Python AIOHTTP server generator

bin/openapi3/python-flask-petstore-python2.sh

@@ -26,9 +26,25 @@ then
 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/openapi-generator/src/test/resources/2_0/petstore.yaml -g python-flask -o samples/server/petstore/flaskConnexion-python2 -DsupportPython2=true $@"
-ags="generate -t modules/openapi-generator/src/main/resources/flaskConnexion -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g python-flask -o samples/server/petstore/flaskConnexion-python2 -c bin/supportPython2.json -D service $@"
+input=modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+out_folder=samples/server/openapi3/petstore/python-flask-python2
+resources=modules/openapi-generator/src/main/resources/python-flask
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -t $resources -i $input -g python-flask -o $out_folder -c bin/supportPython2.json -D service $@"
+
+rm -rf $out_folder/.openapi*
+rm -rf $out_folder/openapi_server
+rm $out_folder/.dockerignore
+rm $out_folder/.gitignore
+rm $out_folder/.travis.yml
+rm $out_folder/Dockerfile
+rm $out_folder/git_push.sh
+rm $out_folder/README.md
+rm $out_folder/requirements.txt
+rm $out_folder/setup.py
+rm $out_folder/test-requirements.txt
+rm $out_folder/tox.ini
 
-rm -rf samples/server/petstore/flaskConnexion-python2/*
 java $JAVA_OPTS -jar $executable $ags

bin/openapi3/python-flask-petstore.sh

@@ -26,8 +26,25 @@ then
 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 -t modules/openapi-generator/src/main/resources/flaskConnexion -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g python-flask -o samples/server/petstore/flaskConnexion -Dservice $@"
+input=modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+out_folder=samples/server/openapi3/petstore/python-flask
+resources=modules/openapi-generator/src/main/resources/python-flask
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -t $resources -i $input -g python-flask -o $out_folder -Dservice $@"
+
+rm -rf $out_folder/.openapi*
+rm -rf $out_folder/openapi_server
+rm $out_folder/.dockerignore
+rm $out_folder/.gitignore
+rm $out_folder/.travis.yml
+rm $out_folder/Dockerfile
+rm $out_folder/git_push.sh
+rm $out_folder/README.md
+rm $out_folder/requirements.txt
+rm $out_folder/setup.py
+rm $out_folder/test-requirements.txt
+rm $out_folder/tox.ini
 
-rm -rf samples/server/petstore/flaskConnexion/*
 java $JAVA_OPTS -jar $executable $ags

bin/python-flask-petstore.sh → bin/python-server-aiohttp-petstore.sh

@@ -25,9 +25,20 @@ then
   mvn -B clean package
 fi
 
+generator=python-aiohttp
+input=modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+out_folder=samples/server/petstore/$generator
+resources=modules/openapi-generator/src/main/resources/$generator
+
 # 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 -t modules/openapi-generator/src/main/resources/flaskConnexion -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g python-flask -o samples/server/petstore/flaskConnexion -Dservice $@"
+export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -t $resources -i $input -g $generator -o $out_folder -Dservice $@"
+
+rm -rf $out_folder/.openapi*
+rm -rf $out_folder/openapi_server
+rm -rf $out_folder/tests*
+rm $out_folder/README.md
+rm $out_folder/requirements.txt
+rm $out_folder/test-requirements.txt
 
-rm -rf samples/server/petstore/flaskConnexion/*
 java $JAVA_OPTS -jar $executable $ags

bin/python-server-all.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+./bin/python-server-aiohttp-petstore.sh
+./bin/python-server-flask-petstore.sh
+./bin/python-server-flask-petstore-python2.sh

bin/python-server-flask-petstore-python2.sh

@@ -0,0 +1,50 @@
+#!/bin/sh
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+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/openapi-generator-cli/target/openapi-generator-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn -B clean package
+fi
+
+generator=python-flask
+input=modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+out_folder=samples/server/petstore/$generator-python2
+resources=modules/openapi-generator/src/main/resources/$generator
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -t $resources -i $input -g $generator -o $out_folder -c bin/supportPython2.json -D service $@"
+
+rm -rf $out_folder/.openapi*
+rm -rf $out_folder/openapi_server
+rm $out_folder/.dockerignore
+rm $out_folder/.gitignore
+rm $out_folder/.travis.yml
+rm $out_folder/Dockerfile
+rm $out_folder/git_push.sh
+rm $out_folder/README.md
+rm $out_folder/requirements.txt
+rm $out_folder/setup.py
+rm $out_folder/test-requirements.txt
+rm $out_folder/tox.ini
+
+java $JAVA_OPTS -jar $executable $ags

bin/python-server-flask-petstore.sh

@@ -0,0 +1,50 @@
+#!/bin/sh
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+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/openapi-generator-cli/target/openapi-generator-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn -B clean package
+fi
+
+generator=python-flask
+input=modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+out_folder=samples/server/petstore/$generator
+resources=modules/openapi-generator/src/main/resources/$generator
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -t $resources -i $input -g $generator -o $out_folder -Dservice $@"
+
+rm -rf $out_folder/.openapi*
+rm -rf $out_folder/openapi_server
+rm $out_folder/.dockerignore
+rm $out_folder/.gitignore
+rm $out_folder/.travis.yml
+rm $out_folder/Dockerfile
+rm $out_folder/git_push.sh
+rm $out_folder/README.md
+rm $out_folder/requirements.txt
+rm $out_folder/setup.py
+rm $out_folder/test-requirements.txt
+rm $out_folder/tox.ini
+
+java $JAVA_OPTS -jar $executable $ags

bin/windows/python2-flask-petstore.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g python-flask -o samples\server\petstore\flaskConnexion-python2 -c bin\supportPython2.json -D service
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g python-flask -o samples\server\petstore\python-flask-python2 -c bin\supportPython2.json -D service
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/python3-flask-petstore.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g python-flask -o samples\server\petstore\flaskConnexion -D service
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g python-flask -o samples\server\petstore\python-flask -D service
 
 java %JAVA_OPTS% -jar %executable% %ags%

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenSecurity.java

@@ -27,7 +27,10 @@
 public class CodegenSecurity {
     public String name;
     public String type;
+    public String scheme;
     public Boolean hasMore, isBasic, isOAuth, isApiKey;
+    // is Basic is true for all http authentication type. Those are to differentiate basic and bearer authentication
+    public Boolean isBasicBasic, isBasicBearer;
     public Map<String, Object> vendorExtensions = new HashMap<String, Object>();
     // ApiKey specific
     public String keyParamName;

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -3228,6 +3228,8 @@ public List<CodegenSecurity> fromSecurity(Map<String, SecurityScheme> securitySc
             cs.name = key;
             cs.type = securityScheme.getType().toString();
             cs.isCode = cs.isPassword = cs.isApplication = cs.isImplicit = false;
+            cs.isBasicBasic = cs.isBasicBearer = false;
+            cs.scheme = securityScheme.getScheme();
 
             if (SecurityScheme.Type.APIKEY.equals(securityScheme.getType())) {
                 cs.isBasic = cs.isOAuth = false;
@@ -3239,6 +3241,12 @@ public List<CodegenSecurity> fromSecurity(Map<String, SecurityScheme> securitySc
             } else if (SecurityScheme.Type.HTTP.equals(securityScheme.getType())) {
                 cs.isKeyInHeader = cs.isKeyInQuery = cs.isKeyInCookie = cs.isApiKey = cs.isOAuth = false;
                 cs.isBasic = true;
+                if ("basic".equals(securityScheme.getScheme())) {
+                    cs.isBasicBasic = true;
+                }
+                else if ("bearer".equals(securityScheme.getScheme())) {
+                    cs.isBasicBearer = true;
+                }
             } else if (SecurityScheme.Type.OAUTH2.equals(securityScheme.getType())) {
                 cs.isKeyInHeader = cs.isKeyInQuery = cs.isKeyInCookie = cs.isApiKey = cs.isBasic = false;
                 cs.isOAuth = true;