Skip to content

Commit 6f99d90

Browse files
tverneytverney
committed
fix(dev): use string instead of UUID in startAssist to help on testing
1 parent aeeee4a commit 6f99d90

File tree

6 files changed

+18
-19
lines changed

6 files changed

+18
-19
lines changed

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/clients/FeatureDevClient.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.calculateTo
3636
import software.aws.toolkits.jetbrains.services.telemetry.ClientMetadata
3737
import software.aws.toolkits.jetbrains.settings.AwsSettings
3838
import java.time.Instant
39-
import java.util.UUID
4039
import software.amazon.awssdk.services.codewhispererruntime.model.ChatTriggerType as SyncChatTriggerType
4140

4241
@Service(Service.Level.PROJECT)
@@ -125,7 +124,7 @@ class FeatureDevClient(
125124
conversationId: String,
126125
uploadId: String,
127126
userMessage: String,
128-
codeGenerationId: UUID,
127+
codeGenerationId: String?,
129128
currentCodeGenerationId: String?,
130129
): StartTaskAssistCodeGenerationResponse =
131130
bearerClient()

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ class CodeGenerationState(
5959
conversationId = config.conversationId,
6060
uploadId = uploadId,
6161
message = action.msg,
62-
codeGenerationId = codeGenerationId,
63-
currentCodeGenerationId = currentCodeGenerationId,
62+
codeGenerationId = codeGenerationId.toString(),
63+
currentCodeGenerationId = currentCodeGenerationId.toString(),
6464
)
6565

6666
if (action.token?.token()?.isCancellationRequested != true) {

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/FeatureDevService.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class FeatureDevService(val proxyClient: FeatureDevClient, val project: Project)
113113
}
114114
}
115115

116-
fun startTaskAssistCodeGeneration(conversationId: String, uploadId: String, message: String, codeGenerationId: UUID, currentCodeGenerationId: UUID?):
116+
fun startTaskAssistCodeGeneration(conversationId: String, uploadId: String, message: String, codeGenerationId: String?, currentCodeGenerationId: String?):
117117
StartTaskAssistCodeGenerationResponse {
118118
try {
119119
logger.debug { "Executing startTaskAssistCodeGeneration with conversationId: $conversationId , uploadId: $uploadId" }
@@ -122,7 +122,7 @@ class FeatureDevService(val proxyClient: FeatureDevClient, val project: Project)
122122
uploadId,
123123
message,
124124
codeGenerationId,
125-
currentCodeGenerationId?.toString() ?: "EMPTY_CURRENT_CODE_GENERATION_ID"
125+
currentCodeGenerationId ?: "EMPTY_CURRENT_CODE_GENERATION_ID"
126126
)
127127

128128
logger.debug { "$FEATURE_NAME: Started code generation with requestId: ${startCodeGenerationResponse.responseMetadata().requestId()}" }

‎plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevTestBase.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ open class FeatureDevTestBase(
6060
internal val testRequestId = "test_aws_request_id"
6161
internal val testConversationId = "1234"
6262
internal val userMessage = "test-user-message"
63-
internal val codeGenerationId = UUID.randomUUID()
63+
internal val codeGenerationId = "1234"
6464
internal val currentCodeGenerationId = UUID.randomUUID()
6565
internal val testUploadId = "5678"
6666
internal val testRepositorySize = 20.0 // Picked a random size
@@ -91,7 +91,7 @@ open class FeatureDevTestBase(
9191

9292
internal val exampleStartTaskAssistConversationResponse = StartTaskAssistCodeGenerationResponse.builder()
9393
.conversationId(testConversationId)
94-
.codeGenerationId(codeGenerationId.toString())
94+
.codeGenerationId(codeGenerationId)
9595
.responseMetadata(DefaultAwsResponseMetadata.create(mapOf(AwsHeader.AWS_REQUEST_ID to testRequestId)))
9696
.build() as StartTaskAssistCodeGenerationResponse
9797

‎plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/clients/FeatureDevClientTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class FeatureDevClientTest : FeatureDevTestBase() {
144144
"test-user-message",
145145
currentCodeGenerationId = UUID.randomUUID()
146146
.toString(),
147-
codeGenerationId = UUID.randomUUID()
147+
codeGenerationId = codeGenerationId
148148
)
149149

150150
argumentCaptor<StartTaskAssistCodeGenerationRequest>().apply {

‎plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/FeatureDevServiceTest.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
148148
testConversationId,
149149
testUploadId,
150150
userMessage,
151-
codeGenerationId = UUID.randomUUID(),
151+
codeGenerationId = codeGenerationId,
152152
currentCodeGenerationId = null,
153153
),
154154
).thenReturn(exampleStartTaskAssistConversationResponse)
@@ -158,7 +158,7 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
158158
testConversationId,
159159
testUploadId,
160160
userMessage,
161-
codeGenerationId = UUID.randomUUID(),
161+
codeGenerationId = codeGenerationId,
162162
currentCodeGenerationId = null,
163163
)
164164

@@ -178,7 +178,7 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
178178
testConversationId,
179179
testUploadId,
180180
userMessage,
181-
codeGenerationId = UUID.randomUUID(),
181+
codeGenerationId = codeGenerationId,
182182
currentCodeGenerationId = null,
183183
),
184184
).thenThrow(exampleCWException)
@@ -188,7 +188,7 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
188188
testConversationId,
189189
testUploadId,
190190
userMessage,
191-
codeGenerationId = UUID.randomUUID(),
191+
codeGenerationId = codeGenerationId,
192192
currentCodeGenerationId = null,
193193
)
194194
}.isExactlyInstanceOf(CodeIterationLimitException::class.java).withFailMessage(
@@ -209,7 +209,7 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
209209
testConversationId,
210210
testUploadId,
211211
userMessage,
212-
codeGenerationId = UUID.randomUUID(),
212+
codeGenerationId = codeGenerationId,
213213
currentCodeGenerationId = null,
214214
),
215215
).thenThrow(exampleCWException)
@@ -219,7 +219,7 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
219219
testConversationId,
220220
testUploadId,
221221
userMessage,
222-
codeGenerationId = UUID.randomUUID(),
222+
codeGenerationId = codeGenerationId,
223223
currentCodeGenerationId = null,
224224
)
225225
}.isExactlyInstanceOf(CodeIterationLimitException::class.java).withFailMessage(
@@ -240,7 +240,7 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
240240
testConversationId,
241241
testUploadId,
242242
userMessage,
243-
codeGenerationId = UUID.randomUUID(),
243+
codeGenerationId = codeGenerationId,
244244
currentCodeGenerationId = null,
245245
),
246246
).thenThrow(exampleCWException)
@@ -250,7 +250,7 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
250250
testConversationId,
251251
testUploadId,
252252
userMessage,
253-
codeGenerationId = UUID.randomUUID(),
253+
codeGenerationId = codeGenerationId,
254254
currentCodeGenerationId = null,
255255
)
256256
}.isExactlyInstanceOf(FeatureDevException::class.java).withFailMessage(cwExceptionMsg)
@@ -264,7 +264,7 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
264264
testConversationId,
265265
testUploadId,
266266
userMessage,
267-
codeGenerationId = UUID.randomUUID(),
267+
codeGenerationId = codeGenerationId,
268268
currentCodeGenerationId = null,
269269
),
270270
).thenThrow(exampleOtherException)
@@ -274,7 +274,7 @@ class FeatureDevServiceTest : FeatureDevTestBase() {
274274
testConversationId,
275275
testUploadId,
276276
userMessage,
277-
codeGenerationId = UUID.randomUUID(),
277+
codeGenerationId = codeGenerationId,
278278
currentCodeGenerationId = null,
279279
)
280280
}.isExactlyInstanceOf(FeatureDevException::class.java).withFailMessage(otherExceptionMsg)

0 commit comments

Comments
 (0)