Author: dkulp Date: Wed Aug 21 16:50:19 2013 New Revision: 1516215 URL: http://svn.apache.org/r1516215 Log: Merged revisions 1516210 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1516210 | dkulp | 2013-08-21 12:46:59 -0400 (Wed, 21 Aug 2013) | 10 lines Merged revisions 1516207 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1516207 | dkulp | 2013-08-21 12:43:54 -0400 (Wed, 21 Aug 2013) | 2 lines Remove a bunch of tab characters ........ ........ Modified: cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/HelloWorld.java cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/JsonBean.java cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java Modified: cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/HelloWorld.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/HelloWorld.java?rev=1516215&r1=1516214&r2=1516215&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/HelloWorld.java (original) +++ cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/HelloWorld.java Wed Aug 21 16:50:19 2013 @@ -22,8 +22,8 @@ public class HelloWorld { @Consumes("application/json") @Path("/jsonBean") public Response modifyJson(JsonBean input) { - input.setVal2(input.getVal1()); - return Response.ok().entity(input).build(); + input.setVal2(input.getVal1()); + return Response.ok().entity(input).build(); } } Modified: cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/JsonBean.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/JsonBean.java?rev=1516215&r1=1516214&r2=1516215&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/JsonBean.java (original) +++ cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/JsonBean.java Wed Aug 21 16:50:19 2013 @@ -6,19 +6,19 @@ public class JsonBean { private String val2; public String getVal1() { - return val1; + return val1; } public void setVal1(String val1) { - this.val1 = val1; + this.val1 = val1; } public String getVal2() { - return val2; + return val2; } public void setVal2(String val2) { - this.val2 = val2; + this.val2 = val2; } } Modified: cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java?rev=1516215&r1=1516214&r2=1516215&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java (original) +++ cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java Wed Aug 21 16:50:19 2013 @@ -16,36 +16,36 @@ import org.junit.BeforeClass; import org.junit.Test; public class HelloWorldIT { - private static String endpointUrl; - - @BeforeClass - public static void beforeClass() { - endpointUrl = System.getProperty("service.url"); - } - - @Test - public void testPing() throws Exception { - WebClient client = WebClient.create(endpointUrl + "/hello/echo/SierraTangoNevada"); - Response r = client.accept("text/plain").get(); - assertEquals(Response.Status.OK.getStatusCode(), r.getStatus()); - String value = IOUtils.toString((InputStream)r.getEntity()); - assertEquals("SierraTangoNevada", value); - } - - @Test - public void testJsonRoundtrip() throws Exception { - List<Object> providers = new ArrayList<Object>(); - providers.add(new org.codehaus.jackson.jaxrs.JacksonJsonProvider()); - JsonBean inputBean = new JsonBean(); - inputBean.setVal1("Maple"); - WebClient client = WebClient.create(endpointUrl + "/hello/jsonBean", providers); - Response r = client.accept("application/json") - .type("application/json") - .post(inputBean); - assertEquals(Response.Status.OK.getStatusCode(), r.getStatus()); - MappingJsonFactory factory = new MappingJsonFactory(); - JsonParser parser = factory.createJsonParser((InputStream)r.getEntity()); - JsonBean output = parser.readValueAs(JsonBean.class); - assertEquals("Maple", output.getVal2()); - } + private static String endpointUrl; + + @BeforeClass + public static void beforeClass() { + endpointUrl = System.getProperty("service.url"); + } + + @Test + public void testPing() throws Exception { + WebClient client = WebClient.create(endpointUrl + "/hello/echo/SierraTangoNevada"); + Response r = client.accept("text/plain").get(); + assertEquals(Response.Status.OK.getStatusCode(), r.getStatus()); + String value = IOUtils.toString((InputStream)r.getEntity()); + assertEquals("SierraTangoNevada", value); + } + + @Test + public void testJsonRoundtrip() throws Exception { + List<Object> providers = new ArrayList<Object>(); + providers.add(new org.codehaus.jackson.jaxrs.JacksonJsonProvider()); + JsonBean inputBean = new JsonBean(); + inputBean.setVal1("Maple"); + WebClient client = WebClient.create(endpointUrl + "/hello/jsonBean", providers); + Response r = client.accept("application/json") + .type("application/json") + .post(inputBean); + assertEquals(Response.Status.OK.getStatusCode(), r.getStatus()); + MappingJsonFactory factory = new MappingJsonFactory(); + JsonParser parser = factory.createJsonParser((InputStream)r.getEntity()); + JsonBean output = parser.readValueAs(JsonBean.class); + assertEquals("Maple", output.getVal2()); + } } Modified: cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java?rev=1516215&r1=1516214&r2=1516215&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java (original) +++ cxf/branches/2.6.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java Wed Aug 21 16:50:19 2013 @@ -23,8 +23,8 @@ import static org.junit.Assert.assertEqu public class HelloWorldImplTest { @Test - public void testSayHi() { - HelloWorldImpl helloWorldImpl = new HelloWorldImpl(); + public void testSayHi() { + HelloWorldImpl helloWorldImpl = new HelloWorldImpl(); String response = helloWorldImpl.sayHi("Sam"); assertEquals("HelloWorldImpl not properly saying hi", "Hello Sam", response); }
