Changeset 5387 for CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/extensions/CheckHandlesExtension.java

Timestamp:

06/25/14 14:51:13 (10 years ago)

Author:

Oliver Schonefeld

Message:

• update HttpClient?
• use pooled connection manager
• add concurrent request support to schema loader
• rework persistent identifier checking
• rework handle resolver

File:

• CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/extensions/CheckHandlesExtension.java (modified) (8 diffs)

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

@@ -17 +17 @@
 package eu.clarin.cmdi.validator.extensions;
 
+import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -46 +47 @@
     private static final Logger logger =
             LoggerFactory.getLogger(CheckHandlesExtension.class);
-    private final int threads;
     private final boolean resolveHandles;
     private HandleResolver resolver = null;
@@ -52 +52 @@
 
 
-    public CheckHandlesExtension(int threads, boolean resolveHandles) {
-        if (threads < 1) {
-            throw new IllegalArgumentException("threads < 1");
-        }
-        this.threads        = threads;
+    public CheckHandlesExtension(boolean resolveHandles) {
         this.resolveHandles = resolveHandles;
     }
 
 
-    public CheckHandlesExtension(boolean resolveHandles) {
-        this(Runtime.getRuntime().availableProcessors(), resolveHandles);
+    public boolean isResolvingHandles() {
+        return resolveHandles;
+    }
+
+
+    public HandleResolver.Statistics getStatistics() {
+        return (resolver != null) ? resolver.getStatistics() : null;
     }
 
@@ -69 +70 @@
     protected void doInitialize() throws CMDIValidatorInitException {
         if (resolveHandles) {
-            this.resolver = new HandleResolver(threads);
+            this.resolver = new HandleResolver();
         }
 
@@ -89 +90 @@
             selector.setContextItem(document);
             for (XdmItem item : selector) {
-                String handle = item.getStringValue();
-                if (handle != null) {
-                    handle = handle.trim();
+                String handle = null;
+                final String h = item.getStringValue();
+                if (h != null) {
+                    handle = h.trim();
                     if (handle.isEmpty()) {
                         handle = null;
+                    } else {
+                        if (!handle.equals(h)) {
+                            result.reportWarning(-1, -1, "handle '" + h +
+                                    "' contains leading or tailing spaces " +
+                                    "within <ResourceRef> element");
+                        }
                     }
                 }
@@ -124 +132 @@
                     checkHandleResolves(actionableURI, result);
                 } catch (URISyntaxException e) {
+                    /* should not happen */
                     throw new CMDIValidatorException(
                             "created an invalid URI", e);
@@ -137 +146 @@
             } else if (HDL_PROXY_HTTP.equalsIgnoreCase(uri.getScheme()) ||
                     HDL_PROXY_HTTPS.equalsIgnoreCase(uri.getScheme())) {
-                if (HDL_PROXY_HOST.equalsIgnoreCase(uri.getHost())) {
+                if (uri.getHost() != null) {
+                    if (!HDL_PROXY_HOST.equalsIgnoreCase(uri.getHost())) {
+                        result.reportError(-1, -1,
+                                "The URI of PID '" + handle +
+                                "' contains an unexpected host part of '" +
+                                uri.getHost() + "'");
+                    }
                     checkHandleResolves(uri, result);
                 } else {
+                    result.reportError(-1, -1, "The URI of PID '" + handle +
+                            "' is missing the host part");
+                }
+            } else {
+                if (uri.getScheme() != null) {
                     result.reportError(-1, -1,
-                            "PID '" + handle +
-                            "' contains an unexpected host part in the URI: " +
-                            uri.getHost());
-                }
-            } else {
-                result.reportError(-1, -1,
-                        "PID '" + handle +
-                        "' contains an unexpected schema part in the URI: " +
-                        uri.getScheme());
+                            "The URI of PID '" + handle +
+                            "' contains an unexpected schema part of '" +
+                            uri.getScheme() + "'");
+                } else {
+                    result.reportError(-1, -1, "The URI of PID '" + handle +
+                            "' is missing a proper schema part");
+                }
             }
         } catch (URISyntaxException e) {
@@ -161 +179 @@
             CMDIValidatorWriteableResult result) throws CMDIValidatorException {
         if (resolver != null) {
-            int code = resolver.resolve(uri);
-            switch (code) {
-            case HttpStatus.SC_OK:
-                /* no special message in this case */
-                break;
-            case HttpStatus.SC_UNAUTHORIZED:
-                /* FALL-THROUGH */
-            case HttpStatus.SC_FORBIDDEN:
-                result.reportInfo(-1, -1, "PID '" + uri +
-                        "' resolved to an access protected resource (" + code +
-                        ")");
-                break;
-            case HttpStatus.SC_NOT_FOUND:
-                result.reportError(-1, -1, "PID '" + uri +
-                        "' resolved to an non-existing resource (" + code + ")");
-                break;
-            default:
-                result.reportError(-1, -1, "PID '" + uri +
-                        "' resolved with an unexpected result (" + code + ")");
-                break;
+            try {
+                int code = resolver.resolve(uri);
+                switch (code) {
+                case HttpStatus.SC_OK:
+                    /* no special message in this case */
+                    break;
+                case HttpStatus.SC_UNAUTHORIZED:
+                    /* FALL-THROUGH */
+                case HttpStatus.SC_FORBIDDEN:
+                    result.reportInfo(-1, -1, "PID '" + uri +
+                            "' resolved to an access protected resource (" +
+                            code + ")");
+                    break;
+                case HttpStatus.SC_NOT_FOUND:
+                    result.reportError(-1, -1, "PID '" + uri +
+                            "' resolved to an non-existing resource (" + code +
+                            ")");
+                    break;
+                case HandleResolver.TIMEOUT:
+                    result.reportWarning(-1, -1, "Timeout while resolving PID '" +
+                            uri + "'");
+                    break;
+                case HandleResolver.UNKNOWN_HOST:
+                    result.reportWarning(-1, -1, "Unable to resolve host '" +
+                            uri.getHost() + "' while resolving PID '" +
+                            uri + "'");
+                    break;
+                case HandleResolver.ERROR:
+                    result.reportWarning(-1, -1,
+                            "An error occurred while resolving PID '" +
+                            uri + "'");
+                    break;
+                default:
+                    result.reportWarning(-1, -1, "PID '" + uri +
+                            "' resolved with an unexpected result (" + code +
+                            ")");
+                    break;
+                } // switch
+            } catch (IOException e) {
+                throw new CMDIValidatorException(
+                        "error while resolving handle '" + uri + "'", e);
             }
         }