Match LCM apis to SdlManagerfeature/fix_mes

4 files changed, 14 insertions, 18 deletions

diff --git a/javaEE/src/main/java/hello_sdl_ee/Main.java b/javaEE/src/main/java/hello_sdl_ee/Main.java
index 098828383..1105c1bed 100644
--- a/javaEE/src/main/java/hello_sdl_ee/Main.java
+++ b/javaEE/src/main/java/hello_sdl_ee/Main.java
@@ -139,7 +139,7 @@ public class Main {
                                 Show show = new Show();
                                 show.setMainField1("There's snake in my boots");
                                 show.setMainField2("YEET THAT SUCKER!");
-                                lifeCycleManager.sendRpc(show);
+                                lifeCycleManager.sendRPC(show);
 
 
                             }
diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
index 0a24f6093..236838e49 100644
--- a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
+++ b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
@@ -12,8 +12,6 @@ import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.RPCRequest;
 import com.smartdevicelink.proxy.SystemCapabilityManager;
-import com.smartdevicelink.proxy.callbacks.OnServiceEnded;
-import com.smartdevicelink.proxy.callbacks.OnServiceNACKed;
 import com.smartdevicelink.proxy.interfaces.*;
 import com.smartdevicelink.proxy.rpc.*;
 import com.smartdevicelink.proxy.rpc.enums.*;
@@ -93,7 +91,7 @@ public class SdlManager extends BaseSdlManager{
 		public void onServiceStarted(SessionType sessionType){
 
 		}
-		
+
 		@Override
 		public void onServiceEnded(SessionType sessionType){
 
@@ -364,7 +362,7 @@ public class SdlManager extends BaseSdlManager{
 	public void sendRPC(RPCMessage message) {
 
 		if (message instanceof RPCRequest){
-			proxy.sendRpc(message);
+			proxy.sendRPC(message);
 		}
 	}
 
@@ -389,7 +387,7 @@ public class SdlManager extends BaseSdlManager{
 		}
 
 		if (rpcRequestList.size() > 0) {
-			proxy.sendRpcsSequentially(rpcRequestList, listener);
+			proxy.sendSequentialRPCs(rpcRequestList, listener);
 		}
 	}
 
@@ -414,7 +412,7 @@ public class SdlManager extends BaseSdlManager{
 		}
 
 		if (rpcRequestList.size() > 0) {
-			proxy.sendRpcs(rpcRequestList, listener);
+			proxy.sendRPCs(rpcRequestList, listener);
 		}
 	}
 
@@ -562,20 +560,20 @@ public class SdlManager extends BaseSdlManager{
 		@Override
 		public void sendRPCRequest(RPCRequest message){
 			if(message != null){
-				proxy.sendRpc(message);
+				proxy.sendRPC(message);
 			}
 		}
 
 		@Override
 		public void sendRPC(RPCMessage message) {
 			if(message != null){
-				proxy.sendRpc(message);
+				proxy.sendRPC(message);
 			}
 		}
 
 		@Override
 		public void sendRequests(List<? extends RPCRequest> rpcs, OnMultipleRequestListener listener) {
-			proxy.sendRpcs(rpcs, listener);
+			proxy.sendRPCs(rpcs, listener);
 		}
 
 		@Override
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 c2ab7a19b..252a6c72e 100644
--- a/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
+++ b/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
@@ -9,8 +9,6 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.protocol.enums.MessageType;
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.*;
-import com.smartdevicelink.proxy.callbacks.OnServiceEnded;
-import com.smartdevicelink.proxy.callbacks.OnServiceNACKed;
 import com.smartdevicelink.proxy.interfaces.*;
 import com.smartdevicelink.proxy.rpc.*;
 import com.smartdevicelink.proxy.rpc.enums.*;
@@ -112,11 +110,11 @@ public class LifecycleManager extends BaseLifecycleManager {
         return rpcSpecVersion;
     }
 
-    public void sendRpc(RPCMessage message){
+    public void sendRPC(RPCMessage message){
         this.sendRPCMessagePrivate(message);
     }
 
-    public void sendRpcs(List<? extends RPCMessage> messages, OnMultipleRequestListener listener){
+    public void sendRPCs(List<? extends RPCMessage> messages, OnMultipleRequestListener listener){
         if(messages != null ){
             for(RPCMessage message : messages){
                 if(message instanceof RPCRequest){
@@ -135,7 +133,7 @@ public class LifecycleManager extends BaseLifecycleManager {
         }
     }
 
-    public void sendRpcsSequentially(List<? extends RPCMessage> messages, OnMultipleRequestListener listener){
+    public void sendSequentialRPCs(List<? extends RPCMessage> messages, OnMultipleRequestListener listener){
        if (messages != null){
            int requestCount = messages.size();
 
@@ -163,7 +161,7 @@ public class LifecycleManager extends BaseLifecycleManager {
                                listener.onUpdate(messages.size());
                            }
                            // recurse after successful response of RPC
-                           sendRpcsSequentially(messages, listener);
+                           sendSequentialRPCs(messages, listener);
                        }
                    }
 
@@ -827,7 +825,7 @@ public class LifecycleManager extends BaseLifecycleManager {
 
         @Override
         public void sendRequests(List<? extends RPCRequest> rpcs, OnMultipleRequestListener listener) {
-            LifecycleManager.this.sendRpcs(rpcs,listener);
+            LifecycleManager.this.sendRPCs(rpcs,listener);
         }
 
         @Override
diff --git a/javaSE/src/main/java/hello_sdl/Main.java b/javaSE/src/main/java/hello_sdl/Main.java
index a8c104c69..fd88dc032 100644
--- a/javaSE/src/main/java/hello_sdl/Main.java
+++ b/javaSE/src/main/java/hello_sdl/Main.java
@@ -139,7 +139,7 @@ public class Main {
                                 Show show = new Show();
                                 show.setMainField1("There's snake in my boots");
                                 show.setMainField2("YEET THAT SUCKER!");
-                                lifeCycleManager.sendRpc(show);
+                                lifeCycleManager.sendRPC(show);
 
 
                             }