Merge remote-tracking branch 'origin/master' into feature/multi-filter-normalizer

Author: jpfinne

.github/workflows/samples-jaxrs.yaml

@@ -20,10 +20,7 @@ jobs:
           - samples/server/petstore/jaxrs/jersey2-useTags
           - samples/server/petstore/jaxrs-jersey
           - samples/server/petstore/jaxrs-spec
-          - samples/server/petstore/jaxrs-spec-interface
-          - samples/server/petstore/jaxrs-spec-interface-response
-          - samples/server/petstore/jaxrs-jersey
-          - samples/server/petstore/jaxrs-spec
+          - samples/server/petstore/jaxrs-spec-withxml
           - samples/server/petstore/jaxrs-spec-interface
           - samples/server/petstore/jaxrs-spec-interface-response
           - samples/server/petstore/jaxrs-datelib-j8

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

@@ -0,0 +1,142 @@
+name: Samples TS clients
+
+on:
+  push:
+    paths:
+      - samples/client/others/typescript-angular/**
+      # comment out angular released before Nov 2023
+      #- samples/client/petstore/typescript-angular-v12-provided-in-root/**
+      #- samples/client/petstore/typescript-angular-v13-provided-in-root/**
+      #- samples/client/petstore/typescript-angular-v14-provided-in-root/**
+      #- samples/client/petstore/typescript-angular-v15-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v16-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v17-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v18-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v19-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v20-provided-in-root/**
+      - samples/openapi3/client/petstore/typescript/builds/default/**
+      # comment out due to build failure
+      #- samples/openapi3/client/petstore/typescript/tests/default/**
+      - samples/openapi3/client/petstore/typescript/builds/jquery/**
+      # comment out due to build failure
+      #- samples/openapi3/client/petstore/typescript/tests/jquery/**
+      - samples/openapi3/client/petstore/typescript/builds/object_params/**
+      # comment out due to build failure
+      #- samples/openapi3/client/petstore/typescript/tests/object_params/**
+      #- samples/openapi3/client/petstore/typescript/builds/inversify/**
+      #- samples/openapi3/client/petstore/typescript/tests/inversify/**
+      #- samples/openapi3/client/petstore/typescript/tests/deno/**
+      - samples/openapi3/client/petstore/typescript/builds/browser/**
+      # comment out due to build failure
+      #- samples/openapi3/client/petstore/typescript/tests/browser/**
+      #- samples/openapi3/client/petstore/typescript/builds/nullable-enum/**
+      - samples/client/petstore/typescript-fetch/builds/default/**
+      - samples/client/petstore/typescript-fetch/builds/es6-target/**
+      - samples/client/petstore/typescript-fetch/builds/with-npm-version/**
+      - samples/client/petstore/typescript-fetch/tests/default/**
+      # comment out due to build failure
+      #- samples/client/petstore/typescript-node/npm/**
+      - samples/client/petstore/typescript-rxjs/builds/with-npm-version/**
+      - samples/client/petstore/typescript-axios/builds/with-npm-version/**
+      # comment out due to build failure
+      #- samples/client/petstore/typescript-axios/tests/default/**
+  pull_request:
+    paths:
+      - samples/client/others/typescript-angular/**
+      #- samples/client/petstore/typescript-angular-v12-provided-in-root/**
+      #- samples/client/petstore/typescript-angular-v13-provided-in-root/**
+      #- samples/client/petstore/typescript-angular-v14-provided-in-root/**
+      #- samples/client/petstore/typescript-angular-v15-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v16-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v17-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v18-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v19-provided-in-root/**
+      - samples/client/petstore/typescript-angular-v20-provided-in-root/**
+      - samples/openapi3/client/petstore/typescript/builds/default/**
+      #- samples/openapi3/client/petstore/typescript/tests/default/**
+      - samples/openapi3/client/petstore/typescript/builds/jquery/**
+      #- samples/openapi3/client/petstore/typescript/tests/jquery/**
+      - samples/openapi3/client/petstore/typescript/builds/object_params/**
+      #- samples/openapi3/client/petstore/typescript/tests/object_params/**
+      #- samples/openapi3/client/petstore/typescript/builds/inversify/**
+      #- samples/openapi3/client/petstore/typescript/tests/inversify/**
+      #- samples/openapi3/client/petstore/typescript/tests/deno/**
+      - samples/openapi3/client/petstore/typescript/builds/browser/**
+      #- samples/openapi3/client/petstore/typescript/tests/browser/**
+      #- samples/openapi3/client/petstore/typescript/builds/nullable-enum/**
+      - samples/client/petstore/typescript-fetch/builds/default/**
+      - samples/client/petstore/typescript-fetch/builds/es6-target/**
+      - samples/client/petstore/typescript-fetch/builds/with-npm-version/**
+      - samples/client/petstore/typescript-fetch/tests/default/**
+      #- samples/client/petstore/typescript-node/npm/**
+      - samples/client/petstore/typescript-rxjs/builds/with-npm-version/**
+      - samples/client/petstore/typescript-axios/builds/with-npm-version/**
+      #- samples/client/petstore/typescript-axios/tests/default/**
+jobs:
+  build:
+    name: Build projects
+    runs-on: ubuntu-latest
+    services:
+      petstore-api:
+        image: swaggerapi/petstore
+        ports:
+          - 80:8080
+        env:
+          SWAGGER_HOST: http://petstore.swagger.io
+          SWAGGER_BASE_PATH: /v2
+    strategy:
+      fail-fast: false
+      matrix:
+        node:
+          #- "18.x"
+          - "20.x"
+        sample:
+          - samples/client/others/typescript-angular/
+          #- samples/client/petstore/typescript-angular-v12-provided-in-root/
+          #- samples/client/petstore/typescript-angular-v13-provided-in-root/
+          #- samples/client/petstore/typescript-angular-v14-provided-in-root/
+          #- samples/client/petstore/typescript-angular-v15-provided-in-root/
+          - samples/client/petstore/typescript-angular-v16-provided-in-root/
+          - samples/client/petstore/typescript-angular-v17-provided-in-root/
+          - samples/client/petstore/typescript-angular-v18-provided-in-root/
+          - samples/client/petstore/typescript-angular-v19-provided-in-root/
+          - samples/client/petstore/typescript-angular-v20-provided-in-root/
+          - samples/openapi3/client/petstore/typescript/builds/default/
+          #- samples/openapi3/client/petstore/typescript/tests/default/
+          - samples/openapi3/client/petstore/typescript/builds/jquery/
+          #- samples/openapi3/client/petstore/typescript/tests/jquery/
+          - samples/openapi3/client/petstore/typescript/builds/object_params/
+          #- samples/openapi3/client/petstore/typescript/tests/object_params/
+          #- samples/openapi3/client/petstore/typescript/builds/inversify/
+          #- samples/openapi3/client/petstore/typescript/tests/inversify/
+          #- samples/openapi3/client/petstore/typescript/tests/deno/
+          - samples/openapi3/client/petstore/typescript/builds/browser/
+          #- samples/openapi3/client/petstore/typescript/tests/browser/
+          #- samples/openapi3/client/petstore/typescript/builds/nullable-enum/
+          - samples/client/petstore/typescript-fetch/builds/default/
+          - samples/client/petstore/typescript-fetch/builds/es6-target/
+          - samples/client/petstore/typescript-fetch/builds/with-npm-version/
+          - samples/client/petstore/typescript-fetch/tests/default/
+          #- samples/client/petstore/typescript-node/npm/
+          - samples/client/petstore/typescript-rxjs/builds/with-npm-version/
+          - samples/client/petstore/typescript-axios/builds/with-npm-version/
+          #- samples/client/petstore/typescript-axios/tests/default/
+    steps:
+      - uses: actions/checkout@v5
+      - name: Add hosts to /etc/hosts
+        run: |
+            sudo echo "127.0.0.1 petstore.swagger.io" | sudo tee -a /etc/hosts
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          java-version: '17' # Specify your desired Java version
+          distribution: 'temurin' # Or 'adopt', 'oracle', etc.
+          cache: maven # Cache Maven dependencies for faster builds
+      - name: Use Node.js
+        uses: actions/setup-node@v5
+        with:
+          node-version: ${{ matrix.node }}
+          cache: 'npm' # Or 'yarn'
+      - name: mvn integration-test
+        working-directory: ${{ matrix.sample }}
+        run: mvn integration-test

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

@@ -0,0 +1,34 @@
+name: Samples TS servers
+
+on:
+  push:
+    paths:
+      - samples/server/petstore/typescript-nestjs-server/**
+  pull_request:
+    paths:
+      - samples/server/petstore/typescript-nestjs-server/**
+jobs:
+  build:
+    name: Build projects
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        node:
+          - "18.x"
+          - "20.x"
+        sample:
+          - samples/server/petstore/typescript-nestjs-server/
+    steps:
+      - uses: actions/checkout@v5
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@v5
+        with:
+          node-version: ${{ matrix.node }}
+          cache: 'npm' # Or 'yarn'
+      - name: npm install
+        working-directory: ${{ matrix.sample }}
+        run: npm install
+      - name: npm test
+        working-directory: ${{ matrix.sample }}
+        run: npm test

CI/circle_parallel.sh

@@ -62,52 +62,51 @@ elif [ "$NODE_INDEX" = "3" ]; then
 
   echo "Running node $NODE_INDEX ... "
 
-  # Install node@stable (for angular 6)
-  set +e
-  curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
-  export NVM_DIR="/opt/circleci/.nvm"
-  [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-  #nvm install stable
-  # install v16 instead of the latest stable version
-  nvm install 18
-  nvm alias default 18
-  node --version
-
-  # Each step uses the same `$BASH_ENV`, so need to modify it
-  echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
-  echo "[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"" >> $BASH_ENV
-
-  (cd samples/client/others/typescript-angular && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v12-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v13-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v14-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v15-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v16-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v17-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v18-provided-in-root && mvn integration-test)
-  (cd samples/client/petstore/typescript-angular-v19-provided-in-root && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/builds/default && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/tests/default && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/builds/jquery && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/tests/jquery && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/builds/object_params && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/tests/object_params && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/builds/inversify && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/tests/inversify && mvn integration-test)
-  #(cd samples/openapi3/client/petstore/typescript/tests/deno && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/builds/browser && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/tests/browser && mvn integration-test)
-  (cd samples/openapi3/client/petstore/typescript/builds/nullable-enum && mvn integration-test)
-  (cd samples/client/petstore/typescript-fetch/builds/default && mvn integration-test)
-  (cd samples/client/petstore/typescript-fetch/builds/es6-target && mvn integration-test)
-  (cd samples/client/petstore/typescript-fetch/builds/with-npm-version && mvn integration-test)
-  (cd samples/client/petstore/typescript-fetch/tests/default && mvn integration-test)
-  (cd samples/client/petstore/typescript-node/npm && mvn integration-test)
-  (cd samples/client/petstore/typescript-rxjs/builds/with-npm-version && mvn integration-test)
-  (cd samples/client/petstore/typescript-axios/builds/with-npm-version && mvn integration-test)
-  (cd samples/client/petstore/typescript-axios/tests/default && mvn integration-test)
-  (cd samples/client/petstore/typescript-axios/tests/with-complex-headers && mvn integration-test)
-  (cd samples/server/petstore/typescript-nestjs-server && mvn integration-test)
+  ## Install node@stable (for angular 6)
+  #set +e
+  #curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
+  #export NVM_DIR="/opt/circleci/.nvm"
+  #[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+  ##nvm install stable
+  ## install v16 instead of the latest stable version
+  #nvm install 18
+  #nvm alias default 18
+  #node --version
+
+  ## Each step uses the same `$BASH_ENV`, so need to modify it
+  #echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
+  #echo "[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"" >> $BASH_ENV
+
+  #(cd samples/client/others/typescript-angular && mvn integration-test)
+  #(cd samples/client/petstore/typescript-angular-v12-provided-in-root && mvn integration-test)
+  #(cd samples/client/petstore/typescript-angular-v13-provided-in-root && mvn integration-test)
+  #(cd samples/client/petstore/typescript-angular-v14-provided-in-root && mvn integration-test)
+  #(cd samples/client/petstore/typescript-angular-v15-provided-in-root && mvn integration-test)
+  #(cd samples/client/petstore/typescript-angular-v16-provided-in-root && mvn integration-test)
+  #(cd samples/client/petstore/typescript-angular-v17-provided-in-root && mvn integration-test)
+  #(cd samples/client/petstore/typescript-angular-v18-provided-in-root && mvn integration-test)
+  #(cd samples/client/petstore/typescript-angular-v19-provided-in-root && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/builds/default && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/tests/default && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/builds/jquery && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/tests/jquery && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/builds/object_params && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/tests/object_params && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/builds/inversify && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/tests/inversify && mvn integration-test)
+  ##(cd samples/openapi3/client/petstore/typescript/tests/deno && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/builds/browser && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/tests/browser && mvn integration-test)
+  #(cd samples/openapi3/client/petstore/typescript/builds/nullable-enum && mvn integration-test)
+  #(cd samples/client/petstore/typescript-fetch/builds/default && mvn integration-test)
+  #(cd samples/client/petstore/typescript-fetch/builds/es6-target && mvn integration-test)
+  #(cd samples/client/petstore/typescript-fetch/builds/with-npm-version && mvn integration-test)
+  #(cd samples/client/petstore/typescript-fetch/tests/default && mvn integration-test)
+  #(cd samples/client/petstore/typescript-node/npm && mvn integration-test)
+  #(cd samples/client/petstore/typescript-rxjs/builds/with-npm-version && mvn integration-test)
+  #(cd samples/client/petstore/typescript-axios/builds/with-npm-version && mvn integration-test)
+  #(cd samples/client/petstore/typescript-axios/tests/default && mvn integration-test)
+  #(cd samples/client/petstore/typescript-axios/tests/with-complex-headers && mvn integration-test)
 
 else
   echo "Running node $NODE_INDEX ..."

bin/configs/jaxrs-spec-withxml.yaml

@@ -0,0 +1,10 @@
+generatorName: jaxrs-spec
+outputDir: samples/server/petstore/jaxrs-spec-withxml/
+inputSpec: modules/openapi-generator/src/test/resources/3_0/jaxrs-spec/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec
+additionalProperties:
+  artifactId: jaxrs-spec-withxml-petstore-server
+  serializableModel: "true"
+  hideGenerationTimestamp: "true"
+  generateBuilders: "true"
+  withXml: true

bin/configs/typescript-angular-v19-provided-in-root.yaml

@@ -0,0 +1,9 @@
+generatorName: typescript-angular
+outputDir: samples/client/petstore/typescript-angular-v19-provided-in-root/builds/default
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+additionalProperties:
+  ngVersion: 19.0.0
+  supportsES6: true
+enumNameMappings:
+  delivered: SHIPPED

bin/configs/typescript-angular-v20-provided-in-root.yaml

@@ -0,0 +1,9 @@
+generatorName: typescript-angular
+outputDir: samples/client/petstore/typescript-angular-v20-provided-in-root/builds/default
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+additionalProperties:
+  ngVersion: 20.0.0
+  supportsES6: true
+enumNameMappings:
+  delivered: SHIPPED

bin/configs/typescript-fetch-infinite-recursion-issue.yaml

@@ -0,0 +1,7 @@
+generatorName: typescript-fetch
+outputDir: samples/client/others/typescript-fetch/infinite-recursion-issue
+inputSpec: modules/openapi-generator/src/test/resources/3_0/typescript-fetch/infinite-recursion-issue.yaml
+templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+additionalProperties:
+  enumPropertyNaming: "original"
+  enumUnknownDefaultCase: true

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

@@ -818,6 +818,20 @@ protected void normalizeProperties(Map<String, Schema> properties, Set<Schema> v
         }
         for (Map.Entry<String, Schema> propertiesEntry : properties.entrySet()) {
             Schema property = propertiesEntry.getValue();
+            
+            // remove x-internal if needed (same logic as normalizeComponentsSchemas)
+            if (property.getExtensions() != null && getRule(REMOVE_X_INTERNAL)) {
+                Object xInternalValue = property.getExtensions().get(X_INTERNAL);
+                boolean isInternal = false;
+                if (xInternalValue instanceof Boolean) {
+                    isInternal = (Boolean) xInternalValue;
+                } else if (xInternalValue instanceof String) {
+                    isInternal = Boolean.parseBoolean((String) xInternalValue);
+                }
+                if (isInternal) {
+                    property.getExtensions().remove(X_INTERNAL);
+                }
+            }
             Schema newProperty = normalizeSchema(property, new HashSet<>());
             propertiesEntry.setValue(newProperty);
         }