Author: dkulp
Date: Wed Aug 21 16:43:54 2013
New Revision: 1516207
URL: http://svn.apache.org/r1516207
Log:
Remove a bunch of tab characters
Modified:
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/JsonBean.java
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java
Modified:
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/HelloWorld.java?rev=1516207&r1=1516206&r2=1516207&view=diff
==============================================================================
---
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
(original)
+++
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
Wed Aug 21 16:43:54 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/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/JsonBean.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/JsonBean.java?rev=1516207&r1=1516206&r2=1516207&view=diff
==============================================================================
---
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/JsonBean.java
(original)
+++
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/main/java/JsonBean.java
Wed Aug 21 16:43:54 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/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java?rev=1516207&r1=1516206&r2=1516207&view=diff
==============================================================================
---
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java
(original)
+++
cxf/trunk/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/src/test/java/HelloWorldIT.java
Wed Aug 21 16:43:54 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/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java?rev=1516207&r1=1516206&r2=1516207&view=diff
==============================================================================
---
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java
(original)
+++
cxf/trunk/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java
Wed Aug 21 16:43:54 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);
}
