Skip to content

Commit 3e277af

Browse files
frantumafrantuma
authored
Merge pull request #8418 from swagger-api/fix_spring_mvc_jetty
Make spring-mvc jersey tests wait that jetty is closed before terminating
2 parents e5a77af + f82e6e3 commit 3e277af

File tree

13 files changed

+234
-5
lines changed

13 files changed

+234
-5
lines changed

‎modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
3737
<stopPort>8079</stopPort>
3838
<stopKey>stopit</stopKey>
39+
<stopWait>10</stopWait>
3940
<httpConnector>
4041
<port>8002</port>
4142
<idleTimeout>60000</idleTimeout>

‎samples/server/petstore/spring-mvc-j8-async/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
3737
<stopPort>8079</stopPort>
3838
<stopKey>stopit</stopKey>
39+
<stopWait>10</stopWait>
3940
<httpConnector>
4041
<port>8002</port>
4142
<idleTimeout>60000</idleTimeout>

‎samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeApi.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.time.LocalDate;
1111
import java.time.OffsetDateTime;
1212
import io.swagger.model.OuterComposite;
13+
import io.swagger.model.User;
1314
import com.fasterxml.jackson.databind.ObjectMapper;
1415
import io.swagger.annotations.*;
1516
import org.slf4j.Logger;
@@ -139,6 +140,21 @@ default CompletableFuture<ResponseEntity<String>> fakeOuterStringSerialize(@ApiP
139140
}
140141

141142

143+
@ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", })
144+
@ApiResponses(value = {
145+
@ApiResponse(code = 200, message = "Success") })
146+
@RequestMapping(value = "/fake/body-with-query-params",
147+
consumes = { "application/json" },
148+
method = RequestMethod.PUT)
149+
default CompletableFuture<ResponseEntity<Void>> testBodyWithQueryParams(@ApiParam(value = "" ,required=true ) @Valid @RequestBody User body,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query) {
150+
if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) {
151+
} else {
152+
log.warn("ObjectMapper or HttpServletRequest not configured in default FakeApi interface so no example is generated");
153+
}
154+
return CompletableFuture.completedFuture(new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED));
155+
}
156+
157+
142158
@ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
143159
@ApiResponses(value = {
144160
@ApiResponse(code = 200, message = "successful operation", response = Client.class) })

‎samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/EnumTest.java

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,42 @@ public static EnumStringEnum fromValue(String text) {
5353
@JsonProperty("enum_string")
5454
private EnumStringEnum enumString = null;
5555

56+
/**
57+
* Gets or Sets enumStringRequired
58+
*/
59+
public enum EnumStringRequiredEnum {
60+
UPPER("UPPER"),
61+
62+
LOWER("lower"),
63+
64+
EMPTY("");
65+
66+
private String value;
67+
68+
EnumStringRequiredEnum(String value) {
69+
this.value = value;
70+
}
71+
72+
@Override
73+
@JsonValue
74+
public String toString() {
75+
return String.valueOf(value);
76+
}
77+
78+
@JsonCreator
79+
public static EnumStringRequiredEnum fromValue(String text) {
80+
for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
81+
if (String.valueOf(b.value).equals(text)) {
82+
return b;
83+
}
84+
}
85+
return null;
86+
}
87+
}
88+
89+
@JsonProperty("enum_string_required")
90+
private EnumStringRequiredEnum enumStringRequired = null;
91+
5692
/**
5793
* Gets or Sets enumInteger
5894
*/
@@ -144,6 +180,27 @@ public void setEnumString(EnumStringEnum enumString) {
144180
this.enumString = enumString;
145181
}
146182

183+
public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
184+
this.enumStringRequired = enumStringRequired;
185+
return this;
186+
}
187+
188+
/**
189+
* Get enumStringRequired
190+
* @return enumStringRequired
191+
**/
192+
@ApiModelProperty(required = true, value = "")
193+
@NotNull
194+
195+
196+
public EnumStringRequiredEnum getEnumStringRequired() {
197+
return enumStringRequired;
198+
}
199+
200+
public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
201+
this.enumStringRequired = enumStringRequired;
202+
}
203+
147204
public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
148205
this.enumInteger = enumInteger;
149206
return this;
@@ -216,14 +273,15 @@ public boolean equals(java.lang.Object o) {
216273
}
217274
EnumTest enumTest = (EnumTest) o;
218275
return Objects.equals(this.enumString, enumTest.enumString) &&
276+
Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) &&
219277
Objects.equals(this.enumInteger, enumTest.enumInteger) &&
220278
Objects.equals(this.enumNumber, enumTest.enumNumber) &&
221279
Objects.equals(this.outerEnum, enumTest.outerEnum);
222280
}
223281

224282
@Override
225283
public int hashCode() {
226-
return Objects.hash(enumString, enumInteger, enumNumber, outerEnum);
284+
return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum);
227285
}
228286

229287
@Override
@@ -232,6 +290,7 @@ public String toString() {
232290
sb.append("class EnumTest {\n");
233291

234292
sb.append(" enumString: ").append(toIndentedString(enumString)).append("\n");
293+
sb.append(" enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n");
235294
sb.append(" enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
236295
sb.append(" enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
237296
sb.append(" outerEnum: ").append(toIndentedString(outerEnum)).append("\n");

‎samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
3737
<stopPort>8079</stopPort>
3838
<stopKey>stopit</stopKey>
39+
<stopWait>10</stopWait>
3940
<httpConnector>
4041
<port>8002</port>
4142
<idleTimeout>60000</idleTimeout>

‎samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeApi.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.time.LocalDate;
1111
import java.time.LocalDateTime;
1212
import io.swagger.model.OuterComposite;
13+
import io.swagger.model.User;
1314
import com.fasterxml.jackson.databind.ObjectMapper;
1415
import io.swagger.annotations.*;
1516
import org.slf4j.Logger;
@@ -138,6 +139,21 @@ default ResponseEntity<String> fakeOuterStringSerialize(@ApiParam(value = "Input
138139
}
139140

140141

142+
@ApiOperation(value = "", nickname = "testBodyWithQueryParams", notes = "", tags={ "fake", })
143+
@ApiResponses(value = {
144+
@ApiResponse(code = 200, message = "Success") })
145+
@RequestMapping(value = "/fake/body-with-query-params",
146+
consumes = { "application/json" },
147+
method = RequestMethod.PUT)
148+
default ResponseEntity<Void> testBodyWithQueryParams(@ApiParam(value = "" ,required=true ) @Valid @RequestBody User body,@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query) {
149+
if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) {
150+
} else {
151+
log.warn("ObjectMapper or HttpServletRequest not configured in default FakeApi interface so no example is generated");
152+
}
153+
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
154+
}
155+
156+
141157
@ApiOperation(value = "To test \"client\" model", nickname = "testClientModel", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
142158
@ApiResponses(value = {
143159
@ApiResponse(code = 200, message = "successful operation", response = Client.class) })

‎samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/FakeClassnameTestApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ default Optional<String> getAcceptHeader() {
4646
return getRequest().map(r -> r.getHeader("Accept"));
4747
}
4848

49-
@ApiOperation(value = "To test class name in snake case", nickname = "testClassname", notes = "", response = Client.class, authorizations = {
49+
@ApiOperation(value = "To test class name in snake case", nickname = "testClassname", notes = "To test class name in snake case", response = Client.class, authorizations = {
5050
@Authorization(value = "api_key_query")
5151
}, tags={ "fake_classname_tags 123#$%^", })
5252
@ApiResponses(value = {

‎samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/api/UserApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ default ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs t
116116
@RequestMapping(value = "/user/{username}",
117117
produces = { "application/xml", "application/json" },
118118
method = RequestMethod.GET)
119-
default ResponseEntity<User> getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing. ",required=true) @PathVariable("username") String username) {
119+
default ResponseEntity<User> getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.",required=true) @PathVariable("username") String username) {
120120
if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) {
121121
if (getAcceptHeader().get().contains("application/xml")) {
122122
try {

‎samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/io/swagger/model/EnumTest.java

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,42 @@ public static EnumStringEnum fromValue(String text) {
5353
@JsonProperty("enum_string")
5454
private EnumStringEnum enumString = null;
5555

56+
/**
57+
* Gets or Sets enumStringRequired
58+
*/
59+
public enum EnumStringRequiredEnum {
60+
UPPER("UPPER"),
61+
62+
LOWER("lower"),
63+
64+
EMPTY("");
65+
66+
private String value;
67+
68+
EnumStringRequiredEnum(String value) {
69+
this.value = value;
70+
}
71+
72+
@Override
73+
@JsonValue
74+
public String toString() {
75+
return String.valueOf(value);
76+
}
77+
78+
@JsonCreator
79+
public static EnumStringRequiredEnum fromValue(String text) {
80+
for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
81+
if (String.valueOf(b.value).equals(text)) {
82+
return b;
83+
}
84+
}
85+
return null;
86+
}
87+
}
88+
89+
@JsonProperty("enum_string_required")
90+
private EnumStringRequiredEnum enumStringRequired = null;
91+
5692
/**
5793
* Gets or Sets enumInteger
5894
*/
@@ -144,6 +180,27 @@ public void setEnumString(EnumStringEnum enumString) {
144180
this.enumString = enumString;
145181
}
146182

183+
public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
184+
this.enumStringRequired = enumStringRequired;
185+
return this;
186+
}
187+
188+
/**
189+
* Get enumStringRequired
190+
* @return enumStringRequired
191+
**/
192+
@ApiModelProperty(required = true, value = "")
193+
@NotNull
194+
195+
196+
public EnumStringRequiredEnum getEnumStringRequired() {
197+
return enumStringRequired;
198+
}
199+
200+
public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
201+
this.enumStringRequired = enumStringRequired;
202+
}
203+
147204
public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
148205
this.enumInteger = enumInteger;
149206
return this;
@@ -216,14 +273,15 @@ public boolean equals(java.lang.Object o) {
216273
}
217274
EnumTest enumTest = (EnumTest) o;
218275
return Objects.equals(this.enumString, enumTest.enumString) &&
276+
Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) &&
219277
Objects.equals(this.enumInteger, enumTest.enumInteger) &&
220278
Objects.equals(this.enumNumber, enumTest.enumNumber) &&
221279
Objects.equals(this.outerEnum, enumTest.outerEnum);
222280
}
223281

224282
@Override
225283
public int hashCode() {
226-
return Objects.hash(enumString, enumInteger, enumNumber, outerEnum);
284+
return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum);
227285
}
228286

229287
@Override
@@ -232,6 +290,7 @@ public String toString() {
232290
sb.append("class EnumTest {\n");
233291

234292
sb.append(" enumString: ").append(toIndentedString(enumString)).append("\n");
293+
sb.append(" enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n");
235294
sb.append(" enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
236295
sb.append(" enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
237296
sb.append(" outerEnum: ").append(toIndentedString(outerEnum)).append("\n");

‎samples/server/petstore/spring-mvc/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
3737
<stopPort>8079</stopPort>
3838
<stopKey>stopit</stopKey>
39+
<stopWait>10</stopWait>
3940
<httpConnector>
4041
<port>8002</port>
4142
<idleTimeout>60000</idleTimeout>

0 commit comments

Comments
 (0)