Upgrade to latest checkstyle plugin.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/004321a2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/004321a2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/004321a2 Branch: refs/heads/master Commit: 004321a2e955665005b9c5bfe304feaf9cb622b0 Parents: 5c678fa Author: Daniel Kulp <[email protected]> Authored: Fri Feb 6 14:31:59 2015 -0500 Committer: Daniel Kulp <[email protected]> Committed: Fri Feb 6 14:31:59 2015 -0500 ---------------------------------------------------------------------- parent/pom.xml | 2 +- .../org/apache/cxf/aegis/type/java5/EnumTypeTest.java | 12 ++++++------ .../cxf/jaxrs/provider/JAXBElementProviderTest.java | 8 ++++++-- .../cxf/jaxrs/provider/json/JSONProviderTest.java | 8 ++++++-- .../addressing/policy/AddressingAssertionBuilder.java | 2 +- .../systest/jaxrs/JAXRSOverlappingDestinationsTest.java | 12 +++++++++--- .../java/org/apache/cxf/systest/jaxrs/RETRIEVE_get.java | 1 + .../apache/cxf/tools/corba/common/idltypes/IdlDefn.java | 2 +- .../apache/cxf/tools/corba/common/idltypes/IdlType.java | 2 +- .../org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java | 3 +-- 10 files changed, 33 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/004321a2/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 1dd4281..75a59a2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -300,7 +300,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.12.1</version> + <version>2.14</version> <dependencies> <dependency> <groupId>org.apache.cxf.build-utils</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/004321a2/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java index 2043aaa..c3f1550 100644 --- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java +++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java @@ -41,7 +41,7 @@ import org.junit.Test; public class EnumTypeTest extends AbstractAegisTest { private DefaultTypeMapping tm; - private enum smallEnum { + private enum SmallEnum { VALUE1, VALUE2; @Override @@ -64,12 +64,12 @@ public class EnumTypeTest extends AbstractAegisTest { @Test public void testType() throws Exception { EnumType type = new EnumType(); - type.setTypeClass(smallEnum.class); + type.setTypeClass(SmallEnum.class); type.setSchemaType(new QName("urn:test", "test")); tm.register(type); - Element element = writeObjectToElement(type, smallEnum.VALUE1, getContext()); + Element element = writeObjectToElement(type, SmallEnum.VALUE1, getContext()); assertEquals("VALUE1", element.getTextContent()); @@ -77,12 +77,12 @@ public class EnumTypeTest extends AbstractAegisTest { ElementReader reader = new ElementReader(xreader); Object value = type.readObject(reader, getContext()); - assertEquals(smallEnum.VALUE1, value); + assertEquals(SmallEnum.VALUE1, value); } @Test public void testAutoCreation() throws Exception { - AegisType type = tm.getTypeCreator().createType(smallEnum.class); + AegisType type = tm.getTypeCreator().createType(SmallEnum.class); assertTrue(type instanceof EnumType); } @@ -117,7 +117,7 @@ public class EnumTypeTest extends AbstractAegisTest { @Test public void testWSDL() throws Exception { EnumType type = new EnumType(); - type.setTypeClass(smallEnum.class); + type.setTypeClass(SmallEnum.class); type.setSchemaType(new QName("urn:test", "test")); XmlSchema schema = newXmlSchema("urn:test"); type.writeSchema(schema); http://git-wip-us.apache.org/repos/asf/cxf/blob/004321a2/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java index f69d8b9..0249fd0 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java @@ -933,8 +933,12 @@ public class JAXBElementProviderTest extends Assert { //ParameterizedType required for Lists of Objects ParameterizedType type = new ParameterizedType() { - public Type getRawType() { return List.class; } - public Type getOwnerType() { return null; } + public Type getRawType() { + return List.class; + } + public Type getOwnerType() { + return null; + } public Type[] getActualTypeArguments() { return new Type[] {TagVO2Holder.class}; } http://git-wip-us.apache.org/repos/asf/cxf/blob/004321a2/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java ---------------------------------------------------------------------- diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java index a2e1b77..7a8c4be 100644 --- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java +++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java @@ -1357,8 +1357,12 @@ public class JSONProviderTest extends Assert { //ParameterizedType required for Lists of Objects ParameterizedType type = new ParameterizedType() { - public Type getRawType() { return List.class; } - public Type getOwnerType() { return null; } + public Type getRawType() { + return List.class; + } + public Type getOwnerType() { + return null; + } public Type[] getActualTypeArguments() { return new Type[] {TagVO2Holder.class}; } http://git-wip-us.apache.org/repos/asf/cxf/blob/004321a2/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java ---------------------------------------------------------------------- diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java index 4f147e3..662b819 100644 --- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java +++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java @@ -80,7 +80,7 @@ public class AddressingAssertionBuilder implements AssertionBuilder<Element> { mp, policy); } - } .build(elem, factory); + }.build(elem, factory); return nap; } else if (MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME.equals(qn) || MetadataConstants.ANON_RESPONSES_ASSERTION_QNAME_0705.equals(qn)) { http://git-wip-us.apache.org/repos/asf/cxf/blob/004321a2/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSOverlappingDestinationsTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSOverlappingDestinationsTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSOverlappingDestinationsTest.java index 53ed5fb..3ead6a5 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSOverlappingDestinationsTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSOverlappingDestinationsTest.java @@ -156,7 +156,9 @@ public class JAXRSOverlappingDestinationsTest extends AbstractBusClientServerTes public String getUris(@Context UriInfo uriInfo) { String baseUriOnEntry = uriInfo.getRequestUri().toString(); try { - while (locked) { Thread.sleep(1000); } + while (locked) { + Thread.sleep(1000); + } } catch (InterruptedException x) { // ignore } @@ -170,11 +172,15 @@ public class JAXRSOverlappingDestinationsTest extends AbstractBusClientServerTes @GET @Path("/lock") @Produces("text/plain") - public String lock() { locked = true; return "locked"; } + public String lock() { + locked = true; return "locked"; + } @GET @Path("/unlock") @Produces("text/plain") - public String unlock() { locked = false; return "unlocked"; } + public String unlock() { + locked = false; return "unlocked"; + } } } http://git-wip-us.apache.org/repos/asf/cxf/blob/004321a2/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/RETRIEVE_get.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/RETRIEVE_get.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/RETRIEVE_get.java index 1c1f3eb..c5f6f50 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/RETRIEVE_get.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/RETRIEVE_get.java @@ -28,6 +28,7 @@ import javax.ws.rs.HttpMethod; @Target({ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) @HttpMethod("GET") +//CHECKSTYLE:OFF public @interface RETRIEVE_get { } http://git-wip-us.apache.org/repos/asf/cxf/blob/004321a2/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlDefn.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlDefn.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlDefn.java index 0cd5385..37f9639 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlDefn.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlDefn.java @@ -23,7 +23,7 @@ import java.io.PrintWriter; import java.util.List; -public abstract interface IdlDefn { +public interface IdlDefn { IdlScopeBase definedIn(); http://git-wip-us.apache.org/repos/asf/cxf/blob/004321a2/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlType.java ---------------------------------------------------------------------- diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlType.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlType.java index fc13e41..65b5d2a 100644 --- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlType.java +++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlType.java @@ -19,6 +19,6 @@ package org.apache.cxf.tools.corba.common.idltypes; -public abstract interface IdlType extends IdlDefn { +public interface IdlType extends IdlDefn { // empty for now } http://git-wip-us.apache.org/repos/asf/cxf/blob/004321a2/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java index f71a0fc..84af561 100644 --- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java +++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java @@ -998,8 +998,7 @@ public class CodeGenTest extends AbstractCodeGenTest { assertEquals("void", method.getReturnType().getSimpleName()); assertEquals("Exception class is not generated ", 1, method.getExceptionTypes().length); assertEquals("org.apache.cxf.w2j.hello_world.messages.PingMeFault", - method.getExceptionTypes()[0] - .getCanonicalName()); + method.getExceptionTypes()[0].getCanonicalName()); } @Test
