#479: android studio plugin support (#529)

Author: slskiba

cli/src/main/java/com/devonfw/tools/ide/os/MacOsHelper.java

@@ -10,6 +10,7 @@
 import com.devonfw.tools.ide.context.IdeContext;
 import com.devonfw.tools.ide.io.FileAccess;
 import com.devonfw.tools.ide.log.IdeLogger;
+import com.devonfw.tools.ide.repo.ToolRepository;
 import com.devonfw.tools.ide.tool.ToolCommandlet;
 
 /**
@@ -51,6 +52,15 @@ public MacOsHelper(FileAccess fileAccess, SystemInfo systemInfo, IdeLogger logge
     this.logger = logger;
   }
 
+  /**
+   * @param rootDir the {@link Path} to the root directory.
+   * @return the path to the app directory.
+   */
+  public Path findAppDir(Path rootDir) {
+    return this.fileAccess.findFirst(rootDir,
+        p -> p.getFileName().toString().endsWith(".app") && Files.isDirectory(p), false);
+  }
+
   /**
    * @param rootDir the {@link Path} to the root directory.
    * @param tool the name of the tool to find the link directory for.
@@ -65,8 +75,7 @@ public Path findLinkDir(Path rootDir, String tool) {
     if (Files.isDirectory(contentsDir)) {
       return findLinkDir(contentsDir, rootDir, tool);
     }
-    Path appDir = this.fileAccess.findFirst(rootDir,
-        p -> p.getFileName().toString().endsWith(".app") && Files.isDirectory(p), false);
+    Path appDir = findAppDir(rootDir);
     if (appDir != null) {
       contentsDir = appDir.resolve(IdeContext.FOLDER_CONTENTS);
       if (Files.isDirectory(contentsDir)) {
@@ -84,7 +93,8 @@ public Path findLinkDir(Path rootDir, String tool) {
    * @return a {@link String}
    */
   public Path findRootToolPath(ToolCommandlet commandlet, IdeContext context) {
-    return context.getSoftwareRepositoryPath().resolve("default").resolve(commandlet.getName()).resolve(commandlet.getName())
+    return context.getSoftwareRepositoryPath().resolve(ToolRepository.ID_DEFAULT).resolve(commandlet.getName())
+        .resolve(commandlet.getInstalledEdition().toString())
         .resolve(commandlet.getInstalledVersion().toString());
   }
 

cli/src/main/java/com/devonfw/tools/ide/tool/androidstudio/AndroidStudio.java

@@ -9,6 +9,7 @@
 import com.devonfw.tools.ide.environment.EnvironmentVariablesType;
 import com.devonfw.tools.ide.process.ProcessMode;
 import com.devonfw.tools.ide.tool.ide.IdeToolCommandlet;
+import com.devonfw.tools.ide.tool.ide.IdeaBasedPluginInstaller;
 import com.devonfw.tools.ide.tool.ide.PluginDescriptor;
 import com.devonfw.tools.ide.version.VersionIdentifier;
 
@@ -66,6 +67,9 @@ protected void postInstall() {
 
   @Override
   public void installPlugin(PluginDescriptor plugin) {
-    // TODO: needs to be implemented see: https://github.com/devonfw/IDEasy/issues/433
+
+    IdeaBasedPluginInstaller pluginInstaller = new IdeaBasedPluginInstaller(context, this);
+    String downloadUrl = pluginInstaller.getDownloadUrl(plugin);
+    pluginInstaller.installPlugin(plugin, downloadUrl);
   }
 }

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

@@ -234,5 +234,4 @@ protected void configureWorkspace() {
     this.context.step("Configuring workspace {} for IDE {}", ideWorkspacePath.getFileName(), this.tool);
     this.context.getWorkspaceMerger().merge(setupFolder, updateFolder, this.context.getVariables(), ideWorkspacePath);
   }
-
 }

cli/src/main/java/com/devonfw/tools/ide/tool/intellij/IntellijPluginInstaller.java renamed to cli/src/main/java/com/devonfw/tools/ide/tool/ide/IdeaBasedPluginInstaller.java

@@ -1,29 +1,27 @@
-package com.devonfw.tools.ide.tool.intellij;
+package com.devonfw.tools.ide.tool.ide;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
 import com.devonfw.tools.ide.context.IdeContext;
 import com.devonfw.tools.ide.os.MacOsHelper;
-import com.devonfw.tools.ide.tool.ide.IdeToolCommandlet;
-import com.devonfw.tools.ide.tool.ide.PluginDescriptor;
-import com.devonfw.tools.ide.tool.ide.PluginInstaller;
 
 /**
- * Plugin Installer for {@link Intellij}.
+ * Manager class to install plugins for the {@link IdeToolCommandlet commandlet}.
  */
-public class IntellijPluginInstaller extends PluginInstaller {
+public class IdeaBasedPluginInstaller extends PluginInstaller {
 
   private static final String BUILD_FILE = "build.txt";
 
   /**
-   * The constructor.
+   * The constructor
    *
    * @param context the {@link IdeContext}.
-   * @param commandlet the {@link IdeToolCommandlet}
+   * @param commandlet the {@link IdeToolCommandlet commandlet}.
    */
-  public IntellijPluginInstaller(IdeContext context, IdeToolCommandlet commandlet) {
+  public IdeaBasedPluginInstaller(IdeContext context, IdeToolCommandlet commandlet) {
+
     super(context, commandlet);
   }
 
@@ -47,23 +45,14 @@ private String readBuildVersion() {
     Path buildFile = commandlet.getToolPath().resolve(BUILD_FILE);
     if (context.getSystemInfo().isMac()) {
       MacOsHelper macOsHelper = new MacOsHelper(context);
-      Path rootToolPath = macOsHelper.findRootToolPath(this.commandlet, context);
-      buildFile = rootToolPath.resolve("IntelliJ IDEA" + generateMacEditionString() + ".app").resolve("Contents/Resources").resolve(BUILD_FILE);
+      Path appPath = macOsHelper.findAppDir(macOsHelper.findRootToolPath(this.commandlet, context));
+      buildFile = appPath.resolve("Contents/Resources").resolve(BUILD_FILE);
     }
     try {
       return Files.readString(buildFile);
     } catch (IOException e) {
-      throw new IllegalStateException("Failed to read IntelliJ build version: " + buildFile, e);
-    }
-  }
-
-  private String generateMacEditionString() {
-
-    String edition = "";
-    if (commandlet.getConfiguredEdition().equals("intellij")) {
-      edition = " CE";
+      throw new IllegalStateException("Failed to read " + commandlet.getName() + " build version: " + buildFile, e);
     }
-    return edition;
   }
 
 }

cli/src/main/java/com/devonfw/tools/ide/tool/intellij/Intellij.java

@@ -9,6 +9,7 @@
 import com.devonfw.tools.ide.environment.EnvironmentVariablesType;
 import com.devonfw.tools.ide.process.ProcessMode;
 import com.devonfw.tools.ide.tool.ide.IdeToolCommandlet;
+import com.devonfw.tools.ide.tool.ide.IdeaBasedPluginInstaller;
 import com.devonfw.tools.ide.tool.ide.PluginDescriptor;
 import com.devonfw.tools.ide.tool.java.Java;
 import com.devonfw.tools.ide.version.VersionIdentifier;
@@ -73,14 +74,8 @@ protected void postInstall() {
   @Override
   public void installPlugin(PluginDescriptor plugin) {
 
-    IntellijPluginInstaller pluginInstaller = this.getPluginInstaller();
+    IdeaBasedPluginInstaller pluginInstaller = new IdeaBasedPluginInstaller(context, this);
     String downloadUrl = pluginInstaller.getDownloadUrl(plugin);
     pluginInstaller.installPlugin(plugin, downloadUrl);
   }
-
-  @Override
-  public IntellijPluginInstaller getPluginInstaller() {
-    return new IntellijPluginInstaller(context, this);
-  }
-
 }

cli/src/test/java/com/devonfw/tools/ide/io/IdeProgressBarTest.java

@@ -25,6 +25,7 @@ public class IdeProgressBarTest extends AbstractIdeContextTest {
    * Tests if a download of a file with a valid content length was displaying an {@link IdeProgressBar} properly.
    *
    * @param tempDir temporary directory to use.
+   * @param wmRuntimeInfo wireMock server on a random port
    */
   @Test
   public void testProgressBarDownloadWithValidContentLength(@TempDir Path tempDir, WireMockRuntimeInfo wmRuntimeInfo) {

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

@@ -34,6 +34,7 @@ public class UrlUpdaterTest extends AbstractUrlUpdaterTest {
    * Tests if the {@link com.devonfw.tools.ide.url.updater.UrlUpdater} can automatically add a missing OS (in this case the linux_x64)
    *
    * @param tempDir Temporary directory
+   * @param wmRuntimeInfo wireMock server on a random port
    * @throws IOException test fails
    */
   @Test
@@ -99,6 +100,7 @@ public void testUrlUpdaterIsNotUpdatingWhenStatusManualIsTrue(@TempDir Path temp
    * See: <a href="https://github.com/devonfw/ide/issues/1343">#1343</a> for reference.
    *
    * @param tempDir Temporary directory
+   * @param wmRuntimeInfo wireMock server on a random port
    */
   @Test
   public void testUrlUpdaterStatusJsonRefreshBugStillExisting(@TempDir Path tempDir, WireMockRuntimeInfo wmRuntimeInfo) {
@@ -172,6 +174,7 @@ public void testUrlUpdaterStatusJsonRefreshBugStillExisting(@TempDir Path tempDi
    * See: <a href="https://github.com/devonfw/ide/issues/1343">#1343</a> for reference.
    *
    * @param tempDir Temporary directory
+   * @param wmRuntimeInfo wireMock server on a random port
    */
   @Test
   public void testUrlUpdaterWithTextContentTypeWillNotCreateStatusJson(@TempDir Path tempDir, WireMockRuntimeInfo wmRuntimeInfo) {

cli/src/test/java/com/devonfw/tools/ide/tool/androidstudio/AndroidStudioTest.java

@@ -1,31 +1,47 @@
 package com.devonfw.tools.ide.tool.androidstudio;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.any;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
 import com.devonfw.tools.ide.context.AbstractIdeContextTest;
 import com.devonfw.tools.ide.context.IdeTestContext;
 import com.devonfw.tools.ide.os.SystemInfo;
 import com.devonfw.tools.ide.os.SystemInfoMock;
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
+import com.github.tomakehurst.wiremock.junit5.WireMockTest;
 
 /**
  * Test class for {@link AndroidStudio Android Studio IDE} tests.
  */
+@WireMockTest
 public class AndroidStudioTest extends AbstractIdeContextTest {
 
   private static final String ANDROID_STUDIO = "android-studio";
+  private static final String MOCKED_PLUGIN_JAR = "mocked-plugin.jar";
 
   private final IdeTestContext context = newContext(ANDROID_STUDIO);
 
   /**
    * Tests if {@link AndroidStudio Android Studio IDE} can be installed.
    *
    * @param os String of the OS to use.
+   * @param wmRuntimeInfo wireMock server on a random port
    */
   @ParameterizedTest
   @ValueSource(strings = { "windows", "mac", "linux" })
-  public void testAndroidStudioInstall(String os) {
+  public void testAndroidStudioInstall(String os, WireMockRuntimeInfo wmRuntimeInfo) throws IOException {
     // arrange
+    setupMockedPlugin(wmRuntimeInfo);
     SystemInfo systemInfo = SystemInfoMock.of(os);
     this.context.setSystemInfo(systemInfo);
     AndroidStudio commandlet = new AndroidStudio(this.context);
@@ -41,11 +57,13 @@ public void testAndroidStudioInstall(String os) {
    * Tests if {@link AndroidStudio Android Studio IDE} can be run.
    *
    * @param os String of the OS to use.
+   * @param wmRuntimeInfo wireMock server on a random port
    */
   @ParameterizedTest
   @ValueSource(strings = { "windows", "mac", "linux" })
-  public void testAndroidStudioRun(String os) {
+  public void testAndroidStudioRun(String os, WireMockRuntimeInfo wmRuntimeInfo) throws IOException {
     // arrange
+    setupMockedPlugin(wmRuntimeInfo);
     SystemInfo systemInfo = SystemInfoMock.of(os);
     this.context.setSystemInfo(systemInfo);
     AndroidStudio commandlet = new AndroidStudio(this.context);
@@ -64,6 +82,22 @@ private void checkInstallation(IdeTestContext context) {
     assertThat(context.getSoftwarePath().resolve("android-studio/.ide.software.version")).exists().hasContent("2024.1.1.1");
     assertThat(context.getVariables().get("STUDIO_PROPERTIES")).isEqualTo(context.getWorkspacePath().resolve("studio.properties").toString());
     assertThat(context).logAtSuccess().hasMessage("Successfully installed android-studio in version 2024.1.1.1");
+    assertThat(context).logAtSuccess().hasMessage("Install plugin: mockedPlugin");
+    assertThat(context.getPluginsPath().resolve("android-studio").resolve("mockedPlugin").resolve("MockedClass.class")).exists();
   }
 
+  private void setupMockedPlugin(WireMockRuntimeInfo wmRuntimeInfo) throws IOException {
+
+    String content = "plugin_id=mockedPlugin\nplugin_active=true\nplugin_url=" + wmRuntimeInfo.getHttpBaseUrl() + "/mockedPlugin";
+    Files.write(this.context.getSettingsPath().resolve("android-studio").resolve("plugins").resolve("MockedPlugin.properties"),
+        content.getBytes(StandardCharsets.UTF_8));
+
+    Path mockedPlugin = this.context.getIdeRoot().resolve("repository").resolve(MOCKED_PLUGIN_JAR);
+    byte[] contentBytes = Files.readAllBytes(mockedPlugin);
+    int contentLength = contentBytes.length;
+
+    stubFor(any(urlEqualTo("/mockedPlugin")).willReturn(
+        aResponse().withStatus(200).withHeader("Content-Type", "application/java-archive").withHeader("Content-Length", String.valueOf(contentLength))
+            .withBody(contentBytes)));
+  }
 }

cli/src/test/java/com/devonfw/tools/ide/tool/intellij/IntellijTest.java

@@ -34,6 +34,7 @@ public class IntellijTest extends AbstractIdeContextTest {
    * Tests if the {@link Intellij} can be installed properly.
    *
    * @param os String of the OS to use.
+   * @param wmRuntimeInfo wireMock server on a random port
    * @throws IOException if reading the content of the mocked plugin fails
    */
   @ParameterizedTest

cli/src/test/java/com/devonfw/tools/ide/tool/pip/PipUrlUpdaterTest.java

@@ -30,6 +30,7 @@ public class PipUrlUpdaterTest extends AbstractUrlUpdaterTest {
    * See: <a href="https://github.com/devonfw/ide/issues/1343">#1343</a> for reference.
    *
    * @param tempDir Temporary directory
+   * @param wmRuntimeInfo wireMock server on a random port
    */
   @Test
   public void testPipUrlUpdaterWithTextContentTypeWillSucceed(@TempDir Path tempDir, WireMockRuntimeInfo wmRuntimeInfo) {