IDEA-CR-43092 use "obsolete" instead of "stalled"

platform/configuration-store-impl/src/ComponentStoreWithExtraComponents.kt

@@ -11,8 +11,8 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import java.util.concurrent.atomic.AtomicBoolean
 
-// A way to remove stalled/unused component data.
-internal val STALLED_STORAGE_EP = ExtensionPointName<StalledStorageBean>("com.intellij.stalledStorage")
+// A way to remove obsolete component data.
+internal val OBSOLETE_STORAGE_EP = ExtensionPointName<ObsoleteStorageBean>("com.intellij.obsoleteStorage")
 
 abstract class ComponentStoreWithExtraComponents : ComponentStoreImpl() {
   @Suppress("DEPRECATION")
@@ -81,14 +81,14 @@ abstract class ComponentStoreWithExtraComponents : ComponentStoreImpl() {
   override fun commitComponents(isForce: Boolean, session: SaveSessionProducerManager, errors: MutableList<Throwable>) {
     // ensure that this task will not interrupt regular saving
     LOG.runAndLogException {
-      commitStalledComponents(session, false)
+      commitObsoleteComponents(session, false)
     }
 
     super.commitComponents(isForce, session, errors)
   }
 
-  internal open fun commitStalledComponents(session: SaveSessionProducerManager, isProjectLevel: Boolean) {
-    for (bean in STALLED_STORAGE_EP.extensionList) {
+  internal open fun commitObsoleteComponents(session: SaveSessionProducerManager, isProjectLevel: Boolean) {
+    for (bean in OBSOLETE_STORAGE_EP.extensionList) {
       if (bean.isProjectLevel != isProjectLevel) {
         continue
       }

platform/configuration-store-impl/src/StalledStorageBean.java → platform/configuration-store-impl/src/ObsoleteStorageBean.java

@@ -7,7 +7,7 @@ import com.intellij.util.xmlb.annotations.XCollection;
 
 import java.util.List;
 
-final class StalledStorageBean {
+final class ObsoleteStorageBean {
   @Attribute
   public String file;
 

platform/configuration-store-impl/src/ProjectStoreImpl.kt

@@ -353,9 +353,9 @@ private open class ProjectStoreImpl(project: Project, private val pathMacroManag
 
   final override fun createSaveSessionProducerManager() = ProjectSaveSessionProducerManager(project)
 
-  final override fun commitStalledComponents(session: SaveSessionProducerManager, isProjectLevel: Boolean) {
+  final override fun commitObsoleteComponents(session: SaveSessionProducerManager, isProjectLevel: Boolean) {
     if (isDirectoryBased) {
-      super.commitStalledComponents(session, true)
+      super.commitObsoleteComponents(session, true)
     }
   }
 }

platform/configuration-store-impl/testSrc/ApplicationStoreTest.kt

@@ -299,10 +299,10 @@ internal class ApplicationStoreTest {
 
   @Test
   fun `remove stalled data`() = runBlocking<Unit> {
-    val stalledStorageBean = StalledStorageBean()
-    stalledStorageBean.file = "i_do_not_want_to_be_deleted_but.xml"
-    stalledStorageBean.components.addAll(listOf("loser1", "loser2", "lucky"))
-    PlatformTestUtil.maskExtensions(STALLED_STORAGE_EP, listOf(stalledStorageBean), disposableRule.disposable)
+    val obsoleteStorageBean = ObsoleteStorageBean()
+    obsoleteStorageBean.file = "i_do_not_want_to_be_deleted_but.xml"
+    obsoleteStorageBean.components.addAll(listOf("loser1", "loser2", "lucky"))
+    PlatformTestUtil.maskExtensions(OBSOLETE_STORAGE_EP, listOf(obsoleteStorageBean), disposableRule.disposable)
 
     @State(name = "loser1", storages = [(Storage(value = "i_do_not_want_to_be_deleted_but.xml"))])
     class AOther : A()
@@ -325,8 +325,8 @@ internal class ApplicationStoreTest {
 
     componentStore.save()
 
-    // all must be saved regardless of stalledStorageBean because we have such components
-    assertThat(testAppConfig.resolve(stalledStorageBean.file)).isEqualTo("""
+    // all must be saved regardless of obsoleteStorageBean because we have such components
+    assertThat(testAppConfig.resolve(obsoleteStorageBean.file)).isEqualTo("""
       <application>
         <component name="loser1" foo="old" />
         <component name="loser2" foo="old?" />
@@ -338,7 +338,7 @@ internal class ApplicationStoreTest {
 
     // first looser is deleted since state equals to default (no committed component data)
     componentStore.save()
-    assertThat(testAppConfig.resolve(stalledStorageBean.file)).isEqualTo("""
+    assertThat(testAppConfig.resolve(obsoleteStorageBean.file)).isEqualTo("""
       <application>
         <component name="loser2" foo="old?" />
         <component name="lucky" bar="foo" />
@@ -349,7 +349,7 @@ internal class ApplicationStoreTest {
 
     // second looser is deleted since state equals to default (no committed component data)
     componentStore.save()
-    assertThat(testAppConfig.resolve(stalledStorageBean.file)).isEqualTo("""
+    assertThat(testAppConfig.resolve(obsoleteStorageBean.file)).isEqualTo("""
       <application>
         <component name="lucky" bar="foo" />
       </application>
@@ -358,12 +358,12 @@ internal class ApplicationStoreTest {
 
   @Test
   fun `remove stalled data - keep file if another unknown component`() = runBlocking<Unit> {
-    val stalledStorageBean = StalledStorageBean()
-    stalledStorageBean.file = "i_will_be_not_deleted.xml"
-    stalledStorageBean.components.addAll(listOf("Loser"))
-    PlatformTestUtil.maskExtensions(STALLED_STORAGE_EP, listOf(stalledStorageBean), disposableRule.disposable)
+    val obsoleteStorageBean = ObsoleteStorageBean()
+    obsoleteStorageBean.file = "i_will_be_not_deleted.xml"
+    obsoleteStorageBean.components.addAll(listOf("Loser"))
+    PlatformTestUtil.maskExtensions(OBSOLETE_STORAGE_EP, listOf(obsoleteStorageBean), disposableRule.disposable)
 
-    testAppConfig.resolve(stalledStorageBean.file).write("""
+    testAppConfig.resolve(obsoleteStorageBean.file).write("""
       <application>
         <component name="Unknown" data="some data" />
         <component name="Loser" foo="old?" />
@@ -372,7 +372,7 @@ internal class ApplicationStoreTest {
 
     componentStore.save()
 
-    assertThat(testAppConfig.resolve(stalledStorageBean.file)).isEqualTo("""
+    assertThat(testAppConfig.resolve(obsoleteStorageBean.file)).isEqualTo("""
       <application>
         <component name="Unknown" data="some data" />
       </application>

platform/configuration-store-impl/testSrc/ProjectStoreTest.kt

@@ -182,16 +182,16 @@ internal class ProjectStoreTest {
     """.trimIndent())
       it.path
     }) { project ->
-      val stalledStorageBean = StalledStorageBean()
+      val obsoleteStorageBean = ObsoleteStorageBean()
       val storageFileName = "foo.xml"
-      stalledStorageBean.file = storageFileName
-      stalledStorageBean.components.addAll(listOf("AppLevelLoser"))
+      obsoleteStorageBean.file = storageFileName
+      obsoleteStorageBean.components.addAll(listOf("AppLevelLoser"))
 
-      val projectStalledStorageBean = StalledStorageBean()
+      val projectStalledStorageBean = ObsoleteStorageBean()
       projectStalledStorageBean.file = storageFileName
       projectStalledStorageBean.isProjectLevel = true
       projectStalledStorageBean.components.addAll(listOf("ProjectLevelLoser"))
-      PlatformTestUtil.maskExtensions(STALLED_STORAGE_EP, listOf(stalledStorageBean, projectStalledStorageBean), project)
+      PlatformTestUtil.maskExtensions(OBSOLETE_STORAGE_EP, listOf(obsoleteStorageBean, projectStalledStorageBean), project)
 
       val componentStore = project.stateStore
 
@@ -204,7 +204,7 @@ internal class ProjectStoreTest {
 
       componentStore.save()
 
-      assertThat(Paths.get(project.stateStore.storageManager.expandMacros(PROJECT_CONFIG_DIR)).resolve(stalledStorageBean.file)).isEqualTo("""
+      assertThat(Paths.get(project.stateStore.storageManager.expandMacros(PROJECT_CONFIG_DIR)).resolve(obsoleteStorageBean.file)).isEqualTo("""
       <?xml version="1.0" encoding="UTF-8"?>
       <project version="4">
         <component name="AppLevelLoser" foo="old?" />

platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml

@@ -348,6 +348,6 @@
 
     <extensionPoint qualifiedName="com.intellij.search.traverseUiHelper" interface="com.intellij.ide.ui.search.TraverseUIHelper"/>
 
-    <extensionPoint name="stalledStorage" beanClass="com.intellij.configurationStore.StalledStorageBean"/>
+    <extensionPoint name="obsoleteStorage" beanClass="com.intellij.configurationStore.ObsoleteStorageBean"/>
   </extensionPoints>
 </idea-plugin>

platform/platform-resources/src/META-INF/PlatformExtensions.xml

@@ -600,28 +600,28 @@
 
     <rawEditorTypedHandler implementationClass="com.intellij.openapi.editor.impl.EditorFactoryImpl$MyRawTypedHandler"/>
 
-    <stalledStorage file="statistics.toolbar.clicks.xml">
+    <obsoleteStorage file="statistics.toolbar.clicks.xml">
       <components>
         <component>ToolbarClicksCollector</component>
       </components>
-    </stalledStorage>
-    <stalledStorage file="statistics.main_menu.xml">
+    </obsoleteStorage>
+    <obsoleteStorage file="statistics.main_menu.xml">
       <components>
         <component>MainMenuCollector</component>
       </components>
-    </stalledStorage>
-    <stalledStorage file="statistics.shortcuts.xml">
+    </obsoleteStorage>
+    <obsoleteStorage file="statistics.shortcuts.xml">
       <components>
         <component>ShortcutsCollector</component>
       </components>
-    </stalledStorage>
-    <stalledStorage file="statistics.application.usages.xml">
+    </obsoleteStorage>
+    <obsoleteStorage file="statistics.application.usages.xml">
       <components>
         <component>StatisticsApplicationUsages</component>
         <component>UsageTrigger</component>
       </components>
-    </stalledStorage>
-    <stalledStorage file="usage.statistics.xml">
+    </obsoleteStorage>
+    <obsoleteStorage file="usage.statistics.xml">
       <components>
         <component>StatisticsApplicationUsages</component>
         <component>UsageTrigger</component>
@@ -634,18 +634,18 @@
         <component>ActionsCollector</component>
         <component>FUSApplicationUsageTrigger</component>
       </components>
-    </stalledStorage>
+    </obsoleteStorage>
 
-    <stalledStorage file="usage.statistics.xml" isProjectLevel="true">
+    <obsoleteStorage file="usage.statistics.xml" isProjectLevel="true">
       <components>
         <component>FUSProjectUsageTrigger</component>
       </components>
-    </stalledStorage>
-    <stalledStorage file="workspace.xml" isProjectLevel="true">
+    </obsoleteStorage>
+    <obsoleteStorage file="workspace.xml" isProjectLevel="true">
       <components>
         <component>FUSProjectUsageTrigger</component>
       </components>
-    </stalledStorage>
+    </obsoleteStorage>
 
     <postStartupActivity implementation="com.intellij.ide.StartUpPerformanceReporter" order="last"/>
   </extensions>