move cusomization data class to shared

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.codewhisperer.customization.CodeWhispererCustomization
+import software.aws.toolkits.jetbrains.services.amazonq.models.QCustomization
 import software.aws.toolkits.jetbrains.services.cwc.editor.context.ActiveFileContext
 import software.aws.toolkits.jetbrains.services.amazonq.project.RelevantDocument
 
@@ -22,7 +22,7 @@ data class ChatRequestData(
     val activeFileContext: ActiveFileContext,
     val userIntent: UserIntent?,
     val triggerType: TriggerType,
-    val customization: CodeWhispererCustomization?,
+    val customization: QCustomization?,
     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,8 +13,8 @@ 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.codewhisperer.credentials.CodeWhispererClientAdaptor
-import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererCustomization
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 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: CodeWhispererCustomization?
+    private val customization: QCustomization?
         get() = CodeWhispererModelConfigurator.getInstance().activeCustomization(context.project)
 
     fun getConversationId(tabId: String): String? = sessionStorage.getSession(tabId)?.session?.conversationId

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.codewhisperer.customization.CodeWhispererCustomization
+import software.aws.toolkits.jetbrains.services.amazonq.models.QCustomization
 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): CodeWhispererCustomization?
+    fun activeCustomization(project: Project): QCustomization?
 
-    fun switchCustomization(project: Project, newCustomization: CodeWhispererCustomization?)
+    fun switchCustomization(project: Project, newCustomization: QCustomization?)
 
     /**
      * 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

@@ -43,7 +43,7 @@ import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
 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.codewhisperer.customization.CodeWhispererCustomization
+import software.aws.toolkits.jetbrains.services.amazonq.models.QCustomization
 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
@@ -89,7 +89,7 @@ interface CodeWhispererClientAdaptor : Disposable {
         isSigv4: Boolean = shouldUseSigv4Client(project),
     ): ListCodeScanFindingsResponse
 
-    fun listAvailableCustomizations(): List<CodeWhispererCustomization>
+    fun listAvailableCustomizations(): List<QCustomization>
 
     fun sendUserTriggerDecisionTelemetry(
         requestContext: RequestContext,
@@ -152,7 +152,7 @@ interface CodeWhispererClientAdaptor : Disposable {
         responseLength: Int?,
         numberOfCodeBlocks: Int?,
         hasProjectLevelContext: Boolean?,
-        customization: CodeWhispererCustomization?,
+        customization: QCustomization?,
     ): SendTelemetryEventResponse
 
     fun sendChatInteractWithMessageTelemetry(
@@ -173,7 +173,7 @@ interface CodeWhispererClientAdaptor : Disposable {
         language: CodeWhispererProgrammingLanguage,
         modificationPercentage: Double,
         hasProjectLevelContext: Boolean?,
-        customization: CodeWhispererCustomization?,
+        customization: QCustomization?,
     ): SendTelemetryEventResponse
 
     companion object {
@@ -273,7 +273,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<CodeWhispererCustomization> =
+    override fun listAvailableCustomizations(): List<QCustomization> =
         bearerClient().listAvailableCustomizationsPaginator(ListAvailableCustomizationsRequest.builder().build())
             .stream()
             .toList()
@@ -284,7 +284,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                     }"
                 }
                 resp.customizations().map {
-                    CodeWhispererCustomization(
+                    QCustomization(
                         arn = it.arn(),
                         name = it.name(),
                         description = it.description()
@@ -459,7 +459,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
         responseLength: Int?,
         numberOfCodeBlocks: Int?,
         hasProjectLevelContext: Boolean?,
-        customization: CodeWhispererCustomization?,
+        customization: QCustomization?,
     ): SendTelemetryEventResponse = bearerClient().sendTelemetryEvent { requestBuilder ->
         requestBuilder.telemetryEvent { telemetryEventBuilder ->
             telemetryEventBuilder.chatAddMessageEvent {
@@ -520,7 +520,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
         language: CodeWhispererProgrammingLanguage,
         modificationPercentage: Double,
         hasProjectLevelContext: Boolean?,
-        customization: CodeWhispererCustomization?,
+        customization: QCustomization?,
     ): 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,6 +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.codewhisperer.util.CodeWhispererConstants.Q_CUSTOM_LEARN_MORE_URI
 import software.aws.toolkits.jetbrains.ui.AsyncComboBox
 import software.aws.toolkits.jetbrains.utils.notifyInfo
@@ -34,7 +35,7 @@ import javax.swing.JComponent
 import javax.swing.JList
 
 private val NoDataToDisplay = CustomizationUiItem(
-    CodeWhispererCustomization("", message("codewhisperer.custom.dialog.option.no_data"), ""),
+    QCustomization("", message("codewhisperer.custom.dialog.option.no_data"), ""),
     false,
     false
 )
@@ -227,7 +228,7 @@ class CodeWhispererCustomizationDialog(
     }
 }
 
-private fun List<CustomizationUiItem>.putPickedUpFront(picked: Set<CodeWhispererCustomization>) = sortedWith { o1, o2 ->
+private fun List<CustomizationUiItem>.putPickedUpFront(picked: Set<QCustomization>) = 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

@@ -20,6 +20,7 @@ import com.intellij.util.xmlb.annotations.Property
 import software.amazon.awssdk.services.codewhispererruntime.model.CodeWhispererRuntimeException
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
+import software.aws.toolkits.jetbrains.services.amazonq.models.QCustomization
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererFeatureConfigService
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
@@ -65,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, CodeWhispererCustomization>(mutableMapOf())
+    private val connectionIdToActiveCustomizationArn = Collections.synchronizedMap<String, QCustomization>(mutableMapOf())
 
     // Map to store connectionId to its listAvailableCustomizations result last time
     private val connectionToCustomizationsShownLastTime = mutableMapOf<String, MutableList<String>>()
@@ -157,20 +158,20 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe
             return@calculateIfIamIdentityCenterConnection customizationUiItems
         }
 
-    override fun activeCustomization(project: Project): CodeWhispererCustomization? {
+    override fun activeCustomization(project: Project): QCustomization? {
         val result = calculateIfIamIdentityCenterConnection(project) { connectionIdToActiveCustomizationArn[it.id] }
 
         // A/B case
         val customizationArnFromAB = CodeWhispererFeatureConfigService.getInstance().getCustomizationArnOverride()
         if (customizationArnFromAB.isEmpty()) return result
-        return CodeWhispererCustomization(
+        return QCustomization(
             arn = customizationArnFromAB,
             name = result?.name.orEmpty(),
             description = result?.description
         )
     }
 
-    override fun switchCustomization(project: Project, newCustomization: CodeWhispererCustomization?) {
+    override fun switchCustomization(project: Project, newCustomization: QCustomization?) {
         calculateIfIamIdentityCenterConnection(project) {
             val oldCus = connectionIdToActiveCustomizationArn[it.id]
             if (oldCus != newCustomization) {
@@ -268,15 +269,15 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe
 class CodeWhispererCustomizationState : BaseState() {
     @get:Property
     @get:MapAnnotation
-    val connectionIdToActiveCustomizationArn by map<String, CodeWhispererCustomization>()
+    val connectionIdToActiveCustomizationArn by map<String, QCustomization>()
 
     @get:Property
     @get:MapAnnotation
     val previousAvailableCustomizations by map<String, MutableList<String>>()
 }
 
 data class CustomizationUiItem(
-    val customization: CodeWhispererCustomization,
+    val customization: QCustomization,
     val isNew: Boolean,
     val shouldPrefixAccountId: Boolean,
 )

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererCustomization.kt renamed to plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/models/QCustomization.kt

@@ -1,9 +1,9 @@
 // Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package software.aws.toolkits.jetbrains.services.codewhisperer.customization
+package software.aws.toolkits.jetbrains.services.amazonq.models
 
-data class CodeWhispererCustomization(
+data class QCustomization(
     @JvmField
     var arn: String = "",