diff options
| author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-09-16 13:47:38 -0400 |
|---|---|---|
| committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-09-16 13:47:38 -0400 |
| commit | ca572ffcc60b274b99236da4f6f46649062e32df (patch) | |
| tree | a7706c5e0d56897af0ee7d4e63b029dc7a0d13a3 | |
| parent | e297e68fd68e2302dc2d6fcd7b86798a863f7177 (diff) | |
| parent | de8e5c9a71ba2c4c793bcf6fcccbb964fe25853a (diff) | |
| download | sdl_android-ca572ffcc60b274b99236da4f6f46649062e32df.tar.gz | |
Merge branch 'develop' into feature/issue_1448_generate_deprecated_javadocfeature/issue_1448_generate_deprecated_javadoc
402 files changed, 1749 insertions, 1646 deletions
diff --git a/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java index 3c4fabc57..69a86129a 100755 --- a/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java +++ b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java @@ -2,13 +2,13 @@ package com.sdl.hellosdlandroid; import android.content.Intent; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; +import androidx.appcompat.app.AppCompatActivity; + public class MainActivity extends AppCompatActivity { - private static final String TAG = "MainActivity"; - + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlReceiver.java b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlReceiver.java index c850f388c..a63258a49 100755 --- a/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlReceiver.java +++ b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlReceiver.java @@ -9,7 +9,7 @@ import com.smartdevicelink.transport.SdlRouterService; import com.smartdevicelink.util.DebugTool; public class SdlReceiver extends SdlBroadcastReceiver { - private static final String TAG = "SdlBroadcastReciever"; + private static final String TAG = "SdlBroadcastReceiver"; @Override public void onSdlEnabled(Context context, Intent intent) { diff --git a/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java index 2d20be1a3..9a7ef2eeb 100755 --- a/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java +++ b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java @@ -12,11 +12,11 @@ import android.os.IBinder; import android.util.Log; import com.smartdevicelink.managers.CompletionListener; -import com.smartdevicelink.managers.screen.OnButtonListener; import com.smartdevicelink.managers.SdlManager; import com.smartdevicelink.managers.SdlManagerListener; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.managers.lifecycle.LifecycleConfigurationUpdate; +import com.smartdevicelink.managers.screen.OnButtonListener; import com.smartdevicelink.managers.screen.choiceset.ChoiceCell; import com.smartdevicelink.managers.screen.choiceset.ChoiceSet; import com.smartdevicelink.managers.screen.choiceset.ChoiceSetSelectionListener; diff --git a/android/hello_sdl_android/src/main/res.zip b/android/hello_sdl_android/src/main/res.zip Binary files differdeleted file mode 100755 index 16370f43a..000000000 --- a/android/hello_sdl_android/src/main/res.zip +++ /dev/null diff --git a/android/hello_sdl_android/src/main/res/values-v11/styles.xml b/android/hello_sdl_android/src/main/res/values-v11/styles.xml deleted file mode 100755 index a4a95bc46..000000000 --- a/android/hello_sdl_android/src/main/res/values-v11/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ -<resources> - - <!-- - Base application theme for API 11+. This theme completely replaces - AppBaseTheme from res/values/styles.xml on API 11+ devices. - --> - <style name="AppBaseTheme" parent="Theme.AppCompat.Light"> - <!-- API 11 theme customizations can go here. --> - </style> - -</resources> diff --git a/android/hello_sdl_android/src/main/res/values-v14/styles.xml b/android/hello_sdl_android/src/main/res/values-v14/styles.xml deleted file mode 100755 index 664f4f162..000000000 --- a/android/hello_sdl_android/src/main/res/values-v14/styles.xml +++ /dev/null @@ -1,12 +0,0 @@ -<resources> - - <!-- - Base application theme for API 14+. This theme completely replaces - AppBaseTheme from BOTH res/values/styles.xml and - res/values-v11/styles.xml on API 14+ devices. - --> - <style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar"> - <!-- API 14 theme customizations can go here. --> - </style> - -</resources> diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/ManagerUtilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/ManagerUtilityTests.java index fe7d402b9..0257be444 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/ManagerUtilityTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/ManagerUtilityTests.java @@ -10,20 +10,18 @@ import com.smartdevicelink.proxy.rpc.enums.FileType; import com.smartdevicelink.proxy.rpc.enums.ImageFieldName; import com.smartdevicelink.proxy.rpc.enums.TextFieldName; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; - import java.util.ArrayList; import java.util.Arrays; 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.assertTrue; -import static junit.framework.TestCase.assertFalse; /** * This is a unit test class for the SmartDeviceLink library manager class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java index 97361adc9..760a8e40d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java @@ -11,7 +11,6 @@ import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCMessage; import com.smartdevicelink.proxy.RPCRequest; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.GetAppServiceDataResponse; import com.smartdevicelink.proxy.rpc.GetVehicleData; import com.smartdevicelink.proxy.rpc.OnAppServiceData; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java index 1d5d12059..cf6735ab6 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java @@ -9,15 +9,15 @@ import android.util.Log; import androidx.test.platform.app.InstrumentationRegistry;
-import com.smartdevicelink.SdlConnection.SdlSession;
+import com.smartdevicelink.session.SdlSession;
import com.smartdevicelink.managers.CompletionListener;
import com.smartdevicelink.managers.audio.AudioStreamManager.SampleType;
import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
import com.smartdevicelink.protocol.enums.SessionType;
-import com.smartdevicelink.proxy.interfaces.IAudioStreamListener;
-import com.smartdevicelink.proxy.interfaces.ISdl;
-import com.smartdevicelink.proxy.interfaces.ISdlServiceListener;
+import com.smartdevicelink.streaming.audio.IAudioStreamListener;
+import com.smartdevicelink.managers.ISdl;
+import com.smartdevicelink.protocol.ISdlServiceListener;
import com.smartdevicelink.proxy.rpc.AudioPassThruCapabilities;
import com.smartdevicelink.proxy.rpc.enums.AudioType;
import com.smartdevicelink.proxy.rpc.enums.BitsPerSample;
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java index 34cc6bf2a..a99214774 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java @@ -2,6 +2,7 @@ package com.smartdevicelink.managers.file; import android.content.Context; import android.net.Uri; + import androidx.test.ext.junit.runners.AndroidJUnit4; import com.smartdevicelink.managers.BaseSubManager; @@ -10,7 +11,7 @@ import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.managers.file.filetypes.SdlFile; import com.smartdevicelink.proxy.RPCMessage; import com.smartdevicelink.proxy.RPCRequest; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.DeleteFile; import com.smartdevicelink.proxy.rpc.DeleteFileResponse; import com.smartdevicelink.proxy.rpc.ListFiles; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/filetypes/SdlArtworkTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/filetypes/SdlArtworkTests.java index ab27c66cc..3f6f6cff5 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/filetypes/SdlArtworkTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/filetypes/SdlArtworkTests.java @@ -2,7 +2,6 @@ package com.smartdevicelink.managers.file.filetypes; import androidx.test.ext.junit.runners.AndroidJUnit4; -import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.proxy.rpc.enums.StaticIconName; import com.smartdevicelink.test.TestValues; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java index a14e98383..47b6a5cec 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java @@ -10,10 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.protocol.enums.SessionType; import com.smartdevicelink.proxy.RPCMessage; import com.smartdevicelink.proxy.RPCRequest; -import com.smartdevicelink.proxy.interfaces.IAudioStreamListener; -import com.smartdevicelink.proxy.interfaces.ISdl; -import com.smartdevicelink.proxy.interfaces.ISdlServiceListener; -import com.smartdevicelink.proxy.interfaces.IVideoStreamListener; +import com.smartdevicelink.managers.ISdl; +import com.smartdevicelink.protocol.ISdlServiceListener; import com.smartdevicelink.proxy.rpc.AppServiceCapability; import com.smartdevicelink.proxy.rpc.AppServicesCapabilities; import com.smartdevicelink.proxy.rpc.AudioPassThruCapabilities; @@ -54,8 +52,6 @@ import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener; import com.smartdevicelink.proxy.rpc.listeners.OnRPCListener; import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener; import com.smartdevicelink.proxy.rpc.listeners.OnRPCRequestListener; -import com.smartdevicelink.streaming.audio.AudioStreamingCodec; -import com.smartdevicelink.streaming.audio.AudioStreamingParams; import com.smartdevicelink.streaming.video.VideoStreamingParameters; import com.smartdevicelink.test.TestValues; import com.smartdevicelink.test.Validator; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManagerTests.java index 38701bd64..727c043cc 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManagerTests.java @@ -3,6 +3,7 @@ package com.smartdevicelink.managers.lockscreen; import android.content.Context; import android.content.SharedPreferences; import android.graphics.Bitmap; + import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java index 6baf9f7ee..dd606a2c0 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java @@ -1,10 +1,11 @@ package com.smartdevicelink.managers.lockscreen; import android.content.Context; + import androidx.test.ext.junit.runners.AndroidJUnit4; import com.smartdevicelink.protocol.enums.FunctionID; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.OnDriverDistraction; import com.smartdevicelink.proxy.rpc.enums.DriverDistractionState; import com.smartdevicelink.proxy.rpc.enums.HMILevel; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java index d53287b61..973625106 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java @@ -4,7 +4,7 @@ import androidx.annotation.NonNull; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.smartdevicelink.protocol.enums.FunctionID; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.HMIPermissions; import com.smartdevicelink.proxy.rpc.OnHMIStatus; import com.smartdevicelink.proxy.rpc.OnPermissionsChange; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java index 11d8472c2..5e9203e99 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java @@ -1,13 +1,13 @@ package com.smartdevicelink.managers.screen; -import com.livio.taskmaster.Taskmaster; import androidx.test.ext.junit.runners.AndroidJUnit4; +import com.livio.taskmaster.Taskmaster; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.managers.screen.menu.DynamicMenuUpdatesMode; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.enums.FileType; import com.smartdevicelink.proxy.rpc.enums.MetadataType; import com.smartdevicelink.proxy.rpc.enums.TextAlignment; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java index b43be2af6..713aae4fd 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java @@ -10,7 +10,7 @@ import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener; import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager; import com.smartdevicelink.protocol.enums.FunctionID; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.DisplayCapability; import com.smartdevicelink.proxy.rpc.Image; import com.smartdevicelink.proxy.rpc.OnButtonEvent; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SubscribeButtonManagerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SubscribeButtonManagerTest.java index b16889934..e0fcc5d0a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SubscribeButtonManagerTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SubscribeButtonManagerTest.java @@ -5,7 +5,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.proxy.RPCMessage; import com.smartdevicelink.proxy.RPCRequest; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.OnButtonEvent; import com.smartdevicelink.proxy.rpc.OnButtonPress; import com.smartdevicelink.proxy.rpc.SubscribeButton; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java index e5deb7f30..e65911ccb 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java @@ -2,6 +2,7 @@ package com.smartdevicelink.managers.screen; import android.content.Context; import android.net.Uri; + import androidx.test.ext.junit.runners.AndroidJUnit4; import com.livio.taskmaster.Task; @@ -13,7 +14,7 @@ import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener; import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager; import com.smartdevicelink.protocol.enums.FunctionID; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.DisplayCapability; import com.smartdevicelink.proxy.rpc.OnHMIStatus; import com.smartdevicelink.proxy.rpc.TextField; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperationTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperationTest.java index cdfab186c..94f75d764 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperationTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperationTest.java @@ -13,7 +13,7 @@ import com.smartdevicelink.managers.file.MultipleFileCompletionListener; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.managers.file.filetypes.SdlFile; import com.smartdevicelink.proxy.RPCRequest; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.ImageField; import com.smartdevicelink.proxy.rpc.MetadataTags; import com.smartdevicelink.proxy.rpc.SdlMsgVersion; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperationTests.java index abf868876..fb8308e5f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperationTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperationTests.java @@ -37,7 +37,7 @@ package com.smartdevicelink.managers.screen.choiceset; import androidx.test.ext.junit.runners.AndroidJUnit4; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.Choice; import com.smartdevicelink.proxy.rpc.CreateInteractionChoiceSet; import com.smartdevicelink.proxy.rpc.DeleteInteractionChoiceSet; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java index 4e9ba2e6b..482d29b90 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java @@ -40,7 +40,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import com.livio.taskmaster.Taskmaster; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.file.FileManager; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.KeyboardProperties; import com.smartdevicelink.proxy.rpc.enums.HMILevel; import com.smartdevicelink.proxy.rpc.enums.KeyboardLayout; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperationTests.java index e8a9eeb23..ca5c7df56 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperationTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperationTests.java @@ -37,7 +37,7 @@ package com.smartdevicelink.managers.screen.choiceset; import androidx.test.ext.junit.runners.AndroidJUnit4; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.DeleteInteractionChoiceSet; import org.junit.Before; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperationTests.java index 14144758f..f5094917f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperationTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperationTests.java @@ -39,7 +39,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.ImageField; import com.smartdevicelink.proxy.rpc.TextField; import com.smartdevicelink.proxy.rpc.WindowCapability; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperationTests.java index 8e91c3a04..6da649165 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperationTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperationTests.java @@ -42,7 +42,7 @@ import com.livio.taskmaster.Task; import com.livio.taskmaster.Taskmaster; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.CancelInteraction; import com.smartdevicelink.proxy.rpc.KeyboardProperties; import com.smartdevicelink.proxy.rpc.PerformInteraction; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperationTests.java index 37264b865..6eb3a1912 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperationTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperationTests.java @@ -42,7 +42,7 @@ import com.livio.taskmaster.Task; import com.livio.taskmaster.Taskmaster; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.CancelInteraction; import com.smartdevicelink.proxy.rpc.KeyboardProperties; import com.smartdevicelink.proxy.rpc.PerformInteraction; @@ -60,14 +60,8 @@ import org.junit.runner.RunWith; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; - import static junit.framework.TestCase.assertEquals; -import static junit.framework.TestCase.assertFalse; import static junit.framework.TestCase.assertNull; -import static junit.framework.TestCase.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java index b740d303a..08b0deb86 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java @@ -42,7 +42,7 @@ import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCRequest; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.OnCommand; import com.smartdevicelink.proxy.rpc.OnHMIStatus; import com.smartdevicelink.proxy.rpc.SdlMsgVersion; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java index a73c28ef2..a3d07438e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java @@ -37,7 +37,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; import com.smartdevicelink.protocol.enums.FunctionID; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.OnCommand; import com.smartdevicelink.proxy.rpc.OnHMIStatus; import com.smartdevicelink.proxy.rpc.enums.HMILevel; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java index 2a09311e9..c02ba30c4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java @@ -15,8 +15,8 @@ import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener; import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.protocol.enums.SessionType; -import com.smartdevicelink.proxy.interfaces.ISdl; -import com.smartdevicelink.proxy.interfaces.ISdlServiceListener; +import com.smartdevicelink.managers.ISdl; +import com.smartdevicelink.protocol.ISdlServiceListener; import com.smartdevicelink.proxy.rpc.ImageResolution; import com.smartdevicelink.proxy.rpc.OnHMIStatus; import com.smartdevicelink.proxy.rpc.OnTouchEvent; 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 e05767aac..ba6249e40 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 @@ -1,8 +1,9 @@ package com.smartdevicelink.protocol; -import androidx.test.ext.junit.runners.AndroidJUnit4; import android.util.Log; +import androidx.test.ext.junit.runners.AndroidJUnit4; + import com.smartdevicelink.protocol.enums.SessionType; import com.smartdevicelink.security.SdlSecurityBase; import com.smartdevicelink.streaming.video.VideoStreamingParameters; @@ -21,12 +22,12 @@ import org.junit.runner.RunWith; import java.io.ByteArrayOutputStream; import java.lang.reflect.Method; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; 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 org.mockito.Mockito.mock; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; @RunWith(AndroidJUnit4.class) public class SdlProtocolTests { diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlConnection/SdlSessionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlConnection/SdlSessionTests.java index cc5b2f7ab..ac575dfbc 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlConnection/SdlSessionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlConnection/SdlSessionTests.java @@ -1,20 +1,18 @@ package com.smartdevicelink.test.SdlConnection; -import com.smartdevicelink.SdlConnection.SdlSession; +import com.smartdevicelink.session.SdlSession; +import com.smartdevicelink.protocol.ISdlServiceListener; import com.smartdevicelink.protocol.enums.SessionType; -import com.smartdevicelink.proxy.interfaces.ISdlServiceListener; import com.smartdevicelink.test.streaming.MockInterfaceBroker; import com.smartdevicelink.transport.MultiplexTransportConfig; -import com.smartdevicelink.transport.TCPTransportConfig; import junit.framework.TestCase; import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; -import static org.mockito.Mockito.mock; /** * This is a unit test class for the SmartDeviceLink library project class : - * {@link com.smartdevicelink.SdlConnection.SdlSession} + * {@link com.smartdevicelink.session.SdlSession} */ public class SdlSessionTests extends TestCase { diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DriverDistractionCapabilityTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DriverDistractionCapabilityTest.java index 2e98296a1..767c264fa 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DriverDistractionCapabilityTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DriverDistractionCapabilityTest.java @@ -3,9 +3,12 @@ package com.smartdevicelink.test.rpc.datatypes; import com.smartdevicelink.proxy.rpc.DriverDistractionCapability; import com.smartdevicelink.test.JsonUtils; import com.smartdevicelink.test.TestValues; + import junit.framework.TestCase; + import org.json.JSONException; import org.json.JSONObject; + import java.util.Iterator; /** diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java index 88d22cd8d..04a77613e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java @@ -18,6 +18,7 @@ import org.junit.Test; import java.util.Hashtable; import java.util.List; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java index 74efd59e9..01ebf5f8c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java @@ -18,12 +18,12 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java index 2fef7e829..5fce62fe4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java @@ -21,12 +21,12 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java index 2224191dd..525fae442 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java @@ -22,12 +22,12 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CancelInteractionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CancelInteractionTests.java index d2e41f85e..26ddbf7b5 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CancelInteractionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CancelInteractionTests.java @@ -49,11 +49,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CloseApplicationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CloseApplicationTests.java index 62a92acfc..02cc2d718 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CloseApplicationTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CloseApplicationTests.java @@ -49,10 +49,10 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java index 3e8e533e2..799936921 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java @@ -19,12 +19,12 @@ import org.junit.Test; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateWindowTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateWindowTests.java index 733932efb..8f905ac73 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateWindowTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateWindowTests.java @@ -16,11 +16,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java index 20d5fe591..a6defa4b7 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java @@ -15,11 +15,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java index 5174f9789..e6cba8157 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java @@ -15,11 +15,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java index 0fb31ba25..32104b281 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java @@ -15,11 +15,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java index 68adc14fa..4d0358cc6 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteWindowTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteWindowTests.java index c442395bd..e05748b29 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteWindowTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteWindowTests.java @@ -14,11 +14,12 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java index 7b0ecacf9..44c4de760 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java @@ -17,12 +17,12 @@ import org.junit.Test; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java index 88e9fbffd..7e6cd3991 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java @@ -14,11 +14,12 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * Created by austinkirk on 6/6/17. diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java index d97bc0f32..b4cd32af7 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java @@ -15,10 +15,10 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java index f5e7bba89..02e7fb5ff 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java @@ -15,11 +15,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; public class GetAppServiceDataTests extends BaseRpcTests { diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java index 73d15ad6d..f9b8e528f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java @@ -15,11 +15,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java index 450dcba1e..9d358cc8a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java @@ -16,11 +16,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; public class GetFileTests extends BaseRpcTests { diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataConsentTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataConsentTests.java index 2aa7dc593..6d9bc2283 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataConsentTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataConsentTests.java @@ -16,6 +16,7 @@ import org.junit.Test; import java.util.Hashtable; import java.util.List; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java index 4c7f5f461..17d500b6f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java @@ -16,11 +16,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java index 533ff8c50..6eb55d90f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java @@ -16,11 +16,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; public class GetSystemCapabilityTests extends BaseRpcTests { diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java index 467c37b2e..637445ac7 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java @@ -15,12 +15,12 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java index a52d1a644..8a9586a93 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java @@ -16,11 +16,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * Created by austinkirk on 6/6/17. diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java index 92e7286e4..cc5b542a0 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java @@ -15,10 +15,10 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java index 9a9b7b375..bdc8bb9ac 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java @@ -15,11 +15,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; public class PerformAppServiceInteractionTests extends BaseRpcTests { diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java index abbe3d644..a1525c773 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java @@ -23,12 +23,12 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java index 176cc3ec5..89afaa843 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java @@ -23,12 +23,12 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java index 9d0c3ed94..e999cb6d1 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java @@ -17,12 +17,12 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; public class PublishAppServiceTests extends BaseRpcTests { diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java index b70c83794..0e3b39aab 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java @@ -17,11 +17,11 @@ import org.junit.Test; import java.util.Hashtable; import java.util.zip.CRC32; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java index 151f5cc3e..0f9319f24 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java @@ -17,12 +17,12 @@ import org.junit.Test; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java index 665a3dc80..b61687bd7 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java @@ -26,12 +26,12 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReleaseInteriorVehicleDataModuleTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReleaseInteriorVehicleDataModuleTests.java index e786d1786..840eb246d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReleaseInteriorVehicleDataModuleTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReleaseInteriorVehicleDataModuleTests.java @@ -16,11 +16,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; public class ReleaseInteriorVehicleDataModuleTests extends BaseRpcTests { diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java index 68448c5a6..bbb4f8012 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java @@ -18,11 +18,11 @@ import org.junit.Test; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java index e6d8b146d..40d4eb33e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java @@ -20,12 +20,12 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java index 99a74dfae..ad1ad8a2c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java @@ -18,12 +18,12 @@ import org.junit.Test; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java index 5878aad7c..01a391518 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java @@ -15,11 +15,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java index 22118bdb1..f5a080295 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java @@ -17,12 +17,12 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java index 379b1c1ee..abf889104 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java @@ -24,12 +24,12 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java index 1285acafd..ad4bb2780 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java @@ -17,12 +17,12 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java index a60709dba..c4937aa95 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java @@ -19,12 +19,12 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowAppMenuTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowAppMenuTests.java index 3e486bc6a..27d876f14 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowAppMenuTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowAppMenuTests.java @@ -50,11 +50,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java index 85c830214..482c73783 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java @@ -21,12 +21,12 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java index 742d23ff4..14585c439 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java @@ -24,12 +24,12 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java index 32f60d4e5..def35eae2 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java @@ -17,12 +17,12 @@ import org.junit.Test; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java index f0214c78c..b9c89493f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java @@ -20,12 +20,12 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; public class SpeakTests extends BaseRpcTests { diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java index 19b192b31..7cc1ca35c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java @@ -15,6 +15,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java index 7f5113fc7..341eb73d4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java @@ -15,12 +15,12 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java index 2ce400e55..a28d31bbf 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java @@ -15,10 +15,10 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * Created by austinkirk on 6/7/17. diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java index aeb061dc6..dae825cc2 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java @@ -18,12 +18,12 @@ import org.junit.Test; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnpublishAppServiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnpublishAppServiceTests.java index 796fe2a25..7b57be8ac 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnpublishAppServiceTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnpublishAppServiceTests.java @@ -50,11 +50,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java index dec7b0376..66bd76bdb 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java @@ -15,10 +15,10 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java index 97833ce02..74160bf4c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java @@ -16,11 +16,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java index 9ca309030..2ea0dae9b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java @@ -16,12 +16,12 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java index 5d20c8454..fe3aa9ffc 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java index 53dc91fc6..905bed6d8 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java @@ -21,12 +21,12 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java index e4d69e79f..618cb9c45 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java @@ -15,6 +15,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java index 861de0d37..163fec190 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java index 01805fce6..7ff5cfaef 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java index d8f554c53..9a89d8d27 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java @@ -15,11 +15,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java index 2c4bfc651..1dcfd95d6 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CancelInteractionResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CancelInteractionResponseTests.java index a981719e9..fb9374247 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CancelInteractionResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CancelInteractionResponseTests.java @@ -48,6 +48,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java index 6888c589d..1c96e774d 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java @@ -15,9 +15,9 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CloseApplicationResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CloseApplicationResponseTests.java index 6eb9a09a5..135155e6e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CloseApplicationResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CloseApplicationResponseTests.java @@ -48,6 +48,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateWindowResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateWindowResponseTest.java index a06af985b..b50b34221 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateWindowResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateWindowResponseTest.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java index b2e6e27a9..74cd75664 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java index 0e529dc69..42b26d1bd 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java index 24ce266d1..bb0e428e0 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java index 8392f915b..0084305ad 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteWindowResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteWindowResponseTest.java index 347db5ea6..2d4486f21 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteWindowResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteWindowResponseTest.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java index 7bfefbeea..302c01c8e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java @@ -16,6 +16,7 @@ import org.junit.Test; import java.util.Hashtable; import java.util.List; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java index ff23c5ad7..006e6d050 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java index f68a6837b..c9da248f8 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java index 3e1d1f136..49de496e4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java @@ -15,6 +15,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java index ea4d48790..3ff630c93 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java @@ -17,12 +17,12 @@ import org.junit.Test; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java index a4abf011d..867e91cb2 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java @@ -16,11 +16,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataConsentResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataConsentResponseTests.java index 411691bd0..512d324e3 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataConsentResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataConsentResponseTests.java @@ -16,6 +16,7 @@ import org.junit.Test; import java.util.Hashtable; import java.util.List; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java index 80185c05c..af6f2cb4b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java @@ -16,6 +16,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java index ee2b24d1f..827b340e7 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java @@ -16,11 +16,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; public class GetSystemCapabilityResponseTests extends BaseRpcTests { diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java index 818c9b4ce..91e13586a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java @@ -38,12 +38,12 @@ import java.util.Hashtable; import java.util.Iterator; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java index fb123bef4..131aba5fa 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java @@ -18,6 +18,7 @@ import org.junit.Test; import java.util.ArrayList; import java.util.Hashtable; import java.util.List; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java index 7b7bd20ec..67b23ef2b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java @@ -17,12 +17,12 @@ import org.junit.Test; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java index 4280902e2..2278a61a1 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java index 7cff8e766..78f9d258b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java index 32c42c16c..83f4bd734 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java @@ -15,6 +15,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java index 5bb6f923a..197aa13d4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java @@ -17,12 +17,12 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java index e95285db8..6c34c9df4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java index aec63227d..b18bea1c7 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java @@ -19,6 +19,7 @@ import org.junit.Test; import java.util.ArrayList; import java.util.Hashtable; import java.util.List; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java index 862ed5342..4e790a758 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java @@ -31,12 +31,12 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReleaseInteriorVehicleDataModuleResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReleaseInteriorVehicleDataModuleResponseTests.java index 965980a0d..b2ba952b8 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReleaseInteriorVehicleDataModuleResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReleaseInteriorVehicleDataModuleResponseTests.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java index e8d3576e6..b6394fa0a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java index 4e12cb78c..286cb9ad2 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java index 7208eeff4..938d8dbc6 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java index e6f0bf140..5203bb1e8 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java index 63d63dab9..6985ad238 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java @@ -23,12 +23,12 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java index 9765dcfba..825c358cf 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java index 7abcdcecc..9e7fd8129 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java @@ -17,12 +17,12 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java index d8f699b5a..4c4ae89ce 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java @@ -15,9 +15,9 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowAppMenuResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowAppMenuResponseTests.java index 1cfafd319..28cf0b436 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowAppMenuResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowAppMenuResponseTests.java @@ -49,6 +49,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java index aa44a190b..a11e31881 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java index ebd5f41b6..2062c5fe1 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java @@ -15,9 +15,9 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java index f454af9eb..4ea612e2b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java index f2880d3eb..b8f8573cb 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java index 1c58b13bc..ed607231f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java @@ -15,9 +15,9 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java index 79af1baa8..408a0af28 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java @@ -18,11 +18,11 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.fail; /** diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java index 239702805..8a156d12f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java index 9f4e464f4..a52ff7c21 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnpublishAppServiceResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnpublishAppServiceResponseTests.java index 7536dd2a7..474c05cd6 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnpublishAppServiceResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnpublishAppServiceResponseTests.java @@ -49,6 +49,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java index 01aad979c..14c276504 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java index 3cf7d6491..de29a5288 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java @@ -15,9 +15,9 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java index 284090cd5..80c61c284 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java @@ -20,12 +20,12 @@ import org.junit.Test; import java.util.Hashtable; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import static junit.framework.TestCase.fail; -import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; /** * This is a unit test class for the SmartDeviceLink library project class : diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java index 5360c023c..bd962f474 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java index 47951d34c..eaaebf1bd 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java @@ -14,6 +14,7 @@ import org.json.JSONObject; import org.junit.Test; import java.util.Hashtable; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java index aeb73e3de..f2648c7e2 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java @@ -2,7 +2,7 @@ package com.smartdevicelink.test.security; import androidx.test.ext.junit.runners.AndroidJUnit4; -import com.smartdevicelink.SdlConnection.SdlSession; +import com.smartdevicelink.session.SdlSession; import com.smartdevicelink.protocol.enums.SessionType; import com.smartdevicelink.security.SdlSecurityBase; import com.smartdevicelink.test.TestValues; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java index 0cccc48e8..dbec1301e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java @@ -1,6 +1,6 @@ package com.smartdevicelink.test.streaming; -import com.smartdevicelink.SdlConnection.SdlSession; +import com.smartdevicelink.session.SdlSession; import com.smartdevicelink.protocol.enums.SessionType; import com.smartdevicelink.proxy.RPCRequest; import com.smartdevicelink.streaming.IStreamListener; 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 1c7005012..14905fa7d 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 @@ -1,6 +1,6 @@ package com.smartdevicelink.test.streaming; -import com.smartdevicelink.SdlConnection.ISdlSessionListener; +import com.smartdevicelink.session.ISdlSessionListener; import com.smartdevicelink.proxy.RPCMessage; import com.smartdevicelink.transport.BaseTransportConfig; import com.smartdevicelink.util.Version; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java index ca6a77820..77eae6cba 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java @@ -1,6 +1,6 @@ package com.smartdevicelink.test.streaming; -import com.smartdevicelink.SdlConnection.SdlSession; +import com.smartdevicelink.session.SdlSession; import com.smartdevicelink.protocol.enums.SessionType; import com.smartdevicelink.streaming.AbstractPacketizer; import com.smartdevicelink.streaming.IStreamListener; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java index bf6f6a850..7791a1c79 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java @@ -1,9 +1,9 @@ package com.smartdevicelink.test.streaming; -import com.smartdevicelink.SdlConnection.SdlSession; +import com.smartdevicelink.session.SdlSession; import com.smartdevicelink.protocol.ProtocolMessage; import com.smartdevicelink.protocol.enums.SessionType; -import com.smartdevicelink.proxy.interfaces.IVideoStreamListener; +import com.smartdevicelink.streaming.video.IVideoStreamListener; import com.smartdevicelink.streaming.IStreamListener; import com.smartdevicelink.streaming.StreamPacketizer; import com.smartdevicelink.test.TestValues; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/RTPH264PacketizerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/RTPH264PacketizerTest.java index 60fa6fb80..5dfe36e19 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/RTPH264PacketizerTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/RTPH264PacketizerTest.java @@ -33,10 +33,10 @@ package com.smartdevicelink.test.streaming.video; import androidx.test.ext.junit.runners.AndroidJUnit4; -import com.smartdevicelink.SdlConnection.SdlSession; +import com.smartdevicelink.session.SdlSession; import com.smartdevicelink.protocol.ProtocolMessage; import com.smartdevicelink.protocol.enums.SessionType; -import com.smartdevicelink.proxy.interfaces.IVideoStreamListener; +import com.smartdevicelink.streaming.video.IVideoStreamListener; import com.smartdevicelink.streaming.IStreamListener; import com.smartdevicelink.streaming.video.RTPH264Packetizer; import com.smartdevicelink.test.streaming.MockInterfaceBroker; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java index e5b07930e..4a0d7b87f 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java @@ -4,13 +4,14 @@ import android.annotation.TargetApi; import android.content.Context; import android.os.Bundle; import android.os.Looper; -import androidx.test.platform.app.InstrumentationRegistry; import android.view.Display; import android.view.MotionEvent; import android.widget.RelativeLayout; +import androidx.test.platform.app.InstrumentationRegistry; + import com.smartdevicelink.encoder.VirtualDisplayEncoder; -import com.smartdevicelink.proxy.interfaces.IVideoStreamListener; +import com.smartdevicelink.streaming.video.IVideoStreamListener; import com.smartdevicelink.streaming.video.SdlRemoteDisplay; import com.smartdevicelink.streaming.video.VideoStreamingParameters; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java index 35ad87cce..64c2d7b7b 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java @@ -38,6 +38,7 @@ import android.content.pm.PackageInfo; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.os.Bundle; + import androidx.test.ext.junit.runners.AndroidJUnit4; import com.smartdevicelink.R; @@ -50,6 +51,7 @@ import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.Collections; import java.util.List; + import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertFalse; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java index 601895b1c..9deff1ec8 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java @@ -1,6 +1,7 @@ package com.smartdevicelink.test.utl; import android.content.ComponentName; + import androidx.test.ext.junit.runners.AndroidJUnit4; import com.smartdevicelink.util.AndroidTools; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java index e3070cd70..a816d6d87 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java @@ -3,6 +3,7 @@ package com.smartdevicelink.transport; import android.content.ComponentName; import android.content.Intent; import android.os.Parcel; + import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java index d1a359e24..03c71264a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java @@ -5,8 +5,8 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.Message; -import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Before; import org.junit.Test; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java index 69a8caeea..812556f2c 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java @@ -5,9 +5,10 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.ConditionVariable; -import androidx.test.ext.junit.runners.AndroidJUnit4; import android.util.Log; +import androidx.test.ext.junit.runners.AndroidJUnit4; + import com.smartdevicelink.transport.RouterServiceValidator.TrustedAppStore; import com.smartdevicelink.util.HttpRequestTask.HttpRequestTaskCallback; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java index f2164e498..d9af0faed 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java @@ -2,8 +2,11 @@ package com.smartdevicelink.transport; import android.os.Looper; import android.os.Messenger; + import androidx.test.ext.junit.runners.AndroidJUnit4; +import com.smartdevicelink.transport.enums.TransportType; + import org.junit.Test; import org.junit.runner.RunWith; @@ -30,10 +33,10 @@ public class RegisteredAppTests { // Instantiate SdlRouterService and Registered App class SdlRouterService router = new SdlRouterService(); - SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, messenger); + SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, 1, messenger); // Call Handle Message - app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START,bytes); + app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START,bytes, TransportType.BLUETOOTH); // Insure that the buffer is not null, if it is the test will fail assertNotNull(app.buffer); @@ -50,13 +53,13 @@ public class RegisteredAppTests { // Instantiate SdlRouterService and Registered App class SdlRouterService router = new SdlRouterService(); - SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, messenger); + SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, 1, messenger); // Force Null Buffer app.buffer = null; // Call Handle Message - Making sure it doesn't init buffer - app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_NONE,bytes); + app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_NONE, bytes, TransportType.BLUETOOTH); // Insure that the buffer is null. and no NPE assertNull(app.buffer); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java index 5815911e7..2ab12e51a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java @@ -5,11 +5,12 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.Message; -import androidx.test.ext.junit.runners.AndroidJUnit4; import android.util.Log; import android.util.SparseArray; import android.util.SparseIntArray; +import androidx.test.ext.junit.runners.AndroidJUnit4; + import com.smartdevicelink.marshal.JsonRPCMarshaller; import com.smartdevicelink.protocol.BinaryFrameHeader; import com.smartdevicelink.protocol.ProtocolMessage; @@ -187,8 +188,8 @@ public class SdlRouterServiceTests { // We need a registered app for this to work Message message = Message.obtain(); - SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345",message.replyTo); - SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344",message.replyTo); + SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345", 1, message.replyTo); + SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344", 1, message.replyTo); HashMap<String,SdlRouterService.RegisteredApp> registeredApps = new HashMap<>(); registeredApps.put(app1.getAppId(),app1); registeredApps.put(app2.getAppId(),app2); @@ -280,8 +281,8 @@ public class SdlRouterServiceTests { // We need a registered app for this to work Message message = Message.obtain(); - SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345",message.replyTo); - SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344",message.replyTo); + SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345", 1, message.replyTo); + SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344", 1, message.replyTo); HashMap<String,SdlRouterService.RegisteredApp> registeredApps = new HashMap<>(); registeredApps.put(app1.getAppId(),app1); registeredApps.put(app2.getAppId(),app2); @@ -688,7 +689,7 @@ public class SdlRouterServiceTests { private void addDummyRegisteredApp(SdlRouterService routerService, String appId, int sessionId) throws IllegalAccessException, NoSuchFieldException { Message message = Message.obtain(); - SdlRouterService.RegisteredApp app = routerService.new RegisteredApp(appId, message.replyTo); + SdlRouterService.RegisteredApp app = routerService.new RegisteredApp(appId, 1, message.replyTo); Field raf = routerService.getClass().getDeclaredField("registeredApps"); raf.setAccessible(true); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java index aa0507a36..811fd8307 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java @@ -6,6 +6,7 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; import android.os.Messenger; + import androidx.test.ext.junit.runners.AndroidJUnit4; import com.smartdevicelink.test.SdlUnitTestContants; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java index b1d3263b2..a808ba936 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java @@ -2,6 +2,7 @@ package com.smartdevicelink.transport; import android.content.ComponentName; import android.os.Looper; + import androidx.test.ext.junit.runners.AndroidJUnit4; import com.smartdevicelink.protocol.SdlPacket; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/util/MediaStreamingStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/util/MediaStreamingStatusTests.java index 5f7f06f59..4a80343ad 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/util/MediaStreamingStatusTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/util/MediaStreamingStatusTests.java @@ -4,6 +4,7 @@ import android.content.Context; import android.media.AudioDeviceInfo; import android.media.AudioManager; import android.os.Build; + import androidx.test.ext.junit.runners.AndroidJUnit4; import com.smartdevicelink.managers.SdlManager; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java index 8f3001294..5fd3f417d 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java @@ -87,14 +87,18 @@ public final class EncoderUtils { } ByteBuffer sps = format.getByteBuffer("csd-0"); - int spsLen = sps.remaining(); + int spsLen = sps != null ? sps.remaining() : 0; ByteBuffer pps = format.getByteBuffer("csd-1"); - int ppsLen = pps.remaining(); + int ppsLen = pps != null ? pps.remaining() : 0; byte[] output = new byte[spsLen + ppsLen]; try { - sps.get(output, 0, spsLen); - pps.get(output, spsLen, ppsLen); + if (sps != null) { + sps.get(output, 0, spsLen); + } + if (pps != null) { + pps.get(output, spsLen, ppsLen); + } } catch (Exception e) { // should not happen DebugTool.logWarning(TAG, "Error while copying H264 codec specific data: " + e); diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java index 7172b0225..251c3ad3a 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java @@ -38,7 +38,7 @@ import android.media.MediaFormat; import android.os.Build; import android.view.Surface; -import com.smartdevicelink.proxy.interfaces.IVideoStreamListener; +import com.smartdevicelink.streaming.video.IVideoStreamListener; import com.smartdevicelink.util.DebugTool; import java.io.IOException; @@ -214,7 +214,7 @@ public class SdlEncoder { if (mBufferInfo.size != 0) { ByteBuffer encoderOutputBuffer = encoderOutputBuffers[encoderStatus]; - byte[] dataToWrite = null; + byte[] dataToWrite; int dataOffset = 0; // append SPS and PPS in front of every IDR NAL unit diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java index 766e10aaa..de342f7c9 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java @@ -43,10 +43,10 @@ import android.os.Build; import android.view.Display; import android.view.Surface; -import com.smartdevicelink.proxy.interfaces.IVideoStreamListener; import com.smartdevicelink.proxy.rpc.ImageResolution; import com.smartdevicelink.proxy.rpc.VideoStreamingFormat; import com.smartdevicelink.proxy.rpc.enums.VideoStreamingCodec; +import com.smartdevicelink.streaming.video.IVideoStreamListener; import com.smartdevicelink.streaming.video.VideoStreamingParameters; import com.smartdevicelink.util.DebugTool; @@ -101,17 +101,14 @@ public class VirtualDisplayEncoder { initPassed = true; } - @SuppressWarnings("unused") public VideoStreamingParameters getStreamingParams(){ return this.streamingParams; } - @SuppressWarnings("unused") public void setStreamingParams(int displayDensity, ImageResolution resolution, int frameRate, int bitrate, int interval, VideoStreamingFormat format) { this.streamingParams = new VideoStreamingParameters(displayDensity, frameRate, bitrate, interval, resolution, format); } - @SuppressWarnings("unused") public void setStreamingParams(VideoStreamingParameters streamingParams) { this.streamingParams = streamingParams; } @@ -321,7 +318,6 @@ public class VirtualDisplayEncoder { } } - @SuppressWarnings("deprecation") void drainEncoder(boolean endOfStream) { if (mVideoEncoder == null || mOutputListener == null) { return; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java index f109cbe85..09adbbaa6 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java @@ -36,6 +36,7 @@ import android.annotation.SuppressLint; import android.content.Context; import android.os.Handler; import android.os.Looper; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -90,7 +91,7 @@ public class SdlManager extends BaseSdlManager { @Override public void onTransportEvent(List<TransportRecord> connectedTransports, boolean audioStreamTransportAvail, boolean videoStreamTransportAvail) { - //Pass to submanagers that need it + //Pass to sub managers that need it if (videoStreamManager != null) { videoStreamManager.handleTransportUpdated(connectedTransports, audioStreamTransportAvail, videoStreamTransportAvail); } diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java index 04fe41c97..141a2b020 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java @@ -36,6 +36,7 @@ import android.media.MediaCodec; import android.media.MediaFormat;
import android.net.Uri;
import android.os.Build;
+
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java index ce2d3c49e..7e32d3261 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java @@ -35,6 +35,7 @@ import android.content.Context; import android.media.MediaCodec; import android.media.MediaFormat; import android.net.Uri; + import androidx.annotation.NonNull; import com.smartdevicelink.managers.audio.AudioStreamManager.SampleType; @@ -90,7 +91,7 @@ public class AudioDecoderCompat extends BaseAudioDecoder { * Runnable to decode audio data */ private static class DecoderRunnable implements Runnable { - WeakReference<AudioDecoderCompat> weakReference; + final WeakReference<AudioDecoderCompat> weakReference; /** * Decodes all audio data from source diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java index 52b4db580..0e4a2ed2c 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java @@ -38,11 +38,12 @@ import android.net.Uri; import android.os.Build;
import android.os.Handler;
import android.os.Looper;
+
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.RestrictTo;
-import com.smartdevicelink.SdlConnection.SdlSession;
+import com.smartdevicelink.session.SdlSession;
import com.smartdevicelink.managers.CompletionListener;
import com.smartdevicelink.managers.StreamingStateMachine;
import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
@@ -50,9 +51,8 @@ import com.smartdevicelink.protocol.ProtocolMessage; import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.protocol.enums.SessionType;
import com.smartdevicelink.proxy.RPCNotification;
-import com.smartdevicelink.proxy.interfaces.IAudioStreamListener;
-import com.smartdevicelink.proxy.interfaces.ISdl;
-import com.smartdevicelink.proxy.interfaces.ISdlServiceListener;
+import com.smartdevicelink.managers.ISdl;
+import com.smartdevicelink.protocol.ISdlServiceListener;
import com.smartdevicelink.proxy.rpc.AudioPassThruCapabilities;
import com.smartdevicelink.proxy.rpc.OnHMIStatus;
import com.smartdevicelink.proxy.rpc.enums.HMILevel;
@@ -61,6 +61,7 @@ import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType; import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
import com.smartdevicelink.streaming.IStreamListener;
import com.smartdevicelink.streaming.StreamPacketizer;
+import com.smartdevicelink.streaming.audio.IAudioStreamListener;
import com.smartdevicelink.transport.utl.TransportRecord;
import com.smartdevicelink.util.DebugTool;
import com.smartdevicelink.util.Version;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java index 53e3d64f0..d7f4f3a7c 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java @@ -38,6 +38,7 @@ import android.media.MediaExtractor; import android.media.MediaFormat;
import android.net.Uri;
import android.os.Build;
+
import androidx.annotation.NonNull;
import com.smartdevicelink.managers.audio.AudioStreamManager.SampleType;
@@ -109,7 +110,7 @@ public abstract class BaseAudioDecoder { for (int i = 0; i < numTracks; ++i) {
MediaFormat f = extractor.getTrackFormat(i);
String m = f.getString(MediaFormat.KEY_MIME);
- if (m.startsWith("audio/")) {
+ if (m != null && m.startsWith("audio/")) {
format = f;
mime = m;
extractor.selectTrack(i);
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java index 05a9cc285..0993b2ec2 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java @@ -44,7 +44,6 @@ import java.nio.ByteOrder; public class SampleBuffer {
private static final String TAG = SampleBuffer.class.getSimpleName();
- @SuppressWarnings({"unused", "FieldCanBeLocal"})
private @SampleType final int sampleType;
private final ByteBuffer byteBuffer;
private final int channelCount;
@@ -94,7 +93,6 @@ public class SampleBuffer { * @param presentationTimeUs The presentation time for the buffer.
* @return A new and empty sample buffer.
*/
- @SuppressWarnings("unused")
public static SampleBuffer allocate(int capacity, @SampleType int sampleType, int channelCount, ByteOrder byteOrder, long presentationTimeUs) {
return new SampleBuffer(capacity, sampleType, channelCount, byteOrder, presentationTimeUs);
}
@@ -117,7 +115,6 @@ public class SampleBuffer { /**
* Returns the capacity of the buffer per channel.
*/
- @SuppressWarnings("unused")
public int capacity() {
return byteBuffer.capacity() / sampleType / channelCount;
}
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java index 0efc3b6ff..6b98e9b58 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java @@ -35,11 +35,12 @@ package com.smartdevicelink.managers.file; import android.content.Context; import android.content.res.Resources; import android.net.Uri; + import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.file.filetypes.SdlFile; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.PutFile; import com.smartdevicelink.util.DebugTool; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java index d0e46f7e5..afceb04a1 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java @@ -33,6 +33,7 @@ package com.smartdevicelink.managers.file.filetypes; import android.net.Uri; + import androidx.annotation.NonNull; import com.smartdevicelink.proxy.rpc.Image; @@ -111,7 +112,7 @@ public class SdlArtwork extends SdlFile implements Cloneable{ } @Override - public void setType(FileType fileType) { + public void setType(@NonNull FileType fileType) { if(fileType == null || fileType.equals(FileType.GRAPHIC_JPEG) || fileType.equals(FileType.GRAPHIC_PNG) || fileType.equals(FileType.GRAPHIC_BMP)){ super.setType(fileType); diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java index 4fe5e3898..2b978c790 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java @@ -33,6 +33,7 @@ package com.smartdevicelink.managers.file.filetypes; import android.net.Uri; + import androidx.annotation.NonNull; import com.smartdevicelink.proxy.rpc.enums.FileType; @@ -40,6 +41,7 @@ import com.smartdevicelink.proxy.rpc.enums.StaticIconName; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.util.Arrays; /** * A class representing data to be uploaded to core @@ -317,7 +319,7 @@ public class SdlFile{ int result = 1; result += ((getName() == null) ? 0 : Integer.rotateLeft(getName().hashCode(), 1)); result += ((getUri() == null) ? 0 : Integer.rotateLeft(getUri().hashCode(), 2)); - result += ((getFileData() == null) ? 0 : Integer.rotateLeft(getFileData().hashCode(), 3)); + result += ((getFileData() == null) ? 0 : Integer.rotateLeft(Arrays.hashCode(getFileData()), 3)); result += ((getType() == null) ? 0 : Integer.rotateLeft(getType().hashCode(), 4)); result += Integer.rotateLeft(Boolean.valueOf(isStaticIcon()).hashCode(), 5); result += Integer.rotateLeft(Boolean.valueOf(isPersistent()).hashCode(), 6); diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/EncryptionLifecycleManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/EncryptionLifecycleManager.java index ae7a0886e..b2749212e 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/EncryptionLifecycleManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/EncryptionLifecycleManager.java @@ -34,9 +34,9 @@ package com.smartdevicelink.managers.lifecycle; import androidx.annotation.NonNull; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.ServiceEncryptionListener; import com.smartdevicelink.protocol.enums.SessionType; -import com.smartdevicelink.proxy.interfaces.ISdl; class EncryptionLifecycleManager extends BaseEncryptionLifecycleManager { 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 78233dc0f..e5aee6c3e 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 @@ -32,15 +32,15 @@ package com.smartdevicelink.managers.lifecycle; -import android.app.Service; import android.content.Context; + import androidx.annotation.RestrictTo; -import com.smartdevicelink.SdlConnection.SdlSession; +import com.smartdevicelink.session.SdlSession; import com.smartdevicelink.exception.SdlException; import com.smartdevicelink.exception.SdlExceptionCause; +import com.smartdevicelink.protocol.ISdlServiceListener; import com.smartdevicelink.protocol.enums.SessionType; -import com.smartdevicelink.proxy.interfaces.ISdlServiceListener; import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason; import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType; import com.smartdevicelink.security.SdlSecurityBase; @@ -52,8 +52,6 @@ import com.smartdevicelink.transport.enums.TransportType; import com.smartdevicelink.util.DebugTool; import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.Collections; /** * The lifecycle manager creates a central point for all SDL session logic to converge. It should only be used by @@ -157,10 +155,6 @@ public class LifecycleManager extends BaseLifecycleManager { * * @param isEncrypted Specify true if packets on this service have to be encrypted * @param parameters VideoStreamingParameters that are desired. Does not guarantee this is what will be accepted. - * @return If the service is opened successfully, an instance of VideoStreamingParams is - * returned which contains accepted video format. If the service is opened with legacy - * mode (i.e. without any negotiation) then an instance of VideoStreamingParams is - * returned. If the service was not opened then null is returned. */ private void tryStartVideoStream(boolean isEncrypted, VideoStreamingParameters parameters) { if (session == null) { diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManager.java index e4e635883..e10693770 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManager.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.managers.lifecycle; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; /** * <strong>SystemCapabilityManager</strong> <br> diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java index 8d1e9a6c8..df1db5475 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java @@ -60,7 +60,9 @@ import java.lang.annotation.RetentionPolicy; */ public class LockScreenConfig { - private boolean enable, deviceLogo, enableDismissGesture; + private final boolean enable; + private boolean deviceLogo; + private boolean enableDismissGesture; private int backgroundColor, appIconInt, customViewInt; private @DisplayMode int displayMode; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManager.java index 711afcc72..603435800 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManager.java @@ -24,7 +24,7 @@ import java.security.NoSuchAlgorithmException; */ class LockScreenDeviceIconManager { - private Context context; + private final Context context; private static final String SDL_DEVICE_STATUS_SHARED_PREFS = "sdl.lockScreenIcon"; private static final String STORED_ICON_DIRECTORY_PATH = "sdl/lock_screen_icon/"; private static final String TAG = "LockScreenDeviceIconManager"; @@ -47,7 +47,7 @@ class LockScreenDeviceIconManager { * @param iconRetrievedListener an interface that will implement onIconReceived and OnError methods */ void retrieveIcon(String iconURL, OnIconRetrievedListener iconRetrievedListener) { - Bitmap icon = null; + Bitmap icon; try { if (isIconCachedAndValid(iconURL)) { DebugTool.logInfo(TAG, "Icon Is Up To Date"); @@ -127,7 +127,7 @@ class LockScreenDeviceIconManager { icon.compress(Bitmap.CompressFormat.PNG, 0 /*ignored for PNG*/, bos); byte[] bitmapData = bos.toByteArray(); - FileOutputStream fos = null; + FileOutputStream fos; try { fos = new FileOutputStream(f); fos.write(bitmapData); @@ -189,11 +189,11 @@ class LockScreenDeviceIconManager { MessageDigest md = MessageDigest.getInstance("MD5"); byte[] messageDigest = md.digest(iconUrl.getBytes()); BigInteger no = new BigInteger(1, messageDigest); - String hashtext = no.toString(16); - while (hashtext.length() < 32) { - hashtext = "0" + hashtext; + StringBuilder hashText = new StringBuilder(no.toString(16)); + while (hashText.length() < 32) { + hashText.insert(0, "0"); } - iconHash = hashtext; + iconHash = hashText.toString(); } catch (NoSuchAlgorithmException e) { DebugTool.logError(TAG, "Unable to hash icon url"); e.printStackTrace(); @@ -208,7 +208,9 @@ class LockScreenDeviceIconManager { File iconDir = new File(context.getCacheDir() + "/" + STORED_ICON_DIRECTORY_PATH); if (iconDir.listFiles() != null) { for (File child : iconDir.listFiles()) { - child.delete(); + if (child != null) { + child.delete(); + } } } } diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java index 06f992875..56975a390 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java @@ -44,7 +44,7 @@ import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCNotification; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.OnDriverDistraction; import com.smartdevicelink.proxy.rpc.OnHMIStatus; import com.smartdevicelink.proxy.rpc.OnSystemRequest; @@ -70,19 +70,26 @@ import java.lang.ref.WeakReference; public class LockScreenManager extends BaseSubManager { private static final String TAG = "LockScreenManager"; - private WeakReference<Context> context; + private final WeakReference<Context> context; HMILevel hmiLevel; private OnRPCNotificationListener systemRequestListener, ddListener, hmiListener; private String deviceIconUrl; - boolean driverDistStatus, mIsLockscreenDismissible, enableDismissGesture, lockScreenEnabled, deviceLogoEnabled; + boolean driverDistStatus; + boolean mIsLockscreenDismissible; + boolean enableDismissGesture; + final boolean lockScreenEnabled; + final boolean deviceLogoEnabled; private volatile boolean isApplicationForegrounded; private androidx.lifecycle.LifecycleObserver lifecycleObserver; - int lockScreenIcon, lockScreenColor, customView, displayMode; + final int lockScreenIcon; + final int lockScreenColor; + final int customView; + int displayMode; Bitmap deviceLogo; private boolean mLockScreenHasBeenDismissed, lockscreenDismissReceiverRegistered, receivedFirstDDNotification; private String mLockscreenWarningMsg; private BroadcastReceiver mLockscreenDismissedReceiver; - private LockScreenDeviceIconManager mLockScreenDeviceIconManager; + private final LockScreenDeviceIconManager mLockScreenDeviceIconManager; public LockScreenManager(LockScreenConfig lockScreenConfig, Context context, ISdl internalInterface){ diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java index a1af673a2..3007d081a 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java @@ -55,7 +55,6 @@ import com.smartdevicelink.R; public class SDLLockScreenActivity extends Activity { - private static final String TAG = "SDLLockScreenActivity"; public static final String LOCKSCREEN_COLOR_EXTRA = "LOCKSCREEN_COLOR_EXTRA"; public static final String LOCKSCREEN_ICON_EXTRA = "LOCKSCREEN_ICON_EXTRA"; public static final String LOCKSCREEN_DEVICE_LOGO_EXTRA = "LOCKSCREEN_DEVICE_LOGO_EXTRA"; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java index 7430c3143..540cbbf20 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java @@ -35,7 +35,7 @@ package com.smartdevicelink.managers.permission; import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; /** PermissionManager gives the developer information about what permissions are permitted in specific HMI level diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java index 31c6da0b1..00bb57628 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java @@ -35,8 +35,8 @@ package com.smartdevicelink.managers.screen; import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.file.FileManager; -import com.smartdevicelink.proxy.interfaces.ISdl; /** * <strong>ScreenManager</strong> <br> diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java index 5499d3a5a..8e30bb446 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java @@ -35,8 +35,8 @@ package com.smartdevicelink.managers.screen; import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.file.FileManager; -import com.smartdevicelink.proxy.interfaces.ISdl; /** * <strong>SoftButtonManager</strong> <br> diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java index 9f08bef36..eba3c9b2f 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java @@ -3,7 +3,7 @@ package com.smartdevicelink.managers.screen; import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; /** * <strong>SubscribeButtonManager</strong> <br> diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java index fe216ea5f..b4154cdf0 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java @@ -36,9 +36,9 @@ import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; import com.smartdevicelink.R; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.enums.FileType; /** diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java index f0895fe22..887d40e94 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java @@ -35,8 +35,8 @@ package com.smartdevicelink.managers.screen.choiceset; import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.file.FileManager; -import com.smartdevicelink.proxy.interfaces.ISdl; /** * <strong>ChoiceSetManager</strong> <br> diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java index d29312cdf..b2055c976 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java @@ -34,8 +34,8 @@ package com.smartdevicelink.managers.screen.menu; import androidx.annotation.RestrictTo; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.file.FileManager; -import com.smartdevicelink.proxy.interfaces.ISdl; /** * <strong>MenuManager</strong> <br> diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java index afde7404d..641ab189e 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java @@ -34,7 +34,7 @@ package com.smartdevicelink.managers.screen.menu; import androidx.annotation.RestrictTo; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; /** * <strong>VoiceCommandManager</strong> <br> diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/HapticInterfaceManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/HapticInterfaceManager.java index 78b6bb03b..36863bc99 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/HapticInterfaceManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/HapticInterfaceManager.java @@ -1,30 +1,30 @@ -/*************************************************************************************************** - * Copyright © 2017 Xevo Inc. - * Redistribution and use in source and binary forms, with or without modification, are permitted - * provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright notice, this list of conditions - * and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, this list of - * conditions and the following disclaimer in the documentation and/or other materials provided - * with the distribution. - * 3. Neither the name of the copyright holder nor the names of its contributors may be used to - * endorse or promote products derived from this software without specific prior written - * permission. - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - **************************************************************************************************/ +/************************************************************************************************** + Copyright © 2017 Xevo Inc. + Redistribution and use in source and binary forms, with or without modification, are permitted + provided that the following conditions are met: + 1. Redistributions of source code must retain the above copyright notice, this list of conditions + and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, this list of + conditions and the following disclaimer in the documentation and/or other materials provided + with the distribution. + 3. Neither the name of the copyright holder nor the names of its contributors may be used to + endorse or promote products derived from this software without specific prior written + permission. + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ package com.smartdevicelink.managers.video; import android.view.View; import android.view.ViewGroup; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.HapticRect; import com.smartdevicelink.proxy.rpc.Rectangle; import com.smartdevicelink.proxy.rpc.SendHapticData; @@ -45,7 +45,7 @@ import java.util.List; class HapticInterfaceManager extends BaseHapticInterfaceManager { private static final String TAG = "Haptic"; - private WeakReference<ISdl> proxyHolder; + private final WeakReference<ISdl> proxyHolder; private List<HapticRect> userHapticData; HapticInterfaceManager(ISdl proxy) { @@ -70,7 +70,7 @@ class HapticInterfaceManager extends BaseHapticInterfaceManager { } /** - * Sends haptic data found by searching for focusable and clickable Views in the view heirarchy + * Sends haptic data found by searching for focusable and clickable Views in the view hierarchy * to the HU. Should be called by Presentation's OnShowListener. * * @param root diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java index 77467f429..a8c3a74be 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java @@ -42,19 +42,18 @@ import android.view.MotionEvent; import androidx.annotation.RestrictTo; -import com.smartdevicelink.SdlConnection.SdlSession; +import com.smartdevicelink.session.SdlSession; import com.smartdevicelink.encoder.VirtualDisplayEncoder; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.StreamingStateMachine; import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener; +import com.smartdevicelink.protocol.ISdlServiceListener; import com.smartdevicelink.protocol.ProtocolMessage; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.protocol.enums.SessionType; import com.smartdevicelink.proxy.RPCNotification; -import com.smartdevicelink.proxy.interfaces.ISdl; -import com.smartdevicelink.proxy.interfaces.ISdlServiceListener; -import com.smartdevicelink.proxy.interfaces.IVideoStreamListener; import com.smartdevicelink.proxy.rpc.DisplayCapabilities; import com.smartdevicelink.proxy.rpc.ImageResolution; import com.smartdevicelink.proxy.rpc.OnHMIStatus; @@ -73,6 +72,7 @@ import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener; import com.smartdevicelink.streaming.AbstractPacketizer; import com.smartdevicelink.streaming.IStreamListener; import com.smartdevicelink.streaming.StreamPacketizer; +import com.smartdevicelink.streaming.video.IVideoStreamListener; import com.smartdevicelink.streaming.video.RTPH264Packetizer; import com.smartdevicelink.streaming.video.SdlRemoteDisplay; import com.smartdevicelink.streaming.video.VideoStreamingParameters; @@ -89,17 +89,17 @@ import java.util.concurrent.FutureTask; @TargetApi(19) public class VideoStreamManager extends BaseVideoStreamManager { - private static String TAG = "VideoStreamManager"; + private static final String TAG = "VideoStreamManager"; private WeakReference<Context> context; private volatile VirtualDisplayEncoder virtualDisplayEncoder; private Class<? extends SdlRemoteDisplay> remoteDisplayClass = null; private SdlRemoteDisplay remoteDisplay; - private float[] touchScalar = {1.0f,1.0f}; //x, y + private final float[] touchScalar = {1.0f,1.0f}; //x, y private HapticInterfaceManager hapticManager; private SdlMotionEvent sdlMotionEvent = null; private OnHMIStatus currentOnHMIStatus; - private StreamingStateMachine stateMachine; + private final StreamingStateMachine stateMachine; private VideoStreamingParameters parameters; private IVideoStreamListener streamListener; private boolean isTransportAvailable = false; @@ -466,13 +466,13 @@ public class VideoStreamManager extends BaseVideoStreamManager { remoteDisplay.dismissPresentation(); } - FutureTask<Boolean> fTask = new FutureTask<Boolean>( new SdlRemoteDisplay.Creator(context.get(), disp, remoteDisplay, remoteDisplayClass, new SdlRemoteDisplay.Callback(){ + FutureTask<Boolean> fTask = new FutureTask<>(new SdlRemoteDisplay.Creator(context.get(), disp, remoteDisplay, remoteDisplayClass, new SdlRemoteDisplay.Callback() { @Override public void onCreated(final SdlRemoteDisplay remoteDisplay) { //Remote display has been created. //Now is a good time to do parsing for spatial data VideoStreamManager.this.remoteDisplay = remoteDisplay; - if(hapticManager != null) { + if (hapticManager != null) { remoteDisplay.getMainView().post(new Runnable() { @Override public void run() { @@ -482,17 +482,17 @@ public class VideoStreamManager extends BaseVideoStreamManager { } //Get touch scalars ImageResolution resolution = null; - if(internalInterface.getProtocolVersion().getMajor() >= 5){ //At this point we should already have the capability + if (internalInterface.getProtocolVersion().getMajor() >= 5) { //At this point we should already have the capability VideoStreamingCapability capability = null; if (internalInterface.getSystemCapabilityManager() != null) { capability = (VideoStreamingCapability) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, null, false); } - if(capability != null){ + if (capability != null) { resolution = capability.getPreferredResolution(); } } - if(resolution == null){ //Either the protocol version is too low to access video streaming caps, or they were null + if (resolution == null) { //Either the protocol version is too low to access video streaming caps, or they were null DisplayCapabilities dispCap = null; if (internalInterface.getSystemCapabilityManager() != null) { dispCap = (DisplayCapabilities) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.DISPLAY, null, false); @@ -502,11 +502,11 @@ public class VideoStreamManager extends BaseVideoStreamManager { } } - if(resolution != null){ + if (resolution != null) { DisplayMetrics displayMetrics = new DisplayMetrics(); disp.getMetrics(displayMetrics); createTouchScalar(resolution, displayMetrics); - } + } } @@ -514,7 +514,7 @@ public class VideoStreamManager extends BaseVideoStreamManager { public void onInvalidated(final SdlRemoteDisplay remoteDisplay) { //Our view has been invalidated //A good time to refresh spatial data - if(hapticManager != null) { + if (hapticManager != null) { remoteDisplay.getMainView().post(new Runnable() { @Override public void run() { @@ -523,7 +523,7 @@ public class VideoStreamManager extends BaseVideoStreamManager { }); } } - } )); + })); Thread showPresentation = new Thread(fTask); showPresentation.setName("RmtDispThread"); @@ -562,7 +562,7 @@ public class VideoStreamManager extends BaseVideoStreamManager { } List<MotionEvent> convertTouchEvent(OnTouchEvent onTouchEvent){ - List<MotionEvent> motionEventList = new ArrayList<MotionEvent>(); + List<MotionEvent> motionEventList = new ArrayList<>(); List<TouchEvent> touchEventList = onTouchEvent.getEvent(); if (touchEventList == null || touchEventList.size() == 0) return null; @@ -643,7 +643,7 @@ public class VideoStreamManager extends BaseVideoStreamManager { */ private static class SdlMotionEvent { class Pointer { - int id; + final int id; float x; float y; Pointer (int id) { @@ -657,7 +657,7 @@ public class VideoStreamManager extends BaseVideoStreamManager { } } - private CopyOnWriteArrayList<Pointer> pointers = new CopyOnWriteArrayList<>(); + private final CopyOnWriteArrayList<Pointer> pointers = new CopyOnWriteArrayList<>(); private long downTime; private long downTimeOnHMI; private long eventTime; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java index 723af1939..707f55c01 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java @@ -34,7 +34,7 @@ public class SdlPacket extends BaseSdlPacket implements Parcelable { } /* *************************************************************************************************************************************************** - * *********************************************************** Parceable Overrides ***************************************************************** + * *********************************************************** Parcelable Overrides ***************************************************************** *****************************************************************************************************************************************************/ @@ -42,7 +42,7 @@ public class SdlPacket extends BaseSdlPacket implements Parcelable { //I think this is FIFO...right? public SdlPacket(Parcel p) { this.version = p.readInt(); - this.encryption = (p.readInt() == 0) ? false : true; + this.encryption = p.readInt() != 0; this.frameType = p.readInt(); this.serviceType = p.readInt(); this.frameInfo = p.readInt(); @@ -61,7 +61,7 @@ public class SdlPacket extends BaseSdlPacket implements Parcelable { messagingVersion = p.readInt(); if (messagingVersion >= 2) { if (p.readInt() == 1) { //We should have a transport type attached - this.transportRecord = (TransportRecord) p.readParcelable(TransportRecord.class.getClassLoader()); + this.transportRecord = p.readParcelable(TransportRecord.class.getClassLoader()); } } }catch (RuntimeException e){ diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java index fd6ac275f..2f5771548 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java @@ -51,7 +51,6 @@ public class SdlProtocol extends SdlProtocolBase { private static final String TAG ="SdlProtocol"; - @SuppressWarnings("ConstantConditions") public SdlProtocol(@NonNull ISdlProtocol iSdlProtocol, @NonNull MultiplexTransportConfig config) { super(iSdlProtocol,config); this.requestedPrimaryTransports = config.getPrimaryTransports(); diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java index dd65cc3a4..b0fcc73f3 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java @@ -47,7 +47,7 @@ public class HeartbeatMonitor implements IHeartbeatMonitor { private final Object listenerLock = new Object();
private int mHeartBeatInterval = HEARTBEAT_INTERVAL;
- private boolean mHeartBeatAck = true;
+ private final boolean mHeartBeatAck = true;
private IHeartbeatMonitorListener mListener;
private volatile boolean mIsAckReceived;
@@ -64,7 +64,7 @@ public class HeartbeatMonitor implements IHeartbeatMonitor { public Runnable getHeartbeatRunnable () { return heartbeatTimeoutRunnable; }
public boolean isHeartbeatReceived () { return isHeartbeatReceived; }
- private Runnable heartbeatTimeoutRunnable = new Runnable() {
+ private final Runnable heartbeatTimeoutRunnable = new Runnable() {
@Override
public void run() {
@@ -91,7 +91,7 @@ public class HeartbeatMonitor implements IHeartbeatMonitor { }
};
- private Runnable heartbeatAckTimeoutRunnable = new Runnable() {
+ private final Runnable heartbeatAckTimeoutRunnable = new Runnable() {
@Override
public void run() {
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java index 6ad5fb001..68e8709f4 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java @@ -38,19 +38,19 @@ public interface IHeartbeatMonitor { /**
* Starts the monitor. If the monitor is already started, nothing happens.
*/
- public void start();
+ void start();
/**
* Stops the monitor. Does nothing if it is already stopped.
*/
- public void stop();
+ void stop();
/**
* Returns the heartbeat messages interval.
*
* @return interval in milliseconds
*/
- public int getInterval();
+ int getInterval();
/**
* Sets the interval for sending heartbeat messages if nothing is sent over
@@ -59,34 +59,34 @@ public interface IHeartbeatMonitor { * @param interval interval in milliseconds (min/max values depend on
* concrete implementations)
*/
- public void setInterval(int interval);
+ void setInterval(int interval);
/**
* Returns the listener.
*
* @return the listener
*/
- public IHeartbeatMonitorListener getListener();
+ IHeartbeatMonitorListener getListener();
/**
* Sets the heartbeat's listener.
*
* @param listener the new listener
*/
- public void setListener(IHeartbeatMonitorListener listener);
+ void setListener(IHeartbeatMonitorListener listener);
/**
* Notifies the monitor about sent/received messages.
*/
- public void notifyTransportActivity();
+ void notifyTransportActivity();
/**
* Notifies the monitor about a received heartbeat ACK message.
*/
- public void heartbeatACKReceived();
+ void heartbeatACKReceived();
/**
* Notifies the monitor about a received heartbeat message.
*/
- public void heartbeatReceived();
+ void heartbeatReceived();
}
\ No newline at end of file diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java index 26f3535b2..e95a6a5ec 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java @@ -45,12 +45,12 @@ public interface IHeartbeatMonitorListener { * * @param monitor the caller */ - public void sendHeartbeat(IHeartbeatMonitor monitor); + void sendHeartbeat(IHeartbeatMonitor monitor); /** * Notifies the listener that the heartbeat timed out. * * @param monitor the caller */ - public void heartbeatTimedOut(IHeartbeatMonitor monitor); + void heartbeatTimedOut(IHeartbeatMonitor monitor); } diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java b/android/sdl_android/src/main/java/com/smartdevicelink/session/SdlSession.java index c57743a2f..f7c1e18d6 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/session/SdlSession.java @@ -30,18 +30,18 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package com.smartdevicelink.SdlConnection; +package com.smartdevicelink.session; import android.content.Context; import androidx.annotation.RestrictTo; import com.smartdevicelink.exception.SdlException; +import com.smartdevicelink.protocol.ISdlServiceListener; 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.MultiplexTransportConfig; import com.smartdevicelink.transport.TCPTransportConfig; import com.smartdevicelink.transport.enums.TransportType; @@ -98,7 +98,8 @@ public class SdlSession extends BaseSdlSession { } // If requiresAudioSupport is false, or a supported audio output device is available - return !requiresAudioSupport || mediaStreamingStatus.isAudioOutputAvailable(); + boolean isAudioOutputAvailable = mediaStreamingStatus != null && mediaStreamingStatus.isAudioOutputAvailable(); + return !requiresAudioSupport || isAudioOutputAvailable; } diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java index 24608ecfe..7bd091596 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java @@ -33,12 +33,12 @@ package com.smartdevicelink.streaming; import androidx.annotation.RestrictTo;
-import com.smartdevicelink.SdlConnection.SdlSession;
+import com.smartdevicelink.session.SdlSession;
import com.smartdevicelink.managers.CompletionListener;
import com.smartdevicelink.protocol.ProtocolMessage;
import com.smartdevicelink.protocol.enums.SessionType;
-import com.smartdevicelink.proxy.interfaces.IAudioStreamListener;
-import com.smartdevicelink.proxy.interfaces.IVideoStreamListener;
+import com.smartdevicelink.streaming.audio.IAudioStreamListener;
+import com.smartdevicelink.streaming.video.IVideoStreamListener;
import com.smartdevicelink.util.DebugTool;
import java.io.IOException;
@@ -68,14 +68,13 @@ public class StreamPacketizer extends AbstractPacketizer implements IVideoStream // a limit of the buffer size, we avoid buffer overflows when underlying transport is too slow.
private static final int MAX_QUEUE_SIZE = 256 * 1024;
- private Object mPauseLock;
+ private final Object mPauseLock = new Object();
private boolean mPaused;
private boolean isServiceProtected = false;
private BlockingQueue<ByteBufferWithListener> mOutputQueue;
public StreamPacketizer(IStreamListener streamListener, InputStream is, SessionType sType, byte rpcSessionID, SdlSession session) throws IOException {
super(streamListener, is, sType, rpcSessionID, session);
- mPauseLock = new Object();
mPaused = false;
isServiceProtected = _session.isServiceProtected(_serviceType);
if (bufferSize == 0) {
@@ -87,7 +86,7 @@ public class StreamPacketizer extends AbstractPacketizer implements IVideoStream bufferSize = BUFF_READ_SIZE;
buffer = new byte[bufferSize];
}
- mOutputQueue = new LinkedBlockingQueue<ByteBufferWithListener>(MAX_QUEUE_SIZE / bufferSize);
+ mOutputQueue = new LinkedBlockingQueue<>(MAX_QUEUE_SIZE / bufferSize);
}
public void start() throws IOException {
@@ -158,7 +157,7 @@ public class StreamPacketizer extends AbstractPacketizer implements IVideoStream }
while (frame.hasRemaining()) {
- int len = frame.remaining() > bufferSize ? bufferSize : frame.remaining();
+ int len = Math.min(frame.remaining(), bufferSize);
ProtocolMessage pm = new ProtocolMessage();
pm.setSessionID(_rpcSessionID);
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java index cdb80ef1e..e22fbb9c6 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java @@ -51,7 +51,7 @@ import java.lang.reflect.Constructor; import java.util.concurrent.Callable; /** - * SdlRemoteDisplay is an abstract class that should be extended by developers to creat their remote displays. + * SdlRemoteDisplay is an abstract class that should be extended by developers to create their remote displays. * All logic for UI events can be stored in their extension. * * <br><br> <b>NOTE:</b> When the UI changes (buttons appear, layouts change, etc) the developer should call {@link #invalidate()} to alert any @@ -64,8 +64,8 @@ public abstract class SdlRemoteDisplay extends Presentation { protected Window w; protected View mainView; - protected Handler handler = new Handler(); - protected Handler uiHandler = new Handler(Looper.getMainLooper()); + protected final Handler handler = new Handler(); + protected final Handler uiHandler = new Handler(Looper.getMainLooper()); protected Callback callback; public SdlRemoteDisplay(Context context, Display display) { @@ -95,7 +95,7 @@ public abstract class SdlRemoteDisplay extends Presentation { handler.removeCallbacks(mStartRefreshTaskCallback); } - protected Runnable mStartRefreshTaskCallback = new Runnable() { + protected final Runnable mStartRefreshTaskCallback = new Runnable() { public void run() { if(mainView == null){ mainView = w.getDecorView().findViewById(android.R.id.content); @@ -108,7 +108,6 @@ public abstract class SdlRemoteDisplay extends Presentation { } }; - @SuppressWarnings("unused") public View getMainView(){ if(mainView == null){ mainView = w.getDecorView().findViewById(android.R.id.content); @@ -116,7 +115,6 @@ public abstract class SdlRemoteDisplay extends Presentation { return this.mainView; } - @SuppressWarnings("unused") public void invalidate(){ // let listeners know the view has been invalidated if(callback != null){ @@ -152,13 +150,13 @@ public abstract class SdlRemoteDisplay extends Presentation { } public static class Creator implements Callable<Boolean> { - private Context context; - private Display mDisplay; + private final Context context; + private final Display mDisplay; boolean presentationShowError = false; SdlRemoteDisplay remoteDisplay; - Class<? extends SdlRemoteDisplay> remoteDisplayClass; - private Handler uiHandler = new Handler(Looper.getMainLooper()); - private Callback callback; + final Class<? extends SdlRemoteDisplay> remoteDisplayClass; + private final Handler uiHandler = new Handler(Looper.getMainLooper()); + private final Callback callback; public Creator(Context context, Display display, SdlRemoteDisplay remoteDisplay, Class<? extends SdlRemoteDisplay> remoteDisplayClass, Callback callback){ diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java b/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java index 584b388ef..5f2452125 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java @@ -29,9 +29,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-/**
- *
- */
package com.smartdevicelink.trace;
import android.bluetooth.BluetoothAdapter;
@@ -145,9 +142,8 @@ public class TraceDeviceInfo { .getBondedDevices();
StringBuilder write = new StringBuilder("<btpairs>");
- Iterator<BluetoothDevice> iter = btDevices.iterator();
- while (iter.hasNext()) {
- write.append(SdlTrace.getBTDeviceInfo(iter.next()));
+ for (BluetoothDevice btDevice : btDevices) {
+ write.append(SdlTrace.getBTDeviceInfo(btDevice));
}
write.append("</btpairs>");
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java index e1f138978..a8eecd484 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java @@ -124,7 +124,7 @@ public abstract class MultiplexBaseTransport { } protected abstract void stop(int state); - protected void stop(int state, byte error) {}; + protected void stop(int state, byte error) {} public abstract void write(byte[] out, int offset, int count); diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java index 449774d57..7995b7bde 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java @@ -29,6 +29,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.Message; + import androidx.annotation.RequiresPermission; import com.smartdevicelink.protocol.SdlPacket; @@ -63,7 +64,7 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{ // Key names received from the BluetoothSerialServer Handler private static final long MS_TILL_TIMEOUT = 2500; private static final int READ_BUFFER_SIZE = 4096; - private final Object THREAD_LOCK = new Object();; + private final Object THREAD_LOCK = new Object(); protected static final String SHARED_PREFS = "sdl.bluetoothprefs"; @@ -75,7 +76,7 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{ private ConnectedThread mConnectedThread; private ConnectedWriteThread mConnectedWriteThread; Handler timeOutHandler; - Runnable socketRunable; + Runnable socketRunnable; boolean keepSocketAlive = true; /** @@ -310,7 +311,7 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{ private void timerDelayRemoveDialog(final BluetoothSocket sock){ timeOutHandler = new Handler(); - socketRunable = new Runnable() { + socketRunnable = new Runnable() { public void run() { //Log.e(TAG, "BLUETOOTH SOCKET CONNECT TIMEOUT - ATTEMPT TO CLOSE SOCKET"); try { @@ -320,7 +321,7 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{ } } }; - timeOutHandler.postDelayed(socketRunable, MS_TILL_TIMEOUT); + timeOutHandler.postDelayed(socketRunnable, MS_TILL_TIMEOUT); } @@ -332,7 +333,7 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{ */ private class AcceptThread extends Thread { // The local server socket - private String mSocketType; + private final String mSocketType; final BluetoothServerSocket mmServerSocket; @SuppressLint("NewApi") @@ -350,7 +351,7 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{ } catch (IOException e) { //Log.e(TAG, "Socket Type: " + mSocketType + "listen() failed", e); MultiplexBluetoothTransport.this.stop(STATE_ERROR, REASON_SPP_ERROR); - //Let's try to shut down this thead + //Let's try to shut down this thread }catch(SecurityException e2){ //Log.e(TAG, "<LIVIO> Security Exception in Accept Thread - "+e2.toString()); interrupt(); @@ -369,7 +370,7 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{ " BEGIN mAcceptThread" + this); setName("AcceptThread" + mSocketType); - BluetoothSocket socket = null; + BluetoothSocket socket; int listenAttempts = 0; // Listen to the server socket if we're not connected @@ -453,8 +454,8 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{ private final BluetoothDevice mmDevice; public ConnectThread(BluetoothDevice device) { mmDevice = device; - //Log.d(TAG, "Attempting to conenct to " + device.getName()); - //Log.d(TAG, "UUID to conenct to " + SERVER_UUID.toString()); + //Log.d(TAG, "Attempting to connect to " + device.getName()); + //Log.d(TAG, "UUID to connect to " + SERVER_UUID.toString()); } @@ -463,7 +464,7 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{ try{ mAdapter.cancelDiscovery(); }catch(SecurityException e2){ - DebugTool.logError(TAG, "Don't have required permision to cancel discovery. Moving on"); + DebugTool.logError(TAG, "Don't have required permission to cancel discovery. Moving on"); } } @@ -499,13 +500,13 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{ try { Method m = mmDevice.getClass().getMethod("createRfcommSocket", new Class[]{int.class}); //Log.i(TAG,"connecting using createRfcommSocket"); - mmSocket = (BluetoothSocket) m.invoke(mmDevice, Integer.valueOf(1)); + mmSocket = (BluetoothSocket) m.invoke(mmDevice, 1); if (mmSocket != null) { //Looper.prepare(); timerDelayRemoveDialog(mmSocket); //Looper.loop(); mmSocket.connect(); - timeOutHandler.removeCallbacks(socketRunable); + timeOutHandler.removeCallbacks(socketRunnable); if (Looper.myLooper() != null) { Looper.myLooper().quit(); } @@ -533,7 +534,7 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{ timerDelayRemoveDialog(mmSocket); //Looper.loop(); mmSocket.connect(); - timeOutHandler.removeCallbacks(socketRunable); + timeOutHandler.removeCallbacks(socketRunnable); if (Looper.myLooper() != null) { Looper.myLooper().quit(); } @@ -562,7 +563,7 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{ timerDelayRemoveDialog(mmSocket); //Looper.loop(); mmSocket.connect(); - timeOutHandler.removeCallbacks(socketRunable); + timeOutHandler.removeCallbacks(socketRunnable); if (Looper.myLooper() != null) { Looper.myLooper().quit(); } @@ -584,7 +585,7 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{ timerDelayRemoveDialog(mmSocket); //Looper.loop(); mmSocket.connect(); - timeOutHandler.removeCallbacks(socketRunable); + timeOutHandler.removeCallbacks(socketRunnable); if (Looper.myLooper() != null) { Looper.myLooper().quit(); } @@ -701,7 +702,7 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{ private class ConnectedThread extends Thread { private final BluetoothSocket mmSocket; private final InputStream mmInStream; - SdlPsm psm; + final SdlPsm psm; public ConnectedThread(BluetoothSocket socket) { this.psm = new SdlPsm(); //Log.d(TAG, "Creating a Connected - Read Thread"); @@ -791,7 +792,7 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{ Field[] f = bsSocket.getClass().getDeclaredFields(); //int channel = -1; - BluetoothSocket mySocket = null; + BluetoothSocket mySocket; for (Field field : f) { if(field.getName().equals("mSocket")){ field.setAccessible(true); diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTcpTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTcpTransport.java index 50d6ba051..c640f67ba 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTcpTransport.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTcpTransport.java @@ -70,7 +70,7 @@ public class MultiplexTcpTransport extends MultiplexBaseTransport { private OutputStream mOutputStream = null; private MultiplexTcpTransport.TcpTransportThread mThread = null; private WriterThread writerThread; - private Context mContext; + private final Context mContext; public MultiplexTcpTransport(int port, String ipAddress, boolean autoReconnect, Handler handler, Context context) { @@ -182,7 +182,7 @@ public class MultiplexTcpTransport extends MultiplexBaseTransport { * Internal class that represents separate thread, that does actual work, related to connecting/reading/writing data */ private class TcpTransportThread extends Thread { - SdlPsm psm; + final SdlPsm psm; public TcpTransportThread(){ psm = new SdlPsm(); } @@ -358,7 +358,7 @@ public class MultiplexTcpTransport extends MultiplexBaseTransport { private class WriterThread extends Thread { private boolean isHalted = false; - private boolean mVerbose = false; + private final boolean mVerbose = false; final BlockingQueue<OutPacket> packetQueue = new LinkedBlockingQueue<>(); @Override @@ -433,9 +433,9 @@ public class MultiplexTcpTransport extends MultiplexBaseTransport { } private final class OutPacket{ - byte[] bytes; - int count; - int offset; + final byte[] bytes; + final int count; + final int offset; OutPacket(byte[] bytes, int offset, int count){ this.bytes = bytes; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java index 4d0ab0670..e2dd06521 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java @@ -67,8 +67,8 @@ public class MultiplexTransportConfig extends BaseTransportConfig{ */ public static final int FLAG_MULTI_SECURITY_HIGH = 0x30; - Context context; - String appId; + final Context context; + final String appId; ComponentName service; int securityLevel; @@ -143,7 +143,7 @@ public class MultiplexTransportConfig extends BaseTransportConfig{ } /** - * Get the securitly level that will be used to verify a router service before binding + * Get the security level that will be used to verify a router service before binding * @return the set security level * @see #FLAG_MULTI_SECURITY_OFF * @see #FLAG_MULTI_SECURITY_LOW diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexUsbTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexUsbTransport.java index 42bbc29a4..e76f2180c 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexUsbTransport.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexUsbTransport.java @@ -205,7 +205,7 @@ public class MultiplexUsbTransport extends MultiplexBaseTransport{ } private class ReaderThread extends Thread{ - SdlPsm psm; + final SdlPsm psm; final InputStream inputStream; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java index 78f78ccb2..39f5909b5 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java @@ -47,6 +47,7 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Handler; import android.os.Looper; + import androidx.annotation.NonNull; import com.smartdevicelink.util.AndroidTools; @@ -89,7 +90,7 @@ public class RouterServiceValidator { private static final String JSON_RESPONSE_OBJECT_TAG = "response"; - private static final String JSON_RESONSE_APP_VERSIONS_TAG = "versionBlacklist"; + private static final String JSON_RESPONSE_APP_VERSIONS_TAG = "versionBlacklist"; private static final String JSON_PUT_ARRAY_TAG = "installedApps"; private static final String JSON_APP_PACKAGE_TAG = "packageName"; @@ -112,7 +113,7 @@ public class RouterServiceValidator { * This will flag the validator to check for app version during debugging. * <br><br><b>NOTE: This flag will include a package check as well. */ - public static final int FLAG_DEBUG_VERSION_CHECK = 0x03; //We use 3 becuase version check will be 2, but since a version check implies a package check we do 2+1=3; + public static final int FLAG_DEBUG_VERSION_CHECK = 0x03; //We use 3 because version check will be 2, but since a version check implies a package check we do 2+1=3; public static final int FLAG_DEBUG_INSTALLED_FROM_CHECK = 0x04; public static final int FLAG_DEBUG_USE_TIMESTAMP_CHECK = 0x05; @@ -121,11 +122,10 @@ public class RouterServiceValidator { private int flags = FLAG_DEBUG_NONE; - private Context context= null; + private Context context; private boolean inDebugMode = false; - @SuppressWarnings("unused") private static boolean pendingListRefresh = false; - + private ComponentName service;//This is how we can save different routers over another in a waterfall method if we choose to. private static int securityLevel = -1; @@ -240,7 +240,7 @@ public class RouterServiceValidator { * FindRouterTask: AsyncTask to find the connected RouterService. */ class FindRouterTask extends AsyncTask<Context, Void, ComponentName> { - FindConnectedRouterCallback mCallback; + final FindConnectedRouterCallback mCallback; final Handler mHandler = new Handler(Looper.getMainLooper()); final Integer TIMEOUT_MSEC = 10000; // 10 sec @@ -356,7 +356,6 @@ public class RouterServiceValidator { || (this.inDebugMode && ((this.flags & FLAG_DEBUG_INSTALLED_FROM_CHECK) != FLAG_DEBUG_INSTALLED_FROM_CHECK)); } - @SuppressWarnings("unused") private boolean shouldOverrideTimeCheck(){ return (this.inDebugMode && ((this.flags & FLAG_DEBUG_USE_TIMESTAMP_CHECK) != FLAG_DEBUG_USE_TIMESTAMP_CHECK)); } @@ -402,17 +401,18 @@ public class RouterServiceValidator { ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); //PackageManager pm = context.getPackageManager(); - - for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) { - //Log.d(TAG, service.service.getClassName()); - //We will check to see if it contains this name, should be pretty specific - if ((service.service.getClassName()).toLowerCase(Locale.US).contains(SdlBroadcastReceiver.SDL_ROUTER_SERVICE_CLASS_NAME)){ - //this.service = service.service; //This is great - if(service.started && service.restarting==0){ //If this service has been started and is not crashed - return service.service; //appPackageForComponenetName(service.service,pm); + if (manager != null) { + for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) { + //Log.d(TAG, service.service.getClassName()); + //We will check to see if it contains this name, should be pretty specific + if ((service.service.getClassName()).toLowerCase(Locale.US).contains(SdlBroadcastReceiver.SDL_ROUTER_SERVICE_CLASS_NAME)) { + //this.service = service.service; //This is great + if (service.started && service.restarting == 0) { //If this service has been started and is not crashed + return service.service; //appPackageForComponenetName(service.service,pm); + } } } - } + } return null; } @@ -484,7 +484,7 @@ public class RouterServiceValidator { JSONObject trustedApps = stringToJson(getTrustedList(context)); JSONArray versions; - JSONObject app = null; + JSONObject app; try { app = trustedApps.getJSONObject(packageName); @@ -498,7 +498,7 @@ public class RouterServiceValidator { if(shouldOverrideVersionCheck()){ //If we don't care about versions, just return true return true; } - try { versions = app.getJSONArray(JSON_RESONSE_APP_VERSIONS_TAG); } catch (JSONException e) { e.printStackTrace();return false;} + try { versions = app.getJSONArray(JSON_RESPONSE_APP_VERSIONS_TAG); } catch (JSONException e) { e.printStackTrace();return false;} return verifyVersion(version, versions); } @@ -530,12 +530,12 @@ public class RouterServiceValidator { * @return */ private static List<SdlApp> findAllSdlApps(Context context){ - List<SdlApp> apps = new ArrayList<SdlApp>(); + List<SdlApp> apps = new ArrayList<>(); PackageManager packageManager = context.getPackageManager(); Intent intent = new Intent(); intent.setAction(TransportConstants.START_ROUTER_SERVICE_ACTION); List<ResolveInfo> infoList = packageManager.queryBroadcastReceivers(intent, 0); - //We want to sort our list so that we know it's the same everytime + //We want to sort our list so that we know it's the same every time Collections.sort(infoList,new Comparator<ResolveInfo>() { @Override public int compare(ResolveInfo lhs, ResolveInfo rhs) { @@ -583,7 +583,7 @@ public class RouterServiceValidator { } return false; } - + pendingListRefresh = true; //Might want to store a flag letting this class know a request is currently pending StringBuilder builder = new StringBuilder(); @@ -660,11 +660,13 @@ public class RouterServiceValidator { */ protected boolean isServiceRunning(Context context, ComponentName service){ ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); - for (RunningServiceInfo serviceInfo : manager.getRunningServices(Integer.MAX_VALUE)) { - if (serviceInfo.service.equals(service)) { - return true; - } - } + if (manager != null) { + for (RunningServiceInfo serviceInfo : manager.getRunningServices(Integer.MAX_VALUE)) { + if (serviceInfo.service.equals(service)) { + return true; + } + } + } return false; } @@ -703,9 +705,9 @@ public class RouterServiceValidator { return prefAdd.commit(); } /****************************************************************** - * + * * Saving the list for later!!! - * + * ******************************************************************/ /** @@ -796,8 +798,8 @@ public class RouterServiceValidator { * Class that holds all the info we want to send/receive from the validation server */ public static class SdlApp{ - String packageName; - int versionCode; + final String packageName; + final int versionCode; SdlApp(String packageName, int versionCode){ this.packageName = packageName; @@ -805,7 +807,7 @@ public class RouterServiceValidator { } } - public static enum TrustedAppStore{ + public enum TrustedAppStore{ PLAY_STORE("com.android.vending"), AMAZON("com.amazon.venezia"), XIAOMI("com.xiaomi.market"), @@ -815,7 +817,7 @@ public class RouterServiceValidator { HIAPK("com.hiapk.marketpho"), ; - String packageString; + final String packageString; private TrustedAppStore(String packageString){ this.packageString = packageString; } @@ -830,8 +832,8 @@ public class RouterServiceValidator { return false; } TrustedAppStore[] stores = TrustedAppStore.values(); - for(int i =0; i<stores.length; i++){ - if(packageString.equalsIgnoreCase(stores[i].packageString)){ + for (TrustedAppStore store : stores) { + if (packageString.equalsIgnoreCase(store.packageString)) { return true; } } @@ -843,8 +845,8 @@ public class RouterServiceValidator { * This interface is used as a callback to know when we have either obtained a list or at least returned from our attempt. * */ - public static interface TrustedListCallback{ - public void onListObtained(boolean successful); + public interface TrustedListCallback{ + void onListObtained(boolean successful); } } diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java index bad3ccc2e..3229d4abd 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java @@ -41,19 +41,14 @@ import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; import android.hardware.usb.UsbManager; import android.os.Build; -import android.os.Debug; import android.os.Looper; import android.os.Parcelable; import android.util.AndroidRuntimeException; import androidx.annotation.CallSuper; -import com.smartdevicelink.R; import com.smartdevicelink.transport.RouterServiceValidator.TrustedListCallback; import com.smartdevicelink.transport.enums.TransportType; import com.smartdevicelink.transport.utl.SdlDeviceListener; @@ -162,7 +157,7 @@ public abstract class SdlBroadcastReceiver extends BroadcastReceiver{ RouterServiceValidator.createTrustedListRequest(context, false, new TrustedListCallback(){ @Override public void onListObtained(boolean successful) { - //Log.v(TAG, "SDL enabled by router service from " + packageName + " compnent package " + componentName.getPackageName() + " - " + componentName.getClassName()); + //Log.v(TAG, "SDL enabled by router service from " + packageName + " component package " + componentName.getPackageName() + " - " + componentName.getClassName()); //List obtained. Let's start our service queuedService = componentName; finalIntent.setAction("com.sdl.noaction"); //Replace what's there so we do go into some unintended loop @@ -261,7 +256,7 @@ public abstract class SdlBroadcastReceiver extends BroadcastReceiver{ new ServiceFinder(context, context.getPackageName(), new ServiceFinder.ServiceFinderCallback() { @Override public void onComplete(Vector<ComponentName> routerServices) { - runningBluetoothServicePackage = new Vector<ComponentName>(); + runningBluetoothServicePackage = new Vector<>(); runningBluetoothServicePackage.addAll(routerServices); if (runningBluetoothServicePackage.isEmpty()) { //If there isn't a service running we should try to start one @@ -350,6 +345,7 @@ public abstract class SdlBroadcastReceiver extends BroadcastReceiver{ if (e != null && e instanceof AndroidRuntimeException && "android.app.RemoteServiceException".equals(e.getClass().getName()) //android.app.RemoteServiceException is a private class + && e.getMessage() != null && e.getMessage().contains("SdlRouterService")) { DebugTool.logInfo(TAG, "Handling failed startForegroundService call"); @@ -375,13 +371,15 @@ public abstract class SdlBroadcastReceiver extends BroadcastReceiver{ return false; } if (runningBluetoothServicePackage == null) { - runningBluetoothServicePackage = new Vector<ComponentName>(); + runningBluetoothServicePackage = new Vector<>(); } else { runningBluetoothServicePackage.clear(); } ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); - manager.getRunningAppProcesses(); - List<RunningServiceInfo> runningServices = null; + if (manager != null) { + manager.getRunningAppProcesses(); + } + List<RunningServiceInfo> runningServices; try { runningServices = manager.getRunningServices(Integer.MAX_VALUE); } catch (NullPointerException e) { @@ -450,7 +448,7 @@ public abstract class SdlBroadcastReceiver extends BroadcastReceiver{ ServiceFinder finder = new ServiceFinder(context, context.getPackageName(), new ServiceFinder.ServiceFinderCallback() { @Override public void onComplete(Vector<ComponentName> routerServices) { - runningBluetoothServicePackage = new Vector<ComponentName>(); + runningBluetoothServicePackage = new Vector<>(); runningBluetoothServicePackage.addAll(routerServices); requestTransportStatus(context,null,true,false); } @@ -473,7 +471,7 @@ public abstract class SdlBroadcastReceiver extends BroadcastReceiver{ return; } if((!lookForServices || isRouterServiceRunning(context)) && !runningBluetoothServicePackage.isEmpty()){ //So there is a service up, let's see if it's connected - final ConcurrentLinkedQueue<ComponentName> list = new ConcurrentLinkedQueue<ComponentName>(runningBluetoothServicePackage); + final ConcurrentLinkedQueue<ComponentName> list = new ConcurrentLinkedQueue<>(runningBluetoothServicePackage); final SdlRouterStatusProvider.ConnectedStatusCallback sdlBrCallback = new SdlRouterStatusProvider.ConnectedStatusCallback() { @Override diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java index 2fde0e817..8f569e7a2 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java @@ -70,12 +70,13 @@ import android.os.Parcel; import android.os.ParcelFileDescriptor; import android.os.Parcelable; import android.os.RemoteException; -import androidx.annotation.NonNull; -import androidx.core.app.NotificationCompat; import android.util.AndroidRuntimeException; import android.util.SparseArray; import android.util.SparseIntArray; +import androidx.annotation.NonNull; +import androidx.core.app.NotificationCompat; + import com.smartdevicelink.R; import com.smartdevicelink.marshal.JsonRPCMarshaller; import com.smartdevicelink.protocol.BinaryFrameHeader; @@ -152,18 +153,12 @@ public class SdlRouterService extends Service{ public static final String SDL_NOTIFICATION_FAQS_PAGE = "https://smartdevicelink.com/en/guides/android/frequently-asked-questions/sdl-notifications/"; - /** - * @deprecated use {@link TransportConstants#START_ROUTER_SERVICE_ACTION} instead - */ - @Deprecated - public static final String START_SERVICE_ACTION = "sdl.router.startservice"; public static final String REGISTER_WITH_ROUTER_ACTION = "com.sdl.android.register"; /** Message types sent from the BluetoothReadService Handler */ public static final int MESSAGE_STATE_CHANGE = 1; public static final int MESSAGE_READ = 2; - @SuppressWarnings("unused") - public static final int MESSAGE_WRITE = 3; + public static final int MESSAGE_WRITE = 3; public static final int MESSAGE_DEVICE_NAME = 4; public static final int MESSAGE_LOG = 5; @@ -1023,7 +1018,6 @@ public class SdlRouterService extends Service{ return true; } - @SuppressWarnings("unused") private void pingClients(){ Message message = Message.obtain(); DebugTool.logInfo(TAG, "Pinging "+ registeredApps.size()+ " clients"); @@ -1229,6 +1223,7 @@ public class SdlRouterService extends Service{ if (e != null && e instanceof AndroidRuntimeException && "android.app.RemoteServiceException".equals(e.getClass().getName()) //android.app.RemoteServiceException is a private class + && e.getMessage() != null && e.getMessage().contains("invalid channel for service notification")) { //This is the message received in the exception for notification channel issues // Set the flag to not delete the notification channel to avoid this exception in the future @@ -1442,7 +1437,6 @@ public class SdlRouterService extends Service{ } @SuppressLint("NewApi") - @SuppressWarnings("deprecation") private void enterForeground(String content, long chronometerLength, boolean ongoing) { DebugTool.logInfo(TAG, "Attempting to enter the foreground - " + System.currentTimeMillis()); @@ -1610,12 +1604,6 @@ public class SdlRouterService extends Service{ *********************************************** Helper Methods ************************************************************** ****************************************************************************************************************************************/ - @SuppressWarnings("SameReturnValue") - @Deprecated - public String getConnectedDeviceName(){ - return null; - } - private ArrayList<TransportRecord> getConnectedTransports(){ ArrayList<TransportRecord> connected = new ArrayList<>(); if(bluetoothTransport != null && bluetoothTransport.isConnected()){ @@ -1733,11 +1721,6 @@ public class SdlRouterService extends Service{ } } - @Deprecated - public void onTransportConnected(final TransportType type){ - onTransportConnected(new TransportRecord(type,null)); - } - public void onTransportConnected(final TransportRecord record){ cancelForegroundTimeOut(); enterForeground(createConnectedNotificationText(),0,true); @@ -1798,11 +1781,6 @@ public class SdlRouterService extends Service{ } - @Deprecated - public void onTransportDisconnected(TransportType type) { - onTransportDisconnected(new TransportRecord(type,null)); - } - public void onTransportDisconnected(TransportRecord record){ cachedModuleVersion = -1; //Reset our cached version //Stop any current pings being sent before the proper state can be determined. @@ -1911,16 +1889,6 @@ public class SdlRouterService extends Service{ } } - @Deprecated - public void onTransportError(TransportType transportType){ - onTransportError(new TransportRecord(transportType,null), null); - } - - @Deprecated - public void onTransportError(TransportRecord record) { - onTransportError(record, null); - } - public void onTransportError(TransportRecord transport, Bundle errorBundle){ switch (transport.getType()){ case BLUETOOTH: @@ -2012,7 +1980,7 @@ public class SdlRouterService extends Service{ } } - @SuppressWarnings("unused") //The return false after the packet null check is not dead code. Read the getByteArray method from bundle + //The return false after the packet null check is not dead code. Read the getByteArray method from bundle public boolean writeBytesToTransport(Bundle bundle){ if(bundle == null){ return false; @@ -2385,7 +2353,7 @@ public class SdlRouterService extends Service{ * And start SDL * @return a boolean if a connection was attempted */ - @SuppressWarnings({"MissingPermission", "unused"}) + @SuppressWarnings({"MissingPermission"}) public synchronized boolean bluetoothQuerryAndConnect(){ BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); if(adapter != null && adapter.isEnabled()){ @@ -2429,29 +2397,6 @@ public class SdlRouterService extends Service{ //************************************************************************************************************************************** //********************************************************* PREFERENCES **************************************************************** //************************************************************************************************************************************** - /** - * @deprecated - * This method will set the last known bluetooth connection method that worked with this phone. - * This helps speed up the process of connecting - * @param level The level of bluetooth connecting method that last worked - * @param prefLocation Where the preference should be stored - */ - @SuppressWarnings("DeprecatedIsStillUsed") - @Deprecated - public static void setBluetoothPrefs (int level, String prefLocation) { - DebugTool.logWarning(TAG, "This method is deprecated and will not take any action"); - } - - /** - * @deprecated - * This method has been deprecated as it was bad practice. - */ - @SuppressWarnings({"DeprecatedIsStillUsed", "SameReturnValue"}) - @Deprecated - public static int getBluetoothPrefs(String prefLocation) - { - return 0; - } /** * Set the connection establishment status of the particular device @@ -2756,7 +2701,6 @@ public class SdlRouterService extends Service{ // *********************************************************** UTILITY **************************************************************** //*****************************************************************************************************************************************/ - @SuppressWarnings("unused") private void debugPacket(byte[] bytes){ //DEBUG @@ -2940,7 +2884,7 @@ public class SdlRouterService extends Service{ * @deprecated Move to the new version checking system with meta-data * */ - @SuppressWarnings({"unused", "DeprecatedIsStillUsed"}) + @SuppressWarnings({"DeprecatedIsStillUsed"}) @Deprecated static class LocalRouterService implements Parcelable{ Intent launchIntent = null; @@ -3075,24 +3019,6 @@ public class SdlRouterService extends Service{ /** * This is a simple class to hold onto a reference of a registered app. * @param appId the supplied id for this app that is attempting to register - * @param messenger the specific messenger that is tied to this app - */ - @Deprecated - public RegisteredApp(String appId, Messenger messenger){ - this.appId = appId; - this.messenger = messenger; - this.sessionIds = new Vector<Long>(); - this.queues = new ConcurrentHashMap<>(); - queueWaitHandler = new Handler(); - registeredTransports = new SparseArray<ArrayList<TransportType>>(); - awaitingSession = new Vector<>(); - setDeathNote(); - routerMessagingVersion = 1; - } - - /** - * This is a simple class to hold onto a reference of a registered app. - * @param appId the supplied id for this app that is attempting to register * @param routerMessagingVersion * @param messenger the specific messenger that is tied to this app */ @@ -3184,7 +3110,6 @@ public class SdlRouterService extends Service{ } } - @SuppressWarnings("unused") public void clearSessionIds(){ this.sessionIds.clear(); } @@ -3373,11 +3298,6 @@ public class SdlRouterService extends Service{ } } - @Deprecated - public void handleMessage(int flags, byte[] packet) { - handleMessage(flags,packet,null); - } - public void handleMessage(int flags, byte[] packet, TransportType transportType){ if(flags == TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START){ clearBuffer(); @@ -3509,17 +3429,11 @@ public class SdlRouterService extends Service{ private static final int DELAY_COEF = 1; private static final int SIZE_COEF = 1; - private byte[] bytesToWrite = null; + private byte[] bytesToWrite; private final int offset, size, priorityCoefficient; private final long timestamp; final Bundle receivedBundle; TransportType transportType; - - @SuppressWarnings("SameParameterValue") - @Deprecated - public PacketWriteTask(byte[] bytes, int offset, int size, int priorityCoefficient) { - this(bytes, offset, size, priorityCoefficient,null); - } public PacketWriteTask(byte[] bytes, int offset, int size, int priorityCoefficient, TransportType transportType){ timestamp = System.currentTimeMillis(); diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java index 6a7230fcd..0640017d5 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java @@ -54,16 +54,16 @@ public class SdlRouterStatusProvider { private static final String TAG = "SdlRouterStateProvider"; - private Context context = null; + private Context context; private boolean isBound = false; - ConnectedStatusCallback cb = null; + ConnectedStatusCallback cb; Messenger routerServiceMessenger = null; - private ComponentName routerService = null; + private ComponentName routerService; private int flags = 0; final Messenger clientMessenger; - private ServiceConnection routerConnection= new ServiceConnection() { + private final ServiceConnection routerConnection= new ServiceConnection() { public void onServiceConnected(ComponentName className, IBinder service) { DebugTool.logInfo(TAG, "Bound to service " + className.toString()); @@ -167,7 +167,7 @@ public class SdlRouterStatusProvider { public ClientHandler(SdlRouterStatusProvider provider){ super(Looper.getMainLooper()); - this.provider = new WeakReference<SdlRouterStatusProvider>(provider); + this.provider = new WeakReference<>(provider); } @Override @@ -183,10 +183,10 @@ public class SdlRouterStatusProvider { break; } } - }; + } public interface ConnectedStatusCallback{ - public void onConnectionStatusUpdate(boolean connected, ComponentName service, Context context); + void onConnectionStatusUpdate(boolean connected, ComponentName service, Context context); } } diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportManager.java index 3df010bcf..4381b97c6 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportManager.java @@ -14,9 +14,9 @@ public class TCPTransportManager extends TransportManagerBase{ private static final String TAG = "TCPTransportManager"; - private TCPHandler tcpHandler; + private final TCPHandler tcpHandler; private MultiplexTcpTransport transport; - private TCPTransportConfig config; + private final TCPTransportConfig config; public TCPTransportManager(TCPTransportConfig config, TransportEventListener transportEventListener){ super(config,transportEventListener); diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java index 3851ab563..dd887b6d4 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java @@ -33,13 +33,10 @@ package com.smartdevicelink.transport; import android.annotation.SuppressLint; -import android.app.ActivityManager; -import android.app.ActivityManager.RunningServiceInfo; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -49,6 +46,9 @@ import android.os.Parcelable; import android.os.RemoteException; import android.os.TransactionTooLargeException; +import androidx.annotation.NonNull; +import androidx.annotation.RestrictTo; + import com.smartdevicelink.protocol.SdlPacket; import com.smartdevicelink.transport.enums.TransportType; import com.smartdevicelink.transport.utl.ByteAraryMessageAssembler; @@ -62,9 +62,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; -import java.util.Locale; +@RestrictTo(RestrictTo.Scope.LIBRARY) public class TransportBroker { private static final String TAG = "SdlTransportBroker"; @@ -80,9 +80,9 @@ public class TransportBroker { private static final TransportRecord LEGACY_TRANSPORT_RECORD = new TransportRecord(TransportType.BLUETOOTH,null); private final String WHERE_TO_REPLY_PREFIX = "com.sdl.android."; - private String appId = null; - private String whereToReply = null; - private Context currentContext = null; + private final String appId; + private final String whereToReply; + private Context currentContext; private final Object INIT_LOCK = new Object(); private final Object MESSAGE_SEND_LOCK = new Object(); @@ -92,7 +92,7 @@ public class TransportBroker { boolean isBound = false, registeredWithRouterService = false; private String routerPackage = null, routerClassName = null; - private ComponentName routerService = null; + private ComponentName routerService; private SdlPacket bufferedPacket = null; @@ -100,7 +100,7 @@ public class TransportBroker { private ServiceConnection routerConnection; private int routerServiceVersion = 1; - private int messagingVersion = MAX_MESSAGING_VERSION; + private final int messagingVersion = MAX_MESSAGING_VERSION; private void initRouterConnection() { routerConnection = new ServiceConnection() { @@ -180,11 +180,11 @@ public class TransportBroker { * Handler of incoming messages from service. */ static class ClientHandler extends Handler { - ClassLoader loader; + final ClassLoader loader; final WeakReference<TransportBroker> provider; public ClientHandler(TransportBroker provider) { - this.provider = new WeakReference<TransportBroker>(provider); + this.provider = new WeakReference<>(provider); loader = getClass().getClassLoader(); } @@ -235,7 +235,6 @@ public class TransportBroker { broker.registeredWithRouterService = false; broker.enableLegacyMode(true); //We call this so we can start the process of legacy connection - //onHardwareDisconnected(TransportType.BLUETOOTH); broker.onLegacyModeEnabled(); break; default: @@ -243,7 +242,7 @@ public class TransportBroker { DebugTool.logWarning(TAG, "Registration denied from router service. Reason - " + msg.arg1); break; } - ; + break; @@ -251,7 +250,6 @@ public class TransportBroker { if (msg.arg1 == TransportConstants.UNREGISTRATION_RESPONSE_SUCESS) { // We've been unregistered. Now what? - } else { //We were denied our unregister request to the router service, let's see why DebugTool.logWarning(TAG, "Unregister request denied from router service. Reason - " + msg.arg1); //Do we care? @@ -263,7 +261,7 @@ public class TransportBroker { DebugTool.logWarning(TAG, "Received packet message from router service with no bundle"); return; } - //So the intent has a packet with it. PEFRECT! Let's send it through the library + //So the intent has a packet with it. PERFECT! Let's send it through the library int flags = bundle.getInt(TransportConstants.BYTES_TO_SEND_FLAGS, TransportConstants.BYTES_TO_SEND_FLAG_NONE); if (bundle.containsKey(TransportConstants.FORMED_PACKET_EXTRA_NAME)) { @@ -310,10 +308,8 @@ public class TransportBroker { broker.bufferedPacket = null; } } - //} - //} } else { - DebugTool.logWarning(TAG, "Flase positive packet reception"); + DebugTool.logWarning(TAG, "False positive packet reception"); } break; case TransportConstants.HARDWARE_CONNECTION_EVENT: @@ -356,7 +352,7 @@ public class TransportBroker { } /** - * Handle a potential connection event. This will adapt legacy router service implementaions + * Handle a potential connection event. This will adapt legacy router service implementations * into the new multiple transport scheme. * @param bundle the received bundle from the router service * @param broker reference to the transport broker that this handler exists @@ -393,25 +389,19 @@ public class TransportBroker { @SuppressLint("SimpleDateFormat") - public TransportBroker(Context context, String appId, ComponentName service) { + public TransportBroker(@NonNull Context context, @NonNull String appId, @NonNull ComponentName service) { synchronized (INIT_LOCK) { + this.appId = appId; + currentContext = context; + this.routerService = service; + clientMessenger = new Messenger(new ClientHandler(this)); initRouterConnection(); - //So the user should have set the AppId, lets define where the intents need to be sent + + //So the user should have set the AppId, lets define where the messages need to be sent SimpleDateFormat s = new SimpleDateFormat("hhmmssss"); //So we have a time stamp of the event String timeStamp = s.format(new Date(System.currentTimeMillis())); - if (whereToReply == null) { - if (appId == null) { //This should really just throw an error - whereToReply = WHERE_TO_REPLY_PREFIX + "." + timeStamp; - } else { - whereToReply = WHERE_TO_REPLY_PREFIX + appId + "." + timeStamp; - } - } - //this.appId = appId.concat(timeStamp); - this.appId = appId; - currentContext = context; - //Log.d(TAG, "Registering our reply receiver: " + whereToReply); - this.routerService = service; + whereToReply = WHERE_TO_REPLY_PREFIX + appId + "." + timeStamp; } } @@ -422,7 +412,7 @@ public class TransportBroker { //Log.d(TAG, "Starting up transport broker for " + whereToReply); synchronized (INIT_LOCK) { if (currentContext == null) { - throw new IllegalStateException("This instance can't be started since it's local reference of context is null. Ensure when suppling a context to the TransportBroker that it is valid"); + throw new IllegalStateException("This instance can't be started since it's local reference of context is null. Ensure when supplying a context to the TransportBroker that it is valid"); } if (routerConnection == null) { initRouterConnection(); @@ -479,31 +469,11 @@ public class TransportBroker { public void onServiceUnregsiteredFromRouterService(int unregisterCode) { } - @Deprecated - public void onHardwareDisconnected(TransportType type) { - stop(); - } public void onHardwareDisconnected(TransportRecord record, List<TransportRecord> connectedTransports) { } - /** - * WILL NO LONGER BE CALLED - * - * @param type - * @return - */ - @Deprecated - public boolean onHardwareConnected(TransportType type) { - synchronized (INIT_LOCK) { - if (routerServiceMessenger == null) { - return false; - } - return true; - } - } - public boolean onHardwareConnected(List<TransportRecord> transports) { synchronized (INIT_LOCK) { if (routerServiceMessenger == null && transports != null && transports.size() > 0) { @@ -525,31 +495,7 @@ public class TransportBroker { return routerServiceVersion; } - /** - * We want to check to see if the Router service is already up and running - * - * @param context - * @return - */ - private boolean isRouterServiceRunning(Context context) { - if (context == null) { - - return false; - } - ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); - for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) { - //We will check to see if it contains this name, should be pretty specific - if ((service.service.getClassName()).toLowerCase(Locale.US).contains(SdlBroadcastReceiver.SDL_ROUTER_SERVICE_CLASS_NAME)) { - this.routerClassName = service.service.getClassName(); - this.routerPackage = service.service.getPackageName(); - return true; - } - } - return false; - } - - - public boolean sendPacketToRouterService(SdlPacket packet) { //We use ints because that is all that is supported by the outputstream class + public boolean sendPacketToRouterService(SdlPacket packet) { //We use ints because that is all that is supported by the output stream class //Log.d(TAG,whereToReply + "Sending packet to router service"); if (routerServiceMessenger == null) { @@ -617,16 +563,14 @@ public class TransportBroker { } //Make sure we know where to bind to if (this.routerService == null) { - if ((Build.VERSION.SDK_INT < Build.VERSION_CODES.O) && !isRouterServiceRunning(getContext())) {//We should be able to ignore this case because of the validation now - DebugTool.logInfo(TAG, whereToReply + " found no router service. Shutting down."); - this.onHardwareDisconnected(null); - return false; - } - } else {//We were already told where to bind. This should be the case. - this.routerClassName = this.routerService.getClassName(); - this.routerPackage = this.routerService.getPackageName(); + DebugTool.logInfo(TAG, whereToReply + " has no router service reference; should shut down."); + return false; } + this.routerClassName = this.routerService.getClassName(); + this.routerPackage = this.routerService.getPackageName(); + + if (!sendBindingIntent()) { DebugTool.logError(TAG, "Something went wrong while trying to bind with the router service."); SdlBroadcastReceiver.queryForConnectedService(currentContext); @@ -730,7 +674,7 @@ public class TransportBroker { */ private static boolean legacyModeEnabled = false; - private static Object LEGACY_LOCK = new Object(); + private static final Object LEGACY_LOCK = new Object(); protected void enableLegacyMode(boolean enable) { synchronized (LEGACY_LOCK) { diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java index c653c7d93..13edfb5f1 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java @@ -55,7 +55,6 @@ import com.smartdevicelink.util.DebugTool; import java.lang.ref.WeakReference; import java.util.List; -@SuppressWarnings("unused") public class TransportManager extends TransportManagerBase{ private static final String TAG = "TransportManager"; @@ -97,7 +96,7 @@ public class TransportManager extends TransportManagerBase{ @Override public void onFinishedValidation(boolean valid, ComponentName name) { DebugTool.logInfo(TAG, "onFinishedValidation valid=" + valid + "; name=" + ((name == null)? "null" : name.getPackageName())); - if (valid) { + if (valid && name != null) { mConfig.service = name; transport = new TransportBrokerImpl(contextWeakReference.get(), mConfig.appId, mConfig.service); DebugTool.logInfo(TAG, "TransportManager start was called; transport=" + transport); @@ -244,7 +243,7 @@ public class TransportManager extends TransportManagerBase{ String[] split = address.split(":"); if(split.length == 2) { bundle.putString(ControlFrameTags.RPC.TransportEventUpdate.TCP_IP_ADDRESS, split[0]); - bundle.putInt(ControlFrameTags.RPC.TransportEventUpdate.TCP_PORT, Integer.valueOf(split[1])); + bundle.putInt(ControlFrameTags.RPC.TransportEventUpdate.TCP_PORT, Integer.parseInt(split[1])); } //else {something went wrong;} }else{ bundle.putString(ControlFrameTags.RPC.TransportEventUpdate.TCP_IP_ADDRESS, address); @@ -450,7 +449,7 @@ public class TransportManager extends TransportManagerBase{ String action = intent.getAction(); if(BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)){ exitLegacyMode("Bluetooth disconnected"); - }else if(action.equalsIgnoreCase(BluetoothAdapter.ACTION_STATE_CHANGED)){ + }else if(action != null && action.equalsIgnoreCase(BluetoothAdapter.ACTION_STATE_CHANGED)){ int bluetoothState = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1); if(bluetoothState == BluetoothAdapter.STATE_TURNING_OFF || bluetoothState == BluetoothAdapter.STATE_OFF){ DebugTool.logInfo(TAG, "Bluetooth is shutting off, exiting legacy mode."); diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java index cd351a622..0b0c9b88d 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java @@ -71,7 +71,7 @@ public class UsbTransferProvider { ParcelFileDescriptor usbPfd; Bundle usbInfoBundle; - private ServiceConnection routerConnection= new ServiceConnection() { + private final ServiceConnection routerConnection= new ServiceConnection() { public void onServiceConnected(ComponentName className, IBinder service) { DebugTool.logInfo(TAG, "Bound to service " + className.toString()); @@ -212,7 +212,7 @@ public class UsbTransferProvider { public ClientHandler(UsbTransferProvider provider){ super(Looper.getMainLooper()); - this.provider = new WeakReference<UsbTransferProvider>(provider); + this.provider = new WeakReference<>(provider); } @Override diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java index 9ab93aea9..670711709 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java @@ -50,11 +50,11 @@ public class ByteArrayMessageSpliter { boolean firstPacket; ByteArrayInputStream stream; int bytesRead; - int what; - String appId; + final int what; + final String appId; byte[] buffer; - int orginalSize; - int priorityCoef; + final int orginalSize; + final int priorityCoef; int routerServiceVersion = 1; TransportRecord transportRecord; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java index b9bd8bb12..1ca1f8d97 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java @@ -39,6 +39,7 @@ import android.content.SharedPreferences; import android.os.Handler; import android.os.Looper; import android.os.Message; + import androidx.annotation.NonNull; import com.smartdevicelink.transport.MultiplexBaseTransport; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java index 0e75acd77..ea2bf709f 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java @@ -84,7 +84,7 @@ public class AndroidTools { public static HashMap<String,ResolveInfo> getSdlEnabledApps(Context context, String myPackageName){ Intent intent = new Intent(TransportConstants.START_ROUTER_SERVICE_ACTION); List<ResolveInfo> infos = context.getPackageManager().queryBroadcastReceivers(intent, 0); - HashMap<String,ResolveInfo> sdlMultiList = new HashMap<String,ResolveInfo>(); + HashMap<String,ResolveInfo> sdlMultiList = new HashMap<>(); for(ResolveInfo info: infos){ if(info.activityInfo.applicationInfo.packageName.equals(myPackageName)){ continue; //Ignoring my own package @@ -111,7 +111,7 @@ public class AndroidTools { if(packageManager != null) { for (ResolveInfo info : resolveInfoList) { - PackageInfo packageInfo = null; + PackageInfo packageInfo; try { packageInfo = packageManager.getPackageInfo(info.serviceInfo.packageName, 0); sdlAppInfoList.add(new SdlAppInfo(info, packageInfo)); diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/util/HttpRequestTask.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/HttpRequestTask.java index 44125dff2..1cc0b514c 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/util/HttpRequestTask.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/HttpRequestTask.java @@ -146,7 +146,7 @@ public class HttpRequestTask extends AsyncTask<String, String, String> { } return null; } - String response = null; + String response; response = buffer.toString(); //send to post execute @@ -199,12 +199,12 @@ public class HttpRequestTask extends AsyncTask<String, String, String> { * Called when HTTP request is successfully completed. * @param response The response to the HTTP request. */ - public abstract void httpCallComplete(String response); + void httpCallComplete(String response); /** * Called when HTTP request failed. * @param statusCode The HTTP failure code. */ - public abstract void httpFailure(int statusCode); + void httpFailure(int statusCode); } } diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/util/IntegrationValidator.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/IntegrationValidator.java index 6553da286..d88912c62 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/util/IntegrationValidator.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/IntegrationValidator.java @@ -113,8 +113,8 @@ public class IntegrationValidator { if (permissionInfos != null && permissionInfos.length > 0) { String permissionInfo; - for (int i = 0; i < permissionInfos.length; i++) { - permissionInfo = permissionInfos[i]; + for (String info : permissionInfos) { + permissionInfo = info; permissionList.remove(permissionInfo); } } @@ -147,9 +147,9 @@ public class IntegrationValidator { if (receivers != null && receivers.length > 0) { ActivityInfo receiver; - for (int i = 0; i < receivers.length; i++) { + for (ActivityInfo activityInfo : receivers) { - receiver = receivers[i]; + receiver = activityInfo; if (receiver != null) { int j = 0; for (ResolveInfo sdlReceiver : sdlReceivers) { diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/util/MediaStreamingStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/MediaStreamingStatus.java index 84c21f761..e7a4b69d6 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/util/MediaStreamingStatus.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/MediaStreamingStatus.java @@ -43,6 +43,7 @@ import android.content.IntentFilter; import android.media.AudioDeviceInfo; import android.media.AudioManager; import android.os.Build; + import androidx.annotation.NonNull; import java.lang.ref.WeakReference; @@ -63,9 +64,9 @@ public class MediaStreamingStatus { private static final Object BROADCAST_RECEIVER_LOCK = new Object(); private boolean broadcastReceiverValid = true; - private WeakReference<Context> contextWeakReference; + private final WeakReference<Context> contextWeakReference; private Callback callback; - private List<String> intentList; + private final List<String> intentList; public MediaStreamingStatus(@NonNull Context context, @NonNull Callback callback){ contextWeakReference = new WeakReference<>(context); @@ -115,11 +116,13 @@ public class MediaStreamingStatus { // If API level 23+ audio manager can iterate over all current devices to see if a supported // device is present. if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){ - AudioDeviceInfo[] deviceInfos = audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS); - if(deviceInfos != null) { - for (AudioDeviceInfo deviceInfo : deviceInfos) { - if (deviceInfo != null && isSupportedAudioDevice(deviceInfo.getType())) { - return true; + if (audioManager != null) { + AudioDeviceInfo[] deviceInfos = audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS); + if (deviceInfos != null) { + for (AudioDeviceInfo deviceInfo : deviceInfos) { + if (deviceInfo != null && isSupportedAudioDevice(deviceInfo.getType())) { + return true; + } } } } @@ -127,7 +130,11 @@ public class MediaStreamingStatus { } //This means the SDK version is < M, and our min is 8 so this API is always available - return audioManager.isBluetoothA2dpOn(); + if (audioManager != null) { + return audioManager.isBluetoothA2dpOn(); + } + + return false; } /** @@ -268,7 +275,7 @@ public class MediaStreamingStatus { } } - private BroadcastReceiver broadcastReceiver = new BroadcastReceiver() { + private final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { synchronized (BROADCAST_RECEIVER_LOCK) { diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java index 0a08a3f16..35c852c09 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java @@ -53,7 +53,7 @@ public class SdlAppInfo { String packageName; ComponentName routerServiceComponentName; - int routerServiceVersion = 4; //We use this as a default and assume if the number doens't exist in meta data it is because the app hasn't updated. + int routerServiceVersion = 4; //We use this as a default and assume if the number doesn't exist in meta data it is because the app hasn't updated. boolean isCustomRouterService = false; long lastUpdateTime; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/util/ServiceFinder.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/ServiceFinder.java index 9265eb345..0848446ef 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/util/ServiceFinder.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/ServiceFinder.java @@ -91,7 +91,7 @@ public class ServiceFinder { } - BroadcastReceiver mainServiceReceiver = new BroadcastReceiver() { + final BroadcastReceiver mainServiceReceiver = new BroadcastReceiver() { private final Object LIST_LOCK = new Object(); @Override diff --git a/android/sdl_android/src/test/java/com/smartdevicelink/managers/video/HapticInterfaceManagerTest.java b/android/sdl_android/src/test/java/com/smartdevicelink/managers/video/HapticInterfaceManagerTest.java index 7c854cbe4..1e147a728 100644 --- a/android/sdl_android/src/test/java/com/smartdevicelink/managers/video/HapticInterfaceManagerTest.java +++ b/android/sdl_android/src/test/java/com/smartdevicelink/managers/video/HapticInterfaceManagerTest.java @@ -24,7 +24,7 @@ package com.smartdevicelink.managers.video; import android.view.View; import android.view.ViewGroup; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.HapticRect; import com.smartdevicelink.proxy.rpc.Rectangle; import com.smartdevicelink.proxy.rpc.SendHapticData; diff --git a/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java b/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java index 8e2b5b84d..dce30db8e 100644 --- a/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java @@ -47,7 +47,6 @@ import com.smartdevicelink.proxy.RPCMessage; import com.smartdevicelink.proxy.RPCNotification; import com.smartdevicelink.proxy.RPCRequest; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.ChangeRegistration; import com.smartdevicelink.proxy.rpc.OnHMIStatus; import com.smartdevicelink.proxy.rpc.RegisterAppInterfaceResponse; @@ -257,7 +256,7 @@ abstract class BaseSdlManager { if (onRPCNotificationListeners != null) { Set<FunctionID> functionIDSet = onRPCNotificationListeners.keySet(); if (functionIDSet != null && !functionIDSet.isEmpty()) { - queuedNotifications = new ConcurrentLinkedQueue<RPCNotification>(); + queuedNotifications = new ConcurrentLinkedQueue<>(); queuedNotificationListener = new OnRPCNotificationListener() { @Override public void onNotified(RPCNotification notification) { @@ -306,7 +305,6 @@ abstract class BaseSdlManager { /** * Starts up a SdlManager, and calls provided callback called once all BaseSubManagers are done setting up */ - @SuppressWarnings("unchecked") public void start() { LifecycleManager.AppConfig appConfig = new LifecycleManager.AppConfig(); appConfig.setAppName(appName); @@ -600,7 +598,7 @@ abstract class BaseSdlManager { // BUILDER public static class Builder { - SdlManager sdlManager; + final SdlManager sdlManager; Builder(@NonNull final String appId, @NonNull final String appName, @NonNull final SdlManagerListener listener) { sdlManager = new SdlManager(); @@ -612,7 +610,7 @@ abstract class BaseSdlManager { /** * Sets the App ID * - * @param appId String representation of the App ID retreived from the SDL Developer Portal + * @param appId String representation of the App ID retrieved from the SDL Developer Portal */ public Builder setAppId(@NonNull final String appId) { sdlManager.appId = appId; diff --git a/base/src/main/java/com/smartdevicelink/managers/BaseSubManager.java b/base/src/main/java/com/smartdevicelink/managers/BaseSubManager.java index f5f875467..11de4359b 100644 --- a/base/src/main/java/com/smartdevicelink/managers/BaseSubManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/BaseSubManager.java @@ -35,7 +35,6 @@ import androidx.annotation.CallSuper; import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.transport.utl.TransportRecord; import java.util.List; diff --git a/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java b/base/src/main/java/com/smartdevicelink/managers/ISdl.java index d8a70b062..5885f4dc4 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java +++ b/base/src/main/java/com/smartdevicelink/managers/ISdl.java @@ -1,23 +1,19 @@ -package com.smartdevicelink.proxy.interfaces; +package com.smartdevicelink.managers; import androidx.annotation.NonNull; import com.livio.taskmaster.Taskmaster; -import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener; import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager; +import com.smartdevicelink.protocol.ISdlServiceListener; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.protocol.enums.SessionType; import com.smartdevicelink.proxy.RPCMessage; -import com.smartdevicelink.proxy.RPCRequest; import com.smartdevicelink.proxy.rpc.RegisterAppInterfaceResponse; import com.smartdevicelink.proxy.rpc.SdlMsgVersion; -import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType; import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener; import com.smartdevicelink.proxy.rpc.listeners.OnRPCListener; import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener; import com.smartdevicelink.proxy.rpc.listeners.OnRPCRequestListener; -import com.smartdevicelink.streaming.audio.AudioStreamingCodec; -import com.smartdevicelink.streaming.audio.AudioStreamingParams; import com.smartdevicelink.streaming.video.VideoStreamingParameters; import com.smartdevicelink.util.Version; @@ -54,7 +50,6 @@ import java.util.List; * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -@SuppressWarnings("unused") public interface ISdl { /** @@ -89,7 +84,7 @@ public interface ISdl { /** * Starts the video streaming service - * @param parameters desired video streaming params for this sevice to be started with + * @param parameters desired video streaming params for this service to be started with * @param encrypted flag to start this service with encryption or not */ void startVideoService(VideoStreamingParameters parameters, boolean encrypted); diff --git a/base/src/main/java/com/smartdevicelink/managers/ManagerUtility.java b/base/src/main/java/com/smartdevicelink/managers/ManagerUtility.java index f9910032c..b788bab1c 100644 --- a/base/src/main/java/com/smartdevicelink/managers/ManagerUtility.java +++ b/base/src/main/java/com/smartdevicelink/managers/ManagerUtility.java @@ -80,7 +80,7 @@ public class ManagerUtility { if (windowCapability != null && windowCapability.getTextFields() != null) { for (TextField field : windowCapability.getTextFields()) { int fieldNumber = 0; - if(field != null) { + if(field != null && field.getName() != null) { switch (field.getName()) { case mainField1: fieldNumber = 1; diff --git a/base/src/main/java/com/smartdevicelink/managers/audio/BaseAudioStreamManager.java b/base/src/main/java/com/smartdevicelink/managers/audio/BaseAudioStreamManager.java index e4c191308..65bf6e3e1 100644 --- a/base/src/main/java/com/smartdevicelink/managers/audio/BaseAudioStreamManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/audio/BaseAudioStreamManager.java @@ -34,7 +34,7 @@ package com.smartdevicelink.managers.audio; import androidx.annotation.NonNull; import com.smartdevicelink.managers.BaseSubManager; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; abstract class BaseAudioStreamManager extends BaseSubManager { BaseAudioStreamManager(@NonNull ISdl internalInterface) { diff --git a/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java b/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java index e1a5414a1..e6c67d2b8 100644 --- a/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java @@ -38,11 +38,11 @@ import androidx.annotation.RestrictTo; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.managers.file.filetypes.SdlFile; import com.smartdevicelink.proxy.RPCRequest; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.DeleteFile; import com.smartdevicelink.proxy.rpc.DeleteFileResponse; import com.smartdevicelink.proxy.rpc.ListFiles; @@ -82,10 +82,11 @@ abstract class BaseFileManager extends BaseSubManager { final static String TAG = "FileManager"; final static int SPACE_AVAILABLE_MAX_VALUE = 2000000000; - private List<String> remoteFiles, uploadedEphemeralFileNames; + private List<String> remoteFiles; + private final List<String> uploadedEphemeralFileNames; private int bytesAvailable = SPACE_AVAILABLE_MAX_VALUE; - private FileManagerConfig fileManagerConfig; - private HashMap<String, Integer> failedFileUploadsIndex; + private final FileManagerConfig fileManagerConfig; + private final HashMap<String, Integer> failedFileUploadsIndex; /** * Constructor for BaseFileManager @@ -117,7 +118,7 @@ abstract class BaseFileManager extends BaseSubManager { */ public List<String> getRemoteFileNames() { if (getState() != BaseSubManager.READY){ - // error and dont return list + // error and don't return list throw new IllegalArgumentException("FileManager is not READY"); } // return list (this is synchronous at this point) @@ -239,9 +240,9 @@ abstract class BaseFileManager extends BaseSubManager { int fileNum = 0; @Override - public void addCorrelationId(int correlationid) { - super.addCorrelationId(correlationid); - requestMap.put(correlationid, requests.get(fileNum++)); + public void addCorrelationId(int correlationId) { + super.addCorrelationId(correlationId); + requestMap.put(correlationId, requests.get(fileNum++)); } @Override @@ -270,18 +271,20 @@ abstract class BaseFileManager extends BaseSubManager { PutFileResponse putFileResponse = (PutFileResponse) response; bytesAvailable = putFileResponse.getSpaceAvailable() != null ? putFileResponse.getSpaceAvailable() : SPACE_AVAILABLE_MAX_VALUE; - if (requestMap.get(correlationId) != null) { - remoteFiles.add(((PutFile) requestMap.get(correlationId)).getSdlFileName()); - uploadedEphemeralFileNames.add(((PutFile) requestMap.get(correlationId)).getSdlFileName()); + PutFile putFile = ((PutFile) requestMap.get(correlationId)); + if (putFile != null) { + remoteFiles.add(putFile.getSdlFileName()); + uploadedEphemeralFileNames.add(putFile.getSdlFileName()); } } else if (response instanceof DeleteFileResponse) { DeleteFileResponse deleteFileResponse = (DeleteFileResponse) response; bytesAvailable = deleteFileResponse.getSpaceAvailable() != null ? deleteFileResponse.getSpaceAvailable() : SPACE_AVAILABLE_MAX_VALUE; - if (requestMap.get(correlationId) != null) { - remoteFiles.remove(((DeleteFile) requestMap.get(correlationId)).getSdlFileName()); - uploadedEphemeralFileNames.remove(((DeleteFile) requestMap.get(correlationId)).getSdlFileName()); + DeleteFile deleteFile = (DeleteFile) requestMap.get(correlationId); + if (deleteFile != null) { + remoteFiles.remove(deleteFile.getSdlFileName()); + uploadedEphemeralFileNames.remove(deleteFile.getSdlFileName()); } } } else { diff --git a/base/src/main/java/com/smartdevicelink/managers/file/FileManagerConfig.java b/base/src/main/java/com/smartdevicelink/managers/file/FileManagerConfig.java index 4ec20b875..7ff6207d6 100644 --- a/base/src/main/java/com/smartdevicelink/managers/file/FileManagerConfig.java +++ b/base/src/main/java/com/smartdevicelink/managers/file/FileManagerConfig.java @@ -25,7 +25,7 @@ public class FileManagerConfig { /** * Setter for Integer artWorkRetryCount * - * @param artworkRetryCount + * @param artworkRetryCount the number of retry attempts */ public void setArtworkRetryCount(int artworkRetryCount) { this.artworkRetryCount = artworkRetryCount; @@ -43,7 +43,7 @@ public class FileManagerConfig { /** * Setter for Integer fileRetryCount * - * @param fileRetryCount + * @param fileRetryCount the number of retry attempts */ public void setFileRetryCount(int fileRetryCount) { this.fileRetryCount = fileRetryCount; diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseEncryptionLifecycleManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseEncryptionLifecycleManager.java index a458ae048..2e005ef68 100644 --- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseEncryptionLifecycleManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseEncryptionLifecycleManager.java @@ -33,13 +33,14 @@ package com.smartdevicelink.managers.lifecycle; import androidx.annotation.NonNull; -import com.smartdevicelink.SdlConnection.SdlSession; + +import com.smartdevicelink.session.SdlSession; import com.smartdevicelink.managers.ServiceEncryptionListener; +import com.smartdevicelink.protocol.ISdlServiceListener; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.protocol.enums.SessionType; import com.smartdevicelink.proxy.RPCNotification; -import com.smartdevicelink.proxy.interfaces.ISdl; -import com.smartdevicelink.proxy.interfaces.ISdlServiceListener; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.OnHMIStatus; import com.smartdevicelink.proxy.rpc.OnPermissionsChange; import com.smartdevicelink.proxy.rpc.PermissionItem; @@ -53,12 +54,12 @@ import java.util.Set; abstract class BaseEncryptionLifecycleManager { private static final String TAG = "BaseEncryptionLifecycleManager"; - private ISdl internalInterface; + private final ISdl internalInterface; private ServiceEncryptionListener serviceEncryptionListener; private HMILevel currentHMILevel; - private Set<String> encryptionRequiredRPCs = new HashSet<>(); + private final Set<String> encryptionRequiredRPCs = new HashSet<>(); private boolean rpcSecuredServiceStarted; - ISdlServiceListener securedServiceListener; + final ISdlServiceListener securedServiceListener; BaseEncryptionLifecycleManager(@NonNull ISdl isdl, ServiceEncryptionListener listener) { internalInterface = isdl; 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 c8566dbad..03158c73c 100644 --- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java @@ -36,9 +36,10 @@ import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; import com.livio.taskmaster.Taskmaster; -import com.smartdevicelink.SdlConnection.ISdlSessionListener; -import com.smartdevicelink.SdlConnection.SdlSession; +import com.smartdevicelink.session.ISdlSessionListener; +import com.smartdevicelink.session.SdlSession; import com.smartdevicelink.exception.SdlException; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.SdlManager; import com.smartdevicelink.managers.ServiceEncryptionListener; import com.smartdevicelink.marshal.JsonRPCMarshaller; @@ -50,8 +51,7 @@ import com.smartdevicelink.proxy.RPCMessage; import com.smartdevicelink.proxy.RPCNotification; import com.smartdevicelink.proxy.RPCRequest; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; -import com.smartdevicelink.proxy.interfaces.ISdlServiceListener; +import com.smartdevicelink.protocol.ISdlServiceListener; import com.smartdevicelink.proxy.rpc.GenericResponse; import com.smartdevicelink.proxy.rpc.OnAppInterfaceUnregistered; import com.smartdevicelink.proxy.rpc.OnButtonEvent; @@ -110,7 +110,7 @@ abstract class BaseLifecycleManager { ON_NOTIFICATION_LISTENER_LOCK = new Object(); SdlSession session; - AppConfig appConfig; + final AppConfig appConfig; Version rpcSpecVersion = MAX_SUPPORTED_RPC_VERSION; HashMap<Integer, CopyOnWriteArrayList<OnRPCListener>> rpcListeners; HashMap<Integer, OnRPCResponseListener> rpcResponseListeners; @@ -121,11 +121,11 @@ abstract class BaseLifecycleManager { RegisterAppInterfaceResponse raiResponse = null; private OnHMIStatus currentHMIStatus; boolean firstTimeFull = true; - LifecycleListener lifecycleListener; + final LifecycleListener lifecycleListener; private List<Class<? extends SdlSecurityBase>> _secList = null; private String authToken; - Version minimumProtocolVersion; - Version minimumRPCVersion; + final Version minimumProtocolVersion; + final Version minimumRPCVersion; BaseTransportConfig _transportConfig; private Taskmaster taskmaster; @@ -270,7 +270,7 @@ abstract class BaseLifecycleManager { * This method is used to ensure all of the methods in this class can remain private and no grantees can be made * to the developer what methods are available or not. * - * <b>NOTE: THERE IS NO GURANTEE THIS WILL BE A VALID SYSTEM CAPABILITY MANAGER</b> + * <b>NOTE: THERE IS NO GUARANTEE THIS WILL BE A VALID SYSTEM CAPABILITY MANAGER</b> * * @param sdlManager this must be a working manager instance * @return the system capability manager. @@ -347,7 +347,7 @@ abstract class BaseLifecycleManager { addRpcListener(FunctionID.UNREGISTER_APP_INTERFACE, rpcListener); } - private OnRPCListener rpcListener = new OnRPCListener() { + private final OnRPCListener rpcListener = new OnRPCListener() { @Override public void onReceived(RPCMessage message) { //Make sure this is a response as expected @@ -480,7 +480,10 @@ abstract class BaseLifecycleManager { rpcListeners.put(id.getId(), new CopyOnWriteArrayList<OnRPCListener>()); } - rpcListeners.get(id.getId()).add(listener); + CopyOnWriteArrayList<OnRPCListener> listeners = rpcListeners.get(id.getId()); + if (listeners != null) { + listeners.add(listener); + } } } } @@ -537,7 +540,6 @@ abstract class BaseLifecycleManager { } } - @SuppressWarnings("unused") private HashMap<Integer, OnRPCResponseListener> getResponseListeners() { synchronized (ON_UPDATE_LISTENER_LOCK) { return this.rpcResponseListeners; @@ -590,7 +592,6 @@ abstract class BaseLifecycleManager { * @param notificationId The notification type that this listener is designated for * @param listener The listener that will be called when a notification of the provided type is received */ - @SuppressWarnings("unused") private void addOnRPCNotificationListener(FunctionID notificationId, OnRPCNotificationListener listener) { synchronized (ON_NOTIFICATION_LISTENER_LOCK) { if (notificationId != null && listener != null) { @@ -641,7 +642,6 @@ abstract class BaseLifecycleManager { * @param requestId The request type that this listener is designated for * @param listener The listener that will be called when a request of the provided type is received */ - @SuppressWarnings("unused") private void addOnRPCRequestListener(FunctionID requestId, OnRPCRequestListener listener) { synchronized (ON_REQUEST_LISTENER_LOCK) { if (requestId != null && listener != null) { @@ -832,7 +832,7 @@ abstract class BaseLifecycleManager { } else if (RPCMessage.KEY_NOTIFICATION.equals(messageType)) { FunctionID functionID = rpc.getFunctionID(); - if (functionID != null && (functionID.equals(FunctionID.ON_BUTTON_PRESS)) || functionID.equals(FunctionID.ON_BUTTON_EVENT)) { + if ((FunctionID.ON_BUTTON_PRESS.equals(functionID)) || FunctionID.ON_BUTTON_EVENT.equals(functionID)) { RPCNotification notificationCompat = handleButtonNotificationFormatting(rpc); if (notificationCompat != null) { onRPCNotificationReceived((notificationCompat)); @@ -1003,6 +1003,7 @@ abstract class BaseLifecycleManager { return BaseLifecycleManager.this.session.isTransportForServiceAvailable(serviceType); } + @NonNull @Override public SdlMsgVersion getSdlMsgVersion() { SdlMsgVersion msgVersion = new SdlMsgVersion(rpcSpecVersion.getMajor(), rpcSpecVersion.getMinor()); @@ -1010,6 +1011,7 @@ abstract class BaseLifecycleManager { return msgVersion; } + @NonNull @Override public Version getProtocolVersion() { return BaseLifecycleManager.this.getProtocolVersion(); diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java index d53dfe9bd..052ecb5c4 100644 --- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java @@ -31,11 +31,11 @@ */ package com.smartdevicelink.managers.lifecycle; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.ManagerUtility; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCMessage; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.AppServiceCapability; import com.smartdevicelink.proxy.rpc.AppServicesCapabilities; import com.smartdevicelink.proxy.rpc.ButtonCapabilities; @@ -80,7 +80,6 @@ abstract class BaseSystemCapabilityManager { private final HashMap<SystemCapabilityType, CopyOnWriteArrayList<OnSystemCapabilityListener>> onSystemCapabilityListeners; private final Object LISTENER_LOCK; private final ISdl callback; - private OnRPCListener rpcListener; private boolean shouldConvertDeprecatedDisplayCapabilities; private HMILevel currentHMILevel; @@ -265,7 +264,7 @@ abstract class BaseSystemCapabilityManager { } private void setupRpcListeners() { - rpcListener = new OnRPCListener() { + OnRPCListener rpcListener = new OnRPCListener() { @Override public void onReceived(RPCMessage message) { if (message != null) { @@ -627,7 +626,7 @@ abstract class BaseSystemCapabilityManager { //We return a new list of type T instead of null because while we don't know if //the original list was of type T we want to ensure that we don't throw a cast class exception //but still - return new ArrayList<T>(); + return new ArrayList<>(); } } else { return null; diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/PoliciesFetcher.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/PoliciesFetcher.java index a217cfb07..41a83cd12 100644 --- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/PoliciesFetcher.java +++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/PoliciesFetcher.java @@ -39,11 +39,17 @@ import com.smartdevicelink.proxy.rpc.SystemRequest; import com.smartdevicelink.proxy.rpc.enums.FileType; import com.smartdevicelink.proxy.rpc.enums.RequestType; import com.smartdevicelink.util.DebugTool; + import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import java.io.*; +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.ProtocolException; @@ -63,7 +69,7 @@ class PoliciesFetcher { boolean bDoOutput = true; boolean bDoInput = true; boolean bUsesCaches = false; - String sRequestMeth = "POST"; + String sRequestMethod = "POST"; boolean bInstFolRed = false; String sCharSet = "utf-8"; @@ -81,7 +87,7 @@ class PoliciesFetcher { bDoOutput = myHeader.getDoOutput(); bDoInput = myHeader.getDoInput(); bUsesCaches = myHeader.getUseCaches(); - sRequestMeth = myHeader.getRequestMethod(); + sRequestMethod = myHeader.getRequestMethod(); iReadTimeout = myHeader.getReadTimeout(); bInstFolRed = myHeader.getInstanceFollowRedirects(); sCharSet = myHeader.getCharset(); @@ -96,12 +102,12 @@ class PoliciesFetcher { urlConnection.setConnectTimeout(CONNECTION_TIMEOUT); urlConnection.setDoOutput(bDoOutput); urlConnection.setDoInput(bDoInput); - urlConnection.setRequestMethod(sRequestMeth); + urlConnection.setRequestMethod(sRequestMethod); urlConnection.setReadTimeout(READ_TIMEOUT); urlConnection.setInstanceFollowRedirects(bInstFolRed); urlConnection.setRequestProperty("Content-Type", sContentType); urlConnection.setRequestProperty("charset", sCharSet); - urlConnection.setRequestProperty("Content-Length", "" + Integer.toString(iContentLength)); + urlConnection.setRequestProperty("Content-Length", "" + iContentLength); urlConnection.setUseCaches(bUsesCaches); return urlConnection; } catch (Exception e) { @@ -166,7 +172,7 @@ class PoliciesFetcher { long BeforeTime = System.currentTimeMillis(); long AfterTime = System.currentTimeMillis(); - final long roundtriptime = AfterTime - BeforeTime; + final long roundTripTime = AfterTime - BeforeTime; int iResponseCode = urlConnection.getResponseCode(); @@ -195,7 +201,7 @@ class PoliciesFetcher { putFile.setCRC(response.toString().getBytes()); return putFile; } else { - Vector<String> cloudDataReceived = new Vector<String>(); + Vector<String> cloudDataReceived = new Vector<>(); final String dataKey = "data"; // Convert the response to JSON JSONObject jsonResponse = new JSONObject(response.toString()); diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/RpcConverter.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/RpcConverter.java index 9cc9eee25..1c4b1fccb 100644 --- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/RpcConverter.java +++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/RpcConverter.java @@ -79,9 +79,9 @@ public class RpcConverter { Hashtable<String, Object> hashTemp = new Hashtable<>(); hashTemp.put(RPCMessage.KEY_CORRELATION_ID, message.getCorrID()); if (message.getJsonSize() > 0) { - final Hashtable<String, Object> mhash = JsonRPCMarshaller.unmarshall(message.getData()); - if (mhash != null) { - hashTemp.put(RPCMessage.KEY_PARAMETERS, mhash); + final Hashtable<String, Object> mHash = JsonRPCMarshaller.unmarshall(message.getData()); + if (mHash != null) { + hashTemp.put(RPCMessage.KEY_PARAMETERS, mHash); } } diff --git a/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java b/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java index 276683ef9..686a2627d 100644 --- a/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java @@ -37,9 +37,9 @@ import androidx.annotation.RestrictTo; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCNotification; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.OnHMIStatus; import com.smartdevicelink.proxy.rpc.OnPermissionsChange; import com.smartdevicelink.proxy.rpc.PermissionItem; @@ -69,8 +69,8 @@ abstract class BasePermissionManager extends BaseSubManager{ private HMILevel currentHMILevel; private Map<FunctionID, PermissionItem> currentPermissionItems; private OnRPCNotificationListener onHMIStatusListener, onPermissionsChangeListener; - private List<PermissionFilter> filters; - private Set<String> encryptionRequiredRPCs = new HashSet<>(); + private final List<PermissionFilter> filters; + private final Set<String> encryptionRequiredRPCs = new HashSet<>(); // Permission groups status constants @IntDef({PERMISSION_GROUP_STATUS_ALLOWED, PERMISSION_GROUP_STATUS_DISALLOWED, @@ -179,10 +179,6 @@ abstract class BasePermissionManager extends BaseSubManager{ /** * Go over all developer's listeners and call them if needed because of HMI level change or permission items change - * @param previousPermissionItems - * @param previousHmiLevel - * @param currentPermissionItems - * @param currentHMILevel */ private void notifyListeners(Map<FunctionID, PermissionItem> previousPermissionItems, HMILevel previousHmiLevel, Map<FunctionID, PermissionItem> currentPermissionItems, HMILevel currentHMILevel){ for (PermissionFilter filter : filters) { diff --git a/base/src/main/java/com/smartdevicelink/managers/permission/OnPermissionChangeListener.java b/base/src/main/java/com/smartdevicelink/managers/permission/OnPermissionChangeListener.java index dd600fc6d..662ac795a 100644 --- a/base/src/main/java/com/smartdevicelink/managers/permission/OnPermissionChangeListener.java +++ b/base/src/main/java/com/smartdevicelink/managers/permission/OnPermissionChangeListener.java @@ -47,5 +47,5 @@ public interface OnPermissionChangeListener { * @param permissionGroupStatus a detailed view about which permissions are allowed and which ones are not * @see PermissionManager.PermissionGroupStatus */ - void onPermissionsChange(@NonNull Map<FunctionID, PermissionStatus> allowedPermissions, @NonNull @PermissionManager.PermissionGroupStatus int permissionGroupStatus); + void onPermissionsChange(@NonNull Map<FunctionID, PermissionStatus> allowedPermissions, @PermissionManager.PermissionGroupStatus int permissionGroupStatus); } diff --git a/base/src/main/java/com/smartdevicelink/managers/permission/PermissionElement.java b/base/src/main/java/com/smartdevicelink/managers/permission/PermissionElement.java index cd7a8f736..d09e75195 100644 --- a/base/src/main/java/com/smartdevicelink/managers/permission/PermissionElement.java +++ b/base/src/main/java/com/smartdevicelink/managers/permission/PermissionElement.java @@ -47,8 +47,8 @@ public class PermissionElement { /** * Create a new instance of PermissionElement - * @param rpcName - * @param parameters + * @param rpcName the name of the RPC + * @param parameters a list of the RPC parameters */ public PermissionElement(@NonNull FunctionID rpcName, List<String> parameters){ this.rpcName = rpcName; diff --git a/base/src/main/java/com/smartdevicelink/managers/permission/PermissionFilter.java b/base/src/main/java/com/smartdevicelink/managers/permission/PermissionFilter.java index 018e038c9..a48b71c9f 100644 --- a/base/src/main/java/com/smartdevicelink/managers/permission/PermissionFilter.java +++ b/base/src/main/java/com/smartdevicelink/managers/permission/PermissionFilter.java @@ -47,13 +47,9 @@ class PermissionFilter { /** * Creates a new instance of PermissionFilter - * @param identifier - * @param permissionElements - * @param groupType - * @param listener * @see com.smartdevicelink.managers.permission.PermissionManager.PermissionGroupType */ - PermissionFilter(UUID identifier, @NonNull List<PermissionElement> permissionElements, @NonNull @PermissionManager.PermissionGroupType int groupType, @NonNull OnPermissionChangeListener listener) { + PermissionFilter(UUID identifier, @NonNull List<PermissionElement> permissionElements, @PermissionManager.PermissionGroupType int groupType, @NonNull OnPermissionChangeListener listener) { if (identifier == null) { this.identifier = UUID.randomUUID(); } else { diff --git a/base/src/main/java/com/smartdevicelink/managers/permission/PermissionStatus.java b/base/src/main/java/com/smartdevicelink/managers/permission/PermissionStatus.java index 8f44ac0f6..adae88e5d 100644 --- a/base/src/main/java/com/smartdevicelink/managers/permission/PermissionStatus.java +++ b/base/src/main/java/com/smartdevicelink/managers/permission/PermissionStatus.java @@ -51,7 +51,7 @@ public class PermissionStatus { * @param isRPCAllowed * @param allowedParameters */ - public PermissionStatus(@NonNull FunctionID rpcName, @NonNull boolean isRPCAllowed, Map<String, Boolean> allowedParameters) { + public PermissionStatus(@NonNull FunctionID rpcName, boolean isRPCAllowed, Map<String, Boolean> allowedParameters) { this.rpcName = rpcName; this.isRPCAllowed = isRPCAllowed; this.allowedParameters = allowedParameters; @@ -77,7 +77,7 @@ public class PermissionStatus { * Set whether the RPC is allowed or not * @param isRPCAllowed */ - protected void setIsRPCAllowed(@NonNull boolean isRPCAllowed) { + protected void setIsRPCAllowed(boolean isRPCAllowed) { this.isRPCAllowed = isRPCAllowed; } diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java index e13855d1c..297c114d3 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java @@ -37,6 +37,7 @@ import androidx.annotation.RestrictTo; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.managers.screen.choiceset.ChoiceCell; @@ -49,7 +50,6 @@ import com.smartdevicelink.managers.screen.menu.MenuConfiguration; import com.smartdevicelink.managers.screen.menu.MenuManager; import com.smartdevicelink.managers.screen.menu.VoiceCommand; import com.smartdevicelink.managers.screen.menu.VoiceCommandManager; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.KeyboardProperties; import com.smartdevicelink.proxy.rpc.enums.ButtonName; import com.smartdevicelink.proxy.rpc.enums.InteractionMode; @@ -68,7 +68,7 @@ import java.util.List; */ abstract class BaseScreenManager extends BaseSubManager { - private static String TAG = "ScreenManager"; + private static final String TAG = "ScreenManager"; private final WeakReference<FileManager> fileManager; private SoftButtonManager softButtonManager; private TextAndGraphicManager textAndGraphicManager; @@ -363,7 +363,7 @@ abstract class BaseScreenManager extends BaseSubManager { /** * Sets the title of the new template that will be displayed. * Sending an empty String "" will clear the field - * @param title the title of the new template that will be displayed. Maxlength: 100. + * @param title the title of the new template that will be displayed. MaxLength: 100. */ public void setTitle(String title){ this.textAndGraphicManager.setTitle(title); diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java index 6694e0de3..690e8e5b9 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java @@ -37,12 +37,12 @@ import com.livio.taskmaster.Queue; import com.livio.taskmaster.Task; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener; +import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCNotification; -import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.DisplayCapability; import com.smartdevicelink.proxy.rpc.OnButtonEvent; import com.smartdevicelink.proxy.rpc.OnButtonPress; @@ -136,7 +136,11 @@ abstract class BaseSoftButtonManager extends BaseSubManager { for (WindowCapability windowCapability : mainDisplay.getWindowCapabilities()) { int currentWindowID = windowCapability.getWindowID() != null ? windowCapability.getWindowID() : PredefinedWindows.DEFAULT_WINDOW.getValue(); if (currentWindowID == PredefinedWindows.DEFAULT_WINDOW.getValue()) { - softButtonCapabilities = windowCapability.getSoftButtonCapabilities().get(0); + if (windowCapability.getSoftButtonCapabilities() != null && windowCapability.getSoftButtonCapabilities().size() > 0) { + softButtonCapabilities = windowCapability.getSoftButtonCapabilities().get(0); + } else { + softButtonCapabilities = null; + } break; } } diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSubscribeButtonManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSubscribeButtonManager.java index 3bdde236a..05addbffe 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSubscribeButtonManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSubscribeButtonManager.java @@ -4,10 +4,10 @@ import androidx.annotation.NonNull; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCNotification; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.OnButtonEvent; import com.smartdevicelink.proxy.rpc.OnButtonPress; import com.smartdevicelink.proxy.rpc.SubscribeButton; @@ -28,7 +28,7 @@ import java.util.concurrent.CopyOnWriteArrayList; abstract class BaseSubscribeButtonManager extends BaseSubManager { private static final String TAG = "SubscribeButtonManager"; - HashMap<ButtonName, CopyOnWriteArrayList<OnButtonListener>> onButtonListeners; + final HashMap<ButtonName, CopyOnWriteArrayList<OnButtonListener>> onButtonListeners; private OnRPCNotificationListener onButtonPressListener; private OnRPCNotificationListener onButtonEventListener; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java index 4bdfcb441..3542dd269 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java @@ -37,13 +37,13 @@ import com.livio.taskmaster.Queue; import com.livio.taskmaster.Task; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener; import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCNotification; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.DisplayCapability; import com.smartdevicelink.proxy.rpc.OnHMIStatus; import com.smartdevicelink.proxy.rpc.Show; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java index 7b5befb3d..6f8a9593e 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java @@ -51,9 +51,9 @@ import java.util.List; */ public class SoftButtonObject { private static final String TAG = "SoftButtonObject"; - static int SOFT_BUTTON_ID_NOT_SET_VALUE = -1; - static int SOFT_BUTTON_ID_MIN_VALUE = 0; - static int SOFT_BUTTON_ID_MAX_VALUE = 65535; + static final int SOFT_BUTTON_ID_NOT_SET_VALUE = -1; + static final int SOFT_BUTTON_ID_MIN_VALUE = 0; + static final int SOFT_BUTTON_ID_MAX_VALUE = 65535; private String name; private List<SoftButtonState> states; private String currentStateName; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java index 00b3824e1..73658b257 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java @@ -2,11 +2,11 @@ package com.smartdevicelink.managers.screen; import com.livio.taskmaster.Task; import com.smartdevicelink.managers.CompletionListener; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.managers.file.MultipleFileCompletionListener; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.Show; import com.smartdevicelink.proxy.rpc.SoftButton; import com.smartdevicelink.proxy.rpc.SoftButtonCapabilities; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonTransitionOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonTransitionOperation.java index 4ef5e715a..458677269 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonTransitionOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonTransitionOperation.java @@ -1,8 +1,8 @@ package com.smartdevicelink.managers.screen; import com.livio.taskmaster.Task; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.Show; import com.smartdevicelink.proxy.rpc.SoftButton; import com.smartdevicelink.proxy.rpc.listeners.OnRPCResponseListener; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperation.java index 5f29e0cf9..a4e1348c8 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperation.java @@ -2,12 +2,12 @@ package com.smartdevicelink.managers.screen; import com.livio.taskmaster.Task; import com.smartdevicelink.managers.CompletionListener; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.ManagerUtility; import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.managers.file.MultipleFileCompletionListener; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.MetadataTags; import com.smartdevicelink.proxy.rpc.Show; import com.smartdevicelink.proxy.rpc.WindowCapability; @@ -33,9 +33,9 @@ class TextAndGraphicUpdateOperation extends Task { private final WeakReference<FileManager> fileManager; WindowCapability defaultMainWindowCapability; private Show currentScreenData; - private TextsAndGraphicsState updatedState; - private CompletionListener listener; - private TextAndGraphicManager.CurrentScreenDataUpdatedListener currentScreenDataUpdateListener; + private final TextsAndGraphicsState updatedState; + private final CompletionListener listener; + private final TextAndGraphicManager.CurrentScreenDataUpdatedListener currentScreenDataUpdateListener; TextAndGraphicUpdateOperation(ISdl internalInterface, FileManager fileManager, WindowCapability currentCapabilities, Show currentScreenData, TextsAndGraphicsState newState, CompletionListener listener, TextAndGraphicManager.CurrentScreenDataUpdatedListener currentScreenDataUpdateListener) { diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/TextsAndGraphicsState.java b/base/src/main/java/com/smartdevicelink/managers/screen/TextsAndGraphicsState.java index bd6f749a3..601c98832 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/TextsAndGraphicsState.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/TextsAndGraphicsState.java @@ -7,8 +7,9 @@ import com.smartdevicelink.proxy.rpc.enums.TextAlignment; class TextsAndGraphicsState { private String textField1, textField2, textField3, textField4, mediaTrackTextField, title; private MetadataType textField1Type, textField2Type, textField3Type, textField4Type; - private TextAlignment textAlignment; - private SdlArtwork primaryGraphic, secondaryGraphic; + private final TextAlignment textAlignment; + private final SdlArtwork primaryGraphic; + private final SdlArtwork secondaryGraphic; TextsAndGraphicsState(String textField1, String textField2, String textField3, String textField4, String mediaTrackTextField, String title, SdlArtwork primaryGraphic, SdlArtwork secondaryGraphic, TextAlignment textAlignment, diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java index 0e91747a8..b4a10ba33 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java @@ -41,12 +41,12 @@ import com.livio.taskmaster.Queue; import com.livio.taskmaster.Task; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener; +import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCNotification; -import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.DisplayCapability; import com.smartdevicelink.proxy.rpc.KeyboardProperties; import com.smartdevicelink.proxy.rpc.OnHMIStatus; @@ -89,7 +89,7 @@ abstract class BaseChoiceSetManager extends BaseSubManager { ChoiceSet pendingPresentationSet; // We will pass operations into this to be completed - Queue transactionQueue; + final Queue transactionQueue; Task pendingPresentOperation; PresentKeyboardOperation currentlyPresentedKeyboardOperation; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java index 6cc0283d9..f99eebc85 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java @@ -36,8 +36,8 @@ package com.smartdevicelink.managers.screen.choiceset; import com.livio.taskmaster.Task; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.Choice; import com.smartdevicelink.proxy.rpc.CreateInteractionChoiceSet; import com.smartdevicelink.proxy.rpc.DeleteInteractionChoiceSet; @@ -49,8 +49,8 @@ import java.util.Collections; class CheckChoiceVROptionalOperation extends Task { private static final String TAG = "CheckChoiceVROptionalOperation"; - private CheckChoiceVROptionalInterface checkChoiceVROptionalInterface; - private WeakReference<ISdl> internalInterface; + private final CheckChoiceVROptionalInterface checkChoiceVROptionalInterface; + private final WeakReference<ISdl> internalInterface; private boolean isVROptional; CheckChoiceVROptionalOperation(ISdl internalInterface, CheckChoiceVROptionalInterface checkChoiceVROptionalInterface){ diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java index c85333cbe..f40b57c74 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java @@ -59,8 +59,8 @@ public class ChoiceSet { ChoiceSetCanceledListener canceledListener; // defaults - private Integer defaultTimeout = 10; - private ChoiceSetLayout defaultLayout = ChoiceSetLayout.CHOICE_SET_LAYOUT_LIST; + private final Integer defaultTimeout = 10; + private final ChoiceSetLayout defaultLayout = ChoiceSetLayout.CHOICE_SET_LAYOUT_LIST; /** * Initialize with a title, listener, and choices. It will use the default timeout and layout, diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java index 290a1f05f..ad35a1ea5 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java @@ -37,8 +37,8 @@ package com.smartdevicelink.managers.screen.choiceset; import com.livio.taskmaster.Task; import com.smartdevicelink.managers.CompletionListener; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.DeleteInteractionChoiceSet; import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener; import com.smartdevicelink.util.DebugTool; @@ -50,9 +50,9 @@ import java.util.List; class DeleteChoicesOperation extends Task { private static final String TAG = "DeleteChoicesOperation"; - private WeakReference<ISdl> internalInterface; - private HashSet<ChoiceCell> cellsToDelete; - private CompletionListener completionListener; + private final WeakReference<ISdl> internalInterface; + private final HashSet<ChoiceCell> cellsToDelete; + private final CompletionListener completionListener; DeleteChoicesOperation(ISdl internalInterface, HashSet<ChoiceCell> cellsToDelete, CompletionListener completionListener){ super("DeleteChoicesOperation"); diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java index 21bf2d712..7864ef8de 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java @@ -39,12 +39,12 @@ import androidx.annotation.NonNull; import com.livio.taskmaster.Task; import com.smartdevicelink.managers.CompletionListener; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.ManagerUtility; import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.managers.file.MultipleFileCompletionListener; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.Choice; import com.smartdevicelink.proxy.rpc.CreateInteractionChoiceSet; import com.smartdevicelink.proxy.rpc.Image; @@ -64,14 +64,14 @@ import java.util.Map; class PreloadChoicesOperation extends Task { private static final String TAG = "PreloadChoicesOperation"; - private WeakReference<ISdl> internalInterface; - private WeakReference<FileManager> fileManager; - private WindowCapability defaultMainWindowCapability; - private String displayName; - private HashSet<ChoiceCell> cellsToUpload; - private CompletionListener completionListener; + private final WeakReference<ISdl> internalInterface; + private final WeakReference<FileManager> fileManager; + private final WindowCapability defaultMainWindowCapability; + private final String displayName; + private final HashSet<ChoiceCell> cellsToUpload; + private final CompletionListener completionListener; private boolean isRunning; - private boolean isVROptional; + private final boolean isVROptional; private boolean choiceError = false; PreloadChoicesOperation(ISdl internalInterface, FileManager fileManager, String displayName, WindowCapability defaultMainWindowCapability, @@ -226,7 +226,7 @@ class PreloadChoicesOperation extends Task { // HELPERS boolean shouldSendChoiceText() { - if (this.displayName != null && this.displayName.equals(DisplayType.GEN3_8_INCH)){ + if (this.displayName != null && this.displayName.equals(DisplayType.GEN3_8_INCH.toString())){ return true; } return templateSupportsTextField(TextFieldName.menuName); diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperation.java index c0e206eed..6efa1b8d1 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperation.java @@ -37,10 +37,10 @@ package com.smartdevicelink.managers.screen.choiceset; import com.livio.taskmaster.Task; import com.smartdevicelink.managers.CompletionListener; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCNotification; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.CancelInteraction; import com.smartdevicelink.proxy.rpc.KeyboardProperties; import com.smartdevicelink.proxy.rpc.OnKeyboardInput; @@ -63,19 +63,20 @@ import java.util.List; class PresentChoiceSetOperation extends Task { private static final String TAG = "PresentChoiceSetOperation"; - private WeakReference<ISdl> internalInterface; - private ChoiceSet choiceSet; - private Integer cancelID; - private InteractionMode presentationMode; - private KeyboardProperties originalKeyboardProperties, keyboardProperties; + private final WeakReference<ISdl> internalInterface; + private final ChoiceSet choiceSet; + private final Integer cancelID; + private final InteractionMode presentationMode; + private final KeyboardProperties originalKeyboardProperties; + private KeyboardProperties keyboardProperties; private ChoiceCell selectedCell; private TriggerSource selectedTriggerSource; private boolean updatedKeyboardProperties; private OnRPCNotificationListener keyboardRPCListener; - private ChoiceSetSelectionListener choiceSetSelectionListener; + private final ChoiceSetSelectionListener choiceSetSelectionListener; Integer selectedCellRow; KeyboardListener keyboardListener; - SdlMsgVersion sdlMsgVersion; + final SdlMsgVersion sdlMsgVersion; PresentChoiceSetOperation(ISdl internalInterface, ChoiceSet choiceSet, InteractionMode mode, KeyboardProperties originalKeyboardProperties, KeyboardListener keyboardListener, ChoiceSetSelectionListener choiceSetSelectionListener, Integer cancelID){ diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperation.java index b48bbffd2..0dbcf0c39 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperation.java @@ -37,10 +37,10 @@ package com.smartdevicelink.managers.screen.choiceset; import com.livio.taskmaster.Task; import com.smartdevicelink.managers.CompletionListener; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCNotification; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.CancelInteraction; import com.smartdevicelink.proxy.rpc.KeyboardProperties; import com.smartdevicelink.proxy.rpc.OnKeyboardInput; @@ -62,14 +62,16 @@ import java.util.List; class PresentKeyboardOperation extends Task { private static final String TAG = "PresentKeyboardOperation"; - private WeakReference<ISdl> internalInterface; - private KeyboardListener keyboardListener; - private KeyboardProperties originalKeyboardProperties, keyboardProperties, customConfig; + private final WeakReference<ISdl> internalInterface; + private final KeyboardListener keyboardListener; + private final KeyboardProperties originalKeyboardProperties; + private KeyboardProperties keyboardProperties; + private final KeyboardProperties customConfig; private boolean updatedKeyboardProperties; - private String initialText; + private final String initialText; private OnRPCNotificationListener keyboardRPCListener; - private Integer cancelID; - SdlMsgVersion sdlMsgVersion; + private final Integer cancelID; + final SdlMsgVersion sdlMsgVersion; PresentKeyboardOperation(ISdl internalInterface, KeyboardProperties originalKeyboardProperties, String initialText, KeyboardProperties customConfig, KeyboardListener keyboardListener, Integer cancelID){ super("PresentKeyboardOperation"); diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java index 053f90c8c..7224960ee 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java @@ -36,6 +36,7 @@ import androidx.annotation.NonNull; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.managers.ManagerUtility; import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.managers.file.MultipleFileCompletionListener; @@ -46,7 +47,6 @@ import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCNotification; import com.smartdevicelink.proxy.RPCRequest; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.AddCommand; import com.smartdevicelink.proxy.rpc.AddSubMenu; import com.smartdevicelink.proxy.rpc.DeleteCommand; diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java index b6ec94930..6ddd37124 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java @@ -36,10 +36,10 @@ import androidx.annotation.NonNull; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCNotification; import com.smartdevicelink.proxy.RPCResponse; -import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.AddCommand; import com.smartdevicelink.proxy.rpc.DeleteCommand; import com.smartdevicelink.proxy.rpc.OnCommand; diff --git a/base/src/main/java/com/smartdevicelink/managers/video/BaseVideoStreamManager.java b/base/src/main/java/com/smartdevicelink/managers/video/BaseVideoStreamManager.java index d5a24766f..6f2153d13 100644 --- a/base/src/main/java/com/smartdevicelink/managers/video/BaseVideoStreamManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/video/BaseVideoStreamManager.java @@ -34,7 +34,7 @@ package com.smartdevicelink.managers.video; import androidx.annotation.NonNull; import com.smartdevicelink.managers.BaseSubManager; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; abstract class BaseVideoStreamManager extends BaseSubManager { BaseVideoStreamManager(@NonNull ISdl internalInterface) { diff --git a/base/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java b/base/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java index 0f13e6fd9..70759e3be 100644 --- a/base/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java +++ b/base/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java @@ -88,12 +88,11 @@ public class JsonRPCMarshaller { return ret;
}
- @SuppressWarnings("unchecked")
- public static Hashtable<String, Object> deserializeJSONObject(JSONObject jsonObject)
+ public static Hashtable<String, Object> deserializeJSONObject(JSONObject jsonObject)
throws JSONException {
- Hashtable<String, Object> ret = new Hashtable<String, Object>();
+ Hashtable<String, Object> ret = new Hashtable<>();
Iterator<String> it = jsonObject.keys();
- String key = null;
+ String key;
while (it.hasNext()) {
key = it.next();
Object value = jsonObject.get(key);
@@ -101,7 +100,7 @@ public class JsonRPCMarshaller { ret.put(key, deserializeJSONObject((JSONObject)value));
} else if (value instanceof JSONArray) {
JSONArray arrayValue = (JSONArray) value;
- List<Object> putList = new ArrayList<Object>(arrayValue.length());
+ List<Object> putList = new ArrayList<>(arrayValue.length());
for (int i = 0; i < arrayValue.length(); i++) {
Object anObject = arrayValue.get(i);
if (anObject instanceof JSONObject) {
@@ -141,16 +140,14 @@ public class JsonRPCMarshaller { @SuppressWarnings({"unchecked" })
public static JSONObject serializeHashtable(Hashtable<String, Object> hash) throws JSONException{
JSONObject obj = new JSONObject();
- Iterator<String> hashKeyIterator = hash.keySet().iterator();
- while (hashKeyIterator.hasNext()){
- String key = (String) hashKeyIterator.next();
+ for (String key : hash.keySet()) {
Object value = hash.get(key);
if (value instanceof RPCStruct) {
obj.put(key, ((RPCStruct) value).serializeJSON());
} else if (value instanceof List<?>) {
obj.put(key, serializeList((List<?>) value));
} else if (value instanceof Hashtable) {
- obj.put(key, serializeHashtable((Hashtable<String, Object>)value));
+ obj.put(key, serializeHashtable((Hashtable<String, Object>) value));
} else {
obj.put(key, value);
}
diff --git a/base/src/main/java/com/smartdevicelink/protocol/BaseSdlPacket.java b/base/src/main/java/com/smartdevicelink/protocol/BaseSdlPacket.java index 21362b53e..2b47eca1c 100644 --- a/base/src/main/java/com/smartdevicelink/protocol/BaseSdlPacket.java +++ b/base/src/main/java/com/smartdevicelink/protocol/BaseSdlPacket.java @@ -288,13 +288,10 @@ class BaseSdlPacket { int dataSize, int messageId, byte[] payload){ ByteBuffer builder; - switch(version){ - case 1: - builder = ByteBuffer.allocate(HEADER_SIZE_V1 + dataSize); - break; - default: - builder = ByteBuffer.allocate(HEADER_SIZE + dataSize); - break; + if (version == 1) { + builder = ByteBuffer.allocate(HEADER_SIZE_V1 + dataSize); + } else { + builder = ByteBuffer.allocate(HEADER_SIZE + dataSize); } builder.put((byte)((version<<4) + getEncryptionBit(encryption) + frameType)); diff --git a/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdlServiceListener.java b/base/src/main/java/com/smartdevicelink/protocol/ISdlServiceListener.java index 06c324cb3..d5bc9ebb4 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdlServiceListener.java +++ b/base/src/main/java/com/smartdevicelink/protocol/ISdlServiceListener.java @@ -29,14 +29,14 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package com.smartdevicelink.proxy.interfaces; +package com.smartdevicelink.protocol; -import com.smartdevicelink.SdlConnection.SdlSession; +import com.smartdevicelink.session.SdlSession; import com.smartdevicelink.protocol.enums.SessionType; public interface ISdlServiceListener { - public void onServiceStarted(SdlSession session, SessionType type, boolean isEncrypted); - public void onServiceEnded(SdlSession session, SessionType type); - public void onServiceError(SdlSession session, SessionType type, String reason); + void onServiceStarted(SdlSession session, SessionType type, boolean isEncrypted); + void onServiceEnded(SdlSession session, SessionType type); + void onServiceError(SdlSession session, SessionType type, String reason); } diff --git a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java index 2bab789e0..8a497cb53 100644 --- a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java +++ b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java @@ -660,7 +660,8 @@ public class SdlProtocolBase { } } else { messageID++; - SdlPacket header = SdlPacketFactory.createSingleSendData(sessionType, sessionID, data.length, messageID, (byte)protocolVersion.getMajor(),data, protocolMsg.getPayloadProtected()); + int dataLength = data != null ? data.length : 0; + SdlPacket header = SdlPacketFactory.createSingleSendData(sessionType, sessionID, dataLength, messageID, (byte)protocolVersion.getMajor(),data, protocolMsg.getPayloadProtected()); header.setPriorityCoefficient(protocolMsg.priorityCoefficient); header.setTransportRecord(activeTransports.get(sessionType)); handlePacketToSend(header); @@ -1069,7 +1070,7 @@ public class SdlProtocolBase { activeTransports.put(SessionType.PCM, transportRecord); if (protocolVersion.getMajor() > 1) { - if (packet.payload != null && packet.dataSize == 4) { //hashid will be 4 bytes in length + if (packet.payload != null && packet.dataSize == 4) { //hashId will be 4 bytes in length hashID = BitConverter.intFromByteArray(packet.payload, 0); } } @@ -1078,12 +1079,14 @@ public class SdlProtocolBase { iSdlProtocol.setAcceptedVideoParams(iSdlProtocol.getDesiredVideoParams()); } } - iSdlProtocol.onServiceStarted(packet, serviceType, (byte) packet.getSessionId(), protocolVersion, packet.isEncrypted()); + if (iSdlProtocol != null) { + iSdlProtocol.onServiceStarted(packet, serviceType, (byte) packet.getSessionId(), protocolVersion, packet.isEncrypted()); + } } protected void handleProtocolSessionNAKed(SdlPacket packet, SessionType serviceType) { String error = "Service start NAK received for service type " + serviceType.getName(); - List<String> rejectedParams = null; + List<String> rejectedParams; if(packet.version >= 5){ if(DebugTool.isDebugEnabled()) { //Currently this is only during a debugging session. Might pass back in the future @@ -1137,7 +1140,6 @@ public class SdlProtocolBase { ----------------------------------- TRANSPORT_TYPE LISTENER --------------------------------- -------------------------------------------------------------------------------------------*/ - @SuppressWarnings("FieldCanBeLocal") final TransportManagerBase.TransportEventListener transportEventListener = new TransportManagerBase.TransportEventListener() { private boolean requestedSession = false; @@ -1329,8 +1331,8 @@ public class SdlProtocolBase { try { iSdlProtocol.onProtocolMessageReceived(message); - } catch (Exception excp) { - DebugTool.logError(TAG, FailurePropagating_Msg + "onProtocolMessageReceived: " + excp.toString(), excp); + } catch (Exception e) { + DebugTool.logError(TAG, FailurePropagating_Msg + "onProtocolMessageReceived: " + e.toString(), e); } // end-catch accumulator = null; diff --git a/base/src/main/java/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java b/base/src/main/java/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java index c0131d085..d31e45eac 100644 --- a/base/src/main/java/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java +++ b/base/src/main/java/com/smartdevicelink/protocol/enums/FrameDataControlFrameType.java @@ -1,34 +1,34 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.protocol.enums;
import com.smartdevicelink.util.ByteEnumer;
@@ -36,11 +36,10 @@ import com.smartdevicelink.util.ByteEnumer; import java.util.Vector;
public class FrameDataControlFrameType extends ByteEnumer {
- private static Vector<FrameDataControlFrameType> theList = new Vector<FrameDataControlFrameType>();
+ private static final Vector<FrameDataControlFrameType> theList = new Vector<>();
public static Vector<FrameDataControlFrameType> getList() { return theList; }
- @SuppressWarnings("unused")
- private byte _i = 0x00;
+ private byte _i = 0x00;
protected FrameDataControlFrameType(byte value, String name) {
super(value, name);
diff --git a/base/src/main/java/com/smartdevicelink/protocol/enums/FrameType.java b/base/src/main/java/com/smartdevicelink/protocol/enums/FrameType.java index 085ae6b40..500549d3f 100644 --- a/base/src/main/java/com/smartdevicelink/protocol/enums/FrameType.java +++ b/base/src/main/java/com/smartdevicelink/protocol/enums/FrameType.java @@ -1,34 +1,34 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.protocol.enums;
import com.smartdevicelink.util.ByteEnumer;
@@ -37,7 +37,7 @@ import java.util.Vector; public class FrameType extends ByteEnumer {
- private static Vector<FrameType> theList = new Vector<FrameType>();
+ private static final Vector<FrameType> theList = new Vector<>();
public static Vector<FrameType> getList() { return theList; }
byte i = 0x00;
diff --git a/base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java b/base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java index b9471209c..c7ab5145a 100644 --- a/base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java +++ b/base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java @@ -159,7 +159,7 @@ public enum FunctionID{ }
private static void initFunctionMap(){
- functionMap = new HashMap<String, Integer>(values().length);
+ functionMap = new HashMap<>(values().length);
for(FunctionID value : EnumSet.allOf(FunctionID.class)){
functionMap.put(value.toString(), value.getId());
@@ -171,10 +171,8 @@ public enum FunctionID{ initFunctionMap();
}
- Iterator<Entry<String, Integer>> iterator = functionMap.entrySet().iterator();
- while(iterator.hasNext()){
- Entry<String, Integer> thisEntry = iterator.next();
- if(Integer.valueOf(i).equals(thisEntry.getValue())){
+ for (Entry<String, Integer> thisEntry : functionMap.entrySet()) {
+ if (Integer.valueOf(i).equals(thisEntry.getValue())) {
return thisEntry.getKey();
}
}
diff --git a/base/src/main/java/com/smartdevicelink/protocol/enums/SessionType.java b/base/src/main/java/com/smartdevicelink/protocol/enums/SessionType.java index 158f4080c..5161b10f8 100644 --- a/base/src/main/java/com/smartdevicelink/protocol/enums/SessionType.java +++ b/base/src/main/java/com/smartdevicelink/protocol/enums/SessionType.java @@ -1,34 +1,34 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.protocol.enums;
import com.smartdevicelink.util.ByteEnumer;
@@ -38,7 +38,7 @@ import java.util.Vector; public class SessionType extends ByteEnumer {
- private static Vector<SessionType> theList = new Vector<SessionType>();
+ private static final Vector<SessionType> theList = new Vector<>();
public static Vector<SessionType> getList() { return theList; }
byte i = 0x00;
diff --git a/base/src/main/java/com/smartdevicelink/proxy/RPCMessage.java b/base/src/main/java/com/smartdevicelink/proxy/RPCMessage.java index 427379842..fd80c6cca 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/RPCMessage.java +++ b/base/src/main/java/com/smartdevicelink/proxy/RPCMessage.java @@ -47,8 +47,8 @@ public class RPCMessage extends RPCStruct { this(functionName, "request");
}
- protected RPCMessage(RPCMessage rpcm) {
- this(cloneStore(rpcm));
+ protected RPCMessage(RPCMessage rpcMessage) {
+ this(cloneStore(rpcMessage));
}
protected RPCMessage(RPCStruct rpcs) {
@@ -57,8 +57,8 @@ public class RPCMessage extends RPCStruct { }
public RPCMessage(String functionName, String messageType) {
- function = new Hashtable<String, Object>();
- parameters = new Hashtable<String, Object>();
+ function = new Hashtable<>();
+ parameters = new Hashtable<>();
this.messageType = messageType;
function.put(KEY_PARAMETERS, parameters);
@@ -94,7 +94,7 @@ public class RPCMessage extends RPCStruct { protected String messageType;
protected Hashtable<String, Object> parameters;
- protected Hashtable<String, Object> function;
+ protected final Hashtable<String, Object> function;
public String getFunctionName() {
return (String)function.get(KEY_FUNCTION_NAME);
diff --git a/base/src/main/java/com/smartdevicelink/proxy/RPCNotification.java b/base/src/main/java/com/smartdevicelink/proxy/RPCNotification.java index dd8388142..dfcd283a6 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/RPCNotification.java +++ b/base/src/main/java/com/smartdevicelink/proxy/RPCNotification.java @@ -29,29 +29,29 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package com.smartdevicelink.proxy;
-
-import java.util.Hashtable;
-
-public class RPCNotification extends RPCMessage {
-
- public RPCNotification(String functionName) {
- super(functionName, RPCMessage.KEY_NOTIFICATION);
- }
-
- public RPCNotification(Hashtable<String, Object> hash) {
- super(hash);
- }
-
- public RPCNotification(RPCMessage rpcMsg) {
- super(preprocessMsg(rpcMsg));
- }
-
- static RPCMessage preprocessMsg (RPCMessage rpcMsg) {
- if (rpcMsg.getMessageType() != RPCMessage.KEY_NOTIFICATION) {
- rpcMsg.messageType = RPCMessage.KEY_NOTIFICATION;
- }
-
- return rpcMsg;
- }
+package com.smartdevicelink.proxy; + +import java.util.Hashtable; + +public class RPCNotification extends RPCMessage { + + public RPCNotification(String functionName) { + super(functionName, RPCMessage.KEY_NOTIFICATION); + } + + public RPCNotification(Hashtable<String, Object> hash) { + super(hash); + } + + public RPCNotification(RPCMessage rpcMsg) { + super(preprocessMsg(rpcMsg)); + } + + static RPCMessage preprocessMsg (RPCMessage rpcMsg) { + if (!RPCMessage.KEY_NOTIFICATION.equals(rpcMsg.getMessageType())) { + rpcMsg.messageType = RPCMessage.KEY_NOTIFICATION; + } + + return rpcMsg; + } }
\ No newline at end of file diff --git a/base/src/main/java/com/smartdevicelink/proxy/RPCResponse.java b/base/src/main/java/com/smartdevicelink/proxy/RPCResponse.java index b0a3549dc..dd56b370f 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/RPCResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/RPCResponse.java @@ -100,7 +100,7 @@ public class RPCResponse extends RPCMessage { }
static RPCMessage preprocessMsg (RPCMessage rpcMsg) {
- if (rpcMsg.getMessageType() != RPCMessage.KEY_RESPONSE) {
+ if (!RPCMessage.KEY_RESPONSE.equals(rpcMsg.getMessageType())) {
rpcMsg.messageType = RPCMessage.KEY_RESPONSE;
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java b/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java index e54694526..e7d915b1e 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java +++ b/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java @@ -57,7 +57,7 @@ public class RPCStruct { private Version rpcSpecVersion = null;
- protected Hashtable<String, Object> store = null;
+ protected Hashtable<String, Object> store;
public boolean getStoreValue(String key) { // for unit testing
return store.contains(key);
@@ -68,7 +68,7 @@ public class RPCStruct { }
public RPCStruct() {
- store = new Hashtable<String, Object>();
+ store = new Hashtable<>();
}
protected RPCStruct(RPCStruct rpcs) {
@@ -150,9 +150,9 @@ public class RPCStruct { }
/**
- * Cycles through parameters in this RPC to ensure they all get formated
+ * Cycles through parameters in this RPC to ensure they all get formatted
* @param rpcVersion version of the rpc spec that should be used to format this rpc
- * @param value the object to investigate if it needs to be formated
+ * @param value the object to investigate if it needs to be formatted
*/
private void internalFormat(Version rpcVersion, Object value) {
if(value instanceof RPCStruct) {
@@ -284,7 +284,7 @@ public class RPCStruct { } else if (tClass.isInstance(item)) {
return list;
} else if (item instanceof Hashtable) {
- List<Object> newList = new ArrayList<Object>();
+ List<Object> newList = new ArrayList<>();
Object customObject;
for (Object hashObj : list) {
try {
@@ -303,7 +303,7 @@ public class RPCStruct { }
return newList;
} else if (item instanceof String){
- List<Object> newList = new ArrayList<Object>();
+ List<Object> newList = new ArrayList<>();
for (Object hashObj : list) {
Object toAdd = getValueForString(tClass, (String) hashObj);
if (toAdd != null) {
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java index 57d0719a5..b3bb816e2 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AddCommand.java @@ -66,7 +66,7 @@ import java.util.List; * <li>Choices having both MenuParams and VR synonym definitions</li>
* </ul>
*
-* <p><b>HMILevel needs to be FULL, LIMITED or BACKGROUD</b></p>
+* <p><b>HMILevel needs to be FULL, LIMITED or BACKGROUND</b></p>
*
* <p><b>Parameter List</b></p>
* <table border="1" rules="all">
@@ -185,7 +185,6 @@ public class AddCommand extends RPCRequest { * @return MenuParams -a MenuParams object
*
*/
- @SuppressWarnings("unchecked")
public MenuParams getMenuParams() {
return (MenuParams) getObject(MenuParams.class, KEY_MENU_PARAMS);
}
@@ -243,7 +242,6 @@ public class AddCommand extends RPCRequest { * @return Image -an Image object
* @since SmartDeviceLink 2.0
*/
- @SuppressWarnings("unchecked")
public Image getCmdIcon() {
return (Image) getObject(Image.class, KEY_CMD_ICON);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java index e2453a727..d989e8d36 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AddSubMenu.java @@ -46,7 +46,7 @@ import java.util.Hashtable; * added to a SubMenu), and may only contain commands as children</p>
*
*
- * <p><b>HMILevel needs to be FULL, LIMITED or BACKGROUD</b></p>
+ * <p><b>HMILevel needs to be FULL, LIMITED or BACKGROUND</b></p>
*
* <p><b>Parameter List</b></p>
* <table border="1" rules="all">
@@ -260,7 +260,6 @@ public class AddSubMenu extends RPCRequest { * Gets the layout of the submenu screen.
* @return the MenuLayout
*/
- @SuppressWarnings("unchecked")
public MenuLayout getMenuLayout() {
return (MenuLayout) getObject(MenuLayout.class, KEY_MENU_LAYOUT);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java index dbb16c073..10a2039c8 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Alert.java @@ -125,7 +125,7 @@ import java.util.List; * <tr>
* <td>softButtons</td>
* <td>SoftButton[]</td>
- * <td>Specifies the softbuttons, the apps wants to use in this alert.</td>
+ * <td>Specifies the soft buttons, the apps wants to use in this alert.</td>
* <td>N</td>
* <td>If omitted on supported displays, the alert will not have any SoftButton.ArrayMin: 0; ArrayMax: 4</td>
* <td>SmartDeviceLink 1.0</td>
@@ -439,7 +439,7 @@ public class Alert extends RPCRequest { public Alert setCancelID( Integer cancelID) {
setParameters(KEY_CANCEL_ID, cancelID);
return this;
- };
+ }
/**
* <p>Sets the Image
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java index 769813bad..8311de9ac 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java @@ -69,7 +69,7 @@ import java.util.Hashtable; * <tr>
* <td>audioType</td>
* <td>AudioType</td>
- * <td>Describes the audiotype for AudioPassThru
+ * <td>Describes the audioType for AudioPassThru
* </td>
* <td>SmartDeviceLink 2.0</td>
* </tr>
@@ -97,7 +97,7 @@ public class AudioPassThruCapabilities extends RPCStruct { * Constructs a newly allocated AudioPassThruCapabilities object
* @param samplingRate the sampling rate for AudioPassThru
* @param bitsPerSample the sample depth in bit for AudioPassThru
- * @param audioType the audiotype for AudioPassThru
+ * @param audioType the audioType for AudioPassThru
*/
public AudioPassThruCapabilities(@NonNull SamplingRate samplingRate, @NonNull BitsPerSample bitsPerSample, @NonNull AudioType audioType) {
this();
@@ -141,8 +141,8 @@ public class AudioPassThruCapabilities extends RPCStruct { }
/**
- * set the audiotype for AudioPassThru
- * @param audioType the audiotype for AudioPassThru
+ * set the audioType for AudioPassThru
+ * @param audioType the audioType for AudioPassThru
*/
public AudioPassThruCapabilities setAudioType(@NonNull AudioType audioType) {
setValue(KEY_AUDIO_TYPE, audioType);
@@ -150,8 +150,8 @@ public class AudioPassThruCapabilities extends RPCStruct { }
/**
- * get the audiotype for AudioPassThru
- * @return the audiotype for AudioPassThru
+ * get the audioType for AudioPassThru
+ * @return the audioType for AudioPassThru
*/
public AudioType getAudioType() {
return (AudioType) getObject(AudioType.class, KEY_AUDIO_TYPE);
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java index 61379d9dc..391d2928d 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java @@ -56,7 +56,7 @@ import java.util.Hashtable; * <td>parkBrakeActive</td>
* <td>Boolean</td>
* <td>true</td>
- * <td>Describes, if the parkbreak is active. The information about the park brake: - true, if active - false if not.</td>
+ * <td>Describes, if the park break is active. The information about the park brake: - true, if active - false if not.</td>
* <td>SmartDeviceLink 2.0</td>
* </tr>
* <tr>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java index aca5f86d5..819cb7c63 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java @@ -225,7 +225,6 @@ public class Choice extends RPCStruct { * Get the image
* @return the image of the choice
*/
- @SuppressWarnings("unchecked")
public Image getImage() {
return (Image) getObject(Image.class, KEY_IMAGE);
}
@@ -253,7 +252,6 @@ public class Choice extends RPCStruct { return this;
}
- @SuppressWarnings("unchecked")
public Image getSecondaryImage() {
return (Image) getObject(Image.class, KEY_SECONDARY_IMAGE);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java index 94b3aed05..f3113de0b 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java @@ -67,13 +67,13 @@ import java.util.Hashtable; * <td>carModeStatus</td>
* <td>CarModeStatus</td>
* <td></td>
- * <td>Describes the carmode the vehicle is in.</td>
+ * <td>Describes the car mode the vehicle is in.</td>
* </tr>
* <tr>
* <td>powerModeStatus</td>
* <td>PowerModeStatus</td>
* <td>true</td>
- * <td>Describes the different powermodes</td>
+ * <td>Describes the different power modes</td>
* </tr>
*
* </table>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java index 3bfc56e72..06c36e1de 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java @@ -46,7 +46,7 @@ import java.util.Hashtable; *
* <p>Function Group: Base</p>
*
- * <p><b>HMILevel needs to be FULL, LIMITED or BACKGROUD</b></p>
+ * <p><b>HMILevel needs to be FULL, LIMITED or BACKGROUND</b></p>
*
* <p>AudioStreamingState: Any</p>
*
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java index 78ff3a91b..e3459f002 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceStatus.java @@ -80,7 +80,7 @@ import java.util.Hashtable; * <tr>
* <td>textMsgAvailable</td>
* <td>Boolean</td>
- * <td>A textmessage is available
+ * <td>A text message is available
* </td>
* <td>SmartDeviceLink 2.0</td>
* </tr>
@@ -166,7 +166,7 @@ public class DeviceStatus extends RPCStruct { * @param btIconOn the bluetooth connection established
* @param callActive a call is being active
* @param phoneRoaming the phone is in roaming mode
- * @param textMsgAvailable a textmessage is available
+ * @param textMsgAvailable a text message is available
* @param battLevelStatus battery level status
* @param stereoAudioOutputMuted the status of the stereo audio output channel
* @param monoAudioOutputMuted the status of the mono audio output channel
@@ -263,8 +263,8 @@ public class DeviceStatus extends RPCStruct { }
/**
- * get a textmessage is available
- * @return a textmessage is available
+ * get a text message is available
+ * @return a text message is available
*/
public Boolean getTextMsgAvailable() {
return getBoolean(KEY_TEXT_MSG_AVAILABLE);
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java index 15d9c5f39..4fdc65560 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java @@ -227,7 +227,7 @@ public class DisplayCapabilities extends RPCStruct { /**
* Get an array of MediaClockFormat elements, defining the valid string formats used in specifying the contents of the media clock field
- * @return the Veotor of mediaClockFormat
+ * @return the Vector of mediaClockFormat
*/
@SuppressWarnings("unchecked")
public List<MediaClockFormat> getMediaClockFormats() {
@@ -276,7 +276,6 @@ public class DisplayCapabilities extends RPCStruct { return this;
}
- @SuppressWarnings("unchecked")
public ScreenParams getScreenParams() {
return (ScreenParams) getObject(ScreenParams.class, KEY_SCREEN_PARAMS);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapability.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapability.java index a071d915f..10b740cae 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapability.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapability.java @@ -72,7 +72,7 @@ public class DisplayCapability extends RPCStruct { * After registration, only windows with capabilities changed will be included. * Following cases will cause only affected windows to be included: * 1. App creates a new window. After the window is created, a system capability notification will be sent related only to the created window. - * 2. App sets a new template to the window. The new template changes window capabilties. The notification will reflect those changes to the single window. + * 2. App sets a new template to the window. The new template changes window capabilities. The notification will reflect those changes to the single window. */ public DisplayCapability setWindowCapabilities( List<WindowCapability> windowCapabilities) { setValue(KEY_WINDOW_CAPABILITIES, windowCapabilities); diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/DynamicUpdateCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DynamicUpdateCapabilities.java index d70523356..2468d369a 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/DynamicUpdateCapabilities.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DynamicUpdateCapabilities.java @@ -52,14 +52,14 @@ import java.util.List; * <tr> * <td>supportedDynamicImageFieldNames</td> * <td>List<ImageFieldName></td> - * <td>An array of ImageFieldName values for which the system supports sending OnFileUpdatenotifications. If you send an Image struct for that image field with a name without havinguploaded the image data using PutFile that matches that name, the system will request thatyou upload the data with PutFile at a later point when the HMI needs it. The HMI will thendisplay the image in the appropriate field. If not sent, assume false.</td> + * <td>An array of ImageFieldName values for which the system supports sending OnFileUpdateNotifications. If you send an Image struct for that image field with a name without having uploaded the image data using PutFile that matches that name, the system will request that you upload the data with PutFile at a later point when the HMI needs it. The HMI will then display the image in the appropriate field. If not sent, assume false.</td> * <td>N</td> * <td></td> * </tr> * <tr> * <td>supportsDynamicSubMenus</td> * <td>Boolean</td> - * <td>If true, the head unit supports dynamic sub-menus by sending OnUpdateSubMenunotifications. If true, you should not send AddCommands that attach to a parentID for anAddSubMenu until OnUpdateSubMenu is received with the menuID. At that point, you shouldsend all AddCommands with a parentID that match the menuID. If not set, assume false.</td> + * <td>If true, the head unit supports dynamic sub-menus by sending OnUpdateSubMenuNotifications. If true, you should not send AddCommands that attach to a parentID for anAddSubMenu until OnUpdateSubMenu is received with the menuID. At that point, you should send all AddCommands with a parentID that match the menuID. If not set, assume false.</td> * <td>N</td> * <td></td> * </tr> diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java index c1bd8d476..e4f6fbd38 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java @@ -62,7 +62,7 @@ import java.util.Hashtable; * <tr>
* <td>auxECallNotificationStatus</td>
* <td>VehicleDataNotificationStatus</td>
- * <td>References signal "eCallNotification". This is an alternative signal available on some carlines replacing the eCallNotificationStatus, but showing the same values.</td>
+ * <td>References signal "eCallNotification". This is an alternative signal available on some car lines replacing the eCallNotificationStatus, but showing the same values.</td>
* <td></td>
* <td></td>
* <td>SmartDeviceLink 2.0</td>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java index 509545143..430341342 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/EqualizerSettings.java @@ -94,7 +94,7 @@ public class EqualizerSettings extends RPCStruct { /** * Sets the channelName portion of the EqualizerSettings class * - * @param channelName Read-only channel / frequency name (e.i. "Treble, Midrange, Bass" or "125 Hz"). + * @param channelName Read-only channel / frequency name (e.i. "Treble, MidRange, Bass" or "125 Hz"). */ public EqualizerSettings setChannelName( String channelName) { setValue(KEY_CHANNEL_NAME, channelName); @@ -104,7 +104,7 @@ public class EqualizerSettings extends RPCStruct { /** * Gets the channelName portion of the EqualizerSettings class * - * @return String - Read-only channel / frequency name (e.i. "Treble, Midrange, Bass" or "125 Hz"). + * @return String - Read-only channel / frequency name (e.i. "Treble, MidRange, Bass" or "125 Hz"). */ public String getChannelName() { return getString(KEY_CHANNEL_NAME); diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java index 549ce6862..1c6885649 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/FuelRange.java @@ -95,7 +95,7 @@ import java.util.Hashtable; * <tr> * <td>capacityUnit</td> * <td>CapacityUnit</td> - * <td>The unit of the capacity of this fuel type such as liters for gasoline or kWh forbatteries.</td> + * <td>The unit of the capacity of this fuel type such as liters for gasoline or kWh for batteries.</td> * <td>N</td> * <td></td> * <td>SmartDeviceLink 7.0.0</td> diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java index 98d85a739..e259636e6 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java @@ -41,7 +41,7 @@ import com.smartdevicelink.util.SdlDataTypeConverter; import java.util.Hashtable;
/**
- * Describes the GPS data. Not all data will be available on all carlines.
+ * Describes the GPS data. Not all data will be available on all car lines.
* <p><b>Parameter List</b></p>
* <table border="1" rules="all">
* <tr>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GearStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GearStatus.java index dbae57a2a..b1dac965c 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GearStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GearStatus.java @@ -95,7 +95,7 @@ public class GearStatus extends RPCStruct { /** * Sets the userSelectedGear. * - * @param userSelectedGear Gear position selected by the user i.e. Park, Drive, Reverse + * @param selectedGear Gear position selected by the user i.e. Park, Drive, Reverse */ public GearStatus setUserSelectedGear( PRNDL selectedGear) { setValue(KEY_USER_SELECTED_GEAR, selectedGear); @@ -107,7 +107,6 @@ public class GearStatus extends RPCStruct { * * @return PRNDL Gear position selected by the user i.e. Park, Drive, Reverse */ - @SuppressWarnings("unchecked") public PRNDL getUserSelectedGear(){ return (PRNDL)getObject(PRNDL.class, KEY_USER_SELECTED_GEAR); } @@ -127,7 +126,6 @@ public class GearStatus extends RPCStruct { * * @return PRNDL Actual Gear in use by the transmission */ - @SuppressWarnings("unchecked") public PRNDL getActualGear(){ return (PRNDL)getObject(PRNDL.class, KEY_ACTUAL_GEAR); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java index 3b2a5098b..f5bc028ff 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleData.java @@ -104,8 +104,8 @@ public class GetInteriorVehicleData extends RPCRequest { * Sets subscribe parameter * * @param subscribe - * If subscribe is true, the head unit will register onInteriorVehicleData notifications for the requested moduelType. - * If subscribe is false, the head unit will unregister onInteriorVehicleData notifications for the requested moduelType. + * If subscribe is true, the head unit will register onInteriorVehicleData notifications for the requested moduleType. + * If subscribe is false, the head unit will unregister onInteriorVehicleData notifications for the requested moduleType. */ public GetInteriorVehicleData setSubscribe( Boolean subscribe) { setParameters(KEY_SUBSCRIBE, subscribe); diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java index e5480b584..654089853 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java @@ -84,7 +84,7 @@ import java.util.Hashtable; * <tr>
* <td>fuelLevel_State</td>
* <td>Boolean</td>
- * <td>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please seefuelRange.</td>
+ * <td>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please see fuelRange.</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 7.0.0</td>
@@ -92,7 +92,7 @@ import java.util.Hashtable; * <tr>
* <td>fuelRange</td>
* <td>Boolean</td>
- * <td>The fuel type, estimated range in KM, fuel level/capacity and fuel level state for thevehicle. See struct FuelRange for details.</td>
+ * <td>The fuel type, estimated range in KM, fuel level/capacity and fuel level state for the vehicle. See struct FuelRange for details.</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 5.0.0</td>
@@ -100,7 +100,7 @@ import java.util.Hashtable; * <tr>
* <td>instantFuelConsumption</td>
* <td>Boolean</td>
- * <td>The instantaneous fuel consumption in microlitres</td>
+ * <td>The instantaneous fuel consumption in micro litres</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 2.0</td>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java index fd1636edb..fc1abcf53 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java @@ -121,7 +121,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_GPS, gps);
return this;
}
- @SuppressWarnings("unchecked")
public GPSData getGps() {
return (GPSData) getObject(GPSData.class, KEY_GPS);
}
@@ -155,7 +154,6 @@ public class GetVehicleDataResponse extends RPCResponse { * @return a ComponentVolumeStatus related to FuelLevel State
*/
@Deprecated
- @SuppressWarnings("unchecked")
public ComponentVolumeStatus getFuelLevelState() {
return (ComponentVolumeStatus) getObject(ComponentVolumeStatus.class, KEY_FUEL_LEVEL_STATE);
}
@@ -235,7 +233,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_TIRE_PRESSURE, tirePressure);
return this;
}
- @SuppressWarnings("unchecked")
public TireStatus getTirePressure() {
return (TireStatus) getObject(TireStatus.class, KEY_TIRE_PRESSURE);
}
@@ -250,7 +247,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_BELT_STATUS, beltStatus);
return this;
}
- @SuppressWarnings("unchecked")
public BeltStatus getBeltStatus() {
return (BeltStatus) getObject(BeltStatus.class, KEY_BELT_STATUS);
}
@@ -258,7 +254,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_BODY_INFORMATION, bodyInformation);
return this;
}
- @SuppressWarnings("unchecked")
public BodyInformation getBodyInformation() {
return (BodyInformation) getObject(BodyInformation.class, KEY_BODY_INFORMATION);
}
@@ -266,7 +261,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_DEVICE_STATUS, deviceStatus);
return this;
}
- @SuppressWarnings("unchecked")
public DeviceStatus getDeviceStatus() {
return (DeviceStatus) getObject(DeviceStatus.class, KEY_DEVICE_STATUS);
}
@@ -289,7 +283,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_HEAD_LAMP_STATUS, headLampStatus);
return this;
}
- @SuppressWarnings("unchecked")
public HeadLampStatus getHeadLampStatus() {
return (HeadLampStatus) getObject(HeadLampStatus.class, KEY_HEAD_LAMP_STATUS);
}
@@ -332,7 +325,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_E_CALL_INFO, eCallInfo);
return this;
}
- @SuppressWarnings("unchecked")
public ECallInfo getECallInfo() {
return (ECallInfo) getObject(ECallInfo.class, KEY_E_CALL_INFO);
}
@@ -341,7 +333,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_AIRBAG_STATUS, airbagStatus);
return this;
}
- @SuppressWarnings("unchecked")
public AirbagStatus getAirbagStatus() {
return (AirbagStatus) getObject(AirbagStatus.class, KEY_AIRBAG_STATUS);
}
@@ -350,7 +341,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_EMERGENCY_EVENT, emergencyEvent);
return this;
}
- @SuppressWarnings("unchecked")
public EmergencyEvent getEmergencyEvent() {
return (EmergencyEvent) getObject(EmergencyEvent.class, KEY_EMERGENCY_EVENT);
}
@@ -358,7 +348,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
return this;
}
- @SuppressWarnings("unchecked")
public ClusterModeStatus getClusterModeStatus() {
return (ClusterModeStatus) getObject(ClusterModeStatus.class, KEY_CLUSTER_MODE_STATUS);
}
@@ -366,7 +355,6 @@ public class GetVehicleDataResponse extends RPCResponse { setParameters(KEY_MY_KEY, myKey);
return this;
}
- @SuppressWarnings("unchecked")
public MyKey getMyKey() {
return (MyKey) getObject(MyKey.class, KEY_MY_KEY);
}
@@ -410,7 +398,6 @@ public class GetVehicleDataResponse extends RPCResponse { *
* @see com.smartdevicelink.proxy.rpc.enums.TurnSignal
*/
- @SuppressWarnings("unchecked")
public TurnSignal getTurnSignal() {
return (TurnSignal) getObject(TurnSignal.class, KEY_TURN_SIGNAL);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java index 6226dc991..f8eed013b 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Headers.java @@ -67,8 +67,8 @@ public class Headers extends RPCStruct { super(hash);
}
- public Headers setContentType( String contenttype) {
- setValue(KEY_CONTENT_TYPE, contenttype);
+ public Headers setContentType( String contentType) {
+ setValue(KEY_CONTENT_TYPE, contentType);
return this;
}
@@ -76,8 +76,8 @@ public class Headers extends RPCStruct { return getString(KEY_CONTENT_TYPE);
}
- public Headers setConnectTimeout( Integer connectiontimeout) {
- setValue(KEY_CONNECT_TIMEOUT, connectiontimeout);
+ public Headers setConnectTimeout( Integer connectionTimeout) {
+ setValue(KEY_CONNECT_TIMEOUT, connectionTimeout);
return this;
}
@@ -85,8 +85,8 @@ public class Headers extends RPCStruct { return getInteger(KEY_CONNECT_TIMEOUT);
}
- public Headers setDoOutput( Boolean dooutput) {
- setValue(KEY_DO_OUTPUT, dooutput);
+ public Headers setDoOutput( Boolean doOutput) {
+ setValue(KEY_DO_OUTPUT, doOutput);
return this;
}
@@ -94,8 +94,8 @@ public class Headers extends RPCStruct { return getBoolean(KEY_DO_OUTPUT);
}
- public Headers setDoInput( Boolean doinput) {
- setValue(KEY_DO_INPUT, doinput);
+ public Headers setDoInput( Boolean doInput) {
+ setValue(KEY_DO_INPUT, doInput);
return this;
}
@@ -103,8 +103,8 @@ public class Headers extends RPCStruct { return getBoolean(KEY_DO_INPUT);
}
- public Headers setUseCaches( Boolean usescaches) {
- setValue(KEY_USE_CACHES, usescaches);
+ public Headers setUseCaches( Boolean usesCaches) {
+ setValue(KEY_USE_CACHES, usesCaches);
return this;
}
@@ -112,8 +112,8 @@ public class Headers extends RPCStruct { return getBoolean(KEY_USE_CACHES);
}
- public Headers setRequestMethod( String requestmethod) {
- setValue(KEY_REQUEST_METHOD, requestmethod);
+ public Headers setRequestMethod( String requestMethod) {
+ setValue(KEY_REQUEST_METHOD, requestMethod);
return this;
}
@@ -122,8 +122,8 @@ public class Headers extends RPCStruct { }
- public Headers setReadTimeout( Integer readtimeout) {
- setValue(KEY_READ_TIMEOUT, readtimeout);
+ public Headers setReadTimeout( Integer readTimeout) {
+ setValue(KEY_READ_TIMEOUT, readTimeout);
return this;
}
@@ -131,8 +131,8 @@ public class Headers extends RPCStruct { return getInteger(KEY_READ_TIMEOUT);
}
- public Headers setInstanceFollowRedirects( Boolean instancefollowredirects) {
- setValue(KEY_INSTANCE_FOLLOW_REDIRECTS, instancefollowredirects);
+ public Headers setInstanceFollowRedirects( Boolean instanceFollowRedirects) {
+ setValue(KEY_INSTANCE_FOLLOW_REDIRECTS, instanceFollowRedirects);
return this;
}
@@ -149,8 +149,8 @@ public class Headers extends RPCStruct { return getString(KEY_CHARSET);
}
- public Headers setContentLength( Integer contentlength) {
- setValue(KEY_CONTENT_LENGTH, contentlength);
+ public Headers setContentLength( Integer contentLength) {
+ setValue(KEY_CONTENT_LENGTH, contentLength);
return this;
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Image.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Image.java index 1d5b57e26..0cf1ef12a 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Image.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Image.java @@ -39,7 +39,7 @@ import com.smartdevicelink.proxy.rpc.enums.ImageType; import java.util.Hashtable;
/**
- *Specifies, which image shall be used, e.g. in Alerts or on Softbuttons provided the display supports it.
+ *Specifies, which image shall be used, e.g. in Alerts or on SoftButtons provided the display supports it.
*<p><b>Parameter List</b></p>
* <table border="1" rules="all">
* <tr>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java index 0e4748072..6fa2e3651 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java @@ -120,7 +120,6 @@ public class ImageField extends RPCStruct { setValue(KEY_IMAGE_TYPE_SUPPORTED, imageTypeSupported);
return this;
}
- @SuppressWarnings("unchecked")
public ImageResolution getImageResolution() {
return (ImageResolution) getObject(ImageResolution.class, KEY_IMAGE_RESOLUTION);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java index 151075bab..ab326ed06 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ImageResolution.java @@ -132,7 +132,7 @@ public class ImageResolution extends RPCStruct { @Override
public String toString() {
- return "width=" + String.valueOf(getResolutionWidth()) +
- ", height=" + String.valueOf(getResolutionHeight());
+ return "width=" + getResolutionWidth() +
+ ", height=" + getResolutionHeight();
}
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java index 3687cd05e..1a182e732 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/KeyboardProperties.java @@ -69,7 +69,7 @@ import java.util.List; * <td>Boolean</td>
* <td>false</td>
* <td></td>
- * <td>In this mode, all keypresses will be sent as they occur. If disabled, entire string of text will be returned only once submitted by user.If omitted, this value will be set to FALSE.</td>
+ * <td>In this mode, all key presses will be sent as they occur. If disabled, entire string of text will be returned only once submitted by user.If omitted, this value will be set to FALSE.</td>
* </tr>
* <tr>
* <td>keypressMode</td>
@@ -82,7 +82,7 @@ import java.util.List; * <td>limitedCharacterList</td>
* <td>String</td>
* <td>false</td>
- * <td>Array = true maxlength = 1 minsize = 1 maxsize = 100</td>
+ * <td>Array = true maxLength = 1 minsize = 1 maxsize = 100</td>
* <td>Array of keyboard characters to enable. All omitted characters will be greyed out (disabled) on the keyboard. If omitted, the entire keyboard will be enabled.</td>
* </tr>
*
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java index 749d43039..17ba11742 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/LightState.java @@ -143,7 +143,6 @@ public class LightState extends RPCStruct { * * @see com.smartdevicelink.proxy.rpc.RGBColor */ - @SuppressWarnings("unchecked") public RGBColor getColor() { return (RGBColor) getObject(RGBColor.class, KEY_COLOR); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java index 574d16912..70e29ec77 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/LocationDetails.java @@ -52,7 +52,6 @@ public class LocationDetails extends RPCStruct{ super(hash); } - @SuppressWarnings("unchecked") public Coordinate getCoordinate() { return (Coordinate) getObject(Coordinate.class, KEY_COORDINATE); } @@ -98,7 +97,6 @@ public class LocationDetails extends RPCStruct{ return this; } - @SuppressWarnings("unchecked") public Image getLocationImage() { return (Image) getObject(Image.class, KEY_LOCATION_IMAGE); } @@ -108,7 +106,6 @@ public class LocationDetails extends RPCStruct{ return this; } - @SuppressWarnings("unchecked") public OasisAddress getSearchAddress() { return (OasisAddress) getObject(OasisAddress.class, KEY_SEARCH_ADDRESS); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java index ca408c580..3bdd9670a 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java @@ -91,7 +91,7 @@ import java.util.Hashtable; * <tr>
* <td>buttonEventMode</td>
* <td>{@linkplain ButtonEventMode}</td>
- * <td>Indicats button was depressed (DOWN) or released (UP)</td>
+ * <td>Indicates button was depressed (DOWN) or released (UP)</td>
* <td></td>
* <td></td>
* <td>SmartDeviceLink 1.0</td>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java index 12695323d..93fd96dce 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java @@ -73,7 +73,7 @@ import java.util.Hashtable; * <tr>
* <td>triggerSource</td>
* <td>{@linkplain TriggerSource}</td>
- * <td>Indicates whether command was selected via VR or via a menu selection (using the OKbutton).</td>
+ * <td>Indicates whether command was selected via VR or via a menu selection (using the OK button).</td>
* <td></td>
* <td>SmartDeviceLink 1.0</td>
* </tr>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java index 3b2f71269..c2906fbce 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java @@ -40,7 +40,7 @@ import com.smartdevicelink.proxy.rpc.enums.KeyboardEvent; import java.util.Hashtable;
/**
- * On-screen keyboard event. Can be full string or individual keypresses depending on keyboard mode.
+ * On-screen keyboard event. Can be full string or individual key presses depending on keyboard mode.
* <p></p>
* <p><b>Parameter List</b></p>
* <table border="1" rules="all">
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnUpdateSubMenu.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnUpdateSubMenu.java index e430aa71d..1b12dd76a 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnUpdateSubMenu.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnUpdateSubMenu.java @@ -62,7 +62,7 @@ import java.util.Hashtable; * <tr> * <td>updateSubCells</td> * <td>Boolean</td> - * <td>If not set, assume false. If true, the app should send AddCommands with parentIDs matchingthe menuID. These AddCommands will then be attached to the submenu and displayed if thesubmenu is selected.</td> + * <td>If not set, assume false. If true, the app should send AddCommands with parentIDs matching the menuID. These AddCommands will then be attached to the submenu and displayed if the submenu is selected.</td> * <td>N</td> * <td></td> * </tr> diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java index c134eba57..b18fd2c50 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java @@ -102,7 +102,7 @@ import java.util.List; * <tr>
* <td>fuelLevel_State</td>
* <td>Boolean</td>
- * <td>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please seefuelRange.</td>
+ * <td>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please see fuelRange.</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 7.0.0</td>
@@ -110,7 +110,7 @@ import java.util.List; * <tr>
* <td>fuelRange</td>
* <td>Boolean</td>
- * <td>The fuel type, estimated range in KM, fuel level/capacity and fuel level state for thevehicle. See struct FuelRange for details.</td>
+ * <td>The fuel type, estimated range in KM, fuel level/capacity and fuel level state for the vehicle. See struct FuelRange for details.</td>
* <td>N</td>
* <td>{"array_min_size": 0, "array_max_size": 100}</td>
* <td>SmartDeviceLink 5.0.0</td>
@@ -118,7 +118,7 @@ import java.util.List; * <tr>
* <td>instantFuelConsumption</td>
* <td>Float</td>
- * <td>The instantaneous fuel consumption in microlitres</td>
+ * <td>The instantaneous fuel consumption in micro litres</td>
* <td>N</td>
* <td>Subscribable </td>
* <td>SmartDeviceLink 2.0</td>
@@ -218,7 +218,7 @@ import java.util.List; * </tr>
* <tr>
* <td>emergencyEvent</td>
- * <td>EmergencyEvernt</td>
+ * <td>EmergencyEvent</td>
* <td>Information related to an emergency event (and if it occurred).</td>
* <td>N</td>
* <td>Subscribable</td>
@@ -390,7 +390,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_GPS, gps);
return this;
}
- @SuppressWarnings("unchecked")
public GPSData getGps() {
return (GPSData) getObject(GPSData.class, KEY_GPS);
}
@@ -498,7 +497,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_TIRE_PRESSURE, tirePressure);
return this;
}
- @SuppressWarnings("unchecked")
public TireStatus getTirePressure() {
return (TireStatus) getObject(TireStatus.class, KEY_TIRE_PRESSURE);
}
@@ -513,7 +511,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_BELT_STATUS, beltStatus);
return this;
}
- @SuppressWarnings("unchecked")
public BeltStatus getBeltStatus() {
return (BeltStatus) getObject(BeltStatus.class, KEY_BELT_STATUS);
}
@@ -521,7 +518,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_BODY_INFORMATION, bodyInformation);
return this;
}
- @SuppressWarnings("unchecked")
public BodyInformation getBodyInformation() {
return (BodyInformation) getObject(BodyInformation.class, KEY_BODY_INFORMATION);
}
@@ -529,7 +525,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_DEVICE_STATUS, deviceStatus);
return this;
}
- @SuppressWarnings("unchecked")
public DeviceStatus getDeviceStatus() {
return (DeviceStatus) getObject(DeviceStatus.class, KEY_DEVICE_STATUS);
}
@@ -551,7 +546,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_HEAD_LAMP_STATUS, headLampStatus);
return this;
}
- @SuppressWarnings("unchecked")
public HeadLampStatus getHeadLampStatus() {
return (HeadLampStatus) getObject(HeadLampStatus.class, KEY_HEAD_LAMP_STATUS);
}
@@ -591,7 +585,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_E_CALL_INFO, eCallInfo);
return this;
}
- @SuppressWarnings("unchecked")
public ECallInfo getECallInfo() {
return (ECallInfo) getObject(ECallInfo.class, KEY_E_CALL_INFO);
}
@@ -599,7 +592,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_AIRBAG_STATUS, airbagStatus);
return this;
}
- @SuppressWarnings("unchecked")
public AirbagStatus getAirbagStatus() {
return (AirbagStatus) getObject(AirbagStatus.class, KEY_AIRBAG_STATUS);
}
@@ -607,7 +599,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_EMERGENCY_EVENT, emergencyEvent);
return this;
}
- @SuppressWarnings("unchecked")
public EmergencyEvent getEmergencyEvent() {
return (EmergencyEvent) getObject(EmergencyEvent.class, KEY_EMERGENCY_EVENT);
}
@@ -615,7 +606,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
return this;
}
- @SuppressWarnings("unchecked")
public ClusterModeStatus getClusterModeStatus() {
return (ClusterModeStatus) getObject(ClusterModeStatus.class, KEY_CLUSTER_MODE_STATUS);
}
@@ -623,7 +613,6 @@ public class OnVehicleData extends RPCNotification { setParameters(KEY_MY_KEY, myKey);
return this;
}
- @SuppressWarnings("unchecked")
public MyKey getMyKey() {
return (MyKey) getObject(MyKey.class, KEY_MY_KEY);
}
@@ -668,7 +657,6 @@ public class OnVehicleData extends RPCNotification { * Gets turnSignal
* @return TurnSignal
*/
- @SuppressWarnings("unchecked")
public TurnSignal getTurnSignal() {
return (TurnSignal) getObject(TurnSignal.class, KEY_TURN_SIGNAL);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java index e102f56c0..be856f93b 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ParameterPermissions.java @@ -63,7 +63,7 @@ import java.util.List; * <tr>
* <td>userDisallowed</td>
* <td>String</td>
- * <td>A set of all parameters that are prohibated for this given RPC.
+ * <td>A set of all parameters that are prohibited for this given RPC.
* <ul>
* <li>Min size: 0</li>
* <li>Max size: 100</li>
@@ -132,7 +132,7 @@ public class ParameterPermissions extends RPCStruct { /**
* set a set of all parameters that are prohibited for this given RPC.
- * @param userDisallowed paramter that is prohibited for this given RPC
+ * @param userDisallowed parameter that is prohibited for this given RPC
*/
public ParameterPermissions setUserDisallowed(@NonNull List<String> userDisallowed) {
setValue(KEY_USER_DISALLOWED, userDisallowed);
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java index 237fe84cc..830e27930 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java @@ -113,7 +113,6 @@ public class PermissionItem extends RPCStruct { setValue(KEY_RPC_NAME, rpcName);
return this;
}
- @SuppressWarnings("unchecked")
public HMIPermissions getHMIPermissions() {
return (HMIPermissions) getObject(HMIPermissions.class, KEY_HMI_PERMISSIONS);
}
@@ -121,7 +120,6 @@ public class PermissionItem extends RPCStruct { setValue(KEY_HMI_PERMISSIONS, hmiPermissions);
return this;
}
- @SuppressWarnings("unchecked")
public ParameterPermissions getParameterPermissions() {
return (ParameterPermissions) getObject(ParameterPermissions.class, KEY_PARAMETER_PERMISSIONS);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java index ae4c0e874..ca2bc9d47 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterface.java @@ -195,13 +195,13 @@ import java.util.List; * <td>String</td>
* <td>ID used to uniquely identify current state of all app data that can persist through connection cycles (e.g. ignition cycles).This registered data (commands, submenus, choice sets, etc.) can be reestablished without needing to explicitly reregister each piece. If omitted, then the previous state of an app's commands, etc. will not be restored.When sending hashID, all RegisterAppInterface parameters should still be provided (e.g. ttsName, etc.). </td>
* <td>N</td>
- * <td>maxlength:100</td>
+ * <td>maxLength:100</td>
* <td>SmartDeviceLink 2.3.1 </td>
* </tr>
* <tr>
* <td>deviceInfo</td>
* <td>DeviceInfo</td>
- * <td>Various information abount connecting device.</td>
+ * <td>Various information about connecting device.</td>
* <td>N</td>
* <td></td>
* <td>SmartDeviceLink 2.3.1 </td>
@@ -211,7 +211,7 @@ import java.util.List; * <td>String</td>
* <td>ID used to validate app with policy table entries</td>
* <td>Y</td>
- * <td>Maxlength: 100</td>
+ * <td>maxLength: 100</td>
* <td>SmartDeviceLink 2.0 </td>
* </tr>
* <tr>
@@ -334,7 +334,7 @@ public class RegisterAppInterface extends RPCRequest { * @param languageDesired a Language Enumeration
* @param hmiDisplayLanguageDesired the requested language to be used on the HMI/Display
* @param fullAppID a String value representing a unique ID, which an app will be given when approved <br>
- * <b>Notes: </b>Maxlength = 100
+ * <b>Notes: </b>maxLength = 100
*/
public RegisterAppInterface(@NonNull SdlMsgVersion syncMsgVersion, @NonNull String appName, @NonNull Boolean isMediaApplication,
@NonNull Language languageDesired, @NonNull Language hmiDisplayLanguageDesired, @NonNull String fullAppID) {
@@ -352,7 +352,6 @@ public class RegisterAppInterface extends RPCRequest { * @return SdlMsgVersion -a SdlMsgVersion object representing version of
* the SDL® SmartDeviceLink interface
*/
- @SuppressWarnings("unchecked")
public SdlMsgVersion getSdlMsgVersion() {
return (SdlMsgVersion) getObject(SdlMsgVersion.class, KEY_SDL_MSG_VERSION);
}
@@ -381,7 +380,6 @@ public class RegisterAppInterface extends RPCRequest { return this;
}
- @SuppressWarnings("unchecked")
public DeviceInfo getDeviceInfo() {
return (DeviceInfo) getObject(DeviceInfo.class, KEY_DEVICE_INFO);
}
@@ -433,7 +431,7 @@ public class RegisterAppInterface extends RPCRequest { /**
*
* @param ttsName
- * a List<TTSChunk> value represeting the TTS Name
+ * a List<TTSChunk> value representing the TTS Name
* <p></p>
* <b>Notes: </b>
* <ul>
@@ -454,23 +452,23 @@ public class RegisterAppInterface extends RPCRequest { }
/**
* Gets a String representing an abbreviated version of the mobile
- * applincation's name (if necessary) that will be displayed on the NGN
+ * application's name (if necessary) that will be displayed on the NGN
* media screen
*
* @return String -a String value representing an abbreviated version of the
- * mobile applincation's name
+ * mobile application's name
*/
public String getNgnMediaScreenAppName() {
return getString(KEY_NGN_MEDIA_SCREEN_APP_NAME);
}
/**
* Sets a String representing an abbreviated version of the mobile
- * applincation's name (if necessary) that will be displayed on the NGN
+ * application's name (if necessary) that will be displayed on the NGN
* media screen
*
* @param ngnMediaScreenAppName
* a String value representing an abbreviated version of the
- * mobile applincation's name
+ * mobile application's name
* <p></p>
* <b>Notes: </b>
* <ul>
@@ -592,7 +590,7 @@ public class RegisterAppInterface extends RPCRequest { * @return List<AppHMIType> - a List value representing a list of all
* applicable app types stating which classifications to be given to
* the app
- * @since SmartDeviceLinke 2.0
+ * @since SmartDeviceLink 2.0
*/
@SuppressWarnings("unchecked")
public List<AppHMIType> getAppHMIType() {
@@ -663,7 +661,7 @@ public class RegisterAppInterface extends RPCRequest { * a String value representing a unique ID, which an app will be
* given when approved
* <p></p>
- * <b>Notes: </b>Maxlength = 100
+ * <b>Notes: </b>maxLength = 100
* @since SmartDeviceLink 2.0
*/
public RegisterAppInterface setAppID(@NonNull String appID) {
@@ -693,7 +691,7 @@ public class RegisterAppInterface extends RPCRequest { * a String value representing a unique ID, which an app will be
* given when approved
* <p></p>
- * <b>Notes: </b>Maxlength = 100
+ * <b>Notes: </b>maxLength = 100
* @since SmartDeviceLink 5.0
*/
public RegisterAppInterface setFullAppID( String fullAppID) {
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java index 967737c85..7bb247e2b 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java @@ -136,7 +136,6 @@ public class RegisterAppInterfaceResponse extends RPCResponse { * @return SdlMsgVersion -a SdlMsgVersion object representing version of
* the SDL® SmartDeviceLink interface
*/
- @SuppressWarnings("unchecked")
public SdlMsgVersion getSdlMsgVersion() {
return (SdlMsgVersion) getObject(SdlMsgVersion.class, KEY_SDL_MSG_VERSION);
}
@@ -220,7 +219,6 @@ public class RegisterAppInterfaceResponse extends RPCResponse { * @return DisplayCapabilities
*/
@Deprecated
- @SuppressWarnings("unchecked")
public DisplayCapabilities getDisplayCapabilities() {
return (DisplayCapabilities) getObject(DisplayCapabilities.class, KEY_DISPLAY_CAPABILITIES);
}
@@ -279,7 +277,6 @@ public class RegisterAppInterfaceResponse extends RPCResponse { * @return PresetBankCapabilities
*/
@Deprecated
- @SuppressWarnings("unchecked")
public PresetBankCapabilities getPresetBankCapabilities() {
return (PresetBankCapabilities) getObject(PresetBankCapabilities.class, KEY_PRESET_BANK_CAPABILITIES);
}
@@ -373,7 +370,6 @@ public class RegisterAppInterfaceResponse extends RPCResponse { *
* @return vehicleType
*/
- @SuppressWarnings("unchecked")
public VehicleType getVehicleType() {
return (VehicleType) getObject(VehicleType.class, KEY_VEHICLE_TYPE);
}
@@ -409,7 +405,6 @@ public class RegisterAppInterfaceResponse extends RPCResponse { *
* @return pcmStreamingCapabilities
*/
- @SuppressWarnings("unchecked")
public AudioPassThruCapabilities getPcmStreamingCapabilities() {
return (AudioPassThruCapabilities) getObject(AudioPassThruCapabilities.class, KEY_PCM_STREAM_CAPABILITIES);
}
@@ -437,7 +432,6 @@ public class RegisterAppInterfaceResponse extends RPCResponse { return this;
}
- @SuppressWarnings("unchecked")
public HMICapabilities getHmiCapabilities() {
return (HMICapabilities) getObject(HMICapabilities.class, KEY_HMI_CAPABILITIES);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java index fd644cb40..bf42b7079 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScreenParams.java @@ -80,7 +80,7 @@ public class ScreenParams extends RPCStruct { public ScreenParams() { }
/**
* <p>
- * Constructs a new ScreenParamst object indicated by the Hashtable
+ * Constructs a new ScreenParams object indicated by the Hashtable
* parameter
* </p>
*
@@ -101,7 +101,6 @@ public class ScreenParams extends RPCStruct { setImageResolution(resolution);
}
- @SuppressWarnings("unchecked")
public ImageResolution getImageResolution() {
return (ImageResolution) getObject(ImageResolution.class, KEY_RESOLUTION);
}
@@ -109,7 +108,6 @@ public class ScreenParams extends RPCStruct { setValue(KEY_RESOLUTION, resolution);
return this;
}
- @SuppressWarnings("unchecked")
public TouchEventCapabilities getTouchEventAvailable() {
return (TouchEventCapabilities) getObject(TouchEventCapabilities.class, KEY_TOUCH_EVENT_AVAILABLE);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java index cb331914a..5e1080182 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java @@ -72,7 +72,7 @@ import java.util.List; * <td>Integer</td>
* <td>App defined timeout. Indicates how long of a timeout from the last action (i.e. scrolling message resets timeout).</td>
* <td>N</td>
- * <td>minvalue=1000; maxvalue=65535; defvalue=30000</td>
+ * <td>minValue=1000; maxValue=65535; defValue=30000</td>
* <td>SmartDevice Link 1.0 </td>
* </tr>
* <tr>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java index 8f63ff39e..ad883e310 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java @@ -387,7 +387,6 @@ public class SeatControlData extends RPCStruct { * * @return SeatMemoryAction. */ - @SuppressWarnings("unchecked") public SeatMemoryAction getMemory() { return (SeatMemoryAction) getObject(SeatMemoryAction.class, KEY_MEMORY); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java index 1ed6cfb10..02cff3664 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SendLocation.java @@ -199,7 +199,6 @@ public class SendLocation extends RPCRequest{ * Getter for image of the location to send. * @return The image of the location to send */ - @SuppressWarnings("unchecked") public Image getLocationImage(){ return (Image) getObject(Image.class, KEY_LOCATION_IMAGE); } @@ -222,8 +221,7 @@ public class SendLocation extends RPCRequest{ return this; } - @SuppressWarnings("unchecked") - public DateTime getTimeStamp() { + public DateTime getTimeStamp() { return (DateTime) getObject(DateTime.class, KEY_TIME_STAMP); } @@ -232,8 +230,7 @@ public class SendLocation extends RPCRequest{ return this; } - @SuppressWarnings("unchecked") - public OasisAddress getAddress() { + public OasisAddress getAddress() { return (OasisAddress) getObject(OasisAddress.class, KEY_ADDRESS); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java index eb4e641d9..de955a5d0 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java @@ -82,7 +82,6 @@ public class SetDisplayLayoutResponse extends RPCResponse { setResultCode(resultCode);
}
- @SuppressWarnings("unchecked")
public DisplayCapabilities getDisplayCapabilities() {
return (DisplayCapabilities) getObject(DisplayCapabilities.class, KEY_DISPLAY_CAPABILITIES);
}
@@ -112,7 +111,6 @@ public class SetDisplayLayoutResponse extends RPCResponse { return this;
}
- @SuppressWarnings("unchecked")
public PresetBankCapabilities getPresetBankCapabilities() {
return (PresetBankCapabilities) getObject(PresetBankCapabilities.class, KEY_PRESET_BANK_CAPABILITIES);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java index 28050a867..e38b38e10 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetGlobalProperties.java @@ -83,7 +83,7 @@ import java.util.List; * <td>string</td>
* <td>Text, which is shown as title of the VR help screen used in an interaction started by PTT.</td>
* <td>N</td>
- * <td>If omitted on supported displays, the default SDL help title will be used. <p>If omitted and one or more vrHelp items are provided, the request will be rejected.</p>maxlength: 500</td>
+ * <td>If omitted on supported displays, the default SDL help title will be used. <p>If omitted and one or more vrHelp items are provided, the request will be rejected.</p>maxLength: 500</td>
* <td>SmartDeviceLink 1.0</td>
* </tr>
* <tr>
@@ -91,7 +91,7 @@ import java.util.List; * <td>VrHelp</td>
* <td>Items listed in the VR help screen used in an interaction started by PTT.</td>
* <td>N</td>
- * <td>If omitted on supported displays, the default SDL VR help / What Can I Say? screen will be used<p>If the list of VR Help Items contains nonsequential positions (e.g. [1,2,4]), the RPC will be rejected.</p><p>If omitted and a vrHelpTitle is provided, the request will be rejected.</p>minsize:1; maxsize: 100 </td>
+ * <td>If omitted on supported displays, the default SDL VR help / What Can I Say? screen will be used<p>If the list of VR Help Items contains non-sequential positions (e.g. [1,2,4]), the RPC will be rejected.</p><p>If omitted and a vrHelpTitle is provided, the request will be rejected.</p>minsize:1; maxsize: 100 </td>
* <td>SmartDeviceLink 1.0</td>
* </tr>
* <tr>
@@ -282,7 +282,7 @@ public class SetGlobalProperties extends RPCRequest { * <ul>
* <li>If omitted on supported displays, the default SmartDeviceLink VR
* help / What Can I Say? screen will be used</li>
- * <li>If the list of VR Help Items contains nonsequential
+ * <li>If the list of VR Help Items contains non-sequential
* positions (e.g. [1,2,4]), the RPC will be rejected</li>
* <li>If omitted and a vrHelpTitle is provided, the request
* will be rejected</li>
@@ -310,7 +310,6 @@ public class SetGlobalProperties extends RPCRequest { return this;
}
- @SuppressWarnings("unchecked")
public Image getMenuIcon() {
return (Image) getObject(Image.class, KEY_MENU_ICON);
}
@@ -337,7 +336,6 @@ public class SetGlobalProperties extends RPCRequest { return (SeatLocation) getObject(SeatLocation.class, KEY_USER_LOCATION);
}
- @SuppressWarnings("unchecked")
public KeyboardProperties getKeyboardProperties() {
return (KeyboardProperties) getObject(KeyboardProperties.class, KEY_KEYBOARD_PROPERTIES);
}
@@ -357,7 +355,6 @@ public class SetGlobalProperties extends RPCRequest { * the head unit will change the display to the new layout type.
* @return the MenuLayout
*/
- @SuppressWarnings("unchecked")
public MenuLayout getMenuLayout() {
return (MenuLayout) getObject(MenuLayout.class, KEY_MENU_LAYOUT);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java index 05a97cc62..af8ad974a 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java @@ -46,7 +46,7 @@ import java.util.Hashtable; * count-down, etc.)
*
* <p>Function Group: Base </p>
- * <p><b>HMILevel needs to be FULL, LIMITIED or BACKGROUND</b></p>
+ * <p><b>HMILevel needs to be FULL, LIMITED or BACKGROUND</b></p>
*
* <p><b>Parameter List</b></p>
*
@@ -262,7 +262,6 @@ public class SetMediaClockTimer extends RPCRequest { * @return StartTime -a StartTime object specifying hour, minute, second
* values
*/
- @SuppressWarnings("unchecked")
public StartTime getStartTime() {
return (StartTime) getObject(StartTime.class, KEY_START_TIME);
}
@@ -284,7 +283,6 @@ public class SetMediaClockTimer extends RPCRequest { return this;
}
- @SuppressWarnings("unchecked")
public StartTime getEndTime() {
return (StartTime) getObject(StartTime.class, KEY_END_TIME);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java index dceae1a3b..f49b3ec0e 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java @@ -430,7 +430,7 @@ public class Show extends RPCRequest { * MediaClockFormat enumeration
*
* @param mediaClock
- * a String value for the MdaiaClock
+ * a String value for the MediaClock
* <p></p>
* <b>Notes: </b>
* <ul>
@@ -494,7 +494,6 @@ public class Show extends RPCRequest { * displays
* @since SmartDeviceLink 2.0
*/
- @SuppressWarnings("unchecked")
public Image getGraphic() {
return (Image) getObject(Image.class, KEY_GRAPHIC);
}
@@ -506,7 +505,6 @@ public class Show extends RPCRequest { }
- @SuppressWarnings("unchecked")
public Image getSecondaryGraphic() {
return (Image) getObject(Image.class, KEY_SECONDARY_GRAPHIC);
}
@@ -528,7 +526,7 @@ public class Show extends RPCRequest { * Sets the the Soft buttons defined by the App
*
* @param softButtons
- * a List value represemting the Soft buttons defined by the
+ * a List value representing the Soft buttons defined by the
* App
* <p></p>
* <b>Notes: </b>
@@ -633,7 +631,6 @@ public class Show extends RPCRequest { *
* @since 6.0
*/
- @SuppressWarnings("unchecked")
public TemplateConfiguration getTemplateConfiguration() {
return (TemplateConfiguration) getObject(TemplateConfiguration.class, KEY_TEMPLATE_CONFIGURATION);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java index a8e375b8f..b6c050739 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ShowConstantTbt.java @@ -171,7 +171,7 @@ public class ShowConstantTbt extends RPCRequest{ } /** - * Sets an Image for turnicon + * Sets an Image for turn icon * * @param turnIcon * an Image value @@ -182,11 +182,10 @@ public class ShowConstantTbt extends RPCRequest{ } /** - * Gets an Image for turnicon + * Gets an Image for turn icon * * @return Image -an Image value representing an Image for turnicon */ - @SuppressWarnings("unchecked") public Image getTurnIcon(){ return (Image) getObject(Image.class, KEY_MANEUVER_IMAGE); } @@ -207,7 +206,6 @@ public class ShowConstantTbt extends RPCRequest{ * * @return Image -an Image value representing an Image for nextTurnIcon */ - @SuppressWarnings("unchecked") public Image getNextTurnIcon(){ return (Image) getObject(Image.class, KEY_NEXT_MANEUVER_IMAGE); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java index e25ac69b9..0862ccc5e 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SisData.java @@ -92,7 +92,6 @@ public class SisData extends RPCStruct { * * @return StationIDNumber. */ - @SuppressWarnings("unchecked") public StationIDNumber getStationIDNumber() { return (StationIDNumber) getObject(StationIDNumber.class, KEY_STATION_ID_NUMBER); } @@ -131,7 +130,6 @@ public class SisData extends RPCStruct { * * @return GPSData - Provides the 3-dimensional geographic station location. */ - @SuppressWarnings("unchecked") public GPSData getStationLocation() { return (GPSData) getObject(GPSData.class, KEY_STATION_LOCATION); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java index ef25006da..8ff2868a6 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java @@ -154,7 +154,6 @@ public class SoftButton extends RPCStruct { setValue(KEY_IMAGE, image);
return this;
}
- @SuppressWarnings("unchecked")
public Image getImage() {
return (Image) getObject(Image.class, KEY_IMAGE);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java index 7dbbbc247..437b42de7 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java @@ -92,7 +92,7 @@ import java.util.Hashtable; * <tr>
* <td>fuelLevel_State</td>
* <td>Boolean</td>
- * <td>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please seefuelRange.</td>
+ * <td>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please see fuelRange.</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 7.0.0</td>
@@ -100,7 +100,7 @@ import java.util.Hashtable; * <tr>
* <td>fuelRange</td>
* <td>Boolean</td>
- * <td>The fuel type, estimated range in KM, fuel level/capacity and fuel level state for thevehicle. See struct FuelRange for details.</td>
+ * <td>The fuel type, estimated range in KM, fuel level/capacity and fuel level state for the vehicle. See struct FuelRange for details.</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 5.0.0</td>
@@ -108,7 +108,7 @@ import java.util.Hashtable; * <tr>
* <td>instantFuelConsumption</td>
* <td>Boolean</td>
- * <td>The instantaneous fuel consumption in microlitres</td>
+ * <td>The instantaneous fuel consumption in micro litres</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 2.0 </td>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java index dfe668f66..a32b7d5ed 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java @@ -126,7 +126,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Gps
* @return a VehicleDataResult related to GPS
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getGps() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_GPS);
}
@@ -142,7 +141,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Speed
* @return a VehicleDataResult related to speed
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getSpeed() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_SPEED);
}
@@ -158,7 +156,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets rpm
* @return a VehicleDataResult related to RPM
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getRpm() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_RPM);
}
@@ -179,7 +176,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * @return VehicleDataResult The fuel level in the tank (percentage). This parameter is deprecated starting RPC Spec
* 7.0, please see fuelRange.
*/
- @SuppressWarnings("unchecked")
@Deprecated
public VehicleDataResult getFuelLevel() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_FUEL_LEVEL);
@@ -198,7 +194,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * @return a VehicleDataResult related to FuelLevel State
*/
@Deprecated
- @SuppressWarnings("unchecked")
public VehicleDataResult getFuelLevelState() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_FUEL_LEVEL_STATE);
}
@@ -214,7 +209,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Instant Fuel Consumption
* @return a VehicleDataResult related to instant fuel consumption
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getInstantFuelConsumption() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_INSTANT_FUEL_CONSUMPTION);
}
@@ -230,7 +224,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets External Temperature
* @return a VehicleDataResult related to external temperature
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getExternalTemperature() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_EXTERNAL_TEMPERATURE);
}
@@ -252,7 +245,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * @deprecated in SmartDeviceLink 7.0.0
*/
@Deprecated
- @SuppressWarnings("unchecked")
public VehicleDataResult getPrndl() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_PRNDL);
}
@@ -268,7 +260,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Tire Pressure
* @return a VehicleDataResult related to tire pressure
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getTirePressure() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_TIRE_PRESSURE);
}
@@ -284,7 +275,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Odometer
* @return a VehicleDataResult related to the odometer
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getOdometer() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ODOMETER);
}
@@ -300,7 +290,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Belt Status
* @return a VehicleDataResult related to the seat belt status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getBeltStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_BELT_STATUS);
}
@@ -316,7 +305,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Body Information
* @return a VehicleDataResult related to the body info
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getBodyInformation() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_BODY_INFORMATION);
}
@@ -332,7 +320,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Device Status
* @return a VehicleDataResult related to the device status of the connected device
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getDeviceStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_DEVICE_STATUS);
}
@@ -348,7 +335,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Driver Braking
* @return a VehicleDataResult related to the driver breaking status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getDriverBraking() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_DRIVER_BRAKING);
}
@@ -364,7 +350,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Wiper Status
* @return a VehicleDataResult related to the wiper status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getWiperStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_WIPER_STATUS);
}
@@ -380,7 +365,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Head Lamp Status
* @return a VehicleDataResult related to the headlamp status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getHeadLampStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_HEAD_LAMP_STATUS);
}
@@ -396,7 +380,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Engine Torque
* @return a VehicleDataResult related to the engine's torque
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getEngineTorque() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ENGINE_TORQUE);
}
@@ -412,7 +395,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets Engine Oil Life
* @return a VehicleDataResult related to the engine's oil life
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getEngineOilLife() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ENGINE_OIL_LIFE);
}
@@ -428,7 +410,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets AccPedal Position
* @return a VehicleDataResult related to the accelerator pedal's position
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getAccPedalPosition() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ACC_PEDAL_POSITION);
}
@@ -438,7 +419,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getSteeringWheelAngle() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_STEERING_WHEEL_ANGLE);
}
@@ -447,7 +427,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_E_CALL_INFO, eCallInfo);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getECallInfo() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_E_CALL_INFO);
}
@@ -455,7 +434,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_AIRBAG_STATUS, airbagStatus);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getAirbagStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_AIRBAG_STATUS);
}
@@ -463,7 +441,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_EMERGENCY_EVENT, emergencyEvent);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getEmergencyEvent() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_EMERGENCY_EVENT);
}
@@ -471,7 +448,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getClusterModeStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_CLUSTER_MODE_STATUS);
}
@@ -479,7 +455,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_MY_KEY, myKey);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getMyKey() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_MY_KEY);
}
@@ -503,7 +478,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * vehicle. See struct FuelRange for details.
* @since SmartDeviceLink 5.0.0
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getFuelRange() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_FUEL_RANGE);
}
@@ -521,7 +495,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * Gets turnSignal
* @return a VehicleDataResult related to the turn signal status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getTurnSignal() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_TURN_SIGNAL);
}
@@ -615,7 +588,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse { * @return VehicleDataResult See GearStatus
* @since SmartDeviceLink 7.0.0
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getGearStatus(){
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_GEAR_STATUS);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubtleAlert.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubtleAlert.java index a3b96e4ec..cc0908f58 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubtleAlert.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubtleAlert.java @@ -79,7 +79,7 @@ import java.util.List; * <tr> * <td>ttsChunks</td> * <td>List<TTSChunk></td> - * <td>An array of text chunks of type TTSChunk. See TTSChunk. The array must have at least oneitem.</td> + * <td>An array of text chunks of type TTSChunk. See TTSChunk. The array must have at least one item.</td> * <td>N</td> * <td>Min Value: 1; Max Value: 100</td> * <td></td> @@ -95,7 +95,7 @@ import java.util.List; * <tr> * <td>softButtons</td> * <td>List<SoftButton></td> - * <td>App defined SoftButtons. If omitted on supported displays, the displayed alert shall nothave any SoftButtons.</td> + * <td>App defined SoftButtons. If omitted on supported displays, the displayed alert shall not have any SoftButtons.</td> * <td>N</td> * <td>Min Value: 0; Max Value: 2</td> * <td></td> diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java index 9eed92f3f..438757bd1 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/TTSChunk.java @@ -43,9 +43,9 @@ import java.util.Hashtable; * It can also be phonemes from either the Microsoft SAPI phoneme set, or from the LHPLUS phoneme set.
* It can also be a pre-recorded sound in WAV format (either developer-defined, or provided by the SDL platform).</p>
*
- * <p>In SDL, words, and therefore sentences, can be built up from phonemes and are used to explicitly provide the proper pronounciation to the TTS engine.
+ * <p>In SDL, words, and therefore sentences, can be built up from phonemes and are used to explicitly provide the proper pronunciation to the TTS engine.
* For example, to have SDL pronounce the word "read" as "red", rather than as when it is pronounced like "reed",
- * the developer would use phonemes to express this desired pronounciation.</p>
+ * the developer would use phonemes to express this desired pronunciation.</p>
* <p>For more information about phonemes, see <a href="http://en.wikipedia.org/wiki/Phoneme">http://en.wikipedia.org/wiki/Phoneme</a></p>.
* <p><b> Parameter List</b></p>
* <table border="1" rules="all">
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/TemplateConfiguration.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/TemplateConfiguration.java index edaf224e5..fdde09f13 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/TemplateConfiguration.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/TemplateConfiguration.java @@ -65,7 +65,6 @@ public class TemplateConfiguration extends RPCStruct { *
* @return TemplateColorScheme
*/
- @SuppressWarnings("unchecked")
public TemplateColorScheme getDayColorScheme() {
return (TemplateColorScheme) getObject(TemplateColorScheme.class, KEY_DAY_COLOR_SCHEME);
}
@@ -85,7 +84,6 @@ public class TemplateConfiguration extends RPCStruct { *
* @return TemplateColorScheme
*/
- @SuppressWarnings("unchecked")
public TemplateColorScheme getNightColorScheme() {
return (TemplateColorScheme) getObject(TemplateColorScheme.class, KEY_NIGHT_COLOR_SCHEME);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java index 92c524b79..e3cef24a8 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java @@ -152,7 +152,6 @@ public class TireStatus extends RPCStruct { setValue(KEY_LEFT_FRONT, leftFront);
return this;
}
- @SuppressWarnings("unchecked")
public SingleTireStatus getLeftFront() {
return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_LEFT_FRONT);
}
@@ -160,7 +159,6 @@ public class TireStatus extends RPCStruct { setValue(KEY_RIGHT_FRONT, rightFront);
return this;
}
- @SuppressWarnings("unchecked")
public SingleTireStatus getRightFront() {
return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_RIGHT_FRONT);
}
@@ -168,7 +166,6 @@ public class TireStatus extends RPCStruct { setValue(KEY_LEFT_REAR, leftRear);
return this;
}
- @SuppressWarnings("unchecked")
public SingleTireStatus getLeftRear() {
return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_LEFT_REAR);
}
@@ -176,7 +173,6 @@ public class TireStatus extends RPCStruct { setValue(KEY_RIGHT_REAR, rightRear);
return this;
}
- @SuppressWarnings("unchecked")
public SingleTireStatus getRightRear() {
return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_RIGHT_REAR);
}
@@ -184,7 +180,6 @@ public class TireStatus extends RPCStruct { setValue(KEY_INNER_LEFT_REAR, innerLeftRear);
return this;
}
- @SuppressWarnings("unchecked")
public SingleTireStatus getInnerLeftRear() {
return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_INNER_LEFT_REAR);
}
@@ -192,7 +187,6 @@ public class TireStatus extends RPCStruct { setValue(KEY_INNER_RIGHT_REAR, innerRightRear);
return this;
}
- @SuppressWarnings("unchecked")
public SingleTireStatus getInnerRightRear() {
return (SingleTireStatus) getObject(SingleTireStatus.class, KEY_INNER_RIGHT_REAR);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java index 55bb75249..86171a5da 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/TouchEvent.java @@ -144,11 +144,11 @@ public class TouchEvent extends RPCStruct { if(obj instanceof Integer){ //Backwards case
int size = list.size();
List<Integer> listOfInt = (List<Integer>) list;
- List<Long> listofLongs = new ArrayList<Long>(size);
+ List<Long> listOfLongs = new ArrayList<>(size);
for(int i = 0; i<size;i++){
- listofLongs.add(listOfInt.get(i).longValue());
+ listOfLongs.add(listOfInt.get(i).longValue());
}
- return listofLongs;
+ return listOfLongs;
}else if(obj instanceof Long){
return (List<Long>) list;
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java index d282e6200..bdfb7d4b4 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java @@ -49,7 +49,7 @@ import java.util.Hashtable; * <tr> * <td>navigationText</td> * <td>String</td> - * <td>Text to describe the turn (e.g. streetname) + * <td>Text to describe the turn (e.g. street name) * <ul> * <li>Maxlength = 500</li> * </ul> @@ -76,10 +76,10 @@ public class Turn extends RPCStruct{ } /** - * set the text to describe the turn (e.g. streetname) + * set the text to describe the turn (e.g. street name) * * @param navigationText - * the text to describe the turn (e.g. streetname) + * the text to describe the turn (e.g. street name) */ public Turn setNavigationText( String navigationText) { setValue(KEY_NAVIGATION_TEXT, navigationText); @@ -87,9 +87,9 @@ public class Turn extends RPCStruct{ } /** - * get the text to describe the turn (e.g. streetname) + * get the text to describe the turn (e.g. street name) * - * @return the text to describe the turn (e.g. streetname) + * @return the text to describe the turn (e.g. street name) */ public String getNavigationText(){ return getString(KEY_NAVIGATION_TEXT); @@ -111,7 +111,6 @@ public class Turn extends RPCStruct{ * * @return the image to be shown for a turn */ - @SuppressWarnings("unchecked") public Image getTurnIcon(){ return (Image) getObject(Image.class, KEY_TURN_IMAGE); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java index 8e7adb2d2..751f9621f 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java @@ -87,7 +87,7 @@ import java.util.Hashtable; * <tr>
* <td>fuelLevel_State</td>
* <td>Boolean</td>
- * <td>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please seefuelRange.</td>
+ * <td>The fuel level state. This parameter is deprecated starting RPC Spec 7.0, please see fuelRange.</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 7.0.0</td>
@@ -95,7 +95,7 @@ import java.util.Hashtable; * <tr>
* <td>fuelRange</td>
* <td>Boolean</td>
- * <td>The fuel type, estimated range in KM, fuel level/capacity and fuel level state for thevehicle. See struct FuelRange for details.</td>
+ * <td>The fuel type, estimated range in KM, fuel level/capacity and fuel level state for the vehicle. See struct FuelRange for details.</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 5.0.0</td>
@@ -103,7 +103,7 @@ import java.util.Hashtable; * <tr>
* <td>instantFuelConsumption</td>
* <td>Boolean</td>
- * <td>The instantaneous fuel consumption in microlitres</td>
+ * <td>The instantaneous fuel consumption in micro litres</td>
* <td>N</td>
* <td>Subscribable</td>
* <td>SmartDeviceLink 2.0 </td>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java index 4f3abd5b7..3e4609f2b 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java @@ -128,7 +128,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Gps
* @return a VehicleDataResult related to GPS
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getGps() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_GPS);
}
@@ -144,7 +143,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Speed
* @return a VehicleDataResult related to speed
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getSpeed() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_SPEED);
}
@@ -160,7 +158,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets rpm
* @return a VehicleDataResult related to RPM
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getRpm() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_RPM);
}
@@ -181,7 +178,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * @return VehicleDataResult The fuel level in the tank (percentage). This parameter is deprecated starting RPC Spec
* 7.0, please see fuelRange.
*/
- @SuppressWarnings("unchecked")
@Deprecated
public VehicleDataResult getFuelLevel() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_FUEL_LEVEL);
@@ -200,7 +196,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * @return a VehicleDataResult related to FuelLevel State
*/
@Deprecated
- @SuppressWarnings("unchecked")
public VehicleDataResult getFuelLevelState() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_FUEL_LEVEL_STATE);
}
@@ -216,7 +211,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Instant Fuel Consumption
* @return a VehicleDataResult related to instant fuel consumption
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getInstantFuelConsumption() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_INSTANT_FUEL_CONSUMPTION);
}
@@ -232,7 +226,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets External Temperature
* @return a VehicleDataResult related to external temperature
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getExternalTemperature() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_EXTERNAL_TEMPERATURE);
}
@@ -254,7 +247,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * @deprecated in SmartDeviceLink 7.0.0
*/
@Deprecated
- @SuppressWarnings("unchecked")
public VehicleDataResult getPrndl() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_PRNDL);
}
@@ -270,7 +262,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Tire Pressure
* @return a VehicleDataResult related to tire pressure
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getTirePressure() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_TIRE_PRESSURE);
}
@@ -286,7 +277,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Odometer
* @return a VehicleDataResult related to the odometer
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getOdometer() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ODOMETER);
}
@@ -302,7 +292,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Belt Status
* @return a VehicleDataResult related to the seat belt status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getBeltStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_BELT_STATUS);
}
@@ -318,7 +307,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Body Information
* @return a VehicleDataResult related to the body info
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getBodyInformation() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_BODY_INFORMATION);
}
@@ -334,7 +322,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Device Status
* @return a VehicleDataResult related to the device status of the connected device
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getDeviceStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_DEVICE_STATUS);
}
@@ -350,7 +337,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Driver Braking
* @return a VehicleDataResult related to the driver breaking status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getDriverBraking() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_DRIVER_BRAKING);
}
@@ -366,7 +352,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Wiper Status
* @return a VehicleDataResult related to the wiper status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getWiperStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_WIPER_STATUS);
}
@@ -382,7 +367,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Head Lamp Status
* @return a VehicleDataResult related to the headlamp status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getHeadLampStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_HEAD_LAMP_STATUS);
}
@@ -396,9 +380,8 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { }
/**
* Gets Engine Torque
- * @return a VehicleDataResult related to the enginer's torque
+ * @return a VehicleDataResult related to the engine's torque
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getEngineTorque() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ENGINE_TORQUE);
}
@@ -414,7 +397,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets Engine Oil Life
* @return a VehicleDataResult related to the engine's oil life
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getEngineOilLife() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ENGINE_OIL_LIFE);
}
@@ -430,7 +412,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets AccPedal Position
* @return a VehicleDataResult related to the accelerator pedal's position
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getAccPedalPosition() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_ACC_PEDAL_POSITION);
}
@@ -440,7 +421,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getSteeringWheelAngle() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_STEERING_WHEEL_ANGLE);
}
@@ -449,7 +429,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_E_CALL_INFO, eCallInfo);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getECallInfo() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_E_CALL_INFO);
}
@@ -457,7 +436,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_AIRBAG_STATUS, airbagStatus);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getAirbagStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_AIRBAG_STATUS);
}
@@ -465,7 +443,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_EMERGENCY_EVENT, emergencyEvent);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getEmergencyEvent() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_EMERGENCY_EVENT);
}
@@ -473,7 +450,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_CLUSTER_MODE_STATUS, clusterModeStatus);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getClusterModeStatus() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_CLUSTER_MODE_STATUS);
}
@@ -481,7 +457,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { setParameters(KEY_MY_KEY, myKey);
return this;
}
- @SuppressWarnings("unchecked")
public VehicleDataResult getMyKey() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_MY_KEY);
}
@@ -522,7 +497,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * Gets turnSignal
* @return a VehicleDataResult related to the turn signal status
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getTurnSignal() {
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_TURN_SIGNAL);
}
@@ -638,7 +612,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse { * @return VehicleDataResult See GearStatus
* @since SmartDeviceLink 7.0.0
*/
- @SuppressWarnings("unchecked")
public VehicleDataResult getGearStatus(){
return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_GEAR_STATUS);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java index a19a9c2ea..8782b120c 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UpdateTurnList.java @@ -38,8 +38,8 @@ import java.util.Hashtable; import java.util.List; /** - * Updates the list of next maneuvers, which can be requested by the user pressing the softbutton "Turns" on the - * Navigation base screen. Three softbuttons are predefined by the system: Up, Down, Close + * Updates the list of next maneuvers, which can be requested by the user pressing the soft button "Turns" on the + * Navigation base screen. Three soft buttons are predefined by the system: Up, Down, Close * * <p>Function Group: Navigation</p> * diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java index 0fac119f2..ba3f6a9f9 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/VideoStreamingFormat.java @@ -90,7 +90,7 @@ public class VideoStreamingFormat extends RPCStruct { @Override public String toString() { - return "codec=" + String.valueOf(getCodec()) + - ", protocol=" + String.valueOf(getProtocol()); + return "codec=" + getCodec() + + ", protocol=" + getProtocol(); } } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java index 2ba56c4db..7b0c9b7ec 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java @@ -118,7 +118,6 @@ public class VrHelpItem extends RPCStruct { setValue(KEY_IMAGE, image);
return this;
}
- @SuppressWarnings("unchecked")
public Image getImage() {
return (Image) getObject(Image.class, KEY_IMAGE);
}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/WindowState.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/WindowState.java index 9011f3865..4c61c69a5 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/WindowState.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/WindowState.java @@ -52,7 +52,7 @@ import java.util.Hashtable; * <tr> * <td>approximatePosition</td> * <td>Integer</td> - * <td>The approximate percentage that the window is open - 0 being fully closed, 100 being fullyopen</td> + * <td>The approximate percentage that the window is open - 0 being fully closed, 100 being fully open</td> * <td>Y</td> * <td></td> * </tr> diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java index d58a048a5..79b1174dd 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/ButtonName.java @@ -54,12 +54,12 @@ package com.smartdevicelink.proxy.rpc.enums; */
public enum ButtonName{
/**
- * <br><b>THIS ENUM VALUE WILL CHANGE IN FUNCITONALITY DURING THE NEXT MAJOR RELEASE!</b>
+ * <br><b>THIS ENUM VALUE WILL CHANGE IN FUNCTIONALITY DURING THE NEXT MAJOR RELEASE!</b>
* <br><br>
* This ButtonName value originally was used for both the OK button and PLAY_PAUSE button. As of
* SmartDeviceLink 5.0.0, the functionality was broken out into the OK and PLAY_PAUSE buttons.
* <br><br> For this version of the library OK will be received for both OK and PLAY_PAUSE to
- * mitigate a potential break in functionliaty. If the desire is only for the OK functionality,
+ * mitigate a potential break in functionality. If the desire is only for the OK functionality,
* this button should still be used. If the desired functionality was actually for the play/pause
* toggle, then the new PLAY_PAUSE should be used.
* <br><br>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java index 22bfe6c9e..e4a5cdff1 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/CarModeStatus.java @@ -1,53 +1,53 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.proxy.rpc.enums;
/** Describes the carmode the vehicle is in.
* @since SmartDeviceLink 2.0
*/
public enum CarModeStatus {
- /** Provides carmode NORMAL to each module.
+ /** Provides car mode NORMAL to each module.
*/
NORMAL,
- /** Provides carmode FACTORY to each module.
+ /** Provides car mode FACTORY to each module.
*/
FACTORY,
- /** Provides carmode TRANSPORT to each module.
+ /** Provides car mode TRANSPORT to each module.
*/
TRANSPORT,
- /** Provides carmode CRASH to each module.
+ /** Provides car mode CRASH to each module.
*/
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java index 0c7c4f7e3..44b654a78 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java @@ -1,39 +1,39 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.proxy.rpc.enums;
/** The type of the display.
*
*
- * @since SmartDevcieLink 1.0
+ * @since SmartDeviceLink 1.0
*
*/
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java index d8a720914..5f5eca430 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/HMILevel.java @@ -1,34 +1,34 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.proxy.rpc.enums;
import java.util.EnumSet;
@@ -67,7 +67,7 @@ public enum HMILevel { HMI_BACKGROUND("BACKGROUND"),
/**
* Application has been discovered by SDL, but application cannot send any requests or receive any notifications
- * An HMILevel of NONE can also mean that the user has exited the application by saying "exit appname" or selecting "exit" from the application's menu. When this happens, the application still has an active interface registration with SDL and all SDL resources the application has created (e.g. Choice Sets, subscriptions, etc.) still exist. But while the HMILevel is NONE, the application cannot send any messages to SDL, except <i>{@linkplain com.smartdevicelink.proxy.rpc.UnregisterAppInterface}</li>
+ * An HMILevel of NONE can also mean that the user has exited the application by saying "exit appName" or selecting "exit" from the application's menu. When this happens, the application still has an active interface registration with SDL and all SDL resources the application has created (e.g. Choice Sets, subscriptions, etc.) still exist. But while the HMILevel is NONE, the application cannot send any messages to SDL, except <i>{@linkplain com.smartdevicelink.proxy.rpc.UnregisterAppInterface}</li>
*/
HMI_NONE("NONE");
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java index 432b8f150..1b40ca8e5 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/KeypressMode.java @@ -29,31 +29,31 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package com.smartdevicelink.proxy.rpc.enums;
-/**
- * Enumeration listing possible keyboard events.
- *
- *
- */
-public enum KeypressMode {
- /**
- * Each keypress is individually sent as the user presses the keyboard keys.
- */
- SINGLE_KEYPRESS,
- /**
- * The keypresses are queued and a string is eventually sent once the user chooses to submit their entry.
- */
- QUEUE_KEYPRESSES,
- /**
- * The keypresses are queue and a string is sent each time the user presses a keyboard key; the string contains the entire current entry.
- */
- RESEND_CURRENT_ENTRY;
-
- public static KeypressMode valueForString(String value) {
- try{
- return valueOf(value);
- }catch(Exception e){
- return null;
- }
- }
+package com.smartdevicelink.proxy.rpc.enums; +/** + * Enumeration listing possible keyboard events. + * + * + */ +public enum KeypressMode { + /** + * Each keypress is individually sent as the user presses the keyboard keys. + */ + SINGLE_KEYPRESS, + /** + * The key presses are queued and a string is eventually sent once the user chooses to submit their entry. + */ + QUEUE_KEYPRESSES, + /** + * The key presses are queue and a string is sent each time the user presses a keyboard key; the string contains the entire current entry. + */ + RESEND_CURRENT_ENTRY; + + public static KeypressMode valueForString(String value) { + try{ + return valueOf(value); + }catch(Exception e){ + return null; + } + } }
\ No newline at end of file diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java index d4a512088..55d9c6791 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/MediaClockFormat.java @@ -1,34 +1,34 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.proxy.rpc.enums;
/**
@@ -88,7 +88,7 @@ public enum MediaClockFormat { * <li>c : character out of following character set: sp|0-9|[letters, see
* TypeII column in XLS.</li>
* <li>:|sp : colon or space</li>
- * <li>used for Type II headunit</li>
+ * <li>used for Type II head unit</li>
* </ul>
*
* @since SmartDeviceLink 1.0
@@ -104,7 +104,7 @@ public enum MediaClockFormat { * <li>c : character out of following character set: sp|0-9|[letters, see
* CID column in XLS.</li>
* <li>:|sp : colon or space</li>
- * <li>used for CID headunit</li>
+ * <li>used for CID head unit</li>
* </ul>
* difference between CLOCKTEXT1 and CLOCKTEXT2 is the supported character
* set
@@ -122,7 +122,7 @@ public enum MediaClockFormat { * <li>c : character out of following character set: sp|0-9|[letters, see
* Type 5 column in XLS].</li>
* <li>:|sp : colon or space</li>
- * <li>used for Type V headunit</li>
+ * <li>used for Type V head unit</li>
* </ul>
* difference between CLOCKTEXT1 and CLOCKTEXT2 is the supported character
* set
@@ -139,7 +139,7 @@ public enum MediaClockFormat { * <li>Format: c :|sp c c : c c</li>
* <li>:|sp : colon or space</li>
* <li>c : character out of following character set: sp|0-9|[letters]</li>
- * <li>used for MFD3/4/5 headunits</li>
+ * <li>used for MFD3/4/5 head units</li>
* </ul>
*
*
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java index a16399201..2f708b63f 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PowerModeStatus.java @@ -1,34 +1,34 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.proxy.rpc.enums;
/** Reflects the status of the current power mode.
*
@@ -47,7 +47,7 @@ public enum PowerModeStatus { KEY_APPROVED_0,
POST_ACCESORY_0,
- /** Key is in accessory positon
+ /** Key is in accessory position
*
*/
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java index ca130d38c..dcec89019 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/PredefinedLayout.java @@ -84,7 +84,7 @@ public enum PredefinedLayout { TEXT_WITH_GRAPHIC("TEXT_WITH_GRAPHIC"), /** - A layout with only softbuttons placed in a tile layout + A layout with only soft buttons placed in a tile layout */ TILES_ONLY("TILES_ONLY"), diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java index 40fbc59a9..18c342f64 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlInterfaceAvailability.java @@ -29,9 +29,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package com.smartdevicelink.proxy.rpc.enums;
-
-public enum SdlInterfaceAvailability {
- SDL_INTERFACE_AVAILABLE,
- SDL_INTERFACE_UNAVAILABLE;
-}
+package com.smartdevicelink.proxy.rpc.enums; + +public enum SdlInterfaceAvailability { + SDL_INTERFACE_AVAILABLE, + SDL_INTERFACE_UNAVAILABLE +} diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java index 775781000..8b6c9a591 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SystemCapabilityType.java @@ -579,9 +579,9 @@ public enum SystemCapabilityType { */ DRIVER_DISTRACTION(true); - ; - boolean IS_QUERYABLE; + + final boolean IS_QUERYABLE; SystemCapabilityType(boolean isQueryable) { this.IS_QUERYABLE = isQueryable; diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java index cf33b73e0..22e367871 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java @@ -204,7 +204,7 @@ public enum TextFieldName { * @since SmartDeviceLink 7.0.0
*/
subtleAlertSoftButtonText;
- ;
+
/**
* Convert String to TextFieldName
* @param value String
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java index 1c5296510..2139c74bd 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/WarningLightStatus.java @@ -1,34 +1,34 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.proxy.rpc.enums;
/**
@@ -37,15 +37,15 @@ package com.smartdevicelink.proxy.rpc.enums; */
public enum WarningLightStatus {
/**
- * Warninglight Off
+ * Warning light Off
*/
OFF,
/**
- * Warninglight On
+ * Warning light On
*/
ON,
/**
- * Warninglight is flashing
+ * Warning light is flashing
*/
FLASH,
NOT_USED;
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java index 9e63827fa..8f07d4320 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java @@ -41,7 +41,7 @@ import java.util.Vector; public abstract class OnMultipleRequestListener extends OnRPCResponseListener { final Vector<Integer> correlationIds; - OnRPCResponseListener rpcResponseListener; + final OnRPCResponseListener rpcResponseListener; public OnMultipleRequestListener(){ setListenerType(UPDATE_LISTENER_TYPE_MULTIPLE_REQUESTS); @@ -60,8 +60,8 @@ public abstract class OnMultipleRequestListener extends OnRPCResponseListener { }; } - public void addCorrelationId(int correlationid){ - correlationIds.add(correlationid); + public void addCorrelationId(int correlationId){ + correlationIds.add(correlationId); } /** * onUpdate is called during multiple stream request diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java index 87f3968eb..237c5efe6 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCListener.java @@ -36,7 +36,7 @@ import com.smartdevicelink.proxy.RPCMessage; public abstract class OnRPCListener { /** - * Generic listener for all RPCs including Requests, response, and notificaiton + * Generic listener for all RPCs including Requests, response, and notification */ public final static int UPDATE_LISTENER_TYPE_ALL_RPCS = -1; diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java index e664b05e8..d32a70f7e 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnRPCResponseListener.java @@ -57,7 +57,7 @@ public abstract class OnRPCResponseListener extends OnRPCListener { */
public void onStart(int correlationId){
- };
+ }
/**
* This is the only method that must be extended. Other methods that are able to be extended are
diff --git a/base/src/main/java/com/smartdevicelink/security/AbstractSdlSecurityBase.java b/base/src/main/java/com/smartdevicelink/security/AbstractSdlSecurityBase.java index 55e0fae2f..03f720096 100644 --- a/base/src/main/java/com/smartdevicelink/security/AbstractSdlSecurityBase.java +++ b/base/src/main/java/com/smartdevicelink/security/AbstractSdlSecurityBase.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.security; -import com.smartdevicelink.SdlConnection.SdlSession; +import com.smartdevicelink.session.SdlSession; import com.smartdevicelink.protocol.enums.SessionType; import java.util.ArrayList; @@ -44,7 +44,7 @@ abstract class AbstractSdlSecurityBase { protected List<String> makeList = null; protected boolean isInitSuccess = false; protected byte sessionId = 0; - protected List<SessionType> startServiceList = new ArrayList<SessionType>(); + protected List<SessionType> startServiceList = new ArrayList<>(); public AbstractSdlSecurityBase() { } diff --git a/base/src/main/java/com/smartdevicelink/security/ISecurityInitializedListener.java b/base/src/main/java/com/smartdevicelink/security/ISecurityInitializedListener.java index 6ad0c2a54..8969be76a 100644 --- a/base/src/main/java/com/smartdevicelink/security/ISecurityInitializedListener.java +++ b/base/src/main/java/com/smartdevicelink/security/ISecurityInitializedListener.java @@ -32,5 +32,5 @@ package com.smartdevicelink.security; public interface ISecurityInitializedListener { - public void onSecurityInitialized(); + void onSecurityInitialized(); } diff --git a/base/src/main/java/com/smartdevicelink/SdlConnection/BaseSdlSession.java b/base/src/main/java/com/smartdevicelink/session/BaseSdlSession.java index 135c0cc9e..2a7ab284e 100644 --- a/base/src/main/java/com/smartdevicelink/SdlConnection/BaseSdlSession.java +++ b/base/src/main/java/com/smartdevicelink/session/BaseSdlSession.java @@ -30,19 +30,19 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package com.smartdevicelink.SdlConnection; +package com.smartdevicelink.session; import androidx.annotation.RestrictTo; import com.smartdevicelink.exception.SdlException; import com.smartdevicelink.managers.lifecycle.RpcConverter; import com.smartdevicelink.protocol.ISdlProtocol; +import com.smartdevicelink.protocol.ISdlServiceListener; import com.smartdevicelink.protocol.ProtocolMessage; import com.smartdevicelink.protocol.SdlPacket; import com.smartdevicelink.protocol.SdlProtocolBase; import com.smartdevicelink.protocol.enums.SessionType; import com.smartdevicelink.proxy.RPCMessage; -import com.smartdevicelink.proxy.interfaces.ISdlServiceListener; import com.smartdevicelink.proxy.rpc.VideoStreamingFormat; import com.smartdevicelink.proxy.rpc.enums.VideoStreamingProtocol; import com.smartdevicelink.security.ISecurityInitializedListener; @@ -65,7 +65,7 @@ public abstract class BaseSdlSession implements ISdlProtocol, ISecurityInitializ final protected SdlProtocolBase sdlProtocol; - protected BaseTransportConfig transportConfig; + protected final BaseTransportConfig transportConfig; protected ISdlSessionListener sessionListener; protected SdlSecurityBase sdlSecurity = null; protected VideoStreamingParameters desiredVideoParams = null; @@ -73,7 +73,7 @@ public abstract class BaseSdlSession implements ISdlProtocol, ISecurityInitializ protected int sessionId = -1; protected HashMap<SessionType, CopyOnWriteArrayList<ISdlServiceListener>> serviceListeners; - protected CopyOnWriteArrayList<SessionType> encryptedServices = new CopyOnWriteArrayList<SessionType>(); + protected final CopyOnWriteArrayList<SessionType> encryptedServices = new CopyOnWriteArrayList<>(); boolean sdlSecurityInitializing = false; @@ -184,9 +184,9 @@ public abstract class BaseSdlSession implements ISdlProtocol, ISecurityInitializ protected void processControlService(ProtocolMessage msg) { if (sdlSecurity == null) return; - int ilen = msg.getData().length - 12; - byte[] data = new byte[ilen]; - System.arraycopy(msg.getData(), 12, data, 0, ilen); + int iLen = msg.getData().length - 12; + byte[] data = new byte[iLen]; + System.arraycopy(msg.getData(), 12, data, 0, iLen); byte[] dataToRead = new byte[4096]; diff --git a/base/src/main/java/com/smartdevicelink/SdlConnection/ISdlSessionListener.java b/base/src/main/java/com/smartdevicelink/session/ISdlSessionListener.java index 3cd6c23c9..e43d08f10 100644 --- a/base/src/main/java/com/smartdevicelink/SdlConnection/ISdlSessionListener.java +++ b/base/src/main/java/com/smartdevicelink/session/ISdlSessionListener.java @@ -29,11 +29,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package com.smartdevicelink.SdlConnection; +package com.smartdevicelink.session; import androidx.annotation.RestrictTo; -import com.smartdevicelink.protocol.enums.SessionType; import com.smartdevicelink.proxy.RPCMessage; import com.smartdevicelink.transport.BaseTransportConfig; import com.smartdevicelink.util.Version; diff --git a/base/src/main/java/com/smartdevicelink/streaming/AbstractPacketizer.java b/base/src/main/java/com/smartdevicelink/streaming/AbstractPacketizer.java index c51652c3b..d7047ee76 100644 --- a/base/src/main/java/com/smartdevicelink/streaming/AbstractPacketizer.java +++ b/base/src/main/java/com/smartdevicelink/streaming/AbstractPacketizer.java @@ -31,7 +31,7 @@ */
package com.smartdevicelink.streaming;
-import com.smartdevicelink.SdlConnection.SdlSession;
+import com.smartdevicelink.session.SdlSession;
import com.smartdevicelink.protocol.enums.SessionType;
import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.util.Version;
@@ -41,12 +41,12 @@ import java.io.InputStream; abstract public class AbstractPacketizer {
- protected IStreamListener _streamListener = null;
+ protected IStreamListener _streamListener;
protected byte _rpcSessionID = 0;
- protected SessionType _serviceType = null;
- protected SdlSession _session = null;
- protected InputStream is = null;
+ protected SessionType _serviceType;
+ protected SdlSession _session;
+ protected InputStream is;
protected int bufferSize;
protected byte[] buffer;
protected RPCRequest _request = null;
diff --git a/base/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingLPCMParams.java b/base/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingLPCMParams.java index bde6abc4c..9845301a3 100644 --- a/base/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingLPCMParams.java +++ b/base/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingLPCMParams.java @@ -33,13 +33,14 @@ package com.smartdevicelink.streaming.audio; /** * A struct to hold LPCM specific audio format information. */ +@Deprecated public class AudioStreamingLPCMParams extends AudioStreamingParams { /** * Sample format of linear PCM data. */ public enum SampleFormat { /** - * LPCM data is represented by 8-bit unsigned integers. Centerpoint is 128. + * LPCM data is represented by 8-bit unsigned integers. Center point is 128. */ LPCM_8BIT_UNSIGNED, @@ -55,7 +56,7 @@ public class AudioStreamingLPCMParams extends AudioStreamingParams { * <p> * This is reserved for future and not used right now. */ - public SampleFormat sampleFormat; + public final SampleFormat sampleFormat; public AudioStreamingLPCMParams(SampleFormat sampleFormat, int samplingRate, int channels) { super(samplingRate, channels); diff --git a/base/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java b/base/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java index c1e6ec0ce..f9181e7fe 100644 --- a/base/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java +++ b/base/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java @@ -43,14 +43,14 @@ public class AudioStreamingParams { * <p> * This is reserved for future and not used right now. */ - public int samplingRate; + public final int samplingRate; /** * Number of channels in the audio stream * <p> * This is reserved for future and not used right now. */ - public int channels; + public final int channels; public AudioStreamingParams(int samplingRate, int channels) { this.samplingRate = samplingRate; diff --git a/base/src/main/java/com/smartdevicelink/proxy/interfaces/IAudioStreamListener.java b/base/src/main/java/com/smartdevicelink/streaming/audio/IAudioStreamListener.java index c39e6bee2..20f758969 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/interfaces/IAudioStreamListener.java +++ b/base/src/main/java/com/smartdevicelink/streaming/audio/IAudioStreamListener.java @@ -28,7 +28,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.smartdevicelink.proxy.interfaces; +package com.smartdevicelink.streaming.audio; import com.smartdevicelink.managers.CompletionListener; diff --git a/base/src/main/java/com/smartdevicelink/proxy/interfaces/IVideoStreamListener.java b/base/src/main/java/com/smartdevicelink/streaming/video/IVideoStreamListener.java index f645b0d55..755ad7948 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/interfaces/IVideoStreamListener.java +++ b/base/src/main/java/com/smartdevicelink/streaming/video/IVideoStreamListener.java @@ -28,7 +28,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.smartdevicelink.proxy.interfaces; +package com.smartdevicelink.streaming.video; import java.nio.ByteBuffer; diff --git a/base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java b/base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java index 549bcfd13..6a98c879e 100644 --- a/base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java +++ b/base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java @@ -32,10 +32,9 @@ package com.smartdevicelink.streaming.video; import androidx.annotation.RestrictTo; -import com.smartdevicelink.SdlConnection.SdlSession; +import com.smartdevicelink.session.SdlSession; import com.smartdevicelink.protocol.ProtocolMessage; import com.smartdevicelink.protocol.enums.SessionType; -import com.smartdevicelink.proxy.interfaces.IVideoStreamListener; import com.smartdevicelink.streaming.AbstractPacketizer; import com.smartdevicelink.streaming.IStreamListener; @@ -122,7 +121,7 @@ public class RTPH264Packetizer extends AbstractPacketizer implements IVideoStrea bufferSize = MAX_DATA_SIZE_FOR_ENCRYPTED_SERVICE; } - mOutputQueue = new LinkedBlockingQueue<ByteBuffer>(MAX_QUEUE_SIZE / bufferSize); + mOutputQueue = new LinkedBlockingQueue<>(MAX_QUEUE_SIZE / bufferSize); mNALUnitReader = new NALUnitReader(); mPayloadType = DEFAULT_RTP_PAYLOAD_TYPE; @@ -230,7 +229,7 @@ public class RTPH264Packetizer extends AbstractPacketizer implements IVideoStrea } while (frame.hasRemaining()) { - int len = frame.remaining() > bufferSize ? bufferSize : frame.remaining(); + int len = Math.min(frame.remaining(), bufferSize); ProtocolMessage pm = new ProtocolMessage(); pm.setSessionID(_rpcSessionID); @@ -391,7 +390,7 @@ public class RTPH264Packetizer extends AbstractPacketizer implements IVideoStrea } - private static int SKIP_TABLE[] = new int[256]; + private static int[] SKIP_TABLE = new int[256]; static { // Sunday's quick search algorithm is used to find the start code. // Prepare the table (SKIP_TABLE[0] = 2, SKIP_TABLE[1] = 1 and other elements will be 4). diff --git a/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java b/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java index c9bea1fb9..0bc5a5f8a 100644 --- a/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java +++ b/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java @@ -49,7 +49,7 @@ public class VideoStreamingParameters { private static final String TAG = "VideoStreamingParameters"; private final VideoStreamingProtocol DEFAULT_PROTOCOL = VideoStreamingProtocol.RAW; private final VideoStreamingCodec DEFAULT_CODEC = VideoStreamingCodec.H264; - private final VideoStreamingFormat[] CURRENTLY_SUPPORTED_FORMATS = { new VideoStreamingFormat(VideoStreamingProtocol.RTP, VideoStreamingCodec.H264), + private final VideoStreamingFormat[] currentlySupportedFormats = { new VideoStreamingFormat(VideoStreamingProtocol.RTP, VideoStreamingCodec.H264), new VideoStreamingFormat(VideoStreamingProtocol.RAW, VideoStreamingCodec.H264) }; private final int DEFAULT_WIDTH = 1024; private final int DEFAULT_HEIGHT = 576; @@ -94,7 +94,6 @@ public class VideoStreamingParameters { * Will only copy values that are not null or are greater than 0 * @param params VideoStreamingParameters that should be copied into this new instants */ - @SuppressWarnings("unused") public VideoStreamingParameters(VideoStreamingParameters params){ update(params); } @@ -136,7 +135,7 @@ public class VideoStreamingParameters { * This update will use the most preferred streaming format from the module. * @param capability the video streaming capability returned from the SystemCapabilityManager * @param vehicleMake the vehicle make from the RegisterAppInterfaceResponse - * @see com.smartdevicelink.proxy.SystemCapabilityManager + * @see com.smartdevicelink.managers.lifecycle.SystemCapabilityManager * @see VideoStreamingCapability */ public void update(VideoStreamingCapability capability, String vehicleMake){ @@ -160,8 +159,8 @@ public class VideoStreamingParameters { final List<VideoStreamingFormat> formats = capability.getSupportedFormats(); if(formats != null && formats.size()>0){ for(VideoStreamingFormat format : formats){ - for(int i = 0; i < CURRENTLY_SUPPORTED_FORMATS.length; i ++){ - if(CURRENTLY_SUPPORTED_FORMATS[i].equals(format) ){ + for (VideoStreamingFormat currentlySupportedFormat : currentlySupportedFormats) { + if (currentlySupportedFormat.equals(format)) { this.format = format; return; } @@ -175,7 +174,6 @@ public class VideoStreamingParameters { } - @SuppressWarnings("unused") public void setDisplayDensity(int displayDensity) { this.displayDensity = displayDensity; } diff --git a/base/src/main/java/com/smartdevicelink/trace/DiagLevel.java b/base/src/main/java/com/smartdevicelink/trace/DiagLevel.java index 8203d0247..6c9e60738 100644 --- a/base/src/main/java/com/smartdevicelink/trace/DiagLevel.java +++ b/base/src/main/java/com/smartdevicelink/trace/DiagLevel.java @@ -1,34 +1,34 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.trace;
import com.smartdevicelink.trace.enums.DetailLevel;
@@ -37,7 +37,7 @@ import com.smartdevicelink.trace.enums.Mod; public class DiagLevel {
- static private DetailLevel[] levels;
+ static private final DetailLevel[] levels;
static { // this is a static c-tor!!
levels = new DetailLevel[Mod.values().length];
diff --git a/base/src/main/java/com/smartdevicelink/trace/Mime.java b/base/src/main/java/com/smartdevicelink/trace/Mime.java index 814dc1ec6..54c99e582 100644 --- a/base/src/main/java/com/smartdevicelink/trace/Mime.java +++ b/base/src/main/java/com/smartdevicelink/trace/Mime.java @@ -1,38 +1,40 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.trace;
// Borrowed from Dave Boll's infamous SdlLinkRelay.java
+import java.nio.charset.StandardCharsets;
+
public class Mime {
private static final String BASE_64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -48,7 +50,7 @@ public class Mime { String b64String = "";
try {
- byte[] strBytes = str.getBytes("US-ASCII");
+ byte[] strBytes = str.getBytes(StandardCharsets.US_ASCII);
b64String = base64Encode(strBytes);
} catch (Exception ex) {
// Don't care?
@@ -60,7 +62,7 @@ public class Mime { * @param bytesToEncode A byte array to encode into base64 String.
* @return Base64 encoded String or a null String if input array is null.
*/
- public static String base64Encode(byte bytesToEncode[]) {
+ public static String base64Encode(byte[] bytesToEncode) {
if(bytesToEncode != null){
return base64Encode(bytesToEncode, 0, bytesToEncode.length);
}
@@ -73,7 +75,7 @@ public class Mime { * @param length Length to read
* @return Base64 encoded String or a null String if input array is null or the input range is out of bounds.
*/
- public static String base64Encode(byte bytesToEncode[], int offset, int length) {
+ public static String base64Encode(byte[] bytesToEncode, int offset, int length) {
if (bytesToEncode == null || bytesToEncode.length < length || bytesToEncode.length < offset + length) {
return null;
}
diff --git a/base/src/main/java/com/smartdevicelink/trace/OpenRPCMessage.java b/base/src/main/java/com/smartdevicelink/trace/OpenRPCMessage.java index 9b3831dab..b521d76ca 100644 --- a/base/src/main/java/com/smartdevicelink/trace/OpenRPCMessage.java +++ b/base/src/main/java/com/smartdevicelink/trace/OpenRPCMessage.java @@ -65,12 +65,11 @@ class OpenRPCMessage extends RPCMessage { pd.append("]");
- return;
} // end-method
private void dumpParams(Hashtable<String, Object> ht, StringBuilder pd) {
Iterator<String> keySet = ht.keySet().iterator();
- Object obj = null;
+ Object obj;
String key = "";
boolean isFirstParam = true;
diff --git a/base/src/main/java/com/smartdevicelink/trace/SdlTraceBase.java b/base/src/main/java/com/smartdevicelink/trace/SdlTraceBase.java index bbddd6453..d271bf895 100644 --- a/base/src/main/java/com/smartdevicelink/trace/SdlTraceBase.java +++ b/base/src/main/java/com/smartdevicelink/trace/SdlTraceBase.java @@ -59,7 +59,7 @@ class SdlTraceBase { public static final String SYSTEM_LOG_TAG = "SdlTrace";
- private static long baseTics = java.lang.System.currentTimeMillis();
+ private static final long baseTics = java.lang.System.currentTimeMillis();
private static boolean acceptAPITraceAdjustments = true;
protected static ISTListener m_appTraceListener = null;
@@ -214,8 +214,8 @@ class SdlTraceBase { //rpcAsXml.append(newline);
if (dl == DetailLevel.VERBOSE) {
- OpenRPCMessage orpcmsg = new OpenRPCMessage(rpcMsg);
- String rpcParamList = orpcmsg.msgDump();
+ OpenRPCMessage openRPCMessage = new OpenRPCMessage(rpcMsg);
+ String rpcParamList = openRPCMessage.msgDump();
String msg = SdlTrace.B64EncodeForXML(rpcParamList);
rpcAsXml.append("<d>");
rpcAsXml.append(msg);
@@ -342,7 +342,7 @@ class SdlTraceBase { return sb.toString();
} // end-method
- public static boolean logTransportEvent(String preamble, String transportSpecificInfoXml, InterfaceActivityDirection msgDirection, byte buf[], int byteLength, String token) {
+ public static boolean logTransportEvent(String preamble, String transportSpecificInfoXml, InterfaceActivityDirection msgDirection, byte[] buf, int byteLength, String token) {
return logTransportEvent(preamble, transportSpecificInfoXml, msgDirection, buf, 0, byteLength, token);
}
@@ -352,7 +352,7 @@ class SdlTraceBase { } // end-if
} // end-method
- public static boolean logTransportEvent(String preamble, String transportSpecificInfoXml, InterfaceActivityDirection msgDirection, byte buf[], int offset, int byteLength, String token) {
+ public static boolean logTransportEvent(String preamble, String transportSpecificInfoXml, InterfaceActivityDirection msgDirection, byte[] buf, int offset, int byteLength, String token) {
if (DiagLevel.getLevel(Mod.tran) == DetailLevel.OFF || !token.equals(SDL_LIB_TRACE_KEY)) {
return false;
}
@@ -402,7 +402,7 @@ class SdlTraceBase { private static boolean writeXmlTraceMessage(String msg) {
try {
// Attempt to write formatted message to the Siphon
- if (false == writeMessageToSiphonServer(msg)) {
+ if (!writeMessageToSiphonServer(msg)) {
// If writing to the Siphon fails, write to the native log
NativeLogTool.logInfo(SdlTrace.SYSTEM_LOG_TAG, msg);
return false;
diff --git a/base/src/main/java/com/smartdevicelink/transport/SdlPsm.java b/base/src/main/java/com/smartdevicelink/transport/SdlPsm.java index 52d2512ee..b6eac12e0 100644 --- a/base/src/main/java/com/smartdevicelink/transport/SdlPsm.java +++ b/base/src/main/java/com/smartdevicelink/transport/SdlPsm.java @@ -39,7 +39,7 @@ import static com.smartdevicelink.protocol.SdlProtocol.V1_V2_MTU_SIZE; public class SdlPsm{ //private static final String TAG = "Sdl PSM"; - //Each state represents the byte that should be incomming + //Each state represents the byte that should be incoming public static final int START_STATE = 0x0; public static final int SERVICE_TYPE_STATE = 0x02; @@ -84,13 +84,10 @@ public class SdlPsm{ } public boolean handleByte(byte data) { - //Log.trace(TAG, data + " = incomming"); + //Log.trace(TAG, data + " = incoming"); state = transitionOnInput(data,state); - - if(state==ERROR_STATE){ - return false; - } - return true; + + return state != ERROR_STATE; } private int transitionOnInput(byte rawByte, int state){ diff --git a/base/src/main/java/com/smartdevicelink/transport/SiphonServer.java b/base/src/main/java/com/smartdevicelink/transport/SiphonServer.java index d9dbb54e9..3648bd8fc 100644 --- a/base/src/main/java/com/smartdevicelink/transport/SiphonServer.java +++ b/base/src/main/java/com/smartdevicelink/transport/SiphonServer.java @@ -62,7 +62,7 @@ public class SiphonServer { private static Boolean m_siphonInitialized = false;
private static Boolean m_foundOpenSocket = false;
private static Socket m_siphonSocket = null;
- private static Object m_siphonLock = new Object();
+ private static final Object m_siphonLock = new Object();
private static ServerSocket m_listeningSocket = null;
private static short m_listenPort = -1;
private static OutputStream m_siphonSocketOutputStream = null;
@@ -72,7 +72,7 @@ public class SiphonServer { private static long m_startTimeStamp = 0;
// SDL Trace Message Version
- private static byte m_sdlTraceMsgVersionNumber = 1;
+ private static final byte m_sdlTraceMsgVersionNumber = 1;
// Max number of ports to attempt a connection on
private final static Integer MAX_NUMBER_OF_PORT_ATTEMPTS = 20;
@@ -192,7 +192,7 @@ public class SiphonServer { return false;
}
- byte messageBytes[] = null;
+ byte[] messageBytes;
int messageLength = 0;
try {
@@ -212,7 +212,7 @@ public class SiphonServer { return false;
}
- byte messageBytes[] = null;
+ byte[] messageBytes;
int messageLength = 0;
try {
@@ -234,7 +234,7 @@ public class SiphonServer { byte siphonDataTypeIndicator = 0x00;
long currentDateTime = System.currentTimeMillis();
- Integer deltaTimeMills = null;
+ Integer deltaTimeMills;
deltaTimeMills = (int)(currentDateTime - m_startTimeStamp);
@@ -278,7 +278,7 @@ public class SiphonServer { return false;
}
- OutputStream siphonOutputStream = null;
+ OutputStream siphonOutputStream;
synchronized (m_siphonLock) {
siphonOutputStream = m_siphonSocketOutputStream;
@@ -315,7 +315,7 @@ public class SiphonServer { }
private boolean findOpenSocket(short port) {
- // Accept incoming sihpon connection from trace utility.
+ // Accept incoming siphon connection from trace utility.
Boolean foundOpenPort = false;
listenPort = port;
@@ -339,7 +339,7 @@ public class SiphonServer { }
private void startServerOnPort() throws IOException {
- Socket newSocket = null;
+ Socket newSocket;
// Wait for a connection
newSocket = m_listeningSocket.accept();
@@ -407,7 +407,7 @@ public class SiphonServer { }
}
- private static final byte[] intToByteArray(int value) {
+ private static byte[] intToByteArray(int value) {
return new byte[] {
(byte)(value >>> 24),
(byte)(value >>> 16),
diff --git a/base/src/main/java/com/smartdevicelink/transport/TransportConstants.java b/base/src/main/java/com/smartdevicelink/transport/TransportConstants.java index 19579c19b..7fbcde80d 100644 --- a/base/src/main/java/com/smartdevicelink/transport/TransportConstants.java +++ b/base/src/main/java/com/smartdevicelink/transport/TransportConstants.java @@ -65,8 +65,6 @@ public class TransportConstants { public static final String FORCE_TRANSPORT_CONNECTED = "force_connect"; //This is legacy, do not refactor this. public static final String ROUTER_SERVICE_VALIDATED = "router_service_validated"; - @Deprecated - public static final String REPLY_TO_INTENT_EXTRA = "ReplyAddress"; public static final String CONNECT_AS_CLIENT_BOOLEAN_EXTRA = "connectAsClient"; public static final String PACKAGE_NAME_STRING = "package.name"; public static final String APP_ID_EXTRA = "app.id";//Sent as a Long. This is no longer used @@ -78,7 +76,7 @@ public class TransportConstants { public static final String ENABLE_LEGACY_MODE_EXTRA = "ENABLE_LEGACY_MODE_EXTRA"; @Deprecated - public static final String HARDWARE_DISCONNECTED = "hardware.disconect"; + public static final String HARDWARE_DISCONNECTED = "hardware.disconect"; //This is legacy, do not refactor this. public static final String TRANSPORT_DISCONNECTED = "transport.disconect"; public static final String HARDWARE_CONNECTED = "hardware.connected"; public static final String CURRENT_HARDWARE_CONNECTED = "current.hardware.connected"; diff --git a/base/src/main/java/com/smartdevicelink/transport/TransportManagerBase.java b/base/src/main/java/com/smartdevicelink/transport/TransportManagerBase.java index bc3e615a4..bc6de3d61 100644 --- a/base/src/main/java/com/smartdevicelink/transport/TransportManagerBase.java +++ b/base/src/main/java/com/smartdevicelink/transport/TransportManagerBase.java @@ -108,7 +108,7 @@ public abstract class TransportManagerBase { public abstract void sendPacket(SdlPacket packet); /** - * Base implementation does nothing and assumes it is not necssary. This method should be + * Base implementation does nothing and assumes it is not necessary. This method should be * overridden in children classes that need to add a prerequest to their transports to make * space ready for a new session. * @param transportRecord the transport that the new session should be assigned to diff --git a/base/src/main/java/com/smartdevicelink/util/ByteEnumer.java b/base/src/main/java/com/smartdevicelink/util/ByteEnumer.java index fe699f7a6..ae949a25a 100644 --- a/base/src/main/java/com/smartdevicelink/util/ByteEnumer.java +++ b/base/src/main/java/com/smartdevicelink/util/ByteEnumer.java @@ -1,37 +1,38 @@ -/* - * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ +/*
+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
package com.smartdevicelink.util;
import java.util.Enumeration;
+import java.util.Objects;
import java.util.Vector;
public abstract class ByteEnumer {
@@ -41,14 +42,14 @@ public abstract class ByteEnumer { this.name = name;
}
- private byte value;
- private String name;
+ private final byte value;
+ private final String name;
public byte getValue() { return value; }
public String getName() { return name; }
public boolean equals(ByteEnumer other) {
- return name == other.getName();
+ return Objects.equals(name, other.getName());
}
public boolean eq(ByteEnumer other) {
diff --git a/base/src/main/java/com/smartdevicelink/util/DebugTool.java b/base/src/main/java/com/smartdevicelink/util/DebugTool.java index f36e9ca7c..58af5a09a 100644 --- a/base/src/main/java/com/smartdevicelink/util/DebugTool.java +++ b/base/src/main/java/com/smartdevicelink/util/DebugTool.java @@ -70,9 +70,7 @@ public class DebugTool { public static boolean isDebugEnabled()
{
- if (isWarningEnabled && isInfoEnabled) return true;
-
- return false;
+ return isWarningEnabled && isInfoEnabled;
}
@SuppressWarnings("ConstantConditions")
@@ -184,7 +182,7 @@ public class DebugTool { }
- protected static Vector<IConsole> consoleListenerList = new Vector<IConsole>();
+ protected static final Vector<IConsole> consoleListenerList = new Vector<>();
protected final static boolean isTransportEnabled = false;
protected final static boolean isRPCEnabled = false;
@@ -356,14 +354,14 @@ public class DebugTool { } else {
message.setData(packet.getPayload());
}
- Hashtable<String, Object> hash = new Hashtable<String, Object>();
+ Hashtable<String, Object> hash = new Hashtable<>();
if (packet.getVersion() > 1) {
- Hashtable<String, Object> hashTemp = new Hashtable<String, Object>();
+ Hashtable<String, Object> hashTemp = new Hashtable<>();
hashTemp.put(RPCMessage.KEY_CORRELATION_ID, message.getCorrID());
if (message.getJsonSize() > 0) {
- final Hashtable<String, Object> mhash = JsonRPCMarshaller.unmarshall(message.getData());
- hashTemp.put(RPCMessage.KEY_PARAMETERS, mhash);
+ final Hashtable<String, Object> mHash = JsonRPCMarshaller.unmarshall(message.getData());
+ hashTemp.put(RPCMessage.KEY_PARAMETERS, mHash);
}
String functionName = FunctionID.getFunctionName(message.getFunctionID());
diff --git a/base/src/main/java/com/smartdevicelink/util/NativeLogTool.java b/base/src/main/java/com/smartdevicelink/util/NativeLogTool.java index b0e3217cb..7fe37ff3b 100644 --- a/base/src/main/java/com/smartdevicelink/util/NativeLogTool.java +++ b/base/src/main/java/com/smartdevicelink/util/NativeLogTool.java @@ -32,7 +32,7 @@ package com.smartdevicelink.util;
public class NativeLogTool {
- private static String TAG = "NativeLogTool";
+ private static final String TAG = "NativeLogTool";
static private boolean logToSystemEnabled = true;
private static final int ChunkSize = 4000;
@@ -103,19 +103,19 @@ public class NativeLogTool { return logToSystemEnabled;
}
- private static boolean log(LogTarget ltarg, String source, String logMsg) {
+ private static boolean log(LogTarget logTarget, String source, String logMsg) {
// Don't log empty messages
if (logMsg == null || logMsg.length() == 0) {
return false;
}
- int substrSize = 0;
- String chunk = null;
+ int subStrSize = 0;
+ String chunk;
try {
- for (int idx=0;idx < logMsg.length();idx += substrSize) {
- substrSize = Math.min(ChunkSize, logMsg.length() - idx);
- chunk = logMsg.substring(idx, idx + substrSize);
- switch (ltarg) {
+ for (int idx=0;idx < logMsg.length();idx += subStrSize) {
+ subStrSize = Math.min(ChunkSize, logMsg.length() - idx);
+ chunk = logMsg.substring(idx, idx + subStrSize);
+ switch (logTarget) {
case Info:
Log.i(source, chunk);
break;
@@ -128,7 +128,7 @@ public class NativeLogTool { }
}
} catch (Exception ex) {
- Log.e(TAG, "Failure writing " + ltarg.name() + " fragments to android log:" + ex.toString(), null);
+ Log.e(TAG, "Failure writing " + logTarget.name() + " fragments to android log:" + ex.toString(), null);
return false;
}
return true;
diff --git a/base/src/main/java/com/smartdevicelink/util/Version.java b/base/src/main/java/com/smartdevicelink/util/Version.java index d25bcd6fe..6b409af9b 100644 --- a/base/src/main/java/com/smartdevicelink/util/Version.java +++ b/base/src/main/java/com/smartdevicelink/util/Version.java @@ -63,9 +63,9 @@ public class Version { if(versions.length!=3){ throw new IllegalArgumentException("Incorrect version string format"); } - major = Integer.valueOf(versions[0]); - minor = Integer.valueOf(versions[1]); - patch = Integer.valueOf(versions[2]); + major = Integer.parseInt(versions[0]); + minor = Integer.parseInt(versions[1]); + patch = Integer.parseInt(versions[2]); } diff --git a/javaEE/build.gradle b/javaEE/build.gradle index da3020478..459ba7a53 100644 --- a/javaEE/build.gradle +++ b/javaEE/build.gradle @@ -11,5 +11,4 @@ repositories { } dependencies { - testCompile group: 'junit', name: 'junit', version: '4.12' } diff --git a/javaEE/javaEE/build.gradle b/javaEE/javaEE/build.gradle index e0bd3d93e..d2c90a1b4 100644 --- a/javaEE/javaEE/build.gradle +++ b/javaEE/javaEE/build.gradle @@ -26,6 +26,7 @@ configurations { } dependencies { + testCompile group: 'junit', name: 'junit', version: '4.12' extraLibs fileTree(dir: 'libs', include: ['*.jar']) extraLibs 'org.mongodb:bson:4.0.5' extraLibs 'androidx.annotation:annotation:1.1.0' diff --git a/javaEE/javaEE/src/test/java/com/smartdevicelink/managers/file/filetypes/SdlFileTests.java b/javaEE/javaEE/src/test/java/com/smartdevicelink/managers/file/filetypes/SdlFileTests.java new file mode 100644 index 000000000..91001d252 --- /dev/null +++ b/javaEE/javaEE/src/test/java/com/smartdevicelink/managers/file/filetypes/SdlFileTests.java @@ -0,0 +1,153 @@ +/* + * Copyright (c) 2019 Livio, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Livio Inc. nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +package com.smartdevicelink.managers.file.filetypes; + +import com.smartdevicelink.test.TestValues; + +import org.junit.Test; + +import static junit.framework.TestCase.assertEquals; +import static junit.framework.TestCase.assertFalse; + +public class SdlFileTests { + + @Test + public void testConstructorWithNoParams() { + SdlFile sdlFile; + + // Case 1 (Setting data) + sdlFile = new SdlFile(); + sdlFile.setFileData(TestValues.GENERAL_BYTE_ARRAY); + assertEquals(sdlFile.getFileData(), TestValues.GENERAL_BYTE_ARRAY); + sdlFile.setName(null); + assertEquals(sdlFile.getName(), "e9800998ecf8427e"); + sdlFile.setName(TestValues.GENERAL_STRING); + assertEquals(sdlFile.getName(), TestValues.GENERAL_STRING); + sdlFile.setType(TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile.getType(), TestValues.GENERAL_FILETYPE); + sdlFile.setPersistent(TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile.getOverwrite()); + + // Case 2 (Setting resourceId) + sdlFile = new SdlFile(); + sdlFile.setFilePath(TestValues.GENERAL_STRING); + assertEquals(sdlFile.getFilePath(), TestValues.GENERAL_STRING); + sdlFile.setName(null); + assertEquals(sdlFile.getName(), "cade4e832627b4f6"); + sdlFile.setName(TestValues.GENERAL_STRING); + assertEquals(sdlFile.getName(), TestValues.GENERAL_STRING); + sdlFile.setType(TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile.getType(), TestValues.GENERAL_FILETYPE); + sdlFile.setPersistent(TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile.getOverwrite()); + + // Case 3 (Setting URI) + sdlFile = new SdlFile(); + sdlFile.setURI(TestValues.GENERAL_URI); + assertEquals(sdlFile.getURI(), TestValues.GENERAL_URI); + sdlFile.setName(null); + assertEquals(sdlFile.getName(), "d3467db131372140"); + sdlFile.setName(TestValues.GENERAL_STRING); + assertEquals(sdlFile.getName(), TestValues.GENERAL_STRING); + sdlFile.setType(TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile.getType(), TestValues.GENERAL_FILETYPE); + sdlFile.setPersistent(TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile.getOverwrite()); + } + + @Test + public void testConstructorWithResourceId() { + // Case1 (Set the name manually) + SdlFile sdlFile1 = new SdlFile(TestValues.GENERAL_STRING, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_STRING, TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile1.getName(), TestValues.GENERAL_STRING); + assertEquals(sdlFile1.getType(), TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile1.getFilePath(), TestValues.GENERAL_STRING); + assertEquals(sdlFile1.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile1.getOverwrite()); + + // Case2 (Let the library generate a name) + SdlFile sdlFile2 = new SdlFile(null, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_STRING, TestValues.GENERAL_BOOLEAN); + SdlFile sdlFile3 = new SdlFile(null, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_STRING, TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile2.getName(), sdlFile3.getName()); + assertEquals(sdlFile2.getName(), "cade4e832627b4f6"); + assertEquals(sdlFile2.getType(), TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile2.getFilePath(), TestValues.GENERAL_STRING); + assertEquals(sdlFile2.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile2.getOverwrite()); + } + + @Test + public void testConstructorWithData() { + // Case1 (Set the name manually) + SdlFile sdlFile1 = new SdlFile(TestValues.GENERAL_STRING, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_BYTE_ARRAY, TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile1.getName(), TestValues.GENERAL_STRING); + assertEquals(sdlFile1.getType(), TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile1.getFileData(), TestValues.GENERAL_BYTE_ARRAY); + assertEquals(sdlFile1.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile1.getOverwrite()); + + // Case2 (Let the library generate a name) + SdlFile sdlFile2 = new SdlFile(null, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_BYTE_ARRAY, TestValues.GENERAL_BOOLEAN); + SdlFile sdlFile3 = new SdlFile(null, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_BYTE_ARRAY, TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile2.getName(), sdlFile3.getName()); + assertEquals(sdlFile2.getName(), "e9800998ecf8427e"); + assertEquals(sdlFile2.getType(), TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile2.getFileData(), TestValues.GENERAL_BYTE_ARRAY); + assertEquals(sdlFile2.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile2.getOverwrite()); + } + + @Test + public void testConstructorWithUri() { + // Case1 (Set the name manually) + SdlFile sdlFile1 = new SdlFile(TestValues.GENERAL_STRING, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_URI, TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile1.getName(), TestValues.GENERAL_STRING); + assertEquals(sdlFile1.getType(), TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile1.getURI(), TestValues.GENERAL_URI); + assertEquals(sdlFile1.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile1.getOverwrite()); + + // Case2 (Let the library generate a name) + SdlFile sdlFile2 = new SdlFile(null, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_URI, TestValues.GENERAL_BOOLEAN); + SdlFile sdlFile3 = new SdlFile(null, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_URI, TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile2.getName(), sdlFile3.getName()); + assertEquals(sdlFile2.getName(), "d3467db131372140"); + assertEquals(sdlFile2.getType(), TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile2.getURI(), TestValues.GENERAL_URI); + assertEquals(sdlFile2.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile2.getOverwrite()); + } +} diff --git a/javaEE/javaEE/src/test/java/com/smartdevicelink/test/TestValues.java b/javaEE/javaEE/src/test/java/com/smartdevicelink/test/TestValues.java new file mode 100644 index 000000000..d3efa2326 --- /dev/null +++ b/javaEE/javaEE/src/test/java/com/smartdevicelink/test/TestValues.java @@ -0,0 +1,13 @@ +package com.smartdevicelink.test; + +import com.smartdevicelink.proxy.rpc.enums.FileType; + +import java.net.URI; + +public class TestValues { + public static final boolean GENERAL_BOOLEAN = true; + public static final byte[] GENERAL_BYTE_ARRAY = new byte[0]; + public static final String GENERAL_STRING = "test"; + public static final FileType GENERAL_FILETYPE = FileType.BINARY; + public static final URI GENERAL_URI = URI.create("http://www.google.com"); +} diff --git a/javaSE/build.gradle b/javaSE/build.gradle index 85f6e7e3e..b4b664aee 100644 --- a/javaSE/build.gradle +++ b/javaSE/build.gradle @@ -11,5 +11,4 @@ repositories { } dependencies { - testCompile group: 'junit', name: 'junit', version: '4.12' } diff --git a/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/Main.java b/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/Main.java index dc1ce2457..0f67efe0b 100644 --- a/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/Main.java +++ b/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/Main.java @@ -37,17 +37,17 @@ import com.smartdevicelink.util.DebugTool; public class Main { private static final String TAG = "Main"; - static Thread thread = null, mainThread; - static Object LOCK; + private static Thread thread = null; + private static Thread mainThread; + private static final Object LOCK = new Object(); - static SdlService sdlService; + private static SdlService sdlService; public static void main(String[] args) { //Enable DebugTool DebugTool.enableDebugTool(); mainThread = Thread.currentThread(); - LOCK = new Object(); startSdlService(); while(!mainThread.isInterrupted()) { @@ -68,7 +68,7 @@ public class Main { } } - static SdlService.SdlServiceCallback serviceCallback = new SdlService.SdlServiceCallback() { + private static final SdlService.SdlServiceCallback serviceCallback = new SdlService.SdlServiceCallback() { @Override public void onEnd() { if (thread != null) { diff --git a/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java b/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java index 8c9afcc28..a9d81b766 100644 --- a/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java +++ b/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java @@ -33,11 +33,11 @@ package com.smartdevicelink.java; import com.smartdevicelink.managers.CompletionListener; -import com.smartdevicelink.managers.screen.OnButtonListener; import com.smartdevicelink.managers.SdlManager; import com.smartdevicelink.managers.SdlManagerListener; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; import com.smartdevicelink.managers.lifecycle.LifecycleConfigurationUpdate; +import com.smartdevicelink.managers.screen.OnButtonListener; import com.smartdevicelink.managers.screen.choiceset.ChoiceCell; import com.smartdevicelink.managers.screen.choiceset.ChoiceSet; import com.smartdevicelink.managers.screen.choiceset.ChoiceSetSelectionListener; @@ -79,7 +79,7 @@ public class SdlService { private SdlManager sdlManager = null; private List<ChoiceCell> choiceCellList; - private SdlServiceCallback callback; + private final SdlServiceCallback callback; public SdlService(BaseTransportConfig config, SdlServiceCallback callback){ this.callback = callback; @@ -173,7 +173,7 @@ public class SdlService { }; - HashMap<FunctionID,OnRPCNotificationListener> notificationListenerHashMap = new HashMap<FunctionID,OnRPCNotificationListener>(); + HashMap<FunctionID,OnRPCNotificationListener> notificationListenerHashMap = new HashMap<>(); notificationListenerHashMap.put(FunctionID.ON_HMI_STATUS, new OnRPCNotificationListener() { @Override public void onNotified(RPCNotification notification) { diff --git a/javaSE/javaSE/build.gradle b/javaSE/javaSE/build.gradle index 1e5525316..1390cd913 100644 --- a/javaSE/javaSE/build.gradle +++ b/javaSE/javaSE/build.gradle @@ -27,6 +27,7 @@ configurations { } dependencies { + testCompile group: 'junit', name: 'junit', version: '4.12' extraLibs fileTree(dir: 'libs', include: ['*.jar']) extraLibs 'org.mongodb:bson:4.0.5' extraLibs 'androidx.annotation:annotation:1.1.0' diff --git a/javaSE/javaSE/src/main/java/com/livio/BSON/BsonEncoder.java b/javaSE/javaSE/src/main/java/com/livio/BSON/BsonEncoder.java index 22c47f6cb..30037bad6 100644 --- a/javaSE/javaSE/src/main/java/com/livio/BSON/BsonEncoder.java +++ b/javaSE/javaSE/src/main/java/com/livio/BSON/BsonEncoder.java @@ -32,9 +32,16 @@ package com.livio.BSON; import com.smartdevicelink.util.DebugTool; -import org.bson.*; -import java.util.*; +import org.bson.BSONObject; +import org.bson.BasicBSONDecoder; +import org.bson.BasicBSONEncoder; +import org.bson.BasicBSONObject; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; public class BsonEncoder { private static final String TAG = "BsonEncoder"; @@ -68,7 +75,7 @@ public class BsonEncoder { } /** - * Goes thorugh the map and ensures that all the values included are supported by SDL. If they are not of a supported + * Goes through the map and ensures that all the values included are supported by SDL. If they are not of a supported * value it is removed from the map * @param map the map to be sanitized * @return a sanitized HashMap with non-supported object type removes diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java index 4dae813f6..09a495355 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java @@ -33,12 +33,10 @@ package com.smartdevicelink.managers; import androidx.annotation.NonNull; -import com.smartdevicelink.util.Log; import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.managers.permission.PermissionManager; import com.smartdevicelink.managers.screen.ScreenManager; -import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason; import com.smartdevicelink.transport.enums.TransportType; import com.smartdevicelink.util.DebugTool; @@ -129,9 +127,9 @@ public class SdlManager extends BaseSdlManager { private void notifyDevListener(String info) { if (managerListener != null) { if (getState() == BaseSubManager.ERROR) { - managerListener.onError((SdlManager) this, info, null); + managerListener.onError(this, info, null); } else { - managerListener.onStart((SdlManager) this); + managerListener.onStart(this); } } } @@ -160,7 +158,7 @@ public class SdlManager extends BaseSdlManager { } if (managerListener != null) { - managerListener.onDestroy((SdlManager) this); + managerListener.onDestroy(this); managerListener = null; } diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/FileManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/FileManager.java index 9fb7c7ce3..a84f0a7c7 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/FileManager.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/FileManager.java @@ -34,8 +34,9 @@ package com.smartdevicelink.managers.file; import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; + import com.smartdevicelink.managers.file.filetypes.SdlFile; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.PutFile; import com.smartdevicelink.util.DebugTool; import com.smartdevicelink.util.FileUtls; diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java index a63c3e27b..eee60bd69 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java @@ -32,6 +32,7 @@ package com.smartdevicelink.managers.file.filetypes; import androidx.annotation.NonNull; + import com.smartdevicelink.proxy.rpc.Image; import com.smartdevicelink.proxy.rpc.enums.FileType; import com.smartdevicelink.proxy.rpc.enums.ImageType; @@ -111,7 +112,7 @@ public class SdlArtwork extends SdlFile implements Cloneable{ @Override - public void setType(FileType fileType) { + public void setType(@NonNull FileType fileType) { if(fileType == null || fileType.equals(FileType.GRAPHIC_JPEG) || fileType.equals(FileType.GRAPHIC_PNG) || fileType.equals(FileType.GRAPHIC_BMP)){ super.setType(fileType); diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java index bb1c170d4..10e400f40 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java @@ -39,6 +39,7 @@ import com.smartdevicelink.proxy.rpc.enums.StaticIconName; import java.net.URI; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.util.Arrays; /** * A class representing data to be uploaded to core @@ -53,7 +54,7 @@ public class SdlFile{ private boolean isStaticIcon; private boolean shouldAutoGenerateName; // Overwrite property by default is set to true in SdlFile constructors indicating that a file can be overwritten - private boolean overwrite = true; + private boolean overwrite = false; /** * Creates a new instance of SdlFile @@ -154,7 +155,7 @@ public class SdlFile{ /** * Gets the location of the file - * @return + * @return represents the path of the file */ public String getFilePath(){ return this.filePath; @@ -317,7 +318,7 @@ public class SdlFile{ result += ((getName() == null) ? 0 : Integer.rotateLeft(getName().hashCode(), 1)); result += ((getURI() == null) ? 0 : Integer.rotateLeft(getURI().hashCode(), 2)); result += ((getFilePath() == null) ? 0 : Integer.rotateLeft(getFilePath().hashCode(), 3)); - result += ((getFileData() == null) ? 0 : Integer.rotateLeft(getFileData().hashCode(), 4)); + result += ((getFileData() == null) ? 0 : Integer.rotateLeft(Arrays.hashCode(getFileData()), 4)); result += ((getType() == null) ? 0 : Integer.rotateLeft(getType().hashCode(), 5)); result += Integer.rotateLeft(Boolean.valueOf(isStaticIcon()).hashCode(), 6); result += Integer.rotateLeft(Boolean.valueOf(isPersistent()).hashCode(), 7); diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/EncryptionLifecycleManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/EncryptionLifecycleManager.java index eda411dc5..d749811a1 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/EncryptionLifecycleManager.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/EncryptionLifecycleManager.java @@ -35,7 +35,7 @@ package com.smartdevicelink.managers.lifecycle; import androidx.annotation.NonNull; import com.smartdevicelink.managers.ServiceEncryptionListener; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; class EncryptionLifecycleManager extends BaseEncryptionLifecycleManager { diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java index b7167b81c..89c9f3190 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java @@ -34,7 +34,7 @@ package com.smartdevicelink.managers.lifecycle; import androidx.annotation.RestrictTo; -import com.smartdevicelink.SdlConnection.SdlSession; +import com.smartdevicelink.session.SdlSession; import com.smartdevicelink.exception.SdlException; import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason; import com.smartdevicelink.transport.BaseTransportConfig; diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManager.java index e4e635883..e10693770 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManager.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManager.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.managers.lifecycle; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; /** * <strong>SystemCapabilityManager</strong> <br> diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java index b27b00bcb..141e16151 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java @@ -33,7 +33,8 @@ package com.smartdevicelink.managers.permission; import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; -import com.smartdevicelink.proxy.interfaces.ISdl; + +import com.smartdevicelink.managers.ISdl; /** PermissionManager gives the developer information about what permissions are permitted in specific HMI level diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java index 2989be3f2..d1f6811ac 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java @@ -33,8 +33,9 @@ package com.smartdevicelink.managers.screen; import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; + import com.smartdevicelink.managers.file.FileManager; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; /** * <strong>ScreenManager</strong> <br> diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java index a7e9d30c2..7f67faa47 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/SoftButtonManager.java @@ -33,8 +33,9 @@ package com.smartdevicelink.managers.screen; import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; + import com.smartdevicelink.managers.file.FileManager; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; /** * <strong>SoftButtonManager</strong> <br> diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java index 8db1cd957..b14ad987c 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java @@ -2,7 +2,8 @@ package com.smartdevicelink.managers.screen; import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; -import com.smartdevicelink.proxy.interfaces.ISdl; + +import com.smartdevicelink.managers.ISdl; /** * <strong>SubscribeButtonManager</strong> <br> diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java index 76c142e9a..d5ff0f52f 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java @@ -33,9 +33,10 @@ package com.smartdevicelink.managers.screen; import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; + import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; import com.smartdevicelink.proxy.rpc.enums.FileType; /** diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java index cd7f20dfe..ebcfa9c10 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManager.java @@ -34,8 +34,9 @@ package com.smartdevicelink.managers.screen.choiceset; import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; + import com.smartdevicelink.managers.file.FileManager; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; /** * <strong>ChoiceSetManager</strong> <br> diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java index ec2ae5fb3..6a51ddd65 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java @@ -33,8 +33,9 @@ package com.smartdevicelink.managers.screen.menu; import androidx.annotation.RestrictTo; + import com.smartdevicelink.managers.file.FileManager; -import com.smartdevicelink.proxy.interfaces.ISdl; +import com.smartdevicelink.managers.ISdl; /** * <strong>MenuManager</strong> <br> diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java index 1d2233fb0..641ab189e 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java @@ -33,7 +33,8 @@ package com.smartdevicelink.managers.screen.menu; import androidx.annotation.RestrictTo; -import com.smartdevicelink.proxy.interfaces.ISdl; + +import com.smartdevicelink.managers.ISdl; /** * <strong>VoiceCommandManager</strong> <br> diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java index 18343acb0..64cd728ca 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java @@ -34,6 +34,7 @@ package com.smartdevicelink.protocol; import androidx.annotation.RestrictTo; + import com.smartdevicelink.transport.BaseTransportConfig; import com.smartdevicelink.transport.TransportManager; @@ -41,7 +42,6 @@ import com.smartdevicelink.transport.TransportManager; @SuppressWarnings("WeakerAccess") @RestrictTo(RestrictTo.Scope.LIBRARY) public class SdlProtocol extends SdlProtocolBase { - private static final String TAG ="SdlProtocol"; public SdlProtocol( ISdlProtocol iSdlProtocol, BaseTransportConfig config) { super(iSdlProtocol, config); diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/session/SdlSession.java index 17a961a17..4aaef8985 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/session/SdlSession.java @@ -30,15 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package com.smartdevicelink.SdlConnection; +package com.smartdevicelink.session; import androidx.annotation.RestrictTo; + 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.protocol.ISdlServiceListener; import com.smartdevicelink.transport.BaseTransportConfig; import com.smartdevicelink.util.DebugTool; import com.smartdevicelink.util.Version; 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..65037f6b8 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/WebSocketServer.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/WebSocketServer.java @@ -37,6 +37,7 @@ import com.smartdevicelink.transport.enums.TransportType; import com.smartdevicelink.transport.utl.SSLWebSocketFactoryGenerator; import com.smartdevicelink.transport.utl.TransportRecord; import com.smartdevicelink.util.DebugTool; + import org.java_websocket.WebSocket; import org.java_websocket.WebSocketServerFactory; import org.java_websocket.handshake.ClientHandshake; @@ -46,8 +47,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 +88,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/SSLConfig.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/utl/SSLConfig.java index d46e8aac6..e2eb1c2b0 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/utl/SSLConfig.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/utl/SSLConfig.java @@ -34,9 +34,9 @@ package com.smartdevicelink.transport.utl; import androidx.annotation.IntDef; import androidx.annotation.NonNull; +import java.io.File; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import java.io.File; public class SSLConfig { 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..4bcb9ca8d 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 @@ -32,14 +32,10 @@ package com.smartdevicelink.transport.utl; import com.smartdevicelink.util.DebugTool; + import org.java_websocket.WebSocketServerFactory; import org.java_websocket.server.DefaultSSLWebSocketServerFactory; -import javax.net.ssl.KeyManager; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManagerFactory; -import javax.xml.bind.DatatypeConverter; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; @@ -54,6 +50,12 @@ import java.security.interfaces.RSAPrivateKey; import java.security.spec.InvalidKeySpecException; import java.security.spec.PKCS8EncodedKeySpec; +import javax.net.ssl.KeyManager; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManagerFactory; +import javax.xml.bind.DatatypeConverter; + public class SSLWebSocketFactoryGenerator { private static final String TAG = "SSLWebSocketFactoryGenerator"; private static final String JAVA_KEY_STORE = "JKS"; @@ -61,7 +63,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 +97,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; diff --git a/javaSE/javaSE/src/test/java/com/smartdevicelink/managers/file/filetypes/SdlFileTests.java b/javaSE/javaSE/src/test/java/com/smartdevicelink/managers/file/filetypes/SdlFileTests.java new file mode 100644 index 000000000..91001d252 --- /dev/null +++ b/javaSE/javaSE/src/test/java/com/smartdevicelink/managers/file/filetypes/SdlFileTests.java @@ -0,0 +1,153 @@ +/* + * Copyright (c) 2019 Livio, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Livio Inc. nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +package com.smartdevicelink.managers.file.filetypes; + +import com.smartdevicelink.test.TestValues; + +import org.junit.Test; + +import static junit.framework.TestCase.assertEquals; +import static junit.framework.TestCase.assertFalse; + +public class SdlFileTests { + + @Test + public void testConstructorWithNoParams() { + SdlFile sdlFile; + + // Case 1 (Setting data) + sdlFile = new SdlFile(); + sdlFile.setFileData(TestValues.GENERAL_BYTE_ARRAY); + assertEquals(sdlFile.getFileData(), TestValues.GENERAL_BYTE_ARRAY); + sdlFile.setName(null); + assertEquals(sdlFile.getName(), "e9800998ecf8427e"); + sdlFile.setName(TestValues.GENERAL_STRING); + assertEquals(sdlFile.getName(), TestValues.GENERAL_STRING); + sdlFile.setType(TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile.getType(), TestValues.GENERAL_FILETYPE); + sdlFile.setPersistent(TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile.getOverwrite()); + + // Case 2 (Setting resourceId) + sdlFile = new SdlFile(); + sdlFile.setFilePath(TestValues.GENERAL_STRING); + assertEquals(sdlFile.getFilePath(), TestValues.GENERAL_STRING); + sdlFile.setName(null); + assertEquals(sdlFile.getName(), "cade4e832627b4f6"); + sdlFile.setName(TestValues.GENERAL_STRING); + assertEquals(sdlFile.getName(), TestValues.GENERAL_STRING); + sdlFile.setType(TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile.getType(), TestValues.GENERAL_FILETYPE); + sdlFile.setPersistent(TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile.getOverwrite()); + + // Case 3 (Setting URI) + sdlFile = new SdlFile(); + sdlFile.setURI(TestValues.GENERAL_URI); + assertEquals(sdlFile.getURI(), TestValues.GENERAL_URI); + sdlFile.setName(null); + assertEquals(sdlFile.getName(), "d3467db131372140"); + sdlFile.setName(TestValues.GENERAL_STRING); + assertEquals(sdlFile.getName(), TestValues.GENERAL_STRING); + sdlFile.setType(TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile.getType(), TestValues.GENERAL_FILETYPE); + sdlFile.setPersistent(TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile.getOverwrite()); + } + + @Test + public void testConstructorWithResourceId() { + // Case1 (Set the name manually) + SdlFile sdlFile1 = new SdlFile(TestValues.GENERAL_STRING, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_STRING, TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile1.getName(), TestValues.GENERAL_STRING); + assertEquals(sdlFile1.getType(), TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile1.getFilePath(), TestValues.GENERAL_STRING); + assertEquals(sdlFile1.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile1.getOverwrite()); + + // Case2 (Let the library generate a name) + SdlFile sdlFile2 = new SdlFile(null, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_STRING, TestValues.GENERAL_BOOLEAN); + SdlFile sdlFile3 = new SdlFile(null, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_STRING, TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile2.getName(), sdlFile3.getName()); + assertEquals(sdlFile2.getName(), "cade4e832627b4f6"); + assertEquals(sdlFile2.getType(), TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile2.getFilePath(), TestValues.GENERAL_STRING); + assertEquals(sdlFile2.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile2.getOverwrite()); + } + + @Test + public void testConstructorWithData() { + // Case1 (Set the name manually) + SdlFile sdlFile1 = new SdlFile(TestValues.GENERAL_STRING, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_BYTE_ARRAY, TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile1.getName(), TestValues.GENERAL_STRING); + assertEquals(sdlFile1.getType(), TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile1.getFileData(), TestValues.GENERAL_BYTE_ARRAY); + assertEquals(sdlFile1.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile1.getOverwrite()); + + // Case2 (Let the library generate a name) + SdlFile sdlFile2 = new SdlFile(null, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_BYTE_ARRAY, TestValues.GENERAL_BOOLEAN); + SdlFile sdlFile3 = new SdlFile(null, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_BYTE_ARRAY, TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile2.getName(), sdlFile3.getName()); + assertEquals(sdlFile2.getName(), "e9800998ecf8427e"); + assertEquals(sdlFile2.getType(), TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile2.getFileData(), TestValues.GENERAL_BYTE_ARRAY); + assertEquals(sdlFile2.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile2.getOverwrite()); + } + + @Test + public void testConstructorWithUri() { + // Case1 (Set the name manually) + SdlFile sdlFile1 = new SdlFile(TestValues.GENERAL_STRING, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_URI, TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile1.getName(), TestValues.GENERAL_STRING); + assertEquals(sdlFile1.getType(), TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile1.getURI(), TestValues.GENERAL_URI); + assertEquals(sdlFile1.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile1.getOverwrite()); + + // Case2 (Let the library generate a name) + SdlFile sdlFile2 = new SdlFile(null, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_URI, TestValues.GENERAL_BOOLEAN); + SdlFile sdlFile3 = new SdlFile(null, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_URI, TestValues.GENERAL_BOOLEAN); + assertEquals(sdlFile2.getName(), sdlFile3.getName()); + assertEquals(sdlFile2.getName(), "d3467db131372140"); + assertEquals(sdlFile2.getType(), TestValues.GENERAL_FILETYPE); + assertEquals(sdlFile2.getURI(), TestValues.GENERAL_URI); + assertEquals(sdlFile2.isPersistent(), TestValues.GENERAL_BOOLEAN); + assertFalse(sdlFile2.getOverwrite()); + } +} diff --git a/javaSE/javaSE/src/test/java/com/smartdevicelink/test/TestValues.java b/javaSE/javaSE/src/test/java/com/smartdevicelink/test/TestValues.java new file mode 100644 index 000000000..d3efa2326 --- /dev/null +++ b/javaSE/javaSE/src/test/java/com/smartdevicelink/test/TestValues.java @@ -0,0 +1,13 @@ +package com.smartdevicelink.test; + +import com.smartdevicelink.proxy.rpc.enums.FileType; + +import java.net.URI; + +public class TestValues { + public static final boolean GENERAL_BOOLEAN = true; + public static final byte[] GENERAL_BYTE_ARRAY = new byte[0]; + public static final String GENERAL_STRING = "test"; + public static final FileType GENERAL_FILETYPE = FileType.BINARY; + public static final URI GENERAL_URI = URI.create("http://www.google.com"); +} |