Merge pull request #8 in ~SVATOPLUK.DEDIC_ORACLE.COM/graal from bugfix/installer_upgrade_noreinst to feature/installer_multi_versions

* commit '3d88cff9280198329edde52258c33f0a7aa366a9':
  [GR-15468] Do not reinstall modules into the same installation

Author: sdedic

vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/commands/UpgradeTest.java

@@ -27,9 +27,11 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
 import org.graalvm.component.installer.BundleConstants;
 import org.graalvm.component.installer.CommandTestBase;
 import org.graalvm.component.installer.Commands;
+import org.graalvm.component.installer.ComponentParam;
 import org.graalvm.component.installer.FailedOperationException;
 import org.graalvm.component.installer.Version;
 import org.graalvm.component.installer.model.CatalogContents;
@@ -250,6 +252,36 @@ public void testInstallWithoutCoreUpgrade() throws Exception {
         assertFalse(inst);
     }
 
+    /**
+     * Upgrade command is used to install a new component, but the core is most recent one and need
+     * not to be upgraded. Component must go to the existing install.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testInstallNewWithoutCoreUpgrade() throws Exception {
+        initVersion("1.0.1.0");
+        textParams.add("ruby");
+
+        UpgradeCommand cmd = new UpgradeCommand();
+        cmd.init(this, this);
+        helper = cmd.getProcess();
+
+        ComponentInfo info = cmd.configureProcess();
+        assertNotNull(info);
+        // will not install core
+        assertFalse(helper.installGraalCore(info));
+        assertNull(helper.getTargetInfo());
+
+        // found the current graalvm:
+        assertEquals(getLocalRegistry().getGraalVersion(), info.getVersion());
+        List<ComponentParam> toDownload = helper.allComponents();
+
+        // no component (e.g. migration) was added, requested ruby is in there
+        assertEquals(1, toDownload.size());
+        assertEquals("org.graalvm.ruby", toDownload.get(0).getShortName());
+    }
+
     /**
      * Checks that "gu update r" will only update to a minor update, not to the next major.
      * 

vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/remote/RemoteCatalogDownloaderTest.java

@@ -153,7 +153,7 @@ private void setupJoinedCatalog(String firstPart) throws IOException {
 
     private static ComponentInfo findComponent(ComponentCollection col, String id) {
         Collection<ComponentInfo> infos = col.loadComponents(id, Version.NO_VERSION.match(Version.Match.Type.GREATER), false);
-        return infos == null ? null : infos.iterator().next();
+        return infos == null || infos.isEmpty() ? null : infos.iterator().next();
     }
 
     /**

vm/src/org.graalvm.component.installer/src/org/graalvm/component/installer/commands/Bundle.properties

@@ -275,8 +275,8 @@ UNINSTALL_NativeComponent={0} is a native component, use system tools to remove
 UNINSTALL_CoreComponent={0} is a core component and cannot be uninstalled.
 
 # {0} - the current version
-UPGRADE_NoUpdateFound=No upgrade is found for the version {0}
-UPGRADE_NoUpdateLatestVersion=No upgrade is necessary, {0} is the latest version.
+UPGRADE_NoUpdateFound=No GraalVM VCore upgrade is found for the version {0}
+UPGRADE_NoUpdateLatestVersion=No upgrade of GraalVM core is necessary, {0} is the latest version.
 # {0} - directory where a new installation should be created
 UPGRADE_DirectoryNotWritable=New GraalVM installation cannot be created: directory {0} is not writable.
 # {0} - directory where a new installation should be created

vm/src/org.graalvm.component.installer/src/org/graalvm/component/installer/commands/UpgradeProcess.java

@@ -202,6 +202,7 @@ boolean prepareInstall(ComponentInfo info) throws IOException {
         }
         if (min.compareTo(info.getVersion()) >= 0) {
             feedback.message("UPGRADE_NoUpdateLatestVersion", min);
+            migrated.clear();
             return false;
         }
 
@@ -297,7 +298,7 @@ public ComponentInfo findGraalVersion(Version.Match minimum) throws IOException
         }
         Collection<ComponentInfo> graals = catalog.loadComponents(BundleConstants.GRAAL_COMPONENT_ID,
                         filter, false);
-        if (graals.isEmpty()) {
+        if (graals == null || graals.isEmpty()) {
             return null;
         }
         List<ComponentInfo> versions = new ArrayList<>(graals);
@@ -340,8 +341,12 @@ public ComponentInfo findGraalVersion(Version.Match minimum) throws IOException
             installables = first;
         }
         migrated.clear();
-        migrated.addAll(installables);
-        return targetInfo = result;
+        // if the result GraalVM is identical to current, do not migrate anything.
+        if (result != null && !input.getLocalRegistry().getGraalVersion().equals(result.getVersion())) {
+            migrated.addAll(installables);
+            targetInfo = result;
+        }
+        return result;
     }
 
     public boolean didUpgrade() {