Skip to content

Commit 46545c1

Browse files
fehguyfehguy
authored
Merge pull request #3388 from swagger-api/release-prepare
updated versions for release
2 parents bd7904d + 8740b4d commit 46545c1

File tree

46 files changed

+1523
-37
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1523
-37
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
5959

6060
Swagger Codegen Version | Release Date | OpenAPI Spec compatibility | Notes
6161
-------------------------- | ------------ | -------------------------- | -----
62-
2.2.0-SNAPSHOT | | 1.0, 1.1, 1.2, 2.0 | [master](https://github.com/swagger-api/swagger-codegen)
62+
2.2.0 | 2016-07-15 | 1.0, 1.1, 1.2, 2.0 | [tag v2.2.0](https://github.com/swagger-api/swagger-codegen/tree/v2.2.0)
6363
2.1.6 (**current stable**) | 2016-04-06 | 1.0, 1.1, 1.2, 2.0 | [tag v2.1.6](https://github.com/swagger-api/swagger-codegen/tree/v2.1.6)
6464
2.0.17 | 2014-08-22 | 1.1, 1.2 | [tag v2.0.17](https://github.com/swagger-api/swagger-codegen/tree/v2.0.17)
6565
1.0.4 | 2012-04-12 | 1.0, 1.1 | [tag v1.0.4](https://github.com/swagger-api/swagger-codegen/tree/swagger-codegen_2.9.1-1.1)

‎modules/swagger-codegen-cli/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.swagger</groupId>
55
<artifactId>swagger-codegen-project</artifactId>
6-
<version>2.2.0-SNAPSHOT</version>
6+
<version>2.2.0</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎modules/swagger-codegen-maven-plugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.swagger</groupId>
88
<artifactId>swagger-codegen-project</artifactId>
9-
<version>2.2.0-SNAPSHOT</version>
9+
<version>2.2.0</version>
1010
<relativePath>../..</relativePath>
1111
</parent>
1212
<artifactId>swagger-codegen-maven-plugin</artifactId>

‎modules/swagger-codegen/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.swagger</groupId>
55
<artifactId>swagger-codegen-project</artifactId>
6-
<version>2.2.0-SNAPSHOT</version>
6+
<version>2.2.0</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,35 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe
11951195
allRequired = null;
11961196
}
11971197
// parent model
1198-
final RefModel parent = (RefModel) composed.getParent();
1198+
RefModel parent = (RefModel) composed.getParent();
1199+
1200+
// interfaces (intermediate models)
1201+
if (composed.getInterfaces() != null) {
1202+
if (m.interfaces == null)
1203+
m.interfaces = new ArrayList<String>();
1204+
for (RefModel _interface : composed.getInterfaces()) {
1205+
Model interfaceModel = null;
1206+
if (allDefinitions != null) {
1207+
interfaceModel = allDefinitions.get(_interface.getSimpleRef());
1208+
}
1209+
// set first interface with discriminator found as parent
1210+
if (parent == null && interfaceModel instanceof ModelImpl && ((ModelImpl) interfaceModel).getDiscriminator() != null) {
1211+
parent = _interface;
1212+
} else {
1213+
final String interfaceRef = toModelName(_interface.getSimpleRef());
1214+
m.interfaces.add(interfaceRef);
1215+
addImport(m, interfaceRef);
1216+
if (allDefinitions != null) {
1217+
if (supportsInheritance) {
1218+
addProperties(allProperties, allRequired, interfaceModel, allDefinitions);
1219+
} else {
1220+
addProperties(properties, required, interfaceModel, allDefinitions);
1221+
}
1222+
}
1223+
}
1224+
}
1225+
}
1226+
11991227
if (parent != null) {
12001228
final String parentRef = parent.getSimpleRef();
12011229
m.parentSchema = parentRef;
@@ -1210,24 +1238,7 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe
12101238
}
12111239
}
12121240
}
1213-
// interfaces (intermediate models)
1214-
if (composed.getInterfaces() != null) {
1215-
if (m.interfaces == null)
1216-
m.interfaces = new ArrayList<String>();
1217-
for (RefModel _interface : composed.getInterfaces()) {
1218-
final String interfaceRef = toModelName(_interface.getSimpleRef());
1219-
m.interfaces.add(interfaceRef);
1220-
addImport(m, interfaceRef);
1221-
if (allDefinitions != null) {
1222-
final Model interfaceModel = allDefinitions.get(_interface.getSimpleRef());
1223-
if (supportsInheritance) {
1224-
addProperties(allProperties, allRequired, interfaceModel, allDefinitions);
1225-
} else {
1226-
addProperties(properties, required, interfaceModel, allDefinitions);
1227-
}
1228-
}
1229-
}
1230-
}
1241+
12311242
// child model (properties owned by the model itself)
12321243
Model child = composed.getChild();
12331244
if (child != null && child instanceof RefModel && allDefinitions != null) {

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,10 @@ private int getInheritanceDepth(Model model) {
259259

260260
private Model getParent(Model model) {
261261
if (model instanceof ComposedModel) {
262-
return definitions.get(((ComposedModel) model).getParent().getReference());
262+
Model parent = ((ComposedModel) model).getParent();
263+
if(parent != null) {
264+
return definitions.get(parent.getReference());
265+
}
263266
}
264267

265268
return null;

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,18 @@ public void processOpts() {
117117

118118
if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
119119
this.setInvokerPackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
120+
} else if (additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) {
121+
// guess from api package
122+
String derviedInvokerPackage = deriveInvokerPackageName((String)additionalProperties.get(CodegenConstants.API_PACKAGE));
123+
this.additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, derviedInvokerPackage);
124+
this.setInvokerPackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
125+
LOGGER.info("Invoker Package Name, originally not set, is now dervied from api package name: " + derviedInvokerPackage);
126+
} else if (additionalProperties.containsKey(CodegenConstants.MODEL_PACKAGE)) {
127+
// guess from model package
128+
String derviedInvokerPackage = deriveInvokerPackageName((String)additionalProperties.get(CodegenConstants.MODEL_PACKAGE));
129+
this.additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, derviedInvokerPackage);
130+
this.setInvokerPackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
131+
LOGGER.info("Invoker Package Name, originally not set, is now dervied from model package name: " + derviedInvokerPackage);
120132
} else {
121133
//not set, use default to be passed to template
122134
additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
@@ -845,4 +857,23 @@ public String escapeUnsafeCharacters(String input) {
845857
return input.replace("*/", "*_/").replace("/*", "/_*");
846858
}
847859

860+
/*
861+
* Derive invoker package name based on the input
862+
* e.g. foo.bar.model => foo.bar
863+
*
864+
* @param input API package/model name
865+
* @return Derived invoker package name based on API package/model name
866+
*/
867+
private String deriveInvokerPackageName(String input) {
868+
String[] parts = input.split(Pattern.quote(".")); // Split on period.
869+
870+
StringBuilder sb = new StringBuilder();
871+
String delim = "";
872+
for (String p : Arrays.copyOf(parts, parts.length-1)) {
873+
sb.append(delim).append(p);
874+
delim = ".";
875+
}
876+
return sb.toString();
877+
}
878+
848879
}

‎modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
</dependency>
189189
</dependencies>
190190
<properties>
191-
<swagger-core-version>1.5.8</swagger-core-version>
191+
<swagger-core-version>1.5.9</swagger-core-version>
192192
<jersey-version>2.22.2</jersey-version>
193193
<jackson-version>2.7.5</jackson-version>
194194
{{^java8}}

‎modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pom.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
</dependency>
143143
</dependencies>
144144
<properties>
145-
<swagger-core-version>1.5.8</swagger-core-version>
145+
<swagger-core-version>1.5.9</swagger-core-version>
146146
<retrofit-version>1.9.0</retrofit-version>
147147
<okhttp-version>2.7.5</okhttp-version>
148148
<jodatime-version>2.9.3</jodatime-version>

‎modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
</repositories>
112112
<properties>
113113
<maven-plugin-version>1.0.0</maven-plugin-version>
114-
<swagger-inflector-version>1.0.4</swagger-inflector-version>
114+
<swagger-inflector-version>1.0.8</swagger-inflector-version>
115115
<jetty-version>9.2.9.v20150224</jetty-version>
116116
<logback-version>1.0.1</logback-version>
117117
<junit-version>4.8.2</junit-version>

0 commit comments

Comments
 (0)