review feedback

Author: marceljk

Makefile

@@ -17,11 +17,11 @@ download-oas:
 generate-sdk:
 	@$(SCRIPTS_BASE)/generate-sdk/generate-sdk.sh "$(GIT_HOST)" "$(GIT_USER_ID)" "$(GIT_REPO_ID)" "$(SDK_REPO_URL)" "$(LANGUAGE)" "$(SDK_BRANCH)"
 
-generate-go-sdk: LANGUAGE=go
-generate-go-sdk: generate-sdk
+generate-go-sdk:
+	@$(SCRIPTS_BASE)/generate-sdk/generate-sdk.sh "$(GIT_HOST)" "$(GIT_USER_ID)" "$(GIT_REPO_ID)" "$(SDK_REPO_URL)" "go" "$(SDK_BRANCH)"
 
-generate-python-sdk: LANGUAGE=python
-generate-python-sdk: generate-sdk
+generate-python-sdk:
+	@$(SCRIPTS_BASE)/generate-sdk/generate-sdk.sh "$(GIT_HOST)" "$(GIT_USER_ID)" "$(GIT_REPO_ID)" "$(SDK_REPO_URL)" "python" "$(SDK_BRANCH)"
 
-generate-java-sdk: LANGUAGE=java
-generate-java-sdk: generate-sdk
+generate-java-sdk:
+	@$(SCRIPTS_BASE)/generate-sdk/generate-sdk.sh "$(GIT_HOST)" "$(GIT_USER_ID)" "$(GIT_REPO_ID)" "$(SDK_REPO_URL)" "java" "$(SDK_BRANCH)"

openapi-generator-config-java.yml

@@ -1,12 +1,13 @@
-artifactUrl: https://github.com/stackitcloud/stackit-sdk-java
-developerName: STACKIT Developer Tools
-developerEmail: [email protected]
-developerOrganization: STACKIT
-developerOrganizationUrl: https://www.stackit.de
-groupId: cloud.stackit
-hideGenerationTimestamp: true
-licenseName: Apache License 2.0
-licenseUrl: http://www.apache.org/licenses/
-scmConnection: scm:[email protected]:stackitcloud/stackit-sdk-java.git
-scmDeveloperConnection: scm:[email protected]:stackitcloud/stackit-sdk-java.git
-scmUrl: https://github.com/stackitcloud/stackit-sdk-java
+additionalProperties:
+  artifactUrl: https://github.com/stackitcloud/stackit-sdk-java
+  developerName: STACKIT Developer Tools
+  developerEmail: [email protected]
+  developerOrganization: STACKIT
+  developerOrganizationUrl: https://www.stackit.de
+  groupId: cloud.stackit
+  hideGenerationTimestamp: true
+  licenseName: Apache License 2.0
+  licenseUrl: http://www.apache.org/licenses/
+  scmConnection: scm:[email protected]:stackitcloud/stackit-sdk-java.git
+  scmDeveloperConnection: scm:[email protected]:stackitcloud/stackit-sdk-java.git
+  scmUrl: https://github.com/stackitcloud/stackit-sdk-java

scripts/generate-sdk/generate-sdk.sh

@@ -78,7 +78,7 @@ if [ -e ${jar_path} ] && [ $(java -jar ${jar_path} version) == ${GENERATOR_VERSI
 else
     echo "Downloading OpenAPI generator (version ${GENERATOR_VERSION})..."
     mkdir -p ${GENERATOR_PATH}
-    wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/${GENERATOR_VERSION_NUMBER}/openapi-generator-cli-${GENERATOR_VERSION_NUMBER}.jar -O ${jar_path} --quiet --no-check-certificate
+    wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/${GENERATOR_VERSION_NUMBER}/openapi-generator-cli-${GENERATOR_VERSION_NUMBER}.jar -O ${jar_path} --quiet
     echo "Download done."
 fi
 

scripts/generate-sdk/languages/java.sh

@@ -122,12 +122,6 @@ generate_java_sdk() {
         rm -r "${SERVICES_FOLDER}/${service}/.openapi-generator/"
         rm "${SERVICES_FOLDER}/${service}/.github/workflows/maven.yml"
 
-        # If the service has a wait package files, move them inside the service folder
-        if [ -d ${sdk_services_backup_dir}/${service}/src/main/java/cloud/stackit/${service}/wait ]; then
-            echo "Found ${service} \"wait\" package"
-            cp -r ${sdk_services_backup_dir}/${service}/src/main/java/cloud/stackit/${service}/wait ${SERVICES_FOLDER}/${service}/src/main/java/cloud/stackit/${service}/wait
-        fi
-
         # If the service has a README.md file, move them inside the service folder
         if [ -f ${sdk_services_backup_dir}/${service}/README.md ]; then
             echo "Found ${service} \"README.md\" file"