loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[New Generator shell] improve gen_name parsing (#2565)

Browse Source
This commit is contained in:
Vincent Devos 2019-04-06 04:01:06 +02:00 committed by Jim Schubert
parent ff9401fee5
commit 783f16fea6
1 changed files with 50 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
new.sh
View File

@ -91,6 +91,12 @@ while getopts ":hcsdtn:" arg; do
esac esac
done done
if [ -z "$gen_type" ]; then
echo "[error] You may set a generator type" >&2
usage >&2
exit 1
fi
[ -z "${gen_name}" ] && usage [ -z "${gen_name}" ] && usage
titleCase() { titleCase() {
@ -103,7 +109,19 @@ titleCase() {
} }
kebabCase() { kebabCase() {
echo $1 | tr '-' ' ' | tr '_' ' ' | tr '[:upper:]' '[:lower:]' | tr ' ' '-' echo $1 | tr '_' ' ' | tr ' ' '-' | tr '[:upper:]' '[:lower:]'
}
kebabCasePath() {
echo $1 | tr '_' ' ' | tr ' ' '-' | tr '-' '/' | tr '[:upper:]' '[:lower:]'
}
kebabCasePathWin() {
echo $1 | tr '_' ' ' | tr ' ' '-' | tr '-' '\\' | tr '[:upper:]' '[:lower:]'
}
kebabCasePkg() {
echo $1 | tr '_' ' ' | tr ' ' '-' | tr '-' '.' | tr '[:upper:]' '[:lower:]'
} }
upperCase() { upperCase() {
@ -112,6 +130,9 @@ upperCase() {
declare lang_classname=$(titleCase "${gen_name}-${gen_type}-Codegen") declare lang_classname=$(titleCase "${gen_name}-${gen_type}-Codegen")
declare gen_name_camel=$(kebabCase "${gen_name}") declare gen_name_camel=$(kebabCase "${gen_name}")
declare gen_name_camel_path=$(kebabCasePath "${gen_name}")
declare gen_name_camel_pathwin=$(kebabCasePathWin "${gen_name}")
declare gen_name_camel_pkg=$(kebabCasePkg "${gen_name}")
declare codegen_type_enum=$(upperCase "${gen_type}") declare codegen_type_enum=$(upperCase "${gen_type}")
# Step 1: Add Language Generator # Step 1: Add Language Generator
@ -146,20 +167,20 @@ public class ${lang_classname} extends DefaultCodegen implements CodegenConfig {
} }
public String getName() { public String getName() {
return "${gen_name}"; return "${gen_name_camel}";
} }
public String getHelp() { public String getHelp() {
return "Generates a ${gen_name} ${gen_type}."; return "Generates a ${gen_name_camel} ${gen_type}.";
} }
public ${lang_classname}() { public ${lang_classname}() {
super(); super();
outputFolder = "generated-code" + File.separator + "${gen_name}"; outputFolder = "generated-code" + File.separator + "${gen_name_camel}";
modelTemplateFiles.put("model.mustache", ".zz"); modelTemplateFiles.put("model.mustache", ".zz");
apiTemplateFiles.put("api.mustache", ".zz"); apiTemplateFiles.put("api.mustache", ".zz");
embeddedTemplateDir = templateDir = "${gen_name}-${gen_type}"; embeddedTemplateDir = templateDir = "${gen_name_camel}-${gen_type}";
apiPackage = File.separator + "Apis"; apiPackage = File.separator + "Apis";
modelPackage = File.separator + "Models"; modelPackage = File.separator + "Models";
supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
@ -172,19 +193,19 @@ EOF
echo -e "\norg.openapitools.codegen.languages.${lang_classname}" >> "${root}/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig" echo -e "\norg.openapitools.codegen.languages.${lang_classname}" >> "${root}/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig"
# Step 3: Create resource files # Step 3: Create resource files
mkdir -p "${root}/modules/openapi-generator/src/main/resources/${gen_name}-${gen_type}" mkdir -p "${root}/modules/openapi-generator/src/main/resources/${gen_name_camel}-${gen_type}"
echo "Creating modules/openapi-generator/src/main/resources/${gen_name}-${gen_type}/README.mustache" && \ echo "Creating modules/openapi-generator/src/main/resources/${gen_name_camel}-${gen_type}/README.mustache" && \
touch "${root}/modules/openapi-generator/src/main/resources/${gen_name}-${gen_type}/README.mustache" touch "${root}/modules/openapi-generator/src/main/resources/${gen_name_camel}-${gen_type}/README.mustache"
echo "Creating modules/openapi-generator/src/main/resources/${gen_name}-${gen_type}/model.mustache" && \ echo "Creating modules/openapi-generator/src/main/resources/${gen_name_camel}-${gen_type}/model.mustache" && \
touch "${root}/modules/openapi-generator/src/main/resources/${gen_name}-${gen_type}/model.mustache" touch "${root}/modules/openapi-generator/src/main/resources/${gen_name_camel}-${gen_type}/model.mustache"
echo "Creating modules/openapi-generator/src/main/resources/${gen_name}-${gen_type}/api.mustache" && \ echo "Creating modules/openapi-generator/src/main/resources/${gen_name_camel}-${gen_type}/api.mustache" && \
touch "${root}/modules/openapi-generator/src/main/resources/${gen_name}-${gen_type}/api.mustache" touch "${root}/modules/openapi-generator/src/main/resources/${gen_name_camel}-${gen_type}/api.mustache"
# Step 4: Create bash/batch scripts # Step 4: Create bash/batch scripts
## Windows batch file ## Windows batch file
echo "Creating bin/windows/${gen_name}-${gen_type}-petstore.bat" echo "Creating bin/windows/${gen_name_camel}-${gen_type}-petstore.bat"
cat > "${root}/bin/windows/${gen_name}-${gen_type}-petstore.bat"<<EOF cat > "${root}/bin/windows/${gen_name_camel}-${gen_type}-petstore.bat"<<EOF
set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
If Not Exist %executable% ( If Not Exist %executable% (
@ -192,14 +213,14 @@ If Not Exist %executable% (
) )
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
set ags=generate --artifact-id "${gen_name}-petstore-${gen_type}" -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g ${gen_name} -o samples\\${gen_type}\petstore\\${gen_name} set ags=generate --artifact-id "${gen_name_camel}-petstore-${gen_type}" -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g ${gen_name_camel} -o samples\\${gen_type}\petstore\\${gen_name_camel_pathwin}
java %JAVA_OPTS% -jar %executable% %ags% java %JAVA_OPTS% -jar %executable% %ags%
EOF EOF
## Bash file ## Bash file
echo "Creating bin/${gen_name}-${gen_type}-petstore.sh" echo "Creating bin/${gen_name_camel}-${gen_type}-petstore.sh"
cat > "${root}/bin/${gen_name}-${gen_type}-petstore.sh"<<EOF cat > "${root}/bin/${gen_name_camel}-${gen_type}-petstore.sh"<<EOF
#!/bin/sh #!/bin/sh
SCRIPT="\$0" SCRIPT="\$0"
@ -228,20 +249,20 @@ fi
# if you've executed sbt assembly previously it will use that instead. # 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" 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 ${gen_name} -o samples/${gen_type}/petstore/${gen_name}" ags="\$@ generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g ${gen_name_camel} -o samples/${gen_type}/petstore/${gen_name_camel_path}"
java \${JAVA_OPTS} -jar \${executable} \${ags} java \${JAVA_OPTS} -jar \${executable} \${ags}
EOF EOF
chmod u+x "${root}/bin/${gen_name}-${gen_type}-petstore.sh" chmod u+x "${root}/bin/${gen_name_camel}-${gen_type}-petstore.sh"
# Step 5: (optional) Create OpenAPI Generator test files # Step 5: (optional) Create OpenAPI Generator test files
if [ "1" -eq "${tests}" ]; then if [ "1" -eq "${tests}" ]; then
mkdir -p "${root}/modules/openapi-generator/src/test/java/org/openapitools/codegen/${gen_name_camel}" mkdir -p "${root}/modules/openapi-generator/src/test/java/org/openapitools/codegen/${gen_name_camel_path}"
# Codegen # Codegen
echo "Creating modules/openapi-generator/src/test/java/org/openapitools/codegen/${gen_name_camel}/${lang_classname}Test.java" echo "Creating modules/openapi-generator/src/test/java/org/openapitools/codegen/${gen_name_camel_path}/${lang_classname}Test.java"
cat > "${root}/modules/openapi-generator/src/test/java/org/openapitools/codegen/${gen_name_camel}/${lang_classname}Test.java"<<EOF cat > "${root}/modules/openapi-generator/src/test/java/org/openapitools/codegen/${gen_name_camel_path}/${lang_classname}Test.java"<<EOF
package org.openapitools.codegen.${gen_name_camel}; package org.openapitools.codegen.${gen_name_camel_pkg};
import org.openapitools.codegen.*; import org.openapitools.codegen.*;
import org.openapitools.codegen.languages.${lang_classname}; import org.openapitools.codegen.languages.${lang_classname};
@ -263,9 +284,9 @@ public class ${lang_classname}Test {
EOF EOF
# Model # Model
echo "Creating modules/openapi-generator/src/test/java/org/openapitools/codegen/${gen_name_camel}/${lang_classname}ModelTest.java" echo "Creating modules/openapi-generator/src/test/java/org/openapitools/codegen/${gen_name_camel_path}/${lang_classname}ModelTest.java"
cat > "${root}/modules/openapi-generator/src/test/java/org/openapitools/codegen/${gen_name_camel}/${lang_classname}ModelTest.java"<<EOF cat > "${root}/modules/openapi-generator/src/test/java/org/openapitools/codegen/${gen_name_camel_path}/${lang_classname}ModelTest.java"<<EOF
package org.openapitools.codegen.${gen_name_camel}; package org.openapitools.codegen.${gen_name_camel_pkg};
import org.openapitools.codegen.*; import org.openapitools.codegen.*;
import org.openapitools.codegen.languages.${lang_classname}; import org.openapitools.codegen.languages.${lang_classname};
@ -297,9 +318,9 @@ public class ${lang_classname}ModelTest {
EOF EOF
# Options # Options
echo "Creating modules/openapi-generator/src/test/java/org/openapitools/codegen/${gen_name_camel}/${lang_classname}OptionsTest.java" echo "Creating modules/openapi-generator/src/test/java/org/openapitools/codegen/${gen_name_camel_path}/${lang_classname}OptionsTest.java"
cat > "${root}/modules/openapi-generator/src/test/java/org/openapitools/codegen/${gen_name_camel}/${lang_classname}OptionsTest.java"<<EOF cat > "${root}/modules/openapi-generator/src/test/java/org/openapitools/codegen/${gen_name_camel_path}/${lang_classname}OptionsTest.java"<<EOF
package org.openapitools.codegen.${gen_name_camel}; package org.openapitools.codegen.${gen_name_camel_pkg};
import org.openapitools.codegen.AbstractOptionsTest; import org.openapitools.codegen.AbstractOptionsTest;
import org.openapitools.codegen.CodegenConfig; import org.openapitools.codegen.CodegenConfig;