NOJIRA: Updated Organization client sample so that it would compile.

diff --git a/services/organization/sample/sample/src/main/java/org/collectionspace/services/organization/client/sample/Sample.java b/services/organization/sample/sample/src/main/java/org/collectionspace/services/organization/client/sample/Sample.java
index 71119a652065e3907fd3583c7411ce6ed38ac456..8667b5b53731602fbf41efaba19e67a619e1532e 100644 (file)
--- a/services/organization/sample/sample/src/main/java/org/collectionspace/services/organization/client/sample/Sample.java
+++ b/services/organization/sample/sample/src/main/java/org/collectionspace/services/organization/client/sample/Sample.java
@@ -37,6 +37,9 @@ import org.apache.log4j.BasicConfigurator;
 import org.collectionspace.services.OrganizationJAXBSchema;\r
 import org.collectionspace.services.client.OrgAuthorityClient;\r
 import org.collectionspace.services.client.OrgAuthorityClientUtils;\r
+import org.collectionspace.services.client.PayloadInputPart;\r
+import org.collectionspace.services.client.PoxPayloadIn;\r
+import org.collectionspace.services.client.PoxPayloadOut;\r
 import org.collectionspace.services.client.test.ServiceRequestType;\r
 import org.collectionspace.services.organization.OrgauthoritiesCommon;\r
 import org.collectionspace.services.organization.OrgauthoritiesCommonList;\r
@@ -134,8 +137,7 @@ public class Sample {
        logger.info("Import: Create Item: \""+shortName+\r
                        "\" in orgAuthority: \"" + orgAuthorityRefName +"\"");\r
         PoxPayloadOut multipart = \r
-               OrgAuthorityClientUtils.createOrganizationInstance( vcsid, \r
-                               refName, orgInfo, client.getItemCommonPartName() );\r
+               OrgAuthorityClientUtils.createOrganizationInstance(refName, orgInfo, client.getItemCommonPartName() );\r
 \r
        ClientResponse<Response> res = client.createItem(vcsid, multipart);\r
 \r
@@ -205,7 +207,7 @@ public class Sample {
         // Submit the request to the service and store the response.\r
         OrgauthoritiesCommon orgAuthority = null;\r
         try {\r
-            ClientResponse<PoxPayloadIn> res = client.read(orgAuthId);\r
+            ClientResponse<String> res = client.read(orgAuthId);\r
             int statusCode = res.getStatus();\r
             if(!REQUEST_TYPE.isValidStatusCode(statusCode)) {\r
                 throw new RuntimeException("Could not read orgAuthority"\r
@@ -215,9 +217,9 @@ public class Sample {
                 throw new RuntimeException("Unexpected Status when reading " +\r
                     "orgAuthority, Status:"+ statusCode);\r
             }\r
-            PoxPayloadIn input = (PoxPayloadIn) res.getEntity();\r
-            orgAuthority = (OrgauthoritiesCommon) extractPart(input,\r
-                    client.getCommonPartName(), OrgauthoritiesCommon.class);\r
+            PoxPayloadIn input = new PoxPayloadIn(res.getEntity());\r
+            PayloadInputPart orgAuthorityPart = input.getPart(client.getCommonPartName());\r
+            orgAuthority = (OrgauthoritiesCommon) orgAuthorityPart.getBody();\r
         } catch (Exception e) {\r
             throw new RuntimeException("Could not read orgAuthority: ", e);\r
         }\r
@@ -375,25 +377,25 @@ public class Sample {
         return sb.toString();\r
     }\r
 \r
-    private Object extractPart(PoxPayloadIn input, String label,\r
-        Class clazz) throws Exception {\r
-        Object obj = null;\r
-        for(InputPart part : input.getParts()){\r
-            String partLabel = part.getHeaders().getFirst("label");\r
-            if(label.equalsIgnoreCase(partLabel)){\r
-                String partStr = part.getBodyAsString();\r
-                if(logger.isDebugEnabled()){\r
-                    logger.debug("extracted part str=\n" + partStr);\r
-                }\r
-                obj = part.getBody(clazz, null);\r
-                if(logger.isDebugEnabled()){\r
-                    logger.debug("extracted part obj=\n", obj, clazz);\r
-                }\r
-                break;\r
-            }\r
-        }\r
-        return obj;\r
-    }\r
+//    private Object extractPart(PoxPayloadIn input, String label,\r
+//        Class clazz) throws Exception {\r
+//        Object obj = null;\r
+//        for(PayloadInputPart part : input.getParts()){\r
+//            String partLabel = part.getHeaders().getFirst("label");\r
+//            if(label.equalsIgnoreCase(partLabel)){\r
+//                String partStr = part.getBodyAsString();\r
+//                if(logger.isDebugEnabled()){\r
+//                    logger.debug("extracted part str=\n" + partStr);\r
+//                }\r
+//                obj = part.getBody(clazz, null);\r
+//                if(logger.isDebugEnabled()){\r
+//                    logger.debug("extracted part obj=\n", obj, clazz);\r
+//                }\r
+//                break;\r
+//            }\r
+//        }\r
+//        return obj;\r
+//    }\r
 \r
        public static void main(String[] args) {\r
 \r