Merge remote-tracking branch 'origin/develop' into develop.next

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.core/resources/settings.json

@@ -68,7 +68,6 @@
 import com.microsoft.azuretools.core.utils.PluginUtil;
 import com.microsoft.tooling.msservices.components.DefaultLoader;
 import com.microsoft.tooling.msservices.components.PluginComponent;
-import com.microsoft.tooling.msservices.components.PluginSettings;
 
 /**
  * The activator class controls the plug-in life cycle
@@ -94,7 +93,6 @@ public class Activator extends AbstractUIPlugin implements PluginComponent {
     // save temporary value of telemetry preference in case of preference page navigation
     public static String prefState = "";
 
-    private PluginSettings settings;
     public static final String CONSOLE_NAME = Messages.consoleName;
 
     private static final EventListenerList DEPLOYMENT_EVENT_LISTENERS = new EventListenerList();
@@ -133,13 +131,6 @@ public void start(BundleContext context) throws Exception {
         AzureConfigInitializer.initialize(InstallationIdUtils.getHashMac(), "Azure Toolkit for Eclipse", Activator.getDefault().getBundle().getVersion().toString());
         initAzureToolsCoreLibsSettings();
         EclipseAzureActionManager.register();
-
-        // load up the plugin settings
-        try {
-            loadPluginSettings();
-        } catch (IOException e) {
-            showException("Azure Core Plugin", "An error occurred while attempting to load settings for the Azure Core plugin.", e);
-        }
         findObsoletePackages(context);
 
         super.start(context);
@@ -266,32 +257,6 @@ public static ImageDescriptor getImageDescriptor(String path) {
         return imageDescriptorFromPlugin(PLUGIN_ID, path);
     }
 
-    private void loadPluginSettings() throws IOException {
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new FileReader(getResourceAsFile("/resources/settings.json")));
-//            reader = new BufferedReader(
-//                    new InputStreamReader(
-//                            MSOpenTechToolsApplication.class.getResourceAsStream("/resources/settings.json")));
-            StringBuilder sb = new StringBuilder();
-            String line;
-
-            while ((line = reader.readLine()) != null) {
-                sb.append(line);
-            }
-
-            Gson gson = new Gson();
-            settings = gson.fromJson(sb.toString(), PluginSettings.class);
-        } finally {
-            if (reader != null) {
-                try {
-                    reader.close();
-                } catch (IOException ignored) {
-                }
-            }
-        }
-    }
-
     public static File getResourceAsFile(String fileEntry) {
         File file = null;
         try {
@@ -328,13 +293,13 @@ public static void setPrefState(String prefState) {
     }
 
     @Override
-    public PluginSettings getSettings() {
-        return settings;
+    public String getPluginId() {
+        return PLUGIN_ID;
     }
 
     @Override
-    public String getPluginId() {
-        return PLUGIN_ID;
+    public String getPluginVersion() {
+        return "0.1.145";
     }
 
     public static void removeUnNecessaryListener() {

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.core/src/com/microsoft/azuretools/core/Activator.java

@@ -13,7 +13,6 @@
 import com.microsoft.azure.toolkit.intellij.common.CommonConst;
 import com.microsoft.azure.toolkit.lib.Azure;
 import com.microsoft.azure.toolkit.lib.common.messager.ExceptionNotification;
-import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import com.microsoft.azuretools.authmanage.CommonSettings;
 import com.microsoft.azuretools.azurecommons.util.FileUtil;
 import com.microsoft.azuretools.core.mvp.ui.base.AppSchedulerProvider;
@@ -25,18 +24,14 @@
 import com.microsoft.intellij.helpers.MvpUIHelperImpl;
 import com.microsoft.intellij.helpers.UIHelperImpl;
 import com.microsoft.intellij.secure.IdeaTrustStrategy;
-import com.microsoft.intellij.util.PluginUtil;
 import com.microsoft.tooling.msservices.components.DefaultLoader;
 import com.microsoft.tooling.msservices.components.PluginComponent;
-import com.microsoft.tooling.msservices.components.PluginSettings;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.ssl.TrustStrategy;
 import rx.internal.util.PlatformDependent;
 
 import javax.annotation.Nonnull;
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.util.List;
 import java.util.logging.FileHandler;
 
@@ -47,8 +42,6 @@ public class AzureActionsListener implements AppLifecycleListener, PluginCompone
     private static final String AZURE_TOOLS_FOLDER_DEPRECATED = "AzureToolsForIntelliJ";
     private static final FileHandler logFileHandler = null;
 
-    private PluginSettings settings;
-
     @Override
     @ExceptionNotification
     public void appFrameCreated(@Nonnull List<String> commandLineArgs) {
@@ -60,12 +53,6 @@ public void appFrameCreated(@Nonnull List<String> commandLineArgs) {
             SchedulerProviderFactory.getInstance().init(new AppSchedulerProvider());
             MvpUIHelperFactory.getInstance().init(new MvpUIHelperImpl());
             HDInsightLoader.setHHDInsightHelper(new HDInsightHelperImpl());
-            try {
-                loadPluginSettings();
-            } catch (final IOException e) {
-                PluginUtil.displayErrorDialogAndLog("Error", "An error occurred while attempting to load settings", e);
-            }
-
             ServiceManager.setServiceProvider(TrustStrategy.class, IdeaTrustStrategy.INSTANCE);
             CommonSettings.setUserAgent(Azure.az().config().getUserAgent());
             initAuthManage();
@@ -94,28 +81,13 @@ private void initAuthManage() {
         }
     }
 
-    @Override
-    public PluginSettings getSettings() {
-        return settings;
-    }
-
     @Override
     public String getPluginId() {
         return PLUGIN_ID;
     }
 
-    private void loadPluginSettings() throws IOException {
-        try (final BufferedReader reader = new BufferedReader(new InputStreamReader(
-            AzureActionsListener.class.getResourceAsStream("/settings.json")))) {
-            final StringBuilder sb = new StringBuilder();
-            String line;
-
-            while ((line = reader.readLine()) != null) {
-                sb.append(line);
-            }
-
-            final Gson gson = new Gson();
-            settings = gson.fromJson(sb.toString(), PluginSettings.class);
-        }
+    @Override
+    public String getPluginVersion() {
+        return "0.1.1";
     }
 }

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

@@ -6,7 +6,6 @@
 package com.microsoft.tooling.msservices.components;
 
 public interface PluginComponent {
-    public PluginSettings getSettings();
-
     public String getPluginId();
+    public String getPluginVersion();
 }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight-base/src/main/resources/settings.json

@@ -136,7 +136,7 @@ protected static HttpResponse getResponse(@NotNull final String method,
 
     @NotNull
     private static String getPlatformUserAgent() {
-        String version = DefaultLoader.getPluginComponent().getSettings().getPluginVersion();
+        String version = DefaultLoader.getPluginComponent().getPluginVersion();
         return String.format(
                 "%s/%s (lang=%s; os=%s; version=%s)",
                 DefaultLoader.getPluginComponent().getPluginId(),

Utils/azure-toolkit-ide-hdinsight-libs/azure-explorer-common/src/com/microsoft/tooling/msservices/components/PluginComponent.java

@@ -7,9 +7,6 @@
 
 public class Constants {
     public static String resourceVault = "https://vault.azure.net";
-
-    public static String tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47";
-    public static String clientId = "61d65f5a-6e3b-468b-af73-a033f5098c5c";
     public static String redirectUri = "https://msopentech.com/";
     public static int connection_read_timeout_ms = 10000;
 

Utils/azure-toolkit-ide-hdinsight-libs/azure-explorer-common/src/com/microsoft/tooling/msservices/components/PluginSettings.java

@@ -1,6 +1,6 @@
 ARTIFACTS_DIR=artifacts
 INJECT_INTELLIJ_VERSION=true
-IJ_VERSION_MAJOR_BUILD=251.23774.16
+IJ_VERSION_MAJOR_BUILD=251.27812.49
 IJ_VERSION_MAJOR=2025.1
 IJ_VERSION_MINOR=
 IJ_SCALA_VERSION_LATEST=2025.1.7