You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/14 09:49:31 UTC
[26/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Storage.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Storage.java b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Storage.java
index aa3ef2c..0de1312 100644
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Storage.java
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Storage.java
@@ -32,47 +32,47 @@ import org.apache.cxf.helpers.IOUtils;
public class Storage {
private final File folder = new File("files");
-
+
public Storage() throws IOException {
if (!folder.exists() && !folder.mkdirs()) {
throw new IOException("Unable to initialize FS storage:" + folder.getAbsolutePath());
}
-
+
if (!folder.isDirectory() || !folder.canWrite() || !folder.canWrite()) {
throw new IOException("Unable to access FS storage:" + folder.getAbsolutePath());
- }
+ }
}
-
+
public void addDocument(final String name, final byte[] content) throws IOException {
try (InputStream in = new ByteArrayInputStream(content)) {
addDocument(name, in);
}
}
-
- public void addDocument(final String name, final InputStream in) throws IOException {
+
+ public void addDocument(final String name, final InputStream in) throws IOException {
final File f = new File(folder, name);
-
+
if (f.exists() && !f.delete()) {
throw new IOException("Unable to delete FS file:" + f.getAbsolutePath());
- }
-
+ }
+
try (OutputStream out = new BufferedOutputStream(new FileOutputStream(f))) {
out.write(IOUtils.readBytesFromStream(in));
-
+
f.deleteOnExit();
}
}
-
+
public InputStream getDocument(final String name) throws IOException {
final File f = new File(folder, name);
-
+
if (!f.exists() || !f.isFile()) {
throw new FileNotFoundException("Unable to access FS file:" + f.getAbsolutePath());
}
-
+
return new FileInputStream(f);
}
-
+
public void deleteAll() throws IOException {
for (final File f: folder.listFiles()) {
if (!f.delete()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/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 98894b4..915b190 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
@@ -40,15 +40,15 @@ import scala.Tuple2;
public final class SparkUtils {
-
+
private SparkUtils() {
}
-
+
public static JavaPairDStream<String, Integer> createOutputDStream(
JavaDStream<String> receiverStream, boolean withId) {
- final JavaDStream<String> words =
+ final JavaDStream<String> words =
receiverStream.flatMap(x -> withId ? splitInputStringWithId(x) : splitInputString(x));
-
+
final JavaPairDStream<String, Integer> pairs = words.mapToPair(s -> {
return new Tuple2<String, Integer>(s, 1);
});
@@ -73,7 +73,7 @@ public final class SparkUtils {
int index = x.indexOf(":");
String jobId = x.substring(0, index);
x = x.substring(index + 1);
-
+
List<String> list = new LinkedList<String>();
for (String s : Arrays.asList(x.split(" "))) {
s = s.trim();
@@ -98,7 +98,7 @@ public final class SparkUtils {
return getStringsFromReader(new BufferedReader(new StringReader(s)));
}
public static List<String> getStringsFromReader(BufferedReader reader) {
-
+
List<String> inputStrings = new LinkedList<String>();
String userInput = null;
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/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 c1a49b2..eb7475e 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
@@ -28,10 +28,10 @@ public class Server {
protected Server(String args[]) throws Exception {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(StreamingService.class);
-
+
String receiverType = args.length == 1 && args[0].equals("-receiverType=queue")
? "queue" : "string";
- sf.setResourceProvider(StreamingService.class,
+ sf.setResourceProvider(StreamingService.class,
new SingletonResourceProvider(new StreamingService(receiverType)));
sf.setAddress("http://localhost:9000/spark");
@@ -45,6 +45,6 @@ public class Server {
System.out.println("Server exiting");
System.exit(0);
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingListener.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingListener.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingListener.java
index 216f3f8..0d6a200 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingListener.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingListener.java
@@ -32,7 +32,7 @@ public class SparkStreamingListener implements StreamingListener {
private SparkStreamingOutput streamOutput;
private boolean batchStarted;
private long batchStartAt;
-
+
public SparkStreamingListener(SparkStreamingOutput streamOutput) {
this.streamOutput = streamOutput;
}
@@ -40,7 +40,7 @@ public class SparkStreamingListener implements StreamingListener {
@Override
public void onBatchCompleted(StreamingListenerBatchCompleted event) {
System.out.println("Batch processing time in millisecs: " + (System.currentTimeMillis() - batchStartAt));
-
+
streamOutput.setSparkBatchCompleted();
}
@@ -87,7 +87,7 @@ public class SparkStreamingListener implements StreamingListener {
// continue
}
}
-
+
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingOutput.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingOutput.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingOutput.java
index 67e2c84..49db3be 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingOutput.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingOutput.java
@@ -32,7 +32,7 @@ import org.apache.spark.streaming.api.java.JavaStreamingContext;
public class SparkStreamingOutput implements StreamingOutput {
private BlockingQueue<String> responseQueue = new LinkedBlockingQueue<String>();
-
+
private JavaStreamingContext jssc;
private volatile boolean sparkBatchCompleted;
private volatile boolean outputWriteDone;
@@ -56,13 +56,13 @@ public class SparkStreamingOutput implements StreamingOutput {
// continue;
}
}
-
+
jssc.stop(false);
jssc.close();
System.out.println("Total processing time in millisecs: " + (System.currentTimeMillis() - startAt));
}
-
-
+
+
public void setSparkBatchCompleted() {
this.sparkBatchCompleted = true;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/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 ee2eade..96259e2 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
@@ -67,18 +67,18 @@ public class StreamingService {
}
private Executor executor = new ThreadPoolExecutor(5, 5, 0, TimeUnit.SECONDS,
new ArrayBlockingQueue<Runnable>(10));
-
+
private String receiverType;
-
+
public StreamingService(String receiverType) {
this.receiverType = receiverType;
}
-
+
@POST
@Path("/multipart")
@Consumes("multipart/form-data")
@Produces("text/plain")
- public void processMultipartStream(@Suspended AsyncResponse async,
+ public void processMultipartStream(@Suspended AsyncResponse async,
@Multipart("file") Attachment att) {
MediaType mediaType = att.getContentType();
if (mediaType == null) {
@@ -90,13 +90,13 @@ public class StreamingService {
}
}
}
-
+
TikaContentExtractor tika = new TikaContentExtractor();
TikaContent tikaContent = tika.extract(att.getObject(InputStream.class),
mediaType);
processStream(async, SparkUtils.getStringsFromString(tikaContent.getContent()));
}
-
+
@POST
@Path("/stream")
@Consumes("text/plain")
@@ -116,12 +116,12 @@ public class StreamingService {
try {
SparkConf sparkConf = new SparkConf().setMaster("local[*]")
.setAppName("JAX-RS Spark Connect " + SparkUtils.getRandomId());
- JavaStreamingContext jssc = new JavaStreamingContext(sparkConf, Durations.seconds(1));
-
+ JavaStreamingContext jssc = new JavaStreamingContext(sparkConf, Durations.seconds(1));
+
SparkStreamingOutput streamOut = new SparkStreamingOutput(jssc);
SparkStreamingListener sparkListener = new SparkStreamingListener(streamOut);
jssc.addStreamingListener(sparkListener);
-
+
JavaDStream<String> receiverStream = null;
if ("queue".equals(receiverType)) {
Queue<JavaRDD<String>> rddQueue = new LinkedList<>();
@@ -132,11 +132,11 @@ public class StreamingService {
} else {
receiverStream = jssc.receiverStream(new StringListReceiver(inputStrings));
}
-
+
JavaPairDStream<String, Integer> wordCounts = SparkUtils.createOutputDStream(receiverStream, false);
wordCounts.foreachRDD(new OutputFunction(streamOut));
jssc.start();
-
+
executor.execute(new SparkJob(async, sparkListener));
} catch (Exception ex) {
// the compiler does not allow to catch SparkException directly
@@ -147,13 +147,13 @@ public class StreamingService {
}
}
}
-
+
private void processStreamOneWay(List<String> inputStrings) {
try {
SparkConf sparkConf = new SparkConf().setMaster("local[*]")
.setAppName("JAX-RS Spark Connect OneWay " + SparkUtils.getRandomId());
- JavaStreamingContext jssc = new JavaStreamingContext(sparkConf, Durations.seconds(1));
-
+ JavaStreamingContext jssc = new JavaStreamingContext(sparkConf, Durations.seconds(1));
+
JavaDStream<String> receiverStream = null;
if ("queue".equals(receiverType)) {
Queue<JavaRDD<String>> rddQueue = new LinkedList<>();
@@ -164,7 +164,7 @@ public class StreamingService {
} else {
receiverStream = jssc.receiverStream(new StringListReceiver(inputStrings));
}
-
+
JavaPairDStream<String, Integer> wordCounts = SparkUtils.createOutputDStream(receiverStream, false);
wordCounts.foreachRDD(new PrintOutputFunction(jssc));
jssc.start();
@@ -172,8 +172,8 @@ public class StreamingService {
// ignore
}
}
-
-
+
+
private static class OutputFunction implements VoidFunction<JavaPairRDD<String, Integer>> {
private static final long serialVersionUID = 1L;
private SparkStreamingOutput streamOut;
@@ -187,7 +187,7 @@ public class StreamingService {
streamOut.addResponseEntry(value);
}
}
-
+
}
private static class PrintOutputFunction implements VoidFunction<JavaPairRDD<String, Integer>> {
private static final long serialVersionUID = 1L;
@@ -206,7 +206,7 @@ public class StreamingService {
jssc.close();
}
}
-
+
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StringListReceiver.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StringListReceiver.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StringListReceiver.java
index f5cac28..76432cc 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StringListReceiver.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StringListReceiver.java
@@ -27,7 +27,7 @@ public class StringListReceiver extends Receiver<String> {
private static final long serialVersionUID = 1L;
private List<String> inputStrings;
-
+
public StringListReceiver(List<String> inputStrings) {
super(StorageLevel.MEMORY_ONLY());
this.inputStrings = inputStrings;
@@ -40,5 +40,5 @@ public class StringListReceiver extends Receiver<String> {
public void onStop() {
// complete
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/Server.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/Server.java
index fc7968c..02ece07 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/Server.java
@@ -45,49 +45,49 @@ import demo.jaxrs.server.simple.SparkStreamingOutput;
public class Server {
protected Server(String args[]) throws Exception {
-
+
ServerSocket sparkServerSocket = new ServerSocket(9999);
ServerSocket jaxrsResponseServerSocket = new ServerSocket(10000);
Socket jaxrsResponseClientSocket = new Socket("localhost", 10000);
-
-
+
+
SparkConf sparkConf = new SparkConf().setMaster("local[*]")
.setAppName("JAX-RS Spark Socket Connect");
- JavaStreamingContext jssc = new JavaStreamingContext(sparkConf, Durations.seconds(1));
-
+ JavaStreamingContext jssc = new JavaStreamingContext(sparkConf, Durations.seconds(1));
+
SparkStreamingOutput streamOut = new SparkStreamingOutput(jssc);
SparkStreamingListener sparkListener = new SparkStreamingListener(streamOut);
jssc.addStreamingListener(sparkListener);
-
+
JavaDStream<String> receiverStream = jssc.socketTextStream(
"localhost", 9999, StorageLevels.MEMORY_ONLY);
-
+
JavaPairDStream<String, Integer> wordCounts = SparkUtils.createOutputDStream(receiverStream, true);
PrintStream sparkResponseOutputStream = new PrintStream(jaxrsResponseClientSocket.getOutputStream(), true);
wordCounts.foreachRDD(new SocketOutputFunction(sparkResponseOutputStream));
-
+
jssc.start();
-
+
Socket receiverClientSocket = sparkServerSocket.accept();
PrintStream sparkOutputStream = new PrintStream(receiverClientSocket.getOutputStream(), true);
- BufferedReader sparkInputStream =
+ BufferedReader sparkInputStream =
new BufferedReader(new InputStreamReader(jaxrsResponseServerSocket.accept().getInputStream()));
-
-
+
+
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
-
+
sf.setResourceClasses(StreamingService.class);
- sf.setResourceProvider(StreamingService.class,
+ sf.setResourceProvider(StreamingService.class,
new SingletonResourceProvider(new StreamingService(sparkInputStream,
sparkOutputStream)));
sf.setAddress("http://localhost:9000/spark");
sf.create();
-
+
jssc.awaitTermination();
sparkServerSocket.close();
jaxrsResponseServerSocket.close();
jaxrsResponseClientSocket.close();
-
+
}
public static void main(String args[]) throws Exception {
@@ -97,7 +97,7 @@ public class Server {
System.out.println("Server exiting");
System.exit(0);
}
-
+
private static class SocketOutputFunction implements VoidFunction<JavaPairRDD<String, Integer>> {
private static final long serialVersionUID = 1L;
private PrintStream streamOut;
@@ -115,14 +115,14 @@ public class Server {
int index = value.indexOf(":");
jobId = value.substring(0, index);
printStream = "oneway".equals(jobId) ? System.out : streamOut;
-
+
}
printStream.println(value);
}
printStream.println(jobId + ":" + "<batchEnd>");
}
}
-
+
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkJob.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkJob.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkJob.java
index 9128a4e..8f5458d 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkJob.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkJob.java
@@ -45,7 +45,7 @@ public class SparkJob implements Runnable {
String jobId = SparkUtils.getRandomId();
BlockingQueue<String> queue = new LinkedBlockingQueue<String>();
sparkResponses.put(jobId, queue);
-
+
for (String s : inputStrings) {
sparkOutputStream.println(jobId + ":" + s);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkResultJob.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkResultJob.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkResultJob.java
index eb0286b..35ba4c5 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkResultJob.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkResultJob.java
@@ -33,7 +33,7 @@ public class SparkResultJob implements Runnable {
this.sparkInputStream = sparkInputStream;
}
-
+
@Override
public void run() {
try {
@@ -45,7 +45,7 @@ public class SparkResultJob implements Runnable {
sparkResponses.get(jobId).offer(value);
}
} catch (IOException ex) {
- // ignore
+ // ignore
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkStreamingOutput.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkStreamingOutput.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkStreamingOutput.java
index 681395a..7972843 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkStreamingOutput.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkStreamingOutput.java
@@ -57,6 +57,6 @@ public class SparkStreamingOutput implements StreamingOutput {
} catch (InterruptedException ex) {
// ignore
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java
index e0e185b..ff72942 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java
@@ -59,20 +59,20 @@ public class StreamingService {
}
private Executor executor = new ThreadPoolExecutor(5, 5, 0, TimeUnit.SECONDS,
new ArrayBlockingQueue<Runnable>(10));
- private Map<String, BlockingQueue<String>> sparkResponses =
+ private Map<String, BlockingQueue<String>> sparkResponses =
new ConcurrentHashMap<String, BlockingQueue<String>>();
private PrintStream sparkOutputStream;
-
+
public StreamingService(BufferedReader sparkInputStream, PrintStream sparkOutputStream) {
this.sparkOutputStream = sparkOutputStream;
executor.execute(new SparkResultJob(sparkResponses, sparkInputStream));
}
-
+
@POST
@Path("/multipart")
@Consumes("multipart/form-data")
@Produces("text/plain")
- public void processMultipartStream(@Suspended AsyncResponse async,
+ public void processMultipartStream(@Suspended AsyncResponse async,
@Multipart("file") Attachment att) {
MediaType mediaType = att.getContentType();
if (mediaType == null) {
@@ -84,13 +84,13 @@ public class StreamingService {
}
}
}
-
+
TikaContentExtractor tika = new TikaContentExtractor();
TikaContent tikaContent = tika.extract(att.getObject(InputStream.class),
mediaType);
processStream(async, SparkUtils.getStringsFromString(tikaContent.getContent()));
}
-
+
@POST
@Path("/stream")
@Consumes("text/plain")
@@ -103,7 +103,7 @@ public class StreamingService {
executor.execute(
new SparkJob(async, sparkResponses, sparkOutputStream, inputStrings));
}
-
+
@POST
@Path("/streamOneWay")
@Consumes("text/plain")
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/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 aeb054b..cb5e139 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
@@ -36,10 +36,10 @@ public class SampleRestClientApplication {
new SpringApplicationBuilder(SampleRestClientApplication.class)
.web(false)
.run(args);
- }
+ }
@Bean
CommandLineRunner initWebClientRunner(final WebClient webClient) {
-
+
return new CommandLineRunner() {
@Override
@@ -50,7 +50,7 @@ public class SampleRestClientApplication {
}
@Bean
CommandLineRunner initProxyClientRunner(final HelloService client) {
-
+
return new CommandLineRunner() {
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/HelloService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/HelloService.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/HelloService.java
index bd37a96..eb3678f 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/HelloService.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/HelloService.java
@@ -24,14 +24,14 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.springframework.stereotype.Service;
-
+
@Path("/sayHello")
@Service
public interface HelloService {
-
+
@GET
@Path("/{a}")
@Produces(MediaType.TEXT_PLAIN)
String sayHello(@PathParam("a") String a);
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java
index 358ca4a..4d8b54b 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java
@@ -39,7 +39,7 @@ public class SampleRestApplication {
public static void main(String[] args) {
SpringApplication.run(SampleRestApplication.class, args);
}
-
+
@Bean
public Server rsServer() {
JAXRSServerFactoryBean endpoint = new JAXRSServerFactoryBean();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
index 0e5d9b8..481a787 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
@@ -19,12 +19,12 @@
package sample.rs.service.hello1;
import io.swagger.annotations.Api;
import sample.rs.service.HelloService;
-
+
@Api("/sayHello")
public class HelloServiceImpl1 implements HelloService {
-
+
public String sayHello(String a) {
return "Hello " + a + ", Welcome to CXF RS Spring Boot World!!!";
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
index 9b24c29..ee44929 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
@@ -24,9 +24,9 @@ import sample.rs.service.HelloService;
@Path("/sayHello2")
@Api("/sayHello2")
public class HelloServiceImpl2 implements HelloService {
-
+
public String sayHello(String a) {
return "Hello2 " + a + ", Welcome to CXF RS Spring Boot World!!!";
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/HelloService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/HelloService.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/HelloService.java
index 706b054..25bda5b 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/HelloService.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/HelloService.java
@@ -22,13 +22,13 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
-
+
@Path("/sayHello")
public interface HelloService {
-
+
@GET
@Path("/{a}")
@Produces(MediaType.TEXT_PLAIN)
String sayHello(@PathParam("a") String a);
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/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 35bf34a..1f3ff56 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
@@ -37,7 +37,7 @@ public class SampleRestApplication {
public MetricRegistry metricRegistry() {
return new MetricRegistry();
}
-
+
@Bean
public MetricsEndpoint metricsEndpoint(final MetricRegistry registry) {
return new MetricsEndpoint(Collections.singleton(new MetricReaderPublicMetrics(
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
index 4ebe2bb..d07b136 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
@@ -21,13 +21,13 @@ import org.springframework.stereotype.Service;
import io.swagger.annotations.Api;
import sample.rs.service.HelloService;
-
+
@Api("/sayHello")
@Service
public class HelloServiceImpl1 implements HelloService {
-
+
public String sayHello(String a) {
return "Hello " + a + ", Welcome to CXF RS Spring Boot World!!!";
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
index 23f8a1d..ad0aca2 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
@@ -28,9 +28,9 @@ import sample.rs.service.HelloService;
@Api("/sayHello2")
@Service
public class HelloServiceImpl2 implements HelloService {
-
+
public String sayHello(String a) {
return "Hello2 " + a + ", Welcome to CXF RS Spring Boot World!!!";
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/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 fac11e6..9f8b928 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
@@ -49,10 +49,10 @@ public class SampleRestClientApplication {
new SpringApplicationBuilder(SampleRestClientApplication.class)
.web(false)
.run(args);
- }
+ }
@Bean
CommandLineRunner initProxyClient(final HelloService service) {
-
+
return new CommandLineRunner() {
@Override
public void run(String... runArgs) throws Exception {
@@ -73,11 +73,11 @@ public class SampleRestClientApplication {
@Autowired
DiscoveryClient discoveryClient;
List<String> addresses = new LinkedList<String>();
-
+
EurekaFailoverFeature() {
super("eureka://registry");
}
-
+
@Override
public FailoverStrategy getStrategy() {
for (ServiceInstance s : discoveryClient.getInstances("jaxrs-hello-world-service")) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/service/HelloService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/service/HelloService.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/service/HelloService.java
index 706b054..25bda5b 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/service/HelloService.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/service/HelloService.java
@@ -22,13 +22,13 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
-
+
@Path("/sayHello")
public interface HelloService {
-
+
@GET
@Path("/{a}")
@Produces(MediaType.TEXT_PLAIN)
String sayHello(@PathParam("a") String a);
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
index 4dfac8b..b691d80 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
@@ -41,115 +41,115 @@ public final class Client {
System.out.println("\n");
Client c = new Client();
-
- // 1. get customer info
- //
+
+ // 1. get customer info
+ //
c.getCustomerInfo("fred", "fred", 123);
c.getCustomerInfo("fred", "fredspassword", 123);
c.getCustomerInfo("bob", "bobspassword", 123);
- // 2. add customer info
- //
+ // 2. add customer info
+ //
c.addCustomerInfo("fred", "fredspassword");
c.addCustomerInfo("bob", "bobspassword");
-
- // 3. update customer info
- //
+
+ // 3. update customer info
+ //
c.updateCustomerInfo("fred", "fredspassword");
c.updateCustomerInfo("bob", "bobspassword");
- // 4. delete customer info
- //
+ // 4. delete customer info
+ //
c.deleteCustomerInfo("bob", "bobspassword", 123);
c.deleteCustomerInfo("fred", "fredspassword", 123);
-
+
}
public void getCustomerInfo(String name, String password, int id) throws Exception {
-
- System.out.println("HTTP GET to query customer info, user : "
+
+ System.out.println("HTTP GET to query customer info, user : "
+ name + ", password : " + password);
- GetMethod get =
+ GetMethod get =
new GetMethod("http://localhost:9002/customerservice/customers/" + id);
setMethodHeaders(get, name, password);
handleHttpMethod(get);
- }
+ }
public void addCustomerInfo(String name, String password) throws Exception {
-
- System.out.println("HTTP POST to add customer info, user : "
+
+ System.out.println("HTTP POST to add customer info, user : "
+ name + ", password : " + password);
PostMethod post = new PostMethod("http://localhost:9002/customerservice/customers");
setMethodHeaders(post, name, password);
RequestEntity entity = new InputStreamRequestEntity(
this.getClass().getClassLoader().getResourceAsStream("add_customer.xml"));
post.setRequestEntity(entity);
-
+
handleHttpMethod(post);
- }
+ }
public void updateCustomerInfo(String name, String password) throws Exception {
-
- System.out.println("HTTP PUT to update customer info, user : "
+
+ System.out.println("HTTP PUT to update customer info, user : "
+ name + ", password : " + password);
PutMethod put = new PutMethod("http://localhost:9002/customerservice/customers/123");
setMethodHeaders(put, name, password);
RequestEntity entity = new InputStreamRequestEntity(
this.getClass().getClassLoader().getResourceAsStream("update_customer.xml"));
put.setRequestEntity(entity);
-
+
handleHttpMethod(put);
- }
+ }
public void deleteCustomerInfo(String name, String password, int id) throws Exception {
-
- System.out.println("HTTP DELETE to update customer info, user : "
+
+ System.out.println("HTTP DELETE to update customer info, user : "
+ name + ", password : " + password);
System.out.println("Confirming a customer with id " + id + " exists first");
getCustomerInfo(name, password, id);
System.out.println("Deleting now...");
- DeleteMethod del =
+ DeleteMethod del =
new DeleteMethod("http://localhost:9002/customerservice/customers/" + id);
setMethodHeaders(del, name, password);
handleHttpMethod(del);
System.out.println("Confirming a customer with id " + id + " does not exist anymore");
getCustomerInfo(name, password, id);
- }
+ }
private static void handleHttpMethod(HttpMethod httpMethod) throws Exception {
HttpClient client = new HttpClient();
try {
int statusCode = client.executeMethod(httpMethod);
- System.out.println("Response status : " + statusCode);
+ System.out.println("Response status : " + statusCode);
Response.Status status = Response.Status.fromStatusCode(statusCode);
if (status == Response.Status.OK) {
- System.out.println(httpMethod.getResponseBodyAsString());
+ System.out.println(httpMethod.getResponseBodyAsString());
} else if (status == Response.Status.FORBIDDEN) {
System.out.println("Authorization failure");
} else if (status == Response.Status.UNAUTHORIZED) {
System.out.println("Authentication failure");
}
- System.out.println();
+ System.out.println();
} finally {
// release any connection resources used by the method
httpMethod.releaseConnection();
- }
+ }
}
private static void setMethodHeaders(HttpMethod httpMethod, String name, String password) {
if (httpMethod instanceof PostMethod || httpMethod instanceof PutMethod) {
httpMethod.setRequestHeader("Content-Type", "application/xml");
- }
+ }
httpMethod.setDoAuthentication(false);
httpMethod.setRequestHeader("Accept", "application/xml");
- httpMethod.setRequestHeader("Authorization",
+ httpMethod.setRequestHeader("Authorization",
"Basic " + base64Encode(name + ":" + password));
-
+
}
private static String base64Encode(String value) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java
index 27141f4..e0cda41 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java
@@ -31,14 +31,14 @@ import javax.ws.rs.core.Response;
@Path("/customerservice/")
public abstract class AbstractCustomerServiceSecured implements CustomerServiceSecured {
-
+
protected long currentId = 123;
protected Map<Long, Customer> customers = new HashMap<Long, Customer>();
protected Map<Long, Order> orders = new HashMap<Long, Order>();
protected AbstractCustomerServiceSecured() {
init();
- }
+ }
@GET
@Path("/customers/{id}/")
@@ -47,7 +47,7 @@ public abstract class AbstractCustomerServiceSecured implements CustomerServiceS
@PUT
@Path("/customers/{id}")
public abstract Response updateCustomer(@PathParam("id") Long id, Customer customer);
-
+
@POST
@Path("/customers/")
public abstract Response addCustomer(Customer customer);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java
index b623f92..310c83d 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java
@@ -28,7 +28,7 @@ import javax.ws.rs.core.Response;
@Path("/customerservice/")
public interface CustomerService {
-
+
@GET
@Path("/customers/{id}/")
Customer getCustomer(@PathParam("id") String id);
@@ -36,7 +36,7 @@ public interface CustomerService {
@PUT
@Path("/customers/{id}")
Response updateCustomer(@PathParam("id") Long id, Customer customer);
-
+
@POST
@Path("/customers/")
Response addCustomer(Customer customer);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java
index 699a448..0566f2d 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java
@@ -23,13 +23,13 @@ import org.springframework.security.access.annotation.Secured;
public interface CustomerServiceSecured {
-
+
@Secured({"ROLE_CUSTOMER", "ROLE_ADMIN" })
Customer getCustomer(String id);
@Secured("ROLE_ADMIN")
Response updateCustomer(Long id, Customer customer);
-
+
@Secured("ROLE_ADMIN")
Response addCustomer(Customer customer);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
index ff05d35..7bf04c4 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
@@ -75,6 +75,6 @@ public class CustomerServiceSecuredImpl extends AbstractCustomerServiceSecured {
return c;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/Stats.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/Stats.java b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/Stats.java
index 874047c..95f7619 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/Stats.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/Stats.java
@@ -29,7 +29,7 @@ public class Stats implements Serializable {
private long timestamp;
private int load;
-
+
public Stats() {
}
@@ -41,7 +41,7 @@ public class Stats implements Serializable {
public long getTimestamp() {
return timestamp;
}
-
+
public void setTimestamp(long timestamp) {
this.timestamp = timestamp;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsApplication.java b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsApplication.java
index edf8a2b..a313967 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsApplication.java
@@ -32,7 +32,7 @@ import org.apache.cxf.jaxrs.sse.SseFeature;
@ApplicationPath("api")
public class StatsApplication extends Application {
@Inject private StatsRestServiceImpl statsRestService;
-
+
@Override
public Set<Object> getSingletons() {
final Set<Object> singletons = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
index a156125..f1fa6a4 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
@@ -70,7 +70,7 @@ public class StatsRestServiceImpl {
}
}.start();
}
-
+
private static OutboundSseEvent createStatsEvent(final OutboundSseEvent.Builder builder, final int eventId) {
return builder
.id("" + eventId)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsServer.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsServer.java b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsServer.java
index c227718..f13318d 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsServer.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsServer.java
@@ -31,7 +31,7 @@ import org.jboss.weld.environment.servlet.Listener;
public final class StatsServer {
private StatsServer() {
}
-
+
public static void main(final String[] args) throws Exception {
final Server server = new Server(8686);
@@ -54,7 +54,7 @@ public final class StatsServer {
HandlerList handlers = new HandlerList();
handlers.addHandler(staticContext);
handlers.addHandler(context);
-
+
server.setHandler(handlers);
server.start();
server.join();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/Stats.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/Stats.java b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/Stats.java
index 874047c..95f7619 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/Stats.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/Stats.java
@@ -29,7 +29,7 @@ public class Stats implements Serializable {
private long timestamp;
private int load;
-
+
public Stats() {
}
@@ -41,7 +41,7 @@ public class Stats implements Serializable {
public long getTimestamp() {
return timestamp;
}
-
+
public void setTimestamp(long timestamp) {
this.timestamp = timestamp;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java
index 57a163f..3380050 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java
@@ -35,9 +35,9 @@ import org.springframework.context.annotation.DependsOn;
@Configuration
@ComponentScan(basePackageClasses = StatsRestServiceImpl.class)
public class StatsConfig {
- @Inject
+ @Inject
private StatsRestServiceImpl statsRestService;
-
+
@Bean(destroyMethod = "shutdown")
SpringBus cxf() {
return new SpringBus();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
index 005c2bf..dc07af6 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
@@ -41,7 +41,7 @@ import org.springframework.stereotype.Component;
public class StatsRestServiceImpl {
private static final Random RANDOM = new Random();
private final Sse sse = SseFactory.create();
-
+
@GET
@Path("sse/{id}")
@Produces(MediaType.SERVER_SENT_EVENTS)
@@ -72,7 +72,7 @@ public class StatsRestServiceImpl {
}
}.start();
}
-
+
private static OutboundSseEvent createStatsEvent(final OutboundSseEvent.Builder builder, final int eventId) {
return builder
.id("" + eventId)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsServer.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsServer.java b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsServer.java
index 06a1e04..4896045 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsServer.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsServer.java
@@ -31,7 +31,7 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon
public final class StatsServer {
private StatsServer() {
}
-
+
public static void main(final String[] args) throws Exception {
final Server server = new Server(8686);
@@ -54,7 +54,7 @@ public final class StatsServer {
HandlerList handlers = new HandlerList();
handlers.addHandler(staticContext);
handlers.addHandler(context);
-
+
server.setHandler(handlers);
server.start();
server.join();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/Stats.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/Stats.java b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/Stats.java
index 874047c..95f7619 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/Stats.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/Stats.java
@@ -29,7 +29,7 @@ public class Stats implements Serializable {
private long timestamp;
private int load;
-
+
public Stats() {
}
@@ -41,7 +41,7 @@ public class Stats implements Serializable {
public long getTimestamp() {
return timestamp;
}
-
+
public void setTimestamp(long timestamp) {
this.timestamp = timestamp;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
index f937702..f1fa6a4 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
@@ -39,7 +39,7 @@ import org.apache.cxf.jaxrs.sse.SseFactory;
public class StatsRestServiceImpl {
private static final Random RANDOM = new Random();
private final Sse sse = SseFactory.create();
-
+
@GET
@Path("sse/{id}")
@Produces(MediaType.SERVER_SENT_EVENTS)
@@ -70,7 +70,7 @@ public class StatsRestServiceImpl {
}
}.start();
}
-
+
private static OutboundSseEvent createStatsEvent(final OutboundSseEvent.Builder builder, final int eventId) {
return builder
.id("" + eventId)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsServer.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsServer.java b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsServer.java
index 8a8831b..9a11851 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsServer.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsServer.java
@@ -35,15 +35,15 @@ import org.springframework.web.context.ContextLoaderListener;
public final class StatsServer {
private StatsServer() {
}
-
+
public static void main(final String[] args) throws Exception {
// Register and map the dispatcher servlet
final File base = new File(System.getProperty("java.io.tmpdir"));
-
+
final Tomcat server = new Tomcat();
server.setPort(8686);
server.setBaseDir(base.getAbsolutePath());
-
+
final StandardContext context = (StandardContext)server.addWebapp("/", base.getAbsolutePath());
context.setConfigFile(StatsServer.class.getResource("/META-INF/context.xml"));
context.addApplicationListener(ContextLoaderListener.class.getName());
@@ -58,8 +58,8 @@ public final class StatsServer {
Tomcat.addServlet(staticContext, "cxfStaticServlet", new DefaultServlet());
staticContext.addServletMapping("/static/*", "cxfStaticServlet");
staticContext.setResources(resourcesFrom(staticContext, "target/classes/web-ui"));
- staticContext.setParentClassLoader(Thread.currentThread().getContextClassLoader());
-
+ staticContext.setParentClassLoader(Thread.currentThread().getContextClassLoader());
+
server.start();
server.getServer().await();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/client/Client.java b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/client/Client.java
index 39ba835..6390237 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/client/Client.java
@@ -32,16 +32,16 @@ import org.apache.cxf.tracing.brave.jaxrs.BraveClientProvider;
public final class Client {
private Client() {
}
-
+
public static void main(final String[] args) throws Exception {
final Brave brave = new Brave.Builder().build();
final BraveClientProvider provider = new BraveClientProvider(brave);
-
+
final Response response = WebClient
.create("http://localhost:9000/catalog", Arrays.asList(provider))
.accept(MediaType.APPLICATION_JSON)
.get();
-
+
System.out.println(response.readEntity(String.class));
response.close();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Catalog.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Catalog.java
index 35110b2..141effc 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Catalog.java
@@ -50,20 +50,20 @@ import org.apache.cxf.tracing.TracerContext;
public class Catalog {
private final ExecutorService executor = Executors.newFixedThreadPool(2);
private final CatalogStore store;
-
+
public Catalog() {
store = new CatalogStore();
}
-
+
@POST
@Produces(MediaType.APPLICATION_JSON)
- public Response addBook(@Context final UriInfo uriInfo, @Context final TracerContext tracing,
+ public Response addBook(@Context final UriInfo uriInfo, @Context final TracerContext tracing,
@FormParam("title") final String title) {
try {
final String id = UUID.randomUUID().toString();
-
+
executor.submit(
- tracing.wrap("Inserting New Book",
+ tracing.wrap("Inserting New Book",
new Traceable<Void>() {
public Void call(final TracerContext context) throws Exception {
store.put(id, title);
@@ -72,7 +72,7 @@ public class Catalog {
}
)
).get(10, TimeUnit.SECONDS);
-
+
return Response
.created(uriInfo.getRequestUriBuilder().path(id).build())
.build();
@@ -86,10 +86,10 @@ public class Catalog {
.build();
}
}
-
+
@GET
@Produces(MediaType.APPLICATION_JSON)
- public void getBooks(@Suspended final AsyncResponse response,
+ public void getBooks(@Suspended final AsyncResponse response,
@Context final TracerContext tracing) throws Exception {
tracing.continueSpan(new Traceable<Void>() {
@Override
@@ -101,25 +101,25 @@ public class Catalog {
return null;
}
}));
-
+
return null;
}
});
}
-
+
@GET
@Path("/{id}")
@Produces(MediaType.APPLICATION_JSON)
public JsonObject getBook(@PathParam("id") final String id) throws IOException {
final JsonObject book = store.get(id);
-
+
if (book == null) {
throw new NotFoundException("Book with does not exists: " + id);
}
-
+
return book;
}
-
+
@DELETE
@Path("/{id}")
@Produces(MediaType.APPLICATION_JSON)
@@ -127,7 +127,7 @@ public class Catalog {
if (!store.remove(id)) {
throw new NotFoundException("Book with does not exists: " + id);
}
-
+
return Response.ok().build();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
index bdbd573..d68ba66 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
@@ -30,17 +30,17 @@ import javax.json.JsonObject;
public class CatalogStore {
private final Map<String, String> books = new ConcurrentHashMap<>();
-
+
public CatalogStore() {
}
-
+
public boolean remove(final String key) throws IOException {
return books.remove(key) != null;
}
-
+
public JsonObject get(final String key) throws IOException {
final String title = books.get(key);
-
+
if (title != null) {
return Json.createObjectBuilder()
.add("id", key)
@@ -50,21 +50,21 @@ public class CatalogStore {
return null;
}
-
+
public void put(final String key, final String title) throws IOException {
books.put(key, title);
}
-
+
public JsonArray scan() throws IOException {
final JsonArrayBuilder builder = Json.createArrayBuilder();
-
+
for (final Map.Entry<String, String> entry: books.entrySet()) {
builder.add(Json.createObjectBuilder()
.add("id", entry.getKey())
.add("title", entry.getValue())
);
}
-
+
return builder.build();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java
index 407300b..c57083d 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java
@@ -29,11 +29,11 @@ public class Server {
// Register and map the dispatcher servlet
final ServletHolder servletHolder = new ServletHolder(new CXFNonSpringJaxrsServlet());
- final ServletContextHandler context = new ServletContextHandler();
+ final ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
context.addServlet(servletHolder, "/*");
-
- servletHolder.setInitParameter("javax.ws.rs.Application",
+
+ servletHolder.setInitParameter("javax.ws.rs.Application",
CatalogApplication.class.getName());
server.setHandler(context);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java
index 35110b2..141effc 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java
@@ -50,20 +50,20 @@ import org.apache.cxf.tracing.TracerContext;
public class Catalog {
private final ExecutorService executor = Executors.newFixedThreadPool(2);
private final CatalogStore store;
-
+
public Catalog() {
store = new CatalogStore();
}
-
+
@POST
@Produces(MediaType.APPLICATION_JSON)
- public Response addBook(@Context final UriInfo uriInfo, @Context final TracerContext tracing,
+ public Response addBook(@Context final UriInfo uriInfo, @Context final TracerContext tracing,
@FormParam("title") final String title) {
try {
final String id = UUID.randomUUID().toString();
-
+
executor.submit(
- tracing.wrap("Inserting New Book",
+ tracing.wrap("Inserting New Book",
new Traceable<Void>() {
public Void call(final TracerContext context) throws Exception {
store.put(id, title);
@@ -72,7 +72,7 @@ public class Catalog {
}
)
).get(10, TimeUnit.SECONDS);
-
+
return Response
.created(uriInfo.getRequestUriBuilder().path(id).build())
.build();
@@ -86,10 +86,10 @@ public class Catalog {
.build();
}
}
-
+
@GET
@Produces(MediaType.APPLICATION_JSON)
- public void getBooks(@Suspended final AsyncResponse response,
+ public void getBooks(@Suspended final AsyncResponse response,
@Context final TracerContext tracing) throws Exception {
tracing.continueSpan(new Traceable<Void>() {
@Override
@@ -101,25 +101,25 @@ public class Catalog {
return null;
}
}));
-
+
return null;
}
});
}
-
+
@GET
@Path("/{id}")
@Produces(MediaType.APPLICATION_JSON)
public JsonObject getBook(@PathParam("id") final String id) throws IOException {
final JsonObject book = store.get(id);
-
+
if (book == null) {
throw new NotFoundException("Book with does not exists: " + id);
}
-
+
return book;
}
-
+
@DELETE
@Path("/{id}")
@Produces(MediaType.APPLICATION_JSON)
@@ -127,7 +127,7 @@ public class Catalog {
if (!store.remove(id)) {
throw new NotFoundException("Book with does not exists: " + id);
}
-
+
return Response.ok().build();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
index bdbd573..d68ba66 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
@@ -30,17 +30,17 @@ import javax.json.JsonObject;
public class CatalogStore {
private final Map<String, String> books = new ConcurrentHashMap<>();
-
+
public CatalogStore() {
}
-
+
public boolean remove(final String key) throws IOException {
return books.remove(key) != null;
}
-
+
public JsonObject get(final String key) throws IOException {
final String title = books.get(key);
-
+
if (title != null) {
return Json.createObjectBuilder()
.add("id", key)
@@ -50,21 +50,21 @@ public class CatalogStore {
return null;
}
-
+
public void put(final String key, final String title) throws IOException {
books.put(key, title);
}
-
+
public JsonArray scan() throws IOException {
final JsonArrayBuilder builder = Json.createArrayBuilder();
-
+
for (final Map.Entry<String, String> entry: books.entrySet()) {
builder.add(Json.createObjectBuilder()
.add("id", entry.getKey())
.add("title", entry.getValue())
);
}
-
+
return builder.build();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java
index c2047ee8..b90b3f6 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java
@@ -37,22 +37,22 @@ import demo.jaxrs.tracing.conf.TracingConfiguration;
public final class Client {
private Client() {
}
-
+
public static void main(final String[] args) throws Exception {
final Map<String, String> properties = new HashMap<String, String>();
properties.put(Tracer.SPAN_RECEIVER_CLASSES_KEY, TracingConfiguration.SPAN_RECEIVER.getName());
properties.put(Tracer.SAMPLER_CLASSES_KEY, AlwaysSampler.class.getName());
-
+
final Tracer tracer = new Tracer.Builder("catalog-client")
.conf(HTraceConfiguration.fromMap(properties))
.build();
-
+
final HTraceClientProvider provider = new HTraceClientProvider(tracer);
final Response response = WebClient
.create("http://localhost:9000/catalog", Arrays.asList(provider))
.accept(MediaType.APPLICATION_JSON)
.get();
-
+
System.out.println(response.readEntity(String.class));
response.close();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/conf/TracingConfiguration.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/conf/TracingConfiguration.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/conf/TracingConfiguration.java
index a15c17a..ca86613 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/conf/TracingConfiguration.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/conf/TracingConfiguration.java
@@ -25,9 +25,9 @@ import org.apache.htrace.core.StandardOutSpanReceiver;
public final class TracingConfiguration {
public static final Class<? extends SpanReceiver> SPAN_RECEIVER = StandardOutSpanReceiver.class;
// Apache HBase client still uses Apache HTrace 3.x release branch
- public static final Class<? extends org.apache.htrace.SpanReceiver> HBASE_SPAN_RECEIVER =
+ public static final Class<? extends org.apache.htrace.SpanReceiver> HBASE_SPAN_RECEIVER =
org.apache.htrace.impl.StandardOutSpanReceiver.class;
-
+
private TracingConfiguration() {
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java
index b5017c2..57e66d4 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java
@@ -55,7 +55,7 @@ import demo.jaxrs.tracing.conf.TracingConfiguration;
public class Catalog {
private final ExecutorService executor = Executors.newFixedThreadPool(2);
private final CatalogStore store;
-
+
public Catalog() throws IOException {
final Configuration configuration = HBaseConfiguration.create();
configuration.set("hbase.zookeeper.quorum", "hbase");
@@ -63,16 +63,16 @@ public class Catalog {
configuration.set(SpanReceiverHost.SPAN_RECEIVERS_CONF_KEY, TracingConfiguration.HBASE_SPAN_RECEIVER.getName());
store = new CatalogStore(configuration, "catalog");
}
-
+
@POST
@Produces(MediaType.APPLICATION_JSON)
- public Response addBook(@Context final UriInfo uriInfo, @Context final TracerContext tracing,
+ public Response addBook(@Context final UriInfo uriInfo, @Context final TracerContext tracing,
@FormParam("title") final String title) {
try {
final String id = UUID.randomUUID().toString();
-
+
executor.submit(
- tracing.wrap("Inserting New Book",
+ tracing.wrap("Inserting New Book",
new Traceable<Void>() {
public Void call(final TracerContext context) throws Exception {
store.put(id, title);
@@ -81,7 +81,7 @@ public class Catalog {
}
)
).get(10, TimeUnit.SECONDS);
-
+
return Response
.created(uriInfo.getRequestUriBuilder().path(id).build())
.build();
@@ -95,10 +95,10 @@ public class Catalog {
.build();
}
}
-
+
@GET
@Produces(MediaType.APPLICATION_JSON)
- public void getBooks(@Suspended final AsyncResponse response,
+ public void getBooks(@Suspended final AsyncResponse response,
@Context final TracerContext tracing) throws Exception {
tracing.continueSpan(new Traceable<Void>() {
@Override
@@ -110,25 +110,25 @@ public class Catalog {
return null;
}
}));
-
+
return null;
}
});
}
-
+
@GET
@Path("/{id}")
@Produces(MediaType.APPLICATION_JSON)
public JsonObject getBook(@PathParam("id") final String id) throws IOException {
final JsonObject book = store.get(id);
-
+
if (book == null) {
throw new NotFoundException("Book with does not exists: " + id);
}
-
+
return book;
}
-
+
@DELETE
@Path("/{id}")
@Produces(MediaType.APPLICATION_JSON)
@@ -136,7 +136,7 @@ public class Catalog {
if (!store.remove(id)) {
throw new NotFoundException("Book with does not exists: " + id);
}
-
+
return Response.ok().build();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
index 175e9d5..eb63e8c 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
@@ -53,7 +53,7 @@ public class CatalogApplication extends Application {
throw new RuntimeException("Failed to initaliaze JAX-RS application", ex);
}
}
-
+
private static Map<String, String> getTracingProperties() {
final Map<String, String> properties = new HashMap<String, String>();
properties.put(Tracer.SPAN_RECEIVER_CLASSES_KEY, TracingConfiguration.SPAN_RECEIVER.getName());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
index 060cbbb..6036f15 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
@@ -47,13 +47,13 @@ public class CatalogStore {
private final SpanReceiverHost spanReceiverHost;
private final Connection connection;
private final String tableName;
-
+
public CatalogStore(final Configuration configuration, final String tableName) throws IOException {
this.connection = ConnectionFactory.createConnection(configuration);
this.spanReceiverHost = SpanReceiverHost.getInstance(configuration);
this.tableName = tableName;
}
-
+
public boolean remove(final String key) throws IOException {
try (final Table table = connection.getTable(TableName.valueOf(tableName))) {
if (get(key) != null) {
@@ -62,28 +62,28 @@ public class CatalogStore {
return true;
}
}
-
+
return false;
}
-
+
public JsonObject get(final String key) throws IOException {
try (final Table table = connection.getTable(TableName.valueOf(tableName))) {
final Get get = new Get(Bytes.toBytes(key));
final Result result = table.get(get);
-
+
if (!result.isEmpty()) {
final Cell cell = result.getColumnLatestCell(Bytes.toBytes("c"), Bytes.toBytes("title"));
-
+
return Json.createObjectBuilder()
.add("id", Bytes.toString(CellUtil.cloneRow(cell)))
.add("title", Bytes.toString(CellUtil.cloneValue(cell)))
.build();
}
}
-
+
return null;
}
-
+
public void put(final String key, final String title) throws IOException {
try (final Table table = connection.getTable(TableName.valueOf(tableName))) {
final Put put = new Put(Bytes.toBytes(key));
@@ -91,23 +91,23 @@ public class CatalogStore {
table.put(put);
}
}
-
+
public JsonArray scan() throws IOException {
final JsonArrayBuilder builder = Json.createArrayBuilder();
-
+
try (final Table table = connection.getTable(TableName.valueOf(tableName))) {
final Scan scan = new Scan();
final ResultScanner results = table.getScanner(scan);
for (final Result result: results) {
final Cell cell = result.getColumnLatestCell(Bytes.toBytes("c"), Bytes.toBytes("title"));
-
+
builder.add(Json.createObjectBuilder()
.add("id", Bytes.toString(CellUtil.cloneRow(cell)))
.add("title", Bytes.toString(CellUtil.cloneValue(cell)))
);
}
}
-
+
return builder.build();
}