- remove invalid characters for valid Java package name

- copy VERSION file to generated code

Author: marceljk

scripts/generate-sdk/.openapi-generator-ignore-java

@@ -5,4 +5,5 @@ api/openapi.yaml
 tox.ini
 **/.github/**
 **/AndroidManifest.xml
-pom.xml
+pom.xml
+build.sbt

scripts/generate-sdk/languages/java.sh

@@ -79,12 +79,16 @@ generate_java_sdk() {
         service="${service_json##*/}"
         service="${service%.json}"
 
-        # Remove invalid characters to ensure a valid Go pkg name
+        # Remove invalid characters to ensure a valid Java pkg name
         service="${service//-/}"                                  # remove dashes
-        service="${service// /}"                                  # remove empty spaces
-        service="${service//_/}"                                  # remove underscores
+        service="${service// /}"                                  # remove spaces
         service=$(echo "${service}" | tr '[:upper:]' '[:lower:]') # convert upper case letters to lower case
-        service=$(echo "${service}" | tr -d -c '[:alnum:]')       # remove non-alphanumeric characters
+        service=$(echo "${service}" | sed 's/[^a-z0-9_]//g')      # remove non-alphanumeric (except underscore)
+
+        # Ensure the package name doesn't start with a number
+        if [[ "${service}" =~ ^[0-9] ]]; then
+          service="_${service}" # Prepend a valid prefix if it starts with a number
+        fi
 
         if ! [[ ${INCLUDE_SERVICES[*]} =~ ${service} ]]; then
             echo "Skipping not included service ${service}"
@@ -146,5 +150,11 @@ generate_java_sdk() {
             cp -r ${sdk_services_backup_dir}/${service}/NOTICE.txt ${SERVICES_FOLDER}/${service}/NOTICE.txt
         fi
 
+        # If the service has a VERSION file, move it inside the service folder
+        if [ -f ${sdk_services_backup_dir}/${service}/VERSION ]; then
+            echo "Found ${service} \"VERSION\" file"
+            cp -r ${sdk_services_backup_dir}/${service}/VERSION ${SERVICES_FOLDER}/${service}/VERSION
+        fi
+
     done
 }