From 1485c3e5ad0a85bc9fade74c63f154fec85116e1 Mon Sep 17 00:00:00 2001 From: William Welling Date: Wed, 7 Oct 2020 10:32:44 -0500 Subject: [PATCH] simplify redis resource creation --- src/main/java/edu/tamu/iiif/model/RedisResource.java | 6 ++++-- .../java/edu/tamu/iiif/service/RedisResourceResolver.java | 3 +-- .../edu/tamu/iiif/controller/ResourceControllerTest.java | 6 +++--- src/test/java/edu/tamu/iiif/model/RedisResourceTest.java | 5 ++--- .../edu/tamu/iiif/service/RedisResourceResolverTest.java | 4 ++-- .../edu/tamu/iiif/service/RemoteResourceResolverTest.java | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/edu/tamu/iiif/model/RedisResource.java b/src/main/java/edu/tamu/iiif/model/RedisResource.java index e0fb930..c4659c2 100644 --- 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 index adce46d..181f050 100644 --- 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 index 48f996e..c951c0d 100644 --- 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 index 34547f4..07bd705 100644 --- 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 index 6615dde..e41f646 100644 --- 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 index a9b54f9..4db283d 100644 --- 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();