Update handling of empty response from latest-package-revision and latest-package-revision-since. Empty map is an acceptable response from latest-package-revision-since. Adresses issue akin to 2641

alisonps · alisonps · commit e49cac1422ff · 2016-10-20T12:37:04.000-07:00
diff --git a/plugin-infra/go-plugin-access/src/com/thoughtworks/go/plugin/access/packagematerial/JsonMessageHandler1_0.java b/plugin-infra/go-plugin-access/src/com/thoughtworks/go/plugin/access/packagematerial/JsonMessageHandler1_0.java
@@ -159,7 +159,10 @@ public String requestMessageForLatestRevision(PackageConfiguration packageConfig
 
     @Override
     public PackageRevision responseMessageForLatestRevision(String responseBody) {
-        return toPackageRevision(responseBody);
+        PackageRevision packageRevision = toPackageRevision(responseBody);
+        if( packageRevision == null) {
+            throw new RuntimeException("Empty response body");
+        } else return packageRevision;
     }
 
     @Override
@@ -173,7 +176,6 @@ public String requestMessageForLatestRevisionSince(PackageConfiguration packageC
 
     @Override
     public PackageRevision responseMessageForLatestRevisionSince(String responseBody) {
-        if (isEmpty(responseBody)) return null;
         return toPackageRevision(responseBody);
     }
 
@@ -270,9 +272,10 @@ PackageRevision toPackageRevision(String responseBody) {
                 throw new RuntimeException("Package revision should be returned as a map");
             }
             if (map == null || map.isEmpty()) {
-                throw new RuntimeException("Empty response body");
+                return null;
             }
 
+
             String revision;
             try {
                 revision = (String) map.get("revision");
diff --git a/plugin-infra/go-plugin-access/test/com/thoughtworks/go/plugin/access/packagematerial/JsonMessageHandler1_0Test.java b/plugin-infra/go-plugin-access/test/com/thoughtworks/go/plugin/access/packagematerial/JsonMessageHandler1_0Test.java
@@ -182,6 +182,13 @@ public void shouldBuildPackageRevisionFromLatestRevisionResponse() throws Except
         assertPackageRevision(packageRevision, "abc.rpm", "some-user", "2011-07-14T19:43:37.100Z", "comment", "http:\\localhost:9999");
     }
 
+    @Test
+    public void shouldThrowExceptionWhenAttemptingToGetLatestRevisionFromEmptyResponse(){
+        assertThat(getErrorMessageFromLatestRevision(""), is("Empty response body"));
+        assertThat(getErrorMessageFromLatestRevision("{}"), is("Empty response body"));
+        assertThat(getErrorMessageFromLatestRevision(null), is("Empty response body"));
+    }
+
     @Test
     public void shouldBuildRequestBodyForLatestRevisionSinceRequest() throws Exception {
         Date timestamp = new SimpleDateFormat(DATE_FORMAT).parse("2011-07-13T19:43:37.100Z");
@@ -208,6 +215,7 @@ public void shouldBuildPackageRevisionFromLatestRevisionSinceResponse() throws E
     public void shouldBuildNullPackageRevisionFromLatestRevisionSinceWhenEmptyResponse() throws Exception {
         assertThat(messageHandler.responseMessageForLatestRevisionSince(""), nullValue());
         assertThat(messageHandler.responseMessageForLatestRevisionSince(null), nullValue());
+        assertThat(messageHandler.responseMessageForLatestRevisionSince("{}"), nullValue());
     }
 
     @Test
@@ -269,7 +277,6 @@ public void shouldValidateIncorrectJsonResponseForPackageConfiguration() {
 
     @Test
     public void shouldValidateIncorrectJsonForPackageRevision() {
-        assertThat(errorMessageForPackageRevision(""), is("Unable to de-serialize json response. Empty response body"));
         assertThat(errorMessageForPackageRevision("[{\"revision\":\"abc.rpm\"}]"), is("Unable to de-serialize json response. Package revision should be returned as a map"));
         assertThat(errorMessageForPackageRevision("{\"revision\":{}}"), is("Unable to de-serialize json response. Package revision should be of type string"));
         assertThat(errorMessageForPackageRevision("{\"revisionComment\":{}}"), is("Unable to de-serialize json response. Package revision comment should be of type string"));
@@ -343,4 +350,13 @@ private String errorMessageForPackageRevision(String message) {
         }
         return null;
     }
+
+    private String getErrorMessageFromLatestRevision(String responseBody) {
+        try{
+            messageHandler.responseMessageForLatestRevision(responseBody);
+            fail("Should throw exception");
+        } catch( RuntimeException e){
+            return e.getMessage();
+        } return null;
+    }
 }
