address comments and fix tests

Author: andrewyuq

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererModelConfigurator.kt

@@ -76,6 +76,7 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe
 
     private val hasShownNewCustomizationNotification = AtomicBoolean(false)
 
+    @Deprecated("Use customizationArnOverrideV2 for the latest arn override persistence")
     private var serviceDefaultArn: String? = null
 
     private var customizationArnOverrideV2: String? = null
@@ -299,6 +300,7 @@ class CodeWhispererCustomizationState : BaseState() {
     @get:MapAnnotation
     val previousAvailableCustomizations by map<String, MutableList<String>>()
 
+    @Deprecated("Use customizationArnOverrideV2 for the latest arn override persistence")
     @get:Property
     var serviceDefaultArn by string()
 

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererModelConfiguratorTest.kt

@@ -421,7 +421,7 @@ class CodeWhispererModelConfiguratorTest {
                 )
             )
 
-            this.serviceDefaultArn = "arn:aws:codewhisperer:default"
+            this.customizationArnOverrideV2 = "arn:aws:codewhisperer:default"
         }
 
         XmlSerializer.serializeInto(state, element)
@@ -470,7 +470,7 @@ class CodeWhispererModelConfiguratorTest {
         val actual = XmlSerializer.deserialize(element, CodeWhispererCustomizationState::class.java)
         assertThat(actual.connectionIdToActiveCustomizationArn).hasSize(0)
         assertThat(actual.previousAvailableCustomizations).hasSize(0)
-        assertThat(actual.serviceDefaultArn).isNull()
+        assertThat(actual.customizationArnOverrideV2).isNull()
     }
 
     @Test
@@ -509,7 +509,7 @@ class CodeWhispererModelConfiguratorTest {
             """
         )
         val actual = XmlSerializer.deserialize(element, CodeWhispererCustomizationState::class.java)
-        assertThat(actual.serviceDefaultArn).isEqualTo("arn:aws:codewhisperer:default")
+        assertThat(actual.customizationArnOverrideV2).isEqualTo("arn:aws:codewhisperer:default")
         assertThat(actual.connectionIdToActiveCustomizationArn).hasSize(1)
         assertThat(actual.connectionIdToActiveCustomizationArn["fake-sso-url"]).isEqualTo(
             CodeWhispererCustomization(
@@ -546,7 +546,7 @@ class CodeWhispererModelConfiguratorTest {
         )
         val actual = XmlSerializer.deserialize(element, CodeWhispererCustomizationState::class.java)
         assertThat(actual.connectionIdToActiveCustomizationArn).hasSize(0)
-        assertThat(actual.serviceDefaultArn).isNull()
+        assertThat(actual.customizationArnOverrideV2).isNull()
         assertThat(actual.previousAvailableCustomizations).hasSize(1)
         assertThat(actual.previousAvailableCustomizations["fake-sso-url"]).isEqualTo(listOf("arn_1", "arn_2", "arn_3"))
     }