Fix some checkstyle things that can be common between checkstyle 5.x and 6.x
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9e4016bf Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9e4016bf Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9e4016bf Branch: refs/heads/3.0.x-fixes Commit: 9e4016bf1b62efa060e9fe4a5b0abb10e3f203c8 Parents: 44df037 Author: Daniel Kulp <[email protected]> Authored: Fri Feb 6 16:30:58 2015 -0500 Committer: Daniel Kulp <[email protected]> Committed: Mon Feb 9 12:48:55 2015 -0500 ---------------------------------------------------------------------- .../cxf/common/xmlschema/XmlSchemaUtils.java | 4 ++-- .../jsse/TLSParameterJaxBUtils.java | 3 +-- .../cxf/workqueue/OneShotAsyncExecutor.java | 4 ++-- .../ws/addressing/EndpointReferenceUtils.java | 4 ++-- .../cxf/ws/addressing/VersionTransformer.java | 4 ++-- .../wsdl2java/WsdlOptionLoader.java | 13 ++++++------ .../wsdl2js/WSDL2JavaScriptMojo.java | 7 +++---- .../cxf/aegis/type/DefaultTypeMapping.java | 2 +- .../cxf/aegis/custom/service/ServiceImpl.java | 1 + .../aegis/namespaces/ExplicitPrefixTest.java | 3 +-- .../cxf/jaxws/support/JaxWsEndpointImpl.java | 4 ++-- .../org/apache/cxf/jaxws/CodeFirstTest.java | 9 ++++----- .../apache/cxf/jaxws/holder/HolderService.java | 10 +++++----- .../cxf/javascript/GreeterClientTest.java | 3 +-- .../cxf/javascript/JsHttpRequestTest.java | 3 +-- .../cxf/transport/https/CertConstraints.java | 9 +++------ .../transport/https/CertConstraintsTest.java | 21 +++++++------------- .../PolicyInterceptorProviderRegistryImpl.java | 1 + .../org/apache/cxf/ws/rm/RMManagerTest.java | 3 +-- .../wss4j/PolicyBasedWSS4JOutInterceptor.java | 1 + .../wss4j/StaxCryptoCoverageChecker.java | 3 +-- .../wss4j/StaxSecurityContextInInterceptor.java | 3 +-- .../ws/security/wss4j/WSS4JInInterceptor.java | 5 +---- .../ws/security/wss4j/WSS4JOutInterceptor.java | 3 +-- .../AbstractStaxBindingHandler.java | 1 + .../StaxSymmetricBindingHandler.java | 4 ++-- .../cxf/ws/security/wss4j/CustomProcessor.java | 3 +-- .../cxf/ws/security/wss4j/WSS4JInOutTest.java | 3 +-- .../apache/cxf/wsdl11/WSDLServiceBuilder.java | 6 +++--- .../java/org/apache/cxf/sts/QNameConstants.java | 4 ++-- .../cxf/sts/operation/AbstractOperation.java | 6 ++---- .../sts/token/realm/CertConstraintsParser.java | 3 +-- .../cxf/wsn/services/JaxwsSubscription.java | 6 +++--- .../systest/jaxrs/JAXRSLoggingAtomPushTest.java | 6 ++---- .../provider/AbstractSourcePayloadProvider.java | 7 ++++--- .../provider/HWDOMSourceMessageProvider.java | 4 ++-- .../provider/HWDOMSourcePayloadProvider.java | 4 ++-- .../provider/HWSAXSourceMessageProvider.java | 2 +- .../provider/HWSAXSourcePayloadProvider.java | 4 ++-- .../provider/HWSoapMessageDocProvider.java | 2 +- .../provider/HWStreamSourceMessageProvider.java | 2 +- .../provider/HWStreamSourcePayloadProvider.java | 2 +- .../systest/kerberos/ldap/LDAPClaimsTest.java | 14 ++++++------- .../cxf/systest/schemaimport/ServiceImpl.java | 6 +++--- .../systest/schemaimport/TestEndpointImpl.java | 4 ++-- .../soap/RPCEncodedSoapActionGreeterImpl.java | 2 +- .../soap/RPCLitSoapActionGreeterImpl.java | 2 +- .../JavaFirstAttachmentPolicyService.java | 2 +- .../JavaFirstAttachmentPolicyServiceImpl.java | 4 ++-- .../ws/policy/JavaFirstPolicyService.java | 2 +- .../ws/policy/JavaFirstPolicyServiceImpl.java | 4 ++-- .../SslUsernamePasswordAttachmentService.java | 2 +- ...slUsernamePasswordAttachmentServiceImpl.java | 4 ++-- .../NoAlternativesOperationSimpleService.java | 2 +- ...oAlternativesOperationSimpleServiceImpl.java | 6 +++--- .../javafirst/OperationSimpleService.java | 2 +- .../javafirst/OperationSimpleServiceImpl.java | 5 +++-- .../ws/wssec10/server/PingServiceBase.java | 5 +---- .../cxf/tools/fortest/exception/Echo2Impl.java | 4 ++-- .../cxf/tools/fortest/holder/HolderService.java | 10 +++++----- 60 files changed, 122 insertions(+), 150 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java b/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java index 70f2200..dbff0c0 100644 --- a/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java +++ b/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java @@ -238,8 +238,8 @@ public final class XmlSchemaUtils { return ext.getAttributes(); } - public static List<XmlSchemaAnnotated> - getContentAttributes(XmlSchemaComplexType type, SchemaCollection collection) { + public static List<XmlSchemaAnnotated> getContentAttributes(XmlSchemaComplexType type, + SchemaCollection collection) { List<XmlSchemaAnnotated> results = new ArrayList<XmlSchemaAnnotated>(); QName baseTypeName = getBaseType(type); if (baseTypeName != null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java index 3ce5fcf..65965e9 100644 --- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java +++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java @@ -225,8 +225,7 @@ public final class TLSParameterJaxBUtils { /** * load the certificates as X.509 certificates */ - private static Collection<? extends Certificate> - loadCertificates(final java.io.InputStream is) + private static Collection<? extends Certificate> loadCertificates(final java.io.InputStream is) throws IOException, CertificateException { final CertificateFactory factory = CertificateFactory.getInstance("X.509"); http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java b/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java index 59203bf..f6d1545 100644 --- a/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java +++ b/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java @@ -27,8 +27,8 @@ import java.util.concurrent.Executor; */ public final class OneShotAsyncExecutor implements Executor { - private static final OneShotAsyncExecutor INSTANCE = new - OneShotAsyncExecutor(); + private static final OneShotAsyncExecutor INSTANCE + = new OneShotAsyncExecutor(); private OneShotAsyncExecutor() { } http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java index 7ca7387..6710ee4 100644 --- a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java +++ b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java @@ -908,8 +908,8 @@ public final class EndpointReferenceUtils { javax.xml.bind.Marshaller jm = getJAXBContextForEPR().createMarshaller(); jm.setProperty(Marshaller.JAXB_FRAGMENT, true); QName qname = new QName("http://www.w3.org/2005/08/addressing";, "EndpointReference"); - JAXBElement<EndpointReferenceType> - jaxEle = new JAXBElement<EndpointReferenceType>(qname, EndpointReferenceType.class, epr); + JAXBElement<EndpointReferenceType> jaxEle + = new JAXBElement<EndpointReferenceType>(qname, EndpointReferenceType.class, epr); W3CDOMStreamWriter writer = new W3CDOMStreamWriter(); http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java b/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java index f13128f..588c83f 100644 --- a/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java +++ b/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java @@ -112,6 +112,7 @@ public class VersionTransformer { */ public static org.apache.cxf.ws.addressing.v200403.AttributedURI convertTo200403(AttributedURIType internal) { + org.apache.cxf.ws.addressing.v200403.AttributedURI exposed = Names200403.WSA_OBJECT_FACTORY .createAttributedURI(); String exposedValue = Names.WSA_ANONYMOUS_ADDRESS.equals(internal.getValue()) @@ -264,8 +265,7 @@ public class VersionTransformer { * @param exposed the 2004/03 EndpointReferenceType * @return an equivalent 2005/08 EndpointReferenceType */ - public static EndpointReferenceType - convert(org.apache.cxf.ws.addressing.v200403.EndpointReferenceType exposed) { + public static EndpointReferenceType convert(org.apache.cxf.ws.addressing.v200403.EndpointReferenceType exposed) { EndpointReferenceType internal = ContextUtils.WSA_OBJECT_FACTORY.createEndpointReferenceType(); internal.setAddress(convert(exposed.getAddress())); // TODO ref parameters not present in 2004/03 http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java ---------------------------------------------------------------------- diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java index 8628c9a..9cee2ae 100644 --- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java +++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java @@ -41,9 +41,8 @@ public final class WsdlOptionLoader { private WsdlOptionLoader() { } - public static List<GenericWsdlOption> - loadWsdlOptionsFromDependencies(MavenProject project, - File outputDir) { + public static List<GenericWsdlOption> loadWsdlOptionsFromDependencies(MavenProject project, + File outputDir) { List<GenericWsdlOption> options = new ArrayList<GenericWsdlOption>(); Set<Artifact> dependencies = CastUtils.cast(project.getDependencyArtifacts()); for (Artifact artifact : dependencies) { @@ -76,10 +75,10 @@ public final class WsdlOptionLoader { * @return list of one WsdlOption object for each wsdl found * @throws MojoExecutionException */ - public static List<GenericWsdlOption> - loadWsdlOptionsFromFiles(File wsdlBasedir, String includes[], - String excludes[], - File defaultOutputDir) + public static List<GenericWsdlOption> loadWsdlOptionsFromFiles(File wsdlBasedir, + String includes[], + String excludes[], + File defaultOutputDir) throws MojoExecutionException { if (wsdlBasedir == null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java ---------------------------------------------------------------------- diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java index 1ba97e3..836daa4 100644 --- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java +++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java @@ -256,10 +256,9 @@ public class WSDL2JavaScriptMojo extends AbstractCodegenMoho { return options; } - public static List<GenericWsdlOption> - loadWsdlOptionsFromDependencies(MavenProject project, - Option defaultOptions, - File outputDir) { + public static List<GenericWsdlOption> loadWsdlOptionsFromDependencies(MavenProject project, + Option defaultOptions, + File outputDir) { List<GenericWsdlOption> options = new ArrayList<GenericWsdlOption>(); Set<Artifact> dependencies = CastUtils.cast(project.getDependencyArtifacts()); http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java index ec16f82..7bc803e 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java @@ -340,7 +340,7 @@ public class DefaultTypeMapping implements TypeMapping { } public static DefaultTypeMapping createDefaultTypeMapping(boolean defaultNillable, - boolean enableMtomXmime) { + boolean enableMtomXmime) { return createDefaultTypeMapping( defaultNillable, enableMtomXmime, http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java index 2c4ef23..109bc26 100644 --- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java +++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java @@ -52,6 +52,7 @@ public class ServiceImpl implements Service { public Map<NoDefaultConstructorBeanKey, Collection<NoDefaultConstructorBean>> getByNames(Collection<NoDefaultConstructorBeanKey> keys) { + if (keys == null) { throw new IllegalArgumentException("keys is null"); } http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java index 7e8c4e0..e32730f 100644 --- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java +++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java @@ -117,8 +117,7 @@ public class ExplicitPrefixTest extends AbstractAegisTest { * @param node * @return */ - private Map<String, String> - getNodeNamespaceDeclarations(Node node) { + private Map<String, String> getNodeNamespaceDeclarations(Node node) { Map<String, String> result = new HashMap<String, String>(); NamedNodeMap attributes = node.getAttributes(); for (int x = 0; x < attributes.getLength(); x++) { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java index 6f0be97..b3584cf 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java @@ -342,8 +342,8 @@ public class JaxWsEndpointImpl extends EndpointImpl { private void buildWsdlExtensibilities(BindingInfo bindingInfo) { Addressing addressing = getAddressing(); if (addressing != null) { - ExtensionRegistry extensionRegistry = getBus().getExtension(WSDLManager.class) - .getExtensionRegistry(); + ExtensionRegistry extensionRegistry + = getBus().getExtension(WSDLManager.class).getExtensionRegistry(); try { ExtensibilityElement el = extensionRegistry.createExtension(javax.wsdl.Binding.class, JAXWSAConstants. http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java index 88f98c0..790b83d 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java @@ -553,11 +553,10 @@ public class CodeFirstTest extends AbstractJaxWsTest { targetNamespace = "http://cxf.apache.org/service.wsdl/types";, partName = "returnResponse") @WebMethod(action = "http://cxf.apache.org/doReturn";) - ReturnResponseType - doReturn(@WebParam(partName = "returnTrx", - name = "return-request", - targetNamespace = "http://cxf.apache.org/service.wsdl/types";) - ReturnRequestType returnTrx); + ReturnResponseType doReturn(@WebParam(partName = "returnTrx", + name = "return-request", + targetNamespace = "http://cxf.apache.org/service.wsdl/types";) + ReturnRequestType returnTrx); } @WebService(targetNamespace = "http://cxf.apache.org/service.wsdl";) public static class CXF2766Impl implements CXF2766 { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderService.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderService.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderService.java index 1b9b465..588f40a 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderService.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderService.java @@ -26,13 +26,13 @@ import javax.xml.ws.Holder; @WebService public interface HolderService { - String echo(String s1, String s2, @WebParam(mode = Mode.OUT) - Holder<String> outS2); + String echo(String s1, String s2, + @WebParam(mode = Mode.OUT) Holder<String> outS2); - String echo2(String s1, @WebParam(mode = Mode.OUT) - Holder<String> outS2, String s2); + String echo2(String s1, + @WebParam(mode = Mode.OUT) Holder<String> outS2, String s2); String echo3(@WebParam(mode = Mode.INOUT, header = true, name = "header") - Holder<String> header, String s1); + Holder<String> header, String s1); } http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java ---------------------------------------------------------------------- diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java index 46c0e06..ba8c14d 100644 --- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java +++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java @@ -50,8 +50,7 @@ public class GreeterClientTest extends JavascriptRhinoTest { @Before - public - void before() throws Exception { + public void before() throws Exception { setupRhino("greeter-service-endpoint", "/org/apache/cxf/javascript/GreeterTests.js", SchemaValidationType.BOTH); http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java ---------------------------------------------------------------------- diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java index 179fb53..c29f22d 100644 --- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java +++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java @@ -74,8 +74,7 @@ public class JsHttpRequestTest extends AbstractCXFSpringTest { @Before - public - void setupRhino() throws Exception { + public void setupRhino() throws Exception { testUtilities.setBus(getBean(Bus.class, "cxf")); testUtilities.initializeRhino(); testUtilities.readResourceIntoRhino("/org/apache/cxf/javascript/XMLHttpRequestTests.js"); http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java ---------------------------------------------------------------------- diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java index c5ebd31..421c73b 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java @@ -71,8 +71,7 @@ public class CertConstraints { * ANY. Note that if the combinator is ALL and the list of patterns * is empty, then any dn will match (by definition of the universal quantifier) */ - final boolean - matches( + final boolean matches( final javax.security.auth.x500.X500Principal dn ) { boolean atLeastOnePatternMatches = false; @@ -121,8 +120,7 @@ public class CertConstraints { /** * Create a CertificateConstraints from a CertificateConstraintsType specification */ - public - CertConstraints( + public CertConstraints( final java.util.List<String> subjectConstraints, final Combinator subjectConstraintsCombinator, final java.util.List<String> issuerConstraints, @@ -139,8 +137,7 @@ public class CertConstraints { * subject DNConstraints and the certificate's IssuerDN matches the issuer * DNConstraints; false, otherwise */ - public boolean - matches( + public boolean matches( final java.security.cert.X509Certificate cert ) { return http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java ---------------------------------------------------------------------- diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java index 4e15b5b..dfa941f 100644 --- a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java +++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java @@ -37,8 +37,7 @@ import org.apache.cxf.staxutils.StaxUtils; public class CertConstraintsTest extends org.junit.Assert { @org.junit.Test - public void - testCertConstraints() throws Exception { + public void testCertConstraints() throws Exception { final X509Certificate bethalCert = loadCertificate("Bethal.jks", "JKS", "password", "bethal"); final X509Certificate gordyCert = @@ -91,8 +90,7 @@ public class CertConstraintsTest extends org.junit.Assert { // Private utilities // - private static CertConstraints - loadCertConstraints( + private static CertConstraints loadCertConstraints( final String id ) throws Exception { CertificateConstraintsType certsConstraintsType = @@ -100,8 +98,7 @@ public class CertConstraintsTest extends org.junit.Assert { return CertConstraintsJaxBUtils.createCertConstraints(certsConstraintsType); } - private static CertificateConstraintsType - loadCertificateConstraintsType( + private static CertificateConstraintsType loadCertificateConstraintsType( final String id ) throws Exception { return loadGeneratedType( @@ -112,8 +109,7 @@ public class CertConstraintsTest extends org.junit.Assert { ); } - private static X509Certificate - loadCertificate( + private static X509Certificate loadCertificate( final String keystoreFilename, final String keystoreType, final String keystorePassword, @@ -138,8 +134,7 @@ public class CertConstraintsTest extends org.junit.Assert { throw new RuntimeException("error in test -- keystore " + id + " has no trusted certs"); } - private static <T> T - loadGeneratedType( + private static <T> T loadGeneratedType( final Class<T> cls, final String elementName, final String name, @@ -162,8 +157,7 @@ public class CertConstraintsTest extends org.junit.Assert { } - private static org.w3c.dom.Document - loadDocument( + private static org.w3c.dom.Document loadDocument( final String name ) throws Exception { final java.io.InputStream inStream = @@ -171,8 +165,7 @@ public class CertConstraintsTest extends org.junit.Assert { return StaxUtils.read(inStream); } - private static <T> T - unmarshal( + private static <T> T unmarshal( final Class<T> cls, final org.w3c.dom.Element elt ) throws JAXBException { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java ---------------------------------------------------------------------- diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java index 7e95a79..133f910 100644 --- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java +++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java @@ -110,6 +110,7 @@ public class PolicyInterceptorProviderRegistryImpl public List<Interceptor<? extends Message>> getInterceptorsForAlternative(Collection<? extends Assertion> alternative, boolean out, boolean fault) { + List<Interceptor<? extends Message>> interceptors = new ArrayList<Interceptor<? extends Message>>(); for (Assertion a : alternative) { if (a.isOptional()) { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java index af50827..25c149b 100644 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java @@ -372,8 +372,7 @@ public class RMManagerTest extends Assert { @Test public void testGetExistingSequence() throws NoSuchMethodException, SequenceFault, RMException { - Method m = RMManager.class - .getDeclaredMethod("getSource", new Class[] {Message.class}); + Method m = RMManager.class.getDeclaredMethod("getSource", new Class[] {Message.class}); manager = control.createMock(RMManager.class, new Method[] {m}); Message message = control.createMock(Message.class); Identifier inSid = control.createMock(Identifier.class); http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java index dfb3597..98a6330 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java @@ -232,6 +232,7 @@ public class PolicyBasedWSS4JOutInterceptor extends AbstractPhaseInterceptor<Soa public Collection<PhaseInterceptor<? extends org.apache.cxf.message.Message>> getAdditionalInterceptors() { + return null; } http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java index 9a131e2..cde80d3 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java @@ -449,8 +449,7 @@ public class StaxCryptoCoverageChecker extends AbstractPhaseInterceptor<SoapMess * Otherwise set the Fault/Code/Value to env:Sender and the Fault/Code/Subcode/Value * as the fault code from the WSSecurityException. */ - private SoapFault - createSoapFault(SoapVersion version, WSSecurityException e) { + private SoapFault createSoapFault(SoapVersion version, WSSecurityException e) { SoapFault fault; javax.xml.namespace.QName faultCode = e.getFaultCode(); if (version.getVersion() == 1.1 && faultCode != null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java index d30c56c..5ba0457 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java @@ -236,8 +236,7 @@ public class StaxSecurityContextInInterceptor extends AbstractPhaseInterceptor<S * Otherwise set the Fault/Code/Value to env:Sender and the Fault/Code/Subcode/Value * as the fault code from the WSSecurityException. */ - private SoapFault - createSoapFault(SoapVersion version, WSSecurityException e) { + private SoapFault createSoapFault(SoapVersion version, WSSecurityException e) { SoapFault fault; javax.xml.namespace.QName faultCode = e.getFaultCode(); if (version.getVersion() == 1.1 && faultCode != null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java index 4f3bbf3..07d4e1e 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java @@ -799,10 +799,7 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor { * (non-null) processor map, to be used to initialize the * WSSecurityEngine instance. */ - protected static WSSecurityEngine - createSecurityEngine( - final Map<QName, Object> map - ) { + protected static WSSecurityEngine createSecurityEngine(final Map<QName, Object> map) { assert map != null; final WSSConfig config = WSSConfig.getNewInstance(); for (Map.Entry<QName, Object> entry : map.entrySet()) { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java index ce1c877..ea4fddd 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java @@ -357,8 +357,7 @@ public class WSS4JOutInterceptor extends AbstractWSS4JInterceptor { } } - public Collection<PhaseInterceptor<? extends org.apache.cxf.message.Message>> - getAdditionalInterceptors() { + public Collection<PhaseInterceptor<? extends org.apache.cxf.message.Message>> getAdditionalInterceptors() { return null; } } http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java index e761ef5..5f80221 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java @@ -1001,6 +1001,7 @@ public abstract class AbstractStaxBindingHandler extends AbstractCommonBindingHa protected org.apache.xml.security.stax.securityToken.SecurityToken findInboundSecurityToken(SecurityEventConstants.Event event) throws XMLSecurityException { + @SuppressWarnings("unchecked") final List<SecurityEvent> incomingEventList = (List<SecurityEvent>) message.getExchange().get(SecurityEvent.class.getName() + ".in"); http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java index e1b0dac..4b41380 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java @@ -606,8 +606,8 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler { return tempTok.getId(); } - private org.apache.xml.security.stax.securityToken.SecurityToken - findEncryptedKeyToken() throws XMLSecurityException { + private org.apache.xml.security.stax.securityToken.SecurityToken findEncryptedKeyToken() + throws XMLSecurityException { @SuppressWarnings("unchecked") final List<SecurityEvent> incomingEventList = (List<SecurityEvent>) message.getExchange().get(SecurityEvent.class.getName() + ".in"); http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomProcessor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomProcessor.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomProcessor.java index e1a10e3..b820be0 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomProcessor.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomProcessor.java @@ -31,8 +31,7 @@ import org.apache.wss4j.dom.validate.Validator; */ public class CustomProcessor implements Processor { - public final java.util.List<WSSecurityEngineResult> - handleToken( + public final java.util.List<WSSecurityEngineResult> handleToken( final org.w3c.dom.Element elem, final RequestData data, final WSDocInfo wsDocInfo http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java index 7db020a..eaa9307 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java @@ -502,8 +502,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest { * null, which will cause the WSS4J runtime to do no * processing on the input) */ - private Map<QName, String> - createCustomProcessorMap() { + private Map<QName, String> createCustomProcessorMap() { final Map<QName, String> ret = new HashMap<QName, String>(); ret.put( new QName( http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java index 577fe71..0fff006 100644 --- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java +++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java @@ -321,9 +321,9 @@ public class WSDLServiceBuilder { PortType bindingPt = binding.getPortType(); if (bindingPt == null) { org.apache.cxf.common.i18n.Message msg = new - org.apache.cxf.common.i18n.Message("BINDING_MISSING_TYPE", - LOG, - binding.getQName()); + org.apache.cxf.common.i18n.Message("BINDING_MISSING_TYPE", + LOG, + binding.getQName()); throw new WSDLRuntimeException(msg); } http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/services/sts/sts-core/src/main/java/org/apache/cxf/sts/QNameConstants.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/QNameConstants.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/QNameConstants.java index 0383500..c3105aa 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/QNameConstants.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/QNameConstants.java @@ -28,8 +28,8 @@ public final class QNameConstants { public static final org.apache.cxf.ws.security.sts.provider.model.ObjectFactory WS_TRUST_FACTORY = new org.apache.cxf.ws.security.sts.provider.model.ObjectFactory(); - public static final org.apache.cxf.ws.security.sts.provider.model.wstrust14.ObjectFactory - WS_TRUST14_FACTORY = new org.apache.cxf.ws.security.sts.provider.model.wstrust14.ObjectFactory(); + public static final org.apache.cxf.ws.security.sts.provider.model.wstrust14.ObjectFactory WS_TRUST14_FACTORY + = new org.apache.cxf.ws.security.sts.provider.model.wstrust14.ObjectFactory(); public static final org.apache.cxf.ws.security.sts.provider.model.secext.ObjectFactory WSSE_FACTORY = new org.apache.cxf.ws.security.sts.provider.model.secext.ObjectFactory(); public static final org.apache.cxf.ws.security.sts.provider.model.utility.ObjectFactory UTIL_FACTORY http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java index 997369f..fd89371 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java @@ -757,10 +757,8 @@ public abstract class AbstractOperation { } protected static org.apache.xml.security.stax.securityToken.SecurityToken - findInboundSecurityToken( - SecurityEventConstants.Event event, - MessageContext messageContext - ) throws XMLSecurityException { + findInboundSecurityToken(SecurityEventConstants.Event event, + MessageContext messageContext) throws XMLSecurityException { @SuppressWarnings("unchecked") final List<SecurityEvent> incomingEventList = (List<SecurityEvent>) messageContext.get(SecurityEvent.class.getName() + ".in"); http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/CertConstraintsParser.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/CertConstraintsParser.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/CertConstraintsParser.java index 2f93f3b..bab9047 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/CertConstraintsParser.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/CertConstraintsParser.java @@ -68,8 +68,7 @@ public class CertConstraintsParser { * subject DNConstraints; false, otherwise. The certificate subject DN only * has to match ONE of the subject cert constraints (not all). */ - public boolean - matches( + public boolean matches( final java.security.cert.X509Certificate cert ) { if (!subjectDNPatterns.isEmpty()) { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsSubscription.java ---------------------------------------------------------------------- diff --git a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsSubscription.java b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsSubscription.java index 6cac824..dc37cad 100644 --- a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsSubscription.java +++ b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsSubscription.java @@ -38,9 +38,9 @@ import org.oasis_open.docs.wsn.bw_2.UnrecognizedPolicyRequestFault; import org.oasis_open.docs.wsn.bw_2.UnsupportedPolicyRequestFault; @WebService(endpointInterface = "org.oasis_open.docs.wsn.bw_2.PausableSubscriptionManager", -targetNamespace = "http://cxf.apache.org/wsn/jaxws";, -serviceName = "PausableSubscriptionManagerService", -portName = "PausableSubscriptionManagerPort" + targetNamespace = "http://cxf.apache.org/wsn/jaxws";, + serviceName = "PausableSubscriptionManagerService", + portName = "PausableSubscriptionManagerPort" ) public class JaxwsSubscription extends JmsSubscription { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java index 19025e4..f052eba 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java @@ -206,8 +206,7 @@ public class JAXRSLoggingAtomPushTest extends Assert { @Ignore - private AbstractFeedBuilder<List<org.apache.cxf.management.web.logging.LogRecord>> - createCustomFeedBuilder() { + private AbstractFeedBuilder<List<org.apache.cxf.management.web.logging.LogRecord>> createCustomFeedBuilder() { AbstractFeedBuilder<List<org.apache.cxf.management.web.logging.LogRecord>> fb = new AbstractFeedBuilder<List<org.apache.cxf.management.web.logging.LogRecord>>() { @@ -220,8 +219,7 @@ public class JAXRSLoggingAtomPushTest extends Assert { } @Ignore - private AbstractEntryBuilder<List<org.apache.cxf.management.web.logging.LogRecord>> - createCustomEntryBuilder() { + private AbstractEntryBuilder<List<org.apache.cxf.management.web.logging.LogRecord>> createCustomEntryBuilder() { AbstractEntryBuilder<List<org.apache.cxf.management.web.logging.LogRecord>> eb = new AbstractEntryBuilder<List<org.apache.cxf.management.web.logging.LogRecord>>() { @Override http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java ---------------------------------------------------------------------- diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java index b0e8af1..4060b69 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java @@ -49,9 +49,10 @@ import org.apache.cxf.staxutils.StaxUtils; //The following wsdl file is used. //wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world_rpc_lit.wsdl" -@WebServiceProvider(portName = "SoapPortProviderRPCLit3", serviceName = "SOAPServiceProviderRPCLit", - targetNamespace = "http://apache.org/hello_world_rpclit";, - wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl") +@WebServiceProvider(portName = "SoapPortProviderRPCLit3", + serviceName = "SOAPServiceProviderRPCLit", + targetNamespace = "http://apache.org/hello_world_rpclit";, + wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl") @ServiceMode (value = javax.xml.ws.Service.Mode.PAYLOAD) @HandlerChain(file = "./handlers_invocation.xml", name = "TestHandlerChain") public abstract class AbstractSourcePayloadProvider implements SourceProvider { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourceMessageProvider.java ---------------------------------------------------------------------- diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourceMessageProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourceMessageProvider.java index 7408116..768b16b 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourceMessageProvider.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourceMessageProvider.java @@ -39,8 +39,8 @@ import org.w3c.dom.Node; //The following wsdl file is used. //wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world_rpc_lit.wsdl" @WebServiceProvider(portName = "SoapPortProviderRPCLit2", serviceName = "SOAPServiceProviderRPCLit", - targetNamespace = "http://apache.org/hello_world_rpclit";, - wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl") + targetNamespace = "http://apache.org/hello_world_rpclit";, + wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl") @ServiceMode(value = Service.Mode.MESSAGE) public class HWDOMSourceMessageProvider implements Provider<DOMSource> { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadProvider.java ---------------------------------------------------------------------- diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadProvider.java index 8361a70..ac79760 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadProvider.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadProvider.java @@ -46,8 +46,8 @@ import org.apache.cxf.helpers.DOMUtils; //The following wsdl file is used. //wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world_rpc_lit.wsdl" @WebServiceProvider(portName = "SoapPortProviderRPCLit3", serviceName = "SOAPServiceProviderRPCLit", - targetNamespace = "http://apache.org/hello_world_rpclit";, - wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl") + targetNamespace = "http://apache.org/hello_world_rpclit";, + wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl") public class HWDOMSourcePayloadProvider implements Provider<DOMSource> { private static QName sayHi = new QName("http://apache.org/hello_world_rpclit";, "sayHi"); private static QName greetMe = new QName("http://apache.org/hello_world_rpclit";, "greetMe"); http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourceMessageProvider.java ---------------------------------------------------------------------- diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourceMessageProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourceMessageProvider.java index 4c7f1b2..7dbc94d 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourceMessageProvider.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourceMessageProvider.java @@ -42,7 +42,7 @@ import org.xml.sax.InputSource; //wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world_rpc_lit.wsdl" @WebServiceProvider(portName = "SoapPortProviderRPCLit4", serviceName = "SOAPServiceProviderRPCLit", targetNamespace = "http://apache.org/hello_world_rpclit";, -wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl") + wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl") @ServiceMode(value = Service.Mode.MESSAGE) public class HWSAXSourceMessageProvider implements Provider<SAXSource> { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourcePayloadProvider.java ---------------------------------------------------------------------- diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourcePayloadProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourcePayloadProvider.java index 1d515e9..0f16067 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourcePayloadProvider.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourcePayloadProvider.java @@ -50,8 +50,8 @@ import org.apache.cxf.staxutils.StaxUtils; //The following wsdl file is used. //wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world_rpc_lit.wsdl" @WebServiceProvider(portName = "SoapPortProviderRPCLit6", serviceName = "SOAPServiceProviderRPCLit", - targetNamespace = "http://apache.org/hello_world_rpclit";, -wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl") + targetNamespace = "http://apache.org/hello_world_rpclit";, + wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl") @ServiceMode(value = Service.Mode.PAYLOAD) public class HWSAXSourcePayloadProvider implements Provider<SAXSource> { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSoapMessageDocProvider.java ---------------------------------------------------------------------- diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSoapMessageDocProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSoapMessageDocProvider.java index e17e1b9..a2117c0 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSoapMessageDocProvider.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSoapMessageDocProvider.java @@ -50,7 +50,7 @@ import org.apache.cxf.helpers.DOMUtils; //wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world.wsdl" @WebServiceProvider(portName = "SoapProviderPort", serviceName = "SOAPProviderService", targetNamespace = "http://apache.org/hello_world_soap_http";, - wsdlLocation = "/org/apache/cxf/systest/provider/hello_world_with_restriction.wsdl") + wsdlLocation = "/org/apache/cxf/systest/provider/hello_world_with_restriction.wsdl") @ServiceMode(value = Service.Mode.MESSAGE) public class HWSoapMessageDocProvider implements Provider<SOAPMessage> { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourceMessageProvider.java ---------------------------------------------------------------------- diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourceMessageProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourceMessageProvider.java index ecdb9e2..cef877b 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourceMessageProvider.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourceMessageProvider.java @@ -42,7 +42,7 @@ import org.w3c.dom.Node; //wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world_rpc_lit.wsdl" @WebServiceProvider(portName = "SoapPortProviderRPCLit5", serviceName = "SOAPServiceProviderRPCLit", targetNamespace = "http://apache.org/hello_world_rpclit";, -wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl") + wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl") @ServiceMode(value = Service.Mode.MESSAGE) public class HWStreamSourceMessageProvider implements Provider<StreamSource> { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourcePayloadProvider.java ---------------------------------------------------------------------- diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourcePayloadProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourcePayloadProvider.java index 3429218..bebef77 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourcePayloadProvider.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourcePayloadProvider.java @@ -51,7 +51,7 @@ import org.w3c.dom.ls.LSSerializer; //wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world_rpc_lit.wsdl" @WebServiceProvider(portName = "SoapPortProviderRPCLit7", serviceName = "SOAPServiceProviderRPCLit", targetNamespace = "http://apache.org/hello_world_rpclit";, -wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl") + wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl") @ServiceMode(value = Service.Mode.PAYLOAD) public class HWStreamSourcePayloadProvider implements Provider<StreamSource> { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java index bfc242a..5e3c198 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java @@ -58,10 +58,10 @@ import org.springframework.util.Assert; //Define the DirectoryService @CreateDS(name = "LDAPClaimsTest-class", - enableAccessControl = false, - allowAnonAccess = false, - enableChangeLog = true, - partitions = { + enableAccessControl = false, + allowAnonAccess = false, + enableChangeLog = true, + partitions = { @CreatePartition( name = "example", suffix = "dc=example,dc=com", @@ -71,13 +71,13 @@ import org.springframework.util.Assert; @CreateIndex(attribute = "ou") } ) } -) + ) @CreateLdapServer( - transports = { + transports = { @CreateTransport(protocol = "LDAP") } -) + ) //Inject an file containing entries @ApplyLdifFiles("ldap.ldif") http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/ServiceImpl.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/ServiceImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/ServiceImpl.java index ec60988..163c764 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/ServiceImpl.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/ServiceImpl.java @@ -20,9 +20,9 @@ package org.apache.cxf.systest.schemaimport; import javax.jws.WebService; @WebService(targetNamespace = "http://cxf.apache.org/xsd/test/";, name = "service_v1_port", -wsdlLocation = "classpath:/wsdl_systest/service.wsdl", -serviceName = "service_v1", -endpointInterface = "org.apache.cxf.systest.schemaimport.ServiceV1Port") + wsdlLocation = "classpath:/wsdl_systest/service.wsdl", + serviceName = "service_v1", + endpointInterface = "org.apache.cxf.systest.schemaimport.ServiceV1Port") public class ServiceImpl implements ServiceV1Port { @Override http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/TestEndpointImpl.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/TestEndpointImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/TestEndpointImpl.java index 7009474..5fb683c 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/TestEndpointImpl.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/TestEndpointImpl.java @@ -21,8 +21,8 @@ package org.apache.cxf.systest.schemaimport; import javax.jws.WebService; @WebService(name = "TestEndpoint", serviceName = "TestEndpointService", -targetNamespace = "http://cxf.apache.org/schemaimport";, -wsdlLocation = "classpath:/wsdl_systest/import/TestService.wsdl") + targetNamespace = "http://cxf.apache.org/schemaimport";, + wsdlLocation = "classpath:/wsdl_systest/import/TestService.wsdl") public class TestEndpointImpl implements TestEndpoint { public String echo(String message) { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCEncodedSoapActionGreeterImpl.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCEncodedSoapActionGreeterImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCEncodedSoapActionGreeterImpl.java index e7bec22..28934bd 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCEncodedSoapActionGreeterImpl.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCEncodedSoapActionGreeterImpl.java @@ -25,7 +25,7 @@ import javax.jws.soap.SOAPBinding; import org.apache.hello_world_soap_action.WrappedGreeter; @WebService(endpointInterface = "org.apache.hello_world_soap_action.WrappedGreeter", -serviceName = "WrappedSOAPService") + serviceName = "WrappedSOAPService") @SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.ENCODED) public class RPCEncodedSoapActionGreeterImpl implements WrappedGreeter { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCLitSoapActionGreeterImpl.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCLitSoapActionGreeterImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCLitSoapActionGreeterImpl.java index e95b13c..76b8ab8 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCLitSoapActionGreeterImpl.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCLitSoapActionGreeterImpl.java @@ -25,7 +25,7 @@ import javax.jws.soap.SOAPBinding; import org.apache.hello_world_soap_action.WrappedGreeter; @WebService(endpointInterface = "org.apache.hello_world_soap_action.WrappedGreeter", -serviceName = "WrappedSOAPService") + serviceName = "WrappedSOAPService") @SOAPBinding(style = SOAPBinding.Style.RPC) public class RPCLitSoapActionGreeterImpl implements WrappedGreeter { http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyService.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyService.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyService.java index d16fb32..7c9fdd1 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyService.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyService.java @@ -23,7 +23,7 @@ import javax.jws.WebMethod; import javax.jws.WebService; @WebService(name = "JavaFirstAttachmentPolicyService", -targetNamespace = "http://www.example.org/contract/JavaFirstAttachmentPolicyService";) + targetNamespace = "http://www.example.org/contract/JavaFirstAttachmentPolicyService";) public interface JavaFirstAttachmentPolicyService { @WebMethod(operationName = "doOperationLevelPolicy") void doOperationLevelPolicy(); http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyServiceImpl.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyServiceImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyServiceImpl.java index e77a3bc..1e82ae3 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyServiceImpl.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyServiceImpl.java @@ -22,8 +22,8 @@ package org.apache.cxf.systest.ws.policy; import javax.jws.WebService; @WebService(endpointInterface = "org.apache.cxf.systest.ws.policy.JavaFirstAttachmentPolicyService", -serviceName = "JavaFirstAttachmentPolicyService", -targetNamespace = "http://www.example.org/contract/JavaFirstAttachmentPolicyService";) + serviceName = "JavaFirstAttachmentPolicyService", + targetNamespace = "http://www.example.org/contract/JavaFirstAttachmentPolicyService";) public class JavaFirstAttachmentPolicyServiceImpl implements JavaFirstAttachmentPolicyService { public void doOperationLevelPolicy() { } http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyService.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyService.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyService.java index 5621943..94c2a6b 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyService.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyService.java @@ -26,7 +26,7 @@ import org.apache.cxf.annotations.Policies; import org.apache.cxf.annotations.Policy; @WebService(name = "JavaFirstPolicyService", -targetNamespace = "http://www.example.org/contract/JavaFirstPolicyService";) + targetNamespace = "http://www.example.org/contract/JavaFirstPolicyService";) public interface JavaFirstPolicyService { @Policies({ @Policy(uri = "#InternalTransportAndUsernamePolicy", http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceImpl.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceImpl.java index 068819b..e5cc8f9 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceImpl.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceImpl.java @@ -22,8 +22,8 @@ package org.apache.cxf.systest.ws.policy; import javax.jws.WebService; @WebService(endpointInterface = "org.apache.cxf.systest.ws.policy.JavaFirstPolicyService", -serviceName = "JavaFirstPolicyService", -targetNamespace = "http://www.example.org/contract/JavaFirstPolicyService";) + serviceName = "JavaFirstPolicyService", + targetNamespace = "http://www.example.org/contract/JavaFirstPolicyService";) public class JavaFirstPolicyServiceImpl implements JavaFirstPolicyService { public void doOperationOne() { } http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentService.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentService.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentService.java index e975b06..d23dcad 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentService.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentService.java @@ -23,7 +23,7 @@ import javax.jws.WebMethod; import javax.jws.WebService; @WebService(name = "SslUsernamePasswordAttachmentService", -targetNamespace = "http://www.example.org/contract/SslUsernamePasswordAttachmentService";) + targetNamespace = "http://www.example.org/contract/SslUsernamePasswordAttachmentService";) public interface SslUsernamePasswordAttachmentService { @WebMethod(operationName = "doSslAndUsernamePasswordPolicy") void doSslAndUsernamePasswordPolicy(); http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentServiceImpl.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentServiceImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentServiceImpl.java index 8b90fe6..dd0139e 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentServiceImpl.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentServiceImpl.java @@ -22,8 +22,8 @@ package org.apache.cxf.systest.ws.policy; import javax.jws.WebService; @WebService(endpointInterface = "org.apache.cxf.systest.ws.policy.SslUsernamePasswordAttachmentService", -serviceName = "SslUsernamePasswordAttachmentService", -targetNamespace = "http://www.example.org/contract/SslUsernamePasswordAttachmentService";) + serviceName = "SslUsernamePasswordAttachmentService", + targetNamespace = "http://www.example.org/contract/SslUsernamePasswordAttachmentService";) public class SslUsernamePasswordAttachmentServiceImpl implements SslUsernamePasswordAttachmentService { public void doSslAndUsernamePasswordPolicy() { } http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleService.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleService.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleService.java index 4574dff..619c6e4 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleService.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleService.java @@ -23,7 +23,7 @@ import javax.jws.WebMethod; import javax.jws.WebService; @WebService(name = "NoAlternativesOperationSimpleService", -targetNamespace = "http://www.example.org/contract/NoAlternativesOperationSimpleService";) + targetNamespace = "http://www.example.org/contract/NoAlternativesOperationSimpleService";) public interface NoAlternativesOperationSimpleService { @WebMethod(operationName = "doStuff") void doStuff(); http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleServiceImpl.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleServiceImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleServiceImpl.java index f889f9e..ce0c927 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleServiceImpl.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleServiceImpl.java @@ -25,9 +25,9 @@ import org.apache.cxf.annotations.Policy; import org.apache.cxf.annotations.Policy.Placement; @WebService(name = "NoAlternativesOperationSimpleService", -endpointInterface = "org.apache.cxf.systest.ws.policy.javafirst.NoAlternativesOperationSimpleService", -serviceName = "NoAlternativesOperationSimpleService", -targetNamespace = "http://www.example.org/contract/NoAlternativesOperationSimpleService";) + endpointInterface = "org.apache.cxf.systest.ws.policy.javafirst.NoAlternativesOperationSimpleService", + serviceName = "NoAlternativesOperationSimpleService", + targetNamespace = "http://www.example.org/contract/NoAlternativesOperationSimpleService";) public class NoAlternativesOperationSimpleServiceImpl implements NoAlternativesOperationSimpleService { @Policy(uri = "classpath:/java_first_policies/UsernamePolicy.xml", placement = Placement.BINDING_OPERATION) http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleService.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleService.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleService.java index 0b22a3a..5903332 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleService.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleService.java @@ -23,7 +23,7 @@ import javax.jws.WebMethod; import javax.jws.WebService; @WebService(name = "OperationSimpleService", -targetNamespace = "http://www.example.org/contract/OperationSimpleService";) + targetNamespace = "http://www.example.org/contract/OperationSimpleService";) public interface OperationSimpleService { @WebMethod(operationName = "doStuff") void doStuff(); http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleServiceImpl.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleServiceImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleServiceImpl.java index ec2d5d0..a8fe166 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleServiceImpl.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleServiceImpl.java @@ -25,8 +25,9 @@ import org.apache.cxf.annotations.Policy; import org.apache.cxf.annotations.Policy.Placement; @WebService(name = "OperationSimpleService", -endpointInterface = "org.apache.cxf.systest.ws.policy.javafirst.OperationSimpleService", -serviceName = "OperationSimpleService", targetNamespace = "http://www.example.org/contract/OperationSimpleService";) + endpointInterface = "org.apache.cxf.systest.ws.policy.javafirst.OperationSimpleService", + serviceName = "OperationSimpleService", + targetNamespace = "http://www.example.org/contract/OperationSimpleService";) public class OperationSimpleServiceImpl implements OperationSimpleService { @Policy(uri = "classpath:/java_first_policies/AlternativesPolicy.xml", placement = Placement.BINDING_OPERATION_INPUT) http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/PingServiceBase.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/PingServiceBase.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/PingServiceBase.java index 5c949b9..4ee2a4a 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/PingServiceBase.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/PingServiceBase.java @@ -32,10 +32,7 @@ public abstract class PingServiceBase implements IPingService { } - public java.lang.String - echo( - java.lang.String request - ) { + public java.lang.String echo(String request) { //System.out.println("echo(" + request + ")"); return request; } http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo2Impl.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo2Impl.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo2Impl.java index f95e58d..4bfd2d4 100644 --- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo2Impl.java +++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo2Impl.java @@ -21,8 +21,8 @@ package org.apache.cxf.tools.fortest.exception; import javax.jws.WebService; @WebService(serviceName = "ListService", portName = "ListPort", -endpointInterface = "org.apache.cxf.tools.fortest.exception.Echo2", -targetNamespace = "http://cxf.apache.org/test/ListService";) + endpointInterface = "org.apache.cxf.tools.fortest.exception.Echo2", + targetNamespace = "http://cxf.apache.org/test/ListService";) public class Echo2Impl implements Echo2 { public String echo(String request) throws ListException { return "Response"; http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/holder/HolderService.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/holder/HolderService.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/holder/HolderService.java index 2b5aa17..e5f9e4d 100644 --- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/holder/HolderService.java +++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/holder/HolderService.java @@ -27,13 +27,13 @@ import javax.xml.ws.Holder; @WebService public interface HolderService { - String echo(String s1, String s2, @WebParam(mode = Mode.OUT) - Holder<String> outS2); + String echo(String s1, String s2, + @WebParam(mode = Mode.OUT) Holder<String> outS2); - String echo2(String s1, @WebParam(mode = Mode.OUT) - Holder<String> outS2, String s2); + String echo2(String s1, + @WebParam(mode = Mode.OUT) Holder<String> outS2, String s2); String echo3(@WebParam(mode = Mode.INOUT, header = true, name = "header") - Holder<String> header, String s1); + Holder<String> header, String s1); }
