Code cleanup

Author: ctmay4

src/main/java/com/imsweb/seerapi/client/disease/DateRange.java

@@ -9,12 +9,6 @@ public class DateRange {
     @JsonProperty("end")
     protected String _endDate;
 
-    /**
-     * Default constructor
-     */
-    public DateRange() {
-    }
-
     public String getStartDate() {
         return _startDate;
     }

src/main/java/com/imsweb/seerapi/client/disease/DateRangeString.java

@@ -7,12 +7,6 @@ public class DateRangeString extends DateRange {
     @JsonProperty("value")
     protected String _value;
 
-    /**
-     * Default constructor
-     */
-    public DateRangeString() {
-    }
-
     public String getValue() {
         return _value;
     }

src/main/java/com/imsweb/seerapi/client/disease/DiseaseChangelogResults.java

@@ -13,12 +13,6 @@ public class DiseaseChangelogResults extends PublishableChangelogResults {
 
     protected List<DiseaseChangelog> _changelogs;
 
-    /**
-     * Default constructor
-     */
-    public DiseaseChangelogResults() {
-    }
-
     @JsonProperty("changelogs")
     public List<DiseaseChangelog> getChangelogs() {
         return _changelogs;

src/main/java/com/imsweb/seerapi/client/glossary/GlossaryChangelogResults.java

@@ -13,12 +13,6 @@ public class GlossaryChangelogResults extends PublishableChangelogResults {
 
     protected List<GlossaryChangelog> _changelogs;
 
-    /**
-     * Default constructor
-     */
-    public GlossaryChangelogResults() {
-    }
-
     @JsonProperty("changelogs")
     public List<GlossaryChangelog> getChangelogs() {
         return _changelogs;

src/main/java/com/imsweb/seerapi/client/mph/MphOutput.java

@@ -16,8 +16,6 @@ public class MphOutput {
     private String _groupId;
     @JsonProperty("step")
     private String _step;
-    public MphOutput() {
-    }
 
     public Result getResult() {
         return _result;

src/main/java/com/imsweb/seerapi/client/staging/SchemaLookup.java

@@ -122,7 +122,7 @@ public boolean hasDiscriminator() {
         for (Entry<String, String> entry : _inputs.entrySet()) {
             String key = entry.getKey();
 
-            if (StagingData.STANDARD_LOOKUP_KEYS.contains(key))
+            if (StagingData._STANDARD_LOOKUP_KEYS.contains(key))
                 continue;
 
             String value = entry.getValue();

src/main/java/com/imsweb/seerapi/client/staging/StagingData.java

@@ -24,7 +24,7 @@ public class StagingData {
     public static final String YEAR_DX_KEY = "year_dx";
 
     // set of keys that are standard for all schema lookups; any other keys are considered a discriminator
-    public static final Set<String> STANDARD_LOOKUP_KEYS = new HashSet<>(Arrays.asList(PRIMARY_SITE_KEY, HISTOLOGY_KEY));
+    protected static final Set<String> _STANDARD_LOOKUP_KEYS = new HashSet<>(Arrays.asList(PRIMARY_SITE_KEY, HISTOLOGY_KEY));
 
     private Result _result;
     private String _schemaId;

src/main/java/com/imsweb/seerapi/client/staging/cs/CsSchemaLookup.java

@@ -8,10 +8,11 @@
 import java.util.Set;
 
 import com.imsweb.seerapi.client.staging.SchemaLookup;
+import com.imsweb.seerapi.client.staging.StagingData;
 
 public class CsSchemaLookup extends SchemaLookup {
 
-    private static final Set<String> _ALLOWED_KEYS = new HashSet<>(Arrays.asList(CsStagingData.PRIMARY_SITE_KEY, CsStagingData.HISTOLOGY_KEY, CsStagingData.SSF25_KEY));
+    private static final Set<String> _ALLOWED_KEYS = new HashSet<>(Arrays.asList(StagingData.PRIMARY_SITE_KEY, StagingData.HISTOLOGY_KEY, CsStagingData.SSF25_KEY));
 
     /**
      * Default constructor

src/main/java/com/imsweb/seerapi/client/staging/eod/EodSchemaLookup.java

@@ -9,13 +9,14 @@
 import java.util.Set;
 
 import com.imsweb.seerapi.client.staging.SchemaLookup;
+import com.imsweb.seerapi.client.staging.StagingData;
 import com.imsweb.seerapi.client.staging.eod.EodStagingData.EodInput;
 
 public class EodSchemaLookup extends SchemaLookup {
 
     private static final Set<String> _ALLOWED_KEYS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
-            EodStagingData.PRIMARY_SITE_KEY,
-            EodStagingData.HISTOLOGY_KEY,
+            StagingData.PRIMARY_SITE_KEY,
+            StagingData.HISTOLOGY_KEY,
             EodInput.SEX.toString(),
             EodInput.DISCRIMINATOR_1.toString(),
             EodInput.DISCRIMINATOR_2.toString())));

src/test/java/com/imsweb/seerapi/client/glossary/GlossaryTest.java

@@ -159,11 +159,11 @@ public void testGlossaryMatch() throws IOException {
 
         Set<KeywordMatch> matches = _GLOSSARY.match(text, null, true).execute().body();
         Assert.assertNotNull(matches);
-        Assert.assertEquals(matches.size(), 1);
+        Assert.assertEquals(1, matches.size());
 
         matches = _GLOSSARY.match(text, EnumSet.of(GENERAL), true).execute().body();
         Assert.assertNotNull(matches);
-        Assert.assertEquals(matches.size(), 0);
+        Assert.assertEquals(0, matches.size());
     }
 
 }