Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CE9A3200B44 for ; Thu, 30 Jun 2016 00:44:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CD6C6160A79; Wed, 29 Jun 2016 22:44:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 60398160A78 for ; Thu, 30 Jun 2016 00:44:01 +0200 (CEST) Received: (qmail 25695 invoked by uid 500); 29 Jun 2016 22:43:59 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 24844 invoked by uid 99); 29 Jun 2016 22:43:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Jun 2016 22:43:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 400EFED22B; Wed, 29 Jun 2016 22:43:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: reta@apache.org To: commits@cxf.apache.org Date: Wed, 29 Jun 2016 22:44:09 -0000 Message-Id: In-Reply-To: <4bcfaade3ee3407db49b6439dc67ac16@git.apache.org> References: <4bcfaade3ee3407db49b6439dc67ac16@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/48] cxf git commit: Fix samples checkstyles issues so the builds should be able to finish archived-at: Wed, 29 Jun 2016 22:44:03 -0000 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/aeecef53 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aeecef53 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aeecef53 Branch: refs/heads/master-jaxrs-2.1 Commit: aeecef53263cd1d595d991654f0a783a10adfdcb Parents: ca2f8e8 Author: Daniel Kulp Authored: Fri Jun 10 15:19:53 2016 -0400 Committer: Daniel Kulp Committed: Fri Jun 10 15:19:53 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/aeecef53/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 { private class CachedStream extends CachedOutputStream { - public CachedStream() { + CachedStream() { super(); } http://git-wip-us.apache.org/repos/asf/cxf/blob/aeecef53/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/aeecef53/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/aeecef53/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/aeecef53/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/aeecef53/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(); this.fragments = new ArrayList(); 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/aeecef53/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 366af5a..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 @@ -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() { @@ -227,6 +228,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/aeecef53/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 366af5a..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 @@ -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() { @@ -227,6 +228,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/aeecef53/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 366af5a..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 @@ -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() { @@ -227,6 +228,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/aeecef53/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/aeecef53/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 { private Message outMessage; - public WrappedOutputStream(Message m) { + WrappedOutputStream(Message m) { this.outMessage = m; }