merge #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

chameleon82 merged 36 commits into chameleon82:master from swagger-api:master

Feb 9, 2016

bin/javascript-closure-angular.sh

-Original file line number
+Diff line change
@@ -0,0 +1,31 @@
+    #!/bin/sh
+    SCRIPT="$0"
+    while [ -h "$SCRIPT" ] ; do
+      ls=`ls -ld "$SCRIPT"`
+      link=`expr "$ls" : '.*-> \(.*\)$'`
+      if expr "$link" : '/.*' > /dev/null; then
+        SCRIPT="$link"
+      else
+        SCRIPT=`dirname "$SCRIPT"`/"$link"
+      fi
+    done
+    if [ ! -d "${APP_DIR}" ]; then
+      APP_DIR=`dirname "$SCRIPT"`/..
+      APP_DIR=`cd "${APP_DIR}"; pwd`
+    fi
+    executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+    if [ ! -f "$executable" ]
+    then
+      mvn clean package
+    fi
+    # if you've executed sbt assembly previously it will use that instead.
+    export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+    ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l javascript-closure-angular -o samples/client/petstore/javascript-closure-angular"
+    java $JAVA_OPTS -jar $executable $ags

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

-Original file line number
+Diff line change
@@ Expand Up @@
                     } else if (param instanceof FormParameter) {
                         if ("file".equalsIgnoreCase(((FormParameter) param).getType())) {
                             p.isFile = true;
+                        } else if("file".equals(p.baseType)){
+                        	p.isFile = true;
                         } else {
                             p.notFile = true;
                         }
@@ Expand Down @@

modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java

-Original file line number
+Diff line change
@@ Expand Up @@
             Map<String, Model> modelsToAdd = new HashMap<String, Model>();
             for (String key : properties.keySet()) {
                 Property property = properties.get(key);
-                if (property instanceof ObjectProperty && ((ObjectProperty)property).getProperties().size() > 0) {
+                if(property instanceof ObjectProperty && ((ObjectProperty)property).getProperties() == null) {
+                    MapProperty mp = new MapProperty();
+                    mp.setAdditionalProperties(new StringProperty());
+                    properties.put(key, mp);
+                }
+                else if (property instanceof ObjectProperty && ((ObjectProperty)property).getProperties().size() > 0) {
                     String modelName = uniqueName(path + "_" + key);
                     ObjectProperty op = (ObjectProperty) property;
@@ Expand Down Expand Up @@
                             swagger.addDefinition(modelName, innerModel);
                         }
                     }
-                } else {
                 }
             }
             if (propsToUpdate.size() > 0) {
@@ Expand Down @@

...s/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,35 +1,19 @@
  
    package io.swagger.codegen.languages;

    import com.google.common.base.Strings;

    import io.swagger.codegen.CliOption;

    import io.swagger.codegen.CodegenConfig;

    import io.swagger.codegen.CodegenConstants;

    import io.swagger.codegen.CodegenModel;

    import io.swagger.codegen.CodegenOperation;

    import io.swagger.codegen.CodegenProperty;

    import io.swagger.codegen.CodegenType;

    import io.swagger.codegen.DefaultCodegen;

    import io.swagger.codegen.SupportingFile;

    import io.swagger.codegen.*;

    import io.swagger.models.*;

    import io.swagger.models.properties.ArrayProperty;

    import io.swagger.models.properties.MapProperty;

    import io.swagger.models.properties.Property;

    import io.swagger.models.properties.RefProperty;

    import java.io.File;

    import java.util.ArrayList;

    import java.util.Arrays;

    import java.util.HashMap;

    import java.util.HashSet;

    import java.util.Iterator;

    import java.util.List;

    import java.util.Map;

    import org.apache.commons.lang.StringUtils;

    import org.slf4j.Logger;

    import org.slf4j.LoggerFactory;

    import java.io.File;

    import java.util.*;

    public class JavascriptClientCodegen extends DefaultCodegen implements CodegenConfig {

        @SuppressWarnings("hiding")

        private static final Logger LOGGER = LoggerFactory.getLogger(JavascriptClientCodegen.class);

    @@ -133,6 +117,7 @@ public void processOpts() {
  
            typeMapping.put("double", "Number");

            typeMapping.put("number", "Number");

            typeMapping.put("DateTime", "Date");

            typeMapping.put("Date", "Date");

            // binary not supported in JavaScript client right now, using String as a workaround

            typeMapping.put("binary", "String");

    @@ -358,7 +343,7 @@ public String toOperationId(String operationId) {
  
            // method name cannot use reserved keyword, e.g. return

            if (reservedWords.contains(operationId)) {

                throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");

                operationId = escapeReservedWord(operationId);

            }

            return camelize(sanitizeName(operationId), true);

...gen/src/main/java/io/swagger/codegen/languages/JavascriptClosureAngularClientCodegen.java

-Original file line number
+Diff line change
@@ -0,0 +1,216 @@
+    package io.swagger.codegen.languages;
+    import io.swagger.codegen.CodegenModel;
+    import io.swagger.codegen.*;
+    import io.swagger.models.properties.*;
+    import java.util.TreeSet;
+    import java.util.*;
+    import java.io.File;
+    public class JavascriptClosureAngularClientCodegen extends DefaultCodegen implements CodegenConfig {
+        public JavascriptClosureAngularClientCodegen() {
+            super();
+            supportsInheritance = false;
+            reservedWords = new HashSet<String>(Arrays.asList("abstract",
+                "continue", "for", "new", "switch", "assert", "default", "if",
+                "package", "synchronized", "do", "goto", "private",
+                "this", "break", "double", "implements", "protected", "throw",
+                "byte", "else", "import", "public", "throws", "case", "enum",
+                "instanceof", "return", "transient", "catch", "extends", "int",
+                "short", "try", "char", "final", "interface", "static", "void",
+                "class", "finally", "const", "super", "while"));
+            languageSpecificPrimitives = new HashSet<String>(Arrays.asList(
+                "string",
+                "boolean",
+                "number",
+                "Object",
+                "Blob",
+                "Date"));
+            instantiationTypes.put("array", "Array");
+            typeMapping = new HashMap<String, String>();
+            typeMapping.put("Array", "Array");
+            typeMapping.put("array", "Array");
+            typeMapping.put("List", "Array");
+            typeMapping.put("boolean", "boolean");
+            typeMapping.put("string", "string");
+            typeMapping.put("int", "number");
+            typeMapping.put("float", "number");
+            typeMapping.put("number", "number");
+            typeMapping.put("long", "number");
+            typeMapping.put("short", "number");
+            typeMapping.put("char", "string");
+            typeMapping.put("double", "number");
+            typeMapping.put("object", "Object");
+            typeMapping.put("Object", "Object");
+            typeMapping.put("File", "Blob");
+            typeMapping.put("file", "Blob");
+            typeMapping.put("integer", "number");
+            typeMapping.put("Map", "Object");
+            typeMapping.put("map", "Object");
+            typeMapping.put("DateTime", "Date");
+            importMapping = new HashMap<String, String>();
+            defaultIncludes = new HashSet<String>(Arrays.asList(
+                "Object",
+                "Array",
+                "Blob"
+            ));
+            typeMapping.put("binary", "string");
+            outputFolder = "generated-code/javascript-closure-angular";
+            modelTemplateFiles.put("model.mustache", ".js");
+            apiTemplateFiles.put("api.mustache", ".js");
+            embeddedTemplateDir = templateDir = "Javascript-Closure-Angular";
+            apiPackage = "API.Client";
+            modelPackage = "API.Client";
+        }
+        @Override
+        public String getName() {
+            return "javascript-closure-angular";
+        }
+        @Override
+        public String getHelp() {
+            return "Generates a Javascript AngularJS client library annotated with Google Closure Compiler annotations" +
+                "(https://developers.google.com/closure/compiler/docs/js-for-compiler?hl=en)";
+        }
+        @Override
+        public CodegenType getTag() {
+            return CodegenType.CLIENT;
+        }
+        @Override
+        public String escapeReservedWord(String name) {
+            return "_" + name;
+        }
+        @Override
+        public String apiFileFolder() {
+            return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
+        }
+        public String modelFileFolder() {
+            return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
+        }
+        @Override
+        public String toVarName(String name) {
+            // replace - with _ e.g. created-at => created_at
+            name = name.replaceAll("-", "_");
+            // if it's all uppper case, do nothing
+            if (name.matches("^[A-Z_]*$"))
+                return name;
+            // camelize the variable name
+            // pet_id => PetId
+            name = camelize(name, true);
+            // for reserved word or word starting with number, append _
+            if (reservedWords.contains(name) || name.matches("^\\d.*"))
+                name = escapeReservedWord(name);
+            return name;
+        }
+        @Override
+        public String toParamName(String name) {
+            // should be the same as variable name
+            return toVarName(name);
+        }
+        @Override
+        public String toModelName(String name) {
+            // model name cannot use reserved keyword, e.g. return
+            if (reservedWords.contains(name))
+                throw new RuntimeException(name
+                        + " (reserved word) cannot be used as a model name");
+            // camelize the model name
+            // phone_number => PhoneNumber
+            return camelize(name);
+        }
+        @Override
+        public String toModelFilename(String name) {
+            // should be the same as the model name
+            return toModelName(name);
+        }
+        @Override
+        public String getTypeDeclaration(Property p) {
+            if (p instanceof ArrayProperty) {
+                ArrayProperty ap = (ArrayProperty) p;
+                Property inner = ap.getItems();
+                return getSwaggerType(p) + "<!" + getTypeDeclaration(inner) + ">";
+            } else if (p instanceof MapProperty) {
+                MapProperty mp = (MapProperty) p;
+                Property inner = mp.getAdditionalProperties();
+                return "Object<!string, "+ getTypeDeclaration(inner) + ">";
+            } else if (p instanceof FileProperty) {
+                return "Object";
+            }
+            String type = super.getTypeDeclaration(p);
+            if (type.equals("boolean") ||
+                    type.equals("Date") ||
+                    type.equals("number") ||
+                    type.equals("string")) {
+                return type;
+                    }
+            return apiPackage + "." + type;
+        }
+        @Override
+        public String getSwaggerType(Property p) {
+            String swaggerType = super.getSwaggerType(p);
+            String type = null;
+            if (typeMapping.containsKey(swaggerType)) {
+                type = typeMapping.get(swaggerType);
+                if (languageSpecificPrimitives.contains(type)) {
+                    return type;
+                }
+            } else
+                type = swaggerType;
+            return type;
+        }
+        @Override
+        public Map<String, Object> postProcessModels(Map<String, Object> objs) {
+            List<Object> models = (List<Object>) objs.get("models");
+            for (Object _mo : models) {
+                Map<String, Object> mo = (Map<String, Object>) _mo;
+                CodegenModel cm = (CodegenModel) mo.get("model");
+                cm.imports = new TreeSet(cm.imports);
+                for (CodegenProperty var : cm.vars) {
+                    // handle default value for enum, e.g. available => StatusEnum.available
+                    if (var.isEnum && var.defaultValue != null && !"null".equals(var.defaultValue)) {
+                        var.defaultValue = var.datatypeWithEnum + "." + var.defaultValue;
+                    }
+                }
+            }
+            return objs;
+        }
+        @Override
+        public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+            if (objs.get("imports") instanceof List) {
+                List<Map<String, String>> imports = (ArrayList<Map<String, String>>)objs.get("imports");
+                Collections.sort(imports, new Comparator<Map<String, String>>() {
+                    public int compare(Map<String, String> o1, Map<String, String> o2) {
+                        return o1.get("import").compareTo(o2.get("import"));
+                    }
+                });
+                objs.put("imports", imports);
+            }
+            return objs;
+        }
+    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge #1

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!