Changeset 2959 for SRUClient

Timestamp:

05/29/13 18:32:21 (11 years ago)

Author:

oschonef

Message:

• add constructor for SRU*Request that accepts an URI object

Location:

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

Files:

• SRUAbstractRequest.java (modified) (5 diffs)
• SRUExplainRequest.java (modified) (3 diffs)
• SRUScanRequest.java (modified) (2 diffs)
• SRUSearchRetrieveRequest.java (modified) (2 diffs)

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

@@ -109 +109 @@
         }
     } // class URIHelper
-    /** The URL of the endpoint. */
-    protected final String endpointURI;
+    /** The baseURI of the SRU server. */
+    protected final URI baseURI;
     /**
      * The request should be processed in strict or non-strict SRU protocol
@@ -126 +126 @@
      * Constructor.
      *
-     * @param endpointURI
-     *            the URI of the endpoint
+     * @param baseURI
+     *            the baseURI of the SRU server
      * @throws NullPointerException
      *             if any required argument is null
      */
-    protected SRUAbstractRequest(String endpointURI) {
-        if (endpointURI == null) {
-            throw new NullPointerException("endpointURI == null");
-        }
-        this.endpointURI = endpointURI;
-    }
-
-
-    /**
-     * Get the endpoint URI.
-     *
-     * @return the endpoint URI
-     */
-    public String getEndpointURI() {
-        return endpointURI;
+    protected SRUAbstractRequest(URI baseURI) {
+        if (baseURI == null) {
+            throw new NullPointerException("baseURI == null");
+        }
+        this.baseURI = baseURI;
+    }
+
+
+    /**
+     * Constructor.
+     *
+     * @param baseURI
+     *            the baseURI of the SRU server
+     * @throws NullPointerException
+     *             if any required argument is null
+     * @throw IllegalArgumentException if the URI is invalid
+     */
+    protected SRUAbstractRequest(String baseURI) {
+        if (baseURI == null) {
+            throw new NullPointerException("baseURI == null");
+        }
+        if (baseURI.isEmpty()) {
+            throw new IllegalArgumentException("baseURI is empty");
+        }
+        try {
+            this.baseURI = new URI(baseURI);
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException("invalid URI", e);
+        }
+    }
+
+
+    /**
+     * Get the baseURI of the SRU server.
+     *
+     * @return the baseURI of the SRU server
+     */
+    public URI getBaseURI() {
+        return baseURI;
     }
 
@@ -278 +302 @@
         try {
             final URIHelper uriBuilder =
-                    new URIHelper(new URIBuilder(endpointURI));
+                    new URIHelper(new URIBuilder(baseURI));
 
             /*
@@ -285 +309 @@
              * NB: Setting "x-malformed-operation" as an extra request parameter
              * makes the client to send invalid requests. This is intended to
-             * use for testing endpoints for protocol conformance (i.e. provoke
-             * an error) and SHOULD NEVER be used in production!
+             * use for testing SRU servers for protocol conformance (i.e.
+             * provoke an error) and SHOULD NEVER be used in production!
              */
             final String malformedOperation =
@@ -316 +340 @@
              * NB: Setting "x-malformed-version" as an extra request parameter
              * makes the client to send invalid requests. This is intended to
-             * use for testing endpoints for protocol conformance (i.e. provoke
-             * an error) and SHOULD NEVER be used in production!
+             * use for testing SRU servers for protocol conformance (i.e.
+             * provoke an error) and SHOULD NEVER be used in production!
              */
             final String malformedVersion =

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

@@ -17 +17 @@
 package eu.clarin.sru.client;
 
+import java.net.URI;
+
 /**
  * An object for performing a <em>explain</em> operation.
@@ -33 +35 @@
      *            the baseURI of the endpoint
      */
+    public SRUExplainRequest(URI baseURI) {
+        super(baseURI);
+    }
+
+
+    /**
+     * Constructor.
+     * 
+     * @param baseURI
+     *            the baseURI of the endpoint
+     */
     public SRUExplainRequest(String baseURI) {
         super(baseURI);
@@ -40 +53 @@
     /**
      * Set the requested record packing.
-     *
+     * 
      * @param recordPacking
      *            the requested record packing

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

@@ -16 +16 @@
  */
 package eu.clarin.sru.client;
+
+import java.net.URI;
 
 /**
@@ -49 +51 @@
      *            the baseURI of the endpoint
      */
+    public SRUScanRequest(URI baseURI) {
+        super(baseURI);
+    }
+
+    
+    /**
+     * Constructor.
+     *
+     * @param baseURI
+     *            the baseURI of the endpoint
+     */
     public SRUScanRequest(String baseURI) {
         super(baseURI);

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

@@ -16 +16 @@
  */
 package eu.clarin.sru.client;
+
+import java.net.URI;
 
 /**
@@ -57 +59 @@
      *            the baseURI of the endpoint
      */
+    public SRUSearchRetrieveRequest(URI baseURI) {
+        super(baseURI);
+    }
+
+
+    /**
+     * Constructor.
+     *
+     * @param baseURI
+     *            the baseURI of the endpoint
+     */
     public SRUSearchRetrieveRequest(String baseURI) {
         super(baseURI);