Changeset 7094

Timestamp:

11/17/16 22:26:04 (8 years ago)

Author:

Oliver Schonefeld

Message:

• bail, if requested version is not obeyed by server

File:

• SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUSimpleClient.java (modified) (7 diffs)

SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUSimpleClient.java

@@ -1458 +1458 @@
                     namespaceURI, requestedVersion);
 
-            if (NAMESPACES_LEGACY_LOC.foo(namespaceURI)) {
-                return NAMESPACES_LEGACY_LOC;
-            } else if (NAMESPACES_OASIS.foo(namespaceURI)) {
-                return NAMESPACES_OASIS;
+            SRUNamespaces namespace;
+            if (NAMESPACES_LEGACY_LOC.matchNamespace(namespaceURI)) {
+                namespace = NAMESPACES_LEGACY_LOC;
+            } else if (NAMESPACES_OASIS.matchNamespace(namespaceURI)) {
+                namespace = NAMESPACES_OASIS;
             } else {
                 throw new SRUClientException(
                         "invalid namespace '" + reader.getNamespaceURI() + "'");
             }
+
+            if (requestedVersion != null) {
+                if (!namespace.compatibleWithVersion(requestedVersion)) {
+                    throw new SRUClientException("Server did not honour " +
+                            "requested SRU version and responded with " +
+                            "different version (requested version was " +
+                            requestedVersion + ")");
+                }
+            }
+            return namespace;
         } catch (XMLStreamException e) {
             throw new SRUClientException("error detecting namespace", e);
@@ -1473 +1484 @@
 
     private interface SRUNamespaces {
+        public boolean compatibleWithVersion(SRUVersion version);
+
         public String sruNS();
 
@@ -1479 +1492 @@
         public String diagnosticNS();
 
-        public boolean foo(String namespaceURI);
+        public boolean matchNamespace(String namespaceURI);
 
     } // interface SRUNamespace
@@ -1492 +1505 @@
 
         @Override
+        public boolean compatibleWithVersion(SRUVersion version) {
+            return SRUVersion.VERSION_1_1.equals(version) ||
+                    SRUVersion.VERSION_1_2.equals(version);
+        }
+
+
+        @Override
         public String sruNS() {
             return SRU_NS;
@@ -1510 +1530 @@
 
         @Override
-        public boolean foo(String namespaceURI) {
+        public boolean matchNamespace(String namespaceURI) {
             return SRU_NS.equals(namespaceURI);
         }
@@ -1526 +1546 @@
 
         @Override
+        public boolean compatibleWithVersion(SRUVersion version) {
+            return SRUVersion.VERSION_2_0.equals(version);
+        }
+
+
+        @Override
         public String sruNS() {
             return SRU_NS;
@@ -1545 +1571 @@
 
         @Override
-        public boolean foo(String namespaceURI) {
+        public boolean matchNamespace(String namespaceURI) {
             return SRU_NS.equals(namespaceURI) || SRU_SCAN_NS.equals(namespaceURI);
         }