Thread: [Andspidclient-commit] SF.net SVN: andspidclient:[79] trunk/src

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 79
          http://andspidclient.svn.sourceforge.net/andspidclient/?rev=79&view=rev
Author:   ritacsiro
Date:     2010-08-27 03:33:09 +0000 (Fri, 27 Aug 2010)

Log Message:
-----------
ANDSWRON-926:PID value not saved correctly if it's a URL string especially if it contains '?' and '&' .

Modified Paths:
--------------
    trunk/src/main/java/au/csiro/pidclient/AndsPidClient.java
    trunk/src/test/java/au/csiro/pidclient/TestAndsPidClient.java

Modified: trunk/src/main/java/au/csiro/pidclient/AndsPidClient.java
===================================================================

--- trunk/src/main/java/au/csiro/pidclient/AndsPidClient.java	2010-07-16 02:30:48 UTC (rev 78)
+++ trunk/src/main/java/au/csiro/pidclient/AndsPidClient.java	2010-08-27 03:33:09 UTC (rev 79)
@@ -39,6 +39,7 @@
 import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.HttpsURL;
+import org.apache.commons.httpclient.NameValuePair;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.RequestEntity;
 import org.apache.commons.httpclient.methods.StringRequestEntity;
@@ -317,8 +318,12 @@
 
         this.validateMintHandleArguments(type, value);
 
-        String queryString = MessageFormat.format("type={0}&value={1}", new Object[] { type.value(), value });
-        return executeMethod(queryString, mintMethodName);
+        NameValuePair[] queryParams = {
+                new NameValuePair("type", type.value()),
+                new NameValuePair("value", value)
+              };
+
+        return executeMethod(queryParams, mintMethodName);
     }
 
     /**
@@ -389,9 +394,12 @@
 
         this.validateMintHandleArguments(type, value);
 
-        String queryString = MessageFormat.format("type={0}&index={1}&value={2}", new Object[] { type.value(), index,
-                value });
-        return executeMethod(queryString, mintMethodName);
+        NameValuePair[] queryParams = {
+                new NameValuePair("type", type.value()),
+                new NameValuePair("index", String.valueOf(index)),
+                new NameValuePair("value", value)
+              };
+        return executeMethod(queryParams, mintMethodName);
     }
     
     /**
@@ -469,9 +477,12 @@
                     new Object[] { (type == null) ? null : type.value(), value }));
         }
 
-        String queryString = MessageFormat.format("handle={0}&type={1}&value={2}", new Object[] { handle, type.value(),
-                value });
-        return executeMethod(queryString, addValueMethodName);
+        NameValuePair[] queryParams = {
+                new NameValuePair("type", type.value()),
+                new NameValuePair("handle", handle),
+                new NameValuePair("value", value)
+              };
+        return executeMethod(queryParams, addValueMethodName);
     }
 
     /**
@@ -551,9 +562,13 @@
                     new Object[] { (type == null) ? null : type.value(), value }));
         }
 
-        String queryString = MessageFormat.format("handle={0}&index={1}&type={2}&value={3}", new Object[] { handle,
-                Integer.toString(index), type.value(), value });
-        return executeMethod(queryString, addValueByIndexMethodName);
+        NameValuePair[] queryParams = {
+                new NameValuePair("handle", handle),
+                new NameValuePair("index", String.valueOf(index)),
+                new NameValuePair("type", type.value()),                
+                new NameValuePair("value", value)
+              };
+        return executeMethod(queryParams, addValueByIndexMethodName);
     }
 
     /**
@@ -635,9 +650,12 @@
                                     new Object[] { handle, newValue }));
         }
 
-        String queryString = MessageFormat.format("handle={0}&index={1}&value={2}", new Object[] { handle,
-                Integer.toString(index), newValue });
-        return executeMethod(queryString, modifyValueByIndexMethodName);
+        NameValuePair[] queryParams = {
+                new NameValuePair("index", String.valueOf(index)),
+                new NameValuePair("handle", handle),
+                new NameValuePair("value", newValue)
+              };
+        return executeMethod(queryParams, modifyValueByIndexMethodName);
     }
 
     /**
@@ -708,10 +726,11 @@
                     "The method deleteValueByIndex() can not be called with null or empty arguments:\n handle={0}\n",
                     new Object[] { handle }));
         }
-
-        String queryString = MessageFormat.format("handle={0}&index={1}", new Object[] { handle,
-                Integer.toString(index) });
-        return executeMethod(queryString, deleteValueByIndexMethodName);
+      
+        NameValuePair[] queryParams = {
+                new NameValuePair("index", String.valueOf(index)),
+                new NameValuePair("handle", handle)};
+        return executeMethod(queryParams, deleteValueByIndexMethodName);
     }
 
     /**
@@ -768,8 +787,8 @@
     public String listHandles() throws IllegalStateException, HttpException, IOException
     {
         this.validateState();
-
-        return executeMethod("", listHandlesMethodName);
+        NameValuePair[] queryParams = {new NameValuePair()};
+        return executeMethod(queryParams, listHandlesMethodName);
     }
 
     /**
@@ -828,8 +847,8 @@
                     new Object[] { handle }));
         }
 
-        String queryString = MessageFormat.format("handle={0}", new Object[] { handle });
-        return executeMethod(queryString, getHandleMethodName);
+        NameValuePair[] queryParams = {new NameValuePair("handle", handle)};
+        return executeMethod(queryParams, getHandleMethodName);
     }
 
     /**
@@ -865,8 +884,8 @@
     /**
      * Constructs and executes an HTTP POST call.
      * 
-     * @param queryString
-     *            the query string to provide the POST call.
+     * @param queryParams
+     *            the array of query parameters to provide the POST call.
      * @param methodName
      *            the method to call.
      * @return a formatted XML response.
@@ -875,10 +894,10 @@
      * @throws HttpException
      *             thrown when attempting to execute method call.
      */
-    private String executeMethod(String queryString, String methodName) throws HttpException, IOException
+    private String executeMethod(NameValuePair[] queryParams, String methodName) throws HttpException, IOException
     {
         HttpsURL url = new HttpsURL(/* String user */"", /* String password */"", this.getPidServiceHost(), this
-                .getPidServicePort(), this.getPidServicePath(), queryString);
+                .getPidServicePort(), this.getPidServicePath());
 
         // if no path has been specified (i.e. path value is just '/') then we have:
         // http://test.org.au:80/mint?type=URL&value=<some value>
@@ -894,7 +913,7 @@
 
         String identityXML = this.getRequestorIdentity().toXML(methodName);
 
-        return executePostMethod(url.toString(), identityXML);
+        return executePostMethod(url.toString(), queryParams, identityXML);
 
     }
 
@@ -905,6 +924,8 @@
      * 
      * @param postMethodURL
      *            the URI of the RESTful ANDS Persistent Identifier web service.
+     * @param params
+     *            the array of query parameters to provide the POST call.
      * @param identityXML
      *            an XML fragment that details the identity of the caller.
      * @return a formatted XML response.
@@ -913,7 +934,7 @@
      * @throws HttpException
      *             thrown when attempting to execute method call.
      */
-    private String executePostMethod(String postMethodURL, String identityXML) throws HttpException, IOException
+    private String executePostMethod(String postMethodURL, NameValuePair[] params, String identityXML) throws HttpException, IOException
     {
         LOG.debug("Post method URL: " + postMethodURL);
         LOG.debug("Identity XML: " + identityXML);
@@ -933,7 +954,7 @@
             RequestEntity entity = new StringRequestEntity(identityXML, "text/xml", "UTF-8");
             client.getParams().setParameter("Content-Length", entity.getContentLength());
             method.setRequestEntity(entity);
-
+            method.setQueryString(params);
             int returnCode = client.executeMethod(method);
             if (returnCode == HttpStatus.SC_NOT_IMPLEMENTED)
             {
@@ -1030,7 +1051,7 @@
         NodeList nodes = (NodeList) result;
         for (int i = 0; i < nodes.getLength(); i++)
         {
-        	return nodes.item(i).getTextContent();
+            return nodes.item(i).getTextContent();
         }
         return null;
     }
@@ -1187,19 +1208,19 @@
         {
             errorMsg
                     .append("The appID of the caller has not been provided. " +
-                    		"e.g. unique Id provided by ANDS upon IP registration.\n");
+                            "e.g. unique Id provided by ANDS upon IP registration.\n");
         }
         if (getRequestorIdentity() == null || StringUtils.isEmpty(this.getRequestorIdentity().getIdentifier()))
         {
             errorMsg
                     .append("The identifier of the caller has not been provided. " +
-                    		"e.g. identifier or name of the repository calling the service.\n");
+                            "e.g. identifier or name of the repository calling the service.\n");
         }
         if (getRequestorIdentity() == null || StringUtils.isEmpty(this.getRequestorIdentity().getAuthDomain()))
         {
             errorMsg
                     .append("The authDomain of the caller has not been provided. " +
-                    		"e.g. the domain of the organisation calling the service.");
+                            "e.g. the domain of the organisation calling the service.");
         }
         // if we have error messages, throw the exception
         if (errorMsg.length() != 0)
@@ -1207,6 +1228,7 @@
             throw new IllegalStateException(errorMsg.toString());
         }
     }
+    
 
     /**
      * Checks the arguments passed to the {@link #mintHandle(HandleType, String)} and the

Modified: trunk/src/test/java/au/csiro/pidclient/TestAndsPidClient.java
===================================================================
--- trunk/src/test/java/au/csiro/pidclient/TestAndsPidClient.java	2010-07-16 02:30:48 UTC (rev 78)
+++ trunk/src/test/java/au/csiro/pidclient/TestAndsPidClient.java	2010-08-27 03:33:09 UTC (rev 79)
@@ -415,8 +415,10 @@
         
         int index = createDummyIndexValue(client); // get an index with a value associated with it
         
+        String goodValue = "http://javatest2.vm.csiro.au:8080/muradora/objectView.action?parentId=procite%3ApublicData&type=1&pid=csiro%3ADocument004";
+
         AndsPidResponse response = client.modifyValueByIndexFormattedResponse(TESTING_HANDLE, index,
-                "http://test.org.au/modifyValueByIndex");
+                goodValue);
 
         // should succeed
         assertTrue("Operation success expected, but response indicated failure", response.isSuccess());
@@ -432,7 +434,7 @@
             {
                 found = true;
                 assertEquals("The value associated with index: " + index + " was not updated by modifyValueByIndex",
-                        property.getValue(), "http://test.org.au/modifyValueByIndex");
+                        property.getValue(), goodValue);
             }
         }
         if (!found)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Andspidclient-commit] SF.net SVN: andspidclient:[79] trunk/src

andspidclient-commit