Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 9deb2d179 -> b9431024b
Remove a bunch of redundant final modifiers (flagged by new Checkstyle plugin in eclipse) # Conflicts: # integration/cdi/src/main/java/org/apache/cxf/cdi/extension/JAXRSServerFactoryCustomizationExtension.java # rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/826c9625 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/826c9625 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/826c9625 Branch: refs/heads/3.1.x-fixes Commit: 826c9625710b4aac2a3d5bacd3858b57de5e0955 Parents: 9deb2d1 Author: Daniel Kulp <[email protected]> Authored: Fri Nov 18 10:46:45 2016 -0500 Committer: Daniel Kulp <[email protected]> Committed: Wed Nov 23 10:51:44 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/cxf/service/invoker/AbstractInvoker.java | 2 +- .../apache/cxf/validation/AbstractValidationInterceptor.java | 4 ++-- .../org/apache/cxf/common/injection/ResourceInjectorTest.java | 6 +++--- .../client/service/settings/RemoteStorageProxyImpl.java | 6 +++--- .../src/main/java/org/apache/cxf/tracing/Traceable.java | 2 +- .../src/main/java/org/apache/cxf/tracing/TracerContext.java | 6 +++--- .../java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java | 2 +- .../transport/https/httpclient/PublicSuffixMatcherLoader.java | 4 ++-- .../main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java | 4 ++-- .../java/org/apache/cxf/systest/jaxrs/tracing/BookStore.java | 2 +- .../cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java | 4 ++-- .../java/org/apache/cxf/systest/jaxws/tracing/BookStore.java | 2 +- .../cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java | 4 ++-- .../java/org/apache/cxf/systest/schemaimport/TestEndpoint.java | 2 +- .../org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java | 2 +- .../org/apache/cxf/tools/misc/processor/address/Address.java | 4 ++-- 16 files changed, 28 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/826c9625/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java b/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java index e348c80..f201571 100644 --- a/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java +++ b/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java @@ -203,7 +203,7 @@ public abstract class AbstractInvoker implements Invoker { /** * Creates and returns a service object depending on the scope. */ - public abstract Object getServiceObject(final Exchange context); + public abstract Object getServiceObject(Exchange context); /** * Called when the invoker is done with the object. Default implementation http://git-wip-us.apache.org/repos/asf/cxf/blob/826c9625/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java b/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java index 00b6dc3..266d2c9 100644 --- a/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java +++ b/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java @@ -108,8 +108,8 @@ public abstract class AbstractValidationInterceptor extends AbstractPhaseInterce return method; } - protected abstract void handleValidation(final Message message, final Object resourceInstance, - final Method method, final List<Object> arguments); + protected abstract void handleValidation(Message message, Object resourceInstance, + Method method, List<Object> arguments); protected BeanValidationProvider getProvider(Message message) { http://git-wip-us.apache.org/repos/asf/cxf/blob/826c9625/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java index d03ba5f..4736663 100644 --- a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java +++ b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java @@ -225,9 +225,9 @@ class SubSetterTarget extends SetterTarget { } interface ISetterTarget extends Target { - void setResource1(final String argResource1); - void setResource2(final String argResource2); - void setResource3(final CharSequence argResource3); + void setResource1(String argResource1); + void setResource2(String argResource2); + void setResource3(CharSequence argResource3); } class ProxyClass implements InvocationHandler { http://git-wip-us.apache.org/repos/asf/cxf/blob/826c9625/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/RemoteStorageProxyImpl.java ---------------------------------------------------------------------- diff --git a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/RemoteStorageProxyImpl.java b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/RemoteStorageProxyImpl.java index 4b94885..7a1ad73 100644 --- a/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/RemoteStorageProxyImpl.java +++ b/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/service/settings/RemoteStorageProxyImpl.java @@ -136,7 +136,7 @@ public class RemoteStorageProxyImpl implements RemoteStorageProxy { protected RemoteSubscription() { } - public final native void setId(@Nullable final String id) /*-{ + public final native void setId(@Nullable String id) /*-{ this.id = id; }-*/; @@ -145,7 +145,7 @@ public class RemoteStorageProxyImpl implements RemoteStorageProxy { return this.id; }-*/; - public final native void setUrl(@Nullable final String url) /*-{ + public final native void setUrl(@Nullable String url) /*-{ this.url = url; }-*/; @@ -154,7 +154,7 @@ public class RemoteStorageProxyImpl implements RemoteStorageProxy { return this.url; }-*/; - public final native void setName(@Nullable final String name) /*-{ + public final native void setName(@Nullable String name) /*-{ this.name = name; }-*/; http://git-wip-us.apache.org/repos/asf/cxf/blob/826c9625/rt/management/src/main/java/org/apache/cxf/tracing/Traceable.java ---------------------------------------------------------------------- diff --git a/rt/management/src/main/java/org/apache/cxf/tracing/Traceable.java b/rt/management/src/main/java/org/apache/cxf/tracing/Traceable.java index 815b1af..18fe3db 100644 --- a/rt/management/src/main/java/org/apache/cxf/tracing/Traceable.java +++ b/rt/management/src/main/java/org/apache/cxf/tracing/Traceable.java @@ -19,5 +19,5 @@ package org.apache.cxf.tracing; public interface Traceable<T> { - T call(final TracerContext context) throws Exception; + T call(TracerContext context) throws Exception; } http://git-wip-us.apache.org/repos/asf/cxf/blob/826c9625/rt/management/src/main/java/org/apache/cxf/tracing/TracerContext.java ---------------------------------------------------------------------- diff --git a/rt/management/src/main/java/org/apache/cxf/tracing/TracerContext.java b/rt/management/src/main/java/org/apache/cxf/tracing/TracerContext.java index 9e41de3..69aa2b6 100644 --- a/rt/management/src/main/java/org/apache/cxf/tracing/TracerContext.java +++ b/rt/management/src/main/java/org/apache/cxf/tracing/TracerContext.java @@ -29,14 +29,14 @@ public interface TracerContext { * @return the result of the execution * @throws Exception any exception being thrown by the traceable implementation */ - <T> T continueSpan(final Traceable<T> traceable) throws Exception; + <T> T continueSpan(Traceable<T> traceable) throws Exception; /** * Starts a new span in the current thread. * @param description span description * @return span instance object */ - <T> T startSpan(final String description); + <T> T startSpan(String description); /** * Wraps the traceable into a new span, preserving the current span as a parent. @@ -44,7 +44,7 @@ public interface TracerContext { * @param traceable traceable implementation to be wrapped * @return callable to be executed (in current thread or any other thread pool) */ - <T> Callable<T> wrap(final String description, final Traceable<T> traceable); + <T> Callable<T> wrap(String description, Traceable<T> traceable); /** http://git-wip-us.apache.org/repos/asf/cxf/blob/826c9625/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java index 82eed57..ec2a205 100644 --- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsHeaders.java @@ -44,7 +44,7 @@ public class JwsHeaders extends JoseHeaders { super(values); } public JwsHeaders(String kid) { - this(Collections.<String, Object>singletonMap(JoseConstants.HEADER_KEY_ID, kid)); + this(Collections.singletonMap(JoseConstants.HEADER_KEY_ID, (Object)kid)); } public JwsHeaders(SignatureAlgorithm sigAlgo) { init(sigAlgo); http://git-wip-us.apache.org/repos/asf/cxf/blob/826c9625/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcherLoader.java ---------------------------------------------------------------------- diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcherLoader.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcherLoader.java index 1c02bcc..afc1633 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcherLoader.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcherLoader.java @@ -62,7 +62,7 @@ public final class PublicSuffixMatcherLoader { if (url == null) { throw new IllegalArgumentException("URL is null"); } - try (final InputStream in = url.openStream()) { + try (InputStream in = url.openStream()) { return load(in); } } @@ -71,7 +71,7 @@ public final class PublicSuffixMatcherLoader { if (file == null) { throw new IllegalArgumentException("File is null"); } - try (final InputStream in = new FileInputStream(file)) { + try (InputStream in = new FileInputStream(file)) { return load(in); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/826c9625/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java index 5b4e1e7..5742c29 100644 --- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java +++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLExtensibilityPlugin.java @@ -25,7 +25,7 @@ import javax.wsdl.extensions.ExtensibilityElement; import javax.wsdl.extensions.ExtensionRegistry; public interface WSDLExtensibilityPlugin { - void setExtensionRegistry(final ExtensionRegistry registry); + void setExtensionRegistry(ExtensionRegistry registry); - ExtensibilityElement createExtension(final Map<String, Object> args) throws WSDLException; + ExtensibilityElement createExtension(Map<String, Object> args) throws WSDLException; } http://git-wip-us.apache.org/repos/asf/cxf/blob/826c9625/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/BookStore.java ---------------------------------------------------------------------- diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/BookStore.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/BookStore.java index 89bdab1..0c7f691 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/BookStore.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/BookStore.java @@ -50,7 +50,7 @@ public class BookStore { @Path("/books") @Produces(MediaType.APPLICATION_JSON) public Collection< Book > getBooks() { - try (final TraceScope span = tracer.startSpan("Get Books")) { + try (TraceScope span = tracer.startSpan("Get Books")) { return Arrays.asList( new Book("Apache CXF in Action", UUID.randomUUID().toString()), new Book("Mastering Apache CXF", UUID.randomUUID().toString()) http://git-wip-us.apache.org/repos/asf/cxf/blob/826c9625/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java ---------------------------------------------------------------------- diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java index 7299d67..d4f84ba 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java @@ -235,7 +235,7 @@ public class HTraceTracingTest extends AbstractBusClientServerTestBase { @Test public void testThatProvidedSpanIsNotClosedWhenActive() throws MalformedURLException { - try (final TraceScope scope = tracer.newScope("test span")) { + try (TraceScope scope = tracer.newScope("test span")) { final Response r = createWebClient("/bookstore/books", htraceClientProvider).get(); assertEquals(Status.OK.getStatusCode(), r.getStatus()); @@ -254,7 +254,7 @@ public class HTraceTracingTest extends AbstractBusClientServerTestBase { @Test public void testThatProvidedSpanIsNotDetachedWhenActiveUsingAsyncClient() throws Exception { final WebClient client = createWebClient("/bookstore/books", htraceClientProvider); - try (final TraceScope scope = tracer.newScope("test span")) { + try (TraceScope scope = tracer.newScope("test span")) { final Future<Response> f = client.async().get(); final Response r = f.get(1, TimeUnit.SECONDS); http://git-wip-us.apache.org/repos/asf/cxf/blob/826c9625/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/BookStore.java ---------------------------------------------------------------------- diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/BookStore.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/BookStore.java index b9ee6ae..602c86e 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/BookStore.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/BookStore.java @@ -33,7 +33,7 @@ import org.apache.htrace.core.Tracer; public class BookStore implements BookStoreService { @WebMethod public Collection< Book > getBooks() { - try (final TraceScope span = Tracer.curThreadTracer().newScope("Get Books")) { + try (TraceScope span = Tracer.curThreadTracer().newScope("Get Books")) { return Arrays.asList( new Book("Apache CXF in Action", UUID.randomUUID().toString()), new Book("Mastering Apache CXF", UUID.randomUUID().toString()) http://git-wip-us.apache.org/repos/asf/cxf/blob/826c9625/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java ---------------------------------------------------------------------- diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java index d133116..260591f 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java @@ -75,7 +75,7 @@ public class HTraceTracingTest extends AbstractBusClientServerTestBase { } private interface Configurator { - void configure(final JaxWsProxyFactoryBean factory); + void configure(JaxWsProxyFactoryBean factory); } @BeforeClass @@ -156,7 +156,7 @@ public class HTraceTracingTest extends AbstractBusClientServerTestBase { } }); - try (final TraceScope scope = tracer.newScope("test span")) { + try (TraceScope scope = tracer.newScope("test span")) { assertThat(service.getBooks().size(), equalTo(2)); assertThat(Tracer.getCurrentSpan(), not(nullValue())); http://git-wip-us.apache.org/repos/asf/cxf/blob/826c9625/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/TestEndpoint.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/TestEndpoint.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/TestEndpoint.java index cc45c95..cd69ad4 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/TestEndpoint.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/TestEndpoint.java @@ -22,5 +22,5 @@ import javax.jws.WebService; @WebService(name = "TestEndpoint", targetNamespace = "http://cxf.apache.org/schemaimport";) public interface TestEndpoint { - String echo(final String message); + String echo(String message); } http://git-wip-us.apache.org/repos/asf/cxf/blob/826c9625/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java index 0c1950d..9a25746 100644 --- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java +++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java @@ -98,7 +98,7 @@ public abstract class AbstractGenerator implements FrontEndGenerator { return writer; } - public abstract void register(final ClassCollector collector, String packageName, String fileName); + public abstract void register(ClassCollector collector, String packageName, String fileName); protected Writer parseOutputName(String packageName, String filename) throws ToolException { register(env.get(ClassCollector.class), packageName, filename); http://git-wip-us.apache.org/repos/asf/cxf/blob/826c9625/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/Address.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/Address.java b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/Address.java index e2e1668..a95980d 100644 --- a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/Address.java +++ b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/Address.java @@ -25,6 +25,6 @@ import org.apache.cxf.tools.common.ToolContext; public interface Address { String HTTP_PREFIX = "http://localhost:9000";; - Map<String, Object> buildAddressArguments(final ToolContext context); - Map<String, String> getNamespaces(final ToolContext context); + Map<String, Object> buildAddressArguments(ToolContext context); + Map<String, String> getNamespaces(ToolContext context); }
