diff options
author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-09-10 17:32:07 -0400 |
---|---|---|
committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-09-10 17:32:07 -0400 |
commit | 23736c374a31a33406d45e4002b694a120661f62 (patch) | |
tree | 070318a8957eea019c978aab9d0419fa93d6619f /javaSE | |
parent | 2e3f8f94c1828c7f8f4858cde480e24d18d72c6c (diff) | |
download | sdl_android-23736c374a31a33406d45e4002b694a120661f62.tar.gz |
fix warnings in transport part3
Diffstat (limited to 'javaSE')
4 files changed, 7 insertions, 8 deletions
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/TransportManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/TransportManager.java index 1004de5ad..ee08f19de 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/TransportManager.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/TransportManager.java @@ -41,7 +41,6 @@ import com.smartdevicelink.util.DebugTool; import java.util.Collections; import java.util.List; -@SuppressWarnings("unused") public class TransportManager extends TransportManagerBase{ private static final String TAG = "TransportManager"; diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/WebSocketServer.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/WebSocketServer.java index 8f5411ce0..bda85e550 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/WebSocketServer.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/WebSocketServer.java @@ -46,8 +46,8 @@ import java.nio.ByteBuffer; public class WebSocketServer extends org.java_websocket.server.WebSocketServer implements TransportInterface{ private static final String TAG = "WebSocketServer"; - TransportCallback callback; - WebSocketServerConfig config; + final TransportCallback callback; + final WebSocketServerConfig config; WebSocket webSocket; SdlPsm psm; @@ -87,7 +87,7 @@ public class WebSocketServer extends org.java_websocket.server.WebSocketServer i @Override public void write(SdlPacket packet){ - //DebugTool.logInfo(TAG, "Atttempt to write packet " + packet); + //DebugTool.logInfo(TAG, "Attempt to write packet " + packet); if(packet != null && this.webSocket != null && this.webSocket.isOpen()) { diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/WebSocketServerConfig.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/WebSocketServerConfig.java index 23e0b25c1..316375bf3 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/WebSocketServerConfig.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/WebSocketServerConfig.java @@ -39,10 +39,10 @@ public class WebSocketServerConfig extends BaseTransportConfig{ final int port, connectionLostTimeout; SSLConfig sslConfig; /** - * Default constructor for WebsocketConfig + * Default constructor for WebSocketConfig * @param port the port this web socket should listen on * @param connectionLostTimeout the timeout for a connection lost, default would be 60 seconds. If a value less than - * 0 is used, then the websocket will wait indefinitely. + * 0 is used, then the web socket will wait indefinitely. */ public WebSocketServerConfig(int port, int connectionLostTimeout){ this.port = port; diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/utl/SSLWebSocketFactoryGenerator.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/utl/SSLWebSocketFactoryGenerator.java index 95d0ceac2..6ecfa579a 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/utl/SSLWebSocketFactoryGenerator.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/utl/SSLWebSocketFactoryGenerator.java @@ -61,7 +61,7 @@ public class SSLWebSocketFactoryGenerator { private static final String SUNX509 = "SunX509"; public static WebSocketServerFactory generateWebSocketServer(SSLConfig config){ - SSLContext context = null; + SSLContext context; switch (config.getSslCertificateType()){ case SSLConfig.JKS: context = getSSLContextFromJKS(config); @@ -95,7 +95,7 @@ public class SSLWebSocketFactoryGenerator { TrustManagerFactory tmf = TrustManagerFactory.getInstance(SUNX509); tmf.init(ks); - SSLContext sslContext = null; + SSLContext sslContext; sslContext = SSLContext.getInstance(TLS); sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null); return sslContext; |