Added a default SSLFactory for the client

Davidiusdadi · Davidiusdadi · commit b7cab91d73f2 · 2012-09-06T23:05:04.000+02:00
diff --git a/example/SSLClientExample.java b/example/SSLClientExample.java
@@ -1,29 +1,17 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.Socket;
 import java.net.URI;
-import java.nio.channels.ByteChannel;
-import java.nio.channels.SelectionKey;
 import java.security.KeyStore;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLEngine;
 import javax.net.ssl.TrustManagerFactory;
 
-import org.java_websocket.SSLSocketChannel2;
 import org.java_websocket.WebSocket;
-import org.java_websocket.WebSocketAdapter;
-import org.java_websocket.WebSocketFactory;
-import org.java_websocket.WebSocketImpl;
+import org.java_websocket.client.DefaultSSLWebSocketClientFactory;
 import org.java_websocket.client.WebSocketClient;
-import org.java_websocket.drafts.Draft;
 import org.java_websocket.handshake.ServerHandshake;
 
 class WebSocketChatClient extends WebSocketClient {
@@ -90,7 +78,7 @@ public static void main( String[] args ) throws Exception {
 		sslContext = SSLContext.getInstance( "TLS" );
 		sslContext.init( kmf.getKeyManagers(), tmf.getTrustManagers(), null );
 
-		chatclient.setWebSocketFactory( new SSLWebSocketClientFactory( sslContext ) );
+		chatclient.setWebSocketFactory( new DefaultSSLWebSocketClientFactory( sslContext ) );
 
 		chatclient.connect();
 
@@ -101,29 +89,3 @@ public static void main( String[] args ) throws Exception {
 
 	}
 }
-
-class SSLWebSocketClientFactory implements WebSocketFactory {
-	private SSLContext sslcontext;
-	private ExecutorService exec = Executors.newSingleThreadScheduledExecutor();
-
-	SSLWebSocketClientFactory( SSLContext sslContext ) {
-		this.sslcontext = sslContext;
-	}
-
-	@Override
-	public ByteChannel wrapChannel( SelectionKey c ) throws IOException {
-		SSLEngine e = sslcontext.createSSLEngine();
-		e.setUseClientMode( true );
-		return new SSLSocketChannel2( c, e, exec );
-	}
-
-	@Override
-	public WebSocketImpl createWebSocket( WebSocketAdapter a, Draft d, Socket c ) {
-		return new WebSocketImpl( a, d, c );
-	}
-
-	@Override
-	public WebSocketImpl createWebSocket( WebSocketAdapter a, List<Draft> d, Socket s ) {
-		return new WebSocketImpl( a, d, s );
-	}
-}
diff --git a/src/org/java_websocket/client/DefaultSSLWebSocketClientFactory.java b/src/org/java_websocket/client/DefaultSSLWebSocketClientFactory.java
@@ -0,0 +1,50 @@
+package org.java_websocket.client;
+import java.io.IOException;
+import java.net.Socket;
+import java.nio.channels.ByteChannel;
+import java.nio.channels.SelectionKey;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+
+import org.java_websocket.SSLSocketChannel2;
+import org.java_websocket.WebSocketAdapter;
+import org.java_websocket.WebSocketImpl;
+import org.java_websocket.client.WebSocketClient.WebSocketClientFactory;
+import org.java_websocket.drafts.Draft;
+
+
+public class DefaultSSLWebSocketClientFactory implements WebSocketClientFactory {
+	protected SSLContext sslcontext;
+	protected ExecutorService exec;
+
+	public DefaultSSLWebSocketClientFactory( SSLContext sslContext ) {
+		this.sslcontext = sslContext;
+		exec = Executors.newSingleThreadScheduledExecutor();
+	}
+
+	public DefaultSSLWebSocketClientFactory( SSLContext sslContext , ExecutorService exec ) {
+		this.sslcontext = sslContext;
+		this.exec = exec;
+	}
+
+	@Override
+	public ByteChannel wrapChannel( SelectionKey c, String host, int port ) throws IOException {
+		SSLEngine e = sslcontext.createSSLEngine( host, port );
+		e.setUseClientMode( true );
+		return new SSLSocketChannel2( c, e, exec );
+	}
+
+	@Override
+	public WebSocketImpl createWebSocket( WebSocketAdapter a, Draft d, Socket c ) {
+		return new WebSocketImpl( a, d, c );
+	}
+
+	@Override
+	public WebSocketImpl createWebSocket( WebSocketAdapter a, List<Draft> d, Socket s ) {
+		return new WebSocketImpl( a, d, s );
+	}
+}
