Update to JDK11

.circleci/config.yml

@@ -31,8 +31,10 @@ commands: # a reusable command with parameters
       # 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/'
       - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
       # This is based on your 1.0 configuration file or project settings
+      #- run:
+      #    command: sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java; sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac; echo -e "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> $BASH_ENV
       - run:
-          command: sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java; sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac; echo -e "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> $BASH_ENV
+          command: java -version
       - run:
           command: 'sudo docker info >/dev/null 2>&1 || sudo service docker start; '
       - run:

.github/workflows/check-supported-versions.yaml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [8, 11]
+        java: [11, 17]
         os: [ubuntu-latest]
         include:
-          - java: 8
+          - java: 11
             os: windows-latest
           - java: 17
             os: ubuntu-latest
@@ -53,7 +53,7 @@ jobs:
 
       - name: Upload Maven build artifact
         uses: actions/upload-artifact@v3
-        if: matrix.java == '8' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == '11' && matrix.os == 'ubuntu-latest'
         with:
           name: artifact
           path: modules/openapi-generator-cli/target/openapi-generator-cli.jar
@@ -63,7 +63,7 @@ jobs:
         run: gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --stacktrace
 
       - name: Test Maven plugin integration
-        if: matrix.java == '8'
+        if: matrix.java == '11'
         shell: bash
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}

.github/workflows/openapi-generator.yaml

@@ -16,10 +16,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
         uses: actions/cache@v3
@@ -54,10 +54,10 @@ jobs:
       - build
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
         uses: actions/cache@v3
@@ -91,10 +91,10 @@ jobs:
       - build
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
         uses: actions/download-artifact@v3
@@ -130,10 +130,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
         uses: actions/download-artifact@v3

.github/workflows/windows.yaml

@@ -16,7 +16,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        java: [8, 11]
+        java: [11, 17]
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.java }}
@@ -39,7 +39,7 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
       - name: Run maven
-        run: mvn --no-snapshot-updates --batch-mode --quiet install -DskipTests
+        run: mvn --no-snapshot-updates --batch-mode --quiet install
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       - name: Setup Gradle

.travis.yml

@@ -1,7 +1,7 @@
 sudo: required
 language: java
 jdk:
-  - openjdk8
+  - openjdk11
 
 # See https://docs.travis-ci.com/user/languages/java/#caching
 before_cache:
@@ -151,7 +151,7 @@ script:
   # run integration tests defined in maven pom.xml
   # WARN: Travis will timeout after 10 minutes of no stdout/stderr activity, which is problematic with mvn --quiet.
   # show "error" only to reduce the log size
-  - mvn -e --no-snapshot-updates --quiet --batch-mode --show-version clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error 2>&1 | grep -i error
+  - mvn -e --no-snapshot-updates --quiet --batch-mode --show-version clean install -DskipTests -Dmaven.javadoc.skip=true -Dorg.slf4j.simpleLogger.defaultLogLevel=error 2>&1 | grep -i error
   #- mvn -e --no-snapshot-updates --quiet --batch-mode --show-version verify -Psamples -Dorg.slf4j.simpleLogger.defaultLogLevel=error
 after_success:
   # push to maven repo

appveyor.yml

@@ -17,30 +17,31 @@ install:
 build_script:
   - dotnet --info
   # build C# aspnetcore 5.0 server
-  - dotnet build samples\server\petstore\aspnetcore-5.0\Org.OpenAPITools.sln
-  # build C# aspnetcore 3.1 server
-  - dotnet build samples\server\petstore\aspnetcore-3.1\Org.OpenAPITools.sln
-  # build C# aspnetcore 3.0 server
-  - dotnet build samples\server\petstore\aspnetcore-3.0\Org.OpenAPITools.sln
-  # build C# aspnetcore 2.2 server
-  - dotnet build samples\server\petstore\aspnetcore\Org.OpenAPITools.sln
-  # build C# API client (multiple frameworks)
-  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClientCoreAndNet47\Org.OpenAPITools.sln
-  # build C# API client (httpclient)
-  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-httpclient\Org.OpenAPITools.sln
-  # build C# API client (generichost)
-  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-generichost-netstandard2.0\Org.OpenAPITools.sln
-  # build C# API client (netcore)
-  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient\Org.OpenAPITools.sln
-  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClientCore\Org.OpenAPITools.sln
-  # build C# API client (.net framework 4.7)
-  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net47\Org.OpenAPITools.sln
-  # build C# API client (.net framework 4.8)
-  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net48\Org.OpenAPITools.sln
-  # build C# API client (.net 5.0)
-  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net5.0\Org.OpenAPITools.sln
-  # build C# API client (.net 5.0 with ConditionalSerialization)
-  - dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-ConditionalSerialization\Org.OpenAPITools.sln
+  #- dotnet build samples\server\petstore\aspnetcore-5.0\Org.OpenAPITools.sln
+  ## build C# aspnetcore 3.1 server
+  #- dotnet build samples\server\petstore\aspnetcore-3.1\Org.OpenAPITools.sln
+  ## build C# aspnetcore 3.0 server
+  #- dotnet build samples\server\petstore\aspnetcore-3.0\Org.OpenAPITools.sln
+  ## build C# aspnetcore 2.2 server
+  #- dotnet build samples\server\petstore\aspnetcore\Org.OpenAPITools.sln
+  ## build C# API client (multiple frameworks)
+  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClientCoreAndNet47\Org.OpenAPITools.sln
+  ## build C# API client (httpclient)
+  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-httpclient\Org.OpenAPITools.sln
+  ## build C# API client (generichost)
+  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-generichost-netstandard2.0\Org.OpenAPITools.sln
+  ## build C# API client (netcore)
+  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient\Org.OpenAPITools.sln
+  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClientCore\Org.OpenAPITools.sln
+  ## build C# API client (.net framework 4.7)
+  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net47\Org.OpenAPITools.sln
+  ## build C# API client (.net framework 4.8)
+  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net48\Org.OpenAPITools.sln
+  ## build C# API client (.net 5.0)
+  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-net5.0\Org.OpenAPITools.sln
+  ## build C# API client (.net 5.0 with ConditionalSerialization)
+  #- dotnet build samples\client\petstore\csharp-netcore\OpenAPIClient-ConditionalSerialization\Org.OpenAPITools.sln
+
   ## build C# API client
   #- nuget restore samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln
   #- msbuild samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"

modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/GeneratorSettings.java

@@ -1070,7 +1070,7 @@ public Builder withHttpUserAgent(String httpUserAgent) {
         public GeneratorSettings build() {
             GeneratorSettings instance = new GeneratorSettings(this);
             //noinspection PlaceholderCountMatchesArgumentCount
-            LOGGER.debug("GeneratorSettings#build: %s", instance.toString());
+            LOGGER.debug("GeneratorSettings#build: {}", instance);
             return instance;
         }
     }

modules/openapi-generator-gradle-plugin/build.gradle

@@ -26,8 +26,8 @@ specifications as part of your build. Other tasks are available as command line
 java {
     withSourcesJar()
     withJavadocJar()
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
+    sourceCompatibility = 1.11
+    targetCompatibility = 1.11
 }
 
 repositories {

modules/openapi-generator-gradle-plugin/pom.xml

@@ -18,6 +18,7 @@
     <properties>
         <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
         <gradleVersion>7.6</gradleVersion>
+        <gradle-tooling.version>7.3-20210825160000+0000</gradle-tooling.version>
     </properties>
 
     <pluginRepositories>
@@ -77,6 +78,17 @@
                 <groupId>org.fortasoft</groupId>
                 <artifactId>gradle-maven-plugin</artifactId>
                 <version>1.0.8</version>
+
+                <!-- The plugin is no longer supported, so dependency has to be overridden -->
+                <!-- https://github.com/LendingClub/gradle-maven-plugin/issues/39 -->
+                <dependencies>
+                    <dependency>
+                        <groupId>org.gradle</groupId>
+                        <artifactId>gradle-tooling-api</artifactId>
+                        <version>${gradle-tooling.version}</version>
+                    </dependency>
+                </dependencies>
+
                 <configuration>
                     <gradleVersion>${gradleVersion}</gradleVersion>
                     <args>
@@ -85,7 +97,7 @@
                 </configuration>
                 <executions>
                     <execution>
-                        <phase>install</phase>
+                        <phase>compile</phase>
                         <goals>
                             <!-- goal must be "invoke" -->
                             <goal>invoke</goal>
@@ -100,13 +112,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.gradle</groupId>
-                        <artifactId>gradle-tooling-api</artifactId>
-                        <version>${gradleVersion}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskFromCacheTest.kt

@@ -22,7 +22,7 @@ class GenerateTaskFromCacheTest : TestBase() {
     }
 
     @DataProvider(name = "gradle_version_provider")
-    private fun gradleVersionProvider(): Array<Array<String>> = arrayOf(arrayOf("6.9.3"), arrayOf("7.6"))
+    private fun gradleVersionProvider(): Array<Array<String>> = arrayOf(arrayOf("8.1.1"), arrayOf("7.6"))
 
     // inputSpec tests
 

modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskUpToDateTest.kt

@@ -9,7 +9,7 @@ import kotlin.test.assertEquals
 class GenerateTaskUpToDateTest : TestBase() {
 
     @DataProvider(name = "gradle_version_provider")
-    private fun gradleVersionProvider(): Array<Array<String>> = arrayOf(arrayOf("6.9.3"), arrayOf("7.6"))
+    private fun gradleVersionProvider(): Array<Array<String>> = arrayOf(arrayOf("8.1.1"), arrayOf("7.6"))
 
     // inputSpec tests
 

modules/openapi-generator-gradle-plugin/src/test/kotlin/ValidateTaskDslTest.kt

@@ -17,9 +17,8 @@ class ValidateTaskDslTest : TestBase() {
     @DataProvider(name = "gradle_version_provider")
     fun gradleVersionProvider(): Array<Array<String?>> = arrayOf(
         arrayOf(null), // uses the version of Gradle used to build the plugin itself
-        arrayOf("5.6.4"),
-        arrayOf("6.9"),
-        arrayOf("7.0")
+        arrayOf("8.1.1"),
+        arrayOf("7.6")
     )
 
     private fun getGradleRunner(gradleVersion: String?): GradleRunner {

modules/openapi-generator/pom.xml

@@ -217,10 +217,6 @@
                 <version>${maven-javadoc-plugin.version}</version>
                 <configuration>
                     <debug>true</debug>
-                    <links>
-                        <link>http://java.sun.com/javaee/5/docs/api</link>
-                        <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-                    </links>
                     <excludePackageNames/>
                 </configuration>
             </plugin>

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

@@ -17,7 +17,6 @@
 
 package org.openapitools.codegen;
 
-import com.sun.org.apache.xerces.internal.impl.dv.xs.AbstractDateTimeDV;
 import io.swagger.v3.oas.models.*;
 import io.swagger.v3.oas.models.callbacks.Callback;
 import io.swagger.v3.oas.models.media.*;

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

@@ -36,9 +36,12 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.lang.reflect.AccessibleObject;
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public class HandlebarsEngineAdapter extends AbstractTemplatingEngineAdapter {
      final Logger LOGGER = LoggerFactory.getLogger(HandlebarsEngineAdapter.class);
@@ -68,12 +71,35 @@ public TemplateSource sourceAt(String location) {
             }
         };
 
+        // $ref: https://github.com/jknack/handlebars.java/issues/917
+        var MY_FIELD_VALUE_RESOLVER = new FieldValueResolver() {
+            @Override
+            protected Set<FieldWrapper> members(
+                    Class<?> clazz) {
+                var members = super.members(clazz);
+                return members.stream()
+                    .filter(fw -> isValidField(fw))
+                    .collect(Collectors.toSet());
+            }
+
+            boolean isValidField(
+                    FieldWrapper fw) {
+                if (fw instanceof AccessibleObject) {
+                    if (isUseSetAccessible(fw)) {
+                        return true;
+                    }
+                    return false;
+                }
+                return true;
+            }
+        };
+
         Context context = Context
                 .newBuilder(bundle)
                 .resolver(
                         MapValueResolver.INSTANCE,
                         JavaBeanValueResolver.INSTANCE,
-                        FieldValueResolver.INSTANCE,
+                        MY_FIELD_VALUE_RESOLVER.INSTANCE,
                         MethodValueResolver.INSTANCE)
                 .build();
 

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

@@ -1322,12 +1322,6 @@ protected Object clone() throws CloneNotSupportedException {
         return super.clone();
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        // TODO Auto-generated method stub
-        super.finalize();
-    }
-
     @Override
     public Number getNumber(JsonPointer ptr) {
         return root == null ? null : root.at(ptr).numberValue();