Merge branch 'develop.next' into resolve-conflicts

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/src/com/microsoft/azure/toolkit/eclipse/functionapp/logstreaming/FunctionAppLogStreamingHandler.java

@@ -66,7 +66,7 @@ public static void startLogStreaming(final FunctionAppBase<?, ?, ?> functionApp)
         }
     }
 
-    // Refers https://github.com/microsoft/vscode-azurefunctions/blob/v0.22.0/src/
+    // Refers https://github.com/microsoft/vscode-azurefunctions/blob/v0.22.0.JAVA17/src/
     // commands/logstream/startStreamingLogs.ts#L53
     private static void openLiveMetricsStream(final FunctionAppBase<?, ?, ?> functionApp) throws IOException {
         final String aiKey = functionApp.getAppSettings().get(APPINSIGHTS_INSTRUMENTATIONKEY);

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceStreamingLogManager.java

@@ -189,7 +189,7 @@ public Flux<String> getStreamingLogContent() {
             return functionApp.streamAllLogsAsync();
         }
 
-        // Refers https://github.com/microsoft/vscode-azurefunctions/blob/v0.22.0/src/
+        // Refers https://github.com/microsoft/vscode-azurefunctions/blob/v0.22.0.JAVA17/src/
         // commands/logstream/startStreamingLogs.ts#L53
         private void openLiveMetricsStream() {
             final String aiKey = Optional.ofNullable(functionApp.getAppSettings()).map(settings -> settings.get(APPINSIGHTS_INSTRUMENTATIONKEY)).orElse(null);

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-vm/src/main/java/com/microsoft/azure/toolkit/intellij/vm/runtarget/AzureVmTargetType.java

@@ -125,7 +125,7 @@ public TargetEnvironmentRequest createEnvironmentRequest(@Nonnull Project projec
     }
 
     @Override
-    public @NotNull <T extends Component> ActionListener createBrowser(@NotNull Project project, @NlsContexts.DialogTitle String title, @NotNull TextComponentAccessor<T> textComponentAccessor, @NotNull T component, @NotNull Supplier<TargetEnvironmentConfiguration> configurationSupplier) {
+    public @NotNull <T extends Component> ActionListener createBrowser(@NotNull Project project, @NlsContexts.DialogTitle String title, @NotNull TextComponentAccessor<T> textComponentAccessor, @NotNull T component, @NotNull Supplier<? extends TargetEnvironmentConfiguration> configurationSupplier) {
         return new ActionListener() {
             public final void actionPerformed(ActionEvent it) {
                 final TargetEnvironmentConfiguration configuration = configurationSupplier.get();

PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id "org.jetbrains.intellij" version "1.5.2"
-    id "org.jetbrains.kotlin.jvm" version "1.6.10"
+    id "org.jetbrains.intellij" version "1.6.0"
+    id "org.jetbrains.kotlin.jvm" version "1.6.21"
     id "de.undercouch.download" version "4.1.1"
     id "com.github.ben-manes.versions" version "0.39.0"
     id "io.freefair.aspectj.post-compile-weaving" version "6.0.0-m2"

PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties

@@ -1,14 +1,14 @@
 pluginVersion=3.68.0
-intellijDisplayVersion=2022.1
+intellijDisplayVersion=2022.2
 needPatchVersion=true
 javaVersion=11
 org.gradle.jvmargs='-Duser.language=en'
 sources=true
-intellij_version=IU-2022.1
-dep_plugins=org.intellij.scala:2022.1.4
+intellij_version=IU-2022.2
+dep_plugins=org.intellij.scala:2022.2.3
 applicationinsights.key=57cc111a-36a8-44b3-b044-25d293b8b77c
 updateVersionRange=true
-patchPluginXmlSinceBuild=221.4165.146
+patchPluginXmlSinceBuild=222.2680.4
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.daemon=true

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/azure/core/implementation/ReflectionUtils.java

@@ -0,0 +1,40 @@
+package com.azure.core.implementation;
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+import java.lang.invoke.MethodHandles;
+import java.security.AccessController;
+import java.security.PrivilegedExceptionAction;
+
+final class ReflectionUtils implements ReflectionUtilsApi {
+    private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
+    private static final Module CORE_MODULE = ReflectionUtils.class.getModule();
+
+    public MethodHandles.Lookup getLookupToUse(Class<?> targetClass) throws Exception {
+        Module responseModule = targetClass.getModule();
+        if (!responseModule.isNamed()) {
+            CORE_MODULE.addReads(responseModule);
+            return performSafePrivateLookupIn(targetClass);
+        } else if (responseModule == CORE_MODULE) {
+            return LOOKUP;
+        } else if (!responseModule.isOpen(targetClass.getPackageName()) && !responseModule.isOpen(targetClass.getPackageName(), CORE_MODULE)) {
+            return MethodHandles.publicLookup();
+        } else {
+            CORE_MODULE.addReads(responseModule);
+            return performSafePrivateLookupIn(targetClass);
+        }
+    }
+
+    public int getJavaImplementationMajorVersion() {
+        return 9;
+    }
+
+    private static MethodHandles.Lookup performSafePrivateLookupIn(Class<?> targetClass) throws Exception {
+        return System.getSecurityManager() == null ? MethodHandles.privateLookupIn(targetClass, LOOKUP) : (MethodHandles.Lookup) AccessController.doPrivileged((PrivilegedExceptionAction<MethodHandles.Lookup>) () -> MethodHandles.privateLookupIn(targetClass, LOOKUP));
+    }
+
+    ReflectionUtils() {
+    }
+}

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/intellij/AzureActionsListener.java

@@ -5,6 +5,7 @@
 
 package com.microsoft.intellij;
 
+import com.azure.core.implementation.ReflectionUtilsApi;
 import com.azure.core.implementation.http.HttpClientProviders;
 import com.azure.core.management.AzureEnvironment;
 import com.google.gson.Gson;
@@ -97,6 +98,9 @@ public class AzureActionsListener implements AppLifecycleListener, PluginCompone
             Thread.currentThread().setContextClassLoader(AzureActionsListener.class.getClassLoader());
             HttpClientProviders.createInstance();
             Azure.az(AzureAccount.class);
+            final Logger logger = Logger.getInstance(AzureActionsListener.class);
+            final int version = ReflectionUtilsApi.INSTANCE.getJavaImplementationMajorVersion();
+            log.warn("ReflectionUtilsApi.INSTANCE.getJavaImplementationMajorVersion(): " + version);
             Hooks.onErrorDropped(ex -> {
                 Throwable cause = findExceptionInExceptionChain(ex, Arrays.asList(InterruptedException.class, UnknownHostException.class));
                 if (cause instanceof InterruptedException) {

gradle.properties

@@ -1,9 +1,9 @@
 ARTIFACTS_DIR=artifacts
 INJECT_INTELLIJ_VERSION=true
-IJ_VERSION_MAJOR_BUILD=221.4165.146
-IJ_VERSION_MAJOR=2021.1
+IJ_VERSION_MAJOR_BUILD=222.2680.4
+IJ_VERSION_MAJOR=2022.2
 IJ_VERSION_MINOR=
-IJ_SCALA_VERSION_LATEST=2022.1.4
+IJ_SCALA_VERSION_LATEST=2022.2.3
 skipCheckstyle=true
 skipTest=false
 forceClean=false