Skip to content

Commit 29aaf16

Browse files
frantumafrantuma
authored
Merge pull request #305 from swagger-api/dep-versions
update dep versions and logging, update java README broken in commit #2243380
2 parents d24c187 + 578685b commit 29aaf16

File tree

3 files changed

+106
-23
lines changed

3 files changed

+106
-23
lines changed

‎pom.xml

Lines changed: 101 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -75,28 +75,109 @@
7575
</plugin>
7676
</plugins>
7777
</build>
78+
<dependencyManagement>
79+
<dependencies>
80+
<!-- swagger-core v2 -->
81+
<dependency>
82+
<groupId>io.swagger.core.v3</groupId>
83+
<artifactId>swagger-core</artifactId>
84+
<version>${swagger-core-version}</version>
85+
</dependency>
86+
<dependency>
87+
<groupId>io.swagger.core.v3</groupId>
88+
<artifactId>swagger-annotations</artifactId>
89+
<version>${swagger-core-version}</version>
90+
</dependency>
91+
<dependency>
92+
<groupId>io.swagger.core.v3</groupId>
93+
<artifactId>swagger-models</artifactId>
94+
<version>${swagger-core-version}</version>
95+
</dependency>
96+
<!-- swagger-parser v2 -->
97+
<dependency>
98+
<groupId>io.swagger.parser.v3</groupId>
99+
<artifactId>swagger-parser</artifactId>
100+
<version>${swagger-parser-version}</version>
101+
</dependency>
102+
<dependency>
103+
<groupId>io.swagger.parser.v3</groupId>
104+
<artifactId>swagger-parser-core</artifactId>
105+
<version>${swagger-parser-version}</version>
106+
</dependency>
107+
<dependency>
108+
<groupId>io.swagger.parser.v3</groupId>
109+
<artifactId>swagger-parser-v3</artifactId>
110+
<version>${swagger-parser-version}</version>
111+
</dependency>
112+
<dependency>
113+
<groupId>io.swagger.parser.v3</groupId>
114+
<artifactId>swagger-parser-v2-converter</artifactId>
115+
<version>${swagger-parser-version}</version>
116+
</dependency>
117+
<!-- jackson -->
118+
<dependency>
119+
<groupId>com.fasterxml.jackson.core</groupId>
120+
<artifactId>jackson-databind</artifactId>
121+
<version>${jackson-version}</version>
122+
</dependency>
123+
<dependency>
124+
<groupId>com.fasterxml.jackson.core</groupId>
125+
<artifactId>jackson-annotations</artifactId>
126+
<version>${jackson-version}</version>
127+
</dependency>
128+
<dependency>
129+
<groupId>com.fasterxml.jackson.core</groupId>
130+
<artifactId>jackson-core</artifactId>
131+
<version>${jackson-version}</version>
132+
</dependency>
133+
134+
<dependency>
135+
<groupId>com.fasterxml.jackson.module</groupId>
136+
<artifactId>jackson-module-jaxb-annotations</artifactId>
137+
<version>${jackson-version}</version>
138+
</dependency>
139+
140+
<dependency>
141+
<groupId>com.fasterxml.jackson.dataformat</groupId>
142+
<artifactId>jackson-dataformat-xml</artifactId>
143+
<version>${jackson-version}</version>
144+
</dependency>
145+
<dependency>
146+
<groupId>com.fasterxml.jackson.dataformat</groupId>
147+
<artifactId>jackson-dataformat-yaml</artifactId>
148+
<version>${jackson-version}</version>
149+
</dependency>
150+
151+
<dependency>
152+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
153+
<artifactId>jackson-jaxrs-base</artifactId>
154+
<version>${jackson-version}</version>
155+
</dependency>
156+
<dependency>
157+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
158+
<artifactId>jackson-jaxrs-json-provider</artifactId>
159+
<version>${jackson-version}</version>
160+
</dependency>
161+
<dependency>
162+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
163+
<artifactId>jackson-jaxrs-xml-provider</artifactId>
164+
<version>${jackson-version}</version>
165+
</dependency>
166+
167+
<dependency>
168+
<groupId>com.fasterxml.jackson.datatype</groupId>
169+
<artifactId>jackson-datatype-joda</artifactId>
170+
<version>${jackson-version}</version>
171+
</dependency>
172+
</dependencies>
173+
</dependencyManagement>
78174

79175
<dependencies>
80176
<dependency>
81177
<groupId>io.swagger.codegen.v3</groupId>
82178
<artifactId>swagger-codegen</artifactId>
83179
<version>${swagger-codegen-version}</version>
84180
</dependency>
85-
<dependency>
86-
<groupId>io.swagger.core.v3</groupId>
87-
<artifactId>swagger-core</artifactId>
88-
<version>${swagger-core-version}</version>
89-
</dependency>
90-
<dependency>
91-
<groupId>io.swagger.parser.v3</groupId>
92-
<artifactId>swagger-parser-core</artifactId>
93-
<version>${swagger-parser-version}</version>
94-
</dependency>
95-
<dependency>
96-
<groupId>io.swagger.parser.v3</groupId>
97-
<artifactId>swagger-parser-v3</artifactId>
98-
<version>${swagger-parser-version}</version>
99-
</dependency>
100181
<dependency>
101182
<groupId>commons-io</groupId>
102183
<artifactId>commons-io</artifactId>
@@ -165,23 +246,24 @@
165246
</dependency>
166247
</dependencies>
167248
<properties>
249+
<swagger-codegen-version>3.0.5-SNAPSHOT</swagger-codegen-version>
168250
<swagger-parser-version>2.0.9-SNAPSHOT</swagger-parser-version>
251+
<swagger-core-version>2.0.7-SNAPSHOT</swagger-core-version>
252+
<jackson-version>2.9.8</jackson-version>
169253
<scala-version>2.11.1</scala-version>
170254
<felix-version>3.3.0</felix-version>
171-
<swagger-core-version>2.0.6</swagger-core-version>
172255
<commons-io-version>2.4</commons-io-version>
173256
<commons-cli-version>1.2</commons-cli-version>
174257
<junit-version>4.8.1</junit-version>
175-
<jackson-version>2.8.9</jackson-version>
176258
<maven-plugin-version>1.0.0</maven-plugin-version>
177259
<commons-lang-version>3.4</commons-lang-version>
178260
<slf4j-version>1.7.12</slf4j-version>
179261
<scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
180262
<testng-version>6.9.6</testng-version>
181263
<surefire-version>2.19.1</surefire-version>
182264
<jmockit-version>1.42</jmockit-version>
183-
<reflections-version>0.9.10</reflections-version>
184-
<swagger-codegen-version>3.0.5-SNAPSHOT</swagger-codegen-version>
265+
<reflections-version>0.9.11</reflections-version>
266+
185267
</properties>
186268

187269
</project>

‎src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.swagger.codegen.v3.generators;
22

3-
import com.fasterxml.jackson.core.JsonProcessingException;
43
import com.fasterxml.jackson.databind.JsonNode;
54
import com.github.jknack.handlebars.Handlebars;
65
import com.samskivert.mustache.Mustache;
@@ -3078,6 +3077,8 @@ public static String camelize(String word) {
30783077
*/
30793078
public static String camelize(String word, boolean lowercaseFirstLetter) {
30803079
// Replace all slashes with dots (package separator)
3080+
String originalWord = word;
3081+
LOGGER.trace("camelize start - " + originalWord);
30813082
Pattern p = Pattern.compile("\\/(.?)");
30823083
Matcher m = p.matcher(word);
30833084
while (m.find()) {
@@ -3135,7 +3136,7 @@ public static String camelize(String word, boolean lowercaseFirstLetter) {
31353136
if (lowercaseFirstLetter && word.length() > 0) {
31363137
word = word.substring(0, 1).toLowerCase() + word.substring(1);
31373138
}
3138-
3139+
LOGGER.trace("camelize end - {} (new: {})", originalWord, word);
31393140
return word;
31403141
}
31413142

‎src/main/resources/handlebars/Java/README.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Then manually install the following JARs:
7676
Please follow the [installation](#installation) instruction and execute the following Java code:
7777

7878
```java
79-
{{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#@first}}
79+
{{#apiInfo}}{{#apis}}{{#@first}}{{#operations}}{{#operation}}{{#contents}}{{#@first}}
8080
import {{{invokerPackage}}}.*;
8181
import {{{invokerPackage}}}.auth.*;
8282
import {{{modelPackage}}}.*;
@@ -118,7 +118,7 @@ public class {{{classname}}}Example {
118118
}
119119
}
120120
}
121-
{{/@first}}{{/operation}}{{/operations}}{{/-first}}{{/apis}}{{/apiInfo}}
121+
{{/@first}}{{/contents}}{{/operation}}{{/operations}}{{/@first}}{{/apis}}{{/apiInfo}}
122122
```
123123

124124
## Documentation for API Endpoints

0 commit comments

Comments
 (0)