Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified clean.sh
100644 → 100755
Empty file.
36 changes: 34 additions & 2 deletions generate.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
set -e
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Stronger bash safety flags

Use pipefail and unset var checks.

-set -e
+set -Eeuo pipefail
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
set -e
set -Eeuo pipefail
🤖 Prompt for AI Agents
In generate.sh around line 2, replace the single "set -e" with stronger bash
safety flags to fail on unset variables and pipeline errors: add -u for unset
var checks and enable pipefail (e.g., set -euo pipefail or set -e -u -o
pipefail) so the script exits on errors, undefined variables, or failing
pipeline stages; optionally also set a safe IFS if needed for robust
word-splitting.


SPEC_FILE="apollo-openapi.yaml"
JAVA_DIR="java"
JAVA_CLIENT_DIR="java-client"
SPRING_BOOT2_DIR="spring-boot2"
PYTHON_DIR="python"
RUST_DIR="rust"
TS_DIR="typescript"

echo "🧹 Cleaning old generated SDKs..."
rm -rf "$JAVA_DIR"
rm -rf "$JAVA_CLIENT_DIR"
rm -rf "$SPRING_BOOT2_DIR"
rm -rf "$PYTHON_DIR"
rm -rf "$RUST_DIR"
rm -rf "$TS_DIR"
Expand All @@ -28,6 +30,36 @@ openapi-generator generate \
-o "$TS_DIR" \
--additional-properties=npmName=apollo-openapi,npmVersion=0.0.1,typescriptThreePlus=true

echo "🚀 Generating Java Client SDK..."
openapi-generator generate \
-i "$SPEC_FILE" \
-g java \
-o "$JAVA_CLIENT_DIR" \
--additional-properties=groupId=com.apollo,artifactId=apollo-openapi-client,artifactVersion=0.0.1,packageName=com.apollo.openapi.client

Comment on lines +33 to +39
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Package mismatch: generated Java code uses org.openapitools.client but script sets packageName=com.apollo.openapi.client

Java generator ignores packageName; you must set invokerPackage/apiPackage/modelPackage. As‑is, regeneration will not reproduce the checked‑in packages.

Run to confirm current packages and the script setting:

Proposed fix:

-  --additional-properties=groupId=com.apollo,artifactId=apollo-openapi-client,artifactVersion=0.0.1,packageName=com.apollo.openapi.client
+  --additional-properties=groupId=com.apollo,artifactId=apollo-openapi-client,artifactVersion=0.0.1,invokerPackage=org.openapitools.client,apiPackage=org.openapitools.client.api,modelPackage=org.openapitools.client.model

🏁 Script executed:

#!/bin/bash
rg -nP --glob 'java-client/**/*.java' '^package\s+([a-zA-Z0-9_.]+);' | awk -F' ' '{print $2}' | sed 's/;//' | sort -u
echo
rg -n ' -g java ' generate.sh -n -C3
rg -n 'packageName=' generate.sh -n -C1

Length of output: 1138


Fix Java client package settings in generate.sh

generate.sh (lines 33–39): the Java client invocation sets packageName=com.apollo.openapi.client but the checked-in java-client sources are under org.openapitools.client.*. openapi-generator for Java uses invokerPackage/apiPackage/modelPackage, so regeneration will not reproduce the checked-in packages — change packageName to the invoker/api/model package properties.

-  --additional-properties=groupId=com.apollo,artifactId=apollo-openapi-client,artifactVersion=0.0.1,packageName=com.apollo.openapi.client
+  --additional-properties=groupId=com.apollo,artifactId=apollo-openapi-client,artifactVersion=0.0.1,invokerPackage=org.openapitools.client,apiPackage=org.openapitools.client.api,modelPackage=org.openapitools.client.model
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
echo "🚀 Generating Java Client SDK..."
openapi-generator generate \
-i "$SPEC_FILE" \
-g java \
-o "$JAVA_CLIENT_DIR" \
--additional-properties=groupId=com.apollo,artifactId=apollo-openapi-client,artifactVersion=0.0.1,packageName=com.apollo.openapi.client
echo "🚀 Generating Java Client SDK..."
openapi-generator generate \
-i "$SPEC_FILE" \
-g java \
-o "$JAVA_CLIENT_DIR" \
--additional-properties=groupId=com.apollo,artifactId=apollo-openapi-client,artifactVersion=0.0.1,invokerPackage=org.openapitools.client,apiPackage=org.openapitools.client.api,modelPackage=org.openapitools.client.model
🤖 Prompt for AI Agents
In generate.sh around lines 33 to 39, the openapi-generator invocation uses
packageName=com.apollo.openapi.client which won't reproduce the checked-in Java
sources under org.openapitools.client.*; replace the single packageName property
with the Java-specific properties invokerPackage, apiPackage, and modelPackage
and set them to match the checked-in layout (for example
invokerPackage=org.openapitools.client, apiPackage=org.openapitools.client.api,
modelPackage=org.openapitools.client.model) so regeneration produces the same
package structure.

echo "🚀 Generating Spring Boot 2 Server..."
openapi-generator generate \
-i "$SPEC_FILE" \
-g spring \
-o "$SPRING_BOOT2_DIR" \
--additional-properties=groupId=com.apollo,artifactId=apollo-openapi-server,artifactVersion=0.0.1,packageName=com.apollo.openapi.server,basePackage=com.apollo.openapi.server,configPackage=com.apollo.openapi.server.config,modelPackage=com.apollo.openapi.server.model,apiPackage=com.apollo.openapi.server.api,library=spring-boot,java8=true,interfaceOnly=false,delegatePattern=true,useTags=true

echo "📦 Adding Maven Wrapper to Spring Boot 2 project..."
cd "$SPRING_BOOT2_DIR"
mvn -N io.takari:maven:wrapper -Dmaven=3.8.6
cd ..

echo "💡 Spring Boot 2 project ready! To start the server, run:"
echo " cd $SPRING_BOOT2_DIR && ./mvnw spring-boot:run"

if [ "$1" = "--start-spring-boot" ]; then
echo "🚀 Starting Spring Boot server..."
cd "$SPRING_BOOT2_DIR"
./mvnw spring-boot:run &
echo "✅ Spring Boot server started in background. Access it at http://localhost:8080"
cd ..
fi

echo "🚀 Generating Rust SDK..."
openapi-generator generate \
-i "$SPEC_FILE" \
Expand Down
30 changes: 30 additions & 0 deletions java-client/.github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
#
# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)

name: Java CI with Maven

on:
push:
branches: [ main, master ]
pull_request:
branches: [ main, master ]

Comment on lines +8 to +13
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Workflow location won’t run from a subdirectory

GitHub Actions only loads workflows from .github/workflows at repo root. Move this file to the repository’s root .github/workflows.

🤖 Prompt for AI Agents
In java-client/.github/workflows/maven.yml around lines 8 to 13, the workflow is
placed in a subdirectory so GitHub Actions will not load it; move this workflow
file from java-client/.github/workflows/maven.yml into the repository root at
.github/workflows/maven.yml (preserving file name and contents), and after
moving verify any repository-relative paths or referenced secrets/runners still
apply and update them if necessary.

jobs:
build:
name: Build Apollo OpenAPI
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 17, 21 ]
steps:
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'
cache: maven
- name: Build with Maven
run: mvn -B package --no-transfer-progress --file pom.xml
Comment on lines +29 to +30
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Wrong Maven path; build likely targets non‑existent root pom

Either set working-directory to java-client or pass -f java-client/pom.xml.

-    - name: Build with Maven
-      run: mvn -B package --no-transfer-progress --file pom.xml
+    - name: Build with Maven
+      working-directory: ./java-client
+      run: mvn -B package --no-transfer-progress -f pom.xml

🏁 Script executed:

#!/bin/bash
# Verify presence of root workflows and pom locations
fd -a '.github/workflows' -t d -d 3
fd -a 'pom.xml' -d 3

Length of output: 452


Fix Maven path — workflow targets non‑existent root pom

Repository has java-client/pom.xml but no top-level pom.xml; running mvn ... -f pom.xml from the repo root will fail. Either run the step in ./java-client or point -f at java-client/pom.xml.

-    - name: Build with Maven
-      run: mvn -B package --no-transfer-progress --file pom.xml
+    - name: Build with Maven
+      working-directory: ./java-client
+      run: mvn -B package --no-transfer-progress -f pom.xml
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
- name: Build with Maven
run: mvn -B package --no-transfer-progress --file pom.xml
- name: Build with Maven
working-directory: ./java-client
run: mvn -B package --no-transfer-progress -f pom.xml
🤖 Prompt for AI Agents
In java-client/.github/workflows/maven.yml around lines 29 to 30, the workflow
runs Maven against pom.xml in the repo root which does not exist; update the
step to either set the step's working-directory to java-client so mvn runs
there, or change the -f argument to point to java-client/pom.xml (e.g., mvn -B
package --no-transfer-progress -f java-client/pom.xml); pick one approach and
apply it consistently so the job finds the correct pom.

21 changes: 21 additions & 0 deletions java-client/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
*.class

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.ear

# exclude jar for gradle wrapper
!gradle/wrapper/*.jar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

# build files
**/target
target
.gradle
build
23 changes: 23 additions & 0 deletions java-client/.openapi-generator-ignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# OpenAPI Generator Ignore
# Generated by openapi-generator https://github.com/openapitools/openapi-generator

# Use this file to prevent files from being overwritten by the generator.
# The patterns follow closely to .gitignore or .dockerignore.

# As an example, the C# client generator defines ApiClient.cs.
# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
#ApiClient.cs

# You can match any string of characters against a directory, file or extension with a single asterisk (*):
#foo/*/qux
# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux

# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
#foo/**/qux
# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux

# You can also negate patterns with an exclamation (!).
# For example, you can ignore all files in a docs folder with the file extension .md:
#docs/*.md
# Then explicitly reverse the ignore rule for a single file:
#!docs/README.md
173 changes: 173 additions & 0 deletions java-client/.openapi-generator/FILES
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
.github/workflows/maven.yml
.gitignore
.openapi-generator-ignore
.travis.yml
README.md
api/openapi.yaml
build.gradle
build.sbt
docs/AppManagementApi.md
docs/Change.md
docs/ClusterDTO.md
docs/ClusterManagementApi.md
docs/EntityPairKVEntity.md
docs/EnvClusterInfo.md
docs/InstanceManagementApi.md
docs/ItemChangeSets.md
docs/ItemDTO.md
docs/ItemManagementApi.md
docs/KVEntity.md
docs/ListItemDiffs.md
docs/ListReleaseBO.md
docs/MapString.md
docs/NamespaceBranchManagementApi.md
docs/NamespaceGrayDelReleaseDTO.md
docs/NamespaceIdentifier.md
docs/NamespaceManagementApi.md
docs/NamespaceReleaseDTO.md
docs/NamespaceSyncModel.md
docs/NamespaceTextModel.md
docs/OpenAppDTO.md
docs/OpenAppNamespaceDTO.md
docs/OpenClusterDTO.md
docs/OpenCreateAppDTO.md
docs/OpenEnvClusterDTO.md
docs/OpenGrayReleaseRuleDTO.md
docs/OpenGrayReleaseRuleItemDTO.md
docs/OpenInstanceConfigDTO.md
docs/OpenInstanceDTO.md
docs/OpenItemDTO.md
docs/OpenNamespaceDTO.md
docs/OpenNamespaceLockDTO.md
docs/OpenOrganizationDto.md
docs/OpenPageDTOOpenInstanceDTO.md
docs/OpenPageDTOOpenItemDTO.md
docs/OpenReleaseDTO.md
docs/OpenapiV1AppsGet401Response.md
docs/OpenapiV1AppsPost400Response.md
docs/OpenapiV1AppsPostRequest.md
docs/OpenapiV1EnvsEnvAppsAppIdClustersClusterNameNamespacesNamespaceNameItemsValidatePost200Response.md
docs/OpenapiV1EnvsEnvAppsAppIdClustersClusterNameNamespacesNamespaceNameItemsValidatePost400Response.md
docs/OpenapiV1EnvsEnvReleasesCompareGet200Response.md
docs/OrganizationManagementApi.md
docs/ReleaseDTO.md
docs/ReleaseManagementApi.md
git_push.sh
gradle.properties
gradle/wrapper/gradle-wrapper.jar
gradle/wrapper/gradle-wrapper.properties
gradlew
gradlew.bat
pom.xml
settings.gradle
src/main/AndroidManifest.xml
src/main/java/org/openapitools/client/ApiCallback.java
src/main/java/org/openapitools/client/ApiClient.java
src/main/java/org/openapitools/client/ApiException.java
src/main/java/org/openapitools/client/ApiResponse.java
src/main/java/org/openapitools/client/Configuration.java
src/main/java/org/openapitools/client/GzipRequestInterceptor.java
src/main/java/org/openapitools/client/JSON.java
src/main/java/org/openapitools/client/Pair.java
src/main/java/org/openapitools/client/ProgressRequestBody.java
src/main/java/org/openapitools/client/ProgressResponseBody.java
src/main/java/org/openapitools/client/ServerConfiguration.java
src/main/java/org/openapitools/client/ServerVariable.java
src/main/java/org/openapitools/client/StringUtil.java
src/main/java/org/openapitools/client/api/AppManagementApi.java
src/main/java/org/openapitools/client/api/ClusterManagementApi.java
src/main/java/org/openapitools/client/api/InstanceManagementApi.java
src/main/java/org/openapitools/client/api/ItemManagementApi.java
src/main/java/org/openapitools/client/api/NamespaceBranchManagementApi.java
src/main/java/org/openapitools/client/api/NamespaceManagementApi.java
src/main/java/org/openapitools/client/api/OrganizationManagementApi.java
src/main/java/org/openapitools/client/api/ReleaseManagementApi.java
src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
src/main/java/org/openapitools/client/auth/Authentication.java
src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
src/main/java/org/openapitools/client/model/Change.java
src/main/java/org/openapitools/client/model/ClusterDTO.java
src/main/java/org/openapitools/client/model/EntityPairKVEntity.java
src/main/java/org/openapitools/client/model/EnvClusterInfo.java
src/main/java/org/openapitools/client/model/ItemChangeSets.java
src/main/java/org/openapitools/client/model/ItemDTO.java
src/main/java/org/openapitools/client/model/KVEntity.java
src/main/java/org/openapitools/client/model/ListItemDiffs.java
src/main/java/org/openapitools/client/model/ListReleaseBO.java
src/main/java/org/openapitools/client/model/MapString.java
src/main/java/org/openapitools/client/model/NamespaceGrayDelReleaseDTO.java
src/main/java/org/openapitools/client/model/NamespaceIdentifier.java
src/main/java/org/openapitools/client/model/NamespaceReleaseDTO.java
src/main/java/org/openapitools/client/model/NamespaceSyncModel.java
src/main/java/org/openapitools/client/model/NamespaceTextModel.java
src/main/java/org/openapitools/client/model/OpenAppDTO.java
src/main/java/org/openapitools/client/model/OpenAppNamespaceDTO.java
src/main/java/org/openapitools/client/model/OpenClusterDTO.java
src/main/java/org/openapitools/client/model/OpenCreateAppDTO.java
src/main/java/org/openapitools/client/model/OpenEnvClusterDTO.java
src/main/java/org/openapitools/client/model/OpenGrayReleaseRuleDTO.java
src/main/java/org/openapitools/client/model/OpenGrayReleaseRuleItemDTO.java
src/main/java/org/openapitools/client/model/OpenInstanceConfigDTO.java
src/main/java/org/openapitools/client/model/OpenInstanceDTO.java
src/main/java/org/openapitools/client/model/OpenItemDTO.java
src/main/java/org/openapitools/client/model/OpenNamespaceDTO.java
src/main/java/org/openapitools/client/model/OpenNamespaceLockDTO.java
src/main/java/org/openapitools/client/model/OpenOrganizationDto.java
src/main/java/org/openapitools/client/model/OpenPageDTOOpenInstanceDTO.java
src/main/java/org/openapitools/client/model/OpenPageDTOOpenItemDTO.java
src/main/java/org/openapitools/client/model/OpenReleaseDTO.java
src/main/java/org/openapitools/client/model/OpenapiV1AppsGet401Response.java
src/main/java/org/openapitools/client/model/OpenapiV1AppsPost400Response.java
src/main/java/org/openapitools/client/model/OpenapiV1AppsPostRequest.java
src/main/java/org/openapitools/client/model/OpenapiV1EnvsEnvAppsAppIdClustersClusterNameNamespacesNamespaceNameItemsValidatePost200Response.java
src/main/java/org/openapitools/client/model/OpenapiV1EnvsEnvAppsAppIdClustersClusterNameNamespacesNamespaceNameItemsValidatePost400Response.java
src/main/java/org/openapitools/client/model/OpenapiV1EnvsEnvReleasesCompareGet200Response.java
src/main/java/org/openapitools/client/model/ReleaseDTO.java
src/test/java/org/openapitools/client/api/AppManagementApiTest.java
src/test/java/org/openapitools/client/api/ClusterManagementApiTest.java
src/test/java/org/openapitools/client/api/InstanceManagementApiTest.java
src/test/java/org/openapitools/client/api/ItemManagementApiTest.java
src/test/java/org/openapitools/client/api/NamespaceBranchManagementApiTest.java
src/test/java/org/openapitools/client/api/NamespaceManagementApiTest.java
src/test/java/org/openapitools/client/api/OrganizationManagementApiTest.java
src/test/java/org/openapitools/client/api/ReleaseManagementApiTest.java
src/test/java/org/openapitools/client/model/ChangeTest.java
src/test/java/org/openapitools/client/model/ClusterDTOTest.java
src/test/java/org/openapitools/client/model/EntityPairKVEntityTest.java
src/test/java/org/openapitools/client/model/EnvClusterInfoTest.java
src/test/java/org/openapitools/client/model/ItemChangeSetsTest.java
src/test/java/org/openapitools/client/model/ItemDTOTest.java
src/test/java/org/openapitools/client/model/KVEntityTest.java
src/test/java/org/openapitools/client/model/ListItemDiffsTest.java
src/test/java/org/openapitools/client/model/ListReleaseBOTest.java
src/test/java/org/openapitools/client/model/MapStringTest.java
src/test/java/org/openapitools/client/model/NamespaceGrayDelReleaseDTOTest.java
src/test/java/org/openapitools/client/model/NamespaceIdentifierTest.java
src/test/java/org/openapitools/client/model/NamespaceReleaseDTOTest.java
src/test/java/org/openapitools/client/model/NamespaceSyncModelTest.java
src/test/java/org/openapitools/client/model/NamespaceTextModelTest.java
src/test/java/org/openapitools/client/model/OpenAppDTOTest.java
src/test/java/org/openapitools/client/model/OpenAppNamespaceDTOTest.java
src/test/java/org/openapitools/client/model/OpenClusterDTOTest.java
src/test/java/org/openapitools/client/model/OpenCreateAppDTOTest.java
src/test/java/org/openapitools/client/model/OpenEnvClusterDTOTest.java
src/test/java/org/openapitools/client/model/OpenGrayReleaseRuleDTOTest.java
src/test/java/org/openapitools/client/model/OpenGrayReleaseRuleItemDTOTest.java
src/test/java/org/openapitools/client/model/OpenInstanceConfigDTOTest.java
src/test/java/org/openapitools/client/model/OpenInstanceDTOTest.java
src/test/java/org/openapitools/client/model/OpenItemDTOTest.java
src/test/java/org/openapitools/client/model/OpenNamespaceDTOTest.java
src/test/java/org/openapitools/client/model/OpenNamespaceLockDTOTest.java
src/test/java/org/openapitools/client/model/OpenOrganizationDtoTest.java
src/test/java/org/openapitools/client/model/OpenPageDTOOpenInstanceDTOTest.java
src/test/java/org/openapitools/client/model/OpenPageDTOOpenItemDTOTest.java
src/test/java/org/openapitools/client/model/OpenReleaseDTOTest.java
src/test/java/org/openapitools/client/model/OpenapiV1AppsGet401ResponseTest.java
src/test/java/org/openapitools/client/model/OpenapiV1AppsPost400ResponseTest.java
src/test/java/org/openapitools/client/model/OpenapiV1AppsPostRequestTest.java
src/test/java/org/openapitools/client/model/OpenapiV1EnvsEnvAppsAppIdClustersClusterNameNamespacesNamespaceNameItemsValidatePost200ResponseTest.java
src/test/java/org/openapitools/client/model/OpenapiV1EnvsEnvAppsAppIdClustersClusterNameNamespacesNamespaceNameItemsValidatePost400ResponseTest.java
src/test/java/org/openapitools/client/model/OpenapiV1EnvsEnvReleasesCompareGet200ResponseTest.java
src/test/java/org/openapitools/client/model/ReleaseDTOTest.java
1 change: 1 addition & 0 deletions java-client/.openapi-generator/VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7.15.0
22 changes: 22 additions & 0 deletions java-client/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#
# Generated by OpenAPI Generator: https://openapi-generator.tech
#
# Ref: https://docs.travis-ci.com/user/languages/java/
#
language: java
jdk:
- openjdk12
- openjdk11
- openjdk10
- openjdk9
- openjdk8
before_install:
# ensure gradlew has proper permission
- chmod a+x ./gradlew
script:
# test using maven
#- mvn test
# test using gradle
- gradle test
# test using sbt
# - sbt test
Loading
Loading