[5/6] cxf git commit: Fix checkstyle issues after merges
Fix checkstyle issues after merges
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4feb04b9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4feb04b9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4feb04b9
Branch: refs/heads/3.1.x-fixes
Commit: 4feb04b9b96bddec2bcd6edbae15e29c1c2765bc
Parents: 621769d
Author: Daniel Kulp
Authored: Thu Jun 8 13:02:22 2017 -0400
Committer: Daniel Kulp
Committed: Thu Jun 8 13:02:22 2017 -0400
--
.../cxf/ws/rm/soap/RMSoapOutInterceptor.java | 8
.../cxf/ws/rm/soap/RMSoapOutInterceptorTest.java | 18 +-
.../org/apache/cxf/systest/ws/rm/ControlImpl.java | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/4feb04b9/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptor.java
--
diff --git
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptor.java
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptor.java
index cb070ad..5ed2734 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptor.java
@@ -131,9 +131,9 @@ public class RMSoapOutInterceptor extends
AbstractSoapInterceptor {
int startSize = headers.size();
protocol.getCodec().buildHeaders(rmps, headers);
if (startSize != headers.size() &&
MessageUtils.isPartialResponse(message)) {
-// make sure the response is returned as HTTP 200 and not
202
-message.put(Message.RESPONSE_CODE,
HttpURLConnection.HTTP_OK);
-}
+// make sure the response is returned as HTTP 200 and not 202
+message.put(Message.RESPONSE_CODE, HttpURLConnection.HTTP_OK);
+}
} catch (JAXBException je) {
LOG.log(Level.WARNING, "SOAP_HEADER_ENCODE_FAILURE_MSG", je);
}
@@ -160,4 +160,4 @@ public class RMSoapOutInterceptor extends
AbstractSoapInterceptor {
LOG.log(Level.WARNING, "SOAP_HEADER_ENCODE_FAILURE_MSG", je);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4feb04b9/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
--
diff --git
a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
index 0056673..d5da583 100644
---
a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
+++
b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
@@ -274,18 +274,18 @@ public class RMSoapOutInterceptorTest extends Assert {
namespace = elem.getNamespaceURI();
localName = elem.getLocalName();
}
-if (RM10Constants.NAMESPACE_URI.equals(namespace)
-&& localName.equals(name)) {
-found = true;
+if (RM10Constants.NAMESPACE_URI.equals(namespace)
+&& localName.equals(name)) {
+found = true;
iter.remove();
-break;
-} else if (Names.WSA_NAMESPACE_NAME.equals(namespace)
-&& localName.equals(name)) {
-found = true;
+break;
+} else if (Names.WSA_NAMESPACE_NAME.equals(namespace)
+&& localName.equals(name)) {
+found = true;
iter.remove();
-break;
-}
+break;
}
+}
assertTrue("Could not find header element " + name, found);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4feb04b9/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
--
diff --git
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
index 10a8127..37490e3 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
@@ -66,7 +66,7 @@ public class ControlImpl extends
org.apache.cxf.greeter_control.ControlImpl {
if (StringUtils.isEmpty(cfgResource)) {
greeterBus = bf.createBus();
} e
[1/2] cxf git commit: Fix checkstyle issues
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 4406683df -> b6d71af8b Fix checkstyle issues Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b7cd8559 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b7cd8559 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b7cd8559 Branch: refs/heads/3.1.x-fixes Commit: b7cd8559dfd6a178af0945d0151f21c48f153522 Parents: 4406683 Author: Daniel Kulp Authored: Tue Apr 4 14:17:51 2017 -0400 Committer: Daniel Kulp Committed: Tue Apr 4 14:17:51 2017 -0400 -- .../sample/rs/service/SampleRestApplicationTest.java | 8 +--- .../sample/rs/service/SampleRestApplicationTest.java | 8 +--- .../java/sample/ws/service/SampleWsApplicationTest.java | 11 ++- 3 files changed, 16 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/b7cd8559/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java -- diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java index 70d5e1c..b783201 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java +++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java @@ -19,14 +19,16 @@ package sample.rs.service; import org.apache.cxf.jaxrs.client.WebClient; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.springframework.boot.context.embedded.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.test.context.junit4.SpringRunner; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; @RunWith(SpringRunner.class) http://git-wip-us.apache.org/repos/asf/cxf/blob/b7cd8559/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java -- diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java index 70d5e1c..b783201 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java +++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java @@ -19,14 +19,16 @@ package sample.rs.service; import org.apache.cxf.jaxrs.client.WebClient; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.springframework.boot.context.embedded.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.test.context.junit4.SpringRunner; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; @RunWith(SpringRunner.class) http://git-wip-us.apache.org/repos/asf/cxf/blob/b7cd8559/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java -- diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java index 13e68eb..53f7277 100644 --- a/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java +++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java @@ -18,13 +18,17 @@ */ package sample.ws.service; -import static org.hamcrest.Matchers.containsString; import java.io.StringReader; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.springframework.boot.context.embedded.LocalServer
cxf git commit: Fix checkstyle issues
Repository: cxf Updated Branches: refs/heads/master db5c2ef07 -> 20951aeac Fix checkstyle issues Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/20951aea Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/20951aea Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/20951aea Branch: refs/heads/master Commit: 20951aeac115e7ae95f4d4cc04da288d2f47e4b2 Parents: db5c2ef Author: Daniel Kulp Authored: Wed Mar 22 13:38:52 2017 -0400 Committer: Daniel Kulp Committed: Wed Mar 22 13:38:52 2017 -0400 -- .../sample/rs/service/SampleRestApplicationTest.java | 9 + .../sample/rs/service/SampleRestApplicationTest.java | 9 + .../java/sample/ws/service/SampleWsApplicationTest.java | 11 ++- 3 files changed, 16 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/20951aea/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java -- diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java index 70d5e1c..d85654a 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java +++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java @@ -19,15 +19,16 @@ package sample.rs.service; import org.apache.cxf.jaxrs.client.WebClient; -import org.springframework.boot.context.embedded.LocalServerPort; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.test.context.junit4.SpringRunner; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.boot.context.embedded.LocalServerPort; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.test.context.junit4.SpringRunner; + @RunWith(SpringRunner.class) @SpringBootTest(classes = SampleRestApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT) http://git-wip-us.apache.org/repos/asf/cxf/blob/20951aea/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java -- diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java index 70d5e1c..d85654a 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java +++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java @@ -19,15 +19,16 @@ package sample.rs.service; import org.apache.cxf.jaxrs.client.WebClient; -import org.springframework.boot.context.embedded.LocalServerPort; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.test.context.junit4.SpringRunner; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.boot.context.embedded.LocalServerPort; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.test.context.junit4.SpringRunner; + @RunWith(SpringRunner.class) @SpringBootTest(classes = SampleRestApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT) http://git-wip-us.apache.org/repos/asf/cxf/blob/20951aea/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java -- diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java index 13e68eb..53f7277 100644 --- a/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/Samp
[5/6] cxf git commit: Fix checkstyle issues in samples
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
Authored: Wed Nov 23 09:39:03 2016 -0500
Committer: Daniel Kulp
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/
[1/4] cxf git commit: Fix checkstyle issues in samples
Repository: cxf
Updated Branches:
refs/heads/master d9e2a6e72 -> 8fc9d7829
Fix checkstyle issues in samples
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8fc9d782
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8fc9d782
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8fc9d782
Branch: refs/heads/master
Commit: 8fc9d782901adddf874fe7c2f9500836a0585707
Parents: 54b7117
Author: Daniel Kulp
Authored: Wed Nov 23 09:39:03 2016 -0500
Committer: Daniel Kulp
Committed: Wed Nov 23 09:51:40 2016 -0500
--
.../main/java/demo/jaxrs/server/SparkUtils.java | 10
.../java/demo/jaxrs/server/simple/Server.java | 4 ++--
.../jaxrs/server/simple/StreamingService.java | 24 ++--
.../rs/service/SampleRestApplication.java | 5 ++--
.../registry/eureka/RegistryApplication.java| 4 ++--
.../sample/ws/SampleWsApplicationClient.java| 4 +++-
6 files changed, 27 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/8fc9d782/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/SparkUtils.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/SparkUtils.java
b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/SparkUtils.java
index ff29627..98894b4 100644
---
a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/SparkUtils.java
+++
b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/SparkUtils.java
@@ -47,14 +47,14 @@ public final class SparkUtils {
public static JavaPairDStream createOutputDStream(
JavaDStream receiverStream, boolean withId) {
final JavaDStream words =
-receiverStream.flatMap(x -> (withId ? splitInputStringWithId(x) :
splitInputString(x)));
+receiverStream.flatMap(x -> withId ? splitInputStringWithId(x) :
splitInputString(x));
final JavaPairDStream pairs = words.mapToPair(s -> {
-return new Tuple2(s, 1);
-});
+return new Tuple2(s, 1);
+});
return pairs.reduceByKey((i1, i2) -> {
-return i1 + i2;
-});
+return i1 + i2;
+});
}
public static Iterator splitInputString(String x) {
List list = new LinkedList();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8fc9d782/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
index cbe4008..c1a49b2 100644
---
a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
+++
b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
@@ -29,8 +29,8 @@ public class Server {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(StreamingService.class);
-String receiverType = args.length == 1 &&
args[0].equals("-receiverType=queue") ?
-"queue" : "string";
+String receiverType = args.length == 1 &&
args[0].equals("-receiverType=queue")
+? "queue" : "string";
sf.setResourceProvider(StreamingService.class,
new SingletonResourceProvider(new StreamingService(receiverType)));
sf.setAddress("http://localhost:9000/spark";);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8fc9d782/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StreamingService.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StreamingService.java
b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StreamingService.java
index 93dbfb8..ee2eade 100644
---
a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StreamingService.java
+++
b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StreamingService.java
@@ -124,13 +124,13 @@ public class StreamingService {
JavaDStream receiverStream = null;
if ("queue".equals(receiverType)) {
- Queue> rddQueue = new LinkedList<>();
- for (i
[31/42] cxf git commit: FIx checkstyle issues
FIx checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/955fd4b7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/955fd4b7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/955fd4b7
Branch: refs/heads/master-jaxrs-2.1
Commit: 955fd4b7fee79642934a828b7758ce14f783364a
Parents: c515130
Author: Daniel Kulp
Authored: Mon Jul 25 16:22:51 2016 -0400
Committer: Daniel Kulp
Committed: Mon Jul 25 16:22:51 2016 -0400
--
.../rs/client/SampleRestClientApplication.java | 29 +++-
.../rs/service/SampleRestApplication.java | 2 +-
.../rs/client/SampleRestClientApplication.java | 21 --
.../registry/eureka/RegistryApplication.java| 6 ++--
4 files changed, 33 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/955fd4b7/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/955fd4b7/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 aa8d358..50944a1 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
@@ -57,4 +57,4 @@ public class SampleRestApplication {
}
- }
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/955fd4b7/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 660cec9..43d48a6 100644
---
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/cl
[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
Authored: Mon Jul 25 16:22:51 2016 -0400
Committer: Daniel Kulp
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
cxf git commit: FIx checkstyle issues
Repository: cxf
Updated Branches:
refs/heads/master c515130f8 -> 955fd4b7f
FIx checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/955fd4b7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/955fd4b7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/955fd4b7
Branch: refs/heads/master
Commit: 955fd4b7fee79642934a828b7758ce14f783364a
Parents: c515130
Author: Daniel Kulp
Authored: Mon Jul 25 16:22:51 2016 -0400
Committer: Daniel Kulp
Committed: Mon Jul 25 16:22:51 2016 -0400
--
.../rs/client/SampleRestClientApplication.java | 29 +++-
.../rs/service/SampleRestApplication.java | 2 +-
.../rs/client/SampleRestClientApplication.java | 21 --
.../registry/eureka/RegistryApplication.java| 6 ++--
4 files changed, 33 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/955fd4b7/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/955fd4b7/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 aa8d358..50944a1 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
@@ -57,4 +57,4 @@ public class SampleRestApplication {
}
- }
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/955fd4b7/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 660cec9..43d48a6 100644
--
cxf git commit: Fix checkstyle issues in samples
Repository: cxf
Updated Branches:
refs/heads/master 52c003020 -> 2a2ed6757
Fix checkstyle issues in samples
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2a2ed675
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2a2ed675
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2a2ed675
Branch: refs/heads/master
Commit: 2a2ed67576b525f9708fcb8bd9e8387a277a1f4f
Parents: 52c0030
Author: Daniel Kulp
Authored: Tue Jul 28 11:34:39 2015 -0400
Committer: Daniel Kulp
Committed: Tue Jul 28 11:34:39 2015 -0400
--
.../java/demo/jaxrs/server/BigQueryServer.java| 8 ++--
.../java/demo/jaxrs/server/BigQueryService.java | 4 ++--
.../java/demo/jaxrs/server/ShakespeareText.java | 18 ++
.../rs/service/SampleRestWSApplication.java | 1 -
4 files changed, 26 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a2ed675/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java
b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java
index bfc8ee8..f82fa7a 100644
---
a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java
+++
b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java
@@ -43,7 +43,10 @@ import
org.apache.cxf.rs.security.oauth2.provider.OAuthJSONProvider;
import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
-public class BigQueryServer {
+public final class BigQueryServer {
+private BigQueryServer() {
+}
+
public static void main(String[] args) throws Exception {
final String pc12File = args[0];
final String keySecret = args[1];
@@ -86,7 +89,8 @@ public class BigQueryServer {
JwtBearerGrant grant = new JwtBearerGrant(base64UrlAssertion);
WebClient accessTokenService =
WebClient.create("https://www.googleapis.com/oauth2/v3/token";,
-Arrays.asList(new
OAuthJSONProvider(), new AccessTokenGrantWriter()));
+Arrays.asList(new
OAuthJSONProvider(),
+ new
AccessTokenGrantWriter()));
accessTokenService.type(MediaType.APPLICATION_FORM_URLENCODED).accept(MediaType.APPLICATION_JSON);
return accessTokenService.post(grant, ClientAccessToken.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a2ed675/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java
b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java
index 99441ba..3eac41f 100644
---
a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java
+++
b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java
@@ -40,8 +40,8 @@ public class BigQueryService {
private static final String BQ_SELECT =
"SELECT corpus,corpus_date FROM publicdata:samples.shakespeare WHERE
word=\\\"%s\\\"";
-private static final String BQ_REQUEST = "{" +
-"\"kind\": \"bigquery#queryRequest\","
+private static final String BQ_REQUEST = "{"
++ "\"kind\": \"bigquery#queryRequest\","
+ "\"query\": \"%s\","
+ "\"maxResults\": %d"
+ "}";
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a2ed675/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/ShakespeareText.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/ShakespeareText.java
b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/ShakespeareText.java
index a3ef3de..95baa17 100644
---
a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/ShakespeareText.java
+++
b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/ShakespeareText.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreeme
