revert rename

Author: Will-ShaoHua

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/model/Requests.kt

@@ -5,7 +5,7 @@ package software.aws.toolkits.jetbrains.services.cwc.clients.chat.model
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import software.amazon.awssdk.services.codewhispererstreaming.model.UserIntent
-import software.aws.toolkits.jetbrains.services.amazonq.models.QCustomization
+import software.aws.toolkits.jetbrains.services.amazonq.models.CodeWhispererCustomization
 import software.aws.toolkits.jetbrains.services.amazonq.project.RelevantDocument
 import software.aws.toolkits.jetbrains.services.cwc.editor.context.ActiveFileContext
 
@@ -22,7 +22,7 @@ data class ChatRequestData(
     val activeFileContext: ActiveFileContext,
     val userIntent: UserIntent?,
     val triggerType: TriggerType,
-    val customization: QCustomization?,
+    val customization: CodeWhispererCustomization?,
     val relevantTextDocuments: List<RelevantDocument>,
     val useRelevantDocuments: Boolean,
 )

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt

@@ -13,7 +13,7 @@ import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
-import software.aws.toolkits.jetbrains.services.amazonq.models.QCustomization
+import software.aws.toolkits.jetbrains.services.amazonq.models.CodeWhispererCustomization
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatRequestData
@@ -45,7 +45,7 @@ class TelemetryHelper(private val context: AmazonQAppInitContext, private val se
     private val responseStreamTimeForChunks: MutableMap<String, MutableList<Instant>> = mutableMapOf()
     private val responseHasProjectContext: MutableMap<String, Boolean> = mutableMapOf()
 
-    private val customization: QCustomization?
+    private val customization: CodeWhispererCustomization?
         get() = CodeWhispererModelConfigurator.getInstance().activeCustomization(context.project)
 
     fun getConversationId(tabId: String): String? = sessionStorage.getSession(tabId)?.session?.conversationId

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/TelemetryHelperTest.kt

@@ -40,7 +40,7 @@ import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
 import software.aws.toolkits.jetbrains.core.credentials.sono.Q_SCOPES
 import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
-import software.aws.toolkits.jetbrains.services.amazonq.models.QCustomization
+import software.aws.toolkits.jetbrains.services.amazonq.models.CodeWhispererCustomization
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.ChatSession
@@ -112,7 +112,7 @@ class TelemetryHelperTest {
         private const val customizationArn = "customizationArn"
         private const val steRequestId = "sendTelemetryEventRequestId"
         private const val lang = "java"
-        private val mockCustomization = QCustomization(customizationArn, "name", "description")
+        private val mockCustomization = CodeWhispererCustomization(customizationArn, "name", "description")
         private val data = ChatRequestData(
             tabId = tabId,
             message = "foo",

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

@@ -5,7 +5,7 @@ package migration.software.aws.toolkits.jetbrains.services.codewhisperer.customi
 
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
-import software.aws.toolkits.jetbrains.services.amazonq.models.QCustomization
+import software.aws.toolkits.jetbrains.services.amazonq.models.CodeWhispererCustomization
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CustomizationUiItem
 
 // A component responsible managing client's codewhisperer model configuration (currently customization feature only support enterprise tier users)
@@ -14,9 +14,9 @@ interface CodeWhispererModelConfigurator {
 
     fun listCustomizations(project: Project, passive: Boolean = false): List<CustomizationUiItem>?
 
-    fun activeCustomization(project: Project): QCustomization?
+    fun activeCustomization(project: Project): CodeWhispererCustomization?
 
-    fun switchCustomization(project: Project, newCustomization: QCustomization?)
+    fun switchCustomization(project: Project, newCustomization: CodeWhispererCustomization?)
 
     /**
      * This method is only used for invalidate a stale customization which was previously active but was removed, it will remove all usage of this customization

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt

@@ -40,7 +40,7 @@ import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManagerListener
 import software.aws.toolkits.jetbrains.core.credentials.pinning.CodeWhispererConnection
 import software.aws.toolkits.jetbrains.services.amazonq.codeWhispererUserContext
-import software.aws.toolkits.jetbrains.services.amazonq.models.QCustomization
+import software.aws.toolkits.jetbrains.services.amazonq.models.CodeWhispererCustomization
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.RequestContext
@@ -84,7 +84,7 @@ interface CodeWhispererClientAdaptor : Disposable {
         isSigv4: Boolean = shouldUseSigv4Client(project),
     ): ListCodeScanFindingsResponse
 
-    fun listAvailableCustomizations(): List<QCustomization>
+    fun listAvailableCustomizations(): List<CodeWhispererCustomization>
 
     fun sendUserTriggerDecisionTelemetry(
         requestContext: RequestContext,
@@ -147,7 +147,7 @@ interface CodeWhispererClientAdaptor : Disposable {
         responseLength: Int?,
         numberOfCodeBlocks: Int?,
         hasProjectLevelContext: Boolean?,
-        customization: QCustomization?,
+        customization: CodeWhispererCustomization?,
     ): SendTelemetryEventResponse
 
     fun sendChatInteractWithMessageTelemetry(
@@ -168,7 +168,7 @@ interface CodeWhispererClientAdaptor : Disposable {
         language: CodeWhispererProgrammingLanguage,
         modificationPercentage: Double,
         hasProjectLevelContext: Boolean?,
-        customization: QCustomization?,
+        customization: CodeWhispererCustomization?,
     ): SendTelemetryEventResponse
 
     companion object {
@@ -250,7 +250,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
         }
 
     // DO NOT directly use this method to fetch customizations, use wrapper [CodeWhispererModelConfigurator.listCustomization()] instead
-    override fun listAvailableCustomizations(): List<QCustomization> =
+    override fun listAvailableCustomizations(): List<CodeWhispererCustomization> =
         bearerClient().listAvailableCustomizationsPaginator(ListAvailableCustomizationsRequest.builder().build())
             .stream()
             .toList()
@@ -261,7 +261,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                     }"
                 }
                 resp.customizations().map {
-                    QCustomization(
+                    CodeWhispererCustomization(
                         arn = it.arn(),
                         name = it.name(),
                         description = it.description()
@@ -436,7 +436,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
         responseLength: Int?,
         numberOfCodeBlocks: Int?,
         hasProjectLevelContext: Boolean?,
-        customization: QCustomization?,
+        customization: CodeWhispererCustomization?,
     ): SendTelemetryEventResponse = bearerClient().sendTelemetryEvent { requestBuilder ->
         requestBuilder.telemetryEvent { telemetryEventBuilder ->
             telemetryEventBuilder.chatAddMessageEvent {
@@ -497,7 +497,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
         language: CodeWhispererProgrammingLanguage,
         modificationPercentage: Double,
         hasProjectLevelContext: Boolean?,
-        customization: QCustomization?,
+        customization: CodeWhispererCustomization?,
     ): SendTelemetryEventResponse = bearerClient().sendTelemetryEvent { requestBuilder ->
         requestBuilder.telemetryEvent { telemetryEventBuilder ->
             telemetryEventBuilder.chatUserModificationEvent {

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

@@ -26,7 +26,7 @@ import software.amazon.awssdk.arns.Arn
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.tryOrNull
-import software.aws.toolkits.jetbrains.services.amazonq.models.QCustomization
+import software.aws.toolkits.jetbrains.services.amazonq.models.CodeWhispererCustomization
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.Q_CUSTOM_LEARN_MORE_URI
 import software.aws.toolkits.jetbrains.ui.AsyncComboBox
 import software.aws.toolkits.jetbrains.utils.notifyInfo
@@ -35,7 +35,7 @@ import javax.swing.JComponent
 import javax.swing.JList
 
 private val NoDataToDisplay = CustomizationUiItem(
-    QCustomization("", message("codewhisperer.custom.dialog.option.no_data"), ""),
+    CodeWhispererCustomization("", message("codewhisperer.custom.dialog.option.no_data"), ""),
     false,
     false
 )
@@ -228,7 +228,7 @@ class CodeWhispererCustomizationDialog(
     }
 }
 
-private fun List<CustomizationUiItem>.putPickedUpFront(picked: Set<QCustomization>) = sortedWith { o1, o2 ->
+private fun List<CustomizationUiItem>.putPickedUpFront(picked: Set<CodeWhispererCustomization>) = sortedWith { o1, o2 ->
     val has1 = picked.contains(o1.customization)
     val has2 = picked.contains(o2.customization)
 

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

@@ -22,7 +22,7 @@ import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
 import software.aws.toolkits.jetbrains.services.amazonq.calculateIfIamIdentityCenterConnection
-import software.aws.toolkits.jetbrains.services.amazonq.models.QCustomization
+import software.aws.toolkits.jetbrains.services.amazonq.models.CodeWhispererCustomization
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
 import software.aws.toolkits.jetbrains.utils.notifyInfo
@@ -66,7 +66,7 @@ private fun notifyNewCustomization(project: Project) {
 class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, PersistentStateComponent<CodeWhispererCustomizationState>, Disposable {
     // TODO: refactor and clean these states, probably not need all the follwing and it's hard to maintain
     // Map to store connectionId to its active customization
-    private val connectionIdToActiveCustomizationArn = Collections.synchronizedMap<String, QCustomization>(mutableMapOf())
+    private val connectionIdToActiveCustomizationArn = Collections.synchronizedMap<String, CodeWhispererCustomization>(mutableMapOf())
 
     // Map to store connectionId to its listAvailableCustomizations result last time
     private val connectionToCustomizationsShownLastTime = mutableMapOf<String, MutableList<String>>()
@@ -158,20 +158,20 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe
             return@calculateIfIamIdentityCenterConnection customizationUiItems
         }
 
-    override fun activeCustomization(project: Project): QCustomization? {
+    override fun activeCustomization(project: Project): CodeWhispererCustomization? {
         val result = calculateIfIamIdentityCenterConnection(project) { connectionIdToActiveCustomizationArn[it.id] }
 
         // A/B case
         val customizationArnFromAB = CodeWhispererFeatureConfigService.getInstance().getCustomizationArnOverride()
         if (customizationArnFromAB.isEmpty()) return result
-        return QCustomization(
+        return CodeWhispererCustomization(
             arn = customizationArnFromAB,
             name = result?.name.orEmpty(),
             description = result?.description
         )
     }
 
-    override fun switchCustomization(project: Project, newCustomization: QCustomization?) {
+    override fun switchCustomization(project: Project, newCustomization: CodeWhispererCustomization?) {
         calculateIfIamIdentityCenterConnection(project) {
             val oldCus = connectionIdToActiveCustomizationArn[it.id]
             if (oldCus != newCustomization) {
@@ -269,15 +269,15 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe
 class CodeWhispererCustomizationState : BaseState() {
     @get:Property
     @get:MapAnnotation
-    val connectionIdToActiveCustomizationArn by map<String, QCustomization>()
+    val connectionIdToActiveCustomizationArn by map<String, CodeWhispererCustomization>()
 
     @get:Property
     @get:MapAnnotation
     val previousAvailableCustomizations by map<String, MutableList<String>>()
 }
 
 data class CustomizationUiItem(
-    val customization: QCustomization,
+    val customization: CodeWhispererCustomization,
     val isNew: Boolean,
     val shouldPrefixAccountId: Boolean,
 )

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

@@ -73,7 +73,7 @@ import software.aws.toolkits.jetbrains.core.credentials.MockCredentialManagerRul
 import software.aws.toolkits.jetbrains.core.credentials.MockToolkitAuthManagerRule
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_REGION
-import software.aws.toolkits.jetbrains.services.amazonq.models.QCustomization
+import software.aws.toolkits.jetbrains.services.amazonq.models.CodeWhispererCustomization
 import software.aws.toolkits.jetbrains.services.codewhisperer.CodeWhispererTestUtil.metadata
 import software.aws.toolkits.jetbrains.services.codewhisperer.CodeWhispererTestUtil.pythonRequest
 import software.aws.toolkits.jetbrains.services.codewhisperer.CodeWhispererTestUtil.pythonResponseWithToken
@@ -198,9 +198,9 @@ class CodeWhispererClientAdaptorTest {
         assertThat(actual).hasSize(3)
         assertThat(actual).isEqualTo(
             listOf(
-                QCustomization(name = "custom-1", arn = "arn-1"),
-                QCustomization(name = "custom-2", arn = "arn-2"),
-                QCustomization(name = "custom-3", arn = "arn-3")
+                CodeWhispererCustomization(name = "custom-1", arn = "arn-1"),
+                CodeWhispererCustomization(name = "custom-2", arn = "arn-2"),
+                CodeWhispererCustomization(name = "custom-3", arn = "arn-3")
             )
         )
     }
@@ -239,7 +239,7 @@ class CodeWhispererClientAdaptorTest {
     @Test
     fun sendUserTriggerDecisionTelemetry() {
         val mockModelConfiguraotr = mock<CodeWhispererModelConfigurator> {
-            on { activeCustomization(any()) } doReturn QCustomization("fake-arn", "fake-name")
+            on { activeCustomization(any()) } doReturn CodeWhispererCustomization("fake-arn", "fake-name")
         }
         ApplicationManager.getApplication().replaceService(CodeWhispererModelConfigurator::class.java, mockModelConfiguraotr, disposableRule.disposable)
 

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

@@ -22,7 +22,7 @@ import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.pinning.CodeWhispererConnection
 import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_URL
 import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
-import software.aws.toolkits.jetbrains.services.amazonq.models.QCustomization
+import software.aws.toolkits.jetbrains.services.amazonq.models.CodeWhispererCustomization
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
 import kotlin.reflect.full.memberFunctions
 import kotlin.test.Test
@@ -76,7 +76,7 @@ class CodeWhispererFeatureConfigServiceTest {
             ).build()
             on { listAvailableCustomizations() } doReturn
                 if (isInListAvailableCustomizations) {
-                    listOf(QCustomization(arn = "test arn", name = "Test Arn"))
+                    listOf(CodeWhispererCustomization(arn = "test arn", name = "Test Arn"))
                 } else {
                     emptyList()
                 }