updated output filenames

src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java

@@ -88,7 +88,10 @@ public class DefaultCodegen {
   }
 
   public String toModelImport(String name) {
-    return modelPackage() + "." + name;
+    if("".equals(modelPackage()))
+      return name;
+    else
+      return modelPackage() + "." + name;
   }
 
   public String toApiImport(String name) {
@@ -181,7 +184,7 @@ public class DefaultCodegen {
       return "new ArrayList<" + inner + ">() ";
     }
     else {
-      System.out.println("unhandled property default value");
+      // System.out.println("unhandled property default value");
       // Json.prettyPrint(p);
       return "null";
     }
@@ -402,14 +405,14 @@ public class DefaultCodegen {
         op.returnBaseType = innerProperty.datatype;
       }
       else {
-        if(responseModel.complexType != null)
+        if(responseModel.complexType != null) {
           op.returnBaseType = responseModel.complexType;
+          imports.add(responseModel.complexType);
+        }
         else
           op.returnBaseType = responseModel.datatype;
       }
 
-      imports.add(op.returnBaseType);
-
       op.returnType = responseModel.datatype;
       if(responseModel.isContainer != null)
         op.returnContainer = responseModel.complexType;

src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java

@@ -187,7 +187,6 @@ public class DefaultGenerator implements Generator {
       if(m == null)
         m = config.toModelImport(i);
 
-      System.out.println("adding import " + i + ", " + m);
       if(m != null) {
         im.put("import", m);
         imports.add(im);
@@ -196,9 +195,6 @@ public class DefaultGenerator implements Generator {
 
     operations.put("imports", imports);
 
-    Json.prettyPrint(allImports);
-    Json.prettyPrint(imports);
-
     return operations;
   }
 

src/main/java/com/wordnik/swagger/codegen/languages/ObjcClientCodegen.java

@@ -18,7 +18,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
     apiTemplateFiles.put("api-header.mustache", ".h");
     apiTemplateFiles.put("api-body.mustache", ".m");
     templateDir = "objc";
-    modelPackage = "com.wordnik.model";
+    modelPackage = "";
 
     defaultIncludes = new HashSet<String>(
       Arrays.asList("bool",
@@ -109,14 +109,32 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
     }
   }
 
+  @Override
+  public String toModelImport(String name) {
+    name = name + ".h";
+    if("".equals(modelPackage()))
+      return name;
+    else
+      return modelPackage() + "." + name;
+  }
+
+  @Override
+  public String apiFileFolder() {
+    return outputFolder + File.separator + "client";
+  }
+
   @Override
   public String modelFileFolder() {
-    return outputFolder + File.separator + "models";
+    return outputFolder + File.separator + "client";
   }
 
   @Override
   public String toModelFilename(String name) {
-    return "SWG" + name;
+    return "SWG" + initialCaps(name);
+  }
+
+  public String toApiFilename(String name) {
+    return "SWG" + initialCaps(name);
   }
 
   @Override