IJPL-797 intellij.platform.externalProcessAuthHelper review internal API

GitOrigin-RevId: e42ed29f117d69ed0baa1e5e7e2c86a06b0b5146

platform/external-process-auth-helper/api-dump.txt

@@ -11,20 +11,16 @@ e:com.intellij.externalProcessAuthHelper.AuthenticationMode
 - s:valueOf(java.lang.String):com.intellij.externalProcessAuthHelper.AuthenticationMode
 - s:values():com.intellij.externalProcessAuthHelper.AuthenticationMode[]
 f:com.intellij.externalProcessAuthHelper.ExternalProcessAuthHelperBundle
-- sf:BUNDLE:java.lang.String
 - s:message(java.lang.String,java.lang.Object[]):java.lang.String
 - s:messagePointer(java.lang.String,java.lang.Object[]):java.util.function.Supplier
 a:com.intellij.externalProcessAuthHelper.ExternalProcessHandlerService
-- sf:Companion:com.intellij.externalProcessAuthHelper.ExternalProcessHandlerService$Companion
 - <init>(java.lang.String,java.lang.Class):V
 - f:getCallbackScriptPath(java.lang.String,com.intellij.externalProcessAuthHelper.ScriptGenerator,Z):java.io.File
 - f:getIdePort():I
 - pa:handleRequest(externalApp.ExternalAppHandler,java.lang.String):java.lang.String
 - f:registerHandler(externalApp.ExternalAppHandler,com.intellij.openapi.Disposable):java.util.UUID
-f:com.intellij.externalProcessAuthHelper.ExternalProcessHandlerService$Companion
 a:com.intellij.externalProcessAuthHelper.ExternalProcessRest
 - org.jetbrains.ide.RestService
-- sf:Companion:com.intellij.externalProcessAuthHelper.ExternalProcessRest$Companion
 - <init>(java.lang.String):V
 - execute(io.netty.handler.codec.http.QueryStringDecoder,io.netty.handler.codec.http.FullHttpRequest,io.netty.channel.ChannelHandlerContext):java.lang.String
 - pa:getExternalProcessHandler():com.intellij.externalProcessAuthHelper.ExternalProcessHandlerService
@@ -32,7 +28,6 @@ a:com.intellij.externalProcessAuthHelper.ExternalProcessRest
 - p:getRequesterId(io.netty.handler.codec.http.QueryStringDecoder,io.netty.handler.codec.http.FullHttpRequest,io.netty.channel.ChannelHandlerContext):java.lang.Object
 - p:getServiceName():java.lang.String
 - p:isMethodSupported(io.netty.handler.codec.http.HttpMethod):Z
-f:com.intellij.externalProcessAuthHelper.ExternalProcessRest$Companion
 f:com.intellij.externalProcessAuthHelper.NativeSshAuthService
 - com.intellij.externalProcessAuthHelper.ExternalProcessHandlerService
 - sf:Companion:com.intellij.externalProcessAuthHelper.NativeSshAuthService$Companion
@@ -40,19 +35,13 @@ f:com.intellij.externalProcessAuthHelper.NativeSshAuthService
 - sf:getInstance():com.intellij.externalProcessAuthHelper.NativeSshAuthService
 f:com.intellij.externalProcessAuthHelper.NativeSshAuthService$Companion
 - f:getInstance():com.intellij.externalProcessAuthHelper.NativeSshAuthService
-f:com.intellij.externalProcessAuthHelper.NativeSshExternalProcessRest
-- com.intellij.externalProcessAuthHelper.ExternalProcessRest
-- <init>():V
 f:com.intellij.externalProcessAuthHelper.NativeSshGuiAuthenticator
 - externalApp.nativessh.NativeSshAskPassAppHandler
-- sf:Companion:com.intellij.externalProcessAuthHelper.NativeSshGuiAuthenticator$Companion
 - <init>(com.intellij.openapi.project.Project,com.intellij.externalProcessAuthHelper.AuthenticationGate,com.intellij.externalProcessAuthHelper.AuthenticationMode,Z):V
 - handleInput(java.lang.String):java.lang.String
-f:com.intellij.externalProcessAuthHelper.NativeSshGuiAuthenticator$Companion
 f:com.intellij.externalProcessAuthHelper.PassthroughAuthenticationGate
 - com.intellij.externalProcessAuthHelper.AuthenticationGate
 - sf:Companion:com.intellij.externalProcessAuthHelper.PassthroughAuthenticationGate$Companion
-- <init>():V
 - cancel():V
 - sf:getInstance():com.intellij.externalProcessAuthHelper.PassthroughAuthenticationGate
 - getSavedInput(java.lang.String):java.lang.String
@@ -76,6 +65,5 @@ c:com.intellij.externalProcessAuthHelper.ScriptGeneratorImpl
 - commandLine(java.lang.Class,Z):java.lang.String
 - p:getJavaExecutablePath():java.lang.String
 f:com.intellij.externalProcessAuthHelper.ScriptGeneratorUtil
-- <init>():V
 - s:createTempScript(java.lang.String,java.lang.String,Z):java.io.File
 - s:getJarFileFor(java.lang.Class):java.io.File

platform/external-process-auth-helper/src/externalProcessAuthHelper/AuthenticationGates.kt

@@ -47,7 +47,7 @@ class RestrictingAuthenticationGate : AuthenticationGate {
   }
 }
 
-class PassthroughAuthenticationGate : AuthenticationGate {
+class PassthroughAuthenticationGate private constructor() : AuthenticationGate {
   override fun <T> waitAndCompute(operation: Supplier<T>): T {
     return operation.get()
   }

platform/external-process-auth-helper/src/externalProcessAuthHelper/ExternalProcessAuthHelperBundle.java

@@ -10,7 +10,7 @@ import org.jetbrains.annotations.PropertyKey;
 import java.util.function.Supplier;
 
 public final class ExternalProcessAuthHelperBundle {
-  public static final @NonNls String BUNDLE = "messages.ExternalProcessAuthHelperBundle";
+  private static final @NonNls String BUNDLE = "messages.ExternalProcessAuthHelperBundle";
   private static final DynamicBundle INSTANCE = new DynamicBundle(ExternalProcessAuthHelperBundle.class, BUNDLE);
 
   private ExternalProcessAuthHelperBundle() {}

platform/external-process-auth-helper/src/externalProcessAuthHelper/ExternalProcessHandlerService.kt

@@ -39,9 +39,6 @@ abstract class ExternalProcessHandlerService<T : ExternalAppHandler>(
   private val scriptNamePrefix: @NonNls String,
   private val scriptMainClass: Class<out ExternalApp>
 ) {
-  companion object {
-    private val LOG = logger<ExternalProcessHandlerService<*>>()
-  }
 
   private val scriptPaths = HashMap<@NonNls String, File>()
   private val SCRIPT_FILE_LOCK = Any()
@@ -86,7 +83,7 @@ abstract class ExternalProcessHandlerService<T : ExternalAppHandler>(
   private fun unregisterHandler(key: UUID) {
     val handler = handlers.remove(key)
     if (handler == null) {
-      LOG.error("The handler $key is not registered")
+      LOG_SERVICE.error("The handler $key is not registered")
     }
   }
 
@@ -105,9 +102,6 @@ abstract class ExternalProcessHandlerService<T : ExternalAppHandler>(
 abstract class ExternalProcessRest<T : ExternalAppHandler>(
   private val entryPointName: @NonNls String
 ) : RestService() {
-  companion object {
-    private val LOG = logger<ExternalProcessRest<*>>()
-  }
 
   protected abstract val externalProcessHandler: ExternalProcessHandlerService<T>
 
@@ -145,7 +139,7 @@ abstract class ExternalProcessRest<T : ExternalAppHandler>(
           channel.close()
         }
         else {
-          LOG.warn(Throwable(err))
+          LOG_REST.warn(Throwable(err))
           sendStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR, false, channel)
         }
       }
@@ -166,4 +160,8 @@ abstract class ExternalProcessRest<T : ExternalAppHandler>(
 
   private fun runHandler(indicator: EmptyProgressIndicator, uuid: UUID, bodyContent: String): String? =
     ProgressManager.getInstance().runProcess(Computable { externalProcessHandler.invokeHandler(uuid, bodyContent) }, indicator)
-}
+}
+
+private val LOG_SERVICE = logger<ExternalProcessHandlerService<*>>()
+
+private val LOG_REST = logger<ExternalProcessRest<*>>()

platform/external-process-auth-helper/src/externalProcessAuthHelper/NativeSshAuthService.kt

@@ -21,7 +21,7 @@ class NativeSshAuthService : ExternalProcessHandlerService<NativeSshAskPassAppHa
   }
 }
 
-class NativeSshExternalProcessRest : ExternalProcessRest<NativeSshAskPassAppHandler>(
+internal class NativeSshExternalProcessRest : ExternalProcessRest<NativeSshAskPassAppHandler>(
   NativeSshAskPassAppHandler.ENTRY_POINT_NAME
 ) {
   override val externalProcessHandler: ExternalProcessHandlerService<NativeSshAskPassAppHandler> get() = NativeSshAuthService.getInstance()

platform/external-process-auth-helper/src/externalProcessAuthHelper/NativeSshGuiAuthenticator.kt

@@ -21,7 +21,7 @@ class NativeSshGuiAuthenticator(private val project: Project,
                                 private val authenticationGate: AuthenticationGate,
                                 private val authenticationMode: AuthenticationMode,
                                 private val doNotRememberPasswords: Boolean) : NativeSshAskPassAppHandler {
-  companion object {
+  private companion object {
     private val LOG = logger<NativeSshGuiAuthenticator>()
   }
 

platform/external-process-auth-helper/src/externalProcessAuthHelper/ScriptGeneratorUtil.java

@@ -11,6 +11,9 @@ import java.io.File;
 import java.io.IOException;
 
 public final class ScriptGeneratorUtil {
+
+  private ScriptGeneratorUtil() { }
+
   @NotNull
   private static File createBatchScript(@NotNull @NonNls String fileName, @NotNull @NonNls String commandLine) throws IOException {
     String batchScriptText = "@echo off" + "\n" + commandLine + " %*\n";