DefaultJdkConfigurator is not component anymore

It's necessary to configure JDK before creating a new project on the new project wizard, so we just trigger this configuration in ProjectSdksModel#reset via ProjectJdkTable#preconfigure. A DefaultJdkConfigurator service now used to detect the best JDK on current system. We could omit this service, but Android Studio wants to disable this.

GitOrigin-RevId: 1ac74ec06d17a571abece70cb4de1ac9bacd940b

Author: amaembo

java/java-impl/src/META-INF/JavaPlugin.xml

@@ -38,13 +38,6 @@
     <xi:fallback/>
   </xi:include>
 
-  <application-components>
-    <component>
-      <implementation-class>com.intellij.openapi.projectRoots.impl.DefaultJdkConfigurator</implementation-class>
-      <headless-implementation-class/>
-    </component>
-  </application-components>
-
   <project-components>
     <component>
       <implementation-class>com.intellij.framework.detection.impl.FrameworkDetectionManager</implementation-class>
@@ -397,6 +390,9 @@
     <projectService serviceInterface="com.intellij.facet.impl.ui.FacetEditorsStateManager"
                     serviceImplementation="com.intellij.facet.impl.ui.FacetEditorsStateManagerImpl"/>
 
+    <applicationService serviceInterface="com.intellij.openapi.projectRoots.DefaultJdkConfigurator"
+                        serviceImplementation="com.intellij.openapi.projectRoots.impl.DefaultJdkConfiguratorImpl"/>
+    
     <applicationService serviceInterface="com.intellij.facet.ui.FacetEditorsFactory"
                         serviceImplementation="com.intellij.facet.impl.ui.FacetEditorsFactoryImpl"/>
 

java/java-impl/src/com/intellij/openapi/projectRoots/DefaultJdkConfigurator.java

@@ -0,0 +1,13 @@
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.intellij.openapi.projectRoots;
+
+import org.jetbrains.annotations.Nullable;
+
+public interface DefaultJdkConfigurator {
+  /**
+   * Guess the best JDK location on this system
+   * 
+   * @return absolute path to JDK home, or null if nothing is found
+   */
+  @Nullable String guessJavaHome();
+}

java/java-impl/src/com/intellij/openapi/projectRoots/impl/DefaultJdkConfigurator.java

@@ -0,0 +1,16 @@
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.intellij.openapi.projectRoots.impl;
+
+import com.intellij.openapi.projectRoots.DefaultJdkConfigurator;
+import com.intellij.openapi.projectRoots.JavaSdk;
+import com.intellij.util.containers.ContainerUtil;
+
+import java.util.Collection;
+
+final class DefaultJdkConfiguratorImpl implements DefaultJdkConfigurator {
+  @Override
+  public String guessJavaHome() {
+    Collection<String> homePaths = JavaSdk.getInstance().suggestHomePaths();
+    return ContainerUtil.getFirstItem(homePaths);
+  }
+}

java/java-impl/src/com/intellij/openapi/projectRoots/impl/DefaultJdkConfiguratorImpl.java

@@ -1,6 +1,8 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.openapi.projectRoots.impl;
 
+import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.WriteAction;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.projectRoots.*;
@@ -12,14 +14,41 @@
 import org.jetbrains.jps.model.java.JdkVersionDetector;
 
 import java.io.File;
+import java.util.List;
 
 public final class JavaAwareProjectJdkTableImpl extends ProjectJdkTableImpl {
+  private static final String DEFAULT_JDK_CONFIGURED = "defaultJdkConfigured";
+
   public static JavaAwareProjectJdkTableImpl getInstanceEx() {
     return (JavaAwareProjectJdkTableImpl)ServiceManager.getService(ProjectJdkTable.class);
   }
 
   private Sdk myInternalJdk;
 
+  @Override
+  public void preconfigure() {
+    PropertiesComponent propertiesComponent = PropertiesComponent.getInstance();
+    if (propertiesComponent.getBoolean(DEFAULT_JDK_CONFIGURED, false) ||
+        ApplicationManager.getApplication().isUnitTestMode()) {
+      return;
+    }
+
+    JavaSdk javaSdk = JavaSdk.getInstance();
+    List<Sdk> jdks = getSdksOfType(javaSdk);
+    if (jdks.isEmpty()) {
+      String homePath = ServiceManager.getService(DefaultJdkConfigurator.class).guessJavaHome(); 
+      if (homePath != null && javaSdk.isValidSdkHome(homePath)) {
+        String suggestedName = JdkUtil.suggestJdkName(javaSdk.getVersionString(homePath));
+        if (suggestedName != null) {
+          ApplicationManager.getApplication().runWriteAction(
+            () -> addJdk(javaSdk.createJdk(suggestedName, homePath, false))
+          );
+        }
+      }
+    }
+    propertiesComponent.setValue(DEFAULT_JDK_CONFIGURED, true);
+  }
+
   /**
    * @deprecated Bundled JDK must not be used. See IDEA-225960"
    */

java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaAwareProjectJdkTableImpl.java

@@ -95,7 +95,9 @@ public void syncSdks() {
 
   public void reset(@Nullable Project project) {
     myProjectSdks.clear();
-    final Sdk[] projectSdks = ProjectJdkTable.getInstance().getAllJdks();
+    ProjectJdkTable jdkTable = ProjectJdkTable.getInstance();
+    jdkTable.preconfigure();
+    final Sdk[] projectSdks = jdkTable.getAllJdks();
     for (Sdk sdk : projectSdks) {
       try {
         Sdk editable = (Sdk)sdk.clone();

platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectSdksModel.java

@@ -85,5 +85,12 @@ public static class Adapter implements Listener {
   @NotNull
   public abstract Sdk createSdk(@NotNull String name, @NotNull SdkTypeId sdkType);
 
+  /**
+   * This method may automatically detect Sdk if none are configured.
+   */
+  public void preconfigure() {
+    
+  }
+
   public static final Topic<Listener> JDK_TABLE_TOPIC = Topic.create("Project JDK table", Listener.class);
 }