a little more clean up

dickschoeller · Mar 29, 2018 · 891d56a · 891d56a
1 parent bebe10c
commit 891d56a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/...rc/test/java/org/schoellerfamily/gedbrowser/api/controller/test/FamilyControllerTest.java b/...rc/test/java/org/schoellerfamily/gedbrowser/api/controller/test/FamilyControllerTest.java
@@ -13,7 +13,6 @@
 import org.schoellerfamily.gedbrowser.api.Application;
 import org.schoellerfamily.gedbrowser.api.datamodel.ApiAttribute;
 import org.schoellerfamily.gedbrowser.api.datamodel.ApiFamily;
-import org.schoellerfamily.gedbrowser.api.datamodel.ApiLifespan;
 import org.schoellerfamily.gedbrowser.api.datamodel.ApiPerson;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.embedded.LocalServerPort;
@@ -437,7 +436,7 @@ private ApiPerson createAlexander() {
                 .add(new ApiAttribute("attribute", "Sex", "M"))
                 .surname("Romanov")
                 .indexName("Romanov, Alexander")
-                .lifespan(new ApiLifespan());
+                .build();
         return new ApiPerson(builder);
     }
 
@@ -451,7 +450,7 @@ private ApiPerson createAlexandra() {
                 .add(new ApiAttribute("attribute", "Sex", "F"))
                 .surname("Romanov")
                 .indexName("Romanov, Alexandra")
-                .lifespan(new ApiLifespan());
+                .build();
         return new ApiPerson(builder);
     }
 

diff --git a/...rc/test/java/org/schoellerfamily/gedbrowser/api/controller/test/PersonControllerTest.java b/...rc/test/java/org/schoellerfamily/gedbrowser/api/controller/test/PersonControllerTest.java
@@ -10,7 +10,6 @@
 import org.junit.runner.RunWith;
 import org.schoellerfamily.gedbrowser.api.Application;
 import org.schoellerfamily.gedbrowser.api.datamodel.ApiAttribute;
-import org.schoellerfamily.gedbrowser.api.datamodel.ApiLifespan;
 import org.schoellerfamily.gedbrowser.api.datamodel.ApiPerson;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.embedded.LocalServerPort;
@@ -179,7 +178,7 @@ private ApiPerson createRJS() {
                 .add(new ApiAttribute("attribute", "Sex", "M"))
                 .surname("Schoeller")
                 .indexName("Schoeller, Richard")
-                .lifespan(new ApiLifespan());
+                .build();
         return new ApiPerson(builder);
     }
 
@@ -193,7 +192,7 @@ private ApiPerson createAlexander() {
                 .add(new ApiAttribute("attribute", "Sex", "M"))
                 .surname("Romanov")
                 .indexName("Romanov, Alexander")
-                .lifespan(new ApiLifespan());
+                .build();
         return new ApiPerson(builder);
     }
 
@@ -207,7 +206,7 @@ private ApiPerson createAlexandra() {
                 .add(new ApiAttribute("attribute", "Sex", "F"))
                 .surname("Romanov")
                 .indexName("Romanov, Alexandra")
-                .lifespan(new ApiLifespan());
+                .build();
         return new ApiPerson(builder);
     }
 

diff --git a/...er-api/src/test/java/org/schoellerfamily/gedbrowser/api/datamodel/test/ApiPersonTest.java b/...er-api/src/test/java/org/schoellerfamily/gedbrowser/api/datamodel/test/ApiPersonTest.java
@@ -81,9 +81,7 @@ public void testConstructorWithAttributes() {
         final ApiPerson.Builder builder = new ApiPerson.Builder()
                 .id("string")
                 .add(new ApiAttribute("a string", "attribute", ""))
-                .indexName("indexName")
-                .surname("surname")
-                .lifespan(new ApiLifespan());
+                .build();
         final ApiPerson o = new ApiPerson(builder);
         assertEquals("attributes mismatch", 1, o.getAttributes().size());
     }
@@ -94,9 +92,7 @@ public void testIsType() {
         final ApiPerson.Builder builder = new ApiPerson.Builder()
                 .id("string")
                 .add(new ApiAttribute("a string", "attribute", ""))
-                .indexName("indexName")
-                .surname("surname")
-                .lifespan(new ApiLifespan());
+                .build();
         final ApiPerson o = new ApiPerson(builder);
         assertTrue("type mismatch", o.isType("person"));
     }

diff --git a/gedbrowser-client/tslint.json b/gedbrowser-client/tslint.json
@@ -104,7 +104,6 @@
         "variable-declaration": "nospace"
       }
     ],
-    "typeof-compare": true,
     "unified-signatures": true,
     "variable-name": false,
     "whitespace": [