Implement interface refactor into JavaSE

3 files changed, 31 insertions, 54 deletions

diff --git a/base/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java b/base/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
index a031defec..64ee4f795 100644
--- a/base/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
+++ b/base/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
@@ -182,7 +182,7 @@ public class StreamPacketizer extends AbstractPacketizer implements IVideoStream
 		finally
 		{
 			if(_session != null) {
-				_session.endService(_serviceType,_rpcSessionID);
+				_session.endService(_serviceType);
 			}
 
 
diff --git a/javaSE/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java b/javaSE/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
index c1a6dca85..11b4be00f 100644
--- a/javaSE/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
+++ b/javaSE/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
@@ -33,14 +33,15 @@
 package com.smartdevicelink.SdlConnection;
 
 
+import com.smartdevicelink.protocol.SdlPacket;
 import com.smartdevicelink.protocol.SdlProtocol;
 import com.smartdevicelink.protocol.SdlProtocolBase;
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.interfaces.ISdlServiceListener;
 import com.smartdevicelink.transport.BaseTransportConfig;
 import com.smartdevicelink.util.DebugTool;
+import com.smartdevicelink.util.Version;
 
-import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 public class SdlSession extends BaseSdlSession {
@@ -48,9 +49,8 @@ public class SdlSession extends BaseSdlSession {
     private static final String TAG = "SdlSession";
 
 
-    public SdlSession(ISdlConnectionListener listener, BaseTransportConfig config){
+    public SdlSession(ISdlSessionListener listener, BaseTransportConfig config){
        super(listener,config);
-       //FIXME this class needs to move to JavaSE only
     }
 
     @Override
@@ -58,47 +58,46 @@ public class SdlSession extends BaseSdlSession {
         return new SdlProtocol(this, transportConfig);
     }
 
-
     @Override
-    public void onProtocolSessionStarted(SessionType sessionType,
-                                         byte sessionID, byte version, String correlationID, int hashID, boolean isEncrypted) {
-
-        DebugTool.logInfo(TAG, "Protocol session started");
+    public void onServiceStarted(SdlPacket packet, SessionType serviceType, int sessionID, Version version, boolean isEncrypted) {
+        DebugTool.logInfo(TAG, serviceType.getName() + " service started");
 
-        this.sessionId = sessionID;
-        if (sessionType.eq(SessionType.RPC)){
-            sessionHashId = hashID;
+        if(serviceType!= null && serviceType.eq(SessionType.RPC) && this.sessionId == -1){
+            this.sessionId = sessionID;
+            this.sessionListener.onSessionStarted(sessionID, version);
         }
-        if (isEncrypted)
-            encryptedServices.addIfAbsent(sessionType);
-        this.sessionListener.onProtocolSessionStarted(sessionType, sessionID, version, correlationID, hashID, isEncrypted);
-        if(serviceListeners != null && serviceListeners.containsKey(sessionType)){
-            CopyOnWriteArrayList<ISdlServiceListener> listeners = serviceListeners.get(sessionType);
-            for(ISdlServiceListener listener:listeners){
-                listener.onServiceStarted(this, sessionType, isEncrypted);
+
+            if (isEncrypted){
+                encryptedServices.addIfAbsent(serviceType);
             }
-        }
 
+            if (serviceListeners != null && serviceListeners.containsKey(serviceType)) {
+                CopyOnWriteArrayList<ISdlServiceListener> listeners = serviceListeners.get(serviceType);
+                for (ISdlServiceListener listener : listeners) {
+                    listener.onServiceStarted(this, serviceType, isEncrypted);
+                }
+            }
     }
 
     @Override
-    public void onProtocolSessionEnded(SessionType sessionType, byte sessionID,
-                                       String correlationID) {
-        this.sessionListener.onProtocolSessionEnded(sessionType, sessionID, correlationID);
-        if(serviceListeners != null && serviceListeners.containsKey(sessionType)){
-            CopyOnWriteArrayList<ISdlServiceListener> listeners = serviceListeners.get(sessionType);
+    public void onServiceEnded(SdlPacket packet, SessionType serviceType, int sessionID) {
+
+        if(SessionType.RPC.equals(serviceType)){
+            this.sessionListener.onSessionEnded(sessionID);
+        }
+
+        if(serviceListeners != null && serviceListeners.containsKey(serviceType)){
+            CopyOnWriteArrayList<ISdlServiceListener> listeners = serviceListeners.get(serviceType);
             for(ISdlServiceListener listener:listeners){
-                listener.onServiceEnded(this, sessionType);
+                listener.onServiceEnded(this, serviceType);
             }
         }
-        encryptedServices.remove(sessionType);
-    }
 
+        encryptedServices.remove(serviceType);
+    }
 
     @Override
-    public void onProtocolSessionEndedNACKed(SessionType sessionType,
-                                             byte sessionID, String correlationID) {
-        this.sessionListener.onProtocolSessionEndedNACKed(sessionType, sessionID, correlationID);
+    public void onServiceError(SdlPacket packet, SessionType sessionType, int sessionID, String error) {
         if(serviceListeners != null && serviceListeners.containsKey(sessionType)){
             CopyOnWriteArrayList<ISdlServiceListener> listeners = serviceListeners.get(sessionType);
             for(ISdlServiceListener listener:listeners){
@@ -107,25 +106,4 @@ public class SdlSession extends BaseSdlSession {
         }
     }
 
-
-
-
-
-    /* ***********************************************************************************************************************************************************************
-     * *****************************************************************  IProtocol Listener  ********************************************************************************
-     *************************************************************************************************************************************************************************/
-
-     public void onProtocolSessionNACKed(SessionType sessionType, byte sessionID, byte version, String correlationID, List<String> rejectedParams) {
-        this.sessionListener.onProtocolSessionStartedNACKed(sessionType,
-                sessionID, version, correlationID, rejectedParams);
-        if(serviceListeners != null && serviceListeners.containsKey(sessionType)){
-            CopyOnWriteArrayList<ISdlServiceListener> listeners = serviceListeners.get(sessionType);
-            for(ISdlServiceListener listener:listeners){
-                listener.onServiceError(this, sessionType, "Start "+ sessionType.toString() +" Service NAKed");
-            }
-        }
-    }    /* ***********************************************************************************************************************************************************************
-     * *****************************************************************  Security Listener  *********************************************************************************
-     *************************************************************************************************************************************************************************/
-
 }
\ No newline at end of file
diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
index 4cfadf611..cfd472680 100644
--- a/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
+++ b/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
@@ -33,7 +33,6 @@
 package com.smartdevicelink.managers.lifecycle;
 
 import android.support.annotation.RestrictTo;
-import com.smartdevicelink.util.Log;
 
 import com.smartdevicelink.SdlConnection.SdlSession;
 import com.smartdevicelink.exception.SdlException;
@@ -53,7 +52,7 @@ public class LifecycleManager extends BaseLifecycleManager {
     @Override
     void initialize() {
         super.initialize();
-        this.session = new SdlSession(sdlConnectionListener, _transportConfig);
+        this.session = new SdlSession(this.sdlSessionListener, _transportConfig);
     }
 
     @Override