Merge branch 'master' into java_add_lombok_model

.github/workflows/gradle-plugin-tests.yaml

@@ -20,7 +20,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven-repository
         with:

.github/workflows/gradle-test.yaml

@@ -37,14 +37,14 @@ jobs:
           java-version: 11
       # Cache Gradle Dependencies
       - name: Setup Gradle Dependencies Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
 
       # Cache Gradle Wrapper
       - name: Setup Gradle Wrapper Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}

.github/workflows/linux.yaml

@@ -28,14 +28,14 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml', 'modules/**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches

.github/workflows/maven-plugin-tests.yaml

@@ -20,7 +20,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven-repository
         with:

.github/workflows/openapi-generator.yaml

@@ -22,7 +22,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven-repository
         with:
@@ -60,7 +60,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven-repository
         with:

.github/workflows/samples-dart.yaml

@@ -24,7 +24,7 @@ jobs:
           java-version: 11
           cache: maven
       - name: Cache test dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: pub-cache
         with:

.github/workflows/samples-groovy.yaml

@@ -27,7 +27,7 @@ jobs:
           distribution: 'temurin'
           java-version: 8
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-java-client-echo-api-jdk11.yaml

@@ -28,7 +28,7 @@ jobs:
           distribution: 'temurin'
           java-version: 11
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-java-client-echo-api-jdk8.yaml

@@ -35,7 +35,7 @@ jobs:
           distribution: 'temurin'
           java-version: 8
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-java-client-jdk11.yaml

@@ -78,7 +78,7 @@ jobs:
           distribution: 'temurin'
           java-version: 11
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-java-client-jdk17.yaml

@@ -27,7 +27,7 @@ jobs:
           distribution: 'temurin'
           java-version: 17
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-java-helidon.yaml

@@ -29,7 +29,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.version }}
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-java-play-framework.yaml

@@ -35,7 +35,7 @@ jobs:
           distribution: 'temurin'
           java-version: 11
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-java-server-jdk8.yaml

@@ -38,7 +38,7 @@ jobs:
           distribution: 'temurin'
           java-version: 8
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-java-wiremock.yaml

@@ -23,7 +23,7 @@ jobs:
           distribution: 'temurin'
           java-version: 11
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-jaxrs-jdk11.yaml

@@ -24,7 +24,7 @@ jobs:
           distribution: 'temurin'
           java-version: 11
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-jaxrs.yaml

@@ -44,7 +44,7 @@ jobs:
           distribution: 'temurin'
           java-version: 8
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-jdk17.yaml

@@ -54,7 +54,7 @@ jobs:
           distribution: 'temurin'
           java-version: 17
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-kotlin-client.yaml

@@ -75,7 +75,7 @@ jobs:
           distribution: 'temurin'
           java-version: 8
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-kotlin-server-jdk17.yaml

@@ -38,7 +38,7 @@ jobs:
           distribution: 'temurin'
           java-version: 17
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-kotlin-server.yaml

@@ -50,7 +50,7 @@ jobs:
           distribution: 'temurin'
           java-version: 8
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-python-petstore.yaml

@@ -39,7 +39,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: ${{ runner.os }}-python-${{ steps.py.outputs.python-version }}-
           path: |

.github/workflows/samples-python-pydantic-v1-petstore.yaml

@@ -39,7 +39,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: ${{ runner.os }}-python-${{ steps.py.outputs.python-version }}-
           path: |

.github/workflows/samples-r.yaml

@@ -0,0 +1,42 @@
+name: Samples R
+
+on:
+  push:
+    paths:
+      - 'samples/client/echo_api/r/**'
+  pull_request:
+    paths:
+      - 'samples/client/echo_api/r/**'
+
+jobs:
+  build:
+    name: Build R
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - 'samples/client/echo_api/r/'
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup node.js
+        uses: actions/setup-node@v4
+      - name: Run echo server
+        run: |
+          git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
+          (cd http-echo-server && npm install && npm start &)
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          r-version: 3.6.1
+      - uses: r-lib/actions/setup-r-dependencies@v2
+        working-directory: ${{ matrix.sample }}
+        with:
+          cache-version: 2
+      - name: Install curl
+        run: sudo apt-get install -y r-cran-curl
+      - name: build and test
+        working-directory: ${{ matrix.sample }}
+        run: |
+          # export _R_CHECK_FORCE_SUGGESTS_=false
+          /bin/bash build_and_test.bash
+        shell: bash

.github/workflows/samples-scala.yaml

@@ -39,7 +39,7 @@ jobs:
           distribution: 'temurin'
           java-version: 8
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-spring-jdk17.yaml

@@ -24,7 +24,7 @@ jobs:
           distribution: 'temurin'
           java-version: 17
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/samples-spring.yaml

@@ -64,7 +64,7 @@ jobs:
           distribution: 'temurin'
           java-version: 8
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: maven-repository
         with:

.github/workflows/windows.yaml

@@ -25,7 +25,7 @@ jobs:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven-repository
         with:

bin/configs/r-echo-api.yaml

@@ -0,0 +1,6 @@
+generatorName: r
+outputDir: samples/client/echo_api/r
+inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
+templateDir: modules/openapi-generator/src/main/resources/r
+additionalProperties:
+  hideGenerationTimestamp: "true"

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java

@@ -347,7 +347,7 @@ public String toString() {
         sb.append(", isVoid=").append(isVoid);
         sb.append(", isResponseBinary=").append(isResponseBinary);
         sb.append(", isResponseFile=").append(isResponseFile);
-        sb.append(", isResponseFile=").append(isResponseOptional);
+        sb.append(", isResponseOptional=").append(isResponseOptional);
         sb.append(", hasReference=").append(hasReference);
         sb.append(", hasDefaultResponse=").append(hasDefaultResponse);
         sb.append(", hasErrorResponseObject=").append(hasErrorResponseObject);

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -4507,6 +4507,11 @@ public CodegenOperation fromOperation(String path,
         if (operation == null)
             throw new RuntimeException("operation cannot be null in fromOperation");
 
+        if (operation.getExtensions() != null && Boolean.TRUE.equals(operation.getExtensions().get("x-internal"))) {
+            LOGGER.info("Operation ({} {} - {}) not generated since x-internal is set to true",
+                    httpMethod, path, operation.getOperationId());
+        }
+
         Map<String, Schema> schemas = ModelUtils.getSchemas(this.openAPI);
         CodegenOperation op = CodegenModelFactory.newInstance(CodegenModelType.OPERATION);
         Set<String> imports = new HashSet<>();
@@ -8197,51 +8202,6 @@ public int hashCode() {
         }
     }
 
-    /**
-     * This method has been kept to keep the introduction of ModelUtils.isAnyType as a non-breaking change
-     * this way, existing forks of our generator can continue to use this method
-     * TODO in 6.0.0 replace this method with ModelUtils.isAnyType
-     * Return true if the schema value can be any type, i.e. it can be
-     * the null value, integer, number, string, object or array.
-     * One use case is when the "type" attribute in the OAS schema is unspecified.
-     *
-     * Examples:
-     *
-     *     arbitraryTypeValue:
-     *       description: This is an arbitrary type schema.
-     *         It is not a free-form object.
-     *         The value can be any type except the 'null' value.
-     *     arbitraryTypeNullableValue:
-     *       description: This is an arbitrary type schema.
-     *         It is not a free-form object.
-     *         The value can be any type, including the 'null' value.
-     *       nullable: true
-     *
-     * @param schema the OAS schema.
-     * @return true if the schema value can be an arbitrary type.
-     */
-    public boolean isAnyTypeSchema(Schema schema) {
-        if (schema == null) {
-            once(LOGGER).error("Schema cannot be null in isAnyTypeSchema check");
-            return false;
-        }
-
-        if (ModelUtils.isFreeFormObject(schema)) {
-            // make sure it's not free form object
-            return false;
-        }
-
-        if (schema.getClass().equals(Schema.class) && schema.get$ref() == null && schema.getType() == null &&
-                (schema.getProperties() == null || schema.getProperties().isEmpty()) &&
-                schema.getAdditionalProperties() == null && schema.getNot() == null &&
-                schema.getEnum() == null) {
-            return true;
-            // If and when type arrays are supported in a future OAS specification,
-            // we could return true if the type array includes all possible JSON schema types.
-        }
-        return false;
-    }
-
     /**
      * Check if the given MIME is a JSON MIME.
      * JSON MIME examples: