loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Improve version management, update dependencies, remove unused dependencies (#10544)

Browse Source 
* Move verion properties to main pom.xml

* Sort properties and remove duplicates

* Use properties for known versions

* Deduplicate versions of maven plugins

* Deduplicate wagon dependencies

* Deduplicate maven targer and source properties

* Explicitly set testng version

* Remove property used once

* Sort lines

* Standardise name of maven version properties

* Upgrade maven-surefire-plugin

* Comment out jackson-datatype-jsr310

* Comment out com.fasterxml.jackson.core:jackson-core:jar:2.10.2:compile

* Remove commented out dependencies

* Rename maven param name

* Remove org.hamcrest:java-hamcrest:jar:2.0.0.0:test

* Bump jacoco

* Upgrade guava, replace deprecated or removed api with vanilla java

* Bump jmustache.version

* Bump jackson.version

* Bump jackson.version and mockito

* Bump testng

* Bump wagon-ssh-external.version

* Downgrade jmustache

* Bump spring boot version and add junit

* Bump maven in wrapper

* Bump apache libs

* Bump dependencies

* Revert checkstyle bump
This commit is contained in:
agilob 2021-10-13 07:46:01 +01:00 committed by GitHub
parent 843e572a10
commit 45336be847
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 207 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.mvn/wrapper/maven-wrapper.properties vendored
View File

@ -1,2 +1,2 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

5
modules/openapi-generator-cli/pom.xml
View File

@ -36,6 +36,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<configuration> <configuration>
<archive> <archive>
<manifest> <manifest>
@ -144,13 +145,13 @@
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
<artifactId>testng</artifactId> <artifactId>testng</artifactId>
<!-- <version>${testng-version}</version> --> <version>${testng.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<version>${mockito-version}</version> <version>${mockito.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

10
modules/openapi-generator-core/pom.xml
View File

@ -32,16 +32,17 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>${guava-version}</version> <version>${guava.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>${slf4j-version}</version> <version>${slf4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
<artifactId>testng</artifactId> <artifactId>testng</artifactId>
<version>${testng.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -70,9 +71,4 @@
</build> </build>
</profile> </profile>
</profiles> </profiles>
<properties>
<slf4j-version>1.7.29</slf4j-version>
<guava-version>26.0-jre</guava-version>
</properties>
</project> </project>

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

@ -16,8 +16,6 @@
package org.openapitools.codegen.config; package org.openapitools.codegen.config;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -48,13 +46,13 @@ public final class GeneratorSettings implements Serializable {
private String artifactVersion; private String artifactVersion;
private String library; private String library;
private final ImmutableMap<String, String> instantiationTypes; private final Map<String, String> instantiationTypes;
private final ImmutableMap<String, String> typeMappings; private final Map<String, String> typeMappings;
private final ImmutableMap<String, Object> additionalProperties; private final Map<String, Object> additionalProperties;
private final ImmutableMap<String, String> importMappings; private final Map<String, String> importMappings;
private final ImmutableSet<String> languageSpecificPrimitives; private final Set<String> languageSpecificPrimitives;
private final ImmutableMap<String, String> reservedWordMappings; private final Map<String, String> reservedWordMappings;
private final ImmutableMap<String, String> serverVariables; private final Map<String, String> serverVariables;
private String gitHost; private String gitHost;
private String gitUserId; private String gitUserId;
@ -348,12 +346,12 @@ public final class GeneratorSettings implements Serializable {
artifactId = builder.artifactId; artifactId = builder.artifactId;
artifactVersion = builder.artifactVersion; artifactVersion = builder.artifactVersion;
library = builder.library; library = builder.library;
instantiationTypes = ImmutableMap.copyOf(builder.instantiationTypes); instantiationTypes = Collections.unmodifiableMap(builder.instantiationTypes);
typeMappings = ImmutableMap.copyOf(builder.typeMappings); typeMappings = Collections.unmodifiableMap(builder.typeMappings);
importMappings = ImmutableMap.copyOf(builder.importMappings); importMappings = Collections.unmodifiableMap(builder.importMappings);
languageSpecificPrimitives = ImmutableSet.copyOf(builder.languageSpecificPrimitives); languageSpecificPrimitives = Collections.unmodifiableSet(builder.languageSpecificPrimitives);
reservedWordMappings = ImmutableMap.copyOf(builder.reservedWordMappings); reservedWordMappings = Collections.unmodifiableMap(builder.reservedWordMappings);
serverVariables = ImmutableMap.copyOf(builder.serverVariables); serverVariables = Collections.unmodifiableMap(builder.serverVariables);
gitHost = builder.gitHost; gitHost = builder.gitHost;
gitUserId = builder.gitUserId; gitUserId = builder.gitUserId;
gitRepoId = builder.gitRepoId; gitRepoId = builder.gitRepoId;
@ -408,7 +406,7 @@ public final class GeneratorSettings implements Serializable {
additional.put("httpUserAgent", httpUserAgent); additional.put("httpUserAgent", httpUserAgent);
} }
additionalProperties = ImmutableMap.copyOf(additional); additionalProperties = Collections.unmodifiableMap(additional);
} }
/** /**
@ -417,13 +415,13 @@ public final class GeneratorSettings implements Serializable {
@SuppressWarnings("unused") @SuppressWarnings("unused")
public GeneratorSettings() { public GeneratorSettings() {
setDefaults(); setDefaults();
instantiationTypes = ImmutableMap.of(); instantiationTypes = Collections.unmodifiableMap(new HashMap<>(0));
typeMappings = ImmutableMap.of(); typeMappings = Collections.unmodifiableMap(new HashMap<>(0));
additionalProperties = ImmutableMap.of(); additionalProperties = Collections.unmodifiableMap(new HashMap<>(0));
importMappings = ImmutableMap.of(); importMappings = Collections.unmodifiableMap(new HashMap<>(0));
languageSpecificPrimitives = ImmutableSet.of(); languageSpecificPrimitives = Collections.unmodifiableSet(new HashSet<>(0));
reservedWordMappings = ImmutableMap.of(); reservedWordMappings = Collections.unmodifiableMap(new HashMap<>(0));
serverVariables = ImmutableMap.of(); serverVariables = Collections.unmodifiableMap(new HashMap<>(0));
} }
private void setDefaults() { private void setDefaults() {

12
modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java
View File

@ -16,7 +16,6 @@
package org.openapitools.codegen.config; package org.openapitools.codegen.config;
import com.google.common.collect.ImmutableMap;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -25,10 +24,7 @@ import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.HashMap; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -51,7 +47,7 @@ public class WorkflowSettings {
public static final boolean DEFAULT_STRICT_SPEC_BEHAVIOR = true; public static final boolean DEFAULT_STRICT_SPEC_BEHAVIOR = true;
public static final boolean DEFAULT_GENERATE_ALIAS_AS_MODEL = false; public static final boolean DEFAULT_GENERATE_ALIAS_AS_MODEL = false;
public static final String DEFAULT_TEMPLATING_ENGINE_NAME = "mustache"; public static final String DEFAULT_TEMPLATING_ENGINE_NAME = "mustache";
public static final ImmutableMap<String, String> DEFAULT_GLOBAL_PROPERTIES = ImmutableMap.of(); public static final Map<String, String> DEFAULT_GLOBAL_PROPERTIES = Collections.unmodifiableMap(new HashMap<>());
private String inputSpec; private String inputSpec;
private String outputDir = DEFAULT_OUTPUT_DIR; private String outputDir = DEFAULT_OUTPUT_DIR;
@ -68,7 +64,7 @@ public class WorkflowSettings {
private String templateDir; private String templateDir;
private String templatingEngineName = DEFAULT_TEMPLATING_ENGINE_NAME; private String templatingEngineName = DEFAULT_TEMPLATING_ENGINE_NAME;
private String ignoreFileOverride; private String ignoreFileOverride;
private ImmutableMap<String, ?> globalProperties = DEFAULT_GLOBAL_PROPERTIES; private Map<String, ?> globalProperties = DEFAULT_GLOBAL_PROPERTIES;
private WorkflowSettings(Builder builder) { private WorkflowSettings(Builder builder) {
this.inputSpec = builder.inputSpec; this.inputSpec = builder.inputSpec;
@ -84,7 +80,7 @@ public class WorkflowSettings {
this.templateDir = builder.templateDir; this.templateDir = builder.templateDir;
this.templatingEngineName = builder.templatingEngineName; this.templatingEngineName = builder.templatingEngineName;
this.ignoreFileOverride = builder.ignoreFileOverride; this.ignoreFileOverride = builder.ignoreFileOverride;
this.globalProperties = ImmutableMap.copyOf(builder.globalProperties); this.globalProperties = Collections.unmodifiableMap(builder.globalProperties);
this.generateAliasAsModel = builder.generateAliasAsModel; this.generateAliasAsModel = builder.generateAliasAsModel;
} }

3
modules/openapi-generator-core/src/main/java/org/openapitools/codegen/meta/FeatureSet.java
View File

@ -16,7 +16,6 @@
package org.openapitools.codegen.meta; package org.openapitools.codegen.meta;
import com.google.common.collect.ImmutableList;
import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.meta.features.*;
import org.openapitools.codegen.meta.features.annotations.AnnotationType; import org.openapitools.codegen.meta.features.annotations.AnnotationType;
@ -203,7 +202,7 @@ public class FeatureSet {
} }
public List<AnnotationType> getSource() { public List<AnnotationType> getSource() {
return ImmutableList.copyOf(source); return Collections.unmodifiableList(source);
} }
} }

2
modules/openapi-generator-gradle-plugin/pom.xml
View File

@ -106,7 +106,7 @@
<dependency> <dependency>
<groupId>org.gradle</groupId> <groupId>org.gradle</groupId>
<artifactId>gradle-tooling-api</artifactId> <artifactId>gradle-tooling-api</artifactId>
<version>${gradleVersion}</version> <version>5.6.4</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>

3
modules/openapi-generator-maven-plugin/pom.xml
View File

@ -17,7 +17,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonar.exclusions>**/src/main/java/org/openapitools/codegen/plugin/**/*</sonar.exclusions> <sonar.exclusions>**/src/main/java/org/openapitools/codegen/plugin/**/*</sonar.exclusions>
<!-- used for integration tests verification scripts, managed by the test harness plugin --> <!-- used for integration tests verification scripts, managed by the test harness plugin -->
<groovy.version>3.0.5</groovy.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
@ -59,7 +58,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<!-- <version>4.12</version> --> <version>${junit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

34
modules/openapi-generator-online/pom.xml
View File

@ -12,13 +12,8 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<name>openapi-generator-online</name> <name>openapi-generator-online</name>
<properties> <properties>
<java.version>1.8</java.version> <spring-boot.version>2.5.5</spring-boot.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<spring-boot-version>2.2.9.RELEASE</spring-boot-version>
<springfox-version>3.0.0</springfox-version> <springfox-version>3.0.0</springfox-version>
<junit-version>4.13</junit-version>
<jackson-version>2.10.2</jackson-version>
<sonar.exclusions>**/org/openapitools/codegen/online/**/*</sonar.exclusions> <sonar.exclusions>**/org/openapitools/codegen/online/**/*</sonar.exclusions>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -26,7 +21,7 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId> <artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot-version}</version> <version>${spring-boot.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@ -54,7 +49,7 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot-version}</version> <version>${spring-boot.version}</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -120,16 +115,6 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-version}</version>
</dependency>
<!-- Bean Validation API support --> <!-- Bean Validation API support -->
<dependency> <dependency>
<groupId>jakarta.validation</groupId> <groupId>jakarta.validation</groupId>
@ -141,6 +126,12 @@
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
@ -151,12 +142,5 @@
<artifactId>spring-boot-test</artifactId> <artifactId>spring-boot-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>java-hamcrest</artifactId>
<version>2.0.0.0</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

3
modules/openapi-generator-online/src/test/java/org/openapitools/codegen/online/api/GenApiControllerTest.java
View File

@ -28,7 +28,6 @@ public class GenApiControllerTest {
@Autowired @Autowired
private MockMvc mockMvc; private MockMvc mockMvc;
@Test @Test
public void clientLanguages() throws Exception { public void clientLanguages() throws Exception {
getLanguages("clients", "java"); getLanguages("clients", "java");
@ -126,4 +125,4 @@ public class GenApiControllerTest {
.andExpect(header().string(HttpHeaders.CONTENT_LENGTH, not(0))); .andExpect(header().string(HttpHeaders.CONTENT_LENGTH, not(0)));
} }
} }

91
modules/openapi-generator/pom.xml
View File

@ -27,17 +27,17 @@
<extension> <extension>
<groupId>org.jvnet.wagon-svn</groupId> <groupId>org.jvnet.wagon-svn</groupId>
<artifactId>wagon-svn</artifactId> <artifactId>wagon-svn</artifactId>
<version>1.12</version> <version>${wagon-svn.version}</version>
</extension> </extension>
<extension> <extension>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId> <artifactId>wagon-ssh-external</artifactId>
<version>2.10</version> <version>${wagon-ssh-external.version}</version>
</extension> </extension>
<extension> <extension>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav</artifactId> <artifactId>wagon-webdav</artifactId>
<version>1.0-beta-2</version> <version>${wagon-webdav.version}</version>
</extension> </extension>
</extensions> </extensions>
<directory>target</directory> <directory>target</directory>
@ -107,16 +107,16 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version> <version>${maven-compiler-plugin.version}</version>
<configuration> <configuration>
<source>1.8</source> <source>${maven.compiler.source}</source>
<target>1.8</target> <target>${maven.compiler.source}</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version> <version>${maven-jar-plugin.version}</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>
@ -138,12 +138,12 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version> <version>${maven-site-plugin.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version> <version>${maven-release-plugin.version}</version>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@ -214,7 +214,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version> <version>${maven-javadoc-plugin.version}</version>
<configuration> <configuration>
<debug>true</debug> <debug>true</debug>
<links> <links>
@ -235,7 +235,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId> <artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.0.0</version> <version>${maven-project-info-reports-plugin.version}</version>
<reportSets> <reportSets>
<reportSet> <reportSet>
<reports> <reports>
@ -246,85 +246,71 @@
</plugin> </plugin>
</plugins> </plugins>
</reporting> </reporting>
<properties>
<diffutils-version>1.3.0</diffutils-version>
<guava-version>26.0-jre</guava-version>
<generex-version>1.0.2</generex-version>
<rxgen-version>1.3</rxgen-version>
<jackson-version>2.10.1</jackson-version>
<jackson-threetenbp-version>2.10.0</jackson-threetenbp-version>
<kotlin-version>1.3.60</kotlin-version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>io.swagger.core.v3</groupId> <groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-core</artifactId> <artifactId>swagger-core</artifactId>
<version>${swagger-core-version}</version> <version>${swagger-core.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${swagger-parser-groupid}</groupId> <groupId>${swagger-parser-groupid.version}</groupId>
<artifactId>swagger-parser</artifactId> <artifactId>swagger-parser</artifactId>
<version>${swagger-parser-version}</version> <version>${swagger-parser.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.samskivert</groupId> <groupId>com.samskivert</groupId>
<artifactId>jmustache</artifactId> <artifactId>jmustache</artifactId>
<version>${jmustache-version}</version> <version>${jmustache.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.jknack</groupId> <groupId>com.github.jknack</groupId>
<artifactId>handlebars</artifactId> <artifactId>handlebars</artifactId>
<version>${handlebars.java-version}</version> <version>${handlebars-java.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.jknack</groupId> <groupId>com.github.jknack</groupId>
<artifactId>handlebars-jackson2</artifactId> <artifactId>handlebars-jackson2</artifactId>
<version>${handlebars.java-version}</version> <version>${handlebars-java.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>${commons-io-version}</version> <version>${commons-io.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId> <artifactId>slf4j-ext</artifactId>
<version>${slf4j-version}</version> <version>${slf4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>${slf4j-version}</version> <version>${slf4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
<version>${slf4j-version}</version> <version>${slf4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>${commons-lang-version}</version> <version>${commons-lang.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-cli</groupId> <groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId> <artifactId>commons-cli</artifactId>
<version>${commons-cli-version}</version> <version>${commons-cli.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>${guava-version}</version> <version>${guava.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.datatype</groupId> <groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-guava</artifactId> <artifactId>jackson-datatype-guava</artifactId>
<version>${jackson-version}</version> <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tngtech.archunit</groupId> <groupId>com.tngtech.archunit</groupId>
@ -341,7 +327,7 @@
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
<artifactId>testng</artifactId> <artifactId>testng</artifactId>
<!-- <version>${testng-version}</version> --> <version>${testng.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -353,13 +339,13 @@
<dependency> <dependency>
<groupId>org.reflections</groupId> <groupId>org.reflections</groupId>
<artifactId>reflections</artifactId> <artifactId>reflections</artifactId>
<version>${reflections-version}</version> <version>${reflections.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.googlecode.java-diff-utils</groupId> <groupId>com.googlecode.java-diff-utils</groupId>
<artifactId>diffutils</artifactId> <artifactId>diffutils</artifactId>
<version>${diffutils-version}</version> <version>${diffutils.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -370,33 +356,28 @@
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<version>${mockito-version}</version> <version>${mockito.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.mifmif</groupId> <groupId>com.github.mifmif</groupId>
<artifactId>generex</artifactId> <artifactId>generex</artifactId>
<version>${generex-version}</version> <version>${generex.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.curious-odd-man</groupId> <groupId>com.github.curious-odd-man</groupId>
<artifactId>rgxgen</artifactId> <artifactId>rgxgen</artifactId>
<version>${rxgen-version}</version> <version>${rxgen.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.datatype</groupId> <groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId> <artifactId>jackson-datatype-joda</artifactId>
<version>${jackson-version}</version> <version>${jackson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.joschi.jackson</groupId> <groupId>com.github.joschi.jackson</groupId>
<artifactId>jackson-datatype-threetenbp</artifactId> <artifactId>jackson-datatype-threetenbp</artifactId>
<version>${jackson-threetenbp-version}</version> <version>${jackson-threetenbp.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.openapitools</groupId> <groupId>org.openapitools</groupId>
@ -406,19 +387,19 @@
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId> <artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin-version}</version> <version>${kotlin.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-compiler-embeddable</artifactId> <artifactId>kotlin-compiler-embeddable</artifactId>
<version>${kotlin-version}</version> <version>${kotlin.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-script-util</artifactId> <artifactId>kotlin-script-util</artifactId>
<version>${kotlin-version}</version> <version>${kotlin.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

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

@ -168,7 +168,7 @@ public class DefaultCodegen implements CodegenConfig {
protected Map<String, String> reservedWordsMappings = new HashMap<String, String>(); protected Map<String, String> reservedWordsMappings = new HashMap<String, String>();
protected String templateDir; protected String templateDir;
protected String embeddedTemplateDir; protected String embeddedTemplateDir;
protected Map<String, Object> additionalProperties = new HashMap<String, Object>(); protected Map<String, Object> additionalProperties = new HashMap<>();
protected Map<String, String> serverVariables = new HashMap<String, String>(); protected Map<String, String> serverVariables = new HashMap<String, String>();
protected Map<String, Object> vendorExtensions = new HashMap<String, Object>(); protected Map<String, Object> vendorExtensions = new HashMap<String, Object>();
/* /*
@ -387,7 +387,7 @@ public class DefaultCodegen implements CodegenConfig {
* If common lambdas are not desired, override addMustacheLambdas() method * If common lambdas are not desired, override addMustacheLambdas() method
* and return empty builder. * and return empty builder.
* *
* @return preinitialized map builder with common lambdas * @return preinitialized map with common lambdas
*/ */
protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() { protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
@ -3419,7 +3419,7 @@ public class DefaultCodegen implements CodegenConfig {
property.example = toExampleValue(p); property.example = toExampleValue(p);
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("Error in generating `example` for the property {}. Default to ERROR_TO_EXAMPLE_VALUE. Enable debugging for more info.", property.baseName); LOGGER.error("Error in generating `example` for the property {}. Default to ERROR_TO_EXAMPLE_VALUE. Enable debugging for more info.", property.baseName);
LOGGER.debug("Exception from toExampleValue: {}", e); LOGGER.debug("Exception from toExampleValue: {}", e.getMessage());
property.example = "ERROR_TO_EXAMPLE_VALUE"; property.example = "ERROR_TO_EXAMPLE_VALUE";
} }
property.defaultValue = toDefaultValue(p); property.defaultValue = toDefaultValue(p);
@ -3574,13 +3574,13 @@ public class DefaultCodegen implements CodegenConfig {
; ;
} }
Boolean isAnyTypeWithNothingElseSet = (ModelUtils.isAnyType(p) && boolean isAnyTypeWithNothingElseSet = (ModelUtils.isAnyType(p) &&
(p.getProperties() == null || p.getProperties().isEmpty()) && (p.getProperties() == null || p.getProperties().isEmpty()) &&
!ModelUtils.isComposedSchema(p) && !ModelUtils.isComposedSchema(p) &&
p.getAdditionalProperties() == null && p.getNot() == null && p.getEnum() == null); p.getAdditionalProperties() == null && p.getNot() == null && p.getEnum() == null);
if (!ModelUtils.isArraySchema(p) && !ModelUtils.isMapSchema(p) && !isFreeFormObject(p) && !isAnyTypeWithNothingElseSet) { if (!ModelUtils.isArraySchema(p) && !ModelUtils.isMapSchema(p) && !isFreeFormObject(p) && !isAnyTypeWithNothingElseSet) {
/** schemas that are not Array, not ModelUtils.isMapSchema, not isFreeFormObject, not AnyType with nothing else set /* schemas that are not Array, not ModelUtils.isMapSchema, not isFreeFormObject, not AnyType with nothing else set
* so primitve schemas int, str, number, referenced schemas, AnyType schemas with properties, enums, or composition * so primitve schemas int, str, number, referenced schemas, AnyType schemas with properties, enums, or composition
*/ */
String type = getSchemaType(p); String type = getSchemaType(p);
@ -3673,7 +3673,7 @@ public class DefaultCodegen implements CodegenConfig {
protected Boolean isPropertyInnerMostEnum(CodegenProperty property) { protected Boolean isPropertyInnerMostEnum(CodegenProperty property) {
CodegenProperty currentProperty = getMostInnerItems(property); CodegenProperty currentProperty = getMostInnerItems(property);
return currentProperty == null ? false : currentProperty.isEnum; return currentProperty != null && currentProperty.isEnum;
} }
protected CodegenProperty getMostInnerItems(CodegenProperty property) { protected CodegenProperty getMostInnerItems(CodegenProperty property) {

3
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
View File

@ -17,7 +17,6 @@
package org.openapitools.codegen; package org.openapitools.codegen;
import com.google.common.collect.ImmutableList;
import io.swagger.v3.core.util.Json; import io.swagger.v3.core.util.Json;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
@ -112,7 +111,7 @@ public class DefaultGenerator implements Generator {
this.config = opts.getConfig(); this.config = opts.getConfig();
List<TemplateDefinition> userFiles = opts.getUserDefinedTemplates(); List<TemplateDefinition> userFiles = opts.getUserDefinedTemplates();
if (userFiles != null) { if (userFiles != null) {
this.userDefinedTemplates = ImmutableList.copyOf(userFiles); this.userDefinedTemplates = Collections.unmodifiableList(userFiles);
} }
TemplateManagerOptions templateManagerOptions = new TemplateManagerOptions(this.config.isEnableMinimalUpdate(),this.config.isSkipOverwrite()); TemplateManagerOptions templateManagerOptions = new TemplateManagerOptions(this.config.isEnableMinimalUpdate(),this.config.isSkipOverwrite());

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/DryRunTemplateManager.java
View File

@ -1,12 +1,12 @@
package org.openapitools.codegen; package org.openapitools.codegen;
import com.google.common.collect.ImmutableMap;
import org.openapitools.codegen.api.TemplateProcessor; import org.openapitools.codegen.api.TemplateProcessor;
import org.openapitools.codegen.templating.TemplateManagerOptions; import org.openapitools.codegen.templating.TemplateManagerOptions;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -32,7 +32,7 @@ public class DryRunTemplateManager implements TemplateProcessor {
* @return An immutable copy of the dry run status. * @return An immutable copy of the dry run status.
*/ */
public Map<String, DryRunStatus> getDryRunStatusMap() { public Map<String, DryRunStatus> getDryRunStatusMap() {
return ImmutableMap.copyOf(dryRunStatusMap); return Collections.unmodifiableMap(dryRunStatusMap);
} }
/** /**

24
modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/CodegenIgnoreProcessor.java
View File

@ -17,8 +17,6 @@
package org.openapitools.codegen.ignore; package org.openapitools.codegen.ignore;
import com.google.common.collect.ImmutableList;
import com.google.common.io.Files;
import org.openapitools.codegen.ignore.rules.DirectoryRule; import org.openapitools.codegen.ignore.rules.DirectoryRule;
import org.openapitools.codegen.ignore.rules.Rule; import org.openapitools.codegen.ignore.rules.Rule;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -26,10 +24,10 @@ import org.slf4j.LoggerFactory;
import java.io.*; import java.io.*;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.ArrayList; import java.nio.file.Files;
import java.util.Collection; import java.util.*;
import java.util.List;
import java.util.Locale; import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
/** /**
* Presents a processing utility for parsing and evaluating files containing common ignore patterns. (.openapi-generator-ignore) * Presents a processing utility for parsing and evaluating files containing common ignore patterns. (.openapi-generator-ignore)
@ -91,7 +89,7 @@ public class CodegenIgnoreProcessor {
if (legacyIgnoreFile.exists() && legacyIgnoreFile.isFile()) { if (legacyIgnoreFile.exists() && legacyIgnoreFile.isFile()) {
LOGGER.info(String.format(Locale.ROOT, "Legacy support: '%s' file renamed to '%s'.", legacyIgnoreFile.getName(), targetIgnoreFile.getName())); LOGGER.info(String.format(Locale.ROOT, "Legacy support: '%s' file renamed to '%s'.", legacyIgnoreFile.getName(), targetIgnoreFile.getName()));
try { try {
Files.move(legacyIgnoreFile, targetIgnoreFile); Files.move(legacyIgnoreFile.toPath(), targetIgnoreFile.toPath(), REPLACE_EXISTING);
loadFromFile(targetIgnoreFile); loadFromFile(targetIgnoreFile);
} catch (IOException e) { } catch (IOException e) {
LOGGER.error(String.format(Locale.ROOT, "Could not rename file: %s", e.getMessage())); LOGGER.error(String.format(Locale.ROOT, "Could not rename file: %s", e.getMessage()));
@ -143,8 +141,8 @@ public class CodegenIgnoreProcessor {
if(this.ignoreFile == null) return true; if(this.ignoreFile == null) return true;
File file = new File(this.ignoreFile.getAbsoluteFile().getParentFile().toURI().relativize(targetFile.toURI()).getPath()); File file = new File(this.ignoreFile.getAbsoluteFile().getParentFile().toURI().relativize(targetFile.toURI()).getPath());
Boolean directoryExcluded = false; boolean directoryExcluded = false;
Boolean exclude = false; boolean exclude = false;
if(exclusionRules.size() == 0 && inclusionRules.size() == 0) { if(exclusionRules.size() == 0 && inclusionRules.size() == 0) {
return true; return true;
} }
@ -207,10 +205,10 @@ public class CodegenIgnoreProcessor {
/** /**
* Allows a consumer to manually inspect explicit "inclusion rules". That is, patterns in the ignore file which have been negated. * Allows a consumer to manually inspect explicit "inclusion rules". That is, patterns in the ignore file which have been negated.
* *
* @return A {@link ImmutableList#copyOf(Collection)} of rules which possibly negate exclusion rules in the ignore file. * @return A {@link Collections#unmodifiableList(List)} of rules which possibly negate exclusion rules in the ignore file.
*/ */
public List<Rule> getInclusionRules() { public List<Rule> getInclusionRules() {
return ImmutableList.copyOf(inclusionRules); return Collections.unmodifiableList(inclusionRules);
} }
/** /**
@ -219,9 +217,9 @@ public class CodegenIgnoreProcessor {
* *
* NOTE: Existence in this list doesn't mean a file is excluded. The rule can be overridden by {@link CodegenIgnoreProcessor#getInclusionRules()} rules. * NOTE: Existence in this list doesn't mean a file is excluded. The rule can be overridden by {@link CodegenIgnoreProcessor#getInclusionRules()} rules.
* *
* @return A {@link ImmutableList#copyOf(Collection)} of rules which define exclusions by patterns in the ignore file. * @return A {@link Collections#unmodifiableList(List)} of rules which define exclusions by patterns in the ignore file.
*/ */
public List<Rule> getExclusionRules() { public List<Rule> getExclusionRules() {
return ImmutableList.copyOf(exclusionRules); return Collections.unmodifiableList((exclusionRules));
} }
} }

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
View File

@ -17,7 +17,7 @@
package org.openapitools.codegen.languages; package org.openapitools.codegen.languages;
import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.ImmutableMap;
import com.samskivert.mustache.Mustache.Lambda; import com.samskivert.mustache.Mustache.Lambda;
import io.swagger.v3.core.util.Json; import io.swagger.v3.core.util.Json;
@ -393,7 +393,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
} }
@Override @Override
protected Builder<String, Lambda> addMustacheLambdas() { protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
return super.addMustacheLambdas() return super.addMustacheLambdas()
.put("camelcase_param", new CamelCaseLambda().generator(this).escapeAsParamName(true)); .put("camelcase_param", new CamelCaseLambda().generator(this).escapeAsParamName(true));
} }

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
View File

@ -17,7 +17,7 @@
package org.openapitools.codegen.languages; package org.openapitools.codegen.languages;
import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.ImmutableMap;
import com.samskivert.mustache.Mustache.Lambda; import com.samskivert.mustache.Mustache.Lambda;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
@ -307,7 +307,7 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg
} }
@Override @Override
protected Builder<String, Lambda> addMustacheLambdas() { protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
return super.addMustacheLambdas() return super.addMustacheLambdas()
.put("multiline_comment_4", new IndentedLambda(4, " ", "///")); .put("multiline_comment_4", new IndentedLambda(4, " ", "///"));
} }

40
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
View File

@ -1,7 +1,5 @@
package org.openapitools.codegen.languages; package org.openapitools.codegen.languages;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.Schema;
@ -114,13 +112,12 @@ public abstract class AbstractDartCodegen extends DefaultCodegen {
setReservedWordsLowerCase(reservedWordsList); setReservedWordsLowerCase(reservedWordsList);
// These types return isPrimitive=true in templates // These types return isPrimitive=true in templates
languageSpecificPrimitives = Sets.newHashSet( languageSpecificPrimitives = new HashSet<>(5);
"String", languageSpecificPrimitives.add("String");
"bool", languageSpecificPrimitives.add("bool");
"int", languageSpecificPrimitives.add("int");
"num", languageSpecificPrimitives.add("num");
"double" languageSpecificPrimitives.add("double");
);
typeMapping = new HashMap<>(); typeMapping = new HashMap<>();
typeMapping.put("Array", "List"); typeMapping.put("Array", "List");
@ -151,18 +148,17 @@ public abstract class AbstractDartCodegen extends DefaultCodegen {
typeMapping.put("AnyType", "Object"); typeMapping.put("AnyType", "Object");
// Data types of the above values which are automatically imported // Data types of the above values which are automatically imported
defaultIncludes = Sets.newHashSet( defaultIncludes = new HashSet<>();
"String", defaultIncludes.add("String");
"bool", defaultIncludes.add("bool");
"int", defaultIncludes.add("int");
"num", defaultIncludes.add("num");
"double", defaultIncludes.add("double");
"List", defaultIncludes.add("List");
"Set", defaultIncludes.add("Set");
"Map", defaultIncludes.add("Map");
"DateTime", defaultIncludes.add("DateTime");
"Object" defaultIncludes.add("Object");
);
imports.put("String", "dart:core"); imports.put("String", "dart:core");
imports.put("bool", "dart:core"); imports.put("bool", "dart:core");
@ -345,7 +341,7 @@ public abstract class AbstractDartCodegen extends DefaultCodegen {
// replace all characters that have a mapping but ignore underscores // replace all characters that have a mapping but ignore underscores
// append an underscore to each replacement so that it can be camelized // append an underscore to each replacement so that it can be camelized
if (name.chars().anyMatch(character -> specialCharReplacements.containsKey("" + ((char) character)))) { if (name.chars().anyMatch(character -> specialCharReplacements.containsKey("" + ((char) character)))) {
name = escape(name, specialCharReplacements, Lists.newArrayList("_"), "_"); name = escape(name, specialCharReplacements, Collections.singletonList("_"), "_");
} }
// remove the rest // remove the rest
name = sanitizeName(name); name = sanitizeName(name);

5
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
View File

@ -30,7 +30,6 @@ import org.slf4j.LoggerFactory;
import java.util.*; import java.util.*;
import static com.google.common.base.Strings.isNullOrEmpty;
import static org.openapitools.codegen.utils.StringUtils.camelize; import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.underscore; import static org.openapitools.codegen.utils.StringUtils.underscore;
@ -268,13 +267,13 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
@Override @Override
public void postProcessModelProperty(CodegenModel model, CodegenProperty property) { public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
if (!isNullOrEmpty(model.parent)) { if (StringUtils.isNotBlank(model.parent)) {
parentModels.add(model.parent); parentModels.add(model.parent);
if (!childrenByParent.containsEntry(model.parent, model)) { if (!childrenByParent.containsEntry(model.parent, model)) {
childrenByParent.put(model.parent, model); childrenByParent.put(model.parent, model);
} }
} }
if (!isNullOrEmpty(model.parentSchema)) { if (StringUtils.isNotBlank(model.parentSchema)) {
model.parentSchema = model.parentSchema.toLowerCase(Locale.ROOT); model.parentSchema = model.parentSchema.toLowerCase(Locale.ROOT);
} }
} }

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java
View File

@ -16,7 +16,7 @@
package org.openapitools.codegen.languages; package org.openapitools.codegen.languages;
import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.ImmutableMap;
import com.samskivert.mustache.Mustache.Lambda; import com.samskivert.mustache.Mustache.Lambda;
import io.swagger.v3.core.util.Json; import io.swagger.v3.core.util.Json;
@ -306,7 +306,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
} }
@Override @Override
protected Builder<String, Lambda> addMustacheLambdas() { protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
return super.addMustacheLambdas() return super.addMustacheLambdas()
.put("camelcase_param", new CamelCaseLambda().generator(this).escapeAsParamName(true)); .put("camelcase_param", new CamelCaseLambda().generator(this).escapeAsParamName(true));
} }

60
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
View File

@ -17,67 +17,12 @@
package org.openapitools.codegen.languages; package org.openapitools.codegen.languages;
import static org.openapitools.codegen.utils.StringUtils.camelize;
import static org.openapitools.codegen.utils.StringUtils.escape;
import static org.openapitools.codegen.utils.StringUtils.underscore;
import java.io.File;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.regex.Pattern;
import java.util.stream.Stream;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConfig;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenParameter;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.meta.features.ClientModificationFeature;
import org.openapitools.codegen.meta.features.DocumentationFeature;
import org.openapitools.codegen.meta.features.GlobalFeature;
import org.openapitools.codegen.meta.features.SchemaSupportFeature;
import org.openapitools.codegen.meta.features.SecurityFeature;
import org.openapitools.codegen.meta.features.WireFormatFeature;
import org.openapitools.codegen.utils.ModelUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Sets;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.PathItem;
import io.swagger.v3.oas.models.examples.Example; import io.swagger.v3.oas.models.examples.Example;
import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.oas.models.media.Content;
import io.swagger.v3.oas.models.media.ComposedSchema;
import io.swagger.v3.oas.models.media.MediaType;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.parameters.Parameter;
import io.swagger.v3.oas.models.parameters.RequestBody; import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.servers.Server;
@ -96,6 +41,7 @@ import java.io.IOException;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.ZoneId; import java.time.ZoneId;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -347,7 +293,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
if (additionalProperties.containsKey(ADDITIONAL_MODEL_TYPE_ANNOTATIONS)) { if (additionalProperties.containsKey(ADDITIONAL_MODEL_TYPE_ANNOTATIONS)) {
String additionalAnnotationsList = additionalProperties.get(ADDITIONAL_MODEL_TYPE_ANNOTATIONS).toString(); String additionalAnnotationsList = additionalProperties.get(ADDITIONAL_MODEL_TYPE_ANNOTATIONS).toString();
this.setAdditionalModelTypeAnnotations(new ArrayList<>(Sets.newHashSet(additionalAnnotationsList.trim().split("\\s*(;|\\r?\\n)\\s*")))); this.setAdditionalModelTypeAnnotations(Arrays.asList(additionalAnnotationsList.trim().split("\\s*(;|\\r?\\n)\\s*")));
} }
if (additionalProperties.containsKey(ADDITIONAL_ENUM_TYPE_ANNOTATIONS)) { if (additionalProperties.containsKey(ADDITIONAL_ENUM_TYPE_ANNOTATIONS)) {

9
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
View File

@ -17,7 +17,6 @@
package org.openapitools.codegen.languages; package org.openapitools.codegen.languages;
import com.google.common.collect.Maps;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.oas.models.media.ComposedSchema;
@ -270,10 +269,10 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
return name.contains("&"); return name.contains("&");
} }
private Map<String,String> toImportMap(String... names){ private Map<String,String> toImportMap(String... names) {
Map<String,String> result = Maps.newHashMap(); Map<String,String> result = new HashMap<>();
for(String name: names){ for(final String name : names) {
if(needToImport(name)){ if(needToImport(name)) {
result.put(toModelImport(name), name); result.put(toModelImport(name), name);
} }
} }

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java
View File

@ -38,6 +38,7 @@ import java.util.stream.Collectors;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CodegenConfig; import org.openapitools.codegen.CodegenConfig;
@ -55,7 +56,6 @@ import org.openapitools.codegen.utils.ModelUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableMap.Builder;
import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Mustache;
import com.samskivert.mustache.Mustache.Lambda; import com.samskivert.mustache.Mustache.Lambda;
import com.samskivert.mustache.Template; import com.samskivert.mustache.Template;
@ -746,7 +746,7 @@ public class K6ClientCodegen extends DefaultCodegen implements CodegenConfig {
} }
@Override @Override
protected Builder<String, Lambda> addMustacheLambdas() { protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
return super.addMustacheLambdas().put("handleParamValue", new ParameterValueLambda()); return super.addMustacheLambdas().put("handleParamValue", new ParameterValueLambda());
} }
} }

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
View File

@ -16,7 +16,7 @@
package org.openapitools.codegen.languages; package org.openapitools.codegen.languages;
import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.ImmutableMap;
import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Mustache;
import com.samskivert.mustache.Mustache.Lambda; import com.samskivert.mustache.Mustache.Lambda;
import com.samskivert.mustache.Template; import com.samskivert.mustache.Template;
@ -437,7 +437,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
} }
@Override @Override
protected Builder<String, Lambda> addMustacheLambdas() { protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
return super.addMustacheLambdas() return super.addMustacheLambdas()
.put("escapeDoubleQuote", new EscapeLambda("\"", "\\\"")); .put("escapeDoubleQuote", new EscapeLambda("\"", "\\\""));
} }

5
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java
View File

@ -16,7 +16,6 @@
package org.openapitools.codegen.languages; package org.openapitools.codegen.languages;
import com.google.common.base.Strings;
import io.swagger.v3.oas.models.*; import io.swagger.v3.oas.models.*;
import io.swagger.v3.oas.models.headers.Header; import io.swagger.v3.oas.models.headers.Header;
import io.swagger.v3.oas.models.media.*; import io.swagger.v3.oas.models.media.*;
@ -522,11 +521,11 @@ public class OCamlClientCodegen extends DefaultCodegen implements CodegenConfig
@Override @Override
public String toModelFilename(String name) { public String toModelFilename(String name) {
if (!Strings.isNullOrEmpty(modelNamePrefix)) { if (!StringUtils.isBlank(modelNamePrefix)) {
name = modelNamePrefix + "_" + name; name = modelNamePrefix + "_" + name;
} }
if (!Strings.isNullOrEmpty(modelNameSuffix)) { if (!StringUtils.isBlank(modelNameSuffix)) {
name = name + "_" + modelNameSuffix; name = name + "_" + modelNameSuffix;
} }

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIYamlGenerator.java
View File

@ -17,13 +17,13 @@
package org.openapitools.codegen.languages; package org.openapitools.codegen.languages;
import com.google.common.collect.ImmutableMap;
import org.openapitools.codegen.*; import org.openapitools.codegen.*;
import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.meta.features.*;
import org.openapitools.codegen.templating.mustache.OnChangeLambda; import org.openapitools.codegen.templating.mustache.OnChangeLambda;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableMap.Builder;
import com.samskivert.mustache.Mustache.Lambda; import com.samskivert.mustache.Mustache.Lambda;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
@ -85,7 +85,7 @@ public class OpenAPIYamlGenerator extends DefaultCodegen implements CodegenConfi
} }
@Override @Override
protected Builder<String, Lambda> addMustacheLambdas() { protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
return super.addMustacheLambdas() return super.addMustacheLambdas()
.put("onchange", new OnChangeLambda()); .put("onchange", new OnChangeLambda());
} }

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java
View File

@ -16,7 +16,7 @@
package org.openapitools.codegen.languages; package org.openapitools.codegen.languages;
import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.ImmutableMap;
import com.samskivert.mustache.Mustache.Lambda; import com.samskivert.mustache.Mustache.Lambda;
import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.ArraySchema;
@ -216,7 +216,7 @@ public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implem
} }
@Override @Override
protected Builder<String, Lambda> addMustacheLambdas() { protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
return super.addMustacheLambdas() return super.addMustacheLambdas()
.put("indented_4", new IndentedLambda(4, " ")); .put("indented_4", new IndentedLambda(4, " "));
} }

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java
View File

@ -314,7 +314,7 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
for (Object _mo : models) { for (Object _mo : models) {
Map<String, Object> mo = (Map<String, Object>) _mo; Map<String, Object> mo = (Map<String, Object>) _mo;
ExtendedCodegenModel cm = (ExtendedCodegenModel) mo.get("model"); ExtendedCodegenModel cm = (ExtendedCodegenModel) mo.get("model");
cm.imports = new TreeSet(cm.imports); cm.imports = new TreeSet<>(cm.imports);
this.processCodeGenModel(cm); this.processCodeGenModel(cm);
} }

3
modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/URLPathUtils.java
View File

@ -17,7 +17,6 @@
package org.openapitools.codegen.utils; package org.openapitools.codegen.utils;
import com.google.common.collect.ImmutableMap;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.servers.Server;
import io.swagger.v3.oas.models.servers.ServerVariable; import io.swagger.v3.oas.models.servers.ServerVariable;
@ -59,7 +58,7 @@ public class URLPathUtils {
variables = new ServerVariables(); variables = new ServerVariables();
} }
Map<String, String> userVariables = userDefinedVariables == null ? new HashMap<>() : ImmutableMap.copyOf(userDefinedVariables); Map<String, String> userVariables = userDefinedVariables == null ? new HashMap<>() : Collections.unmodifiableMap(userDefinedVariables);
if (StringUtils.isNotBlank(url)) { if (StringUtils.isNotBlank(url)) {
url = extractUrl(server, url, variables, userVariables); url = extractUrl(server, url, variables, userVariables);

107
pom.xml
View File

@ -88,17 +88,17 @@
<extension> <extension>
<groupId>org.jvnet.wagon-svn</groupId> <groupId>org.jvnet.wagon-svn</groupId>
<artifactId>wagon-svn</artifactId> <artifactId>wagon-svn</artifactId>
<version>1.8</version> <version>${wagon-svn.version}</version>
</extension> </extension>
<extension> <extension>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId> <artifactId>wagon-ssh-external</artifactId>
<version>1.0-alpha-6</version> <version>${wagon-ssh-external.version}</version>
</extension> </extension>
<extension> <extension>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav</artifactId> <artifactId>wagon-webdav</artifactId>
<version>1.0-beta-1</version> <version>${wagon-webdav.version}</version>
</extension> </extension>
</extensions> </extensions>
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
@ -173,7 +173,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-version}</version> <version>${maven-surefire-plugin.version}</version>
<configuration> <configuration>
<printSummary>true</printSummary> <printSummary>true</printSummary>
<forkedProcessExitTimeoutInSeconds>120</forkedProcessExitTimeoutInSeconds> <forkedProcessExitTimeoutInSeconds>120</forkedProcessExitTimeoutInSeconds>
@ -216,16 +216,16 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version> <version>${maven-compiler-plugin.version}</version>
<configuration> <configuration>
<source>1.8</source> <source>${maven.compiler.source}</source>
<target>1.8</target> <target>${maven.compiler.source}</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version> <version>${maven-jar-plugin.version}</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>
@ -240,20 +240,20 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version> <version>${maven-site-plugin.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version> <version>${maven-release-plugin.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version> <version>${maven-javadoc-plugin.version}</version>
<configuration> <configuration>
<source>1.8</source> <source>${maven.compiler.source}</source>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
<maxmemory>1g</maxmemory> <maxmemory>1g</maxmemory>
<failOnWarnings>true</failOnWarnings> <failOnWarnings>true</failOnWarnings>
@ -345,7 +345,7 @@
<plugin> <plugin>
<groupId>se.bjurr.violations</groupId> <groupId>se.bjurr.violations</groupId>
<artifactId>violations-maven-plugin</artifactId> <artifactId>violations-maven-plugin</artifactId>
<version>${violations-maven.plugin.version}</version> <version>${violations-maven-plugin.version}</version>
<configuration> <configuration>
<maxViolations>0</maxViolations> <maxViolations>0</maxViolations>
<detailLevel>VERBOSE</detailLevel> <detailLevel>VERBOSE</detailLevel>
@ -383,12 +383,12 @@
<plugin> <plugin>
<groupId>com.github.spotbugs</groupId> <groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId> <artifactId>spotbugs-maven-plugin</artifactId>
<version>${spotbugs.plugin.version}</version> <version>${spotbugs-plugin.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId> <artifactId>maven-pmd-plugin</artifactId>
<version>${pmd.plugin.version}</version> <version>${pmd-plugin.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -398,7 +398,7 @@
<plugin> <plugin>
<groupId>pl.project13.maven</groupId> <groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId> <artifactId>git-commit-id-plugin</artifactId>
<version>${git.commit.id.plugin.version}</version> <version>${git-commit-id-plugin.version}</version>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
@ -477,7 +477,7 @@
<plugin> <plugin>
<groupId>com.github.spotbugs</groupId> <groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId> <artifactId>spotbugs-maven-plugin</artifactId>
<version>${spotbugs.plugin.version}</version> <version>${spotbugs-plugin.version}</version>
<configuration> <configuration>
<failOnError>false</failOnError> <failOnError>false</failOnError>
<!-- https://spotbugs.readthedocs.io/en/stable/effort.html --> <!-- https://spotbugs.readthedocs.io/en/stable/effort.html -->
@ -497,7 +497,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId> <artifactId>maven-pmd-plugin</artifactId>
<version>${pmd.plugin.version}</version> <version>${pmd-plugin.version}</version>
<configuration> <configuration>
<sourceEncoding>${project.build.sourceEncoding}</sourceEncoding> <sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
<failOnViolation>false</failOnViolation> <failOnViolation>false</failOnViolation>
@ -526,7 +526,7 @@
<plugin> <plugin>
<groupId>com.github.spotbugs</groupId> <groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId> <artifactId>spotbugs-maven-plugin</artifactId>
<version>${spotbugs.plugin.version}</version> <version>${spotbugs-plugin.version}</version>
</plugin> </plugin>
</plugins> </plugins>
</reporting> </reporting>
@ -1499,7 +1499,7 @@
<plugin> <plugin>
<groupId>net.alchim31.maven</groupId> <groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId> <artifactId>scala-maven-plugin</artifactId>
<version>${scala-maven-plugin-version}</version> <version>${scala-maven-plugin.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -1512,7 +1512,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId> <artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.0.0</version> <version>${maven-project-info-reports-plugin.version}</version>
<reportSets> <reportSets>
<reportSet> <reportSet>
<reports> <reports>
@ -1528,13 +1528,13 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${junit-version}</version> <version>${junit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
<artifactId>testng</artifactId> <artifactId>testng</artifactId>
<version>${testng-version}</version> <version>${testng.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -1551,29 +1551,44 @@
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<swagger-core-version>2.1.2</swagger-core-version>
<swagger-parser-groupid>io.swagger.parser.v3</swagger-parser-groupid>
<swagger-parser-version>2.0.26</swagger-parser-version>
<felix-version>3.3.1</felix-version>
<commons-io-version>2.4</commons-io-version>
<commons-cli-version>1.2</commons-cli-version>
<junit-version>4.13</junit-version>
<jackson-version>2.10.2</jackson-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<commons-lang-version>3.4</commons-lang-version>
<slf4j-version>1.7.29</slf4j-version>
<scala-maven-plugin-version>4.3.1</scala-maven-plugin-version>
<jmustache-version>1.14</jmustache-version>
<handlebars.java-version>4.2.1</handlebars.java-version>
<testng-version>7.1.0</testng-version>
<surefire-version>3.0.0-M5</surefire-version>
<reflections-version>0.9.10</reflections-version>
<mockito-version>3.6.28</mockito-version>
<jacoco.version>0.8.5</jacoco.version>
<spotbugs.plugin.version>3.1.12.2</spotbugs.plugin.version>
<pmd.plugin.version>3.12.0</pmd.plugin.version>
<violations-maven.plugin.version>1.34</violations-maven.plugin.version>
<checkstyle.plugin.version>3.1.0</checkstyle.plugin.version> <checkstyle.plugin.version>3.1.0</checkstyle.plugin.version>
<git.commit.id.plugin.version>4.0.0</git.commit.id.plugin.version> <commons-cli.version>1.4</commons-cli.version>
<commons-io.version>2.11.0</commons-io.version>
<commons-lang.version>3.12.0</commons-lang.version>
<diffutils.version>1.3.0</diffutils.version>
<generex.version>1.0.2</generex.version>
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
<groovy.version>3.0.9</groovy.version>
<guava.version>30.1.1-jre</guava.version>
<handlebars-java.version>4.2.1</handlebars-java.version>
<jackson-threetenbp.version>2.10.0</jackson-threetenbp.version>
<jackson.version>2.10.2</jackson.version>
<jacoco.version>0.8.7</jacoco.version>
<jmustache.version>1.14</jmustache.version>
<junit.version>4.13</junit.version>
<kotlin.version>1.3.60</kotlin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-site-plugin.version>3.7.1</maven-site-plugin.version>
<mockito.version>3.12.4</mockito.version>
<pmd-plugin.version>3.12.0</pmd-plugin.version>
<reflections.version>0.10</reflections.version>
<rxgen.version>1.3</rxgen.version>
<scala-maven-plugin.version>4.3.1</scala-maven-plugin.version>
<slf4j.version>1.7.32</slf4j.version>
<spotbugs-plugin.version>3.1.12.2</spotbugs-plugin.version>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<swagger-core.version>2.1.2</swagger-core.version>
<swagger-parser-groupid.version>io.swagger.parser.v3</swagger-parser-groupid.version>
<swagger-parser.version>2.0.26</swagger-parser.version>
<testng.version>7.4.0</testng.version>
<violations-maven-plugin.version>1.34</violations-maven-plugin.version>
<wagon-ssh-external.version>3.4.3</wagon-ssh-external.version>
<wagon-svn.version>1.12</wagon-svn.version>
<wagon-webdav.version>1.0-beta-2</wagon-webdav.version>
</properties> </properties>
</project> </project>