fix error message and add double nested list unique items test

Author: luigi

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/service/contraints/ConstraintUtilsGenerator.kt

@@ -47,6 +47,7 @@ internal class ConstraintUtilsGenerator(
                         write("is Boolean,")
                         write("is java.time.Instant,")
                         write("is Number -> v == other.v")
+                        write("is ByteArray -> v.contentEquals(other.v as ByteArray)")
                         withBlock("is List<*> -> {", "}") {
                             write("val o = other.v as List<*>")
                             write("v.size == o.size &&  v.indices.all { i -> Wrapped(v[i]) == Wrapped(o[i]) }")
@@ -60,6 +61,7 @@ internal class ConstraintUtilsGenerator(
                 }
                 withBlock("override fun hashCode(): Int = when (v) {", "}") {
                     write("null -> 0")
+                    write("is ByteArray -> v.contentHashCode()")
                     write("is List<*> -> v.fold(1) { acc, e -> 31 * acc + Wrapped(e).hashCode() }")
                     write("is Map<*, *> -> v.entries.fold(1) { acc, (k, e) -> 31 * acc + Wrapped(k).hashCode() xor Wrapped(e).hashCode() }")
                     write("else -> v.hashCode()")

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/service/contraints/LengthConstraint.kt

@@ -11,7 +11,7 @@ internal class LengthConstraint(val memberPrefix: String, val memberName: String
         val max = trait.max.orElse(null)
         writer.write("if (${memberPrefix}$memberName == null) { return }")
         writer.withBlock("require(${memberPrefix}$memberName is List<*> || ${memberPrefix}$memberName is Map<*, *> || ${memberPrefix}$memberName is String || ${memberPrefix}$memberName is java.sql.Blob) {", "}") {
-            write("\"Length trait supports only List, Map, String, or Blob, but type \${${memberPrefix}$memberName?.javaClass?.simpleName ?: #S} was given\"", "null")
+            write("\"The `length` trait can be applied only to List, Map, String, or Blob, but variable `$memberName` is of type `\${${memberPrefix}$memberName?.javaClass?.simpleName ?: #S}`.\"", "null")
         }
 
         if (max != null && min != null) {

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/service/contraints/PatternConstraint.kt

@@ -8,7 +8,7 @@ internal class PatternConstraint(val memberPrefix: String, val memberName: Strin
     override fun render() {
         writer.write("if (${memberPrefix}$memberName == null) { return }")
         writer.withBlock("require(${memberPrefix}$memberName is String) {", "}") {
-            write("\"Pattern trait supports only String, but type \${${memberPrefix}$memberName?.javaClass?.simpleName ?: #S} was given\"", "null")
+            write("\"The `pattern` trait can be applied only to String, but variable `$memberName` is of type `\${${memberPrefix}$memberName?.javaClass?.simpleName ?: #S}`.\"", "null")
         }
         writer.write("val ${memberName}Pattern = #S", trait.pattern)
             .write("val ${memberName}Regex = Regex(${memberName}Pattern)")

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/service/contraints/RangeConstraint.kt

@@ -10,7 +10,7 @@ internal class RangeConstraint(val memberPrefix: String, val memberName: String,
         val max = trait.max.orElse(null)
         writer.write("if (${memberPrefix}$memberName == null) { return }")
         writer.withBlock("require(${memberPrefix}$memberName is Number) {", "}") {
-            write("\"Range trait supports only Number, but type \${${memberPrefix}$memberName?.javaClass?.simpleName ?: #S} was given\"", "null")
+            write("\"The `range` trait can be applied only to Number, but variable `$memberName` is of type `\${${memberPrefix}$memberName?.javaClass?.simpleName ?: #S}`.\"", "null")
         }
 
         if (max != null && min != null) {

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/service/contraints/UniqueItemsConstraint.kt

@@ -9,7 +9,7 @@ internal class UniqueItemsConstraint(val memberPrefix: String, val memberName: S
     override fun render() {
         writer.write("if (${memberPrefix}$memberName == null) { return }")
         writer.withBlock("require(${memberPrefix}$memberName is List<*>) {", "}") {
-            write("\"Unique items trait supports only List, but type \${${memberPrefix}$memberName?.javaClass?.simpleName ?: #S} was given\"", "null")
+            write("\"The `uniqueItems` trait can be applied only to List, but variable `$memberName` is of type `\${${memberPrefix}$memberName?.javaClass?.simpleName ?: #S}`.\"", "null")
         }
         writer.write("require(#T(${memberPrefix}$memberName)) { #S }", ServiceTypes(pkgName).hasAllUniqueElements, "$memberName must have unique items")
     }

tests/codegen/service-codegen-tests/model/service-constraints-test.smithy

@@ -15,6 +15,7 @@ service ServiceConstraintsTest {
         RangeConstraintTest,
         UniqueItemsConstraintTest,
         NestedUniqueItemsConstraintTest,
+        DoubleNestedUniqueItemsConstraintTest,
     ]
 }
 
@@ -131,6 +132,20 @@ structure NestedUniqueItemsConstraintTestInput {
 @output
 structure NestedUniqueItemsConstraintTestOutput {}
 
+@http(method: "POST", uri: "/double-nested-unique-items-constraint", code: 201)
+operation DoubleNestedUniqueItemsConstraintTest {
+    input: DoubleNestedUniqueItemsConstraintTestInput
+    output: DoubleNestedUniqueItemsConstraintTestOutput
+}
+
+@input
+structure DoubleNestedUniqueItemsConstraintTestInput {
+    doubleNestedUniqueItemsListInput: UniqueItemsListWrapContainer
+}
+
+@output
+structure DoubleNestedUniqueItemsConstraintTestOutput {}
+
 
 
 list NotUniqueItemsList {
@@ -147,6 +162,11 @@ list UniqueItemsListWrap {
     member: UniqueItemsList
 }
 
+@uniqueItems
+list UniqueItemsListWrapContainer {
+    member: UniqueItemsListWrap
+}
+
 map MyMap {
     key: String
     value: String

tests/codegen/service-codegen-tests/src/test/kotlin/com/test/ServiceConstraintsTest.kt

@@ -25,7 +25,7 @@ class ServiceConstraintsTest {
     val requestBodyLimit: Long = 10L * 1024 * 1024
     val port: Int = ServerSocket(0).use { it.localPort }
 
-    val portListnerTimeout = 10L
+    val portListenerTimeout = 180L
 
     val baseUrl = "http://localhost:$port"
 
@@ -36,8 +36,8 @@ class ServiceConstraintsTest {
     @BeforeAll
     fun boot() {
         proc = startService("netty", port, closeGracePeriodMillis, closeTimeoutMillis, requestBodyLimit, projectDir)
-        val ready = waitForPort(port, portListnerTimeout, proc)
-        assertTrue(ready, "Service did not start within $portListnerTimeout s")
+        val ready = waitForPort(port, portListenerTimeout, proc)
+        assertTrue(ready, "Service did not start within $portListenerTimeout s")
     }
 
     @AfterAll
@@ -535,4 +535,37 @@ class ServiceConstraintsTest {
         assertEquals(400, body.code)
         assertEquals("member must have unique items", body.message)
     }
+
+    @Test
+    fun `checks unique items constraint providing non-unique nested nested list`() {
+        val cbor = Cbor { }
+        val doubleNestedUniqueItemsListInput = listOf(
+            listOf(listOf("0"), listOf("1", "2"), listOf("6"), listOf("9", "10", "11")),
+            listOf(listOf("2"), listOf("7", "2"), listOf("4"), listOf("5", "6", "5")),
+            listOf(listOf("1"), listOf("1", "2"), listOf("4"), listOf("5", "6", "7")),
+        )
+
+        val requestBytes = cbor.encodeToByteArray(
+            DoubleNestedUniqueItemsConstraintTestRequest.serializer(),
+            DoubleNestedUniqueItemsConstraintTestRequest(doubleNestedUniqueItemsListInput),
+        )
+
+        val response = sendRequest(
+            "$baseUrl/double-nested-unique-items-constraint",
+            "POST",
+            requestBytes,
+            "application/cbor",
+            "application/cbor",
+            "correctToken",
+        )
+        assertIs<HttpResponse<ByteArray>>(response)
+        assertEquals(400, response.statusCode(), "Expected 400")
+
+        val body = cbor.decodeFromByteArray(
+            ErrorResponse.serializer(),
+            response.body(),
+        )
+        assertEquals(400, body.code)
+        assertEquals("member must have unique items", body.message)
+    }
 }

tests/codegen/service-codegen-tests/src/test/kotlin/com/test/ServiceDataClasses.kt

@@ -41,3 +41,6 @@ data class UniqueItemsConstraintTestRequest(val notUniqueItemsListInput: List<St
 
 @Serializable
 data class NestedUniqueItemsConstraintTestRequest(val nestedUniqueItemsListInput: List<List<String>>)
+
+@Serializable
+data class DoubleNestedUniqueItemsConstraintTestRequest(val doubleNestedUniqueItemsListInput: List<List<List<String>>>)