Changeset 7169

Timestamp:

02/01/18 10:49:20 (7 years ago)

Author:

Oliver Schonefeld

Message:

• tweak auto-detect algorithm

File:

• FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/FCSEndpointTester.java (modified) (3 diffs)

FCSEndpointTester/trunk/src/main/java/eu/clarin/fcs/tester/FCSEndpointTester.java

@@ -225 +225 @@
                 if (ed.getVersion() == 1) {
                     profile = FCSTestProfile.CLARIN_FCS_1_0;
-                } else if (ed.getVersion() == 2) {
-                    throw new SRUClientException("CLARIN-FCS version 2.0 " +
-                            "MUST use SRU 2.0. Endpoint used SRU 1.2 " +
-                            "but claimed to support FCS 2.0 in it's " +
-                            "endpoint description!");
                 }
             } else {
+                logger.debug("assume legacy");
                 profile = FCSTestProfile.CLARIN_FCS_LEGACY;
             }
@@ -243 +239 @@
                         ClarinFCSConstants.TRUE);
                 request.setParseRecordDataEnabled(true);
-                response = client.explain(request);
-
-                ed = response.getFirstExtraResponseData(
-                                ClarinFCSEndpointDescription.class);
-                if (ed != null) {
-                    if (ed.getVersion() == 2) {
-                        profile = FCSTestProfile.CLARIN_FCS_2_0;
+                try {
+                    response = client.explain(request);
+
+                    ed = response.getFirstExtraResponseData(
+                            ClarinFCSEndpointDescription.class);
+                    if (ed != null) {
+                        if (ed.getVersion() == 2) {
+                            profile = FCSTestProfile.CLARIN_FCS_2_0;
+                        }
+                    }
+                } catch (SRUClientException e) {
+                    if ((e.getMessage() != null) && (e.getMessage()
+                            .contains("responded with different version"))) {
+                        throw new SRUClientException(
+                                "Seriously broken Endpoint: when trying to " +
+                                "detect FCS 2.0 the Endpoint illegally " +
+                                "responded with a SRU 1.2 reponse to a " +
+                                "SRU 2.0 request!");
+                    } else {
+                        throw e;
                     }
                 }
@@ -325 +334 @@
             try {
                 handler.reset();
+                logcapturehandler.publish(new LogRecord(Level.FINE,
+                        "running test class " + test.getClass().getName()));
                 result = test.perform(context, client, handler);
                 result.setLogRecords(logcapturehandler.getLogRecords());