Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated spring mvc version and updated sample #12145

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,6 @@
<springfox-version>2.7.0</springfox-version>
<jackson-version>2.11.4</jackson-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
<spring-version>4.3.9.RELEASE</spring-version>
<spring-version>5.3.27</spring-version>
</properties>
</project>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.22-SNAPSHOT
2.4.32-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/server/petstore/spring-mvc-j8-async/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,6 @@
<springfox-version>2.7.0</springfox-version>
<jackson-version>2.11.4</jackson-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
<spring-version>4.3.9.RELEASE</spring-version>
<spring-version>5.3.27</spring-version>
</properties>
</project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down Expand Up @@ -163,7 +163,7 @@ default CompletableFuture<ResponseEntity<String>> loginUser(@NotNull @ApiParam(v
}
if (getAcceptHeader().get().contains("application/json")) {
try {
return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{ \"bytes\": [], \"empty\": true}", String.class), HttpStatus.NOT_IMPLEMENTED));
return CompletableFuture.completedFuture(new ResponseEntity<>(getObjectMapper().get().readValue("{ \"blank\": true, \"bytes\": [], \"empty\": true}", String.class), HttpStatus.NOT_IMPLEMENTED));
} catch (IOException e) {
log.error("Couldn't serialize response for content type application/json", e);
return CompletableFuture.completedFuture(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public boolean equals(java.lang.Object o) {
if (o == null || getClass() != o.getClass()) {
return false;
}
return true;
return super.equals(o);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.22-SNAPSHOT
2.4.32-SNAPSHOT
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,6 @@
<springfox-version>2.7.0</springfox-version>
<jackson-version>2.11.4</jackson-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
<spring-version>4.3.9.RELEASE</spring-version>
<spring-version>5.3.27</spring-version>
</properties>
</project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;

import javax.validation.constraints.*;
import javax.validation.Valid;
import javax.validation.constraints.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;

import javax.validation.constraints.*;
import javax.validation.Valid;
import javax.validation.constraints.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;

import javax.validation.constraints.*;
import javax.validation.Valid;
import javax.validation.constraints.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;

import javax.validation.constraints.*;
import javax.validation.Valid;
import javax.validation.constraints.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;

import javax.validation.constraints.*;
import javax.validation.Valid;
import javax.validation.constraints.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;

import javax.validation.constraints.*;
import javax.validation.Valid;
import javax.validation.constraints.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
Expand Down Expand Up @@ -93,7 +93,7 @@ public ResponseEntity<String> loginUser(@NotNull @ApiParam(value = "The user nam

if (accept != null && accept.contains("application/json")) {
try {
return new ResponseEntity<String>(objectMapper.readValue("{ \"bytes\": [], \"empty\": true}", String.class), HttpStatus.NOT_IMPLEMENTED);
return new ResponseEntity<String>(objectMapper.readValue("{ \"blank\": true, \"bytes\": [], \"empty\": true}", String.class), HttpStatus.NOT_IMPLEMENTED);
} catch (IOException e) {
log.error("Couldn't serialize response for content type application/json", e);
return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public boolean equals(java.lang.Object o) {
if (o == null || getClass() != o.getClass()) {
return false;
}
return true;
return super.equals(o);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.22-SNAPSHOT
2.4.32-SNAPSHOT
2 changes: 1 addition & 1 deletion samples/server/petstore/spring-mvc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,6 @@
<springfox-version>2.7.0</springfox-version>
<jackson-version>2.11.4</jackson-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
<spring-version>4.3.9.RELEASE</spring-version>
<spring-version>5.3.27</spring-version>
</properties>
</project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;

import javax.validation.constraints.*;
import javax.validation.Valid;
import javax.validation.constraints.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;

import javax.validation.constraints.*;
import javax.validation.Valid;
import javax.validation.constraints.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;

import javax.validation.constraints.*;
import javax.validation.Valid;
import javax.validation.constraints.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;

import javax.validation.constraints.*;
import javax.validation.Valid;
import javax.validation.constraints.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;

import javax.validation.constraints.*;
import javax.validation.Valid;
import javax.validation.constraints.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
* NOTE: This class is auto generated by the swagger code generator program (2.4.32-SNAPSHOT).
* https://github.com/swagger-api/swagger-codegen
* Do not edit the class manually.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;

import javax.validation.constraints.*;
import javax.validation.Valid;
import javax.validation.constraints.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
Expand Down Expand Up @@ -93,7 +93,7 @@ public ResponseEntity<String> loginUser(@NotNull @ApiParam(value = "The user nam

if (accept != null && accept.contains("application/json")) {
try {
return new ResponseEntity<String>(objectMapper.readValue("{ \"bytes\": [], \"empty\": true}", String.class), HttpStatus.NOT_IMPLEMENTED);
return new ResponseEntity<String>(objectMapper.readValue("{ \"blank\": true, \"bytes\": [], \"empty\": true}", String.class), HttpStatus.NOT_IMPLEMENTED);
} catch (IOException e) {
log.error("Couldn't serialize response for content type application/json", e);
return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public boolean equals(java.lang.Object o) {
if (o == null || getClass() != o.getClass()) {
return false;
}
return true;
return super.equals(o);
}

@Override
Expand Down
Loading