Merge pull request #30 from swagger-api/prepare-release-1.0.5

fix multipart and other NPEs and prepare release 1.0.5

Author: frantuma

Dockerfile

@@ -3,7 +3,7 @@ FROM openjdk:8-jre
 WORKDIR /petstore
 COPY target/lib/jetty-runner* /petstore/jetty-runner.jar
 COPY ./run.sh /petstore/
-ADD target/swagger-petstore-v2-1.0.5-SNAPSHOT /petstore/webapp
+ADD target/swagger-petstore-v2-1.0.5 /petstore/webapp
 
 RUN apt-get update
 

pom.xml

@@ -9,7 +9,7 @@
   <artifactId>swagger-petstore-v2</artifactId>
   <packaging>war</packaging>
   <name>swagger-petstore-v2</name>
-  <version>1.0.5-SNAPSHOT</version>
+  <version>1.0.5</version>
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
@@ -199,6 +199,11 @@
       <artifactId>jersey-core</artifactId>
       <version>${jersey-version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.sun.jersey.contribs</groupId>
+      <artifactId>jersey-multipart</artifactId>
+      <version>${jersey-version}</version>
+    </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-json</artifactId>

src/main/java/io/swagger/sample/resource/PetResource.java

@@ -114,6 +114,9 @@ public Response uploadFile(
   @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input") })
   public Response addPet(
       @ApiParam(value = "Pet object that needs to be added to the store", required = true) Pet pet) {
+    if (pet == null) {
+      return Response.status(405).entity(new io.swagger.sample.model.ApiResponse(405, "no data")).build();
+    }
     try {
       LOGGER.info("addPet ID {} STATUS {}", pet.getId(), pet.getStatus());
       if (LOGGER.isDebugEnabled()) {
@@ -134,6 +137,9 @@ public Response addPet(
       @ApiResponse(code = 405, message = "Validation exception") })
   public Response updatePet(
       @ApiParam(value = "Pet object that needs to be added to the store", required = true) Pet pet) {
+    if (pet == null) {
+      return Response.status(405).entity(new io.swagger.sample.model.ApiResponse(405, "no data")).build();
+    }
     try {
       LOGGER.info("updatePet ID {} STATUS {}", pet.getId(), pet.getStatus());
       if (LOGGER.isDebugEnabled()) {
@@ -197,6 +203,6 @@ public Response  updatePetWithForm (
       return Response.ok().entity(new io.swagger.sample.model.ApiResponse(200, String.valueOf(petId))).build();
     }
     else
-      return Response.status(404).build();
+      return Response.status(404).entity(new io.swagger.sample.model.ApiResponse(404, "not found")).build();
   }
 }

src/main/java/io/swagger/sample/resource/PetStoreResource.java

@@ -19,6 +19,7 @@
 import io.swagger.annotations.*;
 import io.swagger.sample.data.PetData;
 import io.swagger.sample.data.StoreData;
+import io.swagger.sample.exception.BadRequestException;
 import io.swagger.sample.model.Order;
 import io.swagger.sample.exception.NotFoundException;
 import io.swagger.util.Json;
@@ -77,7 +78,10 @@ public Response getOrderById(
   @ApiResponses({ @ApiResponse(code = 400, message = "Invalid Order") })
   public Order placeOrder(
       @ApiParam(value = "order placed for purchasing the pet",
-        required = true) Order order) {
+        required = true) Order order) throws BadRequestException {
+    if (order == null) {
+      throw new BadRequestException(400, "No data");
+    }
     try {
       LOGGER.info("placeOrder ID {} STATUS {}", order.getId(), order.getStatus());
       if (LOGGER.isDebugEnabled()) {

src/main/java/io/swagger/sample/resource/UserResource.java

@@ -44,6 +44,9 @@ public class UserResource {
     position = 1, consumes = "application/json")
   public Response createUser(
       @ApiParam(value = "Created user object", required = true) User user) {
+    if (user == null) {
+      return Response.status(405).entity(new io.swagger.sample.model.ApiResponse(405, "no data")).build();
+    }
     try {
       LOGGER.info("createUser ID {} STATUS {}", user.getId(), user.getUsername());
       if (LOGGER.isDebugEnabled()) {
@@ -61,6 +64,9 @@ public Response createUser(
   @ApiOperation(value = "Creates list of users with given input array",
     position = 2, consumes = "application/json")
   public Response createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) User[] users) {
+    if (users == null) {
+      return Response.status(405).entity(new io.swagger.sample.model.ApiResponse(405, "no data")).build();
+    }
       try {
         LOGGER.info("createUsersWithArrayInput");
         if (LOGGER.isDebugEnabled()) {
@@ -80,6 +86,9 @@ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object
   @ApiOperation(value = "Creates list of users with given input array",
     position = 3, consumes = "application/json")
   public Response createUsersWithListInput(@ApiParam(value = "List of user object", required = true) java.util.List<User> users) {
+    if (users == null) {
+      return Response.status(405).entity(new io.swagger.sample.model.ApiResponse(405, "no data")).build();
+    }
       try {
         LOGGER.info("createUsersWithListInput");
         if (LOGGER.isDebugEnabled()) {
@@ -105,6 +114,9 @@ public Response createUsersWithListInput(@ApiParam(value = "List of user object"
   public Response updateUser(
       @ApiParam(value = "name that need to be updated", required = true) @PathParam("username") String username,
       @ApiParam(value = "Updated user object", required = true) User user) {
+    if (user == null) {
+      return Response.status(405).entity(new io.swagger.sample.model.ApiResponse(405, "no data")).build();
+    }
     try {
       LOGGER.info("updateUser ID {} STATUS {}", user.getId(), user.getUsername());
       if (LOGGER.isDebugEnabled()) {

src/main/webapp/WEB-INF/web.xml

@@ -35,7 +35,7 @@
     <servlet-class>io.swagger.jaxrs.config.DefaultJaxrsConfig</servlet-class>
     <init-param>
       <param-name>api.version</param-name>
-      <param-value>1.0.5-SNAPSHOT</param-value>
+      <param-value>1.0.5</param-value>
     </init-param>
     <init-param>
       <param-name>swagger.api.title</param-name>