MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 06:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-173167: RegionUrlMapper: Rename mapUrl() to tryMapUrlBlocking()

Browse Source 
(cherry picked from commit 8fbd2938cf053623f7715b7faef914efbe2304f4)

IJ-CR-151167

GitOrigin-RevId: 4212535e6f8d53ebb631dae1f65de06fab4ca3be
This commit is contained in:
Eldar Abusalimov
2024-12-06 17:52:32 +01:00
committed by intellij-monorepo-bot
parent 7fc45d4c12
commit 5b3d80c496
3 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/feedback/src/com/intellij/platform/feedback/impl/GeneralFeedbackSubmit.kt
View File

@@ -113,7 +113,7 @@ fun submitFeedback(feedbackData: FeedbackRequestDataHolder,
FeedbackRequestType.PRODUCTION_REQUEST -> PRODUCTION_FEEDBACK_URL
}
val regionalFeedbackUrl = RegionUrlMapper.mapUrl(feedbackUrl)
val regionalFeedbackUrl = RegionUrlMapper.tryMapUrlBlocking(feedbackUrl)
LOG.info("Feedback sent to $regionalFeedbackUrl")
sendFeedback(regionalFeedbackUrl, feedbackData, onDone, onError)
}

4
platform/platform-impl/internal/src/com/intellij/internal/statistic/StatisticsRegionUrlMapperServiceImpl.kt
View File

@@ -30,7 +30,7 @@ private class StatisticsRegionUrlMapperServiceImpl(val scope: CoroutineScope) :
scope.launch {
while (isActive) {
withContext(Dispatchers.IO) {
url = RegionUrlMapper.mapUrl(EventLogInternalApplicationInfo.EVENT_LOG_SETTINGS_URL_TEMPLATE)
url = RegionUrlMapper.tryMapUrlBlocking(EventLogInternalApplicationInfo.EVENT_LOG_SETTINGS_URL_TEMPLATE)
}
delay(10.minutes)
}
@@ -42,7 +42,7 @@ private class StatisticsRegionUrlMapperServiceImpl(val scope: CoroutineScope) :
fun updateUrl() {
scope.launch {
withContext(Dispatchers.IO) {
url = RegionUrlMapper.mapUrl(EventLogInternalApplicationInfo.EVENT_LOG_SETTINGS_URL_TEMPLATE)
url = RegionUrlMapper.tryMapUrlBlocking(EventLogInternalApplicationInfo.EVENT_LOG_SETTINGS_URL_TEMPLATE)
}
}
}

49
platform/platform-impl/src/com/intellij/ide/RegionUrlMapper.java
View File

@@ -34,7 +34,7 @@ public final class RegionUrlMapper {
// augment the table with other regions if needed
Region.CHINA, "https://www.jetbrains.com.cn/config/JetBrainsResourceMapping.json"
);
private static final Map<Region, String> OVERRIDE_CONFIG_URL_TABLE = new HashMap<>(); // for testing
static {
for (Region reg : Region.values()) {
@@ -57,31 +57,50 @@ public final class RegionUrlMapper {
}
/**
* Maps the specified resource URL to a corresponding region-specific URL for the region that is configured for the IDE
* see {@link #mapUrl(String, Region)}
*
* IMPORTANT: the method is potentially long-executing; involves network calls
*
* @param url the original resource URL
* @return the possibly adjusted URL that is specific to the currently specified IDE region.
* @deprecated Use the more explicitly named {@link #tryMapUrlBlocking}, or {@link #tryMapUrl} when calling from a suspending context.
*/
@Deprecated
@RequiresBackgroundThread
@RequiresReadLockAbsence
public static @NotNull String mapUrl(@NotNull String url) {
return mapUrl(url, RegionSettings.getRegion());
return tryMapUrlBlocking(url);
}
/**
* Maps the specified resource URL to a corresponding region-specific URL
* IMPORTANT: the method is potentially long-executing; involves network calls
*
* @param url the original resource URL
* @param region the region for which the original url might be adjusted
* @return the adjusted url, in case the mapping is configured or the original url, if no adjustments are required
* @deprecated Use the more explicitly named {@link #tryMapUrlBlocking}, or {@link #tryMapUrl} when calling from a suspending context.
*/
@Deprecated
@RequiresBackgroundThread
@RequiresReadLockAbsence
public static @NotNull String mapUrl(@NotNull String url, @NotNull Region region) {
return tryMapUrlBlocking(url, region);
}
/**
* @see #tryMapUrlBlocking(String, Region)
* @see #tryMapUrl(String) when calling from a suspending context, consider using the async version
* @see RegionSettings
*/
@RequiresBackgroundThread
@RequiresReadLockAbsence
public static @NotNull String tryMapUrlBlocking(@NotNull String url) {
return tryMapUrlBlocking(url, RegionSettings.getRegion());
}
/**
* Maps the specified resource URL to a corresponding region-specific URL.
* <p>
* <b>IMPORTANT</b>: the method is potentially long-executing; involves network calls.
* Also note that in case the network call fails, this method returns the original URL silently (hence, "try" in its name).
*
* @param url the original resource URL
* @param region the region for which the original url might be adjusted
* @return the adjusted url in case the mapping is configured, or the original url if no adjustments are required
* @see #tryMapUrl(String, Region) when calling from a suspending context, consider using the async version
*/
@RequiresBackgroundThread
@RequiresReadLockAbsence
public static @NotNull String tryMapUrlBlocking(@NotNull String url, @NotNull Region region) {
RegionMapping mappings = ourCache.get(region);
return mappings.apply(url);
}