Remove legacy Spring Boot CLI support and Spring Cloud CLI

Signed-off-by: ab003976 <alex.boyko@broadcom.com>

Author: BoykoAlex

eclipse-extensions/org.springframework.ide.eclipse.boot.dash.test/src/org/springframework/ide/eclipse/boot/dash/test/BootDashModelTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2016 Pivotal, Inc.
+ * Copyright (c) 2015, 2026 Pivotal, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -143,10 +143,6 @@ public void reload() throws Exception {
 //			return privateProperties;
 //		}
 //
-//		@Override
-//		public BootInstallManager getBootInstallManager() {
-//			return bootI
-//		}
 //	}
 
 	public BootDashModel getRunTargetModel(RunTargetType type) {
@@ -253,7 +249,6 @@ public void assertLabelContains(String expectSnippet, Color expectedColor, Gener
 		fail("Snippet found but not the right color");
 	}
 
-
 	public StyledString getStyledLabel(Object element) {
 		Stylers stylers = new Stylers(null);
 		try (BootDashLabels labels = new BootDashLabels(context.injections, stylers)) {
@@ -329,5 +324,4 @@ public BootProjectDashElement waitForElement(long timeout, IProject project) thr
 		return waitForCallable("Element for project "+project.getName(), timeout, () -> getElementFor(project));
 	}
 
-
 }

eclipse-extensions/org.springframework.ide.eclipse.boot.dash.test/src/org/springframework/ide/eclipse/boot/dash/test/BootDashViewModelHarness.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2016 Pivotal Software, Inc.
+ * Copyright (c) 2015, 2026 Pivotal Software, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -23,7 +23,6 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.debug.core.ILaunchManager;
 import org.springframework.ide.eclipse.boot.core.BootPreferences;
-import org.springframework.ide.eclipse.boot.core.cli.BootInstallManager;
 import org.springframework.ide.eclipse.boot.dash.api.RunTargetType;
 import org.springframework.ide.eclipse.boot.dash.console.CloudAppLogManager;
 import org.springframework.ide.eclipse.boot.dash.di.SimpleDIContext;
@@ -44,7 +43,6 @@
 public class TestBootDashModelContext extends BootDashModelContext {
 
 	private File stateLoc;
-	private File installLoc;
 	private ILaunchManager launchManager;
 	private IWorkspace workspace;
 	SecuredCredentialsStore secureStore = new MockSecuredCredentialStore();
@@ -53,16 +51,13 @@ public class TestBootDashModelContext extends BootDashModelContext {
 	private LiveVariable<Pattern> bootProjectExclusion = new LiveVariable<>(BootPreferences.DEFAULT_BOOT_PROJECT_EXCLUDE);
 	private IPropertyStore viewProperties = new InMemoryPropertyStore();
 	private IPropertyStore privateProperties = new InMemoryPropertyStore();
-	private IPropertyStore installProperties = new InMemoryPropertyStore();
-	private BootInstallManager bootInstalls;
 
 	public TestBootDashModelContext(IWorkspace workspace, ILaunchManager launchMamager) {
 		super(createInjections());
 		try {
 			this.workspace = workspace;
 			this.launchManager = launchMamager;
 			stateLoc = StsTestUtil.createTempDirectory("plugin-state", null);
-			installLoc = StsTestUtil.createTempDirectory("boot-installs", null);
 			this.projectProperties = new MockScopedPropertyStore<>();
 			this.runTargetProperties = new MockScopedPropertyStore<>();
 			reload();
@@ -131,17 +126,11 @@ public IPropertyStore getPrivatePropertyStore() {
 		return privateProperties;
 	}
 
-	@Override
-	public BootInstallManager getBootInstallManager() {
-		return bootInstalls;
-	}
-
 	/**
 	 * Simulates reloading
 	 * @return
 	 */
 	public TestBootDashModelContext reload() throws Exception {
-		this.bootInstalls = new BootInstallManager(installLoc, installProperties);
 		injections.reload();
 		return this;
 	}

eclipse-extensions/org.springframework.ide.eclipse.boot.dash.test/src/org/springframework/ide/eclipse/boot/dash/test/TestBootDashModelContext.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2017 Pivotal, Inc.
+ * Copyright (c) 2015, 2026 Pivotal, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -38,7 +38,7 @@ public class ToggleFiltersModelTest {
 
 	private static final String HIDE_NON_WORKSPACE_ELEMENTS = "Hide non-workspace elements";
 	private static final String HIDE_SOLITARY_CONF = "Hide solitary launch configs";
-	private static final String HIDE_LOCAL_SERVICES = "Hide local cloud services";
+	private static final String HIDE_NOT_RUNNABLE_APPS = "Hide local non-runnable apps";
 
 	private InMemoryPropertyStore propertyStore = new InMemoryPropertyStore();
 
@@ -49,11 +49,23 @@ public void testAvailableFilters() throws Exception {
 			arrayContaining(
 					hasToString("FilterChoice("+HIDE_NON_WORKSPACE_ELEMENTS+")"),
 					hasToString("FilterChoice("+HIDE_SOLITARY_CONF+")"),
-					hasToString("FilterChoice("+HIDE_LOCAL_SERVICES+")")
+					hasToString("FilterChoice("+HIDE_NOT_RUNNABLE_APPS+")")
 			)
 		);
 	}
 
+	@Test
+	public void testRemovedLocalServicesFilterIsIgnored() throws Exception {
+		propertyStore.put("hide.local-cloud-services", "true");
+		propertyStore.put(ToggleFiltersModel.FILTER_CHOICE_HIDE_NON_WORKSPACE_ELEMENTS.getId(), "true");
+
+		ToggleFiltersModel model = new ToggleFiltersModel(propertyStore);
+
+		assertEquals(ImmutableSet.of(
+				ToggleFiltersModel.FILTER_CHOICE_HIDE_SOLITARY_CONFS,
+				ToggleFiltersModel.FILTER_CHOICE_HIDE_NON_WORKSPACE_ELEMENTS), model.getSelectedFilters().getValues());
+	}
+
 	@Test
 	public void testHideNonWorkspaceElementsToleratesNull() throws Exception {
 		//Case: element == null
@@ -152,18 +164,17 @@ public void testToggleFiltersPersistAndRestore() throws Exception {
 
 		FilterChoice nonWorkspace = getFilter(model, HIDE_NON_WORKSPACE_ELEMENTS);
 		FilterChoice solitaryConf = getFilter(model, HIDE_SOLITARY_CONF);
-		FilterChoice localService = getFilter(model, HIDE_LOCAL_SERVICES);
 
 		//initially the defaults should be set.
-		assertEquals(ImmutableSet.of(solitaryConf, localService), model.getSelectedFilters().getValues());
+		assertEquals(ImmutableSet.of(solitaryConf), model.getSelectedFilters().getValues());
 
 		model.getSelectedFilters().remove(solitaryConf);
 		model.getSelectedFilters().add(nonWorkspace);
 
 		//Simulate model reload (i.e. just instantiate it with the same property store).
 		model = new ToggleFiltersModel(propertyStore);
 
-		assertEquals(ImmutableSet.of(nonWorkspace, localService), model.getSelectedFilters().getValues());
+		assertEquals(ImmutableSet.of(nonWorkspace), model.getSelectedFilters().getValues());
 	}
 
 	private Filter<BootDashElement> getFilter(String withLabel) {

eclipse-extensions/org.springframework.ide.eclipse.boot.dash.test/src/org/springframework/ide/eclipse/boot/dash/test/ToggleFiltersModelTest.java

@@ -65,7 +65,6 @@ Export-Package: org.springframework.ide.eclipse.boot.dash,
  org.springframework.ide.eclipse.boot.dash.model,
  org.springframework.ide.eclipse.boot.dash.model.actuator,
  org.springframework.ide.eclipse.boot.dash.model.actuator.env,
- org.springframework.ide.eclipse.boot.dash.model.local,
  org.springframework.ide.eclipse.boot.dash.model.remote,
  org.springframework.ide.eclipse.boot.dash.model.runtargettypes,
  org.springframework.ide.eclipse.boot.dash.util,

eclipse-extensions/org.springframework.ide.eclipse.boot.dash/META-INF/MANIFEST.MF

@@ -117,14 +117,6 @@
                   type="org.springframework.ide.eclipse.boot.dash.model.BootProjectDashElement">
             </input>
          </propertySection>
-         <propertySection
-               class="org.springframework.ide.eclipse.boot.dash.views.properties.LocalCloudServiceGeneralPropertiesSection"
-               id="org.springframework.ide.eclipse.boot.dash.section.LocalCloudServiceGeneral"
-               tab="org.springframework.ide.eclipse.boot.dash.tab.General">
-            <input
-                  type="org.springframework.ide.eclipse.boot.dash.model.LocalCloudServiceDashElement">
-            </input>
-         </propertySection>
          <propertySection
                class="org.springframework.ide.eclipse.boot.dash.views.properties.BeansPropertiesSection"
                id="org.springframework.ide.eclipse.boot.dash.section.BeansSection"

eclipse-extensions/org.springframework.ide.eclipse.boot.dash/plugin.xml

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2016 Pivotal Software, Inc.
+ * Copyright (c) 2015, 2026 Pivotal Software, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,7 +16,6 @@
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.debug.core.ILaunchManager;
-import org.springframework.ide.eclipse.boot.core.cli.BootInstallManager;
 import org.springframework.ide.eclipse.boot.dash.api.RunTargetType;
 import org.springframework.ide.eclipse.boot.dash.di.SimpleDIContext;
 import org.springsource.ide.eclipse.commons.core.pstore.IPropertyStore;
@@ -64,8 +63,6 @@ public abstract class BootDashModelContext {
 	 */
 	public abstract LiveExpression<Pattern> getBootProjectExclusion();
 
-	public abstract BootInstallManager getBootInstallManager();
-
 	public final UserInteractions getUi() {
 		return injections.getBean(UserInteractions.class);
 	}

eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/BootDashModelContext.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2016 Pivotal Software, Inc.
+ * Copyright (c) 2015, 2026 Pivotal Software, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -19,7 +19,6 @@
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunchManager;
 import org.springframework.ide.eclipse.boot.core.BootPreferences;
-import org.springframework.ide.eclipse.boot.core.cli.BootInstallManager;
 import org.springframework.ide.eclipse.boot.dash.BootDashActivator;
 import org.springframework.ide.eclipse.boot.dash.api.RunTargetType;
 import org.springframework.ide.eclipse.boot.dash.console.CloudAppLogManager;
@@ -50,8 +49,6 @@ public class DefaultBootDashModelContext extends BootDashModelContext {
 
 	private IPropertyStore viewProperties = PropertyStores.backedBy(BootDashActivator.getDefault().getPreferenceStore());
 
-	private BootInstallManager bootInstalls = BootInstallManager.getInstance();
-
 	public static BootDashModelContext create() {
 		SimpleDIContext injections = new SimpleDIContext();
 		injections.defInstance(UIContext.class, UIContext.DEFAULT);
@@ -114,9 +111,4 @@ public IPropertyStore getViewProperties() {
 		return viewProperties;
 	}
 
-	@Override
-	public BootInstallManager getBootInstallManager() {
-		return bootInstalls;
-	}
-
 }

eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/DefaultBootDashModelContext.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2017 Pivotal, Inc.
+ * Copyright (c) 2015, 2026 Pivotal, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -40,7 +40,6 @@
 import org.springframework.ide.eclipse.boot.dash.api.Deletable;
 import org.springframework.ide.eclipse.boot.dash.api.RunTargetType;
 import org.springframework.ide.eclipse.boot.dash.devtools.DevtoolsPortRefresher;
-import org.springframework.ide.eclipse.boot.dash.model.local.LocalServicesModel;
 import org.springframework.ide.eclipse.boot.dash.util.LaunchConfRunStateTracker;
 import org.springframework.ide.eclipse.boot.dash.util.LaunchConfigurationTracker;
 import org.springframework.ide.eclipse.boot.dash.views.BootDashModelConsoleManager;
@@ -56,8 +55,6 @@
 import org.springsource.ide.eclipse.commons.livexp.core.AsyncLiveExpression.AsyncMode;
 import org.springsource.ide.eclipse.commons.livexp.core.LiveExpression;
 import org.springsource.ide.eclipse.commons.livexp.core.LiveSetVariable;
-import org.springsource.ide.eclipse.commons.livexp.core.LiveSets;
-import org.springsource.ide.eclipse.commons.livexp.core.LiveVariable;
 import org.springsource.ide.eclipse.commons.livexp.core.ObservableSet;
 import org.springsource.ide.eclipse.commons.livexp.core.ValueListener;
 import org.springsource.ide.eclipse.commons.livexp.util.Log;
@@ -81,7 +78,6 @@ public class LocalBootDashModel extends AbstractBootDashModel implements Deletio
 	final LaunchConfigurationTracker launchConfTracker = new LaunchConfigurationTracker(BootLaunchConfigurationDelegate.TYPE_ID);
 
 	private LiveSetVariable<BootProjectDashElement> applications; //lazy created
-	private ObservableSet<BootDashElement> allElements;
 
 	private BootDashModelConsoleManager consoleManager;
 
@@ -91,11 +87,6 @@ public class LocalBootDashModel extends AbstractBootDashModel implements Deletio
 
 	private IPropertyStore modelStore;
 
-	private LocalServicesModel localServices;
-
-	private LiveVariable<RefreshState> bootAppsRefreshState = new LiveVariable<>(RefreshState.READY);
-
-	private LiveExpression<RefreshState> refreshState;
 	private BundleListener bundleListener;
 
 	public class WorkspaceListener implements ProjectChangeListener, ClasspathListener {
@@ -114,19 +105,6 @@ public void classpathChanged(IJavaProject jp) {
 	public LocalBootDashModel(BootDashModelContext context, BootDashViewModel parent) {
 		super(RunTargets.LOCAL, parent);
 		this.workspace = context.getWorkspace();
-		this.localServices = new LocalServicesModel(getViewModel(), this, context.getBootInstallManager().getDefaultInstallExp());
-		this.refreshState = new LiveExpression<>() {
-			{
-				dependsOn(bootAppsRefreshState);
-				dependsOn(localServices.getRefreshState());
-				addListener((e,v) -> notifyModelStateChanged());
-			}
-
-			@Override
-			protected RefreshState compute() {
-				return RefreshState.merge(bootAppsRefreshState.getValue(), localServices.getRefreshState().getValue());
-			}
-		};
 		this.launchConfElementFactory = new LaunchConfDashElementFactory(this, context.getLaunchManager());
 		this.projectElementFactory = new BootProjectDashElementFactory(this, context.getProjectProperties(), launchConfElementFactory);
 		this.consoleManager = new LocalElementConsoleManager();
@@ -170,12 +148,8 @@ public void bundleChanged(BundleEvent event) {
 	}
 
 	void init() {
-		if (allElements == null) {
+		if (applications == null) {
 			this.applications = new LiveSetVariable<>(AsyncMode.SYNC);
-			this.allElements = LiveSets.union(
-					this.applications,
-					this.localServices.getCloudCliServices()
-			);
 			WorkspaceListener workspaceListener = new WorkspaceListener();
 			this.openCloseListenerManager = new ProjectChangeListenerManager(workspace, workspaceListener);
 			this.classpathListenerManager = new ClasspathListenerManager(workspaceListener);
@@ -272,14 +246,6 @@ public void dispose() {
 			projectExclusion.removeListener(projectExclusionListener);
 			projectExclusionListener=null;
 		}
-		if (localServices != null) {
-			localServices.dispose();
-			localServices = null;
-		}
-		if (allElements != null) {
-			allElements.dispose();
-			allElements = null;
-		}
 		launchConfTracker.dispose();
 		launchConfRunStateTracker.dispose();
 		// Remove bundle listener
@@ -317,12 +283,7 @@ private void doUpdateElementsFromWorkspace() {
 
 	public synchronized ObservableSet<BootDashElement> getElements() {
 		init();
-		return allElements;
-	}
-
-	@Override
-	public ObservableSet<ButtonModel> getButtons() {
-		return localServices.getButtons();
+		return (ObservableSet<BootDashElement>) (ObservableSet<?>) applications;
 	}
 
 	/**
@@ -331,7 +292,6 @@ public ObservableSet<ButtonModel> getButtons() {
 	public void refresh(UserInteractions ui) {
 		updateElementsFromWorkspace();
 		applications.getValue().stream().forEach(e -> e.refreshHasMainMethod());
-		localServices.refresh();
 	}
 
 	@Override
@@ -377,9 +337,4 @@ public String getDeletionConfirmationMessage(Collection<BootDashElement> value)
 	public IPropertyStore getModelStore() {
 		return modelStore;
 	}
-
-	@Override
-	public RefreshState getRefreshState() {
-		return refreshState.getValue();
-	}
 }