From adeac8208689dc540a72ec4875a70d1ffa020655 Mon Sep 17 00:00:00 2001 From: Richard Schoeller Date: Sat, 18 Mar 2017 22:03:09 -0400 Subject: [PATCH] Fixes #230 - submittor data handling * Change the way in which the submittor data is handled * Fix all of the related tests --- .../gedbrowser/datamodel/Submittor.java | 53 +---- .../gedbrowser/datamodel/SubmittorLink.java | 8 - .../datamodel/util/GedObjectBuilder.java | 4 +- .../datamodel/test/SubmittorLinkTest.java | 7 - .../datamodel/test/SubmittorTest.java | 208 +++++++++--------- .../mongo/domain/GedDocumentMongoFactory.java | 5 +- .../repository/test/RepositoryFinderTest.java | 18 +- .../test/SubmittorRepositoryTest.java | 11 +- .../reader/AbstractGedObjectFactory.java | 2 +- .../renderer/test/GedRendererFactoryTest.java | 7 +- .../SubmittorLinkListItemRendererTest.java | 4 +- .../test/SubmittorLinkPhraseRendererTest.java | 6 +- .../renderer/test/SubmittorRendererTest.java | 2 +- 13 files changed, 142 insertions(+), 193 deletions(-) diff --git a/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/Submittor.java b/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/Submittor.java index ed556704..4a031649 100644 --- a/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/Submittor.java +++ b/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/Submittor.java @@ -15,55 +15,24 @@ public Submittor() { } /** - * @param parent parent object of this submittor - * @param string long version of type string + * @param parent parent object of this source + * @param xref cross reference to this source */ - public Submittor(final GedObject parent, final String string) { - super(parent, string); + public Submittor(final GedObject parent, final ObjectId xref) { + super(parent, xrefString(xref)); } /** - * @param parent parent object of this submittor - * @param tag long version of type string - * @param tail additional text to append to the string - */ - public Submittor(final GedObject parent, final String tag, - final String tail) { - super(parent, processTail(tag, tail)); - } - - /** - * Handle the concatenation. Separate with a space if both are not empty. + * Get the ID string from and ObjectId. Returns null on null input. * - * @param tag long version of the type string - * @param tail additional text to append to the string. - * @return the tag and tail concatenated. + * @param xref an object ID + * @return its string */ - private static String processTail(final String tag, final String tail) { - if (isEmpty(tag)) { - if (isEmpty(tail)) { - return ""; - } else { - return tail; - } - } else { - if (isEmpty(tail)) { - return tag; - } else { - return tag + " " + tail; - } + private static String xrefString(final ObjectId xref) { + if (xref == null) { + return null; } - } - - /** - * @param string - * string to test for emptiness. Null is supported - * @return true if the string is either null or empty - */ - // TODO could move this into a utility class or into GedObject as a - // protected method - private static boolean isEmpty(final String string) { - return string == null || string.isEmpty(); + return xref.getIdString(); } /** diff --git a/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/SubmittorLink.java b/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/SubmittorLink.java index 97785add..b9f07ba7 100644 --- a/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/SubmittorLink.java +++ b/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/SubmittorLink.java @@ -13,14 +13,6 @@ public SubmittorLink() { super(); } - /** - * @param parent parent object of this link - * @param tag long version of type string - */ - public SubmittorLink(final GedObject parent, final String tag) { - super(parent, tag); - } - /** * @param parent parent object of this submittor link * @param tag long version of type string diff --git a/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/util/GedObjectBuilder.java b/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/util/GedObjectBuilder.java index 70b66281..b80f4c4f 100644 --- a/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/util/GedObjectBuilder.java +++ b/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/util/GedObjectBuilder.java @@ -297,7 +297,7 @@ public Submittor createSubmittor(final String idString, final String name) { if (idString == null || name == null) { return new Submittor(root, null); } - final Submittor submittor = new Submittor(root, idString); + final Submittor submittor = new Submittor(root, new ObjectId(idString)); submittor.insert(new Name(submittor, name)); root.insert(submittor); return submittor; @@ -314,7 +314,7 @@ public Submittor createSubmittor(final String idString) { if (idString == null) { return new Submittor(root, null); } - final Submittor submittor = new Submittor(root, idString); + final Submittor submittor = new Submittor(root, new ObjectId(idString)); root.insert(submittor); return submittor; } diff --git a/gedbrowser-datamodel/src/test/java/org/schoellerfamily/gedbrowser/datamodel/test/SubmittorLinkTest.java b/gedbrowser-datamodel/src/test/java/org/schoellerfamily/gedbrowser/datamodel/test/SubmittorLinkTest.java index 3129f8a7..67508d32 100644 --- a/gedbrowser-datamodel/src/test/java/org/schoellerfamily/gedbrowser/datamodel/test/SubmittorLinkTest.java +++ b/gedbrowser-datamodel/src/test/java/org/schoellerfamily/gedbrowser/datamodel/test/SubmittorLinkTest.java @@ -88,13 +88,6 @@ public void testOneArgumentConstructor() { assertMatch(sourceLink, null, "", "", ""); } - /** */ - @Test - public void testTwoArgumentConstructor() { - final SubmittorLink sourceLink = new SubmittorLink(parent, string); - assertMatch(sourceLink, parent, expectedString, expectedFromString, ""); - } - /** */ @Test public void testThreeArgumentConstructor() { diff --git a/gedbrowser-datamodel/src/test/java/org/schoellerfamily/gedbrowser/datamodel/test/SubmittorTest.java b/gedbrowser-datamodel/src/test/java/org/schoellerfamily/gedbrowser/datamodel/test/SubmittorTest.java index 87617ffd..e0cb8d36 100644 --- a/gedbrowser-datamodel/src/test/java/org/schoellerfamily/gedbrowser/datamodel/test/SubmittorTest.java +++ b/gedbrowser-datamodel/src/test/java/org/schoellerfamily/gedbrowser/datamodel/test/SubmittorTest.java @@ -4,6 +4,7 @@ import static org.junit.Assert.assertNull; import org.junit.Test; +import org.schoellerfamily.gedbrowser.datamodel.ObjectId; import org.schoellerfamily.gedbrowser.datamodel.Root; import org.schoellerfamily.gedbrowser.datamodel.Submittor; import org.schoellerfamily.gedbrowser.datamodel.util.GedObjectBuilder; @@ -24,30 +25,29 @@ public final class SubmittorTest { @Test public void testSubmittorName() { final GedObjectBuilder builder = new GedObjectBuilder(); - final Submittor submittor = - builder.createSubmittor("S1", "Richard John/Schoeller/"); - assertEquals("Mismatch name", - "Richard John/Schoeller/", submittor.getName().toString()); + final Submittor submittor = builder.createSubmittor("S1", + "Richard John/Schoeller/"); + assertEquals("Mismatch name", "Richard John/Schoeller/", + submittor.getName().toString()); } /** */ @Test public void testSubmittorSurname() { final GedObjectBuilder builder = new GedObjectBuilder(); - final Submittor submittor = - builder.createSubmittor("S1", "Richard John/Schoeller/"); - assertEquals("Mismatch surname", - "Schoeller", submittor.getSurname()); + final Submittor submittor = builder.createSubmittor("S1", + "Richard John/Schoeller/"); + assertEquals("Mismatch surname", "Schoeller", submittor.getSurname()); } /** */ @Test public void testSubmittorIndexName() { final GedObjectBuilder builder = new GedObjectBuilder(); - final Submittor submittor = - builder.createSubmittor("S1", "Richard John/Schoeller/"); - assertEquals("Mismatch index name", - "Schoeller, Richard John", submittor.getIndexName()); + final Submittor submittor = builder.createSubmittor("S1", + "Richard John/Schoeller/"); + assertEquals("Mismatch index name", "Schoeller, Richard John", + submittor.getIndexName()); } /** */ @@ -55,8 +55,7 @@ public void testSubmittorIndexName() { public void testSubmittorNullName() { final GedObjectBuilder builder = new GedObjectBuilder(); final Submittor submittor2 = builder.createSubmittor("S2"); - assertEquals("Expected null name", - "", submittor2.getName().toString()); + assertEquals("Expected null name", "", submittor2.getName().toString()); } /** */ @@ -64,8 +63,7 @@ public void testSubmittorNullName() { public void testSubmittorNullSurname() { final GedObjectBuilder builder = new GedObjectBuilder(); final Submittor submittor2 = builder.createSubmittor("S2"); - assertEquals("Expected ? surname", - "?", submittor2.getSurname()); + assertEquals("Expected ? surname", "?", submittor2.getSurname()); } /** */ @@ -73,8 +71,8 @@ public void testSubmittorNullSurname() { public void testSubmittorNullIndexName() { final GedObjectBuilder builder = new GedObjectBuilder(root); final Submittor submittor2 = builder.createSubmittor("S2"); - assertEquals("Expected ?s index name", - "?, ?", submittor2.getIndexName()); + assertEquals("Expected ?s index name", "?, ?", + submittor2.getIndexName()); } /** */ @@ -94,7 +92,7 @@ public void testSubmittorNullString() { /** */ @Test public void testSubmittorRootParent() { - final Submittor submittor = new Submittor(root, "SUB1"); + final Submittor submittor = new Submittor(root, new ObjectId("SUB1")); assertEquals("Mismatched parent", root, submittor.getParent()); } @@ -135,7 +133,7 @@ public void testSubmittorRootNullString() { @Test public void testSubmittorNullEmptyParent() { Submittor submittor; - submittor = new Submittor(null, ""); + submittor = new Submittor(null, new ObjectId("")); assertNull("Expected null parent", submittor.getParent()); } @@ -143,7 +141,7 @@ public void testSubmittorNullEmptyParent() { @Test public void testSubmittorNullEmptyString() { Submittor submittor; - submittor = new Submittor(null, ""); + submittor = new Submittor(null, new ObjectId("")); assertEquals("Expected empty string", "", submittor.getString()); } @@ -151,7 +149,7 @@ public void testSubmittorNullEmptyString() { @Test public void testSubmittorRootEmptyParent() { Submittor submittor; - submittor = new Submittor(root, ""); + submittor = new Submittor(root, new ObjectId("")); assertEquals("Mismatched parent", root, submittor.getParent()); } @@ -159,7 +157,7 @@ public void testSubmittorRootEmptyParent() { @Test public void testSubmittorRootEmptyString() { Submittor submittor; - submittor = new Submittor(root, ""); + submittor = new Submittor(root, new ObjectId("")); assertEquals("Expected empty string", "", submittor.getString()); } @@ -167,7 +165,7 @@ public void testSubmittorRootEmptyString() { @Test public void testSubmittorNullStringParent() { Submittor submittor; - submittor = new Submittor(null, TEST_STRING); + submittor = new Submittor(null, new ObjectId(TEST_STRING)); assertNull("Expected null parent", submittor.getParent()); } @@ -175,7 +173,7 @@ public void testSubmittorNullStringParent() { @Test public void testSubmittorNullStringString() { Submittor submittor; - submittor = new Submittor(null, TEST_STRING); + submittor = new Submittor(null, new ObjectId(TEST_STRING)); assertEquals("Mismatched string", TEST_STRING, submittor.getString()); } @@ -183,7 +181,7 @@ public void testSubmittorNullStringString() { @Test public void testSubmittorRootStringParent() { Submittor submittor; - submittor = new Submittor(root, TEST_STRING); + submittor = new Submittor(root, new ObjectId(TEST_STRING)); assertEquals("Mismatched parent", root, submittor.getParent()); } @@ -191,281 +189,285 @@ public void testSubmittorRootStringParent() { @Test public void testSubmittorRootStringString() { Submittor submittor; - submittor = new Submittor(root, TEST_STRING); + submittor = new Submittor(root, new ObjectId(TEST_STRING)); assertEquals("Mismatched ID", TEST_STRING, submittor.getString()); } /** */ @Test public void testSubmittorNullNullNullParent() { - final Submittor submittor = new Submittor(null, null, null); + final Submittor submittor = new Submittor(null, null); assertNull("Expected null parent", submittor.getParent()); } /** */ @Test public void testSubmittorNullNullNullString() { - final Submittor submittor = new Submittor(null, null, null); - assertEquals("Expected empty string", - "", submittor.getString()); + final Submittor submittor = new Submittor(null, null); + assertEquals("Expected empty string", "", submittor.getString()); } /** */ @Test public void testSubmittorRootNullNullParent() { - final Submittor submittor = new Submittor(root, null, null); + final Submittor submittor = new Submittor(root, null); assertEquals("Mismatched parent", root, submittor.getParent()); } /** */ @Test public void testSubmittorRootNullNullString() { - final Submittor submittor = new Submittor(root, null, null); - assertEquals("Expected empty string", - "", submittor.getString()); + final Submittor submittor = new Submittor(root, null); + assertEquals("Expected empty string", "", submittor.getString()); } /** */ @Test public void testSubmittorNullEmptyNullParent() { - final Submittor submittor = new Submittor(null, "", null); + final Submittor submittor = new Submittor(null, new ObjectId("")); assertNull("Expected null parent", submittor.getParent()); } /** */ @Test public void testSubmittorNullEmptyNullString() { - final Submittor submittor = new Submittor(null, "", null); - assertEquals("Expected empty string", - "", submittor.getString()); + final Submittor submittor = new Submittor(null, new ObjectId("")); + assertEquals("Expected empty string", "", submittor.getString()); } /** */ @Test public void testSubmittorRootEmptyNullParent() { - final Submittor submittor = new Submittor(root, "", null); + final Submittor submittor = new Submittor(root, new ObjectId("")); assertEquals("Mismatched parent", root, submittor.getParent()); } /** */ @Test public void testSubmittorRootEmptyNullString() { - final Submittor submittor = new Submittor(root, "", null); - assertEquals("Expected empty string", - "", submittor.getString()); + final Submittor submittor = new Submittor(root, new ObjectId("")); + assertEquals("Expected empty string", "", submittor.getString()); } /** */ @Test public void testSubmittorNullStringNullParent() { - final Submittor submittor = new Submittor(null, TEST_STRING, null); + final Submittor submittor = new Submittor(null, + new ObjectId(TEST_STRING)); assertNull("Expected null parent", submittor.getParent()); } /** */ @Test public void testSubmittorNullStringNullString() { - final Submittor submittor = new Submittor(null, TEST_STRING, null); - assertEquals("Mismatched string", - TEST_STRING, submittor.getString()); + final Submittor submittor = new Submittor(null, + new ObjectId(TEST_STRING)); + assertEquals("Mismatched string", TEST_STRING, submittor.getString()); } /** */ @Test public void testSubmittorRootStringNullParent() { - final Submittor submittor = new Submittor(root, TEST_STRING, null); + final Submittor submittor = new Submittor(root, + new ObjectId(TEST_STRING)); assertEquals("Mismatched parent", root, submittor.getParent()); } /** */ @Test public void testSubmittorRootStringNullString() { - final Submittor submittor = new Submittor(root, TEST_STRING, null); - assertEquals("Mismatched string", - TEST_STRING, submittor.getString()); + final Submittor submittor = new Submittor(root, + new ObjectId(TEST_STRING)); + assertEquals("Mismatched string", TEST_STRING, submittor.getString()); } /** */ @Test public void testSubmittorNullNullEmptyParent() { - final Submittor submittor = new Submittor(null, null, ""); + final Submittor submittor = new Submittor(null, null); assertNull("Expected null parent", submittor.getParent()); } /** */ @Test public void testSubmittorNullNullEmptyString() { - final Submittor submittor = new Submittor(null, null, ""); - assertEquals("Expected empty string", - "", submittor.getString()); + final Submittor submittor = new Submittor(null, null); + assertEquals("Expected empty string", "", submittor.getString()); } /** */ @Test public void testSubmittorRootNullEmptyParent() { - final Submittor submittor = new Submittor(root, null, ""); + final Submittor submittor = new Submittor(root, null); assertEquals("Mismatched parent", root, submittor.getParent()); } /** */ @Test public void testSubmittorRootNullEmptyString() { - final Submittor submittor = new Submittor(root, null, ""); - assertEquals("Expected empty string", - "", submittor.getString()); + final Submittor submittor = new Submittor(root, null); + assertEquals("Expected empty string", "", submittor.getString()); } /** */ @Test public void testSubmittorNullEmptyEmptyParent() { - final Submittor submittor = new Submittor(null, "", ""); + final Submittor submittor = new Submittor(null, new ObjectId("")); assertNull("Expected null parent", submittor.getParent()); } /** */ @Test public void testSubmittorNullEmptyEmptyString() { - final Submittor submittor = new Submittor(null, "", ""); - assertEquals("Expected empty string", - "", submittor.getString()); + final Submittor submittor = new Submittor(null, new ObjectId("")); + assertEquals("Expected empty string", "", submittor.getString()); } /** */ @Test public void testSubmittorRootEmptyEmptyParent() { - final Submittor submittor = new Submittor(root, "", ""); + final Submittor submittor = new Submittor(root, new ObjectId("")); assertEquals("Mismatched parent", root, submittor.getParent()); } /** */ @Test public void testSubmittorRootEmptyEmptyString() { - final Submittor submittor = new Submittor(root, "", ""); - assertEquals("Expected empty string", - "", submittor.getString()); + final Submittor submittor = new Submittor(root, new ObjectId("")); + assertEquals("Expected empty string", "", submittor.getString()); } /** */ @Test public void testSubmittorNullStringEmptyParent() { - final Submittor submittor = new Submittor(null, TEST_STRING, ""); + final Submittor submittor = new Submittor(null, + new ObjectId(TEST_STRING)); assertNull("Expected null parent", submittor.getParent()); } /** */ @Test public void testSubmittorNullStringEmptyString() { - final Submittor submittor = new Submittor(null, TEST_STRING, ""); - assertEquals("Mismatched string", - TEST_STRING, submittor.getString()); + final Submittor submittor = new Submittor(null, + new ObjectId(TEST_STRING)); + assertEquals("Mismatched string", TEST_STRING, submittor.getString()); } /** */ @Test public void testSubmittorRootStringEmptyParent() { - final Submittor submittor = new Submittor(root, TEST_STRING, ""); + final Submittor submittor = new Submittor(root, + new ObjectId(TEST_STRING)); assertEquals("Mismatched parent", root, submittor.getParent()); } /** */ @Test public void testSubmittorRootStringEmptyString() { - final Submittor submittor = new Submittor(root, TEST_STRING, ""); - assertEquals("Mismatched string", - TEST_STRING, submittor.getString()); + final Submittor submittor = new Submittor(root, + new ObjectId(TEST_STRING)); + assertEquals("Mismatched string", TEST_STRING, submittor.getString()); } /** */ @Test public void testSubmittorNullNullStringParent() { - final Submittor submittor = new Submittor(null, null, TEST_STRUNG); + final Submittor submittor = new Submittor(null, null); + submittor.appendString(TEST_STRUNG); assertNull("Expected null parent", submittor.getParent()); } /** */ @Test public void testSubmittorNullNullStringString() { - final Submittor submittor = new Submittor(null, null, TEST_STRUNG); - assertEquals("Mismatched string", - TEST_STRUNG, submittor.getString()); + final Submittor submittor = new Submittor(null, null); + submittor.appendString(TEST_STRUNG); + assertEquals("Mismatched string", TEST_STRUNG, submittor.getString()); } /** */ @Test public void testSubmittorRootNullStringParent() { - final Submittor submittor = new Submittor(root, null, TEST_STRUNG); + final Submittor submittor = new Submittor(root, null); + submittor.appendString(TEST_STRUNG); assertEquals("Mismatched parent", root, submittor.getParent()); } /** */ @Test public void testSubmittorRootNullStringString() { - final Submittor submittor = new Submittor(root, null, TEST_STRUNG); - assertEquals("Mismatched string", - TEST_STRUNG, submittor.getString()); + final Submittor submittor = new Submittor(root, null); + submittor.appendString(TEST_STRUNG); + assertEquals("Mismatched string", TEST_STRUNG, submittor.getString()); } /** */ @Test public void testSubmittorNullEmptyStringParent() { - final Submittor submittor = new Submittor(null, "", TEST_STRUNG); + final Submittor submittor = new Submittor(null, new ObjectId("")); + submittor.appendString(TEST_STRUNG); assertNull("Expected null parent", submittor.getParent()); } /** */ @Test public void testSubmittorNullEmptyStringString() { - final Submittor submittor = new Submittor(null, "", TEST_STRUNG); - assertEquals("Mismatched string", - TEST_STRUNG, submittor.getString()); + final Submittor submittor = new Submittor(null, new ObjectId("")); + submittor.appendString(TEST_STRUNG); + assertEquals("Mismatched string", TEST_STRUNG, submittor.getString()); } /** */ @Test public void testSubmittorRootEmptyStringParent() { - final Submittor submittor = new Submittor(root, "", TEST_STRUNG); + final Submittor submittor = new Submittor(root, new ObjectId("")); + submittor.appendString(TEST_STRUNG); assertEquals("Mismatched parent", root, submittor.getParent()); } /** */ @Test public void testSubmittorRootEmptyStringString() { - final Submittor submittor = new Submittor(root, "", TEST_STRUNG); - assertEquals("Mismatched string", - TEST_STRUNG, submittor.getString()); + final Submittor submittor = new Submittor(root, new ObjectId("")); + submittor.appendString(TEST_STRUNG); + assertEquals("Mismatched string", TEST_STRUNG, submittor.getString()); } /** */ @Test public void testSubmittorNullStringStringParent() { - final Submittor submittor = - new Submittor(null, TEST_STRING, TEST_STRUNG); + final Submittor submittor = new Submittor(null, + new ObjectId(TEST_STRING)); + submittor.appendString(TEST_STRUNG); assertNull("Expected null parent", submittor.getParent()); } /** */ @Test public void testSubmittorNullStringStringString() { - final Submittor submittor = - new Submittor(null, TEST_STRING, TEST_STRUNG); - assertEquals("Mismatched string", - "string strung", submittor.getString()); + final Submittor submittor = new Submittor(null, + new ObjectId(TEST_STRING)); + submittor.appendString(" " + TEST_STRUNG); + assertEquals("Mismatched string", "string strung", + submittor.getString()); } /** */ @Test public void testSubmittorRootStringStringParent() { - final Submittor submittor = - new Submittor(root, TEST_STRING, TEST_STRUNG); + final Submittor submittor = new Submittor(root, + new ObjectId(TEST_STRING)); + submittor.appendString(" " + TEST_STRUNG); assertEquals("Mismatched parent", root, submittor.getParent()); } /** */ @Test public void testSubmittorRootStringStringString() { - final Submittor submittor = - new Submittor(root, TEST_STRING, TEST_STRUNG); - assertEquals("Mismatched string", - "string strung", submittor.getString()); + final Submittor submittor = new Submittor(root, + new ObjectId(TEST_STRING)); + submittor.appendString(" " + TEST_STRUNG); + assertEquals("Mismatched string", "string strung", + submittor.getString()); } } diff --git a/gedbrowser-mongo-dao/src/main/java/org/schoellerfamily/gedbrowser/persistence/mongo/domain/GedDocumentMongoFactory.java b/gedbrowser-mongo-dao/src/main/java/org/schoellerfamily/gedbrowser/persistence/mongo/domain/GedDocumentMongoFactory.java index b05e6026..40a6af17 100644 --- a/gedbrowser-mongo-dao/src/main/java/org/schoellerfamily/gedbrowser/persistence/mongo/domain/GedDocumentMongoFactory.java +++ b/gedbrowser-mongo-dao/src/main/java/org/schoellerfamily/gedbrowser/persistence/mongo/domain/GedDocumentMongoFactory.java @@ -186,9 +186,10 @@ public GedObject createGedObject(final GedObject parent, new ObjectId(document.getString())); retval = slink; } else if (document instanceof SubmittorDocumentMongo) { - retval = new Submittor(parent, document.getString()); + retval = new Submittor(parent, new ObjectId(document.getString())); } else if (document instanceof SubmittorLinkDocumentMongo) { - retval = new SubmittorLink(parent, document.getString()); + retval = new SubmittorLink(parent, "Submittor", + new ObjectId(document.getString())); } else if (document instanceof TrailerDocumentMongo) { retval = new Trailer(parent, document.getString()); } else if (document instanceof WifeDocumentMongo) { diff --git a/gedbrowser-mongo-dao/src/test/java/org/schoellerfamily/gedbrowser/persistence/mongo/repository/test/RepositoryFinderTest.java b/gedbrowser-mongo-dao/src/test/java/org/schoellerfamily/gedbrowser/persistence/mongo/repository/test/RepositoryFinderTest.java index e3e52ba7..23bf8458 100644 --- a/gedbrowser-mongo-dao/src/test/java/org/schoellerfamily/gedbrowser/persistence/mongo/repository/test/RepositoryFinderTest.java +++ b/gedbrowser-mongo-dao/src/test/java/org/schoellerfamily/gedbrowser/persistence/mongo/repository/test/RepositoryFinderTest.java @@ -42,9 +42,6 @@ public final class RepositoryFinderTest { /** */ private static final String HEADER_STRING = "Header"; - /** */ - private static final String SUBMITTOR_STRING = "Submittor"; - /** */ @Autowired private transient FinderStrategy finder; @@ -95,9 +92,9 @@ public void testUntypedSource() { @Test public void testUntypedSubmittor() { final Submittor submittor = - (Submittor) finder.find(root, SUBMITTOR_STRING); + (Submittor) finder.find(root, "SUB1"); assertEquals("Mismatched tag string", - SUBMITTOR_STRING, submittor.getString()); + "SUB1", submittor.getString()); } /** */ @@ -147,10 +144,9 @@ public void testTypedSource() { /** */ @Test public void testTypedSubmittor() { - final Submittor submittor = (Submittor) finder.find( - root, SUBMITTOR_STRING, Submittor.class); - assertEquals("Mismatched tag string", - SUBMITTOR_STRING, submittor.getString()); + final Submittor submittor = + (Submittor) finder.find(root, "SUB1", Submittor.class); + assertEquals("Mismatched tag string", "SUB1", submittor.getString()); } /** */ @@ -194,7 +190,7 @@ public void testTypedNotFoundSource() { /** */ @Test public void testTypedNotFoundSubmittor() { - final Submittor submittor = finder.find(root, "SUB1", Submittor.class); + final Submittor submittor = finder.find(root, "SUB2", Submittor.class); assertNull("Should not have found anything", submittor); } @@ -272,7 +268,7 @@ public void testInsertSource() { /** */ @Test public void testInsertSubmittor() { - final Submittor submittor = new Submittor(root, BOGUS_ID); + final Submittor submittor = new Submittor(root, new ObjectId(BOGUS_ID)); finder.insert(root, submittor); assertEquals("Submittor mismatch", submittor, finder.find(root, BOGUS_ID, Submittor.class)); diff --git a/gedbrowser-mongo-dao/src/test/java/org/schoellerfamily/gedbrowser/persistence/mongo/repository/test/SubmittorRepositoryTest.java b/gedbrowser-mongo-dao/src/test/java/org/schoellerfamily/gedbrowser/persistence/mongo/repository/test/SubmittorRepositoryTest.java index 1e26d299..8aeb56a8 100644 --- a/gedbrowser-mongo-dao/src/test/java/org/schoellerfamily/gedbrowser/persistence/mongo/repository/test/SubmittorRepositoryTest.java +++ b/gedbrowser-mongo-dao/src/test/java/org/schoellerfamily/gedbrowser/persistence/mongo/repository/test/SubmittorRepositoryTest.java @@ -26,9 +26,6 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { MongoTestConfiguration.class }) public final class SubmittorRepositoryTest { - /** */ - private static final String SUBMITTOR_STRING = "Submittor"; - /** */ @Autowired private transient SubmittorDocumentRepositoryMongo @@ -66,24 +63,24 @@ public void tearDown() { @Test public void testSubmittor() { final SubmittorDocument document = submittorDocumentRepository. - findByFileAndString(root.getFilename(), SUBMITTOR_STRING); + findByFileAndString(root.getFilename(), "SUB1"); final Submittor submittor = (Submittor) GedDocumentMongoFactory.getInstance(). createGedObject(root, document); assertEquals("Expected submittor string", - SUBMITTOR_STRING, submittor.getString()); + "SUB1", submittor.getString()); } /** */ @Test public void testSubmittorRoot() { final SubmittorDocument document = submittorDocumentRepository. - findByRootAndString(rootDocument, SUBMITTOR_STRING); + findByRootAndString(rootDocument, "SUB1"); final Submittor submittor = (Submittor) GedDocumentMongoFactory.getInstance(). createGedObject(root, document); assertEquals("Expected submittor string", - SUBMITTOR_STRING, submittor.getString()); + "SUB1", submittor.getString()); } /** */ diff --git a/gedbrowser-reader/src/main/java/org/schoellerfamily/gedbrowser/reader/AbstractGedObjectFactory.java b/gedbrowser-reader/src/main/java/org/schoellerfamily/gedbrowser/reader/AbstractGedObjectFactory.java index 8eb9ba7a..7d32b041 100644 --- a/gedbrowser-reader/src/main/java/org/schoellerfamily/gedbrowser/reader/AbstractGedObjectFactory.java +++ b/gedbrowser-reader/src/main/java/org/schoellerfamily/gedbrowser/reader/AbstractGedObjectFactory.java @@ -593,7 +593,7 @@ public final GedObject create(final GedObject parent, if (visitor.getRoot() == null) { return SUBMLINK_FACTORY.create(parent, xref, tag, tail); } else { - return new Submittor(parent, tag, tail); + return new Submittor(parent, xref); } } } diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/GedRendererFactoryTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/GedRendererFactoryTest.java index 4288b0b9..1671da57 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/GedRendererFactoryTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/GedRendererFactoryTest.java @@ -17,7 +17,6 @@ import org.schoellerfamily.gedbrowser.datamodel.Husband; import org.schoellerfamily.gedbrowser.datamodel.Link; import org.schoellerfamily.gedbrowser.datamodel.Name; -import org.schoellerfamily.gedbrowser.datamodel.ObjectId; import org.schoellerfamily.gedbrowser.datamodel.Person; import org.schoellerfamily.gedbrowser.datamodel.Place; import org.schoellerfamily.gedbrowser.datamodel.Root; @@ -194,8 +193,8 @@ public void testGetRootRenderer() { /** */ @Test public void testGetSourceRenderer() { - final GedRenderer gedRenderer = grf.create( - new Source(null, new ObjectId("S1")), provider, appInfo); + final GedRenderer gedRenderer = + grf.create(new Source(), provider, appInfo); assertTrue("Expected SourceRenderer", gedRenderer instanceof SourceRenderer); } @@ -213,7 +212,7 @@ public void testGetSourceLinkRenderer() { @Test public void testGetSubmittorRenderer() { final GedRenderer gedRenderer = - grf.create(new Submittor(null, "SUB1"), provider, appInfo); + grf.create(new Submittor(), provider, appInfo); assertTrue("Expected SubmittorRenderer", gedRenderer instanceof SubmittorRenderer); } diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkListItemRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkListItemRendererTest.java index c41cd952..f79c4394 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkListItemRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkListItemRendererTest.java @@ -39,12 +39,12 @@ public void init() { final Head head = new Head(root, "Head"); root.insert(head); - final Submittor submittor = new Submittor(root, "SUBM", "S1"); + final Submittor submittor = new Submittor(root, new ObjectId("S1")); final Name name = new Name(submittor, "Richard/Schoeller/"); root.insert(submittor); submittor.insert(name); - submittorLink = new SubmittorLink(head, "SUBL", new ObjectId("S1")); + submittorLink = new SubmittorLink(head, "SUBM", new ObjectId("S1")); provider = new CalendarProviderStub(); final ApplicationInfo appInfo = new ApplicationInfoStub(); anonymousContext = RenderingContext.anonymous(appInfo); diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkPhraseRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkPhraseRendererTest.java index a5a35c0b..099d72a0 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkPhraseRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorLinkPhraseRendererTest.java @@ -40,12 +40,12 @@ public void init() { final Head head = new Head(root, "Head"); root.insert(head); - final Submittor submittor = new Submittor(root, "SUBM", "S1"); + final Submittor submittor = new Submittor(root, new ObjectId("S1")); final Name name = new Name(submittor, "Richard/Schoeller/"); root.insert(submittor); submittor.insert(name); - submittorLink = new SubmittorLink(head, "SUBL", new ObjectId("S1")); + submittorLink = new SubmittorLink(head, "SUBM", new ObjectId("S1")); provider = new CalendarProviderStub(); final ApplicationInfo appInfo = new ApplicationInfoStub(); anonymousContext = RenderingContext.anonymous(appInfo); @@ -61,7 +61,7 @@ submittorLink, new GedRendererFactory(), anonymousContext, (SubmittorLinkPhraseRenderer) slr.getPhraseRenderer(); assertEquals("Rendered html doesn't match expectation", "S1", + + "href=\"source?db=null&id=S1\">Richard/Schoeller/", slpr.renderAsPhrase()); } } diff --git a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorRendererTest.java b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorRendererTest.java index 6265ecd2..993b63b3 100644 --- a/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorRendererTest.java +++ b/gedbrowser-renderer/src/test/java/org/schoellerfamily/gedbrowser/renderer/test/SubmittorRendererTest.java @@ -100,7 +100,7 @@ public void testPhraseRenderer() { */ private SubmittorRenderer createRenderer() { final SubmittorRenderer renderer = new SubmittorRenderer( - new Submittor(null, "SUB1"), new GedRendererFactory(), + new Submittor(), new GedRendererFactory(), anonymousContext, provider); return renderer; }