You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/05/31 15:32:23 UTC
svn commit: r1344718 - in /camel/trunk/components:
camel-websocket/src/main/java/org/apache/camel/component/websocket/
camel-websocket/src/test/java/org/apache/camel/component/websocket/
camel-zookeeper/src/test/java/org/apache/camel/component/zookeepe...
Author: hadrian
Date: Thu May 31 13:32:22 2012
New Revision: 1344718
URL: http://svn.apache.org/viewvc?rev=1344718&view=rev
Log:
CS fixes
Modified:
camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java
camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketConstants.java
camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java
camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java
camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java
camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java
Modified: camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java?rev=1344718&r1=1344717&r2=1344718&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java (original)
+++ camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java Thu May 31 13:32:22 2012
@@ -27,6 +27,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.management.MBeanServer;
+import javax.servlet.Servlet;
+
import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
@@ -60,9 +63,6 @@ import org.eclipse.jetty.util.thread.Thr
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.management.MBeanServer;
-import javax.servlet.Servlet;
-
public class WebsocketComponent extends DefaultComponent {
protected static final Logger LOG = LoggerFactory.getLogger(WebsocketComponent.class);
@@ -188,7 +188,7 @@ public class WebsocketComponent extends
server.addConnector(connector);
// Create ServletContextHandler and add it to the Jetty server
- context = createContext(server,connector,endpoint.getHandlers());
+ context = createContext(server, connector, endpoint.getHandlers());
server.setHandler(context);
// Don't provide a Servlet object as Producer/Consumer will create them later on
@@ -348,7 +348,7 @@ public class WebsocketComponent extends
WebsocketComponentServlet servlet;
- if (connectorRef!= null) {
+ if (connectorRef != null) {
String pathSpec = createPathSpec(remaining);
servlet = servlets.get(pathSpec);
if (servlet == null) {
@@ -376,7 +376,7 @@ public class WebsocketComponent extends
WebsocketComponentServlet servlet;
- if (connectorRef!= null) {
+ if (connectorRef != null) {
String pathSpec = createPathSpec(remaining);
servlet = servlets.get(pathSpec);
if (servlet == null) {
@@ -384,15 +384,15 @@ public class WebsocketComponent extends
ServletContextHandler context = (ServletContextHandler)connectorRef.server.getHandler();
servlet = createServlet(sync, pathSpec, servlets, context);
connectorRef.servlet = servlet;
- servlets.put(pathSpec,servlet);
+ servlets.put(pathSpec, servlet);
LOG.debug("WebSocket servlet added for the following path : " + pathSpec + ", to the Jetty Server : " + key);
}
if (consumer != null) {
if (servlet.getConsumer() == null) {
- // TODO - chm - 25/05
- // Why do we have to do a setConsumer on the Servlet ?
- servlet.setConsumer(consumer);
+ // TODO - chm - 25/05
+ // Why do we have to do a setConsumer on the Servlet ?
+ servlet.setConsumer(consumer);
}
}
Modified: camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java?rev=1344718&r1=1344717&r2=1344718&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java (original)
+++ camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java Thu May 31 13:32:22 2012
@@ -16,6 +16,9 @@
*/
package org.apache.camel.component.websocket;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
import javax.servlet.http.HttpServletRequest;
import org.eclipse.jetty.websocket.WebSocket;
@@ -23,9 +26,6 @@ import org.eclipse.jetty.websocket.WebSo
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
public class WebsocketComponentServlet extends WebSocketServlet {
private static final long serialVersionUID = 1L;
private final transient Logger log = LoggerFactory.getLogger(getClass());
Modified: camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketConstants.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketConstants.java?rev=1344718&r1=1344717&r2=1344718&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketConstants.java (original)
+++ camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketConstants.java Thu May 31 13:32:22 2012
@@ -24,10 +24,9 @@ public final class WebsocketConstants {
public static final String CONNECTION_KEY = "websocket.connectionKey";
public static final String SEND_TO_ALL = "websocket.sendToAll";
- public static final String WS_PROTOCOL ="ws";
- public static final String WSS_PROTOCOL ="wss";
+ public static final String WS_PROTOCOL = "ws";
+ public static final String WSS_PROTOCOL = "wss";
private WebsocketConstants() {
};
-
}
Modified: camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java?rev=1344718&r1=1344717&r2=1344718&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java (original)
+++ camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java Thu May 31 13:32:22 2012
@@ -16,6 +16,11 @@
*/
package org.apache.camel.component.websocket;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+import java.util.Map;
+
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -25,11 +30,6 @@ import org.apache.camel.util.ServiceHelp
import org.apache.camel.util.jsse.SSLContextParameters;
import org.eclipse.jetty.server.Handler;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
-import java.util.Map;
-
public class WebsocketEndpoint extends DefaultEndpoint {
private NodeSynchronization sync;
Modified: camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java?rev=1344718&r1=1344717&r2=1344718&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java (original)
+++ camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentRouteExampleTest.java Thu May 31 13:32:22 2012
@@ -16,6 +16,11 @@
*/
package org.apache.camel.component.websocket;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import com.ning.http.client.AsyncHttpClient;
import com.ning.http.client.websocket.WebSocket;
import com.ning.http.client.websocket.WebSocketTextListener;
@@ -24,11 +29,6 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
public class WebsocketComponentRouteExampleTest extends CamelTestSupport {
private static List<String> received = new ArrayList<String>();
Modified: camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java?rev=1344718&r1=1344717&r2=1344718&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java (original)
+++ camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java Thu May 31 13:32:22 2012
@@ -214,11 +214,9 @@ public class WebsocketComponentTest {
Connector connector = new SelectChannelConnector();
connector.setHost("localhost");
connector.setPort(1988);
- context = component.createContext(server,connector,null);
+ context = component.createContext(server, connector, null);
server.addConnector(connector);
server.setHandler(context);
server.start();
}
-
-
}
Modified: camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java?rev=1344718&r1=1344717&r2=1344718&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java (original)
+++ camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java Thu May 31 13:32:22 2012
@@ -16,6 +16,11 @@
*/
package org.apache.camel.component.websocket;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import com.ning.http.client.AsyncHttpClient;
import com.ning.http.client.websocket.WebSocket;
import com.ning.http.client.websocket.WebSocketTextListener;
@@ -26,11 +31,6 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
public class WebsocketProducerRouteExampleTest extends CamelTestSupport {
private static List<String> received = new ArrayList<String>();
@@ -72,7 +72,7 @@ public class WebsocketProducerRouteExamp
}).build()).get();
// Send message to the direct endpoint
- producer.sendBodyAndHeader("Beer on stock at Apache Mall",WebsocketConstants.SEND_TO_ALL,"true");
+ producer.sendBodyAndHeader("Beer on stock at Apache Mall", WebsocketConstants.SEND_TO_ALL, "true");
assertTrue(latch.await(10, TimeUnit.SECONDS));
Modified: camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java?rev=1344718&r1=1344717&r2=1344718&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java (original)
+++ camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java Thu May 31 13:32:22 2012
@@ -16,11 +16,21 @@
*/
package org.apache.camel.component.websocket;
+import java.io.IOException;
+import java.net.URL;
+import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import com.ning.http.client.AsyncHttpClient;
import com.ning.http.client.AsyncHttpClientConfig;
import com.ning.http.client.websocket.WebSocket;
import com.ning.http.client.websocket.WebSocketTextListener;
import com.ning.http.client.websocket.WebSocketUpgradeHandler;
+
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -33,15 +43,6 @@ import org.apache.camel.util.jsse.TrustM
import org.junit.Before;
import org.junit.Test;
-import java.io.IOException;
-import java.net.URL;
-import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
public class WebsocketSSLContextInUriRouteExampleTest extends CamelTestSupport {
private static final String NULL_VALUE_MARKER = CamelTestSupport.class.getCanonicalName();
Modified: camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java?rev=1344718&r1=1344717&r2=1344718&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java (original)
+++ camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLRouteExampleTest.java Thu May 31 13:32:22 2012
@@ -16,6 +16,15 @@
*/
package org.apache.camel.component.websocket;
+import java.io.IOException;
+import java.net.URL;
+import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import com.ning.http.client.AsyncHttpClient;
import com.ning.http.client.AsyncHttpClientConfig;
import com.ning.http.client.websocket.WebSocket;
@@ -32,15 +41,6 @@ import org.apache.camel.util.jsse.TrustM
import org.junit.Before;
import org.junit.Test;
-import java.io.IOException;
-import java.net.URL;
-import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
public class WebsocketSSLRouteExampleTest extends CamelTestSupport {
private static final String NULL_VALUE_MARKER = CamelTestSupport.class.getCanonicalName();
Modified: camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java?rev=1344718&r1=1344717&r2=1344718&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java (original)
+++ camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketTwoRoutesExampleTest.java Thu May 31 13:32:22 2012
@@ -16,6 +16,11 @@
*/
package org.apache.camel.component.websocket;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import com.ning.http.client.AsyncHttpClient;
import com.ning.http.client.websocket.WebSocket;
import com.ning.http.client.websocket.WebSocketTextListener;
@@ -24,11 +29,6 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
public class WebsocketTwoRoutesExampleTest extends CamelTestSupport {
private static List<String> received = new ArrayList<String>();
Modified: camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java?rev=1344718&r1=1344717&r2=1344718&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java (original)
+++ camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java Thu May 31 13:32:22 2012
@@ -39,7 +39,7 @@ public class CreateOperationTest extends
@Test
public void createBasic() throws Exception {
- CreateOperation create = new CreateOperation(connection, "/one");
+ CreateOperation create = new CreateOperation(connection, "/one");
OperationResult<String> result = create.get();
assertEquals("/one", result.getResult());