From ccef18ce1e26fbbbf1f3e41d7d7d58bb2f664004 Mon Sep 17 00:00:00 2001 From: Hanson Ho Date: Wed, 25 Oct 2023 23:45:31 -0700 Subject: [PATCH] Move UrlConnection wrappers to internal package --- .../EmbraceOkHttp3ApplicationInterceptor.java | 2 +- .../EmbraceOkHttp3NetworkInterceptor.java | 4 +- .../EmbraceOkHttp3PathOverrideRequest.java | 4 +- .../okhttp3/EmbraceOkHttp3InterceptorsTest.kt | 2 +- .../api/embrace-android-sdk.api | 90 ++++++------ .../testcases/NetworkRequestApiTest.kt | 2 +- .../android/embracesdk/EmbraceImpl.java | 4 +- .../EmbraceInternalInterfaceImpl.kt | 2 +- .../embracesdk/HttpPathOverrideRequest.java | 12 -- .../internal/EmbraceInternalInterface.kt | 2 +- .../http/CountingInputStreamWithCallback.java | 2 +- .../network/http/CountingOutputStream.java | 2 +- .../network/http/EmbraceHttpPathOverride.java | 16 ++- .../http/EmbraceHttpUrlConnection.java | 2 +- .../http/EmbraceHttpUrlConnectionImpl.java | 112 +++++++-------- .../EmbraceHttpUrlConnectionOverride.java | 16 ++- .../http/EmbraceHttpUrlStreamHandler.java | 2 +- .../http/EmbraceHttpsUrlConnection.java | 2 +- .../http/EmbraceHttpsUrlConnectionImpl.java | 131 +++++++++--------- .../http/EmbraceHttpsUrlStreamHandler.java | 2 +- .../http/EmbraceUrlConnectionDelegate.java | 3 +- .../network/http/EmbraceUrlStreamHandler.java | 2 +- .../http/EmbraceUrlStreamHandlerFactory.java | 2 +- .../network/http/HttpPathOverrideRequest.java | 20 +++ .../network/http/HttpUrlConnectionTracker.kt | 2 +- .../network/http/NetworkCaptureData.kt | 2 +- .../http/StreamHandlerFactoryInstaller.java | 2 +- .../network/EmbraceNetworkRequest.java | 3 +- .../embracesdk/network/http/HttpMethod.java | 3 - .../logging/EmbraceNetworkCaptureService.kt | 2 +- .../logging/EmbraceNetworkLoggingService.kt | 2 +- .../network/logging/NetworkCaptureService.kt | 2 +- .../network/logging/NetworkLoggingService.kt | 2 +- .../fakes/FakeNetworkLoggingService.kt | 2 +- .../EmbraceHttpUrlConnectionOverrideTest.kt | 3 +- .../http/EmbraceUrlStreamHandlerTest.kt | 2 +- .../network/EmbraceNetworkRequestTest.kt | 2 +- 37 files changed, 239 insertions(+), 228 deletions(-) delete mode 100644 embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/HttpPathOverrideRequest.java rename embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/{ => internal}/network/http/CountingInputStreamWithCallback.java (98%) rename embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/{ => internal}/network/http/CountingOutputStream.java (96%) rename embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/{ => internal}/network/http/EmbraceHttpPathOverride.java (84%) rename embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/{ => internal}/network/http/EmbraceHttpUrlConnection.java (98%) rename embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/{ => internal}/network/http/EmbraceHttpUrlConnectionImpl.java (54%) rename embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/{ => internal}/network/http/EmbraceHttpUrlConnectionOverride.java (72%) rename embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/{ => internal}/network/http/EmbraceHttpUrlStreamHandler.java (97%) rename embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/{ => internal}/network/http/EmbraceHttpsUrlConnection.java (93%) rename embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/{ => internal}/network/http/EmbraceHttpsUrlConnectionImpl.java (54%) rename embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/{ => internal}/network/http/EmbraceHttpsUrlStreamHandler.java (97%) rename embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/{ => internal}/network/http/EmbraceUrlConnectionDelegate.java (99%) rename embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/{ => internal}/network/http/EmbraceUrlStreamHandler.java (98%) rename embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/{ => internal}/network/http/EmbraceUrlStreamHandlerFactory.java (97%) create mode 100644 embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/HttpPathOverrideRequest.java rename embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/{ => internal}/network/http/HttpUrlConnectionTracker.kt (79%) rename embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/{ => internal}/network/http/NetworkCaptureData.kt (91%) rename embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/{ => internal}/network/http/StreamHandlerFactoryInstaller.java (99%) rename embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/{ => internal}/network/http/EmbraceHttpUrlConnectionOverrideTest.kt (99%) rename embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/{ => internal}/network/http/EmbraceUrlStreamHandlerTest.kt (98%) diff --git a/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3ApplicationInterceptor.java b/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3ApplicationInterceptor.java index 52f3801d73..794030ed8d 100644 --- a/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3ApplicationInterceptor.java +++ b/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3ApplicationInterceptor.java @@ -9,7 +9,7 @@ import io.embrace.android.embracesdk.Embrace; import io.embrace.android.embracesdk.InternalApi; import io.embrace.android.embracesdk.network.EmbraceNetworkRequest; -import io.embrace.android.embracesdk.network.http.EmbraceHttpPathOverride; +import io.embrace.android.embracesdk.internal.network.http.EmbraceHttpPathOverride; import io.embrace.android.embracesdk.network.http.HttpMethod; import okhttp3.Interceptor; import okhttp3.Request; diff --git a/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3NetworkInterceptor.java b/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3NetworkInterceptor.java index 7fc78babe4..c10f3af42d 100644 --- a/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3NetworkInterceptor.java +++ b/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3NetworkInterceptor.java @@ -13,9 +13,9 @@ import io.embrace.android.embracesdk.internal.ApkToolsConfig; import io.embrace.android.embracesdk.internal.clock.Clock; import io.embrace.android.embracesdk.network.EmbraceNetworkRequest; -import io.embrace.android.embracesdk.network.http.EmbraceHttpPathOverride; +import io.embrace.android.embracesdk.internal.network.http.EmbraceHttpPathOverride; import io.embrace.android.embracesdk.network.http.HttpMethod; -import io.embrace.android.embracesdk.network.http.NetworkCaptureData; +import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData; import okhttp3.Headers; import okhttp3.Interceptor; import okhttp3.Request; diff --git a/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3PathOverrideRequest.java b/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3PathOverrideRequest.java index 4c2b9003fd..0ebb19ea98 100644 --- a/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3PathOverrideRequest.java +++ b/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3PathOverrideRequest.java @@ -1,6 +1,6 @@ package io.embrace.android.embracesdk.okhttp3; -import io.embrace.android.embracesdk.HttpPathOverrideRequest; +import io.embrace.android.embracesdk.internal.network.http.HttpPathOverrideRequest; import okhttp3.Request; class EmbraceOkHttp3PathOverrideRequest implements HttpPathOverrideRequest { @@ -17,7 +17,7 @@ public String getHeaderByName(String name) { } @Override - public String getOverriddenURL(String pathOverride) { + public String getOverriddenURL( String pathOverride) { return request.url().newBuilder().encodedPath(pathOverride).build().toString(); } diff --git a/embrace-android-okhttp3/src/test/kotlin/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3InterceptorsTest.kt b/embrace-android-okhttp3/src/test/kotlin/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3InterceptorsTest.kt index 06d2b31d4a..0ed257b395 100644 --- a/embrace-android-okhttp3/src/test/kotlin/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3InterceptorsTest.kt +++ b/embrace-android-okhttp3/src/test/kotlin/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3InterceptorsTest.kt @@ -3,8 +3,8 @@ package io.embrace.android.embracesdk.okhttp3 import io.embrace.android.embracesdk.Embrace import io.embrace.android.embracesdk.internal.EmbraceInternalInterface import io.embrace.android.embracesdk.internal.clock.Clock +import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData import io.embrace.android.embracesdk.network.EmbraceNetworkRequest -import io.embrace.android.embracesdk.network.http.NetworkCaptureData import io.embrace.android.embracesdk.okhttp3.EmbraceOkHttp3ApplicationInterceptor.UNKNOWN_EXCEPTION import io.embrace.android.embracesdk.okhttp3.EmbraceOkHttp3ApplicationInterceptor.UNKNOWN_MESSAGE import io.embrace.android.embracesdk.okhttp3.EmbraceOkHttp3NetworkInterceptor.CONTENT_ENCODING_HEADER_NAME diff --git a/embrace-android-sdk/api/embrace-android-sdk.api b/embrace-android-sdk/api/embrace-android-sdk.api index 2a2cb71eaa..6555cbb61d 100644 --- a/embrace-android-sdk/api/embrace-android-sdk.api +++ b/embrace-android-sdk/api/embrace-android-sdk.api @@ -122,12 +122,6 @@ public final class io/embrace/android/embracesdk/EmbraceSamples { public static final fun verifyIntegration ()V } -public abstract interface class io/embrace/android/embracesdk/HttpPathOverrideRequest { - public abstract fun getHeaderByName (Ljava/lang/String;)Ljava/lang/String; - public abstract fun getOverriddenURL (Ljava/lang/String;)Ljava/lang/String; - public abstract fun getURLString ()Ljava/lang/String; -} - public abstract interface annotation class io/embrace/android/embracesdk/InternalApi : java/lang/annotation/Annotation { } @@ -186,9 +180,9 @@ public abstract interface class io/embrace/android/embracesdk/internal/EmbraceIn public abstract fun logInfo (Ljava/lang/String;Ljava/util/Map;)V public abstract fun logWarning (Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)V public abstract fun recordAndDeduplicateNetworkRequest (Ljava/lang/String;Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest;)V - public abstract fun recordCompletedNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJJJILjava/lang/String;Lio/embrace/android/embracesdk/network/http/NetworkCaptureData;)V - public abstract fun recordIncompleteNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/NetworkCaptureData;)V - public abstract fun recordIncompleteNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJLjava/lang/Throwable;Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/NetworkCaptureData;)V + public abstract fun recordCompletedNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJJJILjava/lang/String;Lio/embrace/android/embracesdk/internal/network/http/NetworkCaptureData;)V + public abstract fun recordIncompleteNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lio/embrace/android/embracesdk/internal/network/http/NetworkCaptureData;)V + public abstract fun recordIncompleteNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJLjava/lang/Throwable;Ljava/lang/String;Lio/embrace/android/embracesdk/internal/network/http/NetworkCaptureData;)V public abstract fun setProcessStartedByNotification ()V public abstract fun shouldCaptureNetworkBody (Ljava/lang/String;Ljava/lang/String;)Z } @@ -197,15 +191,52 @@ public abstract interface class io/embrace/android/embracesdk/internal/clock/Clo public abstract fun now ()J } +public class io/embrace/android/embracesdk/internal/network/http/EmbraceHttpPathOverride { + protected static final field PATH_OVERRIDE Ljava/lang/String; + public fun ()V + public static fun getURLString (Lio/embrace/android/embracesdk/internal/network/http/HttpPathOverrideRequest;)Ljava/lang/String; + public static fun getURLString (Lio/embrace/android/embracesdk/internal/network/http/HttpPathOverrideRequest;Ljava/lang/String;)Ljava/lang/String; +} + +public abstract interface class io/embrace/android/embracesdk/internal/network/http/HttpPathOverrideRequest { + public abstract fun getHeaderByName (Ljava/lang/String;)Ljava/lang/String; + public abstract fun getOverriddenURL (Ljava/lang/String;)Ljava/lang/String; + public abstract fun getURLString ()Ljava/lang/String; +} + +public final class io/embrace/android/embracesdk/internal/network/http/NetworkCaptureData { + public fun (Ljava/util/Map;Ljava/lang/String;[BLjava/util/Map;[BLjava/lang/String;)V + public synthetic fun (Ljava/util/Map;Ljava/lang/String;[BLjava/util/Map;[BLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun component1 ()Ljava/util/Map; + public final fun component2 ()Ljava/lang/String; + public final fun component3 ()[B + public final fun component4 ()Ljava/util/Map; + public final fun component5 ()[B + public final fun component6 ()Ljava/lang/String; + public final fun copy (Ljava/util/Map;Ljava/lang/String;[BLjava/util/Map;[BLjava/lang/String;)Lio/embrace/android/embracesdk/internal/network/http/NetworkCaptureData; + public static synthetic fun copy$default (Lio/embrace/android/embracesdk/internal/network/http/NetworkCaptureData;Ljava/util/Map;Ljava/lang/String;[BLjava/util/Map;[BLjava/lang/String;ILjava/lang/Object;)Lio/embrace/android/embracesdk/internal/network/http/NetworkCaptureData; + public fun equals (Ljava/lang/Object;)Z + public final fun getCapturedRequestBody ()[B + public final fun getCapturedResponseBody ()[B + public final fun getDataCaptureErrorMessage ()Ljava/lang/String; + public final fun getRequestBodySize ()I + public final fun getRequestHeaders ()Ljava/util/Map; + public final fun getRequestQueryParams ()Ljava/lang/String; + public final fun getResponseBodySize ()I + public final fun getResponseHeaders ()Ljava/util/Map; + public fun hashCode ()I + public fun toString ()Ljava/lang/String; +} + public final class io/embrace/android/embracesdk/network/EmbraceNetworkRequest { public static fun fromCompletedRequest (Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/HttpMethod;JJJJI)Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest; public static fun fromCompletedRequest (Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/HttpMethod;JJJJILjava/lang/String;)Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest; - public static fun fromCompletedRequest (Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/HttpMethod;JJJJILjava/lang/String;Lio/embrace/android/embracesdk/network/http/NetworkCaptureData;)Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest; - public static fun fromCompletedRequest (Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/HttpMethod;JJJJILjava/lang/String;Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/NetworkCaptureData;)Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest; + public static fun fromCompletedRequest (Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/HttpMethod;JJJJILjava/lang/String;Lio/embrace/android/embracesdk/internal/network/http/NetworkCaptureData;)Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest; + public static fun fromCompletedRequest (Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/HttpMethod;JJJJILjava/lang/String;Ljava/lang/String;Lio/embrace/android/embracesdk/internal/network/http/NetworkCaptureData;)Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest; public static fun fromIncompleteRequest (Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/HttpMethod;JJLjava/lang/String;Ljava/lang/String;)Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest; public static fun fromIncompleteRequest (Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/HttpMethod;JJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest; - public static fun fromIncompleteRequest (Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/HttpMethod;JJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/NetworkCaptureData;)Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest; - public static fun fromIncompleteRequest (Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/HttpMethod;JJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/NetworkCaptureData;)Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest; + public static fun fromIncompleteRequest (Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/HttpMethod;JJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lio/embrace/android/embracesdk/internal/network/http/NetworkCaptureData;)Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest; + public static fun fromIncompleteRequest (Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/HttpMethod;JJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lio/embrace/android/embracesdk/internal/network/http/NetworkCaptureData;)Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest; public fun getBytesIn ()Ljava/lang/Long; public fun getBytesOut ()Ljava/lang/Long; public fun getBytesReceived ()Ljava/lang/Long; @@ -215,7 +246,7 @@ public final class io/embrace/android/embracesdk/network/EmbraceNetworkRequest { public fun getErrorMessage ()Ljava/lang/String; public fun getErrorType ()Ljava/lang/String; public fun getHttpMethod ()Ljava/lang/String; - public fun getNetworkCaptureData ()Lio/embrace/android/embracesdk/network/http/NetworkCaptureData; + public fun getNetworkCaptureData ()Lio/embrace/android/embracesdk/internal/network/http/NetworkCaptureData; public fun getResponseCode ()Ljava/lang/Integer; public fun getStartTime ()Ljava/lang/Long; public fun getTraceId ()Ljava/lang/String; @@ -223,13 +254,6 @@ public final class io/embrace/android/embracesdk/network/EmbraceNetworkRequest { public fun getW3cTraceparent ()Ljava/lang/String; } -public class io/embrace/android/embracesdk/network/http/EmbraceHttpPathOverride { - protected static final field PATH_OVERRIDE Ljava/lang/String; - public fun ()V - public static fun getURLString (Lio/embrace/android/embracesdk/HttpPathOverrideRequest;)Ljava/lang/String; - public static fun getURLString (Lio/embrace/android/embracesdk/HttpPathOverrideRequest;Ljava/lang/String;)Ljava/lang/String; -} - public final class io/embrace/android/embracesdk/network/http/HttpMethod : java/lang/Enum { public static final field CONNECT Lio/embrace/android/embracesdk/network/http/HttpMethod; public static final field DELETE Lio/embrace/android/embracesdk/network/http/HttpMethod; @@ -246,30 +270,6 @@ public final class io/embrace/android/embracesdk/network/http/HttpMethod : java/ public static fun values ()[Lio/embrace/android/embracesdk/network/http/HttpMethod; } -public final class io/embrace/android/embracesdk/network/http/NetworkCaptureData { - public fun (Ljava/util/Map;Ljava/lang/String;[BLjava/util/Map;[BLjava/lang/String;)V - public synthetic fun (Ljava/util/Map;Ljava/lang/String;[BLjava/util/Map;[BLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun component1 ()Ljava/util/Map; - public final fun component2 ()Ljava/lang/String; - public final fun component3 ()[B - public final fun component4 ()Ljava/util/Map; - public final fun component5 ()[B - public final fun component6 ()Ljava/lang/String; - public final fun copy (Ljava/util/Map;Ljava/lang/String;[BLjava/util/Map;[BLjava/lang/String;)Lio/embrace/android/embracesdk/network/http/NetworkCaptureData; - public static synthetic fun copy$default (Lio/embrace/android/embracesdk/network/http/NetworkCaptureData;Ljava/util/Map;Ljava/lang/String;[BLjava/util/Map;[BLjava/lang/String;ILjava/lang/Object;)Lio/embrace/android/embracesdk/network/http/NetworkCaptureData; - public fun equals (Ljava/lang/Object;)Z - public final fun getCapturedRequestBody ()[B - public final fun getCapturedResponseBody ()[B - public final fun getDataCaptureErrorMessage ()Ljava/lang/String; - public final fun getRequestBodySize ()I - public final fun getRequestHeaders ()Ljava/util/Map; - public final fun getRequestQueryParams ()Ljava/lang/String; - public final fun getResponseBodySize ()I - public final fun getResponseHeaders ()Ljava/util/Map; - public fun hashCode ()I - public fun toString ()Ljava/lang/String; -} - public abstract interface class io/embrace/android/embracesdk/spans/EmbraceSpan { public abstract fun addAttribute (Ljava/lang/String;Ljava/lang/String;)Z public abstract fun addEvent (Ljava/lang/String;)Z diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/NetworkRequestApiTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/NetworkRequestApiTest.kt index 9c233829ec..86a9edffbd 100644 --- a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/NetworkRequestApiTest.kt +++ b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/NetworkRequestApiTest.kt @@ -5,7 +5,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import io.embrace.android.embracesdk.IntegrationTestRule import io.embrace.android.embracesdk.network.EmbraceNetworkRequest import io.embrace.android.embracesdk.network.http.HttpMethod -import io.embrace.android.embracesdk.network.http.NetworkCaptureData +import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData import io.embrace.android.embracesdk.payload.NetworkCallV2 import io.embrace.android.embracesdk.recordSession import org.junit.Assert.assertEquals diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceImpl.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceImpl.java index 8cefb6e4a3..c6d6809dde 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceImpl.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceImpl.java @@ -78,8 +78,8 @@ import io.embrace.android.embracesdk.ndk.NativeModuleImpl; import io.embrace.android.embracesdk.ndk.NdkService; import io.embrace.android.embracesdk.network.EmbraceNetworkRequest; -import io.embrace.android.embracesdk.network.http.HttpUrlConnectionTracker; -import io.embrace.android.embracesdk.network.http.NetworkCaptureData; +import io.embrace.android.embracesdk.internal.network.http.HttpUrlConnectionTracker; +import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData; import io.embrace.android.embracesdk.network.logging.NetworkCaptureService; import io.embrace.android.embracesdk.network.logging.NetworkLoggingService; import io.embrace.android.embracesdk.payload.PushNotificationBreadcrumb; diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceInternalInterfaceImpl.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceInternalInterfaceImpl.kt index df71f0f4df..83dd56682d 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceInternalInterfaceImpl.kt +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceInternalInterfaceImpl.kt @@ -3,9 +3,9 @@ package io.embrace.android.embracesdk import android.util.Pair import io.embrace.android.embracesdk.injection.InitModule import io.embrace.android.embracesdk.internal.EmbraceInternalInterface +import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData import io.embrace.android.embracesdk.network.EmbraceNetworkRequest import io.embrace.android.embracesdk.network.http.HttpMethod -import io.embrace.android.embracesdk.network.http.NetworkCaptureData import io.embrace.android.embracesdk.payload.TapBreadcrumb internal class EmbraceInternalInterfaceImpl( diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/HttpPathOverrideRequest.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/HttpPathOverrideRequest.java deleted file mode 100644 index 0c1609bb75..0000000000 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/HttpPathOverrideRequest.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.embrace.android.embracesdk; - -@InternalApi -public interface HttpPathOverrideRequest { - String getHeaderByName(String name); - - @SuppressWarnings("AbbreviationAsWordInNameCheck") - String getOverriddenURL(String pathOverride); - - @SuppressWarnings("AbbreviationAsWordInNameCheck") - String getURLString(); -} diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/EmbraceInternalInterface.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/EmbraceInternalInterface.kt index e21964352b..a97cbc9abb 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/EmbraceInternalInterface.kt +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/EmbraceInternalInterface.kt @@ -4,8 +4,8 @@ import android.util.Pair import io.embrace.android.embracesdk.Embrace import io.embrace.android.embracesdk.InternalApi import io.embrace.android.embracesdk.LogType +import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData import io.embrace.android.embracesdk.network.EmbraceNetworkRequest -import io.embrace.android.embracesdk.network.http.NetworkCaptureData /** * Provides an internal interface to Embrace that is intended for use by hosted SDKs as their sole source of communication diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/CountingInputStreamWithCallback.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/CountingInputStreamWithCallback.java similarity index 98% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/CountingInputStreamWithCallback.java rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/CountingInputStreamWithCallback.java index 99e371dafe..0000cfd70d 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/CountingInputStreamWithCallback.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/CountingInputStreamWithCallback.java @@ -1,4 +1,4 @@ -package io.embrace.android.embracesdk.network.http; +package io.embrace.android.embracesdk.internal.network.http; import androidx.annotation.NonNull; diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/CountingOutputStream.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/CountingOutputStream.java similarity index 96% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/CountingOutputStream.java rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/CountingOutputStream.java index dc757aff4d..5cddac2278 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/CountingOutputStream.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/CountingOutputStream.java @@ -1,4 +1,4 @@ -package io.embrace.android.embracesdk.network.http; +package io.embrace.android.embracesdk.internal.network.http; import java.io.ByteArrayOutputStream; import java.io.FilterOutputStream; diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpPathOverride.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpPathOverride.java similarity index 84% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpPathOverride.java rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpPathOverride.java index 6b3ace236c..e0f9164cbc 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpPathOverride.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpPathOverride.java @@ -1,10 +1,12 @@ -package io.embrace.android.embracesdk.network.http; +package io.embrace.android.embracesdk.internal.network.http; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.nio.charset.StandardCharsets; import java.util.Locale; import java.util.regex.Pattern; -import io.embrace.android.embracesdk.HttpPathOverrideRequest; import io.embrace.android.embracesdk.InternalApi; import io.embrace.android.embracesdk.logging.InternalStaticEmbraceLogger; @@ -28,13 +30,15 @@ public class EmbraceHttpPathOverride { private static final Pattern RELATIVE_PATH_PATTERN = Pattern.compile("[A-Za-z0-9-._~:/\\[\\]@!$&'()*+,;=]+"); @SuppressWarnings("AbbreviationAsWordInNameCheck") - public static String getURLString(HttpPathOverrideRequest request) { + @NonNull + public static String getURLString(@NonNull HttpPathOverrideRequest request) { return getURLString(request, request.getHeaderByName(PATH_OVERRIDE)); } @SuppressWarnings("AbbreviationAsWordInNameCheck") @InternalApi - public static String getURLString(HttpPathOverrideRequest request, String pathOverride) { + @NonNull + public static String getURLString(@NonNull HttpPathOverrideRequest request, @Nullable String pathOverride) { String url; try { if (pathOverride != null && validatePathOverride(pathOverride)) { @@ -65,7 +69,7 @@ private static Boolean validatePathOverride(String path) { } if (!StandardCharsets.US_ASCII.newEncoder().canEncode(path)) { InternalStaticEmbraceLogger.logError("Relative path must not contain unicode " + - "characters. Relative path " + path + " will be ignored."); + "characters. Relative path " + path + " will be ignored."); return false; } if (!path.startsWith("/")) { @@ -74,7 +78,7 @@ private static Boolean validatePathOverride(String path) { } if (!RELATIVE_PATH_PATTERN.matcher(path).matches()) { InternalStaticEmbraceLogger.logError("Relative path contains invalid chars. " + - "Relative path " + path + " will be ignored."); + "Relative path " + path + " will be ignored."); return false; } diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpUrlConnection.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnection.java similarity index 98% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpUrlConnection.java rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnection.java index a5059eacf2..4df7ba9466 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpUrlConnection.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnection.java @@ -1,4 +1,4 @@ -package io.embrace.android.embracesdk.network.http; +package io.embrace.android.embracesdk.internal.network.http; import android.annotation.TargetApi; diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpUrlConnectionImpl.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnectionImpl.java similarity index 54% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpUrlConnectionImpl.java rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnectionImpl.java index 5f32e433b7..c0a8a67c1d 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpUrlConnectionImpl.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnectionImpl.java @@ -1,4 +1,4 @@ -package io.embrace.android.embracesdk.network.http; +package io.embrace.android.embracesdk.internal.network.http; import android.annotation.TargetApi; @@ -14,7 +14,7 @@ class EmbraceHttpUrlConnectionImpl extends HttpURLConnection { - private final EmbraceHttpUrlConnection embraceConnectionService; + private final EmbraceHttpUrlConnection embraceHttpUrlConnectionDelegate; /** * Wraps an existing {@link HttpURLConnection} with the Embrace network logic. @@ -24,273 +24,273 @@ class EmbraceHttpUrlConnectionImpl extends HttpURLC */ public EmbraceHttpUrlConnectionImpl(T connection, boolean enableWrapIoStreams) { super(connection.getURL()); - embraceConnectionService = new EmbraceUrlConnectionDelegate<>(connection, enableWrapIoStreams); + embraceHttpUrlConnectionDelegate = new EmbraceUrlConnectionDelegate<>(connection, enableWrapIoStreams); } @Override public void addRequestProperty(String key, String value) { - embraceConnectionService.addRequestProperty(key, value); + embraceHttpUrlConnectionDelegate.addRequestProperty(key, value); } @Override public void connect() throws IOException { - embraceConnectionService.connect(); + embraceHttpUrlConnectionDelegate.connect(); } @Override public void disconnect() { - embraceConnectionService.disconnect(); + embraceHttpUrlConnectionDelegate.disconnect(); } @Override public boolean getAllowUserInteraction() { - return embraceConnectionService.getAllowUserInteraction(); + return embraceHttpUrlConnectionDelegate.getAllowUserInteraction(); } @Override public void setAllowUserInteraction(boolean allowUserInteraction) { - embraceConnectionService.setAllowUserInteraction(allowUserInteraction); + embraceHttpUrlConnectionDelegate.setAllowUserInteraction(allowUserInteraction); } @Override public int getConnectTimeout() { - return embraceConnectionService.getConnectTimeout(); + return embraceHttpUrlConnectionDelegate.getConnectTimeout(); } @Override public void setConnectTimeout(int timeout) { - embraceConnectionService.setConnectTimeout(timeout); + embraceHttpUrlConnectionDelegate.setConnectTimeout(timeout); } @Override public Object getContent() throws IOException { - return embraceConnectionService.getContent(); + return embraceHttpUrlConnectionDelegate.getContent(); } @Override public Object getContent(Class[] classes) throws IOException { - return embraceConnectionService.getContent(classes); + return embraceHttpUrlConnectionDelegate.getContent(classes); } @Override public String getContentEncoding() { - return embraceConnectionService.getContentEncoding(); + return embraceHttpUrlConnectionDelegate.getContentEncoding(); } @Override public int getContentLength() { - return embraceConnectionService.getContentLength(); + return embraceHttpUrlConnectionDelegate.getContentLength(); } @Override @TargetApi(24) public long getContentLengthLong() { - return embraceConnectionService.getContentLengthLong(); + return embraceHttpUrlConnectionDelegate.getContentLengthLong(); } @Override public String getContentType() { - return embraceConnectionService.getContentType(); + return embraceHttpUrlConnectionDelegate.getContentType(); } @Override public long getDate() { - return embraceConnectionService.getDate(); + return embraceHttpUrlConnectionDelegate.getDate(); } @Override public boolean getDefaultUseCaches() { - return embraceConnectionService.getDefaultUseCaches(); + return embraceHttpUrlConnectionDelegate.getDefaultUseCaches(); } @Override public void setDefaultUseCaches(boolean defaultUseCaches) { - embraceConnectionService.setDefaultUseCaches(defaultUseCaches); + embraceHttpUrlConnectionDelegate.setDefaultUseCaches(defaultUseCaches); } @Override public boolean getDoInput() { - return embraceConnectionService.getDoInput(); + return embraceHttpUrlConnectionDelegate.getDoInput(); } @Override public void setDoInput(boolean doInput) { - embraceConnectionService.setDoInput(doInput); + embraceHttpUrlConnectionDelegate.setDoInput(doInput); } @Override public boolean getDoOutput() { - return embraceConnectionService.getDoOutput(); + return embraceHttpUrlConnectionDelegate.getDoOutput(); } @Override public void setDoOutput(boolean doOutput) { - embraceConnectionService.setDoOutput(doOutput); + embraceHttpUrlConnectionDelegate.setDoOutput(doOutput); } @Override public InputStream getErrorStream() { - return embraceConnectionService.getErrorStream(); + return embraceHttpUrlConnectionDelegate.getErrorStream(); } @Override public String getHeaderField(int n) { - return embraceConnectionService.getHeaderField(n); + return embraceHttpUrlConnectionDelegate.getHeaderField(n); } @Override public String getHeaderField(String name) { - return embraceConnectionService.getHeaderField(name); + return embraceHttpUrlConnectionDelegate.getHeaderField(name); } @Override public long getHeaderFieldDate(String name, long defaultValue) { - return embraceConnectionService.getHeaderFieldDate(name, defaultValue); + return embraceHttpUrlConnectionDelegate.getHeaderFieldDate(name, defaultValue); } @Override public int getHeaderFieldInt(String name, int defaultValue) { - return embraceConnectionService.getHeaderFieldInt(name, defaultValue); + return embraceHttpUrlConnectionDelegate.getHeaderFieldInt(name, defaultValue); } @Override public String getHeaderFieldKey(int n) { - return embraceConnectionService.getHeaderFieldKey(n); + return embraceHttpUrlConnectionDelegate.getHeaderFieldKey(n); } @Override @TargetApi(24) public long getHeaderFieldLong(String name, long defaultValue) { - return embraceConnectionService.getHeaderFieldLong(name, defaultValue); + return embraceHttpUrlConnectionDelegate.getHeaderFieldLong(name, defaultValue); } @Override public Map> getHeaderFields() { - return embraceConnectionService.getHeaderFields(); + return embraceHttpUrlConnectionDelegate.getHeaderFields(); } @Override public long getIfModifiedSince() { - return embraceConnectionService.getIfModifiedSince(); + return embraceHttpUrlConnectionDelegate.getIfModifiedSince(); } @Override public void setIfModifiedSince(long ifModifiedSince) { - embraceConnectionService.setIfModifiedSince(ifModifiedSince); + embraceHttpUrlConnectionDelegate.setIfModifiedSince(ifModifiedSince); } @Override public InputStream getInputStream() throws IOException { - return embraceConnectionService.getInputStream(); + return embraceHttpUrlConnectionDelegate.getInputStream(); } @Override public boolean getInstanceFollowRedirects() { - return embraceConnectionService.getInstanceFollowRedirects(); + return embraceHttpUrlConnectionDelegate.getInstanceFollowRedirects(); } @Override public void setInstanceFollowRedirects(boolean followRedirects) { - embraceConnectionService.setInstanceFollowRedirects(followRedirects); + embraceHttpUrlConnectionDelegate.setInstanceFollowRedirects(followRedirects); } @Override public long getLastModified() { - return embraceConnectionService.getLastModified(); + return embraceHttpUrlConnectionDelegate.getLastModified(); } @Override public OutputStream getOutputStream() throws IOException { - return embraceConnectionService.getOutputStream(); + return embraceHttpUrlConnectionDelegate.getOutputStream(); } @Override public Permission getPermission() throws IOException { - return embraceConnectionService.getPermission(); + return embraceHttpUrlConnectionDelegate.getPermission(); } @Override public int getReadTimeout() { - return embraceConnectionService.getReadTimeout(); + return embraceHttpUrlConnectionDelegate.getReadTimeout(); } @Override public void setReadTimeout(int timeout) { - embraceConnectionService.setReadTimeout(timeout); + embraceHttpUrlConnectionDelegate.setReadTimeout(timeout); } @Override public String getRequestMethod() { - return embraceConnectionService.getRequestMethod(); + return embraceHttpUrlConnectionDelegate.getRequestMethod(); } @Override public void setRequestMethod(String method) throws ProtocolException { - embraceConnectionService.setRequestMethod(method); + embraceHttpUrlConnectionDelegate.setRequestMethod(method); } @Override public Map> getRequestProperties() { - return embraceConnectionService.getRequestProperties(); + return embraceHttpUrlConnectionDelegate.getRequestProperties(); } @Override public String getRequestProperty(String key) { - return embraceConnectionService.getRequestProperty(key); + return embraceHttpUrlConnectionDelegate.getRequestProperty(key); } @Override public int getResponseCode() throws IOException { - return embraceConnectionService.getResponseCode(); + return embraceHttpUrlConnectionDelegate.getResponseCode(); } @Override public String getResponseMessage() throws IOException { - return embraceConnectionService.getResponseMessage(); + return embraceHttpUrlConnectionDelegate.getResponseMessage(); } @Override public URL getURL() { - return embraceConnectionService.getUrl(); + return embraceHttpUrlConnectionDelegate.getUrl(); } @Override public boolean getUseCaches() { - return embraceConnectionService.getUseCaches(); + return embraceHttpUrlConnectionDelegate.getUseCaches(); } @Override public void setUseCaches(boolean useCaches) { - embraceConnectionService.setUseCaches(useCaches); + embraceHttpUrlConnectionDelegate.setUseCaches(useCaches); } @Override public void setChunkedStreamingMode(int chunkLen) { - embraceConnectionService.setChunkedStreamingMode(chunkLen); + embraceHttpUrlConnectionDelegate.setChunkedStreamingMode(chunkLen); } @Override public void setFixedLengthStreamingMode(int contentLength) { - embraceConnectionService.setFixedLengthStreamingMode(contentLength); + embraceHttpUrlConnectionDelegate.setFixedLengthStreamingMode(contentLength); } @Override public void setFixedLengthStreamingMode(long contentLength) { - embraceConnectionService.setFixedLengthStreamingMode(contentLength); + embraceHttpUrlConnectionDelegate.setFixedLengthStreamingMode(contentLength); } @Override public void setRequestProperty(String key, String value) { - embraceConnectionService.setRequestProperty(key, value); + embraceHttpUrlConnectionDelegate.setRequestProperty(key, value); } @Override public String toString() { - return embraceConnectionService.toString(); + return embraceHttpUrlConnectionDelegate.toString(); } @Override public boolean usingProxy() { - return embraceConnectionService.usingProxy(); + return embraceHttpUrlConnectionDelegate.usingProxy(); } } diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpUrlConnectionOverride.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnectionOverride.java similarity index 72% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpUrlConnectionOverride.java rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnectionOverride.java index ac49cd172a..2d767516c0 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpUrlConnectionOverride.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnectionOverride.java @@ -1,12 +1,11 @@ -package io.embrace.android.embracesdk.network.http; +package io.embrace.android.embracesdk.internal.network.http; + +import androidx.annotation.NonNull; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; -import java.util.Locale; -import io.embrace.android.embracesdk.HttpPathOverrideRequest; -import io.embrace.android.embracesdk.InternalApi; import io.embrace.android.embracesdk.logging.InternalStaticEmbraceLogger; class EmbraceHttpUrlConnectionOverride implements HttpPathOverrideRequest { @@ -17,23 +16,26 @@ class EmbraceHttpUrlConnectionOverride implements HttpPathOverrideRequest { this.connection = connection; } + @NonNull @Override - public String getHeaderByName(String name) { + public String getHeaderByName(@NonNull String name) { return connection.getRequestProperty(name); } + @NonNull @Override - public String getOverriddenURL(String pathOverride) { + public String getOverriddenURL(@NonNull String pathOverride) { try { return new URL(connection.getURL().getProtocol(), connection.getURL().getHost(), connection.getURL().getPort(), pathOverride).toString(); } catch (MalformedURLException e) { InternalStaticEmbraceLogger.logError("Failed to override path of " + - connection.getURL() + " with " + pathOverride); + connection.getURL() + " with " + pathOverride); return connection.getURL().toString(); } } + @NonNull @Override public String getURLString() { return connection.getURL().toString(); diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpUrlStreamHandler.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlStreamHandler.java similarity index 97% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpUrlStreamHandler.java rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlStreamHandler.java index 37a404efd6..d442221ddc 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpUrlStreamHandler.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlStreamHandler.java @@ -1,4 +1,4 @@ -package io.embrace.android.embracesdk.network.http; +package io.embrace.android.embracesdk.internal.network.http; import java.lang.reflect.Method; import java.net.HttpURLConnection; diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpsUrlConnection.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpsUrlConnection.java similarity index 93% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpsUrlConnection.java rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpsUrlConnection.java index 963055706a..eb66132fea 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpsUrlConnection.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpsUrlConnection.java @@ -1,4 +1,4 @@ -package io.embrace.android.embracesdk.network.http; +package io.embrace.android.embracesdk.internal.network.http; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpsUrlConnectionImpl.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpsUrlConnectionImpl.java similarity index 54% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpsUrlConnectionImpl.java rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpsUrlConnectionImpl.java index 6c59bf3403..24edc6d940 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpsUrlConnectionImpl.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpsUrlConnectionImpl.java @@ -1,4 +1,4 @@ -package io.embrace.android.embracesdk.network.http; +package io.embrace.android.embracesdk.internal.network.http; import android.annotation.TargetApi; @@ -27,8 +27,7 @@ */ class EmbraceHttpsUrlConnectionImpl extends HttpsURLConnection { - private final EmbraceHttpsUrlConnection embraceHttpsUrlConnectionService; - + private final EmbraceHttpsUrlConnection embraceHttpsUrlConnectionDelegate; /** * Wraps an existing {@link HttpsURLConnection} with the Embrace network logic. @@ -38,318 +37,318 @@ class EmbraceHttpsUrlConnectionImpl extends HttpsU */ public EmbraceHttpsUrlConnectionImpl(T connection, boolean enableWrapIoStreams) { super(connection.getURL()); - embraceHttpsUrlConnectionService = new EmbraceUrlConnectionDelegate<>(connection, enableWrapIoStreams); + embraceHttpsUrlConnectionDelegate = new EmbraceUrlConnectionDelegate<>(connection, enableWrapIoStreams); } @Override public void addRequestProperty(String key, String value) { - this.embraceHttpsUrlConnectionService.addRequestProperty(key, value); + this.embraceHttpsUrlConnectionDelegate.addRequestProperty(key, value); } @Override public void connect() throws IOException { - this.embraceHttpsUrlConnectionService.connect(); + this.embraceHttpsUrlConnectionDelegate.connect(); } @Override public void disconnect() { - this.embraceHttpsUrlConnectionService.disconnect(); + this.embraceHttpsUrlConnectionDelegate.disconnect(); } @Override public boolean getAllowUserInteraction() { - return this.embraceHttpsUrlConnectionService.getAllowUserInteraction(); + return this.embraceHttpsUrlConnectionDelegate.getAllowUserInteraction(); } @Override public void setAllowUserInteraction(boolean allowUserInteraction) { - this.embraceHttpsUrlConnectionService.setAllowUserInteraction(allowUserInteraction); + this.embraceHttpsUrlConnectionDelegate.setAllowUserInteraction(allowUserInteraction); } @Override public int getConnectTimeout() { - return this.embraceHttpsUrlConnectionService.getConnectTimeout(); + return this.embraceHttpsUrlConnectionDelegate.getConnectTimeout(); } @Override public void setConnectTimeout(int timeout) { - this.embraceHttpsUrlConnectionService.setConnectTimeout(timeout); + this.embraceHttpsUrlConnectionDelegate.setConnectTimeout(timeout); } @Override public Object getContent() throws IOException { - return this.embraceHttpsUrlConnectionService.getContent(); + return this.embraceHttpsUrlConnectionDelegate.getContent(); } @Override public Object getContent(Class[] classes) throws IOException { - return this.embraceHttpsUrlConnectionService.getContent(classes); + return this.embraceHttpsUrlConnectionDelegate.getContent(classes); } @Override public String getContentEncoding() { - return this.embraceHttpsUrlConnectionService.getContentEncoding(); + return this.embraceHttpsUrlConnectionDelegate.getContentEncoding(); } @Override public int getContentLength() { - return this.embraceHttpsUrlConnectionService.getContentLength(); + return this.embraceHttpsUrlConnectionDelegate.getContentLength(); } @Override @TargetApi(24) public long getContentLengthLong() { - return this.embraceHttpsUrlConnectionService.getContentLengthLong(); + return this.embraceHttpsUrlConnectionDelegate.getContentLengthLong(); } @Override public String getContentType() { - return this.embraceHttpsUrlConnectionService.getContentType(); + return this.embraceHttpsUrlConnectionDelegate.getContentType(); } @Override public long getDate() { - return this.embraceHttpsUrlConnectionService.getDate(); + return this.embraceHttpsUrlConnectionDelegate.getDate(); } @Override public boolean getDefaultUseCaches() { - return this.embraceHttpsUrlConnectionService.getDefaultUseCaches(); + return this.embraceHttpsUrlConnectionDelegate.getDefaultUseCaches(); } @Override public void setDefaultUseCaches(boolean defaultUseCaches) { - this.embraceHttpsUrlConnectionService.setDefaultUseCaches(defaultUseCaches); + this.embraceHttpsUrlConnectionDelegate.setDefaultUseCaches(defaultUseCaches); } @Override public boolean getDoInput() { - return this.embraceHttpsUrlConnectionService.getDoInput(); + return this.embraceHttpsUrlConnectionDelegate.getDoInput(); } @Override public void setDoInput(boolean doInput) { - this.embraceHttpsUrlConnectionService.setDoInput(doInput); + this.embraceHttpsUrlConnectionDelegate.setDoInput(doInput); } @Override public boolean getDoOutput() { - return this.embraceHttpsUrlConnectionService.getDoOutput(); + return this.embraceHttpsUrlConnectionDelegate.getDoOutput(); } @Override public void setDoOutput(boolean doOutput) { - this.embraceHttpsUrlConnectionService.setDoOutput(doOutput); + this.embraceHttpsUrlConnectionDelegate.setDoOutput(doOutput); } @Override public InputStream getErrorStream() { - return this.embraceHttpsUrlConnectionService.getErrorStream(); + return this.embraceHttpsUrlConnectionDelegate.getErrorStream(); } @Override public String getHeaderField(int n) { - return this.embraceHttpsUrlConnectionService.getHeaderField(n); + return this.embraceHttpsUrlConnectionDelegate.getHeaderField(n); } @Override public String getHeaderField(String name) { - return this.embraceHttpsUrlConnectionService.getHeaderField(name); + return this.embraceHttpsUrlConnectionDelegate.getHeaderField(name); } @Override public long getHeaderFieldDate(String name, long defaultValue) { - return this.embraceHttpsUrlConnectionService.getHeaderFieldDate(name, defaultValue); + return this.embraceHttpsUrlConnectionDelegate.getHeaderFieldDate(name, defaultValue); } @Override public int getHeaderFieldInt(String name, int defaultValue) { - return this.embraceHttpsUrlConnectionService.getHeaderFieldInt(name, defaultValue); + return this.embraceHttpsUrlConnectionDelegate.getHeaderFieldInt(name, defaultValue); } @Override public String getHeaderFieldKey(int n) { - return this.embraceHttpsUrlConnectionService.getHeaderFieldKey(n); + return this.embraceHttpsUrlConnectionDelegate.getHeaderFieldKey(n); } @Override @TargetApi(24) public long getHeaderFieldLong(String name, long defaultValue) { - return this.embraceHttpsUrlConnectionService.getHeaderFieldLong(name, defaultValue); + return this.embraceHttpsUrlConnectionDelegate.getHeaderFieldLong(name, defaultValue); } @Override public Map> getHeaderFields() { - return this.embraceHttpsUrlConnectionService.getHeaderFields(); + return this.embraceHttpsUrlConnectionDelegate.getHeaderFields(); } @Override public long getIfModifiedSince() { - return this.embraceHttpsUrlConnectionService.getIfModifiedSince(); + return this.embraceHttpsUrlConnectionDelegate.getIfModifiedSince(); } @Override public void setIfModifiedSince(long ifModifiedSince) { - this.embraceHttpsUrlConnectionService.setIfModifiedSince(ifModifiedSince); + this.embraceHttpsUrlConnectionDelegate.setIfModifiedSince(ifModifiedSince); } @Override public InputStream getInputStream() throws IOException { - return this.embraceHttpsUrlConnectionService.getInputStream(); + return this.embraceHttpsUrlConnectionDelegate.getInputStream(); } @Override public boolean getInstanceFollowRedirects() { - return this.embraceHttpsUrlConnectionService.getInstanceFollowRedirects(); + return this.embraceHttpsUrlConnectionDelegate.getInstanceFollowRedirects(); } @Override public void setInstanceFollowRedirects(boolean followRedirects) { - this.embraceHttpsUrlConnectionService.setInstanceFollowRedirects(followRedirects); + this.embraceHttpsUrlConnectionDelegate.setInstanceFollowRedirects(followRedirects); } @Override public long getLastModified() { - return this.embraceHttpsUrlConnectionService.getLastModified(); + return this.embraceHttpsUrlConnectionDelegate.getLastModified(); } @Override public OutputStream getOutputStream() throws IOException { - return this.embraceHttpsUrlConnectionService.getOutputStream(); + return this.embraceHttpsUrlConnectionDelegate.getOutputStream(); } @Override public Permission getPermission() throws IOException { - return this.embraceHttpsUrlConnectionService.getPermission(); + return this.embraceHttpsUrlConnectionDelegate.getPermission(); } @Override public int getReadTimeout() { - return this.embraceHttpsUrlConnectionService.getReadTimeout(); + return this.embraceHttpsUrlConnectionDelegate.getReadTimeout(); } @Override public void setReadTimeout(int timeout) { - this.embraceHttpsUrlConnectionService.setReadTimeout(timeout); + this.embraceHttpsUrlConnectionDelegate.setReadTimeout(timeout); } @Override public String getRequestMethod() { - return this.embraceHttpsUrlConnectionService.getRequestMethod(); + return this.embraceHttpsUrlConnectionDelegate.getRequestMethod(); } @Override public void setRequestMethod(String method) throws ProtocolException { - this.embraceHttpsUrlConnectionService.setRequestMethod(method); + this.embraceHttpsUrlConnectionDelegate.setRequestMethod(method); } @Override public Map> getRequestProperties() { - return this.embraceHttpsUrlConnectionService.getRequestProperties(); + return this.embraceHttpsUrlConnectionDelegate.getRequestProperties(); } @Override public String getRequestProperty(String key) { - return this.embraceHttpsUrlConnectionService.getRequestProperty(key); + return this.embraceHttpsUrlConnectionDelegate.getRequestProperty(key); } @Override public int getResponseCode() throws IOException { - return this.embraceHttpsUrlConnectionService.getResponseCode(); + return this.embraceHttpsUrlConnectionDelegate.getResponseCode(); } @Override public String getResponseMessage() throws IOException { - return this.embraceHttpsUrlConnectionService.getResponseMessage(); + return this.embraceHttpsUrlConnectionDelegate.getResponseMessage(); } @Override public URL getURL() { - return this.embraceHttpsUrlConnectionService.getUrl(); + return this.embraceHttpsUrlConnectionDelegate.getUrl(); } @Override public boolean getUseCaches() { - return this.embraceHttpsUrlConnectionService.getUseCaches(); + return this.embraceHttpsUrlConnectionDelegate.getUseCaches(); } @Override public void setUseCaches(boolean useCaches) { - this.embraceHttpsUrlConnectionService.setUseCaches(useCaches); + this.embraceHttpsUrlConnectionDelegate.setUseCaches(useCaches); } @Override public void setChunkedStreamingMode(int chunkLen) { - this.embraceHttpsUrlConnectionService.setChunkedStreamingMode(chunkLen); + this.embraceHttpsUrlConnectionDelegate.setChunkedStreamingMode(chunkLen); } @Override public void setFixedLengthStreamingMode(int contentLength) { - this.embraceHttpsUrlConnectionService.setFixedLengthStreamingMode(contentLength); + this.embraceHttpsUrlConnectionDelegate.setFixedLengthStreamingMode(contentLength); } @Override public void setFixedLengthStreamingMode(long contentLength) { - this.embraceHttpsUrlConnectionService.setFixedLengthStreamingMode(contentLength); + this.embraceHttpsUrlConnectionDelegate.setFixedLengthStreamingMode(contentLength); } @Override public void setRequestProperty(String key, String value) { - this.embraceHttpsUrlConnectionService.setRequestProperty(key, value); + this.embraceHttpsUrlConnectionDelegate.setRequestProperty(key, value); } @Override public String toString() { - return this.embraceHttpsUrlConnectionService.toString(); + return this.embraceHttpsUrlConnectionDelegate.toString(); } @Override public boolean usingProxy() { - return this.embraceHttpsUrlConnectionService.usingProxy(); + return this.embraceHttpsUrlConnectionDelegate.usingProxy(); } @Override public String getCipherSuite() { - return this.embraceHttpsUrlConnectionService.getCipherSuite(); + return this.embraceHttpsUrlConnectionDelegate.getCipherSuite(); } @Override public Certificate[] getLocalCertificates() { - return this.embraceHttpsUrlConnectionService.getLocalCertificates(); + return this.embraceHttpsUrlConnectionDelegate.getLocalCertificates(); } @Override public Certificate[] getServerCertificates() throws SSLPeerUnverifiedException { - return this.embraceHttpsUrlConnectionService.getServerCertificates(); + return this.embraceHttpsUrlConnectionDelegate.getServerCertificates(); } @Override public SSLSocketFactory getSSLSocketFactory() { - return this.embraceHttpsUrlConnectionService.getSslSocketFactory(); + return this.embraceHttpsUrlConnectionDelegate.getSslSocketFactory(); } @Override public void setSSLSocketFactory(SSLSocketFactory factory) { - this.embraceHttpsUrlConnectionService.setSslSocketFactory(factory); + this.embraceHttpsUrlConnectionDelegate.setSslSocketFactory(factory); } @Override public HostnameVerifier getHostnameVerifier() { - return this.embraceHttpsUrlConnectionService.getHostnameVerifier(); + return this.embraceHttpsUrlConnectionDelegate.getHostnameVerifier(); } @Override public void setHostnameVerifier(HostnameVerifier verifier) { - this.embraceHttpsUrlConnectionService.setHostnameVerifier(verifier); + this.embraceHttpsUrlConnectionDelegate.setHostnameVerifier(verifier); } public Principal getLocalPrincipal() { - return embraceHttpsUrlConnectionService.getLocalPrincipal(); + return embraceHttpsUrlConnectionDelegate.getLocalPrincipal(); } public Principal getPeerPrincipal() throws SSLPeerUnverifiedException { - return embraceHttpsUrlConnectionService.getPeerPrincipal(); + return embraceHttpsUrlConnectionDelegate.getPeerPrincipal(); } } \ No newline at end of file diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpsUrlStreamHandler.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpsUrlStreamHandler.java similarity index 97% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpsUrlStreamHandler.java rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpsUrlStreamHandler.java index b176adaeb0..94f2f48f47 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceHttpsUrlStreamHandler.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpsUrlStreamHandler.java @@ -1,4 +1,4 @@ -package io.embrace.android.embracesdk.network.http; +package io.embrace.android.embracesdk.internal.network.http; import java.lang.reflect.Method; import java.net.Proxy; diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceUrlConnectionDelegate.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegate.java similarity index 99% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceUrlConnectionDelegate.java rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegate.java index 97c5d02c44..ff053df876 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceUrlConnectionDelegate.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegate.java @@ -1,4 +1,4 @@ -package io.embrace.android.embracesdk.network.http; +package io.embrace.android.embracesdk.internal.network.http; import static io.embrace.android.embracesdk.config.behavior.NetworkSpanForwardingBehavior.TRACEPARENT_HEADER_NAME; @@ -36,6 +36,7 @@ import io.embrace.android.embracesdk.InternalApi; import io.embrace.android.embracesdk.logging.InternalStaticEmbraceLogger; import io.embrace.android.embracesdk.network.EmbraceNetworkRequest; +import io.embrace.android.embracesdk.network.http.HttpMethod; import io.embrace.android.embracesdk.utils.exceptions.function.CheckedSupplier; import kotlin.jvm.functions.Function0; diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceUrlStreamHandler.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlStreamHandler.java similarity index 98% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceUrlStreamHandler.java rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlStreamHandler.java index 7a7818b8d9..a07f9c8009 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceUrlStreamHandler.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlStreamHandler.java @@ -1,4 +1,4 @@ -package io.embrace.android.embracesdk.network.http; +package io.embrace.android.embracesdk.internal.network.http; import static io.embrace.android.embracesdk.config.behavior.NetworkSpanForwardingBehavior.TRACEPARENT_HEADER_NAME; diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceUrlStreamHandlerFactory.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlStreamHandlerFactory.java similarity index 97% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceUrlStreamHandlerFactory.java rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlStreamHandlerFactory.java index 0d37e60b33..8664c999e0 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceUrlStreamHandlerFactory.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlStreamHandlerFactory.java @@ -1,4 +1,4 @@ -package io.embrace.android.embracesdk.network.http; +package io.embrace.android.embracesdk.internal.network.http; import java.net.URLStreamHandler; import java.net.URLStreamHandlerFactory; diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/HttpPathOverrideRequest.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/HttpPathOverrideRequest.java new file mode 100644 index 0000000000..16620eb0e0 --- /dev/null +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/HttpPathOverrideRequest.java @@ -0,0 +1,20 @@ +package io.embrace.android.embracesdk.internal.network.http; + +import androidx.annotation.NonNull; + +import io.embrace.android.embracesdk.InternalApi; + +@InternalApi +public interface HttpPathOverrideRequest { + + @NonNull + String getHeaderByName(@NonNull String name); + + @NonNull + @SuppressWarnings("AbbreviationAsWordInNameCheck") + String getOverriddenURL(@NonNull String pathOverride); + + @NonNull + @SuppressWarnings("AbbreviationAsWordInNameCheck") + String getURLString(); +} diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/HttpUrlConnectionTracker.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/HttpUrlConnectionTracker.kt similarity index 79% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/HttpUrlConnectionTracker.kt rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/HttpUrlConnectionTracker.kt index 3921c5e05b..786207bc0b 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/HttpUrlConnectionTracker.kt +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/HttpUrlConnectionTracker.kt @@ -1,4 +1,4 @@ -package io.embrace.android.embracesdk.network.http +package io.embrace.android.embracesdk.internal.network.http internal object HttpUrlConnectionTracker { @JvmStatic diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/NetworkCaptureData.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/NetworkCaptureData.kt similarity index 91% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/NetworkCaptureData.kt rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/NetworkCaptureData.kt index 911e2b3e5e..9aec1024fa 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/NetworkCaptureData.kt +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/NetworkCaptureData.kt @@ -1,4 +1,4 @@ -package io.embrace.android.embracesdk.network.http +package io.embrace.android.embracesdk.internal.network.http import io.embrace.android.embracesdk.InternalApi diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/StreamHandlerFactoryInstaller.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/StreamHandlerFactoryInstaller.java similarity index 99% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/StreamHandlerFactoryInstaller.java rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/StreamHandlerFactoryInstaller.java index e470bf684b..513f060855 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/StreamHandlerFactoryInstaller.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/StreamHandlerFactoryInstaller.java @@ -1,4 +1,4 @@ -package io.embrace.android.embracesdk.network.http; +package io.embrace.android.embracesdk.internal.network.http; import androidx.annotation.NonNull; diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/EmbraceNetworkRequest.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/EmbraceNetworkRequest.java index ccec0b0fd4..a0f05c0474 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/EmbraceNetworkRequest.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/EmbraceNetworkRequest.java @@ -3,9 +3,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import io.embrace.android.embracesdk.logging.InternalStaticEmbraceLogger; import io.embrace.android.embracesdk.network.http.HttpMethod; -import io.embrace.android.embracesdk.network.http.NetworkCaptureData; +import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData; /** * This class is used to create manually-recorded network requests. diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/HttpMethod.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/HttpMethod.java index 85e983c9d0..0ea6e85a9a 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/HttpMethod.java +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/HttpMethod.java @@ -2,14 +2,11 @@ import java.util.Locale; -import io.embrace.android.embracesdk.InternalApi; - /** * Enumeration of supported HTTP request methods. *

* This class is part of the Embrace Public API. */ -@InternalApi public enum HttpMethod { GET, HEAD, diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/EmbraceNetworkCaptureService.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/EmbraceNetworkCaptureService.kt index e92f6bc63c..5617b7e519 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/EmbraceNetworkCaptureService.kt +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/EmbraceNetworkCaptureService.kt @@ -5,8 +5,8 @@ import io.embrace.android.embracesdk.config.ConfigService import io.embrace.android.embracesdk.config.remote.NetworkCaptureRuleRemoteConfig import io.embrace.android.embracesdk.event.EmbraceRemoteLogger import io.embrace.android.embracesdk.internal.EmbraceSerializer +import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData import io.embrace.android.embracesdk.logging.InternalStaticEmbraceLogger -import io.embrace.android.embracesdk.network.http.NetworkCaptureData import io.embrace.android.embracesdk.payload.NetworkCapturedCall import io.embrace.android.embracesdk.prefs.PreferencesService import kotlin.math.max diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/EmbraceNetworkLoggingService.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/EmbraceNetworkLoggingService.kt index 7738a8acbb..963d64b3df 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/EmbraceNetworkLoggingService.kt +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/EmbraceNetworkLoggingService.kt @@ -2,8 +2,8 @@ package io.embrace.android.embracesdk.network.logging import io.embrace.android.embracesdk.config.ConfigService import io.embrace.android.embracesdk.internal.CacheableValue +import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData import io.embrace.android.embracesdk.logging.InternalEmbraceLogger -import io.embrace.android.embracesdk.network.http.NetworkCaptureData import io.embrace.android.embracesdk.network.logging.EmbraceNetworkCaptureService.Companion.NETWORK_ERROR_CODE import io.embrace.android.embracesdk.payload.NetworkCallV2 import io.embrace.android.embracesdk.payload.NetworkSessionV2 diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/NetworkCaptureService.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/NetworkCaptureService.kt index a2b3a4812d..d2f0c79452 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/NetworkCaptureService.kt +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/NetworkCaptureService.kt @@ -1,7 +1,7 @@ package io.embrace.android.embracesdk.network.logging import io.embrace.android.embracesdk.config.remote.NetworkCaptureRuleRemoteConfig -import io.embrace.android.embracesdk.network.http.NetworkCaptureData +import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData internal interface NetworkCaptureService { diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/NetworkLoggingService.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/NetworkLoggingService.kt index 9bd992e51b..5f40851919 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/NetworkLoggingService.kt +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/logging/NetworkLoggingService.kt @@ -1,6 +1,6 @@ package io.embrace.android.embracesdk.network.logging -import io.embrace.android.embracesdk.network.http.NetworkCaptureData +import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData import io.embrace.android.embracesdk.payload.NetworkSessionV2 /** diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakeNetworkLoggingService.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakeNetworkLoggingService.kt index fbab2fcadd..dbebe63059 100644 --- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakeNetworkLoggingService.kt +++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/fakes/FakeNetworkLoggingService.kt @@ -1,6 +1,6 @@ package io.embrace.android.embracesdk.fakes -import io.embrace.android.embracesdk.network.http.NetworkCaptureData +import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData import io.embrace.android.embracesdk.network.logging.NetworkLoggingService import io.embrace.android.embracesdk.payload.NetworkSessionV2 diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/network/http/EmbraceHttpUrlConnectionOverrideTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnectionOverrideTest.kt similarity index 99% rename from embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/network/http/EmbraceHttpUrlConnectionOverrideTest.kt rename to embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnectionOverrideTest.kt index 06d3ab5673..b8f18af758 100644 --- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/network/http/EmbraceHttpUrlConnectionOverrideTest.kt +++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpUrlConnectionOverrideTest.kt @@ -1,9 +1,10 @@ -package io.embrace.android.embracesdk.network.http +package io.embrace.android.embracesdk.internal.network.http import io.embrace.android.embracesdk.Embrace import io.embrace.android.embracesdk.config.behavior.NetworkSpanForwardingBehavior.Companion.TRACEPARENT_HEADER_NAME import io.embrace.android.embracesdk.internal.EmbraceInternalInterface import io.embrace.android.embracesdk.network.EmbraceNetworkRequest +import io.embrace.android.embracesdk.network.http.HttpMethod import io.mockk.CapturingSlot import io.mockk.every import io.mockk.mockk diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/network/http/EmbraceUrlStreamHandlerTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlStreamHandlerTest.kt similarity index 98% rename from embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/network/http/EmbraceUrlStreamHandlerTest.kt rename to embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlStreamHandlerTest.kt index a4fad739a4..e2367d97e5 100644 --- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/network/http/EmbraceUrlStreamHandlerTest.kt +++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlStreamHandlerTest.kt @@ -1,4 +1,4 @@ -package io.embrace.android.embracesdk.network.http +package io.embrace.android.embracesdk.internal.network.http import android.os.Build.VERSION_CODES.TIRAMISU import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/network/EmbraceNetworkRequestTest.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/network/EmbraceNetworkRequestTest.kt index 3bae98b4d7..9302a902e0 100644 --- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/network/EmbraceNetworkRequestTest.kt +++ b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/network/EmbraceNetworkRequestTest.kt @@ -1,8 +1,8 @@ package io.embrace.android.embracesdk.network import io.embrace.android.embracesdk.internal.TraceparentGenerator +import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData import io.embrace.android.embracesdk.network.http.HttpMethod -import io.embrace.android.embracesdk.network.http.NetworkCaptureData import org.junit.Assert.assertEquals import org.junit.Test