simplify redis resource creation

TAMULib · Oct 7, 2020 · 1485c3e · 1485c3e
1 parent c223802
commit 1485c3e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/src/main/java/edu/tamu/iiif/model/RedisResource.java b/src/main/java/edu/tamu/iiif/model/RedisResource.java
@@ -1,5 +1,7 @@
 package edu.tamu.iiif.model;
 
+import java.util.UUID;
+
 import org.springframework.data.annotation.Id;
 import org.springframework.data.redis.core.RedisHash;
 import org.springframework.data.redis.core.index.Indexed;
@@ -13,8 +15,8 @@ public class RedisResource {
     @Indexed
     private final String url;
 
-    public RedisResource(String id, String url) {
-        this.id = id;
+    public RedisResource(String url) {
+        this.id = UUID.nameUUIDFromBytes(url.getBytes()).toString();
         this.url = url;
     }
 

diff --git a/src/main/java/edu/tamu/iiif/service/RedisResourceResolver.java b/src/main/java/edu/tamu/iiif/service/RedisResourceResolver.java
@@ -2,7 +2,6 @@
 
 import java.net.URISyntaxException;
 import java.util.Optional;
-import java.util.UUID;
 
 import org.apache.commons.validator.routines.UrlValidator;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +36,7 @@ public String create(String url) throws URISyntaxException {
         if (!URL_VALIDATOR.isValid(url)) {
             throw new URISyntaxException(url, "Not a valid URL");
         }
-        return redisResourceRepo.save(new RedisResource(UUID.nameUUIDFromBytes(url.getBytes()).toString(), url)).getId();
+        return redisResourceRepo.save(new RedisResource(url)).getId();
     }
 
     public String resolve(String id) throws NotFoundException {

diff --git a/src/test/java/edu/tamu/iiif/controller/ResourceControllerTest.java b/src/test/java/edu/tamu/iiif/controller/ResourceControllerTest.java
@@ -44,11 +44,11 @@ public class ResourceControllerTest {
     @MockBean
     private ResourceResolver resourceResolver;
 
-    private final RedisResource mockResource = new RedisResource("26f9b338-f744-11e8-8eb2-f2801f1b9fd1", "http://localhost:9000/fcrepo/rest/image01");
+    private final RedisResource mockResource = new RedisResource("http://localhost:9000/fcrepo/rest/image01");
 
-    private final RedisResource mockResourceNotExist = new RedisResource("26f9b338-f744-11e8-8eb2-f2801f1b9fd9", "http://localhost:9000/fcrepo/rest/image02");
+    private final RedisResource mockResourceNotExist = new RedisResource("http://localhost:9000/fcrepo/rest/image02");
 
-    private final RedisResource mockResourceNotExistYet = new RedisResource("26f9b338-f744-11e8-8eb2-f2801f1b9fe3", "http://localhost:9000/fcrepo/rest/image03");
+    private final RedisResource mockResourceNotExistYet = new RedisResource("http://localhost:9000/fcrepo/rest/image03");
 
     private final String resourceWithIdNotFound = String.format("Resource with id %s not found!", mockResourceNotExist.getId());
 

diff --git a/src/test/java/edu/tamu/iiif/model/RedisResourceTest.java b/src/test/java/edu/tamu/iiif/model/RedisResourceTest.java
@@ -13,10 +13,9 @@ public class RedisResourceTest {
     @Test
     public void testCreate() {
         String url = "http://localhost:900/fcrepo/rest/image02";
-        String id = UUID.nameUUIDFromBytes(url.getBytes()).toString();
-        RedisResource redisResource = new RedisResource(id, url);
+        RedisResource redisResource = new RedisResource(url);
         Assert.assertNotNull(redisResource);
-        Assert.assertEquals(id, redisResource.getId());
+        Assert.assertEquals(UUID.nameUUIDFromBytes(redisResource.getUrl().getBytes()).toString(), redisResource.getId());
         Assert.assertEquals(url, redisResource.getUrl());
     }
 

diff --git a/src/test/java/edu/tamu/iiif/service/RedisResourceResolverTest.java b/src/test/java/edu/tamu/iiif/service/RedisResourceResolverTest.java
@@ -28,9 +28,9 @@ public class RedisResourceResolverTest {
 
     private RedisResourceResolver redisResourceResolver = new RedisResourceResolver();
 
-    private final RedisResource mockResource = new RedisResource("26f9b338-f744-11e8-8eb2-f2801f1b9fd1", "http://localhost:9000/fcrepo/rest/image01");
+    private final RedisResource mockResource = new RedisResource("http://localhost:9000/fcrepo/rest/image01");
 
-    private final RedisResource mockResourceNotExist = new RedisResource("26f9b338-f744-11e8-8eb2-f2801f1b9fd9", "http://localhost:9000/fcrepo/rest/image02");
+    private final RedisResource mockResourceNotExist = new RedisResource("http://localhost:9000/fcrepo/rest/image02");
 
     @Before
     public void setup() {

diff --git a/src/test/java/edu/tamu/iiif/service/RemoteResourceResolverTest.java b/src/test/java/edu/tamu/iiif/service/RemoteResourceResolverTest.java
@@ -38,9 +38,9 @@ public class RemoteResourceResolverTest {
 
     private RemoteResourceResolver remoteResourceResolver = new RemoteResourceResolver();
 
-    private final RedisResource mockResource = new RedisResource("26f9b338-f744-11e8-8eb2-f2801f1b9fd1", "http://localhost:9000/fcrepo/rest/image01");
+    private final RedisResource mockResource = new RedisResource("http://localhost:9000/fcrepo/rest/image01");
 
-    private final RedisResource mockResourceNotExist = new RedisResource("26f9b338-f744-11e8-8eb2-f2801f1b9fd9", "http://localhost:9000/fcrepo/rest/image02");
+    private final RedisResource mockResourceNotExist = new RedisResource("http://localhost:9000/fcrepo/rest/image02");
 
     private final ResolverConfig resolver = new ResolverConfig();