RELTEC-11865: updated used generator version

api-generator/generate.sh

@@ -6,57 +6,49 @@ if [ -d "api-generator" ]; then
   cd api-generator
 fi
 
-GENERATOR=openapi-generator-cli.jar
+GENERATOR=openapi-generator-cli-7.5.0_INTERHYP.jar
 
 if [ ! -f "$GENERATOR" ]; then
-  echo "Please download https://github.com/Interhyp/openapi-generator/blob/RELTEC-11228/bin/openapi-generator-cli.jar using your browser and save as $GENERATOR"
+  echo "Please download https://github.com/Interhyp/openapi-generator/blob/new_generator_rebased/bin/openapi-generator-cli-7.5.0_INTERHYP.jar using your browser and save as $GENERATOR"
   exit 1
 fi
 
 API_MODEL_PACKAGE_NAME=openapi
 
 java -jar $GENERATOR generate \
   -i ../api/openapi-v3-spec.json \
-  -o tmp/$API_MODEL_PACKAGE_NAME \
+  -o ../api \
   --package-name $API_MODEL_PACKAGE_NAME \
-  --global-property modelTests=false,modelDocs=false,apiTests=false,apiDocs=false,generateClient=false \
-  -g go
-
-# -------------------------------------- customization -----------------------------------------
-# omit certain fields from yaml representations, which we use internally to save to files in git
-# (this information is represented in the directory tree or is part of the commit metadata)
-sed -i'' -e 's/yaml:"timeStamp"/yaml:"-"/g' tmp/$API_MODEL_PACKAGE_NAME/generated_models.go
-sed -i'' -e 's/yaml:"commitHash"/yaml:"-"/g' tmp/$API_MODEL_PACKAGE_NAME/generated_models.go
-sed -i'' -e 's/yaml:"jiraIssue"/yaml:"-"/g' tmp/$API_MODEL_PACKAGE_NAME/generated_models.go
-sed -i'' -e 's/yaml:"owner"/yaml:"-"/g' tmp/$API_MODEL_PACKAGE_NAME/generated_models.go
-# ------------------------------------ end customization ---------------------------------------
-
-mkdir -p ../api
-mv tmp/$API_MODEL_PACKAGE_NAME/generated_models.go ../api/generated_apimodel.go || (rm -rf tmp && exit 1)
-rm -rf tmp
-
-gofmt -w ../api/generated_apimodel.go
-
-DOWNSTREAM_API_DIRECTORY=../internal/client
+  --global-property models \
+  --additional-properties=enumClassPrefix=true,structPrefix=true \
+  -g go-autumrest
 
 function generate_downstream {
   P_DOWNSTREAM_NAME=$1
   P_SPEC_FILE_NAME=$2
+  # use 'tags' from openapi to generate only selected parts of the entire api. Use ':' as separator for multiple values. Convert whitespaces to CamelCased string: 'Abc and Def'->'AbcAndDef'
+  P_APIS=$3
 
   MODEL_PACKAGE_NAME=${P_DOWNSTREAM_NAME}client
   java -jar $GENERATOR generate \
     -i ${DOWNSTREAM_API_DIRECTORY}/${P_SPEC_FILE_NAME} \
-    -o tmp/${MODEL_PACKAGE_NAME} \
+    -o ${DOWNSTREAM_API_DIRECTORY}/${P_DOWNSTREAM_NAME} \
     --package-name ${MODEL_PACKAGE_NAME} \
-    --global-property modelTests=false,modelDocs=false,apiTests=false,apiDocs=false \
-    -g go
-  mkdir -p ${DOWNSTREAM_API_DIRECTORY}/${P_DOWNSTREAM_NAME}
-  mv tmp/${MODEL_PACKAGE_NAME}/generated_models.go ${DOWNSTREAM_API_DIRECTORY}/${P_DOWNSTREAM_NAME}/generated_model.go || (rm -rf tmp && exit 1)
-  mv tmp/${MODEL_PACKAGE_NAME}/generated_client.go ${DOWNSTREAM_API_DIRECTORY}/${P_DOWNSTREAM_NAME}/generated_client.go || (rm -rf tmp && exit 1)
-  rm -rf tmp
-
-  gofmt -w ${DOWNSTREAM_API_DIRECTORY}/${P_DOWNSTREAM_NAME}/generated_model.go
-  gofmt -w ${DOWNSTREAM_API_DIRECTORY}/${P_DOWNSTREAM_NAME}/generated_client.go
+    --global-property supportingFiles,models,apis=${P_APIS} \
+    --additional-properties=enumClassPrefix=true,structPrefix=true \
+    -g go-autumrest
 }
 
-# generate_downstream package_name openapi-spec-filename.json
+# -------------------------------------- customization -----------------------------------------
+# omit certain fields from yaml representations, which we use internally to save to files in git
+# (this information is represented in the directory tree or is part of the commit metadata)
+for i in ../api/*.go; do
+    sed -i'' -e 's/yaml:"timeStamp"/yaml:"-"/g' $i
+    sed -i'' -e 's/yaml:"commitHash"/yaml:"-"/g' $i
+    sed -i'' -e 's/yaml:"jiraIssue"/yaml:"-"/g' $i
+    sed -i'' -e 's/yaml:"owner"/yaml:"-"/g' $i
+done
+
+# ------------------------------------ end customization ---------------------------------------
+
+gofmt -w ../api/*.go