Skip to content

Commit 1814ca0

Browse files
HugoMarioHugoMario
authored
Merge pull request #8776 from swagger-api/generator-issue-201
updated inflector templates.
2 parents 2a15063 + c3a8cd3 commit 1814ca0

File tree

15 files changed

+1540
-261
lines changed

15 files changed

+1540
-261
lines changed

‎bin/java-inflector-petstore-server.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fi
2626

2727
# if you've executed sbt assembly previously it will use that instead.
2828
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -Dlogback.configurationFile=bin/logback.xml"
29-
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l inflector -o samples/server/petstore/java-inflector -DhideGenerationTimestamp=true"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/3_0_0/petstore-with-fake-endpoints-models-for-testing.yaml -l inflector -o samples/server/petstore/java-inflector -DhideGenerationTimestamp=true"
3030

3131
echo "Removing files and folders under samples/server/petstore/java-inflector/src/main"
3232
rm -rf samples/server/petstore/java-inflector/src/main

‎samples/server/petstore/java-inflector/.swagger-codegen/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0-SNAPSHOT
1+
3.0.1-SNAPSHOT

‎samples/server/petstore/java-inflector/inflector.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ AnimalFarm : io.swagger.model.AnimalFarm
1010
ArrayOfArrayOfNumberOnly : io.swagger.model.ArrayOfArrayOfNumberOnly
1111
ArrayOfNumberOnly : io.swagger.model.ArrayOfNumberOnly
1212
ArrayTest : io.swagger.model.ArrayTest
13+
Body : io.swagger.model.Body
14+
Body1 : io.swagger.model.Body1
15+
Body2 : io.swagger.model.Body2
16+
Body3 : io.swagger.model.Body3
17+
Body4 : io.swagger.model.Body4
18+
Body5 : io.swagger.model.Body5
1319
Capitalization : io.swagger.model.Capitalization
1420
Cat : io.swagger.model.Cat
1521
Category : io.swagger.model.Category

‎samples/server/petstore/java-inflector/pom.xml‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<modelVersion>4.0.0</modelVersion>
99
<groupId>io.swagger</groupId>
1010
<artifactId>swagger-inflector-server</artifactId>
11-
<packaging>jar</packaging>
11+
<packaging>war</packaging>
1212
<name>swagger-inflector-server</name>
1313
<version>1.0.0</version>
1414

@@ -25,26 +25,6 @@
2525
<directory>target</directory>
2626
<finalName>${project.artifactId}-${project.version}</finalName>
2727
<plugins>
28-
<plugin>
29-
<groupId>org.apache.maven.plugins</groupId>
30-
<artifactId>maven-enforcer-plugin</artifactId>
31-
<version>3.0.0-M1</version>
32-
<executions>
33-
<execution>
34-
<id>enforce-maven</id>
35-
<goals>
36-
<goal>enforce</goal>
37-
</goals>
38-
<configuration>
39-
<rules>
40-
<requireMavenVersion>
41-
<version>2.2.0</version>
42-
</requireMavenVersion>
43-
</rules>
44-
</configuration>
45-
</execution>
46-
</executions>
47-
</plugin>
4828
<plugin>
4929
<groupId>org.codehaus.mojo</groupId>
5030
<artifactId>build-helper-maven-plugin</artifactId>
@@ -105,7 +85,7 @@
10585
<monitoredDirName>.</monitoredDirName>
10686
<scanTargets>
10787
<scanTarget>inflector.yaml</scanTarget>
108-
<scanTarget>src/main/swagger/swagger.yaml</scanTarget>
88+
<scanTarget>src/main/resources/openapi3.yaml</scanTarget>
10989
</scanTargets>
11090
<scanIntervalSeconds>1</scanIntervalSeconds>
11191
<webApp>
@@ -139,7 +119,7 @@
139119
<properties>
140120
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
141121
<maven-plugin-version>1.0.0</maven-plugin-version>
142-
<jetty-version>9.2.9.v20150224</jetty-version>
122+
<jetty-version>9.4.9.v20180320</jetty-version>
143123
<logback-version>1.0.1</logback-version>
144124
<junit-version>4.8.2</junit-version>
145125
<slf4j-version>1.6.3</slf4j-version>

‎samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Body.java‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
package io.swagger.model;
2+
3+
import java.util.Objects;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
5+
import com.fasterxml.jackson.annotation.JsonCreator;
6+
import io.swagger.v3.oas.annotations.media.Schema;
7+
8+
9+
public class Body {
10+
@JsonProperty("name")
11+
private String name = null;
12+
@JsonProperty("status")
13+
private String status = null;
14+
/**
15+
* Updated name of the pet
16+
**/
17+
public Body name(String name) {
18+
this.name = name;
19+
return this;
20+
}
21+
22+
23+
@Schema(description = "Updated name of the pet")
24+
@JsonProperty("name")
25+
public String getName() {
26+
return name;
27+
}
28+
public void setName(String name) {
29+
this.name = name;
30+
}
31+
32+
/**
33+
* Updated status of the pet
34+
**/
35+
public Body status(String status) {
36+
this.status = status;
37+
return this;
38+
}
39+
40+
41+
@Schema(description = "Updated status of the pet")
42+
@JsonProperty("status")
43+
public String getStatus() {
44+
return status;
45+
}
46+
public void setStatus(String status) {
47+
this.status = status;
48+
}
49+
50+
51+
@Override
52+
public boolean equals(java.lang.Object o) {
53+
if (this == o) {
54+
return true;
55+
}
56+
if (o == null || getClass() != o.getClass()) {
57+
return false;
58+
}
59+
Body body = (Body) o;
60+
return Objects.equals(name, body.name) &&
61+
Objects.equals(status, body.status);
62+
}
63+
64+
@Override
65+
public int hashCode() {
66+
return Objects.hash(name, status);
67+
}
68+
69+
@Override
70+
public String toString() {
71+
StringBuilder sb = new StringBuilder();
72+
sb.append("class Body {\n");
73+
sb.append(" name: ").append(toIndentedString(name)).append("\n");
74+
sb.append(" status: ").append(toIndentedString(status)).append("\n");
75+
sb.append("}");
76+
return sb.toString();
77+
}
78+
79+
/**
80+
* Convert the given object to string with each line indented by 4 spaces
81+
* (except the first line).
82+
*/
83+
private String toIndentedString(java.lang.Object o) {
84+
if (o == null) {
85+
return "null";
86+
}
87+
return o.toString().replace("\n", "\n ");
88+
}
89+
}

‎samples/server/petstore/java-inflector/src/gen/java/io/swagger/model/Body1.java‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
package io.swagger.model;
2+
3+
import java.util.Objects;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
5+
import com.fasterxml.jackson.annotation.JsonCreator;
6+
import io.swagger.v3.oas.annotations.media.Schema;
7+
import java.io.File;
8+
9+
10+
public class Body1 {
11+
@JsonProperty("additionalMetadata")
12+
private String additionalMetadata = null;
13+
@JsonProperty("file")
14+
private File file = null;
15+
/**
16+
* Additional data to pass to server
17+
**/
18+
public Body1 additionalMetadata(String additionalMetadata) {
19+
this.additionalMetadata = additionalMetadata;
20+
return this;
21+
}
22+
23+
24+
@Schema(description = "Additional data to pass to server")
25+
@JsonProperty("additionalMetadata")
26+
public String getAdditionalMetadata() {
27+
return additionalMetadata;
28+
}
29+
public void setAdditionalMetadata(String additionalMetadata) {
30+
this.additionalMetadata = additionalMetadata;
31+
}
32+
33+
/**
34+
* file to upload
35+
**/
36+
public Body1 file(File file) {
37+
this.file = file;
38+
return this;
39+
}
40+
41+
42+
@Schema(description = "file to upload")
43+
@JsonProperty("file")
44+
public File getFile() {
45+
return file;
46+
}
47+
public void setFile(File file) {
48+
this.file = file;
49+
}
50+
51+
52+
@Override
53+
public boolean equals(java.lang.Object o) {
54+
if (this == o) {
55+
return true;
56+
}
57+
if (o == null || getClass() != o.getClass()) {
58+
return false;
59+
}
60+
Body1 body1 = (Body1) o;
61+
return Objects.equals(additionalMetadata, body1.additionalMetadata) &&
62+
Objects.equals(file, body1.file);
63+
}
64+
65+
@Override
66+
public int hashCode() {
67+
return Objects.hash(additionalMetadata, file);
68+
}
69+
70+
@Override
71+
public String toString() {
72+
StringBuilder sb = new StringBuilder();
73+
sb.append("class Body1 {\n");
74+
sb.append(" additionalMetadata: ").append(toIndentedString(additionalMetadata)).append("\n");
75+
sb.append(" file: ").append(toIndentedString(file)).append("\n");
76+
sb.append("}");
77+
return sb.toString();
78+
}
79+
80+
/**
81+
* Convert the given object to string with each line indented by 4 spaces
82+
* (except the first line).
83+
*/
84+
private String toIndentedString(java.lang.Object o) {
85+
if (o == null) {
86+
return "null";
87+
}
88+
return o.toString().replace("\n", "\n ");
89+
}
90+
}

0 commit comments

Comments
 (0)