Fixed error response and cleaned up failing tests

Author: ctmay4

build.gradle

@@ -65,7 +65,7 @@ findbugs {
 
 // Gradle wrapper, this allows to build the project without having to install Gradle!
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.0'
+    gradleVersion = '4.1'
 }
 
 modifyPom {

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Fri Jun 16 16:42:51 EDT 2017
+#Fri Aug 18 11:34:44 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -4,30 +4,54 @@
 
 public class ErrorResponse {
 
-    @JsonProperty("code")
-    protected Integer _id;
+    @JsonProperty("timestamp")
+    private String _timestamp;
+    @JsonProperty("status")
+    private Integer _status;
+    @JsonProperty("error")
+    private String _error;
     @JsonProperty("message")
-    protected String _message;
+    private String _message;
+    @JsonProperty("path")
+    private String _path;
 
-    /**
-     * Default constructor
-     */
-    public ErrorResponse() {
+    public String getTimestamp() {
+        return _timestamp;
     }
 
-    /**
-     * Return the error identifier
-     * @return an error identifier
-     */
-    public Integer getId() {
-        return _id;
+    public void setTimestamp(String timestamp) {
+        _timestamp = timestamp;
+    }
+
+    public Integer getStatus() {
+        return _status;
+    }
+
+    public void setStatus(Integer status) {
+        _status = status;
+    }
+
+    public String getError() {
+        return _error;
+    }
+
+    public void setError(String error) {
+        _error = error;
     }
 
-    /**
-     * Return the error message
-     * @return an error message
-     */
     public String getMessage() {
         return _message;
     }
+
+    public void setMessage(String message) {
+        _message = message;
+    }
+
+    public String getPath() {
+        return _path;
+    }
+
+    public void setPath(String path) {
+        _path = path;
+    }
 }

src/main/java/com/imsweb/seerapi/client/ErrorResponse.java

@@ -26,7 +26,7 @@ public void testMissingAllInput() throws IOException {
         _MPH.mph(new MphInputPair()).execute();
     }
 
-    @Test
+    @Test(expected = BadRequestException.class)
     public void testMissingSite() throws IOException {
         MphInput input1 = new MphInput();
         // site is missing
@@ -43,10 +43,6 @@ public void testMissingSite() throws IOException {
         input2.setLaterality("1");
 
         MphOutput result = _MPH.mph(new MphInputPair(input1, input2)).execute().body();
-        assertEquals(MphOutput.Result.QUESTIONABLE, result.getResult());
-        assertEquals(
-                "Unable to identify cancer group for first set of parameters. Valid primary site (C000-C999 excluding C809), histology (8000-9999), behavior (0-3, 6) and diagnosis year are required.",
-                result.getReason());
     }
 
     @Test

src/test/java/com/imsweb/seerapi/client/mph/MphTest.java

@@ -56,11 +56,9 @@ public void testNdcByCode() throws IOException {
 
         assertEquals(Arrays.asList("Norepinephrine Reuptake Inhibitor [EPC]", "Norepinephrine Uptake Inhibitors [MoA]"), product.getPharmClass());
 
-        assertEquals(2, product.getPackages().size());
-        assertEquals("07", product.getPackages().get(0).getCode());
-        assertEquals("7 CAPSULE in 1 BOTTLE (0002-3227-07)", product.getPackages().get(0).getDescription());
-        assertEquals("30", product.getPackages().get(1).getCode());
-        assertEquals("30 CAPSULE in 1 BOTTLE (0002-3227-30)", product.getPackages().get(1).getDescription());
+        assertEquals(1, product.getPackages().size());
+        assertEquals("30", product.getPackages().get(0).getCode());
+        assertEquals("30 CAPSULE in 1 BOTTLE (0002-3227-30)", product.getPackages().get(0).getDescription());
 
         assertNotNull(product.getDateAdded());
         assertNotNull(product.getDateModified());
@@ -78,8 +76,6 @@ public void testNdcSearch() throws IOException {
         Integer totalIncludingRemoved = Integer.valueOf(response.headers().get("X-Total-Count"));
         assertTrue(totalIncludingRemoved > 100000);
 
-        assertEquals(3, response.headers().values("Link").size());
-
         List<NdcProduct> products = response.body();
         assertEquals(25, products.size());
 

src/test/java/com/imsweb/seerapi/client/ndc/NdcTest.java

@@ -28,7 +28,7 @@ public static void setup() {
     }
 
     @Test(expected = BadRequestException.class)
-    public void testBadRequestExceptiion() throws IOException {
+    public void testBadRequestException() throws IOException {
         _SITE_RECODE.siteGroup("C379", null).execute();
     }
 
@@ -45,9 +45,7 @@ public void testExceptionMessages() throws IOException {
 
         // the API call works out to:
         //     https://api.seer.cancer.gov/rest/recode/sitegroup?site=C379
-        // and the full message returned should be
-        //     {"code":400,"message":"Site and histology must be supplied"}
-        assertEquals("Site and histology must be supplied", message);
+        assertEquals("Required String parameter 'hist' is not present", message);
     }
 
     @Test