From a3196c0297945cbd0e1004897a1f3b762b3d9d09 Mon Sep 17 00:00:00 2001
From: Georgii Ustinov <georgii.ustinov@jetbrains.com>
Date: Fri, 5 Jul 2024 15:22:52 +0300
Subject: [PATCH] [Java. Code Formatting] Remove bad way of migration
 JavaCodeStyleSettings

IDEA-110857

GitOrigin-RevId: b44f2d53170f7753d5c7c61d1caec72e0af3c432
---
 .../JavaCodeStyleSettingsMigrationActivity.kt | 39 -------------------
 ...odeStyleSettingsProjectMigrationManager.kt | 31 ---------------
 java/java-impl/src/META-INF/JavaPlugin.xml    |  1 -
 3 files changed, 71 deletions(-)
 delete mode 100644 java/java-frontback-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettingsMigrationActivity.kt
 delete mode 100644 java/java-frontback-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettingsProjectMigrationManager.kt

diff --git a/java/java-frontback-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettingsMigrationActivity.kt b/java/java-frontback-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettingsMigrationActivity.kt
deleted file mode 100644
index 1fc4243837b7..000000000000
--- a/java/java-frontback-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettingsMigrationActivity.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.psi.codeStyle
-
-import com.intellij.lang.java.JavaLanguage
-import com.intellij.openapi.components.SimplePersistentStateComponent
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.ProjectActivity
-
-/**
- * JavaCodeStyleSettingsMigrationActivity is responsible for migrating the Java code style settings
- * for both application-wide and project-specific schemes.
- * All customs schemes are stored on the application level and therefore, two [SimplePersistentStateComponent] are required
- * Note, migration will not happen in case new schemes will be added.
- */
-class JavaCodeStyleSettingsMigrationActivity : ProjectActivity {
-  override suspend fun execute(project: Project) {
-    val applicationMigrationState = JavaCodeStyleSettingsApplicationMigrationManager.getInstance().state
-    val projectMigrationState = JavaCodeStyleSettingsProjectMigrationManager.getInstance(project).state
-
-    if (!applicationMigrationState.areSchemesMigrated) {
-      CodeStyleSchemes.getInstance().allSchemes.forEach { scheme ->
-        migrateSettings(scheme.codeStyleSettings)
-      }
-      applicationMigrationState.areSchemesMigrated = true
-    }
-
-    if (!projectMigrationState.areSchemesMigrated) {
-      val settings = CodeStyleSettingsManager.getInstance(project).mainProjectCodeStyle ?: return
-      migrateSettings(settings)
-      projectMigrationState.areSchemesMigrated = true
-    }
-  }
-
-  private fun migrateSettings(codeStyleSettings: CodeStyleSettings) {
-    val commonSettings = codeStyleSettings.getCommonSettings(JavaLanguage.INSTANCE)
-    val customSettings = codeStyleSettings.getCustomSettings(JavaCodeStyleSettings::class.java)
-    customSettings.BLANK_LINES_AROUND_FIELD_WITH_ANNOTATIONS = commonSettings.BLANK_LINES_AROUND_FIELD
-  }
-}
\ No newline at end of file
diff --git a/java/java-frontback-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettingsProjectMigrationManager.kt b/java/java-frontback-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettingsProjectMigrationManager.kt
deleted file mode 100644
index 6d1cd478f95b..000000000000
--- a/java/java-frontback-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettingsProjectMigrationManager.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.psi.codeStyle
-
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.components.*
-import com.intellij.openapi.project.Project
-
-abstract class JavaCodeStyleSettingsProjectMigrationManagerBase : SimplePersistentStateComponent<MigrationState>(MigrationState())
-
-@Service(Service.Level.PROJECT)
-@State(name = "JavaCodeStyleSettingsProjectMigration", storages = [Storage(StoragePathMacros.WORKSPACE_FILE)])
-class JavaCodeStyleSettingsProjectMigrationManager : JavaCodeStyleSettingsProjectMigrationManagerBase() {
-  companion object {
-    @JvmStatic
-    fun getInstance(project: Project) = project.service<JavaCodeStyleSettingsProjectMigrationManager>()
-  }
-}
-
-
-@Service(Service.Level.APP)
-@State(name = "JavaCodeStyleSettingsApplicationMigrationManager", storages = [Storage("java.code.style.migration.xml")])
-class JavaCodeStyleSettingsApplicationMigrationManager : JavaCodeStyleSettingsProjectMigrationManagerBase() {
-  companion object {
-    @JvmStatic
-    fun getInstance() = ApplicationManager.getApplication().service<JavaCodeStyleSettingsApplicationMigrationManager>()
-  }
-}
-
-class MigrationState : BaseState() {
-  var areSchemesMigrated by property(false)
-}
\ No newline at end of file
diff --git a/java/java-impl/src/META-INF/JavaPlugin.xml b/java/java-impl/src/META-INF/JavaPlugin.xml
index 9f6b517021aa..3b4b9b5e98f2 100644
--- a/java/java-impl/src/META-INF/JavaPlugin.xml
+++ b/java/java-impl/src/META-INF/JavaPlugin.xml
@@ -399,7 +399,6 @@
     <compilableFileTypesProvider implementation="com.intellij.compiler.impl.javaCompiler.JavaCompilableFileTypesProvider"/>
     <postStartupActivity implementation="com.intellij.compiler.server.BuildManager$BuildManagerStartupActivity"/>
     <postStartupActivity implementation="com.intellij.ide.SetupJavaProjectFromSourcesActivity"/>
-    <postStartupActivity implementation="com.intellij.psi.codeStyle.JavaCodeStyleSettingsMigrationActivity"/>
     <backgroundPostStartupActivity implementation="com.intellij.compiler.cache.CompilerCacheStartupActivity"/>
 
     <projectService serviceInterface="com.intellij.packaging.artifacts.ArtifactManager"