You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/07/26 17:37:13 UTC
cxf git commit: Re-enable checkstyle
Repository: cxf
Updated Branches:
refs/heads/master 3b9898a0c -> 7facb09bd
Re-enable checkstyle
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7facb09b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7facb09b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7facb09b
Branch: refs/heads/master
Commit: 7facb09bd371501dbde438fcef82dfb4a0d98f6f
Parents: 3b9898a
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Jul 26 13:36:56 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jul 26 13:36:56 2017 -0400
----------------------------------------------------------------------
rt/rs/sse/pom.xml | 10 --------
.../jaxrs/sse/client/InboundSseEventImpl.java | 22 +++++++++--------
.../sse/client/InboundSseEventProcessor.java | 9 +++----
.../sse/client/SseEventSourceBuilderImpl.java | 10 ++++----
.../jaxrs/sse/client/SseEventSourceImpl.java | 25 ++++++++++----------
5 files changed, 35 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7facb09b/rt/rs/sse/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/sse/pom.xml b/rt/rs/sse/pom.xml
index 745a493..c53d504 100644
--- a/rt/rs/sse/pom.xml
+++ b/rt/rs/sse/pom.xml
@@ -68,14 +68,4 @@
<artifactId>atmosphere-runtime</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/7facb09b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/InboundSseEventImpl.java
----------------------------------------------------------------------
diff --git a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/InboundSseEventImpl.java b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/InboundSseEventImpl.java
index 9479e1c..8a9d8aa 100644
--- a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/InboundSseEventImpl.java
+++ b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/InboundSseEventImpl.java
@@ -60,19 +60,19 @@ public class InboundSseEventImpl implements InboundSseEvent {
this.name = name;
}
- Builder id(String id) {
- this.id = id;
+ Builder id(String i) {
+ this.id = i;
return this;
}
- Builder comment(String comment) {
- this.comment = comment;
+ Builder comment(String cmt) {
+ this.comment = cmt;
return this;
}
- Builder reconnectDelay(String reconnectDelay) {
+ Builder reconnectDelay(String rd) {
try {
- this.reconnectDelay = OptionalLong.of(Long.parseLong(reconnectDelay));
+ this.reconnectDelay = OptionalLong.of(Long.parseLong(rd));
} catch (final NumberFormatException ex) {
LOG.warning("Unable to parse reconnectDelay, long number expected: " + ex.getMessage());
}
@@ -80,8 +80,8 @@ public class InboundSseEventImpl implements InboundSseEvent {
return this;
}
- Builder data(String data) {
- this.data = data;
+ Builder data(String d) {
+ this.data = d;
return this;
}
@@ -91,8 +91,10 @@ public class InboundSseEventImpl implements InboundSseEvent {
}
}
- InboundSseEventImpl(String id, String name, String comment, long reconnectDelay, boolean reconnectDelaySet,
+ //CHECKSTYLE:OFF
+ InboundSseEventImpl(String id, String name, String comment, long reconnectDelay, boolean reconnectDelaySet,
String data, ClientProviderFactory factory, Message message) {
+ //CHECKSTYLE:ON
this.id = id;
this.name = name;
this.comment = comment;
@@ -175,7 +177,7 @@ public class InboundSseEventImpl implements InboundSseEvent {
throw new RuntimeException("No suitable message body reader for class: " + messageType.getName());
}
- try (final ByteArrayInputStream is = new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8))) {
+ try (ByteArrayInputStream is = new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8))) {
return reader.readFrom(messageType, type, annotations, mediaType, headers, is);
} catch (final IOException ex) {
throw new RuntimeException("Unable to read data of type " + messageType.getName(), ex);
http://git-wip-us.apache.org/repos/asf/cxf/blob/7facb09b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/InboundSseEventProcessor.java
----------------------------------------------------------------------
diff --git a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/InboundSseEventProcessor.java b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/InboundSseEventProcessor.java
index e5659f5..80a34cd 100644
--- a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/InboundSseEventProcessor.java
+++ b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/InboundSseEventProcessor.java
@@ -51,7 +51,7 @@ public class InboundSseEventProcessor {
private final InboundSseEventListener listener;
private final ExecutorService executor;
- private volatile boolean closed = false;
+ private volatile boolean closed;
protected InboundSseEventProcessor(Endpoint endpoint, InboundSseEventListener listener) {
this.endpoint = endpoint;
@@ -77,11 +77,11 @@ public class InboundSseEventProcessor {
private Callable<?> process(Response response, InputStream is, ClientProviderFactory factory, Message message) {
return () -> {
- try (final BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
- String line = null;
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
+ String line = reader.readLine();
InboundSseEventImpl.Builder builder = null;
- while ((line = reader.readLine()) != null && !Thread.interrupted() && !closed) {
+ while (line != null && !Thread.interrupted() && !closed) {
if (!StringUtils.isEmpty(line) && line.startsWith(EVENT)) {
if (builder == null) {
builder = new InboundSseEventImpl.Builder(line.substring(EVENT.length()));
@@ -101,6 +101,7 @@ public class InboundSseEventProcessor {
builder.data(line.substring(DATA.length()));
}
}
+ line = reader.readLine();
}
if (builder != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/7facb09b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceBuilderImpl.java
----------------------------------------------------------------------
diff --git a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceBuilderImpl.java b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceBuilderImpl.java
index 5727d56..685d8c2 100644
--- a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceBuilderImpl.java
+++ b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceBuilderImpl.java
@@ -36,15 +36,15 @@ public class SseEventSourceBuilderImpl extends SseEventSource.Builder {
}
@Override
- public Builder reconnectingEvery(long delay, TimeUnit unit) {
- this.delay = delay;
- this.unit = unit;
+ public Builder reconnectingEvery(long tdelay, TimeUnit tunit) {
+ this.delay = tdelay;
+ this.unit = tunit;
return this;
}
@Override
- protected Builder target(WebTarget target) {
- this.target = target;
+ protected Builder target(WebTarget tgt) {
+ this.target = tgt;
return this;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/7facb09b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImpl.java
----------------------------------------------------------------------
diff --git a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImpl.java b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImpl.java
index c932a60..ad002c8 100644
--- a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImpl.java
+++ b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/client/SseEventSourceImpl.java
@@ -94,11 +94,11 @@ public class SseEventSourceImpl implements SseEventSource {
private final Runnable onComplete;
InboundSseEventListenerImpl(Consumer<InboundSseEvent> e) {
- this(e, ex -> {}, () -> {});
+ this(e, ex -> { }, () -> { });
}
InboundSseEventListenerImpl(Consumer<InboundSseEvent> e, Consumer<Throwable> t) {
- this(e, t, () -> {});
+ this(e, t, () -> { });
}
InboundSseEventListenerImpl(Consumer<InboundSseEvent> e, Consumer<Throwable> t, Runnable c) {
@@ -223,7 +223,7 @@ public class SseEventSourceImpl implements SseEventSource {
}
@Override
- public boolean close(long timeout, TimeUnit unit) {
+ public boolean close(long timeout, TimeUnit tunit) {
if (state.get() == SseSourceState.CLOSED) {
return true;
}
@@ -243,12 +243,12 @@ public class SseEventSourceImpl implements SseEventSource {
return true;
}
- return processor.close(timeout, unit);
+ return processor.close(timeout, tunit);
}
- private void scheduleReconnect(long delay, TimeUnit unit, String lastEventId) {
+ private void scheduleReconnect(long tdelay, TimeUnit tunit, String lastEventId) {
// If delay == RECONNECT_NOT_SET, no reconnection attempt should be performed
- if (delay < 0 || executor == null) {
+ if (tdelay < 0 || executor == null) {
return;
}
@@ -258,9 +258,10 @@ public class SseEventSourceImpl implements SseEventSource {
}
// If the connection was still on connecting state, just try to reconnect
- if (state.get() != SseSourceState.CONNECTING && !state.compareAndSet(SseSourceState.OPEN, SseSourceState.CONNECTING)) {
- throw new IllegalStateException("The SseEventSource is not opened, but in " + state.get() +
- " state, unable to reconnect");
+ if (state.get() != SseSourceState.CONNECTING
+ && !state.compareAndSet(SseSourceState.OPEN, SseSourceState.CONNECTING)) {
+ throw new IllegalStateException("The SseEventSource is not opened, but in " + state.get()
+ + " state, unable to reconnect");
}
executor.schedule(() -> {
@@ -269,9 +270,9 @@ public class SseEventSourceImpl implements SseEventSource {
LOG.fine("Reestablishing SSE connection to " + target.getUri());
connect(lastEventId);
}
- }, delay, unit);
+ }, tdelay, tunit);
- LOG.fine("The reconnection attempt to " + target.getUri() + " is scheduled in " +
- unit.toMillis(delay) + "ms");
+ LOG.fine("The reconnection attempt to " + target.getUri() + " is scheduled in "
+ + tunit.toMillis(tdelay) + "ms");
}
}