Add JAX-RS PATCH annotation

CHANGELOG.md

@@ -7,13 +7,12 @@
 
 ### Enhancements
 * Disable the stagemonitor web widget in the service generated by the archetype, as the default configuration.
+* Added toString implementation to DelegatingGenericResponse and BuiltGenericResponse.
+* Added a PATCH annotation because JAX-rs does not have one.
 
 ### Defects Corrected
 * Cleaned up dependencies and fixed few minor issues with generated code in archetype.
 
-### Enhancements
-* Added toString implementation to DelegatingGenericResponse and BuiltGenericResponse.
-
 ## 2.4 - 16 Feb 2017
 
 ### Additions

CONTRIBUTORS.md

@@ -12,6 +12,7 @@
 * Jason Gassel [@jpeg][jason-gassel]
 * Andy Nelson [@anelson425][andy-nelson]
 * Bryan Baugher [@bbaugher][bryan-baugher]
+* Eric Christensen [@EricChristensen][eric-christensen]
 
 [john-leacox]: https://github.com/johnlcox
 [jacob-williams]: https://github.com/brokensandals
@@ -25,3 +26,4 @@
 [jason-gassel]: https://github.com/jpeg
 [andy-nelson]: https://github.com/anelson425
 [bryan-baugher]: https://github.com/bbaugher
+[eric-christensen]: https://github.com/EricChristensen

checkstyle-suppressions.xml

@@ -4,4 +4,5 @@
     <suppress files="generated-sources" checks=".*"/>
     <suppress files="generated-test-sources" checks=".*"/>
     <suppress files="com.cerner.beadledom.client.resteasy.ApacheHttpClient4Dot3Engine" checks=".*"/>
+    <suppress files="com.cerner.beadledom.jaxrs.PATCH" checks="AbbreviationAsWordInName" />
 </suppressions>

client/beadledom-client-example/example-api/pom.xml

@@ -12,6 +12,10 @@
     <name>Beadledom Resteasy Client Example API</name>
 
     <dependencies>
+        <dependency>
+            <groupId>com.cerner.beadledom</groupId>
+            <artifactId>beadledom-jaxrs</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>

client/beadledom-client-example/example-api/src/main/java/com/cerner/beadledom/client/example/ResourceOne.java

@@ -1,6 +1,7 @@
 package com.cerner.beadledom.client.example;
 
 import com.cerner.beadledom.client.example.model.JsonOne;
+import com.cerner.beadledom.jaxrs.PATCH;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
@@ -23,4 +24,9 @@ public interface ResourceOne {
   @Produces("application/json")
   @Consumes("application/json")
   JsonOne echo(JsonOne json);
+
+  @PATCH
+  @Produces("application/json")
+  @Consumes("application/json")
+  JsonOne patch(JsonOne json);
 }

client/beadledom-client-example/example-api/src/main/java/com/cerner/beadledom/client/example/ResourceTwo.java

@@ -1,6 +1,7 @@
 package com.cerner.beadledom.client.example;
 
 import com.cerner.beadledom.client.example.model.JsonTwo;
+import com.cerner.beadledom.jaxrs.PATCH;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
@@ -23,4 +24,9 @@ public interface ResourceTwo {
   @Produces("application/json")
   @Consumes("application/json")
   JsonTwo echo(JsonTwo json);
+
+  @PATCH
+  @Produces("application/json")
+  @Consumes("application/json")
+  JsonTwo patch(JsonTwo json);
 }

client/beadledom-client-example/example-api/src/main/java/com/cerner/beadledom/client/example/model/JsonOne.java

@@ -2,6 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.google.auto.value.AutoValue;
 
 /**
@@ -10,21 +12,40 @@
  * @author John Leacox
  */
 @AutoValue
+@JsonDeserialize(builder = AutoValue_JsonOne.Builder.class)
 public abstract class JsonOne {
 
+  public static Builder builder() {
+    return new AutoValue_JsonOne.Builder();
+  }
+
   /**
    * Creates a new instance of JsonOne.
    */
   @JsonCreator
   public static JsonOne create(
       @JsonProperty("one") String one,
       @JsonProperty("hello") String hello) {
-    return new AutoValue_JsonOne(one, hello);
+    return builder()
+        .setOne(one)
+        .setHello(hello)
+        .build();
   }
 
   @JsonProperty("one")
   public abstract String getOne();
 
   @JsonProperty("hello")
   public abstract String getHello();
+
+  @AutoValue.Builder
+  @JsonPOJOBuilder(withPrefix = "set")
+  public abstract static class Builder {
+
+    public abstract Builder setOne(String one);
+
+    public abstract Builder setHello(String hello);
+
+    public abstract JsonOne build();
+  }
 }

client/beadledom-client-example/example-api/src/main/java/com/cerner/beadledom/client/example/model/JsonTwo.java

@@ -2,6 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.google.auto.value.AutoValue;
 
 /**
@@ -10,21 +12,40 @@
  * @author John Leacox
  */
 @AutoValue
+@JsonDeserialize(builder = AutoValue_JsonTwo.Builder.class)
 public abstract class JsonTwo {
 
+  public static Builder builder() {
+    return new AutoValue_JsonTwo.Builder();
+  }
+
   /**
    * Creates a new instance of JsonOne.
    */
   @JsonCreator
   public static JsonTwo create(
       @JsonProperty("two") String two,
       @JsonProperty("hello") String hello) {
-    return new AutoValue_JsonTwo(two, hello);
+    return builder()
+        .setTwo(two)
+        .setHello(hello)
+        .build();
   }
 
   @JsonProperty("two")
   public abstract String getTwo();
 
   @JsonProperty("hello")
   public abstract String getHello();
+
+  @AutoValue.Builder
+  @JsonPOJOBuilder(withPrefix = "set")
+  public abstract static class Builder {
+
+    public abstract Builder setTwo(String two);
+
+    public abstract Builder setHello(String hello);
+
+    public abstract JsonTwo build();
+  }
 }

client/beadledom-client-example/example-service/src/main/java/com/cerner/beadledom/client/example/ResourceOneImpl.java

@@ -17,4 +17,12 @@ public JsonOne get() {
   public JsonOne echo(JsonOne json) {
     return json;
   }
+
+  @Override
+  public JsonOne patch(JsonOne json) {
+    return json.builder()
+        .setHello("Hola")
+        .setOne("New Json")
+        .build();
+  }
 }

client/beadledom-client-example/example-service/src/main/java/com/cerner/beadledom/client/example/ResourceTwoImpl.java

@@ -17,4 +17,12 @@ public JsonTwo get() {
   public JsonTwo echo(JsonTwo json) {
     return json;
   }
+
+  @Override
+  public JsonTwo patch(JsonTwo json) {
+    return json.builder()
+        .setHello("Hola")
+        .setTwo("New Json")
+        .build();
+  }
 }

client/beadledom-client-test/src/test/scala/com/cerner/beadledom/client/ClientServiceSpec.scala

@@ -34,11 +34,15 @@ class ClientServiceSpec(contextRoot: String, servicePort: Int)
         val resourceOne = injector.getInstance(classOf[ResourceOne])
         val resourceTwo = injector.getInstance(classOf[ResourceTwo])
 
+        val jsonNewOne = JsonOne.create("New Json", "Hola")
         val jsonOne = JsonOne.create("LocalOne", "Hi")
         resourceOne.echo(jsonOne) mustBe jsonOne
+        resourceOne.patch(jsonOne) mustBe jsonNewOne
 
+        val jsonNewTwo = JsonTwo.create("New Json", "Hola")
         val jsonTwo = JsonTwo.create("LocalTwo", "Howdy")
         resourceTwo.echo(jsonTwo) mustBe jsonTwo
+        resourceTwo.patch(jsonTwo) mustBe jsonNewTwo
       }
 
       it("each client gets its own unique object mapper") {
@@ -53,7 +57,6 @@ class ClientServiceSpec(contextRoot: String, servicePort: Int)
         mapperTwo.isEnabled(SerializationFeature.INDENT_OUTPUT) must be(true)
       }
 
-
       it("provides default object mapper") {
         val injector = getInjector(List(new ResourceOneModule, new ResourceTwoModule))
 

jaxrs/src/main/java/com/cerner/beadledom/jaxrs/PATCH.java

@@ -0,0 +1,14 @@
+package com.cerner.beadledom.jaxrs;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.ws.rs.HttpMethod;
+
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@HttpMethod("PATCH")
+public @interface PATCH {
+}

jaxrs/src/test/java/com/cerner/beadledom/jaxrs/provider/FakeModel.java

@@ -28,6 +28,10 @@ public class FakeModel {
   @JsonProperty("inner_models")
   public List<FakeInnerModel> innerModels;
 
+  public FakeModel() {
+
+  }
+
   public FakeModel(
       String id, String name, int times, List<String> tags, List<FakeInnerModel> innerModels) {
     this.id = id;
@@ -37,6 +41,32 @@ public FakeModel(
     this.innerModels = innerModels;
   }
 
+  public FakeModel setId(String id) {
+    this.id = id;
+    return this;
+  }
+
+  public FakeModel setName(String name) {
+    this.name = name;
+    return this;
+  }
+
+  public FakeModel setTimes(int times) {
+    this.times = times;
+    return this;
+  }
+
+  public FakeModel setTags(List<String> tags) {
+    this.tags = tags;
+    return this;
+  }
+
+  public FakeModel setInnerModels(
+      List<FakeInnerModel> innerModels) {
+    this.innerModels = innerModels;
+    return this;
+  }
+
   @JsonProperty("id")
   public String getId() {
     return id;

jaxrs/src/test/java/com/cerner/beadledom/jaxrs/provider/FakeResource.java

@@ -0,0 +1,24 @@
+package com.cerner.beadledom.jaxrs.provider;
+
+import com.cerner.beadledom.jaxrs.PATCH;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Path("/fakeResource")
+public class FakeResource {
+
+  @PATCH
+  @Path("/Patch")
+  @Produces(MediaType.APPLICATION_JSON)
+  @Consumes(MediaType.APPLICATION_JSON)
+  public Response fakePatch(FakeModel model) {
+    model.setId("newId");
+    model.setName("newName");
+    return Response.ok(model).build();
+  }
+
+}

jaxrs/src/test/scala/com/cerner/beadledom/jaxrs/PATCHSpec.scala

@@ -0,0 +1,77 @@
+package com.cerner.beadledom.jaxrs
+
+import com.cerner.beadledom.jaxrs.provider.{FakeModel, FakeResource}
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider
+
+import org.jboss.resteasy.core.Dispatcher
+import org.jboss.resteasy.mock.{MockDispatcherFactory, MockHttpRequest, MockHttpResponse}
+import org.jboss.resteasy.plugins.server.resourcefactory.POJOResourceFactory
+import org.scalatest._
+import org.scalatest.mock.MockitoSugar
+
+import java.io._
+
+import scala.collection.JavaConverters._
+import javax.ws.rs.core.MediaType
+
+/**
+  * Spec tests for {@link PATCH}.
+  *
+  * @author Eric Christensen
+  */
+class PATCHSpec extends FunSpec with BeforeAndAfterAll with ShouldMatchers with MockitoSugar {
+
+    val dispatcher: Dispatcher = MockDispatcherFactory.createDispatcher()
+    val noDefaults: POJOResourceFactory = new POJOResourceFactory(classOf[FakeResource])
+    dispatcher.getRegistry.addResourceFactory(noDefaults)
+    dispatcher.getProviderFactory.registerProvider(classOf[JacksonJsonProvider])
+
+    describe("PATCH") {
+      it("calls PATCH resource without error") {
+
+        val model = new FakeModel()
+            .setId("id")
+            .setName("name")
+            .setTimes(10)
+            .setTags(List.empty[String].asJava)
+            .setInnerModels(List.empty[FakeModel.FakeInnerModel].asJava)
+
+        val mapper = new ObjectMapper
+        val request: MockHttpRequest = MockHttpRequest.create("PATCH", "/fakeResource/Patch")
+        request.contentType(MediaType.APPLICATION_JSON)
+        request.content(new ByteArrayInputStream(mapper.writeValueAsBytes(model)))
+
+        val response: MockHttpResponse = new MockHttpResponse()
+        dispatcher.invoke(request, response)
+
+        response.getStatus shouldBe 200
+      }
+
+      it("should change the request model fields") {
+
+        val model = new FakeModel()
+            .setId("id")
+            .setName("name")
+            .setTimes(10)
+            .setTags(List.empty[String].asJava)
+            .setInnerModels(List.empty[FakeModel.FakeInnerModel].asJava)
+
+        val mapper = new ObjectMapper
+        val request: MockHttpRequest = MockHttpRequest.create("PATCH", "/fakeResource/Patch")
+        request.contentType(MediaType.APPLICATION_JSON)
+        request.content(new ByteArrayInputStream(mapper.writeValueAsBytes(model)))
+
+        val response: MockHttpResponse = new MockHttpResponse()
+        dispatcher.invoke(request, response)
+
+        response.getStatus shouldBe 200
+
+        val newModel: FakeModel = mapper.readValue(response.getContentAsString, classOf[FakeModel])
+        newModel.name shouldBe "newName"
+        newModel.id shouldBe "newId"
+        newModel.times shouldBe 10
+      }
+    }
+}