You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/08/19 22:55:52 UTC
svn commit: r1159786 - in /cxf/trunk:
common/common/src/main/java/org/apache/cxf/jaxb/
rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/
rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/
rt/frontend/jaxrs/src/main/...
Author: dkulp
Date: Fri Aug 19 20:55:51 2011
New Revision: 1159786
URL: http://svn.apache.org/viewvc?rev=1159786&view=rev
Log:
Fixes to prepare to update to newer versions of checkstyle.
Modified:
cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRef.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisElementProviderTest.java
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisJSONProviderTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java
cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java?rev=1159786&r1=1159785&r2=1159786&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java Fri Aug 19 20:55:51 2011
@@ -645,7 +645,7 @@ public final class JAXBUtils {
throw new JAXBException(ex);
}
}
- public static interface BridgeWrapper {
+ public interface BridgeWrapper {
Object unmarshal(XMLStreamReader source, AttachmentUnmarshaller am) throws JAXBException;
@@ -939,7 +939,7 @@ public final class JAXBUtils {
}
- public static interface SchemaCompiler {
+ public interface SchemaCompiler {
void setErrorListener(Object elForRun);
@@ -955,7 +955,7 @@ public final class JAXBUtils {
@WrapReturn(Options.class)
Options getOptions();
}
- public static interface S2JJAXBModel {
+ public interface S2JJAXBModel {
@WrapReturn(JCodeModel.class)
JCodeModel generateCode(Object object, Object elForRun);
@@ -966,15 +966,15 @@ public final class JAXBUtils {
@WrapReturn(TypeAndAnnotation.class)
TypeAndAnnotation getJavaType(QName typeQName);
}
- public static interface Mapping {
+ public interface Mapping {
@WrapReturn(TypeAndAnnotation.class)
TypeAndAnnotation getType();
}
- public static interface TypeAndAnnotation {
+ public interface TypeAndAnnotation {
@WrapReturn(JType.class)
JType getTypeClass();
}
- public static interface JType {
+ public interface JType {
boolean isArray();
@WrapReturn(JType.class)
@@ -991,7 +991,7 @@ public final class JAXBUtils {
@WrapReturn(value = JType.class, iterator = true)
Iterator<JType> classes();
}
- public static interface Options {
+ public interface Options {
void addGrammar(InputSource is);
@@ -999,21 +999,21 @@ public final class JAXBUtils {
String getBuildID();
}
- public static interface JCodeModel {
+ public interface JCodeModel {
void build(Object writer) throws IOException;
@WrapReturn(value = JPackage.class, iterator = true)
Iterator<JPackage> packages();
}
- public static interface JPackage {
+ public interface JPackage {
String name();
@WrapReturn(value = JDefinedClass.class, iterator = true)
Iterator<JDefinedClass> classes();
}
- public static interface JDefinedClass {
+ public interface JDefinedClass {
String name();
String fullName();
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRef.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRef.java?rev=1159786&r1=1159785&r2=1159786&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRef.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRef.java Fri Aug 19 20:55:51 2011
@@ -70,7 +70,7 @@ public class SoapRef {
}
}
- public static interface Action {
+ public interface Action {
void onSet(SoapRef ref);
}
}
\ No newline at end of file
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java?rev=1159786&r1=1159785&r2=1159786&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java Fri Aug 19 20:55:51 2011
@@ -73,7 +73,7 @@ public class OperationNSTest extends Abs
}
@WebService(name = "NotificationLog", targetNamespace = "http://www.sics.se/NotificationLog")
- public static interface NotificationLog {
+ public interface NotificationLog {
@WebMethod(operationName = "Notify", action = "")
@Oneway
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java?rev=1159786&r1=1159785&r2=1159786&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java Fri Aug 19 20:55:51 2011
@@ -1155,7 +1155,7 @@ public class WadlGenerator implements Re
}
}
- private static interface SchemaWriter {
+ private interface SchemaWriter {
void write(StringBuilder sb);
}
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java?rev=1159786&r1=1159785&r2=1159786&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java Fri Aug 19 20:55:51 2011
@@ -63,7 +63,7 @@ import org.apache.cxf.jaxrs.impl.PathSeg
public class Customer extends AbstractCustomer implements CustomerInfo {
- public static interface CustomerBeanInterface {
+ public interface CustomerBeanInterface {
}
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisElementProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisElementProviderTest.java?rev=1159786&r1=1159785&r2=1159786&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisElementProviderTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisElementProviderTest.java Fri Aug 19 20:55:51 2011
@@ -163,7 +163,7 @@ public class AegisElementProviderTest ex
public static class AegisSuperBean extends AegisTestBean {
}
- private static interface InterfaceWithMap {
+ private interface InterfaceWithMap {
Map<AegisTestBean, AegisSuperBean> mapFunction();
}
Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisJSONProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisJSONProviderTest.java?rev=1159786&r1=1159785&r2=1159786&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisJSONProviderTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisJSONProviderTest.java Fri Aug 19 20:55:51 2011
@@ -337,7 +337,7 @@ public class AegisJSONProviderTest exten
public static class AegisSuperBean extends AegisTestBean {
}
- private static interface InterfaceWithMap {
+ private interface InterfaceWithMap {
Map<AegisTestBean, AegisSuperBean> mapFunction();
}
}
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java?rev=1159786&r1=1159785&r2=1159786&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java Fri Aug 19 20:55:51 2011
@@ -387,7 +387,7 @@ public class CodeFirstTest extends Abstr
}
- public static interface GenericsService2Typed extends GenericsService2<Float, Double> {
+ public interface GenericsService2Typed extends GenericsService2<Float, Double> {
}
public static class GenericsService2Impl implements GenericsService2<Integer, String> {
@@ -422,7 +422,7 @@ public class CodeFirstTest extends Abstr
@WebService
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- public static interface NoRootBare {
+ public interface NoRootBare {
NoRootResponse echoString(NoRootRequest request);
}
@@ -498,7 +498,7 @@ public class CodeFirstTest extends Abstr
}
@WebService(targetNamespace = "http://cxf.apache.org/service.wsdl")
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- public static interface CXF2766 {
+ public interface CXF2766 {
@WebResult(name = "return-response",
targetNamespace = "http://cxf.apache.org/service.wsdl/types",
partName = "returnResponse")
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java?rev=1159786&r1=1159785&r2=1159786&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java Fri Aug 19 20:55:51 2011
@@ -180,7 +180,7 @@ public class CodeFirstWSDLTest extends A
placement = WSDLDocumentation.Placement.TOP),
@WSDLDocumentation(value = "My binding doc", placement = WSDLDocumentation.Placement.BINDING)
})
- public static interface CXF3093PortType {
+ public interface CXF3093PortType {
int doubleIt(int numberToDouble);
}
@@ -228,7 +228,7 @@ public class CodeFirstWSDLTest extends A
}
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt")
- public static interface CXF3092PortType {
+ public interface CXF3092PortType {
int doubleIt(int numberToDouble);
}
Modified: cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java?rev=1159786&r1=1159785&r2=1159786&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java (original)
+++ cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java Fri Aug 19 20:55:51 2011
@@ -55,7 +55,7 @@ public class ServerFactoryTest extends A
assertTrue(server.getDestination() instanceof CustomDestination);
}
- public static interface TestService<P> {
+ public interface TestService<P> {
int open(P args);
void close(int handle);
}
Modified: cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java?rev=1159786&r1=1159785&r2=1159786&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java (original)
+++ cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java Fri Aug 19 20:55:51 2011
@@ -241,7 +241,7 @@ public class JavascriptTestUtilities ext
return rhinoContextFactory;
}
- public static interface JSRunnable<T> {
+ public interface JSRunnable<T> {
T run(Context context);
}
Modified: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java?rev=1159786&r1=1159785&r2=1159786&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java (original)
+++ cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java Fri Aug 19 20:55:51 2011
@@ -933,7 +933,7 @@ public class MAPAggregatorTest extends A
}
}
- private static interface SEI {
+ private interface SEI {
@RequestWrapper(targetNamespace = "http://foo/bar", className = "SEI", localName = "opRequest")
@ResponseWrapper(targetNamespace = "http://foo/bar", className = "SEI", localName = "opResponse")
String op();