diff --git a/pom.xml b/pom.xml index 627906b17f..0f6ff2fb67 100644 --- a/pom.xml +++ b/pom.xml @@ -75,6 +75,102 @@ + + + + + io.swagger.core.v3 + swagger-core + ${swagger-core-version} + + + io.swagger.core.v3 + swagger-annotations + ${swagger-core-version} + + + io.swagger.core.v3 + swagger-models + ${swagger-core-version} + + + + io.swagger.parser.v3 + swagger-parser + ${swagger-parser-version} + + + io.swagger.parser.v3 + swagger-parser-core + ${swagger-parser-version} + + + io.swagger.parser.v3 + swagger-parser-v3 + ${swagger-parser-version} + + + io.swagger.parser.v3 + swagger-parser-v2-converter + ${swagger-parser-version} + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson-version} + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson-version} + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson-version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${jackson-version} + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + ${jackson-version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson-version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-xml-provider + ${jackson-version} + + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + ${jackson-version} + + + @@ -82,21 +178,6 @@ swagger-codegen ${swagger-codegen-version} - - io.swagger.core.v3 - swagger-core - ${swagger-core-version} - - - io.swagger.parser.v3 - swagger-parser-core - ${swagger-parser-version} - - - io.swagger.parser.v3 - swagger-parser-v3 - ${swagger-parser-version} - commons-io commons-io @@ -165,14 +246,15 @@ + 3.0.5-SNAPSHOT 2.0.9-SNAPSHOT + 2.0.7-SNAPSHOT + 2.9.8 2.11.1 3.3.0 - 2.0.6 2.4 1.2 4.8.1 - 2.8.9 1.0.0 3.4 1.7.12 @@ -180,8 +262,8 @@ 6.9.6 2.19.1 1.42 - 0.9.10 - 3.0.5-SNAPSHOT + 0.9.11 + diff --git a/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java b/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java index 0754439601..66ee6b284e 100644 --- a/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java +++ b/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java @@ -1,6 +1,5 @@ package io.swagger.codegen.v3.generators; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.github.jknack.handlebars.Handlebars; import com.samskivert.mustache.Mustache; @@ -3078,6 +3077,8 @@ public static String camelize(String word) { */ public static String camelize(String word, boolean lowercaseFirstLetter) { // Replace all slashes with dots (package separator) + String originalWord = word; + LOGGER.trace("camelize start - " + originalWord); Pattern p = Pattern.compile("\\/(.?)"); Matcher m = p.matcher(word); while (m.find()) { @@ -3135,7 +3136,7 @@ public static String camelize(String word, boolean lowercaseFirstLetter) { if (lowercaseFirstLetter && word.length() > 0) { word = word.substring(0, 1).toLowerCase() + word.substring(1); } - + LOGGER.trace("camelize end - {} (new: {})", originalWord, word); return word; } diff --git a/src/main/resources/handlebars/Java/README.mustache b/src/main/resources/handlebars/Java/README.mustache index 9a84754365..1ea6a809fb 100644 --- a/src/main/resources/handlebars/Java/README.mustache +++ b/src/main/resources/handlebars/Java/README.mustache @@ -76,7 +76,7 @@ Then manually install the following JARs: Please follow the [installation](#installation) instruction and execute the following Java code: ```java -{{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#@first}} +{{#apiInfo}}{{#apis}}{{#@first}}{{#operations}}{{#operation}}{{#contents}}{{#@first}} import {{{invokerPackage}}}.*; import {{{invokerPackage}}}.auth.*; import {{{modelPackage}}}.*; @@ -118,7 +118,7 @@ public class {{{classname}}}Example { } } } -{{/@first}}{{/operation}}{{/operations}}{{/-first}}{{/apis}}{{/apiInfo}} +{{/@first}}{{/contents}}{{/operation}}{{/operations}}{{/@first}}{{/apis}}{{/apiInfo}} ``` ## Documentation for API Endpoints