Merge pull request #455 from RachelTucker/pythonsdk-82

PYTHONSDK-82: updating python generation of client to type check request handlers

Author: rpmoore

ds3-autogen-python/src/main/java/com/spectralogic/ds3autogen/python/generators/client/BaseClientGenerator.java

@@ -30,10 +30,11 @@ public class BaseClientGenerator implements ClientModelGenerator<BaseClient> {
     @Override
     public BaseClient generate(final Ds3Request ds3Request, final Ds3DocSpec docSpec) {
         final String commandName = toPythonCommandName(ds3Request.getName());
+        final String requestType = removePath(ds3Request.getName());
         final String responseName = toResponseName(ds3Request.getName());
         final String documentation = toDocumentation(ds3Request.getName(), docSpec);
 
-        return new BaseClient(commandName, responseName, documentation);
+        return new BaseClient(commandName, requestType, responseName, documentation);
     }
 
     /**

ds3-autogen-python/src/main/java/com/spectralogic/ds3autogen/python/model/client/BaseClient.java

@@ -18,11 +18,13 @@
 public class BaseClient {
 
     private final String commandName;
+    private final String requestType;
     private final String responseName;
     private final String documentation;
 
-    public BaseClient(final String commandName, final String responseName, final String documentation) {
+    public BaseClient(final String commandName, final String requestType, final String responseName, final String documentation) {
         this.commandName = commandName;
+        this.requestType = requestType;
         this.responseName = responseName;
         this.documentation = documentation;
     }
@@ -31,6 +33,10 @@ public String getCommandName() {
         return commandName;
     }
 
+    public String getRequestType() {
+        return requestType;
+    }
+
     public String getResponseName() {
         return responseName;
     }

ds3-autogen-python/src/main/resources/tmpls/python/commands/client/client_class.ftl

@@ -10,5 +10,7 @@ class Client(object):
 <#list clientCommands as cmd>
     ${cmd.documentation}
     def ${cmd.commandName}(self, request):
+        if not isinstance(request, ${cmd.requestType}):
+            raise TypeError('request for ${cmd.commandName} should be of type ${cmd.requestType} but was ' + request.__class__.__name__)
         return ${cmd.responseName}(self.net_client.get_response(request), request)
 </#list>

ds3-autogen-python/src/test/java/com.spectralogic.ds3autogen.python/utils/FunctionalTestHelper.java

@@ -210,10 +210,12 @@ public static void hasClient(final ImmutableList<String> requestNames, final Str
      * Determines if the code contains the client command for the specified request
      */
     public static boolean hasClientCommand(final String requestName, final String code) {
+        final String commandName = camelToUnderscore(toCommandName(requestName));
         final Pattern search = Pattern.compile(
-                "def " + camelToUnderscore(toCommandName(requestName)) + "\\(self, request\\):"
-                + "\\s+return " + toResponseName(requestName)
-                + "\\(self\\.net_client.get_response\\(request\\), request\\)",
+                "def " + commandName + "\\(self, request\\):"
+                + "\\s+if not isinstance\\(request, " + requestName + "\\):"
+                + "\\s+raise TypeError\\('request for " + commandName + " should be of type " + requestName + " but was ' \\+ request\\.__class__\\.__name__\\)"
+                + "\\s+return " + toResponseName(requestName) + "\\(self\\.net_client.get_response\\(request\\), request\\)",
                 Pattern.MULTILINE | Pattern.UNIX_LINES);
         return search.matcher(code).find();
     }