Rename the IntelliJ settings' State class to StoredSettings

State also named IntelliJ's @State annotation on the same class, which
the previous commit wrote out in full to tell the two apart. The class
gets a name of its own and the annotation its import back.

The class name is not in .idea/open-java-format.xml: IntelliJ writes
the bean's fields into the component element, and
PalantirJavaFormatSettingsTest loads files written before.

Author: abashev

open-java-format-idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirJavaFormatSettings.java

@@ -18,6 +18,7 @@
 
 import com.intellij.formatting.service.FormattingService;
 import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.extensions.PluginDescriptor;
 import com.intellij.openapi.project.Project;
@@ -36,25 +37,25 @@
 
 import static java.util.Optional.ofNullable;
 
-@com.intellij.openapi.components.State(
+@State(
         name = "PalantirJavaFormatSettings",
         storages = {@Storage("open-java-format.xml")})
-public class PalantirJavaFormatSettings implements PersistentStateComponent<PalantirJavaFormatSettings.State> {
+public class PalantirJavaFormatSettings implements PersistentStateComponent<PalantirJavaFormatSettings.StoredSettings> {
 
-    private State state = new State();
+    private StoredSettings state = new StoredSettings();
 
     static PalantirJavaFormatSettings getInstance(Project project) {
         return project.getService(PalantirJavaFormatSettings.class);
     }
 
     @Nullable
     @Override
-    public State getState() {
+    public StoredSettings getState() {
         return state;
     }
 
     @Override
-    public void loadState(State state) {
+    public void loadState(StoredSettings state) {
         this.state = state;
     }
 
@@ -148,7 +149,7 @@ enum EnabledState {
         DISABLED
     }
 
-    static class State {
+    static class StoredSettings {
 
         private EnabledState enabled = EnabledState.UNKNOWN;
         private Optional<List<URI>> implementationClassPath = Optional.empty();

open-java-format-idea-plugin/src/test/java/com/palantir/javaformat/intellij/FormatterProviderTest.java

@@ -22,7 +22,7 @@
 import com.intellij.testFramework.fixtures.JavaTestFixtureFactory;
 import com.palantir.javaformat.bootstrap.BootstrappingFormatterService;
 import com.palantir.javaformat.bootstrap.NativeImageFormatterService;
-import com.palantir.javaformat.intellij.PalantirJavaFormatSettings.State;
+import com.palantir.javaformat.intellij.PalantirJavaFormatSettings.StoredSettings;
 import java.nio.file.Path;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
@@ -45,7 +45,7 @@ void setUp() throws Exception {
         fixture = JavaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(projectBuilder.getFixture());
         fixture.setUp();
         settings = PalantirJavaFormatSettings.getInstance(fixture.getProject());
-        settings.loadState(new State());
+        settings.loadState(new StoredSettings());
     }
 
     @AfterEach

open-java-format-idea-plugin/src/test/java/com/palantir/javaformat/intellij/PalantirJavaFormatConfigurableTest.java

@@ -34,7 +34,7 @@
 import com.palantir.javaformat.intellij.EmbeddedNativeImage.Installed;
 import com.palantir.javaformat.intellij.EmbeddedNativeImage.Status;
 import com.palantir.javaformat.intellij.PalantirJavaFormatConfigurable.StatusLine;
-import com.palantir.javaformat.intellij.PalantirJavaFormatSettings.State;
+import com.palantir.javaformat.intellij.PalantirJavaFormatSettings.StoredSettings;
 import java.awt.Component;
 import java.awt.Container;
 import java.io.IOException;
@@ -74,7 +74,7 @@ void setUp() throws Exception {
         fixture = JavaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(projectBuilder.getFixture());
         fixture.setUp();
         settings = PalantirJavaFormatSettings.getInstance(fixture.getProject());
-        settings.loadState(new State());
+        settings.loadState(new StoredSettings());
         settings.setEnabled(true);
         // Nothing downloaded, and nowhere to download from.
         var embedded = new EmbeddedNativeImage(
@@ -104,7 +104,7 @@ void hasNoChoiceOfCodeStyle() {
 
     @Test
     void readsAndWritesTheEnabledSetting() throws Throwable {
-        State disabled = new State();
+        var disabled = new StoredSettings();
         disabled.setEnabled("false");
         settings.loadState(disabled);
 

open-java-format-idea-plugin/src/test/java/com/palantir/javaformat/intellij/PalantirJavaFormatFormattingServiceTest.java

@@ -35,7 +35,7 @@
 import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture;
 import com.intellij.testFramework.fixtures.JavaTestFixtureFactory;
 import com.intellij.testFramework.fixtures.TestFixtureBuilder;
-import com.palantir.javaformat.intellij.PalantirJavaFormatSettings.State;
+import com.palantir.javaformat.intellij.PalantirJavaFormatSettings.StoredSettings;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -70,7 +70,7 @@ void setUp() throws Exception {
 
         settings = PalantirJavaFormatSettings.getInstance(fixture.getProject());
 
-        State resetState = new State();
+        var resetState = new StoredSettings();
         resetState.setEnabled("true");
         settings.loadState(resetState);
     }

open-java-format-idea-plugin/src/test/java/com/palantir/javaformat/intellij/PalantirJavaFormatSettingsTest.java

@@ -18,7 +18,7 @@
 
 import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.util.xmlb.XmlSerializer;
-import com.palantir.javaformat.intellij.PalantirJavaFormatSettings.State;
+import com.palantir.javaformat.intellij.PalantirJavaFormatSettings.StoredSettings;
 import java.nio.file.Path;
 import java.util.Optional;
 import org.intellij.lang.annotations.Language;
@@ -42,7 +42,7 @@ void loadsAFileThatStillHasTheCodeStyle() throws Exception {
 
     @Test
     void doesNotWriteACodeStyle() {
-        var xml = JDOMUtil.write(XmlSerializer.serialize(new State()));
+        var xml = JDOMUtil.write(XmlSerializer.serialize(new StoredSettings()));
 
         assertThat(xml).doesNotContain("style");
     }
@@ -78,15 +78,15 @@ void ignoresTheNativeImageTheGradlePluginUsedToWrite() throws Exception {
 
     @Test
     void takesABlankPathForNone() {
-        var state = new State();
+        var state = new StoredSettings();
         state.nativeImagePath = " ";
         var settings = new PalantirJavaFormatSettings();
         settings.loadState(state);
 
         assertThat(settings.getNativeImagePath()).isEmpty();
     }
 
-    private static State deserialize(@Language("xml") String xml) throws Exception {
-        return XmlSerializer.deserialize(JDOMUtil.load(xml), State.class);
+    private static StoredSettings deserialize(@Language("xml") String xml) throws Exception {
+        return XmlSerializer.deserialize(JDOMUtil.load(xml), StoredSettings.class);
     }
 }