Fix issues found during reviewfeature/refactor_interfaces

8 files changed, 12 insertions, 20 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java
index 28d046948..0407d0f50 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java
@@ -10,7 +10,6 @@ import com.smartdevicelink.test.SampleRpc;
 import com.smartdevicelink.test.SdlUnitTestContants;
 import com.smartdevicelink.transport.BaseTransportConfig;
 import com.smartdevicelink.transport.MultiplexTransportConfig;
-import com.smartdevicelink.transport.RouterServiceValidator;
 import com.smartdevicelink.util.Version;
 
 import junit.framework.Assert;
@@ -21,13 +20,11 @@ import org.junit.runner.RunWith;
 
 import java.io.ByteArrayOutputStream;
 import java.lang.reflect.Method;
-import java.util.List;
 
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertNotNull;
 import static junit.framework.TestCase.assertNull;
-import static junit.framework.TestCase.assertTrue;
 import static org.mockito.Mockito.mock;
 import static android.support.test.InstrumentationRegistry.getContext;
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockInterfaceBroker.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockInterfaceBroker.java
index 8617ab247..1c7005012 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockInterfaceBroker.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockInterfaceBroker.java
@@ -5,8 +5,6 @@ import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.transport.BaseTransportConfig;
 import com.smartdevicelink.util.Version;
 
-import java.util.List;
-
 /**
  * This is a mock class for testing the following :
  * {@link com.smartdevicelink.streaming.AbstractPacketizer}
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java b/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
index 7d378a47d..f4bdb7136 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Livio, Inc.
+ * Copyright (c) 2017-2020 Livio, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,6 @@ import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-@SuppressWarnings({"WeakerAccess", "deprecation"})
 public class SdlSession extends BaseSdlSession {
     private static final String TAG = "SdlSession";
 
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
index 2075f1581..5b244d344 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
@@ -96,7 +96,7 @@ public class LifecycleManager extends BaseLifecycleManager {
             this.session = new SdlSession(sdlSessionListener, (MultiplexTransportConfig) _transportConfig);
         } else if (_transportConfig != null && _transportConfig.getTransportType().equals(TransportType.TCP)) {
             this.session = new SdlSession(sdlSessionListener, (TCPTransportConfig) _transportConfig);
-        }else{
+        } else {
             DebugTool.logError(TAG,"Unable to create session for transport type");
         }
     }
diff --git a/base/src/main/java/com/smartdevicelink/SdlConnection/BaseSdlSession.java b/base/src/main/java/com/smartdevicelink/SdlConnection/BaseSdlSession.java
index 03dafa250..c3e6158dd 100644
--- a/base/src/main/java/com/smartdevicelink/SdlConnection/BaseSdlSession.java
+++ b/base/src/main/java/com/smartdevicelink/SdlConnection/BaseSdlSession.java
@@ -268,8 +268,8 @@ public abstract class BaseSdlSession implements ISdlProtocol, ISecurityInitializ
     public void onProtocolMessageReceived(ProtocolMessage msg) {
         if (msg.getSessionType().equals(SessionType.CONTROL)) {
             processControlService(msg);
-        }else if(SessionType.RPC.equals(msg.getSessionType())
-                || SessionType.BULK_DATA.equals(msg.getSessionType())){
+        } else if (SessionType.RPC.equals(msg.getSessionType())
+                || SessionType.BULK_DATA.equals(msg.getSessionType())) {
             RPCMessage rpc = RpcConverter.extractRpc(msg, this.sdlProtocol.getProtocolVersion());
             this.sessionListener.onRPCMessageReceived(rpc);
         }
@@ -296,7 +296,7 @@ public abstract class BaseSdlSession implements ISdlProtocol, ISecurityInitializ
     }
 
     @Override
-    public void shutdown(String info){
+    public void shutdown(String info) {
         DebugTool.logInfo(TAG, "Shutdown - " + info);
         this.sessionListener.onTransportDisconnected(info, false, this.transportConfig);
     }
@@ -317,15 +317,15 @@ public abstract class BaseSdlSession implements ISdlProtocol, ISecurityInitializ
      * @return the desired video streaming parameters
      */
     @Override
-    public VideoStreamingParameters getDesiredVideoParams(){
-        if(desiredVideoParams == null){
+    public VideoStreamingParameters getDesiredVideoParams() {
+        if (desiredVideoParams == null) {
             desiredVideoParams = new VideoStreamingParameters();
         }
         return desiredVideoParams;
     }
 
     @Override
-    public void setAcceptedVideoParams(VideoStreamingParameters params){
+    public void setAcceptedVideoParams(VideoStreamingParameters params) {
         this.acceptedVideoParams = params;
     }
 
diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
index f95671098..199cd7a11 100644
--- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
@@ -158,7 +158,7 @@ abstract class BaseLifecycleManager {
      */
     public void startRPCEncryption() {
         if (session != null) {
-            session.startService(SessionType.RPC,true);
+            session.startService(SessionType.RPC, true);
         }
     }
 
@@ -855,7 +855,7 @@ abstract class BaseLifecycleManager {
     }
 
     /* *******************************************************************************************************
-     *************************************** ISdlConnectionListener START ************************************
+     **************************************** ISdlSessionListener START **************************************
      *********************************************************************************************************/
 
     final ISdlSessionListener sdlSessionListener = new ISdlSessionListener() {
diff --git a/base/src/main/java/com/smartdevicelink/protocol/ISdlProtocol.java b/base/src/main/java/com/smartdevicelink/protocol/ISdlProtocol.java
index d75702563..decc8205d 100644
--- a/base/src/main/java/com/smartdevicelink/protocol/ISdlProtocol.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/ISdlProtocol.java
@@ -41,8 +41,6 @@ import com.smartdevicelink.streaming.video.VideoStreamingParameters;
 import com.smartdevicelink.transport.BaseTransportConfig;
 import com.smartdevicelink.util.Version;
 
-import java.util.List;
-
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public interface ISdlProtocol {
 
diff --git a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
index 276801adc..1e259c47b 100644
--- a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
@@ -848,7 +848,7 @@ public class SdlProtocolBase {
      * sent to the protocol listener.
      **/
     protected void handleServiceEndedNAK(SdlPacket packet, SessionType serviceType) {
-        String error = "Service ended NAK received for service type " + serviceType.getName();;
+        String error = "Service ended NAK received for service type " + serviceType.getName();
         if(packet.version >= 5){
             if(DebugTool.isDebugEnabled()) {
                 //Currently this is only during a debugging session. Might pass back in the future
@@ -1071,7 +1071,7 @@ public class SdlProtocolBase {
     }
 
     protected void handleProtocolSessionNAKed(SdlPacket packet, SessionType serviceType) {
-        String error = "Service start NAK received for service type " + serviceType.getName();;
+        String error = "Service start NAK received for service type " + serviceType.getName();
         List<String> rejectedParams = null;
         if(packet.version >= 5){
             if(DebugTool.isDebugEnabled()) {