Merge pull request #10298 from swagger-api/new_samples

New samples

bin/go-petstore-mixed.sh

@@ -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 -Dlogback.configurationFile=bin/logback.xml"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore-mixed.yaml -l go -o samples/client/petstore/go/go-petstore-mixed/swagger --flatten-inline-schema"
+
+java $JAVA_OPTS -jar $executable $ags

bin/nodejs-petstore-mixed-server-v3.sh

@@ -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 -Dlogback.configurationFile=bin/logback.xml"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore-mixed.yaml -l nodejs-server -o samples/server/petstore/nodejs-petstore-mixed -Dservice"
+
+java $JAVA_OPTS -jar $executable $ags

bin/typescript-fetch-petstore-mixed-with-npm-version.sh

@@ -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 -Dlogback.configurationFile=bin/logback.xml"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore-mixed.yaml -l typescript-fetch -c bin/typescript-fetch-petstore-with-npm-version.json -o samples/client/petstore/typescript-fetch/builds/mixed-with-npm-version"
+
+java $JAVA_OPTS -jar $executable $ags

bin/typescript-fetch-petstore-with-npm-version.sh

@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l typescript-fetch -c bin/typescript-fetch-petstore-with-npm-version.json -o samples/client/petstore/typescript-fetch/builds/with-npm-version"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore.yaml -l typescript-fetch -c bin/typescript-fetch-petstore-with-npm-version.json -o samples/client/petstore/typescript-fetch/builds/with-npm-version"
 
-# java $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/v3/cli/cmd/Generate.java

@@ -77,6 +77,7 @@ public class Generate implements Runnable {
     protected Boolean disableExamples;
     protected Boolean resolveFully;
     protected Boolean ignoreImportMappings;
+    protected Boolean flattenInlineSchema;
     private String url;
     private List<CodegenArgument> codegenArguments;
 
@@ -224,6 +225,10 @@ public void setResolveFully(Boolean resolveFully) {
         this.resolveFully = resolveFully;
     }
 
+    public void setFlattenInlineSchema(Boolean flattenInlineSchema) {
+        this.flattenInlineSchema = flattenInlineSchema;
+    }
+
     public void setIgnoreImportMappings(Boolean ignoreImportMappings) {
         this.ignoreImportMappings = ignoreImportMappings;
     }
@@ -331,6 +336,10 @@ public void run() {
             configurator.setIgnoreFileOverride(ignoreFileOverride);
         }
 
+        if (flattenInlineSchema != null) {
+            configurator.setFlattenInlineSchema(flattenInlineSchema);
+        }
+
         if (removeOperationIdPrefix != null) {
             configurator.setRemoveOperationIdPrefix(removeOperationIdPrefix);
         }

modules/swagger-codegen-cli/src/main/resources/oas3.yaml

@@ -210,7 +210,12 @@ components:
           type: "boolean"
           title: "fully resolve schemas"
           description: "fully resolves json schemas when loading definitions."
-          x-option: "--resolve-fully"          
+          x-option: "--resolve-fully"
+        flattenInlineSchema:
+          type: "boolean"
+          title: "flatten inline schemas"
+          description: "flattens inline composed schemas."
+          x-option: "--flatten-inline-schema"
     ConfigHelp:
       x-command: "config-help"
       x-command-description: "Config help for chosen lang"

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenConstants.java

@@ -248,9 +248,11 @@ public static enum ENUM_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case,
     public static final String HAS_OPTIONAL_EXT_NAME = PREFIX_HAS + "optional";
     public static final String HAS_CHILDREN_EXT_NAME = PREFIX_HAS + "children";
     public static final String HAS_ONLY_READ_ONLY_EXT_NAME = PREFIX_HAS + "only-read-only";
+    public static final String HAS_INNER_OBJECT_NAME = PREFIX_HAS + "inner-object";
 
     public static final String IS_SIMPLE_TYPE_EXT_NAME = PREFIX_IS + "simple-type";
     public static final String IS_PRIMITIVE_TYPE_EXT_NAME = PREFIX_IS + "primitive-type";
+    public static final String IS_OBJECT_EXT_NAME = PREFIX_IS + "object";
     public static final String IS_CONTAINER_EXT_NAME = PREFIX_IS + "container";
     public static final String IS_NOT_CONTAINER_EXT_NAME = PREFIX_IS + "not-container";
     public static final String IS_DEFAULT_EXT_NAME = PREFIX_IS + "default";

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenObject.java

@@ -116,6 +116,14 @@ public Boolean getIsPrimitiveType() {
         return getBooleanValue(CodegenConstants.IS_PRIMITIVE_TYPE_EXT_NAME);
     }
 
+    public Boolean getIsObject() {
+        return getBooleanValue(CodegenConstants.IS_OBJECT_EXT_NAME);
+    }
+
+    public Boolean getHasInnerObject() {
+        return getBooleanValue(CodegenConstants.HAS_INNER_OBJECT_NAME);
+    }
+
     public Boolean getIsContainer() {
         return getBooleanValue(CodegenConstants.IS_CONTAINER_EXT_NAME);
     }