Merge pull request #28 from cdlib/develop

16088_defensive

Author: jferrie

pom.xml

@@ -4,7 +4,7 @@
     <groupId>org.cdlib</groupId>
     <artifactId>d2d-commons</artifactId>
     <packaging>jar</packaging>
-    <version>1.5.6</version>
+    <version>1.5.7</version>
     <name>D2D Commons</name>
 
     <!-- comment -->
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version> 2.9.10.4</version>
+            <version>2.9.10.5</version>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>

src/main/java/org/cdlib/cache/CacheService.java

@@ -4,7 +4,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-public class CacheService<T, S> {
+public abstract class CacheService<T, S> {
 
     protected Map<T, S> cache;
 
@@ -15,9 +15,7 @@ public void init() {
       cache = Collections.synchronizedMap(new Cache<T, S>(cacheSize));
     }
 
-    public void insertInto(T key, S result) {
-      cache.put(key, result);
-    }
+    public abstract void insertInto(T key, S result);
 
     public Optional<S> getFrom(T key) {
       return Optional.ofNullable(cache.get(key));

src/main/java/org/cdlib/domain/objects/link/Link.java

@@ -20,13 +20,20 @@ public class Link {
   private String mimeType;
 
   @NotNull
-  private Map<String, Object> properties;
+  private Map<String, String> properties;
 
   public Link() {}
 
   public Link(Link source) {
     this.href = source.href;
     this.mimeType = source.mimeType;
+    this.properties = deepCopy(source.properties);
+  }
+  
+  @SuppressWarnings("unchecked")
+  private static Map<String, String> deepCopy(Map<String, String> properties) {
+    String intermediate = JSON.serialize(properties);
+    return JSON.deserialize(intermediate, properties.getClass());
   }
 
   public String getHref() {
@@ -37,7 +44,7 @@ public String getMimeType() {
     return mimeType;
   }
 
-  public Map<String, Object> getProperties() {
+  public Map<String, String> getProperties() {
     return properties;
   }
 
@@ -49,7 +56,7 @@ public void setMimeType(String mimeType) {
     this.mimeType = mimeType;
   }
 
-  public void setProperties(Map<String, Object> properties) {
+  public void setProperties(Map<String, String> properties) {
     this.properties = properties;
   }
 
@@ -70,7 +77,9 @@ public boolean equals(Object obj) {
       return false;
     }
     Link other = (Link) obj;
-    return Objects.equals(href, other.href) && Objects.equals(mimeType, other.mimeType) && Objects.equals(properties, other.properties);
+    return Objects.equals(href, other.href) 
+        && Objects.equals(mimeType, other.mimeType) 
+        && Objects.equals(properties, other.properties);
   }
 
   @Override

src/test/java/org/cdlib/domain/objects/link/LinkTest.java

@@ -0,0 +1,35 @@
+package org.cdlib.domain.objects.link;
+
+import static org.junit.Assert.*;
+import java.util.HashMap;
+import java.util.Map;
+import org.cdlib.domain.objects.bib.Carrier;
+import org.junit.Test;
+
+public class LinkTest {
+  
+  @Test
+  public void testDeepCopy() {
+    Link original = testLink();
+    Link copy = new Link(original);
+    assertFalse(copy == original);
+    assertFalse(copy.getProperties() == original.getProperties());
+    assertTrue(copy.getProperties().equals(original.getProperties()));
+    assertTrue("result".equals(copy.getProperties().get("test")));
+    assertFalse(copy.getProperties().get("test") == original.getProperties().get("test"));
+    assertEquals(copy.getProperties().get("carrier"), original.getProperties().get("carrier"));
+    assertEquals("BRAILLE", copy.getProperties().get("carrier"));
+  }
+  
+  private Link testLink() {
+    Link testLink = new Link();
+    testLink.setHref("href");
+    testLink.setMimeType("mimeType");
+    Map<String, String> testProperties = new HashMap<>();
+    testProperties.put("test", "result");
+    testProperties.put("carrier", Carrier.BRAILLE.name());
+    testLink.setProperties(testProperties);
+    return testLink;
+  }
+
+}