remove builder setter, add 2 empty test classes

11 files changed, 115 insertions, 48 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/RunScoreTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/RunScoreTests.java
new file mode 100644
index 000000000..1eef07622
--- /dev/null
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/RunScoreTests.java
@@ -0,0 +1,50 @@
+/*
+ * 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.screen.menu;
+
+import com.smartdevicelink.AndroidTestCase2;
+
+public class RunScoreTests extends AndroidTestCase2 {
+
+
+	@Override
+	public void setUp() throws Exception{
+		super.setUp();
+	}
+
+	@Override
+	public void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+}
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/SubCellCommandListTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/SubCellCommandListTests.java
new file mode 100644
index 000000000..f47037dbe
--- /dev/null
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/SubCellCommandListTests.java
@@ -0,0 +1,49 @@
+/*
+ * 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.screen.menu;
+
+import com.smartdevicelink.AndroidTestCase2;
+
+public class SubCellCommandListTests extends AndroidTestCase2 {
+
+	@Override
+	public void setUp() throws Exception{
+		super.setUp();
+	}
+
+	@Override
+	public void tearDown() throws Exception {
+		super.tearDown();
+	}
+
+}
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 76546bc7f..ea1e88dcc 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
@@ -233,7 +233,7 @@ public class SdlManager extends BaseSdlManager{
 		if (lockScreenConfig.isEnabled()) {
 			this.lockScreenManager = new LockScreenManager(lockScreenConfig, context, _internalInterface);
 		}
-		this.screenManager = new ScreenManager(_internalInterface, this.fileManager, enableDynamicMenuUpdates);
+		this.screenManager = new ScreenManager(_internalInterface, this.fileManager);
 		if(getAppTypes().contains(AppHMIType.NAVIGATION) || getAppTypes().contains(AppHMIType.PROJECTION)){
 			this.videoStreamManager = new VideoStreamManager(_internalInterface);
 		} else {
@@ -1011,17 +1011,6 @@ public class SdlManager extends BaseSdlManager{
 			return this;
 		}
 
-		/**
-		 * Default: true. If set to false, the Menu Manager will enter a compatibility mode that deletes
-		 * and re-adds menus and sub menus each time a new menu or menu item is set. We discourage its
-		 * use due to performance issues on older head units.
-		 * @param enableDynamicMenuUpdates - a boolean
-		 */
-		public Builder setEnableDynamicMenuUpdates(Boolean enableDynamicMenuUpdates){
-			sdlManager.enableDynamicMenuUpdates = enableDynamicMenuUpdates;
-			return this;
-		}
-
 		public SdlManager build() {
 
 			if (sdlManager.appName == null) {
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 db802e46d..7975bb5f2 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
@@ -44,7 +44,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
 */
 public class ScreenManager extends BaseScreenManager {
 
-	public ScreenManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager, Boolean enableDynamicMenuUpdates) {
-		super(internalInterface, fileManager, enableDynamicMenuUpdates);
+	public ScreenManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager) {
+		super(internalInterface, fileManager);
 	}
 }
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 253b37900..4a28a2792 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
@@ -44,9 +44,9 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
  */
 public class MenuManager extends BaseMenuManager {
 
-	public MenuManager(ISdl internalInterface, FileManager fileManager, Boolean enableDynamicMenuUpdates) {
+	public MenuManager(ISdl internalInterface, FileManager fileManager) {
 		// setup
-		super(internalInterface, fileManager, enableDynamicMenuUpdates);
+		super(internalInterface, fileManager);
 	}
 
 }
diff --git a/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java b/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java
index 6427ad067..5f73be39d 100644
--- a/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java
@@ -65,7 +65,6 @@ abstract class BaseSdlManager {
 
     String appId, appName, shortAppName;
     boolean isMediaApp;
-    Boolean enableDynamicMenuUpdates;
     Language hmiLanguage;
     Vector<AppHMIType> hmiTypes;
     BaseTransportConfig transport;
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 4fb4c7e3f..b6c040884 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java
@@ -63,7 +63,6 @@ abstract class BaseScreenManager extends BaseSubManager {
 	private TextAndGraphicManager textAndGraphicManager;
 	private VoiceCommandManager voiceCommandManager;
 	private MenuManager menuManager;
-	private Boolean enableDynamicMenuUpdates;
 
 	// Sub manager listener
 	private final CompletionListener subManagerListener = new CompletionListener() {
@@ -91,10 +90,9 @@ abstract class BaseScreenManager extends BaseSubManager {
 		}
 	};
 
-	BaseScreenManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager, Boolean enableDynamicMenuUpdates) {
+	BaseScreenManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager) {
 		super(internalInterface);
 		this.fileManager = new WeakReference<>(fileManager);
-		this.enableDynamicMenuUpdates = enableDynamicMenuUpdates;
 		initialize();
 	}
 
@@ -111,7 +109,7 @@ abstract class BaseScreenManager extends BaseSubManager {
 		if (fileManager.get() != null) {
 			this.softButtonManager = new SoftButtonManager(internalInterface, fileManager.get());
 			this.textAndGraphicManager = new TextAndGraphicManager(internalInterface, fileManager.get(), softButtonManager);
-			this.menuManager = new MenuManager(internalInterface, fileManager.get(), enableDynamicMenuUpdates);
+			this.menuManager = new MenuManager(internalInterface, fileManager.get());
 		}
 		this.voiceCommandManager = new VoiceCommandManager(internalInterface);
 	}
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 c38a00154..9fa1fe82e 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
@@ -99,7 +99,7 @@ abstract class BaseMenuManager extends BaseSubManager {
 
 	SystemContext currentSystemContext;
 
-	BaseMenuManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager, Boolean enableDynamicMenuUpdates) {
+	BaseMenuManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager) {
 
 		super(internalInterface);
 
@@ -109,13 +109,6 @@ abstract class BaseMenuManager extends BaseSubManager {
 		currentHMILevel = HMILevel.HMI_NONE;
 		lastMenuId = menuCellIdMin;
 
-		// if not set, we want this to be true by default
-		if (enableDynamicMenuUpdates == null){
-			this.enableDynamicMenuUpdates = true;
-		}else{
-			this.enableDynamicMenuUpdates = enableDynamicMenuUpdates;
-		}
-
 		addListeners();
 	}
 
@@ -382,7 +375,7 @@ abstract class BaseMenuManager extends BaseSubManager {
 			return;
 		}
 
-		List<SubCellCommandLists> commandLists = new ArrayList<>();
+		List<SubCellCommandList> commandLists = new ArrayList<>();
 
 		for (int i = 0; i < keepsNew.size(); i++) {
 
@@ -395,7 +388,7 @@ abstract class BaseMenuManager extends BaseSubManager {
 
 				if (subScore != null){
 					DebugTool.logInfo("Sub menu Run Score: "+ oldKeptCell.getTitle()+ " Score: "+ subScore.getScore());
-					SubCellCommandLists commandList = new SubCellCommandLists(oldKeptCell.getTitle(), oldKeptCell.getCellId(), subScore, oldKeptCell.getSubCells(), keptCell.getSubCells());
+					SubCellCommandList commandList = new SubCellCommandList(oldKeptCell.getTitle(), oldKeptCell.getCellId(), subScore, oldKeptCell.getSubCells(), keptCell.getSubCells());
 					commandLists.add(commandList);
 				}
 			}
@@ -403,7 +396,7 @@ abstract class BaseMenuManager extends BaseSubManager {
 		createSubMenuDynamicCommands(commandLists);
 	}
 
-	private void createSubMenuDynamicCommands(final List<SubCellCommandLists> commandLists){
+	private void createSubMenuDynamicCommands(final List<SubCellCommandList> commandLists){
 
 		// break out
 		if (commandLists.size() == 0){
@@ -420,7 +413,7 @@ abstract class BaseMenuManager extends BaseSubManager {
 			return;
 		}
 
-		final SubCellCommandLists commandList = commandLists.remove(0);
+		final SubCellCommandList commandList = commandLists.remove(0);
 
 		DebugTool.logInfo("Creating and Sending Dynamic Sub Commands For Root Menu Cell: "+ commandList.getMenuTitle());
 
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/SubCellCommandLists.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/SubCellCommandList.java
index d77fc60ef..d5eee6ef1 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/SubCellCommandLists.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/SubCellCommandList.java
@@ -34,14 +34,14 @@ package com.smartdevicelink.managers.screen.menu;
 
 import java.util.List;
 
-class SubCellCommandLists {
+class SubCellCommandList {
 
 	private RunScore listsScore;
 	private String menuTitle;
 	private Integer parentId;
 	private List<MenuCell> oldList, newList;
 
-	SubCellCommandLists(String menuTitle, Integer parentId, RunScore listsScore, List<MenuCell> oldList, List<MenuCell> newList){
+	SubCellCommandList(String menuTitle, Integer parentId, RunScore listsScore, List<MenuCell> oldList, List<MenuCell> newList){
 		setMenuTitle(menuTitle);
 		setParentId(parentId);
 		setListsScore(listsScore);
diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
index 4adc29ef3..146382de9 100644
--- a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
+++ b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
@@ -667,17 +667,6 @@ public class SdlManager extends BaseSdlManager{
 			return this;
 		}
 
-		/**
-		 * Default: true. If set to false, the Menu Manager will enter a compatibility mode that deletes
-		 * and re-adds menus and sub menus each time a new menu or menu item is set. We discourage its
-		 * use due to performance issues on older head units.
-		 * @param enableDynamicMenuUpdates - a boolean
-		 */
-		public Builder setEnableDynamicMenuUpdates(Boolean enableDynamicMenuUpdates){
-			sdlManager.enableDynamicMenuUpdates = enableDynamicMenuUpdates;
-			return this;
-		}
-
 		public SdlManager build() {
 
 			if (sdlManager.appName == null) {
diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
index f2c61d1a1..b9828f4c3 100644
--- a/javaSE/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
+++ b/javaSE/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
@@ -42,7 +42,7 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
 */
 public class ScreenManager extends BaseScreenManager {
 
-	public ScreenManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager, Boolean enableDynamicMenuUpdates) {
-		super(internalInterface, fileManager, enableDynamicMenuUpdates);
+	public ScreenManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager) {
+		super(internalInterface, fileManager);
 	}
 }