CSPACE-5217: Initial placeholder population of uriTemplateRegistry, *not* yet tested.

diff --git a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
index 85808b5d74f8e05b78bf2903b1e178e50c2ca793..56eaf47c88b322f89684938d0b82538571357c2a 100644 (file)
--- a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
+++ b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
@@ -142,7 +142,9 @@ public class CollectionSpaceJaxRsApplication extends Application
     private void addResourceToMapAndSingletons(ResourceBase resource) {
         singletons.add(resource);
         resourceMap.put(resource.getServiceName(), resource);
-        // uriTemplateRegistry.put(resource.getDocType(), resource.getUriTemplate());
+        // FIXME: Accept multiple entries from each resource into the registry.
+        // See also similar comments in ResourceBase.
+        uriTemplateRegistry.put(resource.getDocType(), resource.getUriTemplate());
     }
 
     @Override

diff --git a/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java b/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
index 38f34669a74a15e2902e6648538b259b19c1c5ac..4df2662b76e91b9bc147605b878c16aa2ec18aa9 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
@@ -47,7 +47,9 @@ import org.nuxeo.ecm.core.api.repository.RepositoryInstance;
 import javax.ws.rs.*;\r
 import javax.ws.rs.core.*;\r
 \r
+import java.util.HashMap;\r
 import java.util.List;\r
+import java.util.Map;\r
 \r
 /**\r
  * $LastChangedRevision:  $\r
@@ -377,5 +379,25 @@ public abstract class ResourceBase
                        throws Exception, DocumentNotFoundException {\r
        return getDocModelForAuthorityItem(repoSession, RefName.AuthorityItem.parse(refName));\r
     }\r
+    \r
+    // FIXME: For authority items, we will need to return an array / collection of uriTemplate objects,\r
+    // since there are two different doctypes, with associated uriTemplates, to insert into the registry.\r
+    // The following is a placeholder to test proof of concept, adding a single item from each resource\r
+    // to the registry.\r
+    \r
+    public String getDocType() {\r
+        // FIXME: Proof of concept placeholder\r
+        return getServiceName();\r
+    }\r
+    \r
+\r
+    public StoredValuesUriTemplate getUriTemplate() {\r
+        Map<String,String> storedValuesMap = new HashMap<String,String>();\r
+        storedValuesMap.put(UriTemplateFactory.SERVICENAME_VAR, getServiceName());\r
+        StoredValuesUriTemplate template =\r
+                UriTemplateFactory.getURITemplate(UriTemplateFactory.UriTemplateType.RESOURCE,\r
+                storedValuesMap);\r
+        return template;\r
+    }\r
 \r
 }\r

diff --git a/services/common/src/main/java/org/collectionspace/services/common/UriTemplateFactory.java b/services/common/src/main/java/org/collectionspace/services/common/UriTemplateFactory.java
index e845a52304eff5ae8dfade1c7d8ba8d1b0d4f234..d442dbf5637dacec0bac153c0432f0919b1e7fa2 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/UriTemplateFactory.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/UriTemplateFactory.java
@@ -31,24 +31,34 @@ import java.util.Map;
  * provided template type.\r
  */\r
 public class UriTemplateFactory {\r
+    \r
+    public final static String SERVICENAME_VAR = "servicename";\r
+    public final static String IDENTIFIER_VAR = "identifier";\r
+    public final static String ITEM_IDENTIFIER_VAR = "itemIdentifier";\r
+    public final static String CONTACT_IDENTIFIER_VAR = "contactIdentifier";\r
 \r
     public final static String RESOURCE_PATH_PATTERN =\r
-            "/{servicename}/{identifier}";\r
+            "/ +"\r
+            + "{" + SERVICENAME_VAR + "}"\r
+            + "/"\r
+            + "{" + IDENTIFIER_VAR + "}";\r
     // FIXME: Get static strings below (e.g. "items", "contacts") from\r
     // already-declared constants elsewhere\r
     public final static String ITEM_PATH_PATTERN =\r
-            "/{servicename}/{identifier}/items/{itemIdentifier}";\r
+            RESOURCE_PATH_PATTERN\r
+            + "/items/"\r
+            + "{" + ITEM_IDENTIFIER_VAR + "}";\r
     public final static String CONTACT_PATH_PATTERN =\r
-            "/{servicename}/{identifier}/items/{itemIdentifier}/contacts/{contactIdentifier}";\r
+            ITEM_PATH_PATTERN\r
+            + "/contacts/"\r
+            + "{" + CONTACT_IDENTIFIER_VAR + "}";\r
 \r
     public static StoredValuesUriTemplate getURITemplate(UriTemplateType type) {\r
         return new StoredValuesUriTemplate(getUriPathPattern(type));\r
     }\r
     \r
     public static StoredValuesUriTemplate getURITemplate(UriTemplateType type, Map<String,String> storedValuesMap) {\r
-        StoredValuesUriTemplate template = new StoredValuesUriTemplate(getUriPathPattern(type));\r
-        template.setStoredValuesMap(storedValuesMap);\r
-        return template;\r
+        return new StoredValuesUriTemplate(getUriPathPattern(type), storedValuesMap);\r
     }\r
 \r
     private static String getUriPathPattern(UriTemplateType type) {\r

diff --git a/services/common/src/test/java/org/collectionspace/services/common/test/UriTemplateTest.java b/services/common/src/test/java/org/collectionspace/services/common/test/UriTemplateTest.java
index 35eeae82477e31aaf095b965dbfbc094d018cd5d..11ec7ce9685d01e3cd01f9c9d4184ccb301b4857 100644 (file)
--- a/services/common/src/test/java/org/collectionspace/services/common/test/UriTemplateTest.java
+++ b/services/common/src/test/java/org/collectionspace/services/common/test/UriTemplateTest.java
@@ -34,9 +34,10 @@ import org.testng.annotations.Test;
 \r
 public class UriTemplateTest {\r
 \r
-    final static String EXAMPLE_SERVICE_NAME = "examples";\r
-    final static String EXAMPLE_CSID = "a87f6616-4146-4c17-a41a-048597cc12aa";\r
-    final static HashMap<String, String> EMPTY_VALUES_MAP = new HashMap<String, String>();\r
+    private final static String EXAMPLE_SERVICE_NAME = "examples";\r
+    private final static String EXAMPLE_CSID = "a87f6616-4146-4c17-a41a-048597cc12aa";\r
+    private final static String EXAMPLE_ITEM_CSID = "5d1c2f45-6d02-4376-8852-71893eaf8b1b";\r
+    private final static HashMap<String, String> EMPTY_VALUES_MAP = new HashMap<String, String>();\r
     private static final Logger logger = LoggerFactory.getLogger(UriTemplateTest.class);\r
 \r
     private void testBanner(String msg) {\r
@@ -63,10 +64,10 @@ public class UriTemplateTest {
         resourceUriVars.put("servicename", EXAMPLE_SERVICE_NAME);\r
         resourceUriVars.put("identifier", EXAMPLE_CSID);\r
         String uriStr = resourceTemplate.buildUri(resourceUriVars);\r
+        logger.debug("Generated URI string = " + uriStr);\r
         Assert.assertFalse(Tools.isBlank(uriStr), "Generated URI string is null or blank.");\r
         Assert.assertTrue(uriStr.contains(EXAMPLE_SERVICE_NAME), "Generated URI string does not contain expected value: " + EXAMPLE_SERVICE_NAME);\r
         Assert.assertTrue(uriStr.contains(EXAMPLE_CSID), "Generated URI string does not contain expected value: " + EXAMPLE_CSID);\r
-        logger.debug("Generated URI string = " + uriStr);\r
     }\r
 \r
     @Test(dependsOnMethods = {"buildResourceUri"})\r
@@ -79,11 +80,31 @@ public class UriTemplateTest {
         Map<String, String> additionalValues = new HashMap<String, String>();\r
         additionalValues.put("identifier", EXAMPLE_CSID);\r
         String uriStr = storedValuesResourceTemplate.buildUri(additionalValues);\r
-        Assert.assertFalse(Tools.isBlank(uriStr), "Generated URI string is null or blank.");\r
+        logger.debug("Generated URI string = " + uriStr);\r
+        Assert.assertTrue(Tools.notBlank(uriStr), "Generated URI string is null or blank.");\r
         Assert.assertTrue(uriStr.contains(EXAMPLE_SERVICE_NAME), "Generated URI string does not contain expected value: " + EXAMPLE_SERVICE_NAME);\r
         Assert.assertTrue(uriStr.contains(EXAMPLE_CSID), "Generated URI string does not contain expected value: " + EXAMPLE_CSID);\r
+    }\r
+\r
+    @Test(dependsOnMethods = {"buildResourceUri"})\r
+    public void buildItemUri() {\r
+        testBanner("buildItemUri");\r
+        Map<String, String> storedValuesMap = new HashMap<String, String>();\r
+        storedValuesMap.put("servicename", EXAMPLE_SERVICE_NAME);\r
+        StoredValuesUriTemplate itemTemplate =\r
+                UriTemplateFactory.getURITemplate(UriTemplateFactory.UriTemplateType.ITEM, storedValuesMap);\r
+        Map<String, String> additionalValues = new HashMap<String, String>();\r
+        additionalValues.put("identifier", EXAMPLE_CSID);\r
+        additionalValues.put("itemIdentifier", EXAMPLE_ITEM_CSID);\r
+        String uriStr = itemTemplate.buildUri(additionalValues);\r
         logger.debug("Generated URI string = " + uriStr);\r
+        Assert.assertTrue(Tools.notBlank(uriStr), "Generated URI string is null or blank.");\r
+        Assert.assertTrue(uriStr.contains(EXAMPLE_SERVICE_NAME), "Generated URI string does not contain expected value: " + EXAMPLE_SERVICE_NAME);\r
+        Assert.assertTrue(uriStr.contains(EXAMPLE_CSID), "Generated URI string does not contain expected value: " + EXAMPLE_CSID);\r
+        Assert.assertTrue(uriStr.contains(EXAMPLE_ITEM_CSID), "Generated URI string does not contain expected item value: " + EXAMPLE_ITEM_CSID);\r
     }\r
+    \r
+    // Negative tests: errors are anticipated and checked for in each of the following tests\r
 \r
     @Test(dependsOnMethods = {"buildResourceUri"})\r
     public void buildResourceUriWithMissingValue() {\r
@@ -94,8 +115,8 @@ public class UriTemplateTest {
         // The required 'identifier' value is missing from the Map from which the URI will be built\r
         logger.debug("This is a negative test, and an error message is expected here:");\r
         String uriStr = resourceTemplate.buildUri(resourceUriVars);\r
-        Assert.assertTrue(Tools.isBlank(uriStr), "Generated URI string was not blank, but should have been.");\r
         logger.debug("Generated URI string = " + uriStr);\r
+        Assert.assertTrue(Tools.isBlank(uriStr), "Generated URI string was not blank, but should have been.");\r
     }\r
 \r
     @Test(dependsOnMethods = {"buildResourceUri"})\r
@@ -107,8 +128,8 @@ public class UriTemplateTest {
         resourceUriVars.put("identifier", null);\r
         logger.debug("This is a negative test, and an error message is expected here:");\r
         String uriStr = resourceTemplate.buildUri(resourceUriVars);\r
-        Assert.assertTrue(Tools.isBlank(uriStr), "Generated URI string was not blank, but should have been.");\r
         logger.debug("Generated URI string = " + uriStr);\r
+        Assert.assertTrue(Tools.isBlank(uriStr), "Generated URI string was not blank, but should have been.");\r
     }\r
 \r
     @Test(dependsOnMethods = {"buildResourceUri"})\r
@@ -117,7 +138,7 @@ public class UriTemplateTest {
         UriTemplate resourceTemplate = UriTemplateFactory.getURITemplate(UriTemplateFactory.UriTemplateType.RESOURCE);\r
         logger.debug("This is a negative test, and an error message is expected here:");\r
         String uriStr = resourceTemplate.buildUri(EMPTY_VALUES_MAP);\r
-        Assert.assertTrue(Tools.isBlank(uriStr), "Generated URI string was not blank, but should have been.");\r
         logger.debug("Generated URI string = " + uriStr);\r
+        Assert.assertTrue(Tools.isBlank(uriStr), "Generated URI string was not blank, but should have been.");\r
     }\r
 }\r