Saxon

The fix was incorrect. Setting a property to null fails with a NullPointerException. Should use Properties.remove().

I think that we should be generating a sample configuration file from FeatureKeys.xml, as well as the java classes, schema, and documentation; and testing this. Note that validating against the schema may be insufficient; it seems that we also need to check it can be read by the ConfgurationReader.

Currently the sample configuration files that we distribute in the saxon-resources are just samples - they do not contain all properties. The run_config_samples test just checks the samples are valid against the generated schema. Similarly the example configuration file included in the documentation (https://www.saxonica.com/documentation12/index.html#!configuration/configuration-file) is only manually edited, and may be incomplete.

I've checked the list of global/xsl/xquery/xsd properties read by ConfigurationReader.java against the list in samples/config/config-raw.xsd and found several omissions -- thresholdForFunctionInlining, xpathVersionForXsd, xpathVersionForXslt , multipleModuleImports, allowUnresolvedSchemaComponents -- which I have fixed.

There seems to be some inconsistency in how we handle properties that no longer have any meaning. These should probably result in a warning. I've changed ConfigurationReader so it issues a warning for certain properties that are still in the schema but no longer have any effect (for example, those related to bytecode generation).

It would definitely help if both the schema and the ConfigurationReader were driven directly from the FeatureKeys database.

Note that we do check that config-raw.xsd is consistent with FeatureKeys.xml: the stylesheet tools/FeatureKeys/FeatureKeysToSchema.xsl which is used to generate config.xsd (provided in the saxon-resources) from config-raw.xsd checks the properties "The stylesheet also checks the schema for consistency with FeatureKeys.xml; the set of attributes defined in both should agree".

But yes, currently there are no checks for consistency with ConfigurationReader.

I have updated the samples testing gradle task run_config_samples to add tests which actually use the sample configuration files (as well as the existing tests that they are valid against the schema).

These tests (for the sample configuration files config.xml and config-HE.xml) currently fail. It looks like the ConfigurationReader is still throwing an error, as well as producing warnings for obsolete options. Testing config.xml:

Warning 
   Obsolete configuration property global/@lazyConstructionMode
Warning 
   Unrecognized configuration property global/@lazyConstructionMode
Warning 
   Invalid configuration property xsd/@schemaUriResolver. Supplied value:
  'com.saxonica.ee.config.StandardSchemaResolver'; required: 'Cannot use
  com.saxonica.ee.config.StandardSchemaResolver as the value of
  http://saxon.sf.net/feature/schemaURIResolverClass. Failed to instantiate class
  com.saxonica.ee.config.StandardSchemaResolver (it has no public zero-argument constructor)'
Warning 
   Unrecognized configuration property xsd/@schemaUriResolver
Unrecognized configuration property global/@lazyConstructionMode

Testing config-HE.xml:

Warning 
   Obsolete configuration property global/@lazyConstructionMode
Warning 
   Unrecognized configuration property global/@lazyConstructionMode
Warning 
   Obsolete configuration property xslt/@versionWarning
Warning 
   Unrecognized configuration property xslt/@versionWarning
Unrecognized configuration property global/@lazyConstructionMode

Also note that there is no indication in the FeatureKeys.xml source that lazyConstructionMode is now obsolete; so this is currently not documented.

I've committed a fix in the ConfigurationReader so that obsolete options just produce warnings and not an error.

I also discovered another missing option - global/@regexBacktrackingLimit - which is now added.

(I'm currently working on generating configuration files from the FeatureKeys source, to test for complete consistency.)

I've committed some further work:

• PREFER_JAXP_PARSER was fully removed from FeatureKeys for 11.0 (rather than just being labelled as obsolete); I have removed some remaining instances of global/@preferJaxpParser in sample configuration files and in ConfigurationReader.
• Otherwise, obsolete properties are labelled as OBSOLETE_PROPERTY in ConfigurationReader. I have added mark up to FeatureKeys (i.e. the <obsolete> element) to label features as obsolete. I have aligned these so that they are now consistent: updating ConfigurationReader to add that global/@displayByteCode, global/@maxCompiledClasses, global/@thresholdForHotspotByteCode, and xslt/@messageEmitter are obsolete; and updating the documentation in FeatureKeys for global/@lazyConstructionMode).
• In tools/featureKeys I've added a new stylesheet "FeatureKeysToConfigFile.xsl" which can be used to generate sample configuration files, referencing FeatureKeys.xml and AdditionalFeatures.xml to include all possible options. The stylesheet should be run against the source document config-base.xml, which includes sample values for options to ensure that generated configuration files are valid, and "usable". Stylesheet parameters can be used to configure the generated output: $edition, $platform, $include-obsolete - to include relevant options only.

It would be good to add testing for generated configuration files which will help us to keep FeatureKeys and ConfigurationReader aligned; but I have not yet configured this.

There were JUnit test failures in ConfigTest caused by invalid options in the testdata/config.xml file; I have corrected these errors and the corresponding tests now pass. The invalid options were

stripWhitespace - should be stripSpace
collectionUriResolver - should be collectionFinder
preEvaluateDocFunction - should be preEvaluateDoc

Updates committed to FeatureKeysToConfigFile.xsl, and testing for generated configuration files now added in run-samples.gradle - see the run_config_tests task (which is added as a dependency for run_config_samples, so we will at least run this testing whenever we run these samples tests).