Allow Java 9+ to be detected (#1384)

Author: dgolovin

browser/directives/componentPanel.html

@@ -49,7 +49,7 @@
     <span>You have selected
       <ng-repeat ng-repeat="dep in filtered = (item.dependenciesOf | filter: {selectedOption: 'install'} | limitTo:1)">
         <span>{{dep.productName}},</span>
-      </ng-repeat> which requires {{item.productName}} version {{item.minimumVersion}} or higher.</span>
+      </ng-repeat> which requires {{item.productName}} version {{item.minimumVersion}}{{item.orHigher}}.</span>
       <span ng-show="item.messages.dependency !== undefined">
         <span>{{item.messages.dependency.message.split(item.messages.dependency.linkDescription)[0]}}</span>
         <a type="button" class="pointer" ng-click="openUrl(item.messages.dependency.link ? item.messages.dependency.link : item.downloadUrl)">

browser/model/jdk-install.js

@@ -2,7 +2,8 @@
 
 let fs = require('fs-extra');
 let path = require('path');
-var rimraf = require('rimraf');
+let rimraf = require('rimraf');
+let semver = require('semver');
 
 
 import InstallableItem from './installable-item';
@@ -20,6 +21,7 @@ class JdkInstall extends InstallableItem {
     this.sha256 = sha256sum;
     this.minimumVersion = '1.8.0';
     this.openJdkMsi = false;
+    this.orHigher = '';
   }
 
   static get KEY() {
@@ -34,7 +36,7 @@ class JdkInstall extends InstallableItem {
   }
 
   detectExistingInstall() {
-    let versionRegex = /version\s"(\d+\.\d+\.\d+)_.*"/;
+    let versionRegex = /version\s"(.+)".*/;
     let versionRegex1 = /(\d+\.\d+\.\d+).*/;
     let command = 'java -XshowSettings';
     this.addOption('install', versionRegex1.exec(this.version)[1], this.installerDataSvc.jdkDir(), true);
@@ -52,15 +54,11 @@ class JdkInstall extends InstallableItem {
     }).then((output) => {
       return new Promise((resolve, reject) => {
         let version = versionRegex.exec(output);
-        if (version && version.length > 1) {
+        if (version && version.length > 1 && version[1].length > 0) {
           this.addOption('detected', version[1], '', true);
-          this.option['detected'].version = version[1];
           this.selectedOption = 'detected';
           this.validateVersion();
-          if(this.option['detected'].valid) {
-            this.selectedOption = 'detected';
-          }
-          resolve(true);
+          resolve();
         } else {
           reject('No java detected');
         }
@@ -110,15 +108,16 @@ class JdkInstall extends InstallableItem {
   validateVersion() {
     let option = this.option[this.selectedOption];
     if(option) {
+      let v = semver.coerce(option.version);
       option.valid = true;
       option.error = '';
       option.warning = '';
-      if(Version.LT(option.version, this.minimumVersion)) {
+      if(Version.LT(v, this.minimumVersion)) {
         option.valid = false;
         option.error = 'oldVersion';
         option.warning = '';
-      } else if(Version.GT(option.version, this.minimumVersion)) {
-        option.valid = true;
+      } else if(Version.GT(v, this.minimumVersion)) {
+        option.valid = false;
         option.error = '';
         option.warning = 'newerVersion';
       }

browser/model/virtualbox.js

@@ -15,6 +15,7 @@ class VirtualBoxInstall extends InstallableItem {
     super(VirtualBoxInstall.KEY, downloadUrl, fileName, targetFolderName, installerDataSvc, false);
 
     this.minimumVersion = '5.1.12';
+    this.orHigher = ' or higher';
     this.revision = revision;
 
     this.downloadUrl = this.downloadUrl.split('${version}').join(this.version);

test/unit/model/jdk-install-test.js

@@ -77,11 +77,11 @@ describe('JDK installer', function() {
     sandbox.restore();
   });
 
-  function mockDetectedJvm(version, location = 'java.home = /java/home\n') {
+  function mockDetectedJvm(version, location = 'java.home = /java/home\n', buildDate = '2018-03-20') {
     sandbox.stub(JdkInstall.prototype, 'findMsiInstalledJava').resolves('');
     sandbox.stub(JdkInstall.prototype, 'findDarwinJava').resolves('');
     sandbox.stub(Util, 'executeCommand')
-      .onFirstCall().resolves(`version "${version}"`)
+      .onFirstCall().resolves(`version "${version}" ${buildDate}`)
       .onSecondCall().resolves(location);
     sandbox.stub(Util, 'executeFile').resolves('optput');
     sandbox.stub(child_process, 'exec').yields(undefined, 'output');
@@ -139,6 +139,22 @@ describe('JDK installer', function() {
       jdk.validateVersion();
     });
 
+    it('should detect Java 9 and mark it as invalid', function() {
+      mockDetectedJvm('9.0.4.1-redhat');
+      return jdk.detectExistingInstall().then(()=>{
+        expect(jdk.selectedOption).to.be.equal('detected');
+        expect(jdk.option.detected.valid).to.be.equal(false);
+      });
+    });
+
+    it('should detect Java 10 and mark it as invalid', function() {
+      mockDetectedJvm('10');
+      return jdk.detectExistingInstall().then(()=>{
+        expect(jdk.selectedOption).to.be.equal('detected');
+        expect(jdk.option.detected.valid).to.be.equal(false);
+      });
+    });
+
     describe('on windows', function() {
       beforeEach(function() {
         sandbox.stub(Platform, 'getOS').returns('win32');
@@ -168,7 +184,7 @@ describe('JDK installer', function() {
       });
 
       it('should reject openjdk if location for java is not found', function() {
-        mockDetectedJvm('1.8.0', '');
+        mockDetectedJvm('', '');
         return jdk.detectExistingInstall().then(()=> {
           expect(jdk.selectedOption).to.be.equal('install');
         });
@@ -271,7 +287,7 @@ describe('JDK installer', function() {
         mockDetectedJvm('1.9.0_1');
         return jdk.detectExistingInstall().then(()=>{
           expect(jdk.selectedOption).to.be.equal('detected');
-          expect(jdk.option.detected.version).to.be.equal('1.9.0');
+          expect(jdk.option.detected.version).to.be.equal('1.9.0_1');
           Util.executeCommand.rejects();
           return jdk.detectExistingInstall();
         }).then(()=>{