From f3949c6c1b9a557d56f1e679929ad5e5da292fab Mon Sep 17 00:00:00 2001
From: remillet <remillet@yahoo.com>
Date: Sun, 3 Apr 2016 15:54:38 -0700
Subject: [PATCH] CSPACE-6935: Cleaning up Index service files and continuing
 the refactor of the client classes.

---
 .../nuxeo/AuthorityDocumentModelHandler.java  |  4 +++-
 .../services/client/BlobClient.java           |  3 ++-
 .../services/client/index/IndexClient.java    |  4 ++--
 .../client/workflow/WorkflowClient.java       |  4 +++-
 services/index/client/pom.xml                 |  2 +-
 .../services/client/README.java               |  5 +++++
 .../services/client/test/README.java          |  5 +++++
 .../services/index/IndexJAXBSchema.java       |  9 --------
 .../index/IndexListItemJAXBSchema.java        |  4 ----
 services/index/pom.xml                        |  1 -
 .../src/main/resources/index_common.xsd}      | 22 +++++++++----------
 .../services/client/LoaninClient.java         |  4 +++-
 .../services/client/LoanoutClient.java        |  4 +++-
 .../services/client/PublicItemClient.java     |  4 +++-
 .../services/client/README.java               |  5 +++++
 services/workflow/jaxb/pom.xml                |  3 +--
 16 files changed, 46 insertions(+), 37 deletions(-)
 create mode 100644 services/index/client/src/main/java/org/collectionspace/services/client/README.java
 create mode 100644 services/index/client/src/test/java/org/collectionspace/services/client/test/README.java
 delete mode 100644 services/index/jaxb/src/main/java/org/collectionspace/services/index/IndexJAXBSchema.java
 delete mode 100644 services/index/jaxb/src/main/java/org/collectionspace/services/index/IndexListItemJAXBSchema.java
 rename services/{index/jaxb/src/main/resources/indexes-common.xsd => jaxb/src/main/resources/index_common.xsd} (60%)
 create mode 100644 services/workflow/client/src/main/java/org/collectionspace/services/client/README.java

diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
index 6c0ad81c1..b6fa057bf 100644
--- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
+++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
@@ -122,9 +122,11 @@ public abstract class AuthorityDocumentModelHandler<AuthCommon>
 	            logger.debug(client.getClass().getCanonicalName() + ": status = " + statusCode);
 	        }
 	        
+            PoxPayloadIn input = new PoxPayloadIn((String)res.readEntity(getEntityResponseType())); // Get the entire response!
+	        
 			PayloadInputPart payloadInputPart = extractPart(res, client.getCommonPartName());
 			if (payloadInputPart != null) {
-				result = (CPT) payloadInputPart.getBody();
+//				result = (client.getc) payloadInputPart.getBody();
 			}
         } finally {
         	res.close();
diff --git a/services/blob/client/src/main/java/org/collectionspace/services/client/BlobClient.java b/services/blob/client/src/main/java/org/collectionspace/services/client/BlobClient.java
index 2e5dbd6b8..d5e266713 100644
--- a/services/blob/client/src/main/java/org/collectionspace/services/client/BlobClient.java
+++ b/services/blob/client/src/main/java/org/collectionspace/services/client/BlobClient.java
@@ -19,6 +19,7 @@ package org.collectionspace.services.client;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.core.Response;
 
+import org.collectionspace.services.blob.BlobsCommon;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput;
 
 /**
@@ -28,7 +29,7 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput;
  * $LastChangedDate: 2010-05-17 18:25:37 -0700 (Mon, 17 May 2010) $
  *
  */
-public class BlobClient extends AbstractCommonListPoxServiceClientImpl<BlobProxy> {
+public class BlobClient extends AbstractCommonListPoxServiceClientImpl<BlobProxy, BlobsCommon> {
 	public static final String SERVICE_NAME = "blobs";
 	public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;	
 	public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT;
diff --git a/services/client/src/main/java/org/collectionspace/services/client/index/IndexClient.java b/services/client/src/main/java/org/collectionspace/services/client/index/IndexClient.java
index 689618ca5..6938e5065 100644
--- a/services/client/src/main/java/org/collectionspace/services/client/index/IndexClient.java
+++ b/services/client/src/main/java/org/collectionspace/services/client/index/IndexClient.java
@@ -19,7 +19,7 @@ package org.collectionspace.services.client.index;
 import javax.ws.rs.core.Response;
 
 import org.collectionspace.services.client.AbstractCommonListPoxServiceClientImpl;
-import org.collectionspace.services.index.IndexesCommon;
+import org.collectionspace.services.index.IndexCommon;
 
 /**
  * IndexClient.java
@@ -28,7 +28,7 @@ import org.collectionspace.services.index.IndexesCommon;
  * $LastChangedDate: 2010-05-17 18:25:37 -0700 (Mon, 17 May 2010) $
  *
  */
-public class IndexClient extends AbstractCommonListPoxServiceClientImpl<IndexProxy, IndexesCommon> {
+public class IndexClient extends AbstractCommonListPoxServiceClientImpl<IndexProxy, IndexCommon> {
 	public static final String SERVICE_NAME = "index";
 	public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;	
 	public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT;
diff --git a/services/client/src/main/java/org/collectionspace/services/client/workflow/WorkflowClient.java b/services/client/src/main/java/org/collectionspace/services/client/workflow/WorkflowClient.java
index 5491864e4..d107f7800 100644
--- a/services/client/src/main/java/org/collectionspace/services/client/workflow/WorkflowClient.java
+++ b/services/client/src/main/java/org/collectionspace/services/client/workflow/WorkflowClient.java
@@ -17,7 +17,9 @@
 package org.collectionspace.services.client.workflow;
 
 import javax.ws.rs.core.Response;
+
 import org.collectionspace.services.client.AbstractCommonListPoxServiceClientImpl;
+import org.collectionspace.services.workflow.WorkflowCommon;
 
 /**
  * WorkflowClient.java
@@ -26,7 +28,7 @@ import org.collectionspace.services.client.AbstractCommonListPoxServiceClientImp
  * $LastChangedDate: 2010-05-17 18:25:37 -0700 (Mon, 17 May 2010) $
  *
  */
-public class WorkflowClient extends AbstractCommonListPoxServiceClientImpl<WorkflowProxy> {
+public class WorkflowClient extends AbstractCommonListPoxServiceClientImpl<WorkflowProxy, WorkflowCommon> {
 	public static final String SERVICE_NAME = "workflow";
 	public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;	
 	public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT;
diff --git a/services/index/client/pom.xml b/services/index/client/pom.xml
index c74988069..6d167c4c8 100644
--- a/services/index/client/pom.xml
+++ b/services/index/client/pom.xml
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.index.jaxb</artifactId>
+            <artifactId>org.collectionspace.services.dimension.client</artifactId> <!-- Dimension instances are used as a unit-tests targets -->
             <version>${project.version}</version>
         </dependency>
 <!-- External dependencies -->        
diff --git a/services/index/client/src/main/java/org/collectionspace/services/client/README.java b/services/index/client/src/main/java/org/collectionspace/services/client/README.java
new file mode 100644
index 000000000..86331a135
--- /dev/null
+++ b/services/index/client/src/main/java/org/collectionspace/services/client/README.java
@@ -0,0 +1,5 @@
+package org.collectionspace.services.client;
+
+public final class README {
+	// The IndexClient class you expected to see here is in the ../services/services/client directory (Maven Module)
+}
diff --git a/services/index/client/src/test/java/org/collectionspace/services/client/test/README.java b/services/index/client/src/test/java/org/collectionspace/services/client/test/README.java
new file mode 100644
index 000000000..b2a9e3329
--- /dev/null
+++ b/services/index/client/src/test/java/org/collectionspace/services/client/test/README.java
@@ -0,0 +1,5 @@
+package org.collectionspace.services.client.test;
+
+public final class README {
+
+}
diff --git a/services/index/jaxb/src/main/java/org/collectionspace/services/index/IndexJAXBSchema.java b/services/index/jaxb/src/main/java/org/collectionspace/services/index/IndexJAXBSchema.java
deleted file mode 100644
index aa05c9a5b..000000000
--- a/services/index/jaxb/src/main/java/org/collectionspace/services/index/IndexJAXBSchema.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * 
- */
-package org.collectionspace.services.index;
-
-public interface IndexJAXBSchema {
-}
-
-
diff --git a/services/index/jaxb/src/main/java/org/collectionspace/services/index/IndexListItemJAXBSchema.java b/services/index/jaxb/src/main/java/org/collectionspace/services/index/IndexListItemJAXBSchema.java
deleted file mode 100644
index 7ed65b9a5..000000000
--- a/services/index/jaxb/src/main/java/org/collectionspace/services/index/IndexListItemJAXBSchema.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.collectionspace.services.index;
-
-public interface IndexListItemJAXBSchema {
-}
diff --git a/services/index/pom.xml b/services/index/pom.xml
index 6c2cee691..da22a260a 100644
--- a/services/index/pom.xml
+++ b/services/index/pom.xml
@@ -13,7 +13,6 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>jaxb</module>
         <module>3rdparty</module>
         <module>client</module>
         <module>service</module>
diff --git a/services/index/jaxb/src/main/resources/indexes-common.xsd b/services/jaxb/src/main/resources/index_common.xsd
similarity index 60%
rename from services/index/jaxb/src/main/resources/indexes-common.xsd
rename to services/jaxb/src/main/resources/index_common.xsd
index 8f8edbb52..e250df2d1 100644
--- a/services/index/jaxb/src/main/resources/indexes-common.xsd
+++ b/services/jaxb/src/main/resources/index_common.xsd
@@ -1,36 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
 <!--
-    Index schema (XSD)
+    Loan Out schema (XSD)
     
     Entity  : Index
     Part    : Common
     Used for: JAXB binding between XML and Java objects
 
-    $LastChangedRevision: 860 $
-    $LastChangedDate: 2009-10-14 14:48:05 -0700 (Wed, 14 Oct 2009) $
+    $LastChangedRevision: 2316 $
+    $LastChangedDate: 2010-06-02 16:03:51 -0700 (Wed, 02 Jun 2010) $
 -->
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0"
-  elementFormDefault="unqualified"
+  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+  jaxb:version="1.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/index"
   xmlns="http://collectionspace.org/services/index"
   targetNamespace="http://collectionspace.org/services/index"
   version="0.1">
-
 <!--
     Avoid XmlRootElement nightmare:
     See http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html
--->
-<!-- See http://wiki.collectionspace.org/display/collectionspace/Index+Schema -->    
-    
-    <!-- index  -->
-    <xs:element name="indexes_common">
+-->    
+    <!-- index -->
+    <xs:element name="index_common">
         <xs:complexType>
             <xs:sequence>
-                <xs:element name="csid" type="xs:string" />
+                <!--  Index Information Group -->
+                <xs:element name="indexInfo" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>    
diff --git a/services/loanin/client/src/main/java/org/collectionspace/services/client/LoaninClient.java b/services/loanin/client/src/main/java/org/collectionspace/services/client/LoaninClient.java
index e5c31e8f0..f611c1aba 100644
--- a/services/loanin/client/src/main/java/org/collectionspace/services/client/LoaninClient.java
+++ b/services/loanin/client/src/main/java/org/collectionspace/services/client/LoaninClient.java
@@ -16,6 +16,8 @@
  */
 package org.collectionspace.services.client;
 
+import org.collectionspace.services.loanin.LoansinCommon;
+
 /**
  * LoaninClient.java
  *
@@ -23,7 +25,7 @@ package org.collectionspace.services.client;
  * $LastChangedDate$
  *
  */
-public class LoaninClient extends AbstractCommonListPoxServiceClientImpl<LoaninProxy> {
+public class LoaninClient extends AbstractCommonListPoxServiceClientImpl<LoaninProxy, LoansinCommon> {
 
     public static final String SERVICE_NAME = "loansin";
     public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;
diff --git a/services/loanout/client/src/main/java/org/collectionspace/services/client/LoanoutClient.java b/services/loanout/client/src/main/java/org/collectionspace/services/client/LoanoutClient.java
index 657bd95ee..46457088b 100644
--- a/services/loanout/client/src/main/java/org/collectionspace/services/client/LoanoutClient.java
+++ b/services/loanout/client/src/main/java/org/collectionspace/services/client/LoanoutClient.java
@@ -16,13 +16,15 @@
  */
 package org.collectionspace.services.client;
 
+import org.collectionspace.services.loanout.LoansoutCommon;
+
 /**
  * LoanoutClient.java
  *
  * $LastChangedRevision$
  * $LastChangedDate$
  */
-public class LoanoutClient extends AbstractCommonListPoxServiceClientImpl<LoanoutProxy> {
+public class LoanoutClient extends AbstractCommonListPoxServiceClientImpl<LoanoutProxy, LoansoutCommon> {
 
     public static final String SERVICE_NAME = "loansout";
     public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;
diff --git a/services/publicitem/client/src/main/java/org/collectionspace/services/client/PublicItemClient.java b/services/publicitem/client/src/main/java/org/collectionspace/services/client/PublicItemClient.java
index 5d96dea61..a224bb4be 100644
--- a/services/publicitem/client/src/main/java/org/collectionspace/services/client/PublicItemClient.java
+++ b/services/publicitem/client/src/main/java/org/collectionspace/services/client/PublicItemClient.java
@@ -16,6 +16,8 @@
  */
 package org.collectionspace.services.client;
 
+import org.collectionspace.services.publicitem.PublicitemsCommon;
+
 /**
  * PublicItemClient.java
  *
@@ -23,7 +25,7 @@ package org.collectionspace.services.client;
  * $LastChangedDate$
  *
  */
-public class PublicItemClient extends AbstractCommonListPoxServiceClientImpl<PublicItemProxy> {
+public class PublicItemClient extends AbstractCommonListPoxServiceClientImpl<PublicItemProxy, PublicitemsCommon> {
 
     public static final String SERVICE_NAME = "publicitems";
     public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;
diff --git a/services/workflow/client/src/main/java/org/collectionspace/services/client/README.java b/services/workflow/client/src/main/java/org/collectionspace/services/client/README.java
new file mode 100644
index 000000000..2daab5b4d
--- /dev/null
+++ b/services/workflow/client/src/main/java/org/collectionspace/services/client/README.java
@@ -0,0 +1,5 @@
+package org.collectionspace.services.client;
+
+public final class README {
+	// The WorkflowClient class you expected to see here is in the ../services/services/client directory (Maven Module)
+}
diff --git a/services/workflow/jaxb/pom.xml b/services/workflow/jaxb/pom.xml
index 8335c08c7..b02f03ba7 100644
--- a/services/workflow/jaxb/pom.xml
+++ b/services/workflow/jaxb/pom.xml
@@ -3,13 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <artifactId>org.collectionspace.services.workflow</artifactId>
         <groupId>org.collectionspace.services</groupId>
+        <artifactId>org.collectionspace.services.workflow</artifactId>
         <version>4.4-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.workflow.jaxb</artifactId>
     <name>services.workflow.jaxb</name>
     
-- 
2.47.3