Skip to content

Commit 7fc0235

Browse files
committed
Remove cache for validation and related deprecated codes
1 parent 084e49f commit 7fc0235

File tree

5 files changed

+1
-29
lines changed

5 files changed

+1
-29
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/webapp/runner/webappconfig/WebAppConfiguration.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import com.intellij.openapi.options.SettingsEditor;
1717
import com.intellij.openapi.project.Project;
1818
import com.intellij.openapi.util.InvalidDataException;
19-
import com.intellij.openapi.util.WriteExternalException;
2019
import com.microsoft.azure.toolkit.intellij.common.AzureArtifact;
2120
import com.microsoft.azure.toolkit.intellij.common.AzureArtifactManager;
2221
import com.microsoft.azure.toolkit.intellij.common.AzureArtifactType;
@@ -85,12 +84,6 @@ public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEn
8584
return new WebAppRunState(getProject(), this);
8685
}
8786

88-
@Override
89-
public void writeExternal(Element element) throws WriteExternalException {
90-
element.getChildren().forEach(child -> element.removeChild(child.getName()));
91-
super.writeExternal(element);
92-
}
93-
9487
@Override
9588
public void readExternal(final Element element) throws InvalidDataException {
9689
super.readExternal(element);

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/webapp/runner/webappconfig/WebAppRunState.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import com.microsoft.azuretools.utils.AzureUIRefreshEvent;
2929
import com.microsoft.azuretools.utils.WebAppUtils;
3030
import com.microsoft.intellij.RunProcessHandler;
31-
import com.microsoft.intellij.util.ValidationUtils;
3231
import org.apache.commons.collections4.MapUtils;
3332
import org.apache.commons.compress.utils.FileNameUtils;
3433
import org.apache.commons.lang3.StringUtils;
@@ -165,9 +164,7 @@ private IWebApp getOrCreateWebappFromAppSettingModel(AzureAppService azureAppSer
165164
}
166165
if (webAppSettingModel.isCreatingNew()) {
167166
processHandler.setText(message("webapp.deploy.hint.creatingWebApp"));
168-
final IWebApp webAppFromSettingModel = AzureWebAppMvpModel.getInstance().createWebAppFromSettingModel(webAppSettingModel);
169-
ValidationUtils.evictCacheForAppServiceNameValidation(webAppSettingModel.getSubscriptionId(), webAppSettingModel.getWebAppName());
170-
return webAppFromSettingModel;
167+
return AzureWebAppMvpModel.getInstance().createWebAppFromSettingModel(webAppSettingModel);
171168
} else {
172169
processHandler.setText(message("appService.deploy.hint.failed"));
173170
throw new Exception(message("webapp.deploy.error.noWebApp"));

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/lib/function/FunctionAppService.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.microsoft.azure.toolkit.lib.common.telemetry.AzureTelemetry;
2525
import com.microsoft.azure.toolkit.lib.resource.AzureGroup;
2626
import com.microsoft.azuretools.sdkmanage.IdentityAzureManager;
27-
import com.microsoft.intellij.util.ValidationUtils;
2827
import org.apache.commons.lang3.StringUtils;
2928
import org.zeroturnaround.zip.ZipUtil;
3029

@@ -102,7 +101,6 @@ public IFunctionApp createFunctionApp(final FunctionAppConfig config) {
102101
.withAppSettings(appSettings)
103102
.withDiagnosticConfig(config.getMonitorConfig().getDiagnosticConfig())
104103
.commit();
105-
ValidationUtils.evictCacheForAppServiceNameValidation(config.getSubscriptionId(), config.getName());
106104
AzureMessager.getMessager().info(String.format(CREATE_FUNCTION_APP_DONE, result.name()));
107105
return result;
108106
}

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/lib/webapp/WebAppService.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.microsoft.azuretools.telemetrywrapper.EventUtil;
2121
import com.microsoft.azuretools.telemetrywrapper.Operation;
2222
import com.microsoft.azuretools.telemetrywrapper.TelemetryManager;
23-
import com.microsoft.intellij.util.ValidationUtils;
2423
import org.apache.commons.lang3.StringUtils;
2524

2625
import javax.annotation.Nonnull;
@@ -53,7 +52,6 @@ public IWebApp createWebApp(final WebAppConfig config) {
5352
EventUtil.logError(operation, ErrorType.userError, e, properties, null);
5453
throw e;
5554
} finally {
56-
ValidationUtils.evictCacheForAppServiceNameValidation(config.getSubscriptionId(), config.getName());
5755
operation.complete();
5856
}
5957
}

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
import com.azure.core.management.exception.ManagementException;
99
import com.microsoft.azure.toolkit.lib.Azure;
1010
import com.microsoft.azure.toolkit.lib.appservice.AzureAppService;
11-
import com.microsoft.azure.toolkit.lib.common.cache.CacheManager;
12-
import com.microsoft.azure.toolkit.lib.common.cache.Cacheable;
1311
import com.microsoft.azure.toolkit.lib.common.entity.CheckNameAvailabilityResultEntity;
1412
import com.microsoft.azure.toolkit.lib.common.model.ResourceGroup;
1513
import com.microsoft.azure.toolkit.lib.resource.AzureGroup;
@@ -19,7 +17,6 @@
1917
import java.util.HashSet;
2018
import java.util.Objects;
2119
import java.util.Set;
22-
import java.util.concurrent.ExecutionException;
2320
import java.util.regex.Matcher;
2421
import java.util.regex.Pattern;
2522

@@ -57,7 +54,6 @@ public static boolean isValidVersion(String version) {
5754
return version != null && version.matches(VERSION_REGEX);
5855
}
5956

60-
@Cacheable(cacheName = "appservice/validation/name", key = "$subscriptionId/$appServiceName")
6157
public static void validateAppServiceName(String subscriptionId, String appServiceName) {
6258
if (StringUtils.isEmpty(subscriptionId)) {
6359
throw new IllegalArgumentException(message("appService.subscription.validate.empty"));
@@ -71,16 +67,6 @@ public static void validateAppServiceName(String subscriptionId, String appServi
7167
}
7268
}
7369

74-
// todo: move validation and related cache management to toolkit lib
75-
public static void evictCacheForAppServiceNameValidation(String subscriptionId, String appServiceName) {
76-
try {
77-
CacheManager.evictCache("appservice/validation/name", String.format("%s/%s", subscriptionId, appServiceName));
78-
} catch (ExecutionException e) {
79-
// swallow exception for clear cache
80-
}
81-
}
82-
83-
@Cacheable(cacheName = "resourcegroup/validation/name", key = "$subscriptionId/$resourceGroup")
8470
public static void validateResourceGroupName(String subscriptionId, String resourceGroup) {
8571
if (StringUtils.isEmpty(subscriptionId)) {
8672
throw new IllegalArgumentException(message("appService.subscription.validate.empty"));

0 commit comments

Comments
 (0)