CI fixes

Author: SamuelMarks

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - name: Set up JDK
       uses: actions/setup-java@v5
       with:
@@ -15,7 +15,8 @@ jobs:
       run: mvn clean install
     - name: Test Generated Petstore Clients
       run: |
-        curl -sL "https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml" | npx swagger-cli bundle -t json > petstore_oas3.json
+        curl -sL "https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml" > petstore_raw.yaml
+        npx swagger-cli bundle petstore_raw.yaml -t json > petstore_oas3.json
         curl -sL "https://petstore.swagger.io/v2/swagger.json" > petstore.json
         python3 scripts/test_petstore.py v2 petstore.json
         python3 scripts/test_petstore.py v3 petstore_oas3.json
@@ -32,7 +33,7 @@ jobs:
       contents: write
       packages: write
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
 
     - name: Set up JDK
       uses: actions/setup-java@v5

scripts/test_generated_server.py

@@ -12,6 +12,14 @@
 version = sys.argv[1]
 json_file = sys.argv[2]
 
+if not os.path.exists(json_file):
+    print(f"{json_file} not found. Attempting to download...")
+    if version == "v2":
+        subprocess.run(["curl", "-sL", "https://petstore.swagger.io/v2/swagger.json", "-o", json_file], check=True)
+    elif version == "v3":
+        subprocess.run(["curl", "-sL", "https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml", "-o", "petstore_raw.yaml"], check=True)
+        subprocess.run(["npx", "swagger-cli", "bundle", "petstore_raw.yaml", "-t", "json"], stdout=open(json_file, "w"), check=True)
+
 server_dir = f"../cdd-java-server-{version}"
 
 if os.path.exists(server_dir):

scripts/test_petstore.py

@@ -14,6 +14,14 @@
 version = sys.argv[1]
 json_file = sys.argv[2]
 
+if not os.path.exists(json_file):
+    print(f"{json_file} not found. Attempting to download...")
+    if version == "v2":
+        subprocess.run(["curl", "-sL", "https://petstore.swagger.io/v2/swagger.json", "-o", json_file], check=True)
+    elif version == "v3":
+        subprocess.run(["curl", "-sL", "https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml", "-o", "petstore_raw.yaml"], check=True)
+        subprocess.run(["npx", "swagger-cli", "bundle", "petstore_raw.yaml", "-t", "json"], stdout=open(json_file, "w"), check=True)
+
 client_dir = f"../cdd-java-client-{version}"
 
 if os.path.exists(client_dir):

src/main/java/cli/Main.java

@@ -3,7 +3,7 @@
 /**
  * CLI Entrypoint.
  */
-@cli.Generated
+
 public class Main {
 
 	/**