fix merge conflicts

smithy-lang · Jul 18, 2023 · dc041d0 · dc041d0
1 parent 93ac26f
commit dc041d0
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 62 deletions.
diff --git a/...ervability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/logging/Logger.kt b/...ervability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/logging/Logger.kt
@@ -11,7 +11,6 @@ public typealias MessageSupplier = () -> String
  * Internal logging facade
  */
 public interface Logger {
-    @InternalApi
     public companion object {
         /**
          * A no-op [Logger] that does nothing
@@ -61,29 +60,24 @@ public interface Logger {
 /**
  * Add a log message if trace logging is enabled
  */
-@InternalApi
 public fun Logger.trace(msg: String): Unit = trace { msg }
 
 /**
  * Add a log message if debug logging is enabled
  */
-@InternalApi
 public fun Logger.debug(msg: String): Unit = debug { msg }
 
 /**
  * Add a log message if info logging is enabled
  */
-@InternalApi
 public fun Logger.info(msg: String): Unit = info { msg }
 
 /**
  * Add a log message if warn logging is enabled
  */
-@InternalApi
 public fun Logger.warn(msg: String): Unit = warn { msg }
 
 /**
  * Add a log message if error logging is enabled
  */
-@InternalApi
 public fun Logger.error(msg: String): Unit = error { msg }
diff --git a/runtime/protocol/http-client/api/http-client.api b/runtime/protocol/http-client/api/http-client.api
@@ -184,36 +184,6 @@ public final class aws/smithy/kotlin/runtime/http/middleware/HttpResponseExcepti
 	public final fun setStatusCode (Laws/smithy/kotlin/runtime/http/HttpStatusCode;)V
 }
 
-public final class aws/smithy/kotlin/runtime/http/operation/HttpOperationContextKt {
-}
-
-public abstract interface class aws/smithy/kotlin/runtime/http/operation/HttpDeserialize {
-	public abstract fun deserialize (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Laws/smithy/kotlin/runtime/http/response/HttpResponse;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public class aws/smithy/kotlin/runtime/http/operation/HttpOperationContext$Builder : aws/smithy/kotlin/runtime/client/ClientOptionsBuilder {
-	public fun <init> ()V
-	public final fun getExpectedHttpStatus ()Ljava/lang/Integer;
-	public final fun getHostPrefix ()Ljava/lang/String;
-	public final fun getOperationName ()Ljava/lang/String;
-	public final fun getServiceName ()Ljava/lang/String;
-	public final fun setExpectedHttpStatus (Ljava/lang/Integer;)V
-	public final fun setHostPrefix (Ljava/lang/String;)V
-	public final fun setOperationName (Ljava/lang/String;)V
-	public final fun setServiceName (Ljava/lang/String;)V
-}
-
-public final class aws/smithy/kotlin/runtime/http/operation/HttpOperationContext$Companion {
-	public final fun build (Lkotlin/jvm/functions/Function1;)Laws/smithy/kotlin/runtime/operation/ExecutionContext;
-	public final fun getExpectedHttpStatus ()Laws/smithy/kotlin/runtime/util/AttributeKey;
-	public final fun getHostPrefix ()Laws/smithy/kotlin/runtime/util/AttributeKey;
-	public final fun getHttpCallList ()Laws/smithy/kotlin/runtime/util/AttributeKey;
-	public final fun getOperationAttributes ()Laws/smithy/kotlin/runtime/util/AttributeKey;
-	public final fun getOperationInput ()Laws/smithy/kotlin/runtime/util/AttributeKey;
-	public final fun getOperationMetrics ()Laws/smithy/kotlin/runtime/util/AttributeKey;
-	public final fun getSdkInvocationId ()Laws/smithy/kotlin/runtime/util/AttributeKey;
-}
-
 public final class aws/smithy/kotlin/runtime/http/operation/InitializeMiddleware$DefaultImpls {
 }
 
@@ -226,38 +196,12 @@ public final class aws/smithy/kotlin/runtime/http/operation/MutateMiddleware$Def
 public final class aws/smithy/kotlin/runtime/http/operation/OperationEndpointKt {
 }
 
-public final class aws/smithy/kotlin/runtime/http/operation/OperationRequest {
-	public fun <init> (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Ljava/lang/Object;)V
-	public fun <init> (Ljava/lang/Object;)V
-	public final fun component1 ()Laws/smithy/kotlin/runtime/operation/ExecutionContext;
-	public final fun component2 ()Ljava/lang/Object;
-	public final fun copy (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Ljava/lang/Object;)Laws/smithy/kotlin/runtime/http/operation/OperationRequest;
-	public static synthetic fun copy$default (Laws/smithy/kotlin/runtime/http/operation/OperationRequest;Laws/smithy/kotlin/runtime/operation/ExecutionContext;Ljava/lang/Object;ILjava/lang/Object;)Laws/smithy/kotlin/runtime/http/operation/OperationRequest;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getContext ()Laws/smithy/kotlin/runtime/operation/ExecutionContext;
-	public final fun getSubject ()Ljava/lang/Object;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public final class aws/smithy/kotlin/runtime/http/operation/OperationTelemetryKt {
 }
 
 public final class aws/smithy/kotlin/runtime/http/operation/ReceiveMiddleware$DefaultImpls {
 }
 
 public final class aws/smithy/kotlin/runtime/http/operation/SdkHttpOperationKt {
-	public static final fun getSdkInvocationId (Laws/smithy/kotlin/runtime/operation/ExecutionContext;)Ljava/lang/String;
-}
-
-public final class aws/smithy/kotlin/runtime/http/operation/UnitDeserializer : aws/smithy/kotlin/runtime/http/operation/HttpDeserialize {
-	public static final field INSTANCE Laws/smithy/kotlin/runtime/http/operation/UnitDeserializer;
-	public fun deserialize (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Laws/smithy/kotlin/runtime/http/response/HttpResponse;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class aws/smithy/kotlin/runtime/http/operation/UnitSerializer : aws/smithy/kotlin/runtime/http/operation/HttpSerialize {
-	public static final field INSTANCE Laws/smithy/kotlin/runtime/http/operation/UnitSerializer;
-	public synthetic fun serialize (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun serialize (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Lkotlin/Unit;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }