fix!: Make error factory methods nonpublic (#1157)

awslabs · Sep 27, 2023 · 17f7102 · 17f7102
1 parent ace826d
commit 17f7102
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/...tware/amazon/smithy/aws/swift/codegen/awsjson/AWSJsonHttpResponseBindingErrorGenerator.kt b/...tware/amazon/smithy/aws/swift/codegen/awsjson/AWSJsonHttpResponseBindingErrorGenerator.kt
@@ -76,13 +76,13 @@ class AWSJsonHttpResponseBindingErrorGenerator : HttpResponseBindingErrorGenerat
                 addImport(SwiftDependency.CLIENT_RUNTIME.target)
 
                 openBlock(
-                    "public enum \$L: \$N {",
+                    "enum \$L: \$N {",
                     "}",
                     operationErrorName,
                     ClientRuntimeTypes.Http.HttpResponseErrorBinding
                 ) {
                     openBlock(
-                        "public static func makeError(httpResponse: \$N, decoder: \$D) async throws -> \$N {", "}",
+                        "static func makeError(httpResponse: \$N, decoder: \$D) async throws -> \$N {", "}",
                         ClientRuntimeTypes.Http.HttpResponse,
                         ClientRuntimeTypes.Serde.ResponseDecoder,
                         SwiftTypes.Error

diff --git a/...y/aws/swift/codegen/ec2query/httpResponse/AWSEc2QueryHttpResponseBindingErrorGenerator.kt b/...y/aws/swift/codegen/ec2query/httpResponse/AWSEc2QueryHttpResponseBindingErrorGenerator.kt
@@ -75,13 +75,13 @@ class AWSEc2QueryHttpResponseBindingErrorGenerator : HttpResponseBindingErrorGen
                 addImport(SwiftDependency.CLIENT_RUNTIME.target)
 
                 openBlock(
-                    "public enum \$L: \$N {",
+                    "enum \$L: \$N {",
                     "}",
                     operationErrorName,
                     ClientRuntimeTypes.Http.HttpResponseErrorBinding
                 ) {
                     openBlock(
-                        "public static func makeError(httpResponse: \$N, decoder: \$D) async throws -> \$N {", "}",
+                        "static func makeError(httpResponse: \$N, decoder: \$D) async throws -> \$N {", "}",
                         ClientRuntimeTypes.Http.HttpResponse,
                         ClientRuntimeTypes.Serde.ResponseDecoder,
                         SwiftTypes.Error

diff --git a/...azon/smithy/aws/swift/codegen/restjson/AWSRestJson1HttpResponseBindingErrorGeneratable.kt b/...azon/smithy/aws/swift/codegen/restjson/AWSRestJson1HttpResponseBindingErrorGeneratable.kt
@@ -77,13 +77,13 @@ class AWSRestJson1HttpResponseBindingErrorGeneratable : HttpResponseBindingError
                 addImport(SwiftDependency.CLIENT_RUNTIME.target)
 
                 openBlock(
-                    "public enum \$L: \$N {",
+                    "enum \$L: \$N {",
                     "}",
                     operationErrorName,
                     ClientRuntimeTypes.Http.HttpResponseErrorBinding
                 ) {
                     openBlock(
-                        "public static func makeError(httpResponse: \$N, decoder: \$D) async throws -> \$N {", "}",
+                        "static func makeError(httpResponse: \$N, decoder: \$D) async throws -> \$N {", "}",
                         ClientRuntimeTypes.Http.HttpResponse,
                         ClientRuntimeTypes.Serde.ResponseDecoder,
                         SwiftTypes.Error

diff --git a/...re/amazon/smithy/aws/swift/codegen/restxml/AWSRestXMLHttpResponseBindingErrorGenerator.kt b/...re/amazon/smithy/aws/swift/codegen/restxml/AWSRestXMLHttpResponseBindingErrorGenerator.kt
@@ -80,13 +80,13 @@ class AWSRestXMLHttpResponseBindingErrorGenerator : HttpResponseBindingErrorGene
                 addImport(SwiftDependency.CLIENT_RUNTIME.target)
 
                 openBlock(
-                    "public enum \$L: \$N {",
+                    "enum \$L: \$N {",
                     "}",
                     operationErrorName,
                     ClientRuntimeTypes.Http.HttpResponseErrorBinding
                 ) {
                     openBlock(
-                        "public static func makeError(httpResponse: \$N, decoder: \$D) async throws -> \$N {", "}",
+                        "static func makeError(httpResponse: \$N, decoder: \$D) async throws -> \$N {", "}",
                         ClientRuntimeTypes.Http.HttpResponse,
                         ClientRuntimeTypes.Serde.ResponseDecoder,
                         SwiftTypes.Error

diff --git a/.../amazon/smithy/aws/swift/codegen/awsjson/AWSJsonHttpResponseBindingErrorGeneratorTests.kt b/.../amazon/smithy/aws/swift/codegen/awsjson/AWSJsonHttpResponseBindingErrorGeneratorTests.kt
@@ -21,8 +21,8 @@ class AWSJsonHttpResponseBindingErrorGeneratorTests {
         contents.shouldSyntacticSanityCheck()
         val expectedContents =
             """
-            public enum GreetingWithErrorsOutputError: ClientRuntime.HttpResponseErrorBinding {
-                public static func makeError(httpResponse: ClientRuntime.HttpResponse, decoder: ClientRuntime.ResponseDecoder? = nil) async throws -> Swift.Error {
+            enum GreetingWithErrorsOutputError: ClientRuntime.HttpResponseErrorBinding {
+                static func makeError(httpResponse: ClientRuntime.HttpResponse, decoder: ClientRuntime.ResponseDecoder? = nil) async throws -> Swift.Error {
                     let restJSONError = try await AWSClientRuntime.RestJSONError(httpResponse: httpResponse)
                     let requestID = httpResponse.requestId
                     let serviceError = try await Json10ProtocolClientTypes.makeServiceError(httpResponse, decoder, restJSONError, requestID)

diff --git a/...thy/aws/swift/codegen/awsrestjson/AWSRestJson1HttpResponseBindingErrorGeneratableTests.kt b/...thy/aws/swift/codegen/awsrestjson/AWSRestJson1HttpResponseBindingErrorGeneratableTests.kt
@@ -19,8 +19,8 @@ class AWSRestJson1HttpResponseBindingErrorGeneratableTests {
         contents.shouldSyntacticSanityCheck()
         val expectedContents =
             """
-            public enum GreetingWithErrorsOutputError: ClientRuntime.HttpResponseErrorBinding {
-                public static func makeError(httpResponse: ClientRuntime.HttpResponse, decoder: ClientRuntime.ResponseDecoder? = nil) async throws -> Swift.Error {
+            enum GreetingWithErrorsOutputError: ClientRuntime.HttpResponseErrorBinding {
+                static func makeError(httpResponse: ClientRuntime.HttpResponse, decoder: ClientRuntime.ResponseDecoder? = nil) async throws -> Swift.Error {
                     let restJSONError = try await AWSClientRuntime.RestJSONError(httpResponse: httpResponse)
                     let requestID = httpResponse.requestId
                     let serviceError = try await RestJson1ProtocolClientTypes.makeServiceError(httpResponse, decoder, restJSONError, requestID)

diff --git a/...mazon/smithy/aws/swift/codegen/customizations/Route53InvalidBatchErrorIntegrationTests.kt b/...mazon/smithy/aws/swift/codegen/customizations/Route53InvalidBatchErrorIntegrationTests.kt
@@ -70,8 +70,8 @@ class Route53InvalidBatchErrorIntegrationTests {
         contents.shouldSyntacticSanityCheck()
         val expectedContents =
             """
-            public enum ChangeResourceRecordSetsOutputError: ClientRuntime.HttpResponseErrorBinding {
-                public static func makeError(httpResponse: ClientRuntime.HttpResponse, decoder: ClientRuntime.ResponseDecoder? = nil) async throws -> Swift.Error {
+            enum ChangeResourceRecordSetsOutputError: ClientRuntime.HttpResponseErrorBinding {
+                static func makeError(httpResponse: ClientRuntime.HttpResponse, decoder: ClientRuntime.ResponseDecoder? = nil) async throws -> Swift.Error {
                     if let customBatchError = try await CustomInvalidBatchError.makeFromHttpResponse(httpResponse) {
                         return InvalidChangeBatch(
                             customError: customBatchError,

diff --git a/...mazon/smithy/aws/swift/codegen/ec2query/Ec2QueryHttpResponseBindingErrorGeneratorTests.kt b/...mazon/smithy/aws/swift/codegen/ec2query/Ec2QueryHttpResponseBindingErrorGeneratorTests.kt
@@ -21,8 +21,8 @@ class Ec2QueryHttpResponseBindingErrorGeneratorTests {
         contents.shouldSyntacticSanityCheck()
         val expectedContents =
             """
-            public enum GreetingWithErrorsOutputError: ClientRuntime.HttpResponseErrorBinding {
-                public static func makeError(httpResponse: ClientRuntime.HttpResponse, decoder: ClientRuntime.ResponseDecoder? = nil) async throws -> Swift.Error {
+            enum GreetingWithErrorsOutputError: ClientRuntime.HttpResponseErrorBinding {
+                static func makeError(httpResponse: ClientRuntime.HttpResponse, decoder: ClientRuntime.ResponseDecoder? = nil) async throws -> Swift.Error {
                     let ec2QueryError = try await Ec2QueryError(httpResponse: httpResponse)
                     let serviceError = try await EC2ProtocolClientTypes.makeServiceError(httpResponse, decoder, ec2QueryError)
                     if let error = serviceError { return error }

diff --git a/...azon/smithy/aws/swift/codegen/restxml/AWSRestXMLHttpResponseBindingErrorGeneratorTests.kt b/...azon/smithy/aws/swift/codegen/restxml/AWSRestXMLHttpResponseBindingErrorGeneratorTests.kt
@@ -22,8 +22,8 @@ class AWSRestXMLHttpResponseBindingErrorGeneratorTests {
         contents.shouldSyntacticSanityCheck()
         val expectedContents =
             """
-            public enum GreetingWithErrorsOutputError: ClientRuntime.HttpResponseErrorBinding {
-                public static func makeError(httpResponse: ClientRuntime.HttpResponse, decoder: ClientRuntime.ResponseDecoder? = nil) async throws -> Swift.Error {
+            enum GreetingWithErrorsOutputError: ClientRuntime.HttpResponseErrorBinding {
+                static func makeError(httpResponse: ClientRuntime.HttpResponse, decoder: ClientRuntime.ResponseDecoder? = nil) async throws -> Swift.Error {
                     let restXMLError = try await AWSClientRuntime.RestXMLError(httpResponse: httpResponse)
                     let serviceError = try await RestXmlerrorsClientTypes.makeServiceError(httpResponse, decoder, restXMLError)
                     if let error = serviceError { return error }