loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-11 09:02:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.1.x' into sync_41x_50x

Browse Source
This commit is contained in:
wing328
2019-06-27 18:27:20 +08:00
parent 3c8fe5b97f 1020223007
commit a48d7f77fb
1243 changed files with 38715 additions and 15082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
modules/openapi-generator-gradle-plugin/README.adoc
View File

@@ -40,25 +40,34 @@ compileJava.dependsOn tasks.openApiGenerate
== Plugin Setup
//# RELEASE_VERSION
[source,group]
----
plugins {
id "org.openapi.generator" version "4.0.3-SNAPSHOT"
}
----
Using https://docs.gradle.org/current/userguide/plugins.html#sec:old_plugin_application[legacy plugin application]:
[source,groovy]
----
buildscript {
repositories {
mavenLocal()
mavenCentral()
// or, via Gradle Plugin Portal:
// url "https://plugins.gradle.org/m2/"
}
dependencies {
classpath "org.openapitools:openapi-generator-gradle-plugin:4.0.1"
classpath "org.openapitools:openapi-generator-gradle-plugin:4.0.3-SNAPSHOT"
}
}
apply plugin: 'org.openapi.generator'
----
[NOTE]
====
The gradle plugin is not currently published to https://plugins.gradle.org/m2/.
====
//# /RELEASE_VERSION
== Configuration
@@ -591,6 +600,7 @@ Android Studio may experience a Windows-specific Guava dependency conflict with
As a workaround, you may force exclude conflicting Guava dependencies.
//# RELEASE_VERSION
```gradle
buildscript {
repositories {
@@ -599,7 +609,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath('org.openapitools:openapi-generator-gradle-plugin:4.0.1') {
classpath('org.openapitools:openapi-generator-gradle-plugin:4.0.3-SNAPSHOT') {
exclude group: 'com.google.guava'
}
}
@@ -612,5 +622,6 @@ configurations {
// …
apply plugin: 'org.openapi.generator'
```
//# /RELEASE_VERSION
See https://github.com/OpenAPITools/openapi-generator/issues/1818[OpenAPITools/openapi-generator#1818] for more details.

2
modules/openapi-generator-gradle-plugin/gradle.properties
View File

@@ -1,4 +1,6 @@
# RELEASE_VERSION
openApiGeneratorVersion=5.0.0-SNAPSHOT
# /RELEASE_VERSION
# BEGIN placeholders
# these are just placeholders to allow contributors to build directly

2
modules/openapi-generator-gradle-plugin/pom.xml
View File

@@ -3,7 +3,9 @@
<parent>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-project</artifactId>
<!-- RELEASE_VERSION -->
<version>5.0.0-SNAPSHOT</version>
<!-- /RELEASE_VERSION -->
<relativePath>../..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

1
modules/openapi-generator-gradle-plugin/samples/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
.bak/

2
modules/openapi-generator-gradle-plugin/samples/local-spec/README.md
View File

@@ -17,5 +17,5 @@ gradle generateGoWithInvalidSpec
The samples can be tested against other versions of the plugin using the `openApiGeneratorVersion` property. For example:
```bash
gradle -PopenApiGeneratorVersion=4.0.1 openApiValidate
gradle -PopenApiGeneratorVersion=4.0.3-SNAPSHOT openApiValidate
```

4
modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties
View File

@@ -1 +1,3 @@
openApiGeneratorVersion=4.0.1
# RELEASE_VERSION
openApiGeneratorVersion=4.0.3-SNAPSHOT
# /RELEASE_VERSION

BIN
modules/openapi-generator-gradle-plugin/samples/local-spec/gradle/wrapper/gradle-wrapper.jar vendored Normal file
View File

Binary file not shown.

5
modules/openapi-generator-gradle-plugin/samples/local-spec/gradle/wrapper/gradle-wrapper.properties vendored Normal file
View File

@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

172
modules/openapi-generator-gradle-plugin/samples/local-spec/gradlew vendored Executable file
View File

@@ -0,0 +1,172 @@
#!/usr/bin/env sh
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "$@"

84
modules/openapi-generator-gradle-plugin/samples/local-spec/gradlew.bat vendored Normal file
View File

@@ -0,0 +1,84 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

81
modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt
View File

@@ -28,7 +28,7 @@ import org.gradle.kotlin.dsl.property
import org.openapitools.codegen.CodegenConstants
import org.openapitools.codegen.DefaultGenerator
import org.openapitools.codegen.config.CodegenConfigurator
import org.openapitools.codegen.config.GeneratorProperties
import org.openapitools.codegen.config.GlobalSettings
/**
@@ -40,6 +40,7 @@ import org.openapitools.codegen.config.GeneratorProperties
*
* @author Jim Schubert
*/
@Suppress("UnstableApiUsage")
open class GenerateTask : DefaultTask() {
/**
@@ -392,146 +393,146 @@ open class GenerateTask : DefaultTask() {
}
if (supportingFilesConstrainedTo.isPresent && supportingFilesConstrainedTo.get().isNotEmpty()) {
GeneratorProperties.setProperty(CodegenConstants.SUPPORTING_FILES, supportingFilesConstrainedTo.get().joinToString(","))
GlobalSettings.setProperty(CodegenConstants.SUPPORTING_FILES, supportingFilesConstrainedTo.get().joinToString(","))
} else {
GeneratorProperties.clearProperty(CodegenConstants.SUPPORTING_FILES)
GlobalSettings.clearProperty(CodegenConstants.SUPPORTING_FILES)
}
if (modelFilesConstrainedTo.isPresent && modelFilesConstrainedTo.get().isNotEmpty()) {
GeneratorProperties.setProperty(CodegenConstants.MODELS, modelFilesConstrainedTo.get().joinToString(","))
GlobalSettings.setProperty(CodegenConstants.MODELS, modelFilesConstrainedTo.get().joinToString(","))
} else {
GeneratorProperties.clearProperty(CodegenConstants.MODELS)
GlobalSettings.clearProperty(CodegenConstants.MODELS)
}
if (apiFilesConstrainedTo.isPresent && apiFilesConstrainedTo.get().isNotEmpty()) {
GeneratorProperties.setProperty(CodegenConstants.APIS, apiFilesConstrainedTo.get().joinToString(","))
GlobalSettings.setProperty(CodegenConstants.APIS, apiFilesConstrainedTo.get().joinToString(","))
} else {
GeneratorProperties.clearProperty(CodegenConstants.APIS)
GlobalSettings.clearProperty(CodegenConstants.APIS)
}
if (generateApiDocumentation.isPresent) {
GeneratorProperties.setProperty(CodegenConstants.API_DOCS, generateApiDocumentation.get().toString())
GlobalSettings.setProperty(CodegenConstants.API_DOCS, generateApiDocumentation.get().toString())
}
if (generateModelDocumentation.isPresent) {
GeneratorProperties.setProperty(CodegenConstants.MODEL_DOCS, generateModelDocumentation.get().toString())
GlobalSettings.setProperty(CodegenConstants.MODEL_DOCS, generateModelDocumentation.get().toString())
}
if (generateModelTests.isPresent) {
GeneratorProperties.setProperty(CodegenConstants.MODEL_TESTS, generateModelTests.get().toString())
GlobalSettings.setProperty(CodegenConstants.MODEL_TESTS, generateModelTests.get().toString())
}
if (generateApiTests.isPresent) {
GeneratorProperties.setProperty(CodegenConstants.API_TESTS, generateApiTests.get().toString())
GlobalSettings.setProperty(CodegenConstants.API_TESTS, generateApiTests.get().toString())
}
if (withXml.isPresent) {
GeneratorProperties.setProperty(CodegenConstants.WITH_XML, withXml.get().toString())
GlobalSettings.setProperty(CodegenConstants.WITH_XML, withXml.get().toString())
}
// now override with any specified parameters
verbose.ifNotEmpty { value ->
configurator.isVerbose = value
configurator.setVerbose(value)
}
validateSpec.ifNotEmpty { value ->
configurator.isValidateSpec = value
configurator.setValidateSpec(value)
}
skipOverwrite.ifNotEmpty { value ->
configurator.isSkipOverwrite = value ?: false
configurator.setSkipOverwrite(value ?: false)
}
inputSpec.ifNotEmpty { value ->
configurator.inputSpec = value
configurator.setInputSpec(value)
}
generatorName.ifNotEmpty { value ->
configurator.generatorName = value
configurator.setGeneratorName(value)
}
outputDir.ifNotEmpty { value ->
configurator.outputDir = value
configurator.setOutputDir(value)
}
auth.ifNotEmpty { value ->
configurator.auth = value
configurator.setAuth(value)
}
templateDir.ifNotEmpty { value ->
configurator.templateDir = value
configurator.setTemplateDir(value)
}
packageName.ifNotEmpty { value ->
configurator.packageName = value
configurator.setPackageName(value)
}
apiPackage.ifNotEmpty { value ->
configurator.apiPackage = value
configurator.setApiPackage(value)
}
modelPackage.ifNotEmpty { value ->
configurator.modelPackage = value
configurator.setModelPackage(value)
}
modelNamePrefix.ifNotEmpty { value ->
configurator.modelNamePrefix = value
configurator.setModelNamePrefix(value)
}
modelNameSuffix.ifNotEmpty { value ->
configurator.modelNameSuffix = value
configurator.setModelNameSuffix(value)
}
invokerPackage.ifNotEmpty { value ->
configurator.invokerPackage = value
configurator.setInvokerPackage(value)
}
groupId.ifNotEmpty { value ->
configurator.groupId = value
configurator.setGroupId(value)
}
id.ifNotEmpty { value ->
configurator.artifactId = value
configurator.setArtifactId(value)
}
version.ifNotEmpty { value ->
configurator.artifactVersion = value
configurator.setArtifactVersion(value)
}
library.ifNotEmpty { value ->
configurator.library = value
configurator.setLibrary(value)
}
gitUserId.ifNotEmpty { value ->
configurator.gitUserId = value
configurator.setGitUserId(value)
}
gitRepoId.ifNotEmpty { value ->
configurator.gitRepoId = value
configurator.setGitRepoId(value)
}
releaseNote.ifNotEmpty { value ->
configurator.releaseNote = value
configurator.setReleaseNote(value)
}
httpUserAgent.ifNotEmpty { value ->
configurator.httpUserAgent = value
configurator.setHttpUserAgent(value)
}
ignoreFileOverride.ifNotEmpty { value ->
configurator.ignoreFileOverride = value
configurator.setIgnoreFileOverride(value)
}
removeOperationIdPrefix.ifNotEmpty { value ->
configurator.removeOperationIdPrefix = value!!
configurator.setRemoveOperationIdPrefix(value!!)
}
logToStderr.ifNotEmpty { value ->
configurator.logToStderr = value
configurator.setLogToStderr(value)
}
enablePostProcessFile.ifNotEmpty { value ->
configurator.enablePostProcessFile = value
configurator.setEnablePostProcessFile(value)
}
skipValidateSpec.ifNotEmpty { value ->
@@ -602,12 +603,12 @@ open class GenerateTask : DefaultTask() {
DefaultGenerator().opts(clientOptInput).generate()
out.println("Successfully generated code to ${configurator.outputDir}")
out.println("Successfully generated code to $outputDir")
} catch (e: RuntimeException) {
throw GradleException("Code generation failed.", e)
}
} finally {
GeneratorProperties.reset()
GlobalSettings.reset()
}
}
}