Skip to content

Commit ebf94f9

Browse files
committed
tst
1 parent 34efb26 commit ebf94f9

File tree

7 files changed

+20
-31
lines changed

7 files changed

+20
-31
lines changed

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/EnumJsonValueAdapter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
3-
3+
@file:Suppress("BannedImports")
44
package software.aws.toolkits.jetbrains.services.amazonq.lsp.model
55

66
import com.fasterxml.jackson.annotation.JsonValue
@@ -15,7 +15,7 @@ import com.google.gson.reflect.TypeToken
1515
class EnumJsonValueAdapter : TypeAdapterFactory {
1616
override fun <T> create(
1717
gson: Gson,
18-
type: TypeToken<T>
18+
type: TypeToken<T>,
1919
): TypeAdapter<T>? {
2020
val rawType = type.getRawType()
2121
if (!rawType.isEnum) {

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/AuthFollowUpClicked.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,4 @@ enum class AuthFollowupType(@JsonValue val repr: String) {
2424
RE_AUTH("re-auth"),
2525
MISSING_SCOPES("missing_scopes"),
2626
USE_SUPPORTED_AUTH("use-supported-auth"),
27-
;
2827
}

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/ChatMessage.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ enum class IconType(@JsonValue val repr: String) {
8282
TRASH("trash"),
8383
SEARCH("search"),
8484
CALENDAR("calendar"),
85-
;
86-
8785
}
8886

8987
@JsonAdapter(EnumJsonValueAdapter::class)
@@ -92,8 +90,6 @@ enum class Status(@JsonValue val repr: String) {
9290
SUCCESS("success"),
9391
WARNING("warning"),
9492
ERROR("error"),
95-
;
96-
9793
}
9894

9995
@JsonAdapter(EnumJsonValueAdapter::class)
@@ -105,8 +101,6 @@ enum class ButtonStatus(@JsonValue val repr: String) {
105101
SUCCESS("success"),
106102
WARNING("warning"),
107103
ERROR("error"),
108-
;
109-
110104
}
111105

112106
// https://github.com/aws/language-server-runtimes/blame/68319c975d29a8ba9b084c9fa780ebff75b286bb/types/chat.ts#L127
@@ -117,5 +111,4 @@ enum class MessageType(@JsonValue val repr: String) {
117111
SYSTEM_PROMPT("system-prompt"),
118112
DIRECTIVE("directive"),
119113
TOOL("tool"),
120-
;
121114
}

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/Conversations.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,12 @@ typealias ListConversationsResult = ConversationsList
6161
enum class TextInputType(@JsonValue val repr: String) {
6262
TEXTAREA("textarea"),
6363
TEXTINPUT("textinput"),
64-
;
6564
}
6665

6766
@JsonAdapter(EnumJsonValueAdapter::class)
6867
enum class ConversationAction(@JsonValue val repr: String) {
6968
DELETE("delete"),
7069
EXPORT("markdown"),
71-
;
7270
}
7371

7472
data class ConversationClickParams(

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/GetSerializedChatParams.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ data class GetSerializedChatParams(
1616
enum class SerializedChatFormat(@JsonValue val repr: String) {
1717
HTML("html"),
1818
MARKDOWN("markdown"),
19-
;
2019
}
2120

2221
data class GetSerializedChatResult(

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/TabBarActionParams.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ data class TabBarActionParams(
1515
@JsonAdapter(EnumJsonValueAdapter::class)
1616
enum class TabBarAction(@JsonValue val repr: String) {
1717
EXPORT("export"),
18-
;
1918
}
2019

2120
data class TabBarActionResult(

plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/ChatMessageTest.kt

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
3-
3+
@file:Suppress("BannedImports")
44
package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
55

66
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
@@ -28,7 +28,6 @@ class ChatMessageTest {
2828

2929
assertThat(Gson().fromJson(expected, IconType::class.java)).isEqualTo(it)
3030
assertThat(jackson.readValue<IconType>(expected)).isEqualTo(it)
31-
3231
}
3332
}
3433

@@ -46,24 +45,26 @@ class ChatMessageTest {
4645
// jackson is more straight forward so assume that it is probably the correct repr
4746
val jacksonJson = jackson.writeValueAsString(enumValue)
4847

49-
yield(DynamicTest.dynamicTest("$enumFqn.${enumValue.name}") {
50-
AutoCloseableSoftAssertions().use { softly ->
51-
val jacksonRead = jackson.readValue(jacksonJson, clazz)
52-
softly.assertThat(jacksonRead)
53-
.describedAs { "Jackson roundtrip $enumFqn: expecting ${enumValue.name}" }
54-
.isEqualTo(enumValue)
48+
yield(
49+
DynamicTest.dynamicTest("$enumFqn.${enumValue.name}") {
50+
AutoCloseableSoftAssertions().use { softly ->
51+
val jacksonRead = jackson.readValue(jacksonJson, clazz)
52+
softly.assertThat(jacksonRead)
53+
.describedAs { "Jackson roundtrip $enumFqn: expecting ${enumValue.name}" }
54+
.isEqualTo(enumValue)
5555

56-
val gsonRead = Gson().fromJson(jacksonJson, clazz)
57-
softly.assertThat(gsonRead)
58-
.describedAs { "Gson deserialize $enumFqn: expecting ${enumValue.name}" }
59-
.isEqualTo(enumValue)
56+
val gsonRead = Gson().fromJson(jacksonJson, clazz)
57+
softly.assertThat(gsonRead)
58+
.describedAs { "Gson deserialize $enumFqn: expecting ${enumValue.name}" }
59+
.isEqualTo(enumValue)
6060

61-
val gsonWrite = Gson().toJson(enumValue)
62-
softly.assertThat(gsonWrite)
63-
.describedAs { "Gson serialize $enumFqn: expecting $jacksonJson" }
64-
.isEqualTo(jacksonJson)
61+
val gsonWrite = Gson().toJson(enumValue)
62+
softly.assertThat(gsonWrite)
63+
.describedAs { "Gson serialize $enumFqn: expecting $jacksonJson" }
64+
.isEqualTo(jacksonJson)
65+
}
6566
}
66-
})
67+
)
6768
}
6869
}
6970
}.asStream()

0 commit comments

Comments
 (0)