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/07/25 20:28:45 UTC
[1/4] cxf git commit: FIx checkstyle issues
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes d4aa22c8d -> 20a4f79a7
FIx checkstyle issues
# Conflicts:
# distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/src/main/java/registry/eureka/RegistryApplication.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/97eb4f3e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/97eb4f3e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/97eb4f3e
Branch: refs/heads/3.1.x-fixes
Commit: 97eb4f3e2db0678af3c2ae6cac999ce821574b10
Parents: d4aa22c
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Jul 25 16:22:51 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 16:23:51 2016 -0400
----------------------------------------------------------------------
.../rs/client/SampleRestClientApplication.java | 29 +++++++++++---------
.../rs/service/SampleRestApplication.java | 2 +-
.../rs/client/SampleRestClientApplication.java | 21 ++++++++------
.../registry/eureka/RegistryApplication.java | 5 +++-
4 files changed, 33 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/97eb4f3e/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
index 0fed450..8dbf659 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
@@ -31,7 +31,10 @@ import sample.rs.service.HelloService;
@SpringBootApplication
@EnableJaxRsWebClient
@EnableJaxRsProxyClient
-public class SampleRestClientApplication {
+public final class SampleRestClientApplication {
+ private SampleRestClientApplication() {
+ }
+
public static void main(String[] args) {
new SpringApplicationBuilder(SampleRestClientApplication.class)
.web(false)
@@ -40,24 +43,24 @@ public class SampleRestClientApplication {
@Bean
CommandLineRunner initWebClientRunner(final WebClient webClient) {
- return new CommandLineRunner() {
+ return new CommandLineRunner() {
- @Override
- public void run(String... runArgs) throws Exception {
- System.out.println(webClient.path("sayHello/ApacheCxfWebClientUser").get(String.class));
- }
- };
+ @Override
+ public void run(String... runArgs) throws Exception {
+ System.out.println(webClient.path("sayHello/ApacheCxfWebClientUser").get(String.class));
+ }
+ };
}
@Bean
CommandLineRunner initProxyClientRunner(final HelloService client) {
- return new CommandLineRunner() {
+ return new CommandLineRunner() {
- @Override
- public void run(String... runArgs) throws Exception {
- System.out.println(client.sayHello("ApacheCxfProxyUser"));
- }
- };
+ @Override
+ public void run(String... runArgs) throws Exception {
+ System.out.println(client.sayHello("ApacheCxfProxyUser"));
+ }
+ };
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/97eb4f3e/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 60ef15e..f622a43 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
@@ -60,4 +60,4 @@ public class SampleRestApplication {
}
- }
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/97eb4f3e/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
index 4ec4e60..9db3fa4 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
@@ -44,7 +44,10 @@ import sample.rs.service.HelloService;
@SpringBootApplication
@EnableEurekaClient
@EnableJaxRsProxyClient
-public class SampleRestClientApplication {
+public final class SampleRestClientApplication {
+ private SampleRestClientApplication() {
+ }
+
public static void main(String[] args) {
new SpringApplicationBuilder(SampleRestClientApplication.class)
.web(false)
@@ -53,13 +56,13 @@ public class SampleRestClientApplication {
@Bean
CommandLineRunner initProxyClient(final HelloService service) {
- return new CommandLineRunner() {
- @Override
- public void run(String... runArgs) throws Exception {
- System.out.println(service.sayHello("ApacheCxfProxyUser1"));
- System.out.println(service.sayHello("ApacheCxfProxyUser2"));
- }
- };
+ return new CommandLineRunner() {
+ @Override
+ public void run(String... runArgs) throws Exception {
+ System.out.println(service.sayHello("ApacheCxfProxyUser1"));
+ System.out.println(service.sayHello("ApacheCxfProxyUser2"));
+ }
+ };
}
/**
@@ -74,7 +77,7 @@ public class SampleRestClientApplication {
DiscoveryClient discoveryClient;
List<String> addresses = new LinkedList<String>();
- public EurekaFailoverFeature() {
+ EurekaFailoverFeature() {
super("eureka://registry");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/97eb4f3e/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 c08dc8a..bed6961 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
@@ -6,7 +6,10 @@ import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
@SpringBootApplication
@EnableEurekaServer
-public class RegistryApplication {
+public final class RegistryApplication {
+ private RegistryApplication() {
+ }
+
public static void main(String[] args) {
SpringApplication.run(RegistryApplication.class, args);
}
[3/4] cxf git commit: Fix samples checkstyles issues so the builds
should be able to finish
Posted by dk...@apache.org.
Fix samples checkstyles issues so the builds should be able to finish
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d2f8f79a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d2f8f79a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d2f8f79a
Branch: refs/heads/3.1.x-fixes
Commit: d2f8f79aee0fb7187a11025209879897ea856f6a
Parents: 115d5e8
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Jun 10 15:19:53 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 16:25:41 2016 -0400
----------------------------------------------------------------------
.../main/java/demo/stream/interceptor/StreamInterceptor.java | 2 +-
.../jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java | 2 +-
.../basic_https/src/main/java/httpsdemo/client/Client.java | 2 +-
.../src/main/java/demo/jaxrs/client/Client.java | 4 ++--
.../src/main/java/demo/jaxrs/swagger/server/Server.java | 5 +++--
.../src/main/java/demo/jaxrs/client/WebSocketTestClient.java | 4 ++--
.../src/main/java/demo/jaxrs/server/CustomerService.java | 3 +++
.../src/main/java/demo/jaxrs/server/CustomerService.java | 3 +++
.../src/main/java/demo/jaxrs/server/CustomerService.java | 3 +++
.../demo/oauth/server/controllers/MemoryOAuthDataProvider.java | 3 +--
.../src/main/java/demo/ws_rm/common/MessageLossSimulator.java | 2 +-
11 files changed, 21 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d2f8f79a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java
index 22b9cb4..e534329 100644
--- a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java
+++ b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java
@@ -83,7 +83,7 @@ public class StreamInterceptor extends AbstractPhaseInterceptor<Message> {
private class CachedStream extends CachedOutputStream {
- public CachedStream() {
+ CachedStream() {
super();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d2f8f79a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java
index c1e21d0..4267b84 100644
--- a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java
@@ -90,7 +90,7 @@ public final class Client {
resolver = new URIResolver(inputFile);
input = new File(resolver.getURI());
PostMethod post = new PostMethod("http://localhost:9000/customerservice/customers");
- post.addRequestHeader("Accept" , "text/xml");
+ post.addRequestHeader("Accept", "text/xml");
entity = new FileRequestEntity(input, "text/xml; charset=ISO-8859-1");
post.setRequestEntity(entity);
httpclient = new HttpClient();
http://git-wip-us.apache.org/repos/asf/cxf/blob/d2f8f79a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
index 9bdb084..7147e2d 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
@@ -61,7 +61,7 @@ public final class Client {
DefaultHttpClient httpclient = new DefaultHttpClient();
httpclient.getConnectionManager().getSchemeRegistry().register(httpsScheme);
HttpGet httpget = new HttpGet(BASE_SERVICE_URL + "/123");
- BasicHeader bh = new BasicHeader("Accept" , "text/xml");
+ BasicHeader bh = new BasicHeader("Accept", "text/xml");
httpget.addHeader(bh);
HttpResponse response = httpclient.execute(httpget);
HttpEntity entity = response.getEntity();
http://git-wip-us.apache.org/repos/asf/cxf/blob/d2f8f79a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/client/Client.java b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/client/Client.java
index 5374baf..f1c360d 100644
--- a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/client/Client.java
@@ -31,7 +31,7 @@ public final class Client {
// Sent HTTP GET request to query customer info, expect XML
System.out.println("Sent HTTP GET request to query customer info, expect XML");
GetMethod get = new GetMethod("http://localhost:9000/customerservice/customers/123");
- get.addRequestHeader("Accept" , "application/xml");
+ get.addRequestHeader("Accept", "application/xml");
HttpClient httpclient = new HttpClient();
try {
@@ -47,7 +47,7 @@ public final class Client {
System.out.println("\n");
System.out.println("Sent HTTP GET request to query customer info, expect JSON");
get = new GetMethod("http://localhost:9000/customerservice/customers/123");
- get.addRequestHeader("Accept" , "application/json");
+ get.addRequestHeader("Accept", "application/json");
httpclient = new HttpClient();
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/d2f8f79a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
index d03938f..985bac2 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
@@ -22,8 +22,9 @@ package demo.jaxrs.swagger.server;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class Server {
-
+public final class Server {
+ private Server() {
+ }
public static void main(String args[]) throws Exception {
ApplicationContext appctxt =
http://git-wip-us.apache.org/repos/asf/cxf/blob/d2f8f79a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
index b22dd0b..26fe7ee 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
@@ -56,7 +56,7 @@ class WebSocketTestClient {
private WebSocket websocket;
private String url;
- public WebSocketTestClient(String url) {
+ WebSocketTestClient(String url) {
this.received = new ArrayList<Object>();
this.fragments = new ArrayList<Object>();
this.latch = new CountDownLatch(1);
@@ -214,7 +214,7 @@ class WebSocketTestClient {
private String contentType;
private Object entity;
- public Response(Object data) {
+ Response(Object data) {
this.data = data;
String line;
boolean first = true;
http://git-wip-us.apache.org/repos/asf/cxf/blob/d2f8f79a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
index f77f8aa..605fa8b 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -172,6 +172,7 @@ public class CustomerService {
return (monitors2.remove(key) != null ? "Removed: " : "Already removed: ") + key;
}
+ // CHECKSTYLE:OFF
private void sendCustomerEvent(final String msg, final Customer customer) {
executor.execute(new Runnable() {
public void run() {
@@ -226,6 +227,8 @@ public class CustomerService {
});
}
+ // CHECKSTYLE:ON
+
final void init() {
Customer c = new Customer();
c.setName("John");
http://git-wip-us.apache.org/repos/asf/cxf/blob/d2f8f79a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
index f77f8aa..605fa8b 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -172,6 +172,7 @@ public class CustomerService {
return (monitors2.remove(key) != null ? "Removed: " : "Already removed: ") + key;
}
+ // CHECKSTYLE:OFF
private void sendCustomerEvent(final String msg, final Customer customer) {
executor.execute(new Runnable() {
public void run() {
@@ -226,6 +227,8 @@ public class CustomerService {
});
}
+ // CHECKSTYLE:ON
+
final void init() {
Customer c = new Customer();
c.setName("John");
http://git-wip-us.apache.org/repos/asf/cxf/blob/d2f8f79a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
index f77f8aa..605fa8b 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -172,6 +172,7 @@ public class CustomerService {
return (monitors2.remove(key) != null ? "Removed: " : "Already removed: ") + key;
}
+ // CHECKSTYLE:OFF
private void sendCustomerEvent(final String msg, final Customer customer) {
executor.execute(new Runnable() {
public void run() {
@@ -226,6 +227,8 @@ public class CustomerService {
});
}
+ // CHECKSTYLE:ON
+
final void init() {
Customer c = new Customer();
c.setName("John");
http://git-wip-us.apache.org/repos/asf/cxf/blob/d2f8f79a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
index 31b322a..53179f1 100644
--- a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
+++ b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
@@ -146,8 +146,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
return accessToken;
}
- public AccessToken getAccessToken(String accessToken) throws OAuthServiceException
- {
+ public AccessToken getAccessToken(String accessToken) throws OAuthServiceException {
return (AccessToken) oauthTokens.get(accessToken);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d2f8f79a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java
index 9bb8067..693c918 100644
--- a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java
+++ b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java
@@ -101,7 +101,7 @@ public class MessageLossSimulator extends AbstractPhaseInterceptor<Message> {
private Message outMessage;
- public WrappedOutputStream(Message m) {
+ WrappedOutputStream(Message m) {
this.outMessage = m;
}
[4/4] cxf git commit: Fixing many checkstyle violations for the
sample projects
Posted by dk...@apache.org.
Fixing many checkstyle violations for the sample projects
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/20a4f79a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/20a4f79a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/20a4f79a
Branch: refs/heads/3.1.x-fixes
Commit: 20a4f79a791cbdb5defe6a1c4c30b258c54d0fde
Parents: d2f8f79
Author: reta <dr...@gmail.com>
Authored: Tue May 10 21:33:07 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 16:28:33 2016 -0400
----------------------------------------------------------------------
.../colocated/client/DispatchSourceClient.java | 2 +-
.../rs/service/SampleRestApplication.java | 34 ++++++++++----------
.../registry/eureka/RegistryApplication.java | 18 +++++++++++
.../src/main/java/demo/jaxrs/client/Client.java | 4 +--
.../java/demo/jaxrs/server/CustomerService.java | 13 ++++----
.../java/demo/jaxrs/server/CustomerService.java | 13 ++++----
.../java/demo/jaxrs/server/CustomerService.java | 13 ++++----
7 files changed, 59 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/20a4f79a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
index 181b931..32a2811 100755
--- a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
+++ b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
@@ -125,7 +125,7 @@ public final class DispatchSourceClient {
String elementName;
boolean recording;
- public ContentHandler(String namespaceURI, String elementName) {
+ ContentHandler(String namespaceURI, String elementName) {
this.namespaceURI = namespaceURI;
this.elementName = elementName;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/20a4f79a/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 f622a43..db47c2f 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
@@ -36,27 +36,27 @@ public class SampleRestApplication {
@Bean
@ExportMetricWriter
public MetricWriter metricWriter() {
- return new MetricWriter() {
+ return new MetricWriter() {
- @Override
- public void set(Metric<?> arg0) {
- // TODO Auto-generated method stub
-
- }
+ @Override
+ public void set(Metric<?> arg0) {
+ // TODO Auto-generated method stub
+
+ }
- @Override
- public void increment(Delta<?> arg0) {
- // TODO Auto-generated method stub
-
- }
+ @Override
+ public void increment(Delta<?> arg0) {
+ // TODO Auto-generated method stub
+
+ }
- @Override
- public void reset(String arg0) {
- // TODO Auto-generated method stub
-
- }
+ @Override
+ public void reset(String arg0) {
+ // TODO Auto-generated method stub
- };
+ }
+
+ };
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/20a4f79a/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 bed6961..a481fae 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
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package registry.eureka;
import org.springframework.boot.SpringApplication;
http://git-wip-us.apache.org/repos/asf/cxf/blob/20a4f79a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java
index 1b91019..10e3917 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java
@@ -19,14 +19,14 @@
package demo.jaxrs.client;
-import demo.jaxrs.server.Server;
-
import java.io.InputStream;
import java.util.List;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.io.CachedOutputStream;
+import demo.jaxrs.server.Server;
+
public final class Client {
private Client() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/20a4f79a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
index 605fa8b..ac765a2 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -147,7 +147,7 @@ public class CustomerService {
@Path("/monitor2")
@Produces("text/*")
public void monitorCustomers2(
- final @javax.ws.rs.core.Context HttpServletResponse httpResponse,
+ @javax.ws.rs.core.Context final HttpServletResponse httpResponse,
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
final String key = reqid == null ? "*" : reqid;
monitors2.put(key, new WriterHolder(httpResponse, MAX_ERROR_COUNT));
@@ -199,7 +199,8 @@ public class CustomerService {
}
}
}
- for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator(); it.hasNext();) {
+ for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator();
+ it.hasNext();) {
WriterHolder<HttpServletResponse> wh = it.next();
try {
wh.getValue().getOutputStream().write(t.getBytes());
@@ -246,11 +247,11 @@ public class CustomerService {
}
private static class WriterHolder<T> {
- final private T value;
- final private int max;
- final private AtomicInteger errorCount;
+ private final T value;
+ private final int max;
+ private final AtomicInteger errorCount;
- public WriterHolder(T object, int max) {
+ WriterHolder(T object, int max) {
this.value = object;
this.max = max;
this.errorCount = new AtomicInteger();
http://git-wip-us.apache.org/repos/asf/cxf/blob/20a4f79a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
index 605fa8b..ac765a2 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -147,7 +147,7 @@ public class CustomerService {
@Path("/monitor2")
@Produces("text/*")
public void monitorCustomers2(
- final @javax.ws.rs.core.Context HttpServletResponse httpResponse,
+ @javax.ws.rs.core.Context final HttpServletResponse httpResponse,
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
final String key = reqid == null ? "*" : reqid;
monitors2.put(key, new WriterHolder(httpResponse, MAX_ERROR_COUNT));
@@ -199,7 +199,8 @@ public class CustomerService {
}
}
}
- for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator(); it.hasNext();) {
+ for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator();
+ it.hasNext();) {
WriterHolder<HttpServletResponse> wh = it.next();
try {
wh.getValue().getOutputStream().write(t.getBytes());
@@ -246,11 +247,11 @@ public class CustomerService {
}
private static class WriterHolder<T> {
- final private T value;
- final private int max;
- final private AtomicInteger errorCount;
+ private final T value;
+ private final int max;
+ private final AtomicInteger errorCount;
- public WriterHolder(T object, int max) {
+ WriterHolder(T object, int max) {
this.value = object;
this.max = max;
this.errorCount = new AtomicInteger();
http://git-wip-us.apache.org/repos/asf/cxf/blob/20a4f79a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
index 605fa8b..ac765a2 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -147,7 +147,7 @@ public class CustomerService {
@Path("/monitor2")
@Produces("text/*")
public void monitorCustomers2(
- final @javax.ws.rs.core.Context HttpServletResponse httpResponse,
+ @javax.ws.rs.core.Context final HttpServletResponse httpResponse,
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
final String key = reqid == null ? "*" : reqid;
monitors2.put(key, new WriterHolder(httpResponse, MAX_ERROR_COUNT));
@@ -199,7 +199,8 @@ public class CustomerService {
}
}
}
- for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator(); it.hasNext();) {
+ for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator();
+ it.hasNext();) {
WriterHolder<HttpServletResponse> wh = it.next();
try {
wh.getValue().getOutputStream().write(t.getBytes());
@@ -246,11 +247,11 @@ public class CustomerService {
}
private static class WriterHolder<T> {
- final private T value;
- final private int max;
- final private AtomicInteger errorCount;
+ private final T value;
+ private final int max;
+ private final AtomicInteger errorCount;
- public WriterHolder(T object, int max) {
+ WriterHolder(T object, int max) {
this.value = object;
this.max = max;
this.errorCount = new AtomicInteger();
[2/4] 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/115d5e87
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/115d5e87
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/115d5e87
Branch: refs/heads/3.1.x-fixes
Commit: 115d5e87c12d7fc01c6a621738c08bea2db410f6
Parents: 97eb4f3
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Jul 25 16:23:52 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 16:23:52 2016 -0400
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/115d5e87/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index aa59f49..8a0f002 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -130,6 +130,7 @@ M 8e650cfe3efd63a06c25b7e912d9d4db61598eb1
M 8f8e587cde7ec97410da6b0586810ccf8f0f3233
M 8fbf0941ca52aac406b3efcf2e0d73436c72d0f1
M 91bb2a18f4653f997e455c5089e7a009310591c6
+M 955fd4b7fee79642934a828b7758ce14f783364a
M 9a9e0a8a37608195c4ef6fbf386728d13d025d2d
M 9b2bda583c09861c693122ab631c4bffa2187ddd
M 9b6666816a21d8b85cc051be59a8ab6e968c5d0d