You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2016/05/11 01:33:32 UTC
cxf git commit: Fixing many checkstyle violations for the sample
projects
Repository: cxf
Updated Branches:
refs/heads/master 4149e50e3 -> ee6ceea0d
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/ee6ceea0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ee6ceea0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ee6ceea0
Branch: refs/heads/master
Commit: ee6ceea0d493b1b2dc6d83ca6923c3baed81885e
Parents: 4149e50
Author: reta <dr...@gmail.com>
Authored: Tue May 10 21:33:07 2016 -0400
Committer: reta <dr...@gmail.com>
Committed: Tue May 10 21:33:07 2016 -0400
----------------------------------------------------------------------
.../colocated/client/DispatchSourceClient.java | 2 +-
.../jaxrs/server/AdvancedStreamingService.java | 4 ++--
.../demo/jaxrs/server/InputStreamReceiver.java | 18 ++++++++++++++++++
.../demo/jaxrs/server/SparkStreamingOutput.java | 2 +-
.../java/demo/jaxrs/server/StreamingService.java | 3 ++-
.../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 +++++++------
9 files changed, 47 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ee6ceea0/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/ee6ceea0/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/AdvancedStreamingService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/AdvancedStreamingService.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/AdvancedStreamingService.java
index 412935d..1971fd9 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/AdvancedStreamingService.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/AdvancedStreamingService.java
@@ -58,8 +58,8 @@ public class AdvancedStreamingService {
public static class MyReceiverInputDStream extends ReceiverInputDStream<String> {
- public MyReceiverInputDStream(StreamingContext ssc_, ClassTag<String> evidence$1) {
- super(ssc_, evidence$1);
+ public MyReceiverInputDStream(StreamingContext ssc, ClassTag<String> evidence) {
+ super(ssc, evidence);
}
public void putInputStream(InputStream is) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/ee6ceea0/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/InputStreamReceiver.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/InputStreamReceiver.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/InputStreamReceiver.java
index acbc358..05658e1 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/InputStreamReceiver.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/InputStreamReceiver.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 demo.jaxrs.server;
import java.io.BufferedReader;
http://git-wip-us.apache.org/repos/asf/cxf/blob/ee6ceea0/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/SparkStreamingOutput.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/SparkStreamingOutput.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/SparkStreamingOutput.java
index d76f549..b0d5a50 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/SparkStreamingOutput.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/SparkStreamingOutput.java
@@ -85,7 +85,7 @@ public class SparkStreamingOutput implements StreamingOutput {
private class OutputFunction implements VoidFunction<JavaPairRDD<String, Integer>> {
private static final long serialVersionUID = 1L;
private OutputStream os;
- public OutputFunction(OutputStream os) {
+ OutputFunction(OutputStream os) {
this.os = os;
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/ee6ceea0/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/StreamingService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/StreamingService.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/StreamingService.java
index 1dcb439..9e5f9c3 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/StreamingService.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/StreamingService.java
@@ -72,7 +72,8 @@ public class StreamingService {
}
@SuppressWarnings("serial")
- private static JavaPairDStream<String, Integer> createOutputDStream(JavaReceiverInputDStream<String> receiverStream) {
+ private static JavaPairDStream<String, Integer> createOutputDStream(
+ JavaReceiverInputDStream<String> receiverStream) {
final JavaDStream<String> words = receiverStream.flatMap(
new FlatMapFunction<String, String>() {
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/ee6ceea0/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/ee6ceea0/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..366af5a 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));
@@ -198,7 +198,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());
@@ -243,11 +244,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/ee6ceea0/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..366af5a 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));
@@ -198,7 +198,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());
@@ -243,11 +244,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/ee6ceea0/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..366af5a 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));
@@ -198,7 +198,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());
@@ -243,11 +244,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();