You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2017/09/04 23:48:31 UTC
cxf git commit: Minor fixes: updated README.txt,
addressing all Checkstyle errors (multiple samples)
Repository: cxf
Updated Branches:
refs/heads/master 66e5cca3c -> aad3a62bf
Minor fixes: updated README.txt, addressing all Checkstyle errors (multiple samples)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aad3a62b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aad3a62b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aad3a62b
Branch: refs/heads/master
Commit: aad3a62bf74f3378c4309a611d8b9e498bce14b3
Parents: 66e5cca
Author: reta <dr...@gmail.com>
Authored: Mon Sep 4 19:48:13 2017 -0400
Committer: reta <dr...@gmail.com>
Committed: Mon Sep 4 19:48:13 2017 -0400
----------------------------------------------------------------------
.../java/demo/jaxrs/search/server/Catalog.java | 2 ++
.../samples/jax_rs/tracing_brave/README.txt | 21 ++++++--------------
.../demo/jaxrs/tracing/server/CatalogStore.java | 8 ++++----
.../jaxws/tracing/server/CatalogService.java | 4 ++--
.../tracing/server/impl/CatalogServiceImpl.java | 2 +-
.../demo/ws_rm/common/MessageLossSimulator.java | 3 ++-
6 files changed, 17 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/aad3a62b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
index 2be12de..540b5c5 100644
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
@@ -109,6 +109,7 @@ public class Catalog {
initIndex();
}
+ // CHECKSTYLE:OFF: ReturnCount
@POST
@CrossOriginResourceSharing(allowAllOrigins = true)
@Consumes("multipart/form-data")
@@ -156,6 +157,7 @@ public class Catalog {
}
});
}
+ // CHECKSTYLE:ON: ReturnCount
@GET
@Produces(MediaType.APPLICATION_JSON)
http://git-wip-us.apache.org/repos/asf/cxf/blob/aad3a62b/distribution/src/main/release/samples/jax_rs/tracing_brave/README.txt
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/README.txt b/distribution/src/main/release/samples/jax_rs/tracing_brave/README.txt
index 3a04f91..ceb779f 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/README.txt
@@ -3,22 +3,13 @@ JAX-RS Brave/OpenZipkin Tracing Demo
The demo shows a basic usage of Brave/OpenZipkin distributed tracer with REST based
Web Services using JAX-RS 2.0 (JSR-339). The REST server provides the
-following services:
-
-A RESTful catalog service is provided on URL http://localhost:9000/catalog
-
-A HTTP GET request to URL http://localhost:9000/catalog generates following
-traces:
-
-A HTTP POST request to URL http://localhost:9000/catalog generates following
-traces:
-
-A HTTP GET request to URL http://localhost:9000/catalog/<id> generates following
-traces:
-
-A HTTP DELETE request to URL http://localhost:9000/catalog/<id> generates following
-traces:
+following services at URL http://localhost:9000/catalog:
+ - GET to http://localhost:9000/catalog
+ - POST to http://localhost:9000/catalog
+ - GET to URL http://localhost:9000/catalog/<id>
+ - DELETE to URL http://localhost:9000/catalog/<id>
+
Building and running the demo using Maven
---------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/aad3a62b/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 9b5d656..4ca957c 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
@@ -55,7 +55,7 @@ public class CatalogStore {
}
public boolean remove(final String key) throws IOException {
- try (final Table table = connection.getTable(TableName.valueOf(tableName))) {
+ try (Table table = connection.getTable(TableName.valueOf(tableName))) {
if (get(key) != null) {
final Delete delete = new Delete(Bytes.toBytes(key));
table.delete(delete);
@@ -67,7 +67,7 @@ public class CatalogStore {
}
public JsonObject get(final String key) throws IOException {
- try (final Table table = connection.getTable(TableName.valueOf(tableName))) {
+ try (Table table = connection.getTable(TableName.valueOf(tableName))) {
final Get get = new Get(Bytes.toBytes(key));
final Result result = table.get(get);
@@ -85,7 +85,7 @@ public class CatalogStore {
}
public void put(final String key, final String title) throws IOException {
- try (final Table table = connection.getTable(TableName.valueOf(tableName))) {
+ try (Table table = connection.getTable(TableName.valueOf(tableName))) {
final Put put = new Put(Bytes.toBytes(key));
put.addColumn(Bytes.toBytes("c"), Bytes.toBytes("title"), Bytes.toBytes(title));
table.put(put);
@@ -95,7 +95,7 @@ public class CatalogStore {
public JsonArray scan() throws IOException {
final JsonArrayBuilder builder = Json.createArrayBuilder();
- try (final Table table = connection.getTable(TableName.valueOf(tableName))) {
+ try (Table table = connection.getTable(TableName.valueOf(tableName))) {
final Scan scan = new Scan();
final ResultScanner results = table.getScanner(scan);
for (final Result result: results) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aad3a62b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/CatalogService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/CatalogService.java b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/CatalogService.java
index 5d2c1de..5fa7410 100644
--- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/CatalogService.java
+++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/CatalogService.java
@@ -24,6 +24,6 @@ import javax.jws.WebService;
@WebService
public interface CatalogService {
void addBook(Book book);
- Book getBook(final String id);
- void deleteBook(final String id);
+ Book getBook(String id);
+ void deleteBook(String id);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aad3a62b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java
index 39f94c8..c05ab44 100644
--- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java
+++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java
@@ -55,7 +55,7 @@ public class CatalogServiceImpl implements CatalogService {
executor.submit(() -> {
final Span span = brave.tracer().nextSpan().name("Inserting New Book").start();
- try (final SpanInScope scope = brave.tracer().withSpanInScope(span)) {
+ try (SpanInScope scope = brave.tracer().withSpanInScope(span)) {
books.put(book.getId(), book);
handler.handleResponse(response);
} finally {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aad3a62b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java
index 148ad38..ee274b4 100644
--- a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java
+++ b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java
@@ -50,7 +50,7 @@ public class MessageLossSimulator extends AbstractPhaseInterceptor<Message> {
addBefore(MessageSenderInterceptor.class.getName());
}
-
+ // CHECKSTYLE:OFF: ReturnCount
public void handleMessage(Message message) throws Fault {
AddressingProperties maps =
RMContextUtils.retrieveMAPs(message, false, true);
@@ -96,6 +96,7 @@ public class MessageLossSimulator extends AbstractPhaseInterceptor<Message> {
});
}
+ // CHECKSTYLE:ON: ReturnCount
private class WrappedOutputStream extends AbstractWrappedOutputStream {