#1309: Improve plugin managment

cli/src/main/java/com/devonfw/tools/ide/tool/PluginBasedCommandlet.java

@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -68,8 +69,20 @@ private void loadPluginsFromDirectory(Map<String, PluginDescriptor> map, Path pl
  if (filename.endsWith(IdeContext.EXT_PROPERTIES) && Files.exists(child)) {
  PluginDescriptor descriptor = PluginDescriptorImpl.of(child, this.context, isPluginUrlNeeded());
 
- // Priority to user-specific plugins
- map.put(descriptor.getName(), descriptor);
+ // Check if plugin with same id exists
+ boolean pluginExists = map.values().stream()
+ .anyMatch(existingDescriptor -> existingDescriptor.getId().equals(descriptor.getId()));
+
+ if (pluginExists) {
+ // Plugin with same id already exists, overwrite it
+ map.entrySet().stream()
+ .filter(entry -> entry.getValue().getId().equals(descriptor.getId()))
+ .findFirst()
+ .ifPresent(entry -> entry.setValue(descriptor));
+ } else {
+ // Plugin does not exist, add it normally to the map
+ map.put(descriptor.getName(), descriptor);
+ }
  }
  }
  } catch (IOException e) {
@@ -146,7 +159,7 @@ public void uninstallPlugin(PluginDescriptor plugin) {
 
  /**
  * @param key the filename of the properties file configuring the requested plugin (typically excluding the
- *  ".properties" extension).
+ * ".properties" extension).
  * @return the {@link PluginDescriptor} for the given {@code key}.
  */
  public PluginDescriptor getPlugin(String key) {
@@ -191,7 +204,7 @@ protected boolean doInstall(boolean silent) {
 
  /**
  * @param plugin the in{@link PluginDescriptor#isActive() active} {@link PluginDescriptor} that is skipped for regular
- *  plugin installation.
+ * plugin installation.
  */
  protected void handleInstall4InactivePlugin(PluginDescriptor plugin) {
 

cli/src/test/java/com/devonfw/tools/ide/tool/PluginBasedCommandletTest.java

@@ -1,30 +1,24 @@
 package com.devonfw.tools.ide.tool;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.junit.jupiter.api.Test;
-
-import com.devonfw.tools.ide.common.Tag;
 import com.devonfw.tools.ide.context.AbstractIdeContextTest;
 import com.devonfw.tools.ide.context.IdeTestContext;
 import com.devonfw.tools.ide.tool.ide.PluginDescriptor;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Test of {@link PluginBasedCommandlet}.
  */
 public class PluginBasedCommandletTest extends AbstractIdeContextTest {
 
- @Test
- void testGetPluginsMap() {
-
- IdeTestContext context = newContext(PROJECT_BASIC, "", true);
- String tool = "eclipse";
- Set<Tag> tags = null;
- ExamplePluginBasedCommandlet pluginBasedCommandlet = new ExamplePluginBasedCommandlet(context, tool, tags);
+ public IdeTestContext context = newContext(PROJECT_BASIC, "", true);
+ public ExamplePluginBasedCommandlet pluginBasedCommandlet = new ExamplePluginBasedCommandlet(context, "eclipse", null);
 
+ @Test
+ void testGetPluginsMap() {
  Map<String, PluginDescriptor> pluginsMap = pluginBasedCommandlet.getPluginsMap();
  assertThat(pluginsMap).isNotNull();
 
@@ -40,6 +34,12 @@ void testGetPluginsMap() {
  assertThat(plugin2.getName()).isEqualTo("anyedit");
 
  // Check if anyedit plugin has value "false" --> value from user directory
- assertThat(plugin2.isActive()).isFalse();
+ assertFalse(plugin2.isActive());
+
+ assertFalse(pluginsMap.containsKey("anyedit2"));
+
+ assertEquals(2, pluginsMap.size());
  }
+
+
 }