diff options
| -rw-r--r-- | android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java | 10 | ||||
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/transport/CustomTransport.java (renamed from base/src/main/java/com/smartdevicelink/transport/GenericTransport.java) | 8 | ||||
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/transport/CustomTransportConfig.java (renamed from base/src/main/java/com/smartdevicelink/transport/GenericTransportConfig.java) | 12 | ||||
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/transport/TransportManager.java | 4 | ||||
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/transport/enums/TransportType.java | 2 | ||||
| -rw-r--r-- | javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java | 6 |
6 files changed, 19 insertions, 23 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java index fa993e009..309c5edc2 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java @@ -28,7 +28,7 @@ public class TransportTypeTests extends TestCase { String testBluetooth = "BLUETOOTH"; String testMultiplexing = "MULTIPLEX"; String testWebSocketServer = "WEB_SOCKET_SERVER"; - String testGeneric = "GENERIC"; + String testCustom = "CUSTOM"; try { // Comparison Values @@ -37,7 +37,7 @@ public class TransportTypeTests extends TestCase { TransportType expectedBluetoothEnum = TransportType.BLUETOOTH; TransportType expectedMultiplexingEnum = TransportType.MULTIPLEX; TransportType expectedWebSocketServerEnum = TransportType.WEB_SOCKET_SERVER; - TransportType expectedGenericEnum = TransportType.GENERIC; + TransportType expectedCustomEnum = TransportType.CUSTOM; List<TransportType> expectedEnumList = new ArrayList<TransportType>(); expectedEnumList.add(TransportType.BLUETOOTH); @@ -45,7 +45,7 @@ public class TransportTypeTests extends TestCase { expectedEnumList.add(TransportType.USB); expectedEnumList.add(TransportType.MULTIPLEX); expectedEnumList.add(TransportType.WEB_SOCKET_SERVER); - expectedEnumList.add(TransportType.GENERIC); + expectedEnumList.add(TransportType.CUSTOM); TransportType actualNullEnum = TransportType.valueForString(null); TransportType actualTcpEnum = TransportType.valueForString(testTcp); @@ -54,7 +54,7 @@ public class TransportTypeTests extends TestCase { TransportType actualBluetoothEnum = TransportType.valueForString(testBluetooth); TransportType actualMultiplexingEnum = TransportType.valueForString(testMultiplexing); TransportType actualWebSocketServerEnum = TransportType.valueForString(testWebSocketServer); - TransportType actualGenericEnum = TransportType.valueForString(testGeneric); + TransportType actualCustomEnum = TransportType.valueForString(testCustom); List<TransportType> actualEnumList = Arrays.asList(TransportType.values()); @@ -64,7 +64,7 @@ public class TransportTypeTests extends TestCase { assertEquals(Test.MATCH, expectedBluetoothEnum, actualBluetoothEnum); assertEquals(Test.MATCH, expectedMultiplexingEnum, actualMultiplexingEnum); assertEquals(Test.MATCH, expectedWebSocketServerEnum, actualWebSocketServerEnum); - assertEquals(Test.MATCH, expectedGenericEnum, actualGenericEnum); + assertEquals(Test.MATCH, expectedCustomEnum, actualCustomEnum); assertTrue(Test.ARRAY, expectedEnumList.containsAll(actualEnumList) && actualEnumList.containsAll(expectedEnumList)); // Invalid/Null Tests diff --git a/base/src/main/java/com/smartdevicelink/transport/GenericTransport.java b/base/src/main/java/com/smartdevicelink/transport/CustomTransport.java index f0774dbbc..6e029d1b5 100644 --- a/base/src/main/java/com/smartdevicelink/transport/GenericTransport.java +++ b/base/src/main/java/com/smartdevicelink/transport/CustomTransport.java @@ -39,8 +39,8 @@ import com.smartdevicelink.util.DebugTool; import java.nio.ByteBuffer; -public abstract class GenericTransport implements TransportInterface{ - private static final String TAG = "GenericTransport"; +public abstract class CustomTransport implements TransportInterface{ + private static final String TAG = "CustomTransport"; final TransportRecord transportRecord; final SdlPsm psm; @@ -48,10 +48,10 @@ public abstract class GenericTransport implements TransportInterface{ - public GenericTransport (String address) { + public CustomTransport(String address) { //Creates a callback for when packets psm = new SdlPsm(); - transportRecord = new TransportRecord(TransportType.GENERIC,address); + transportRecord = new TransportRecord(TransportType.CUSTOM,address); } public TransportRecord getTransportRecord(){ diff --git a/base/src/main/java/com/smartdevicelink/transport/GenericTransportConfig.java b/base/src/main/java/com/smartdevicelink/transport/CustomTransportConfig.java index 13cce7749..af0613aa1 100644 --- a/base/src/main/java/com/smartdevicelink/transport/GenericTransportConfig.java +++ b/base/src/main/java/com/smartdevicelink/transport/CustomTransportConfig.java @@ -34,20 +34,20 @@ package com.smartdevicelink.transport; import com.smartdevicelink.transport.enums.TransportType; -public class GenericTransportConfig extends BaseTransportConfig { +public class CustomTransportConfig extends BaseTransportConfig { - final GenericTransport genericTransport; + final CustomTransport customTransport; - public GenericTransportConfig(GenericTransport genericTransport){ - this.genericTransport = genericTransport; + public CustomTransportConfig(CustomTransport customTransport){ + this.customTransport = customTransport; } @Override public TransportType getTransportType() { - return TransportType.GENERIC; + return TransportType.CUSTOM; } public TransportInterface getTransportInterface(){ - return this.genericTransport; + return this.customTransport; } } diff --git a/base/src/main/java/com/smartdevicelink/transport/TransportManager.java b/base/src/main/java/com/smartdevicelink/transport/TransportManager.java index ed7a05d9f..aafaefe1b 100644 --- a/base/src/main/java/com/smartdevicelink/transport/TransportManager.java +++ b/base/src/main/java/com/smartdevicelink/transport/TransportManager.java @@ -63,8 +63,8 @@ public class TransportManager extends TransportManagerBase{ case WEB_SOCKET_SERVER: transport = new WebSocketServer2((WebSocketServerConfig)config, new SingleTransportCallbackImpl(new TransportRecord(TransportType.WEB_SOCKET_SERVER,"127.0.0.1:"+((WebSocketServerConfig)config).port))); break; - case GENERIC: - transport = ((GenericTransportConfig) config).getTransportInterface(); + case CUSTOM: + transport = ((CustomTransportConfig) config).getTransportInterface(); transport.setCallback(new SingleTransportCallbackImpl(transport.getTransportRecord())); break; } diff --git a/base/src/main/java/com/smartdevicelink/transport/enums/TransportType.java b/base/src/main/java/com/smartdevicelink/transport/enums/TransportType.java index 86b974c46..c3c68a82c 100644 --- a/base/src/main/java/com/smartdevicelink/transport/enums/TransportType.java +++ b/base/src/main/java/com/smartdevicelink/transport/enums/TransportType.java @@ -27,7 +27,7 @@ public enum TransportType { * This transport is setup to be essentially a proxy to a different transport. It allows a developer to create a
* custom transport without much effort.
*/
- GENERIC,
+ CUSTOM,
;
diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java index e8fa1d101..5c5e50662 100644 --- a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java +++ b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java @@ -19,7 +19,6 @@ import com.smartdevicelink.proxy.interfaces.*; import com.smartdevicelink.proxy.rpc.*; import com.smartdevicelink.proxy.rpc.enums.*; import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener; -import com.smartdevicelink.proxy.rpc.listeners.OnPutFileUpdateListener; import com.smartdevicelink.proxy.rpc.listeners.OnRPCListener; import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener; import com.smartdevicelink.security.SdlSecurityBase; @@ -27,13 +26,10 @@ import com.smartdevicelink.streaming.audio.AudioStreamingCodec; import com.smartdevicelink.streaming.audio.AudioStreamingParams; import com.smartdevicelink.streaming.video.VideoStreamingParameters; import com.smartdevicelink.transport.BaseTransportConfig; -import com.smartdevicelink.transport.WebSocketServerConfig; import com.smartdevicelink.transport.enums.TransportType; import com.smartdevicelink.util.DebugTool; import com.smartdevicelink.util.Version; -import java.io.InputStream; -import java.io.OutputStream; import java.util.ArrayList; import java.util.List; import java.util.Vector; @@ -520,7 +516,7 @@ public class SdlManager extends BaseSdlManager{ Log.i(TAG, "start"); if (proxy == null) { if (transport != null - && (transport.getTransportType().equals(TransportType.WEB_SOCKET_SERVER) || transport.getTransportType().equals(TransportType.GENERIC))) { + && (transport.getTransportType().equals(TransportType.WEB_SOCKET_SERVER) || transport.getTransportType().equals(TransportType.CUSTOM))) { //Do the thing LifecycleManager.AppConfig appConfig = new LifecycleManager.AppConfig(); |