Merge pull request #456 from RachelTucker/python-80

PYTHONSDK-80: Fixed python response handlers with string response payloads

Author: rpmoore

ds3-autogen-python/src/main/java/com/spectralogic/ds3autogen/python/generators/response/BaseResponseGenerator.java

@@ -28,6 +28,7 @@
 
 import static com.spectralogic.ds3autogen.python.utils.GeneratorUtils.getParserModelName;
 import static com.spectralogic.ds3autogen.utils.ConverterUtil.isEmpty;
+import static com.spectralogic.ds3autogen.utils.NormalizingContractNamesUtil.removePath;
 import static com.spectralogic.ds3autogen.utils.NormalizingContractNamesUtil.toResponseName;
 import static com.spectralogic.ds3autogen.utils.ResponsePayloadUtil.*;
 
@@ -89,6 +90,10 @@ protected static ParsePayload getParsePayload(final Ds3Request ds3Request) {
         }
         final String responsePayload = getResponsePayload(ds3Request.getDs3ResponseCodes());
         final Integer responseCode = getPayloadResponseCode(ds3Request.getDs3ResponseCodes());
+
+        if (removePath(responsePayload).equalsIgnoreCase("String")) {
+            return new StringParsePayload(responseCode);
+        }
         return new BaseParsePayload(getParserModelName(responsePayload), responseCode);
     }
 

ds3-autogen-python/src/main/java/com/spectralogic/ds3autogen/python/model/response/StringParsePayload.java

@@ -0,0 +1,20 @@
+package com.spectralogic.ds3autogen.python.model.response;
+
+import static com.spectralogic.ds3autogen.python.helpers.PythonHelper.pythonIndent;
+
+public class StringParsePayload implements ParsePayload {
+    private final Integer code;
+
+    public StringParsePayload(final int code) {
+        this.code = code;
+    }
+
+    @Override
+    public String toPythonCode() {
+        final StringBuilder builder = new StringBuilder("if self.response.status == ");
+        builder.append(code).append(":\n")
+                .append(pythonIndent(3))
+                .append("self.result = response.read()");
+        return builder.toString();
+    }
+}

ds3-autogen-python/src/test/java/com.spectralogic.ds3autogen.python/generators/response/BaseResponseGenerator_Test.java

@@ -22,12 +22,11 @@
 import com.spectralogic.ds3autogen.api.models.apispec.Ds3Type;
 import com.spectralogic.ds3autogen.python.model.response.BaseParsePayload;
 import com.spectralogic.ds3autogen.python.model.response.NoPayload;
+import com.spectralogic.ds3autogen.python.model.response.StringParsePayload;
 import org.junit.Test;
 
 import static com.spectralogic.ds3autogen.python.generators.response.BaseResponseGenerator.*;
-import static com.spectralogic.ds3autogen.testutil.Ds3ModelFixtures.getBucketRequest;
-import static com.spectralogic.ds3autogen.testutil.Ds3ModelFixtures.getRequestAmazonS3GetObject;
-import static com.spectralogic.ds3autogen.testutil.Ds3ModelFixtures.getRequestGetJob;
+import static com.spectralogic.ds3autogen.testutil.Ds3ModelFixtures.*;
 import static com.spectralogic.ds3autogen.testutil.Ds3ModelPartialDataFixture.createDs3RequestTestData;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -86,6 +85,12 @@ public void getParsePayload_NoNameToMarshal_Test() {
         assertThat(getParsePayload(request), instanceOf(BaseParsePayload.class));
     }
 
+    @Test
+    public void getParsePayload_TypeString_Test() {
+        final Ds3Request request = getGetBlobPersistence();
+        assertThat(getParsePayload(request), instanceOf(StringParsePayload.class));
+    }
+
     @Test
     public void toParseResponsePayload_NoPayload_Test() {
         final Ds3Request request = createDs3RequestTestData("com.test.Request", Classification.amazons3);
@@ -110,6 +115,15 @@ public void toParseResponsePayload_WithNameToMarshal_Test() {
         assertThat(generator.toParseResponsePayload(request), is(expected));
     }
 
+    @Test
+    public void toParseResponsePayload_WithStringPayload_Test() {
+        final String expected = "if self.response.status == 200:\n" +
+                "            self.result = response.read()";
+
+        final Ds3Request request = getGetBlobPersistence();
+        assertThat(generator.toParseResponsePayload(request), is(expected));
+    }
+
     @Test
     public void getStatusCodes_NullList_Test() {
         final ImmutableList<Integer> result = generator.getStatusCodes(null, "com.test.Request");