Changeset 5371 for CMDIValidator

Timestamp:

06/19/14 00:06:29 (10 years ago)

Author:

Oliver Schonefeld

Message:

• add config object for factory configuration

Location:

CMDIValidator/trunk

Files:

• cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidatorFactory.java (modified) (6 diffs)
• cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidatorFactoryConfig.java (added)
• cmdi-validator-tool/src/main/java/eu/clarin/cmdi/validator/tool/CMDIValidatorTool.java (modified) (2 diffs)

CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidatorFactory.java

@@ -42 +42 @@
 
 
-    private CMDIValidatorFactory(File cacheDirectory,
-            File schematronSchemaFile, boolean disableSchematron)
+    private CMDIValidatorFactory(final CMDIValidatorFactoryConfig config)
             throws CMDIValidatorInitException {
         /*
@@ -49 +48 @@
          */
         logger.debug("initializing schema loader ...");
+        File cacheDirectory = config.getSchemaCacheDirectory();
         if (cacheDirectory == null) {
             if (SystemUtils.IS_OS_WINDOWS &&
@@ -98 +98 @@
          * initialize Schematron validator
          */
-        if (!disableSchematron) {
+        if (!config.isSchematronDisabled()) {
             logger.debug("initializing Schematron validator ...");
 
             URL schema = null;
+            File schematronSchemaFile = config.getSchematronSchemaFile();
             if (schematronSchemaFile != null) {
                 if (!schematronSchemaFile.exists()) {
@@ -147 +148 @@
                 schematronValidator =
                         compiler.compile(destination.getXdmNode().asSource());
-                logger.debug("Schematron validator successfully initializied");
+                logger.debug("Schematron validator successfully initialized");
             } catch (SaxonApiException e) {
                 throw new CMDIValidatorInitException(
@@ -178 +179 @@
 
 
-    public static CMDIValidatorFactory newInstance(File cacheDircetory,
-            File schematronSchemaFile,
-            boolean disableSchematron) throws CMDIValidatorInitException {
-        return new CMDIValidatorFactory(cacheDircetory,
-                schematronSchemaFile,
-                disableSchematron);
+    public static CMDIValidatorFactory newInstance(
+            CMDIValidatorFactoryConfig config)
+            throws CMDIValidatorInitException {
+        return new CMDIValidatorFactory(config);
     }
 
@@ -189 +188 @@
     public static CMDIValidatorFactory newInstance()
             throws CMDIValidatorInitException {
-        return new CMDIValidatorFactory(null, null, false);
+        return newInstance(new CMDIValidatorFactoryConfig());
     }
 

CMDIValidator/trunk/cmdi-validator-tool/src/main/java/eu/clarin/cmdi/validator/tool/CMDIValidatorTool.java

@@ -27 +27 @@
 import eu.clarin.cmdi.validator.CMDIValidatorException;
 import eu.clarin.cmdi.validator.CMDIValidatorFactory;
+import eu.clarin.cmdi.validator.CMDIValidatorFactoryConfig;
 import eu.clarin.cmdi.validator.CMDIValidatorInitException;
 import eu.clarin.cmdi.validator.CMDIValidatorJob;
@@ -178 +179 @@
                 }
 
+                final CMDIValidatorFactoryConfig config =
+                        new CMDIValidatorFactoryConfig.Builder()
+                        .schemaCacheDirectory(schemaCacheDir)
+                        .schematronSchemaFile(schematronFile)
+                        .schematronDisabled(disableSchematron)
+                        .build();
                 final CMDIValidatorFactory factory =
-                        CMDIValidatorFactory.newInstance(schemaCacheDir,
-                                schematronFile,
-                                disableSchematron);
+                        CMDIValidatorFactory.newInstance(config);
 
                 if (checkPids) {