Update IRI factory use (#104)

Make it work more like our NOID factory (i.e., you must explictly supply it to a TextualBody).
ksclarke · May 10, 2021 · ee8172b · ee8172b
1 parent 492f9f3
commit ee8172b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 27 deletions.
diff --git a/src/main/java/info/freelibrary/iiif/presentation/v3/TextualBody.java b/src/main/java/info/freelibrary/iiif/presentation/v3/TextualBody.java
@@ -53,10 +53,17 @@ public class TextualBody implements ContentResource {
      * Creates a new textual body for an annotation.
      */
     public TextualBody() {
-        final SkolemIriFactory factory = SkolemIriFactory.getFactory();
+        // This is intentionally left empty
+    }
 
-        hasSerializableID = factory.createsSerializableIDs();
-        myID = factory.getSkolemIRI();
+    /**
+     * Creates a new textual body for an annotation, supplying an ID factory for ID creation.
+     *
+     * @param aFactory A SkolemIriFactory that can create IDs
+     */
+    public TextualBody(final SkolemIriFactory aFactory) {
+        hasSerializableID = aFactory.createsSerializableIDs();
+        myID = aFactory.getSkolemIRI();
     }
 
     /**

diff --git a/src/main/java/info/freelibrary/iiif/presentation/v3/id/SkolemIriFactory.java b/src/main/java/info/freelibrary/iiif/presentation/v3/id/SkolemIriFactory.java
@@ -125,7 +125,7 @@ public boolean createsSerializableIDs() {
      * @param aBoolFlag True if IDs should be serialized; else, false
      * @return This SkolemIriFactory
      */
-    public SkolemIriFactory useSerializableIDs(final boolean aBoolFlag) {
+    public SkolemIriFactory createSerializableIDs(final boolean aBoolFlag) {
         hasSerializableIDs = aBoolFlag;
         return this;
     }

diff --git a/src/test/java/info/freelibrary/iiif/presentation/v3/TextualBodyTest.java b/src/test/java/info/freelibrary/iiif/presentation/v3/TextualBodyTest.java
@@ -23,7 +23,6 @@ public class TextualBodyTest {
      */
     @Test
     public final void testTextualBody() {
-        SkolemIriFactory.getFactory().useSerializableIDs(false);
         assertEquals(null, new TextualBody().getID());
     }
 
@@ -32,8 +31,8 @@ public final void testTextualBody() {
      */
     @Test
     public final void testTextualBodyNotSerializingID() {
-        SkolemIriFactory.getFactory().useSerializableIDs(true);
-        assertNotEquals(null, new TextualBody().getID());
+        final SkolemIriFactory idFactory = SkolemIriFactory.getFactory().createSerializableIDs(true);
+        assertNotEquals(null, new TextualBody(idFactory).getID());
     }
 
     /**
@@ -59,7 +58,7 @@ public final void testSetIDURI() {
      */
     @Test
     public final void testSerializedID() {
-        final TextualBody textualBody = new TextualBody().serializeID(true);
+        final TextualBody textualBody = new TextualBody(SkolemIriFactory.getFactory()).serializeID(true);
         assertNotEquals(null, textualBody.getID());
     }
 
@@ -68,7 +67,7 @@ public final void testSerializedID() {
      */
     @Test
     public final void testUnserializeID() {
-        final TextualBody textualBody = new TextualBody().serializeID(false);
+        final TextualBody textualBody = new TextualBody(SkolemIriFactory.getFactory()).serializeID(false);
         assertEquals(null, textualBody.getID());
     }
 

diff --git a/src/test/java/info/freelibrary/iiif/presentation/v3/id/SkolemIriFactoryTest.java b/src/test/java/info/freelibrary/iiif/presentation/v3/id/SkolemIriFactoryTest.java
@@ -72,37 +72,22 @@ public final void testGetSkolemIRI() {
      */
     @Test
     public final void testHasSerializableIDs() {
-        final TextualBody textualBody;
-
-        SkolemIriFactory.getFactory().useSerializableIDs(true);
-        textualBody = new TextualBody();
-
-        assertNotEquals(null, textualBody.getID());
+        assertNotEquals(null, new TextualBody(SkolemIriFactory.getFactory().createSerializableIDs(true)).getID());
     }
 
     /**
      * Tests <code>hasSerializableIDs()</code>.
      */
     @Test
     public final void testHasNonSerializableIDsDefault() {
-        final TextualBody textualBody;
-
-        SkolemIriFactory.getFactory().setWellKnownBase(null);
-        textualBody = new TextualBody();
-
-        assertEquals(null, textualBody.getID());
+        assertEquals(null, new TextualBody(SkolemIriFactory.getFactory().setWellKnownBase(null)).getID());
     }
 
     /**
      * Tests <code>hasSerializableIDs()</code>.
      */
     @Test
     public final void testHasNonSerializableIDs() {
-        final TextualBody textualBody;
-
-        SkolemIriFactory.getFactory().useSerializableIDs(false);
-        textualBody = new TextualBody();
-
-        assertEquals(null, textualBody.getID());
+        assertEquals(null, new TextualBody(SkolemIriFactory.getFactory().createSerializableIDs(false)).getID());
     }
 }