You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2016/11/23 16:44:37 UTC
[1/6] cxf git commit: Remove a bunch of redundant final modifiers
(flagged by new Checkstyle plugin in eclipse)
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 <dk...@apache.org>
Authored: Fri Nov 18 10:46:45 2016 -0500
Committer: Daniel Kulp <dk...@apache.org>
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);
}
[5/6] cxf git commit: Fix checkstyle issues in samples
Posted by dk...@apache.org.
Fix checkstyle issues in samples
# Conflicts:
# distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/SparkUtils.java
# distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
# distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StreamingService.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a8f1f095
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a8f1f095
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a8f1f095
Branch: refs/heads/3.1.x-fixes
Commit: a8f1f095ecddd639d1496c1fa6189ebf2e371716
Parents: 2164a19
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Nov 23 09:39:03 2016 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Nov 23 10:53:07 2016 -0500
----------------------------------------------------------------------
.../src/main/java/sample/rs/service/SampleRestApplication.java | 5 +++--
.../src/main/java/registry/eureka/RegistryApplication.java | 4 ++--
.../src/main/java/sample/ws/SampleWsApplicationClient.java | 4 +++-
3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a8f1f095/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
index e146a7f..35bf34a 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
@@ -19,6 +19,8 @@
package sample.rs.service;
import java.util.Collections;
+import com.codahale.metrics.MetricRegistry;
+
import org.springframework.boot.SpringApplication;
import org.springframework.boot.actuate.endpoint.MetricReaderPublicMetrics;
import org.springframework.boot.actuate.endpoint.MetricsEndpoint;
@@ -27,13 +29,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.context.annotation.Bean;
-import com.codahale.metrics.MetricRegistry;
@SpringBootApplication
@EnableEurekaClient
public class SampleRestApplication {
@Bean
- public MetricRegistry metricRegistry(){
+ public MetricRegistry metricRegistry() {
return new MetricRegistry();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a8f1f095/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java
index 0cbdc6e..b38ed90 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java
@@ -22,12 +22,12 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
+//CHECKSTYLE:OFF
@SpringBootApplication
@EnableEurekaServer
-//CHECKSTYLE:OFF
public class RegistryApplication {
-//CHECKSTYLE:ON
public static void main(String[] args) {
SpringApplication.run(RegistryApplication.class, args);
}
}
+//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/cxf/blob/a8f1f095/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
index 76f4611..15ea971 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
@@ -24,8 +24,8 @@ import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+//CHECKSTYLE:OFF
public class SampleWsApplicationClient {
-
public static void main(String[] args) {
String address = "http://localhost:8080/Service/Hello";
@@ -44,3 +44,5 @@ public class SampleWsApplicationClient {
}
}
+//CHECKSTYLE:ON
+
[3/6] cxf git commit: Fix random test failure (methods can return in
any order)
Posted by dk...@apache.org.
Fix random test failure (methods can return in any order)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b72bf00a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b72bf00a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b72bf00a
Branch: refs/heads/3.1.x-fixes
Commit: b72bf00a4686d14d3727840593b25ce0578948e8
Parents: 55f92f4
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Nov 23 09:10:04 2016 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Nov 23 10:52:09 2016 -0500
----------------------------------------------------------------------
.../org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b72bf00a/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java b/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
index 37e1130..2e7581f 100644
--- a/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
+++ b/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
@@ -435,6 +435,11 @@ public class JAXRSContainerTest extends ProcessorTestBase {
Method[] test1Methods = test1.getDeclaredMethods();
assertEquals(2, test1Methods.length);
assertEquals(2, test1Methods[0].getAnnotations().length);
+ if ("getGetaddmethod2".equals(test1Methods[0].getName())) {
+ Method tmp = test1Methods[0];
+ test1Methods[0] = test1Methods[1];
+ test1Methods[1] = tmp;
+ }
checkComplexPathMethod(test1Methods[0], "");
checkComplexPathMethod(test1Methods[1], "2");
} catch (Exception e) {
[4/6] cxf git commit: Fix build failure due to dependency
name/version for servlet-api
Posted by dk...@apache.org.
Fix build failure due to dependency name/version for servlet-api
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2164a191
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2164a191
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2164a191
Branch: refs/heads/3.1.x-fixes
Commit: 2164a191dfa9db0d9a2a8f38efcbfd953f5679d3
Parents: b72bf00
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Nov 23 09:10:27 2016 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Nov 23 10:52:44 2016 -0500
----------------------------------------------------------------------
distribution/src/main/release/samples/oauth/client/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/2164a191/distribution/src/main/release/samples/oauth/client/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/client/pom.xml b/distribution/src/main/release/samples/oauth/client/pom.xml
index 6db4c0c..d73a0ba 100644
--- a/distribution/src/main/release/samples/oauth/client/pom.xml
+++ b/distribution/src/main/release/samples/oauth/client/pom.xml
@@ -84,8 +84,8 @@
<version>20100527</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<artifactId>standard</artifactId>
[2/6] cxf git commit: Get the HTTPSProxyAuthConduitTest working java8
update 112+
Posted by dk...@apache.org.
Get the HTTPSProxyAuthConduitTest working java8 update 112+
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/55f92f4c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/55f92f4c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/55f92f4c
Branch: refs/heads/3.1.x-fixes
Commit: 55f92f4c2c750f13e231482466181eb4bcfdcc74
Parents: 826c962
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Nov 18 13:40:19 2016 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Nov 23 10:52:07 2016 -0500
----------------------------------------------------------------------
systests/transports/pom.xml | 3 +++
.../cxf/systest/https/conduit/HTTPSProxyAuthConduitTest.java | 1 +
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/55f92f4c/systests/transports/pom.xml
----------------------------------------------------------------------
diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml
index b620969..8136272 100644
--- a/systests/transports/pom.xml
+++ b/systests/transports/pom.xml
@@ -30,6 +30,9 @@
<name>Apache CXF Transport System Tests</name>
<description>Apache CXF Transport System Tests</description>
<url>http://cxf.apache.org</url>
+ <properties>
+ <cxf.surefire.fork.vmargs>-Djdk.http.auth.tunneling.disabledSchemes=""</cxf.surefire.fork.vmargs>
+ </properties>
<build>
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
<testResources>
http://git-wip-us.apache.org/repos/asf/cxf/blob/55f92f4c/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyAuthConduitTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyAuthConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyAuthConduitTest.java
index 82369df..3aac4cd 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyAuthConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSProxyAuthConduitTest.java
@@ -73,6 +73,7 @@ public class HTTPSProxyAuthConduitTest extends HTTPSConduitTest {
@BeforeClass
public static void startProxy() {
+ System.setProperty("jdk.http.auth.tunneling.disabledSchemes", "");
proxy = new DefaultHttpProxyServer(PROXY_PORT, requestFilter, new HashMap<String, HttpFilter>());
proxy.addProxyAuthenticationHandler(new ProxyAuthorizationHandler() {
public boolean authenticate(String userName, String password) {
[6/6] cxf git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b9431024
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b9431024
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b9431024
Branch: refs/heads/3.1.x-fixes
Commit: b9431024bcc3e244a220489e7f101adde6380a86
Parents: a8f1f09
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Nov 23 10:53:07 2016 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Nov 23 10:53:07 2016 -0500
----------------------------------------------------------------------
.gitmergeinfo | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b9431024/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 5acca72..4e20f07 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -54,6 +54,7 @@ B 517ef67f1a69d386de44153e5e09d51cb47bf4d7
B 519a67dfa240471bb585929f263cd85051a9eb06
B 53a46205871434d8c47ed45822e078e5ad6d2c60
B 54910695917fb63a11982a8dc96a3b4d088963c5
+B 54b71171e89bb1be7d169ac91bb626c9c1ca293b
B 56dab42caaf27e3bedf08cbb419d3644aeccb7af
B 57cb5447341949836b7d8cc8f00ca3ced68622f1
B 584df3ae111595da1b44ccd9db9567c2172bbb2e
@@ -151,6 +152,7 @@ B f66dea949bdc3f136084115aca4e514bad426380
B f94e1dd9b2a8d27ec5a27bfb7c026e3ae2350e39
B f98785bd8490c4717353f1a9688cae3e7a823ec2
B fb30f8bffc85fcc3208fcc0e1eda4b54a89b5d37
+M 01cd14ce923f1f2cd044746e272b2d525c46f9a6
M 01d06cee06203b0ba616ca1924f1878aecc1a791
M 0222768baf6b60742c4a8332308edf2be0f4a2e4
M 055f1d738016ae5caf3eba42e656782de8490890
@@ -173,6 +175,7 @@ M 366a556210a1a7b047c4b4dd8da4fc74af6bd301
M 386805560479b35276d88605c5acf805e3004aa5
M 39c772a0764b323f98ab58e00345f4fca924c425
M 3a1fa0b23f1778594b6339dfcfbc90dcc43a87d4
+M 3be9aac26a003ef43995054da875ffd5fa5a2eb4
M 3e30d8892a723adcf04268efd7d407e164607065
M 45d54d558625236b84752b0d7976f0cf85518c16
M 47691ae5c2c6528d95795a51e98e02b54a033c88
@@ -182,12 +185,16 @@ M 4b0868a8ee6f53d8543860a458821c35ec2a79a2
M 4f4ce80ba2de80219e13943cbd6edbf411117234
M 574b2a9997c94011794fa2e083181e23c9936f15
M 585df048b7730ee36644a4bb7c1a20fcf977d79e
+M 5b7b014cc1d24cba1191bc07fd48b13dbf4d4391
+M 5cff82c735c7543ce6dfb6c52ac72f583dbb5d22
M 6242c682dfce4a2ba4869978c28b14f1472484c1
M 63a1088a9253da0452497440e900d35a5415c3c9
M 6becb31c62ef0845a5078f4ec2124fe7bc264e58
M 7304dfbd8f3044d8d46981abf2058c6cb732d219
M 746914a5084f5db8d0c0f052802c7ef2217b9b6b
M 7690a1fd087aff24ad8e8e1ab2e0722e24bf3d81
+M 804a957eb4225a1eaf65399881cdcd8552c00f52
+M 80ca2370616c28b036c54c95af84ca62f1725a30
M 8118c5a301f22dea16c9d235ad378584a0ae2466
M 8583a24ac541dc373503d7a6c59cd90890acdae3
M 86667619dc61c8a84672fc5a583b4517f48176c5
@@ -197,6 +204,8 @@ M 8e131133c8566a124605cb06e0b6db98fddb5972
M 8e650cfe3efd63a06c25b7e912d9d4db61598eb1
M 8f8e587cde7ec97410da6b0586810ccf8f0f3233
M 8fbf0941ca52aac406b3efcf2e0d73436c72d0f1
+M 8fc9d782901adddf874fe7c2f9500836a0585707
+M 910f37767518832cce843c2a093ee833b7c48916
M 91bb2a18f4653f997e455c5089e7a009310591c6
M 955fd4b7fee79642934a828b7758ce14f783364a
M 9a9e0a8a37608195c4ef6fbf386728d13d025d2d
@@ -215,6 +224,7 @@ M b624c034c5682b54b9faf3d3e90eb0c23cde1a5b
M c01c68ddda10ec6db492b86d818498bec0bf4228
M c212240f696e3387df19bbcf22d1851aff320078
M cf8ac102e728b8745da265ec969f7b5160829fdb
+M d46818bd3043d211774de9bc531849f54bb2989f
M dba09f00804cc05d943fd95d34882d6368c28edb
M ded06c40ba057981e003903faa93beb94cbe11fa
M df3854cefae5d2da71f8d222a86218e81df7bd05
@@ -226,5 +236,6 @@ M f462c797eab75e9b6c6c352b4baeb84429866068
M f7f017f2187d59369a7b94bb053f1e297972dce7
M f9a42a528f4edfa7bcc62d5885eebaeb25224cec
M fa973bd7ab43099151f83beea351b80c7140eaab
+M faf461150f178f7f7ae89a3b7c345671e53b8b04
M fd6689948bc7ad153ccfd7f64554eafbf64b20d6
M fe89bf0fb8379428667f66312e6942e906142d6f