Skip to content

Commit f8b39b0

Browse files
0marperez0marperez
committed
Self review 2
1 parent 9760ee1 commit f8b39b0

File tree

8 files changed

+39
-40
lines changed

8 files changed

+39
-40
lines changed

‎codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ object RuntimeTypes {
232232
val RequestCompressionConfig = symbol("RequestCompressionConfig")
233233
val CompressionClientConfig = symbol("CompressionClientConfig")
234234
val HttpChecksumClientConfig = symbol("HttpChecksumClientConfig")
235-
val ChecksumConfigOption = symbol("ChecksumConfigOption")
235+
val HttpChecksumConfigOption = symbol("HttpChecksumConfigOption")
236236
}
237237

238238
object Endpoints : RuntimeTypePackage(KotlinDependency.SMITHY_CLIENT, "endpoints") {

‎runtime/protocol/http-client/api/http-client.api‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,15 +332,15 @@ public final class aws/smithy/kotlin/runtime/http/interceptors/DiscoveredEndpoin
332332
}
333333

334334
public final class aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsRequestInterceptor : aws/smithy/kotlin/runtime/http/interceptors/AbstractChecksumInterceptor {
335-
public fun <init> (ZLaws/smithy/kotlin/runtime/client/config/ChecksumConfigOption;Ljava/lang/String;)V
335+
public fun <init> (ZLaws/smithy/kotlin/runtime/client/config/HttpChecksumConfigOption;Ljava/lang/String;)V
336336
public fun applyChecksum (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Ljava/lang/String;)Laws/smithy/kotlin/runtime/http/request/HttpRequest;
337337
public fun calculateChecksum (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
338338
public fun modifyBeforeSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
339339
}
340340

341341
public final class aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptor : aws/smithy/kotlin/runtime/client/Interceptor {
342342
public static final field Companion Laws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptor$Companion;
343-
public fun <init> (ZLaws/smithy/kotlin/runtime/client/config/ChecksumConfigOption;)V
343+
public fun <init> (ZLaws/smithy/kotlin/runtime/client/config/HttpChecksumConfigOption;)V
344344
public fun modifyBeforeAttemptCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
345345
public fun modifyBeforeCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
346346
public fun modifyBeforeDeserialization (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;

‎runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsRequestInterceptor.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ import aws.smithy.kotlin.runtime.businessmetrics.BusinessMetric
1111
import aws.smithy.kotlin.runtime.businessmetrics.SmithyBusinessMetric
1212
import aws.smithy.kotlin.runtime.businessmetrics.emitBusinessMetric
1313
import aws.smithy.kotlin.runtime.client.ProtocolRequestInterceptorContext
14-
import aws.smithy.kotlin.runtime.client.config.ChecksumConfigOption
14+
import aws.smithy.kotlin.runtime.client.config.HttpChecksumConfigOption
1515
import aws.smithy.kotlin.runtime.hashing.*
1616
import aws.smithy.kotlin.runtime.http.*
1717
import aws.smithy.kotlin.runtime.http.request.HttpRequest
1818
import aws.smithy.kotlin.runtime.http.request.header
1919
import aws.smithy.kotlin.runtime.http.request.toBuilder
2020
import aws.smithy.kotlin.runtime.io.*
2121
import aws.smithy.kotlin.runtime.telemetry.logging.Logger
22-
import aws.smithy.kotlin.runtime.telemetry.logging.debug
2322
import aws.smithy.kotlin.runtime.telemetry.logging.logger
2423
import aws.smithy.kotlin.runtime.text.encoding.encodeBase64String
2524
import kotlinx.coroutines.CompletableDeferred
@@ -53,10 +52,10 @@ import kotlin.coroutines.coroutineContext
5352
@InternalApi
5453
public class FlexibleChecksumsRequestInterceptor(
5554
requestChecksumRequired: Boolean,
56-
requestChecksumCalculation: ChecksumConfigOption?,
55+
requestChecksumCalculation: HttpChecksumConfigOption?,
5756
userSelectedChecksumAlgorithm: String?,
5857
) : AbstractChecksumInterceptor() {
59-
private val forcedToCalculateChecksum = requestChecksumRequired || requestChecksumCalculation == ChecksumConfigOption.WHEN_SUPPORTED
58+
private val forcedToCalculateChecksum = requestChecksumRequired || requestChecksumCalculation == HttpChecksumConfigOption.WHEN_SUPPORTED
6059
private val checksumHeader = StringBuilder("x-amz-checksum-")
6160
private val defaultChecksumAlgorithm = lazy { Crc32() }
6261
private val defaultChecksumAlgorithmHeaderPostfix = "crc32"

‎runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptor.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package aws.smithy.kotlin.runtime.http.interceptors
88
import aws.smithy.kotlin.runtime.ClientException
99
import aws.smithy.kotlin.runtime.InternalApi
1010
import aws.smithy.kotlin.runtime.client.ProtocolResponseInterceptorContext
11-
import aws.smithy.kotlin.runtime.client.config.ChecksumConfigOption
11+
import aws.smithy.kotlin.runtime.client.config.HttpChecksumConfigOption
1212
import aws.smithy.kotlin.runtime.collections.AttributeKey
1313
import aws.smithy.kotlin.runtime.hashing.toHashFunction
1414
import aws.smithy.kotlin.runtime.http.HttpBody
@@ -46,7 +46,7 @@ internal val CHECKSUM_HEADER_VALIDATION_PRIORITY_LIST: List<String> = listOf(
4646
@InternalApi
4747
public class FlexibleChecksumsResponseInterceptor(
4848
private val responseValidationRequired: Boolean,
49-
private val responseChecksumValidation: ChecksumConfigOption?,
49+
private val responseChecksumValidation: HttpChecksumConfigOption?,
5050
) : HttpInterceptor {
5151
@InternalApi
5252
public companion object {
@@ -57,7 +57,7 @@ public class FlexibleChecksumsResponseInterceptor(
5757
override suspend fun modifyBeforeDeserialization(context: ProtocolResponseInterceptorContext<Any, HttpRequest, HttpResponse>): HttpResponse {
5858
val logger = coroutineContext.logger<FlexibleChecksumsResponseInterceptor>()
5959

60-
val forcedToVerifyChecksum = responseValidationRequired || responseChecksumValidation == ChecksumConfigOption.WHEN_SUPPORTED
60+
val forcedToVerifyChecksum = responseValidationRequired || responseChecksumValidation == HttpChecksumConfigOption.WHEN_SUPPORTED
6161
if (!forcedToVerifyChecksum) return context.protocolResponse
6262

6363
val checksumHeader = CHECKSUM_HEADER_VALIDATION_PRIORITY_LIST

‎runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsRequestInterceptorTest.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package aws.smithy.kotlin.runtime.http.interceptors
77

88
import aws.smithy.kotlin.runtime.ClientException
9-
import aws.smithy.kotlin.runtime.client.config.ChecksumConfigOption
9+
import aws.smithy.kotlin.runtime.client.config.HttpChecksumConfigOption
1010
import aws.smithy.kotlin.runtime.collections.get
1111
import aws.smithy.kotlin.runtime.hashing.toHashFunction
1212
import aws.smithy.kotlin.runtime.http.*
@@ -45,7 +45,7 @@ class FlexibleChecksumsRequestInterceptorTest {
4545
FlexibleChecksumsRequestInterceptor(
4646
userSelectedChecksumAlgorithm = checksumAlgorithmName,
4747
requestChecksumRequired = true,
48-
requestChecksumCalculation = ChecksumConfigOption.WHEN_SUPPORTED,
48+
requestChecksumCalculation = HttpChecksumConfigOption.WHEN_SUPPORTED,
4949
),
5050
)
5151

@@ -72,7 +72,7 @@ class FlexibleChecksumsRequestInterceptorTest {
7272
FlexibleChecksumsRequestInterceptor(
7373
userSelectedChecksumAlgorithm = checksumAlgorithmName,
7474
requestChecksumRequired = true,
75-
requestChecksumCalculation = ChecksumConfigOption.WHEN_SUPPORTED,
75+
requestChecksumCalculation = HttpChecksumConfigOption.WHEN_SUPPORTED,
7676
),
7777
)
7878

@@ -97,7 +97,7 @@ class FlexibleChecksumsRequestInterceptorTest {
9797
FlexibleChecksumsRequestInterceptor(
9898
userSelectedChecksumAlgorithm = unsupportedChecksumAlgorithmName,
9999
requestChecksumRequired = true,
100-
requestChecksumCalculation = ChecksumConfigOption.WHEN_SUPPORTED,
100+
requestChecksumCalculation = HttpChecksumConfigOption.WHEN_SUPPORTED,
101101
),
102102
)
103103
}
@@ -123,7 +123,7 @@ class FlexibleChecksumsRequestInterceptorTest {
123123
FlexibleChecksumsRequestInterceptor(
124124
userSelectedChecksumAlgorithm = checksumAlgorithmName,
125125
requestChecksumRequired = true,
126-
requestChecksumCalculation = ChecksumConfigOption.WHEN_SUPPORTED,
126+
requestChecksumCalculation = HttpChecksumConfigOption.WHEN_SUPPORTED,
127127
),
128128
)
129129

@@ -191,7 +191,7 @@ class FlexibleChecksumsRequestInterceptorTest {
191191
FlexibleChecksumsRequestInterceptor(
192192
userSelectedChecksumAlgorithm = checksumAlgorithmName,
193193
requestChecksumRequired = true,
194-
requestChecksumCalculation = ChecksumConfigOption.WHEN_SUPPORTED,
194+
requestChecksumCalculation = HttpChecksumConfigOption.WHEN_SUPPORTED,
195195
),
196196
)
197197

‎runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptorTest.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package aws.smithy.kotlin.runtime.http.interceptors
77

8-
import aws.smithy.kotlin.runtime.client.config.ChecksumConfigOption
8+
import aws.smithy.kotlin.runtime.client.config.HttpChecksumConfigOption
99
import aws.smithy.kotlin.runtime.collections.get
1010
import aws.smithy.kotlin.runtime.http.*
1111
import aws.smithy.kotlin.runtime.http.HttpCall
@@ -76,7 +76,7 @@ class FlexibleChecksumsResponseInterceptorTest {
7676
op.interceptors.add(
7777
FlexibleChecksumsResponseInterceptor(
7878
responseValidationRequired = true,
79-
responseChecksumValidation = ChecksumConfigOption.WHEN_SUPPORTED,
79+
responseChecksumValidation = HttpChecksumConfigOption.WHEN_SUPPORTED,
8080
),
8181
)
8282

@@ -103,7 +103,7 @@ class FlexibleChecksumsResponseInterceptorTest {
103103
op.interceptors.add(
104104
FlexibleChecksumsResponseInterceptor(
105105
responseValidationRequired = true,
106-
responseChecksumValidation = ChecksumConfigOption.WHEN_SUPPORTED,
106+
responseChecksumValidation = HttpChecksumConfigOption.WHEN_SUPPORTED,
107107
),
108108
)
109109

@@ -131,7 +131,7 @@ class FlexibleChecksumsResponseInterceptorTest {
131131
op.interceptors.add(
132132
FlexibleChecksumsResponseInterceptor(
133133
responseValidationRequired = true,
134-
responseChecksumValidation = ChecksumConfigOption.WHEN_SUPPORTED,
134+
responseChecksumValidation = HttpChecksumConfigOption.WHEN_SUPPORTED,
135135
),
136136
)
137137

@@ -156,7 +156,7 @@ class FlexibleChecksumsResponseInterceptorTest {
156156
op.interceptors.add(
157157
FlexibleChecksumsResponseInterceptor(
158158
responseValidationRequired = true,
159-
responseChecksumValidation = ChecksumConfigOption.WHEN_SUPPORTED,
159+
responseChecksumValidation = HttpChecksumConfigOption.WHEN_SUPPORTED,
160160
),
161161
)
162162

‎runtime/smithy-client/api/smithy-client.api‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -211,14 +211,6 @@ public final class aws/smithy/kotlin/runtime/client/SdkClientOptionKt {
211211
public static final fun getServiceName (Laws/smithy/kotlin/runtime/operation/ExecutionContext;)Ljava/lang/String;
212212
}
213213

214-
public final class aws/smithy/kotlin/runtime/client/config/ChecksumConfigOption : java/lang/Enum {
215-
public static final field WHEN_REQUIRED Laws/smithy/kotlin/runtime/client/config/ChecksumConfigOption;
216-
public static final field WHEN_SUPPORTED Laws/smithy/kotlin/runtime/client/config/ChecksumConfigOption;
217-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
218-
public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/client/config/ChecksumConfigOption;
219-
public static fun values ()[Laws/smithy/kotlin/runtime/client/config/ChecksumConfigOption;
220-
}
221-
222214
public final class aws/smithy/kotlin/runtime/client/config/ClientSettings {
223215
public static final field INSTANCE Laws/smithy/kotlin/runtime/client/config/ClientSettings;
224216
public final fun getLogMode ()Laws/smithy/kotlin/runtime/config/EnvironmentSetting;
@@ -244,15 +236,23 @@ public abstract interface annotation class aws/smithy/kotlin/runtime/client/conf
244236
}
245237

246238
public abstract interface class aws/smithy/kotlin/runtime/client/config/HttpChecksumClientConfig {
247-
public abstract fun getRequestChecksumCalculation ()Laws/smithy/kotlin/runtime/client/config/ChecksumConfigOption;
248-
public abstract fun getResponseChecksumValidation ()Laws/smithy/kotlin/runtime/client/config/ChecksumConfigOption;
239+
public abstract fun getRequestChecksumCalculation ()Laws/smithy/kotlin/runtime/client/config/HttpChecksumConfigOption;
240+
public abstract fun getResponseChecksumValidation ()Laws/smithy/kotlin/runtime/client/config/HttpChecksumConfigOption;
249241
}
250242

251243
public abstract interface class aws/smithy/kotlin/runtime/client/config/HttpChecksumClientConfig$Builder {
252-
public abstract fun getRequestChecksumCalculation ()Laws/smithy/kotlin/runtime/client/config/ChecksumConfigOption;
253-
public abstract fun getResponseChecksumValidation ()Laws/smithy/kotlin/runtime/client/config/ChecksumConfigOption;
254-
public abstract fun setRequestChecksumCalculation (Laws/smithy/kotlin/runtime/client/config/ChecksumConfigOption;)V
255-
public abstract fun setResponseChecksumValidation (Laws/smithy/kotlin/runtime/client/config/ChecksumConfigOption;)V
244+
public abstract fun getRequestChecksumCalculation ()Laws/smithy/kotlin/runtime/client/config/HttpChecksumConfigOption;
245+
public abstract fun getResponseChecksumValidation ()Laws/smithy/kotlin/runtime/client/config/HttpChecksumConfigOption;
246+
public abstract fun setRequestChecksumCalculation (Laws/smithy/kotlin/runtime/client/config/HttpChecksumConfigOption;)V
247+
public abstract fun setResponseChecksumValidation (Laws/smithy/kotlin/runtime/client/config/HttpChecksumConfigOption;)V
248+
}
249+
250+
public final class aws/smithy/kotlin/runtime/client/config/HttpChecksumConfigOption : java/lang/Enum {
251+
public static final field WHEN_REQUIRED Laws/smithy/kotlin/runtime/client/config/HttpChecksumConfigOption;
252+
public static final field WHEN_SUPPORTED Laws/smithy/kotlin/runtime/client/config/HttpChecksumConfigOption;
253+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
254+
public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/client/config/HttpChecksumConfigOption;
255+
public static fun values ()[Laws/smithy/kotlin/runtime/client/config/HttpChecksumConfigOption;
256256
}
257257

258258
public final class aws/smithy/kotlin/runtime/client/config/RequestCompressionConfig {

‎runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/config/HttpChecksumClientConfig.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@ public interface HttpChecksumClientConfig {
77
/**
88
* Configures request checksum calculation
99
*/
10-
public val requestChecksumCalculation: ChecksumConfigOption?
10+
public val requestChecksumCalculation: HttpChecksumConfigOption?
1111

1212
/**
1313
* Configures response checksum validation
1414
*/
15-
public val responseChecksumValidation: ChecksumConfigOption?
15+
public val responseChecksumValidation: HttpChecksumConfigOption?
1616

1717
public interface Builder {
1818
/**
1919
* Configures request checksum calculation
2020
*/
21-
public var requestChecksumCalculation: ChecksumConfigOption?
21+
public var requestChecksumCalculation: HttpChecksumConfigOption?
2222

2323
/**
2424
* Configures response checksum validation
2525
*/
26-
public var responseChecksumValidation: ChecksumConfigOption?
26+
public var responseChecksumValidation: HttpChecksumConfigOption?
2727
}
2828
}
2929

30-
public enum class ChecksumConfigOption {
30+
public enum class HttpChecksumConfigOption {
3131
/**
3232
* SDK will create/validate checksum if the service marks it as required or if this is set.
3333
*/

0 commit comments

Comments
 (0)