Move custom traits to shared file, changed traits namespace, misc pr …

…feedback
smithy-lang · Sep 17, 2024 · 39f66de · 39f66de
1 parent 4e58bbd
commit 39f66de
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/...src/main/kotlin/software/amazon/smithy/kotlin/codegen/model/traits/FailedResponseTrait.kt b/...src/main/kotlin/software/amazon/smithy/kotlin/codegen/model/traits/FailedResponseTrait.kt
diff --git a/...egen/model/traits/SuccessResponseTrait.kt → ...n/codegen/model/traits/SmokeTestTraits.kt b/...egen/model/traits/SuccessResponseTrait.kt → ...n/codegen/model/traits/SmokeTestTraits.kt
@@ -4,11 +4,20 @@ import software.amazon.smithy.model.node.ObjectNode
 import software.amazon.smithy.model.shapes.ShapeId
 import software.amazon.smithy.model.traits.AnnotationTrait
 
+/**
+ * Indicates the annotated service should always return a failed response.
+ */
+class FailedResponseTrait(node: ObjectNode) : AnnotationTrait(ID, node) {
+    companion object {
+        val ID: ShapeId = ShapeId.from("smithy.kotlin.traits#failedResponseTrait")
+    }
+}
+
 /**
  * Indicates the annotated service should always return a success response.
  */
 class SuccessResponseTrait(node: ObjectNode) : AnnotationTrait(ID, node) {
     companion object {
-        val ID: ShapeId = ShapeId.from("com.test#successResponseTrait")
+        val ID: ShapeId = ShapeId.from("smithy.kotlin.traits#successResponseTrait")
     }
 }
diff --git a/...n/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGenerator.kt b/...n/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGenerator.kt
@@ -39,8 +39,8 @@ class SmokeTestsRunnerGenerator(
     private val operations = ctx.model.operations(ctx.settings.service).filter { it.hasTrait<SmokeTestsTrait>() }
 
     // Test config
-    private val hasSuccessResponseTrait = ctx.model.expectShape<ServiceShape>(ctx.settings.service).hasTrait(SuccessResponseTrait.ID)
-    private val hasFailedResponseTrait = ctx.model.expectShape<ServiceShape>(ctx.settings.service).hasTrait(FailedResponseTrait.ID)
+    private val hasSuccessResponseTrait = model.expectShape<ServiceShape>(ctx.settings.service).hasTrait(SuccessResponseTrait.ID)
+    private val hasFailedResponseTrait = model.expectShape<ServiceShape>(ctx.settings.service).hasTrait(FailedResponseTrait.ID)
     init {
         check(!(hasSuccessResponseTrait && hasFailedResponseTrait)) {
             "A service can't have both the success response trait and the failed response trait."