Changeset 7019

Timestamp:

06/13/16 11:35:15 (8 years ago)

Author:

Menzo Windhouwer

Message:

M cmdi-validator-tool/pom.xml
M pom.xml
M cmdi-validator-core/pom.xml

• bumped version to 0.7

M cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidator.java
M cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDISchemaLoader.java
M cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidatorConfig.java

• set connection and socket timeout via the config (alpha CR takes a bit longer to server big XSDs)
• some small changes to make it easier to reuse the SchemaLoader? for different validators and CMDI files

Location:

CMDIValidator/trunk

Files:

• cmdi-validator-core/pom.xml (modified) (1 diff)
• cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDISchemaLoader.java (modified) (3 diffs)
• cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidator.java (modified) (4 diffs)
• cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidatorConfig.java (modified) (3 diffs)
• cmdi-validator-tool/pom.xml (modified) (1 diff)
• pom.xml (modified) (1 diff)

CMDIValidator/trunk/cmdi-validator-core/pom.xml

@@ -6 +6 @@
         <groupId>eu.clarin.cmdi</groupId>
         <artifactId>cmdi-validator</artifactId>
-        <version>0.0.6-SNAPSHOT</version>
+        <version>0.0.7-SNAPSHOT</version>
     </parent>
     <artifactId>cmdi-validator-core</artifactId>

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

@@ -69 +69 @@
 
     public CMDISchemaLoader(File cacheDirectory, long maxCacheAge,
-            long maxNegativeCacheAge) {
+            long maxNegativeCacheAge, int connectTimeout,
+            int socketTimeout) {
         if (cacheDirectory == null) {
             throw new NullPointerException("cacheDirectory == null");
@@ -82 +83 @@
         this.maxCacheAge         = maxCacheAge;
         this.maxNegativeCacheAge = maxNegativeCacheAge;
-        this.httpClient          = createHttpClient(2500, 5000);
-    }
-
+        this.httpClient          = createHttpClient(connectTimeout, socketTimeout);
+    }
+
+
+    public CMDISchemaLoader(File cacheDirectory, long maxCacheAge, int connectTimeout,
+            int socketTimeout) {
+        this(cacheDirectory, maxCacheAge, TimeUnit.HOURS.toMillis(1), 
+                connectTimeout, socketTimeout);
+    }
 
     public CMDISchemaLoader(File cacheDirectory, long maxCacheAge) {
-        this(cacheDirectory, maxCacheAge, TimeUnit.HOURS.toMillis(1));
+        this(cacheDirectory, maxCacheAge, TimeUnit.HOURS.toMillis(1), 2500, 5000);
     }
 
@@ -167 +174 @@
                     return new FileInputStream(cacheDataFile);
                 } catch (IOException e) {
+                    logger.error("downloading schema from '{}' failed", schemaLocation);
+                    logger.error("cause:", e);
                     failed = true;
                     throw e;

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

@@ -132 +132 @@
     private Result result = null;
 
-
+    
     public CMDIValidator(final CMDIValidatorConfig config)
+            throws CMDIValidatorInitException {
+        this(config, config.getRoot(), config.getHandler());
+    }
+
+    public CMDIValidator(final CMDIValidatorConfig config, final File src, CMDIValidationHandler handler)
             throws CMDIValidatorInitException {
         if (config == null) {
@@ -230 +235 @@
          * other stuff
          */
-        final TFile root = new TFile(config.getRoot());
+        final TFile root = new TFile(src);
         this.files       = new FileEnumerator(root, config.getFileFilter());
         if (config.getHandler() == null) {
             throw new NullPointerException("handler == null");
         }
-        this.handler = config.getHandler();
+        this.handler = handler;
     }
 
@@ -331 +336 @@
     private static CMDISchemaLoader initSchemaLoader(
             final CMDIValidatorConfig config) throws CMDIValidatorInitException {
+        int connectTimeout = config.getConnectTimeout();
+        int socketTimeout = config.getSocketTimeout();
         File cacheDirectory = config.getSchemaCacheDirectory();
         if (cacheDirectory == null) {
@@ -369 +376 @@
             }
         }
-        return new CMDISchemaLoader(cacheDirectory, CMDISchemaLoader.DISABLE_CACHE_AGING);
+        return new CMDISchemaLoader(cacheDirectory, CMDISchemaLoader.DISABLE_CACHE_AGING, connectTimeout, socketTimeout);
     }
 

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

@@ -33 +33 @@
     private boolean schematronDisabled = false;
     private List<CMDIValidatorExtension> extensions = null;
+    private int connectTimeout = 2500;
+    private int socketTimeout = 5000;
 
 
@@ -92 +94 @@
 
 
+    public int getConnectTimeout() {
+        return connectTimeout;
+    }
+    
+    public int getSocketTimeout() {
+        return socketTimeout;
+    }
+    
     public static class Builder {
         private final CMDIValidatorConfig config;
@@ -171 +181 @@
         }
 
+        public Builder connectTimeout(int connectTimeout) {
+            config.connectTimeout = connectTimeout;
+            return this;
+        }
+
+        public Builder socketTimeout(int socketTimeout) {
+            config.socketTimeout = socketTimeout;
+            return this;
+        }
 
         public CMDIValidatorConfig build() {

CMDIValidator/trunk/cmdi-validator-tool/pom.xml

@@ -6 +6 @@
         <groupId>eu.clarin.cmdi</groupId>
         <artifactId>cmdi-validator</artifactId>
-        <version>0.0.6-SNAPSHOT</version>
+        <version>0.0.7-SNAPSHOT</version>
     </parent>
     <artifactId>cmdi-validator-tool</artifactId>

CMDIValidator/trunk/pom.xml

@@ -5 +5 @@
     <groupId>eu.clarin.cmdi</groupId>
     <artifactId>cmdi-validator</artifactId>
-    <version>0.0.6-SNAPSHOT</version>
+    <version>0.0.7-SNAPSHOT</version>
     <packaging>pom</packaging>