Changeset 7195 for FCSSimpleClient

Timestamp:

10/11/18 12:12:44 (6 years ago)

Author:

Oliver Schonefeld

Message:

• move some constants to ClarinFCSConstants to make them public

Location:

FCSSimpleClient/trunk/src/main/java/eu/clarin/sru/client/fcs

Files:

• ClarinFCSConstants.java (modified) (3 diffs)
• ClarinFCSEndpointDescriptionParser.java (modified) (4 diffs)

FCSSimpleClient/trunk/src/main/java/eu/clarin/sru/client/fcs/ClarinFCSConstants.java

@@ -17 +17 @@
 package eu.clarin.sru.client.fcs;
 
+import java.net.URI;
+
 import eu.clarin.sru.client.SRUClientConstants;
 
@@ -23 +25 @@
     /** constant for CQL query type */
     public static final String QUERY_TYPE_FCS = "fcs";
+
 
     /** constant for CQL query type */
@@ -33 +36 @@
     public static final String X_FCS_ENDPOINT_DESCRIPTION  =
             "x-fcs-endpoint-description";
+
+
+    /**
+     * constant for Basic Search capability
+     */
+    public static final URI CAPABILITY_BASIC_SEARCH =
+            URI.create("http://clarin.eu/fcs/capability/basic-search");
+
+
+    /**
+     * constant for Advanced Search capability
+     */
+    public static final URI CAPABILITY_ADVANCED_SEARCH =
+            URI.create("http://clarin.eu/fcs/capability/advanced-search");
+
 
     /**

FCSSimpleClient/trunk/src/main/java/eu/clarin/sru/client/fcs/ClarinFCSEndpointDescriptionParser.java

@@ -66 +66 @@
     private static final String CAPABILITY_PREFIX =
             "http://clarin.eu/fcs/capability/";
-    private static final URI CAPABILITY_BASIC_SEARCH =
-            URI.create("http://clarin.eu/fcs/capability/basic-search");
-    private static final URI CAPABILITY_ADVANCED_SEARCH =
-            URI.create("http://clarin.eu/fcs/capability/advanced-search");
     private static final String MIMETYPE_HITS_DATAVIEW =
             "application/x-clarin-fcs-hits+xml";
@@ -147 +143 @@
                     "least one capability!");
         }
-        final boolean hasBasicSearch =
-                (capabilities.indexOf(CAPABILITY_BASIC_SEARCH) != -1);
-        final boolean hasAdvancedSearch =
-                (capabilities.indexOf(CAPABILITY_ADVANCED_SEARCH) != -1);
+        final boolean hasBasicSearch = (capabilities
+                .indexOf(ClarinFCSConstants.CAPABILITY_BASIC_SEARCH) != -1);
+        final boolean hasAdvancedSearch = (capabilities
+                .indexOf(ClarinFCSConstants.CAPABILITY_ADVANCED_SEARCH) != -1);
         if (!hasBasicSearch) {
-            throw new SRUClientException("Endpoint must support " +
-                    "'basic-search' (" + CAPABILITY_BASIC_SEARCH +
-                    ") to conform to CLARIN-FCS specification");
+            throw new SRUClientException(
+                    "Endpoint must support " + "'basic-search' (" +
+                            ClarinFCSConstants.CAPABILITY_BASIC_SEARCH +
+                            ") to conform to CLARIN-FCS specification");
         }
 
@@ -276 +273 @@
                     "all supported layers (<SupportedLayers>) if they " +
                     "provide the 'advanced-search' (" +
-                    CAPABILITY_ADVANCED_SEARCH + ") capability");
+                    ClarinFCSConstants.CAPABILITY_ADVANCED_SEARCH +
+                    ") capability");
         }
         if (!hasAdvancedSearch && (supportedLayers != null)) {
@@ -282 +280 @@
             logger.warn("Endpoint superflously declared supported " +
                     "layers (<SupportedLayers> without providing the " +
-                    "'advanced-search' (" + CAPABILITY_ADVANCED_SEARCH + ") capability");
+                    "'advanced-search' (" +
+                    ClarinFCSConstants.CAPABILITY_ADVANCED_SEARCH +
+                    ") capability");
         }