Author: markt
Date: Sun Sep 7 22:23:01 2014
New Revision: 1623236
URL: http://svn.apache.org/r1623236
Log:
Fix some checkstyle GenericWhitespace issues.
Modified:
tomcat/trunk/java/org/apache/el/stream/Stream.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
Modified: tomcat/trunk/java/org/apache/el/stream/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/stream/Stream.java?rev=1623236&r1=1623235&r2=1623236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/stream/Stream.java (original)
+++ tomcat/trunk/java/org/apache/el/stream/Stream.java Sun Sep 7 22:23:01 2014
@@ -37,7 +37,7 @@ public class Stream {
private final Iterator<Object> iterator;
- public Stream(Iterator<Object > iterator) {
+ public Stream(Iterator<Object> iterator) {
this.iterator = iterator;
}
@@ -468,7 +468,7 @@ public class Stream {
private static class LambdaExpressionComparator
- implements Comparator<Object>{
+ implements Comparator<Object> {
private final LambdaExpression le;
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1623236&r1=1623235&r2=1623236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Sun
Sep 7 22:23:01 2014
@@ -327,7 +327,7 @@ public class WsWebSocketContainer
WsSession wsSession = new WsSession(endpoint, wsRemoteEndpointClient,
this, null, null, null, null, null, subProtocol,
- Collections.<String, String> emptyMap(), secure,
+ Collections.<String,String>emptyMap(), secure,
clientEndpointConfiguration);
WsFrameClient wsFrameClient = new WsFrameClient(response, channel,
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java?rev=1623236&r1=1623235&r2=1623236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointClient.java
Sun Sep 7 22:23:01 2014
@@ -36,7 +36,7 @@ public class PojoEndpointClient extends
setPojo(pojo);
setMethodMapping(
new PojoMethodMapping(pojo.getClass(), decoders, null));
- setPathParameters(Collections.<String, String> emptyMap());
+ setPathParameters(Collections.<String,String>emptyMap());
}
@Override
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java?rev=1623236&r1=1623235&r2=1623236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBinary.java
Sun Sep 7 22:23:01 2014
@@ -25,7 +25,7 @@ import javax.websocket.Session;
* ByteBuffer specific concrete implementation for handling partial messages.
*/
public class PojoMessageHandlerPartialBinary
- extends PojoMessageHandlerPartialBase<ByteBuffer>{
+ extends PojoMessageHandlerPartialBase<ByteBuffer> {
public PojoMessageHandlerPartialBinary(Object pojo, Method method,
Session session, Object[] params, int indexPayload, boolean
convert,
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java?rev=1623236&r1=1623235&r2=1623236&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialText.java
Sun Sep 7 22:23:01 2014
@@ -24,7 +24,7 @@ import javax.websocket.Session;
* Text specific concrete implementation for handling partial messages.
*/
public class PojoMessageHandlerPartialText
- extends PojoMessageHandlerPartialBase<String>{
+ extends PojoMessageHandlerPartialBase<String> {
public PojoMessageHandlerPartialText(Object pojo, Method method,
Session session, Object[] params, int indexPayload, boolean
convert,
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1623236&r1=1623235&r2=1623236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Sun Sep 7 22:23:01 2014
@@ -336,8 +336,7 @@ public class WsServerContainer extends W
// Check an exact match. Simple case as there are no templates.
ServerEndpointConfig sec = configExactMatchMap.get(path);
if (sec != null) {
- return new WsMappingResult(sec,
- Collections.<String, String> emptyMap());
+ return new WsMappingResult(sec, Collections.<String,
String>emptyMap());
}
// No exact match. Need to look for template matches.
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java?rev=1623236&r1=1623235&r2=1623236&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java Sun Sep 7
22:23:01 2014
@@ -140,14 +140,11 @@ public class TestUtil {
}
- private abstract static class GenericMessageHandler<T>
- implements MessageHandler.Whole<T> {
+ private abstract static class GenericMessageHandler<T> implements
MessageHandler.Whole<T> {
}
- private static class GenericSubMessageHandler
- extends GenericMessageHandler<String>{
-
+ private static class GenericSubMessageHandler extends
GenericMessageHandler<String> {
@Override
public void onMessage(String message) {
// NO-OP
@@ -242,8 +239,7 @@ public class TestUtil {
}
- private static class GenericSubEncoder
- extends GenericEncoder<String>{
+ private static class GenericSubEncoder extends GenericEncoder<String> {
@Override
public String encode(String object) throws EncodeException {
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java?rev=1623236&r1=1623235&r2=1623236&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
Sun Sep 7 22:23:01 2014
@@ -69,14 +69,12 @@ public class TestEncodingDecoding extend
public void testProgrammaticEndPoints() throws Exception{
Tomcat tomcat = getTomcatInstance();
// Must have a real docBase - just use temp
- Context ctx =
- tomcat.addContext("", System.getProperty("java.io.tmpdir"));
+ Context ctx = tomcat.addContext("",
System.getProperty("java.io.tmpdir"));
ctx.addApplicationListener(ProgramaticServerEndpointConfig.class.getName());
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMapping("/", "default");
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
tomcat.start();
@@ -341,8 +339,7 @@ public class TestEncodingDecoding extend
}
- public static class MsgStringMessageHandler
- implements MessageHandler.Whole<MsgString>{
+ public static class MsgStringMessageHandler implements
MessageHandler.Whole<MsgString> {
public static Queue<Object> received = new ConcurrentLinkedQueue<>();
private final Session session;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
