Skip to content

Commit 68589f4

Browse files
authored
Merge pull request #2707 from DataDog/nogorodnikov/move-top-level-functions-and-properties-060625
Move public top-level extension functions and properties from `core` module to `internal` module
2 parents 60a1945 + cee64de commit 68589f4

File tree

56 files changed

+134
-140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+134
-140
lines changed

dd-sdk-android-core/api/apiSurface

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,6 @@ interface com.datadog.android.core.InternalSdkCore : com.datadog.android.api.fea
192192
class com.datadog.android.core.SdkReference
193193
constructor(String? = null, (com.datadog.android.api.SdkCore) -> Unit = {})
194194
fun get(): com.datadog.android.api.SdkCore?
195-
fun <T> allowThreadDiskReads(() -> T): T
196-
fun <T> allowThreadDiskWrites(() -> T): T
197195
class com.datadog.android.core.UploadWorker : androidx.work.Worker
198196
constructor(android.content.Context, androidx.work.WorkerParameters)
199197
override fun doWork(): Result
@@ -290,15 +288,9 @@ fun Collection<ByteArray>.join(ByteArray, ByteArray = ByteArray(0), ByteArray =
290288
fun java.util.concurrent.Executor.executeSafe(String, com.datadog.android.api.InternalLogger, Runnable)
291289
fun java.util.concurrent.ScheduledExecutorService.scheduleSafe(String, Long, java.util.concurrent.TimeUnit, com.datadog.android.api.InternalLogger, Runnable): java.util.concurrent.ScheduledFuture<*>?
292290
fun java.util.concurrent.ExecutorService.submitSafe(String, com.datadog.android.api.InternalLogger, Runnable): java.util.concurrent.Future<*>?
293-
val NULL_MAP_VALUE: Object
294291
object com.datadog.android.core.internal.utils.JsonSerializer
295292
fun toJsonElement(Any?): com.google.gson.JsonElement
296293
fun Map<String, Any?>.safeMapValuesToJson(com.datadog.android.api.InternalLogger): Map<String, com.google.gson.JsonElement>
297-
fun Int.toHexString(): String
298-
fun Long.toHexString(): String
299-
fun java.math.BigInteger.toHexString(): String
300-
fun Thread.State.asString(): String
301-
fun Array<StackTraceElement>.loggableStackTrace(): String
302294
enum com.datadog.android.core.metrics.MethodCallSamplingRate
303295
constructor(Float)
304296
- ALL

dd-sdk-android-core/api/dd-sdk-android-core.api

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -551,11 +551,6 @@ public final class com/datadog/android/core/SdkReference {
551551
public final fun get ()Lcom/datadog/android/api/SdkCore;
552552
}
553553

554-
public final class com/datadog/android/core/StrictModeExtKt {
555-
public static final fun allowThreadDiskReads (Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
556-
public static final fun allowThreadDiskWrites (Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
557-
}
558-
559554
public final class com/datadog/android/core/UploadWorker : androidx/work/Worker {
560555
public static final field Companion Lcom/datadog/android/core/UploadWorker$Companion;
561556
public fun <init> (Landroid/content/Context;Landroidx/work/WorkerParameters;)V
@@ -792,21 +787,6 @@ public final class com/datadog/android/core/internal/utils/JsonSerializer {
792787
public final fun toJsonElement (Ljava/lang/Object;)Lcom/google/gson/JsonElement;
793788
}
794789

795-
public final class com/datadog/android/core/internal/utils/MapUtilsKt {
796-
public static final fun getNULL_MAP_VALUE ()Ljava/lang/Object;
797-
}
798-
799-
public final class com/datadog/android/core/internal/utils/NumberExtKt {
800-
public static final fun toHexString (I)Ljava/lang/String;
801-
public static final fun toHexString (J)Ljava/lang/String;
802-
public static final fun toHexString (Ljava/math/BigInteger;)Ljava/lang/String;
803-
}
804-
805-
public final class com/datadog/android/core/internal/utils/ThreadExtKt {
806-
public static final fun asString (Ljava/lang/Thread$State;)Ljava/lang/String;
807-
public static final fun loggableStackTrace ([Ljava/lang/StackTraceElement;)Ljava/lang/String;
808-
}
809-
810790
public final class com/datadog/android/core/metrics/MethodCallSamplingRate : java/lang/Enum {
811791
public static final field ALL Lcom/datadog/android/core/metrics/MethodCallSamplingRate;
812792
public static final field HIGH Lcom/datadog/android/core/metrics/MethodCallSamplingRate;

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/CoreFeature.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import com.datadog.android.Datadog
1919
import com.datadog.android.DatadogSite
2020
import com.datadog.android.api.InternalLogger
2121
import com.datadog.android.api.storage.RawBatchEvent
22-
import com.datadog.android.core.allowThreadDiskReads
2322
import com.datadog.android.core.configuration.BackPressureStrategy
2423
import com.datadog.android.core.configuration.BatchProcessingLevel
2524
import com.datadog.android.core.configuration.BatchSize
@@ -75,6 +74,7 @@ import com.datadog.android.core.internal.utils.executeSafe
7574
import com.datadog.android.core.internal.utils.unboundInternalLogger
7675
import com.datadog.android.core.persistence.PersistenceStrategy
7776
import com.datadog.android.core.thread.FlushableExecutorService
77+
import com.datadog.android.internal.utils.allowThreadDiskReads
7878
import com.datadog.android.ndk.internal.DatadogNdkCrashHandler
7979
import com.datadog.android.ndk.internal.NdkCrashHandler
8080
import com.datadog.android.ndk.internal.NdkCrashLogDeserializer

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/utils/MapUtils.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@
66

77
package com.datadog.android.core.internal.utils
88

9-
// TODO RUM-373 public as hack, no other solution for now. Any?.toJsonElement relies on this
10-
// particular value. Maybe create something like (class NullMap) and check identity instead?
11-
/**
12-
* Special value for missing attribute.
13-
*/
14-
@Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "PackageNameVisibility")
15-
val NULL_MAP_VALUE: Object = Object()
16-
179
/**
1810
* @return a new mutable map containing all key-value pairs from the given array of pairs.
1911
*

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/utils/MiscUtils.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
package com.datadog.android.core.internal.utils
88

99
import com.datadog.android.api.InternalLogger
10+
import com.datadog.android.internal.utils.NULL_MAP_VALUE
1011
import com.datadog.android.lint.InternalApi
1112
import com.google.gson.JsonArray
1213
import com.google.gson.JsonElement

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/utils/NumberExt.kt

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,8 @@
66

77
package com.datadog.android.core.internal.utils
88

9-
import com.datadog.android.lint.InternalApi
10-
import java.math.BigInteger
119
import java.nio.ByteBuffer
1210

13-
/**
14-
* Radix used to convert numbers to hexadecimal strings.
15-
*/
16-
internal const val HEX_RADIX: Int = 16
17-
1811
/**
1912
* Converts this [Short] into a [ByteArray] representation.
2013
*/
@@ -25,12 +18,6 @@ internal fun Short.toByteArray(): ByteArray {
2518
return ByteBuffer.allocate(Short.SIZE_BYTES).putShort(this).array()
2619
}
2720

28-
/**
29-
* Converts this [Int] into hexadecimal representation.
30-
*/
31-
@InternalApi
32-
fun Int.toHexString(): String = toString(HEX_RADIX)
33-
3421
/**
3522
* Converts this [Int] into a [ByteArray] representation.
3623
*/
@@ -41,12 +28,6 @@ internal fun Int.toByteArray(): ByteArray {
4128
return ByteBuffer.allocate(Int.SIZE_BYTES).putInt(this).array()
4229
}
4330

44-
/**
45-
* Converts this [Long] into hexadecimal representation.
46-
*/
47-
@InternalApi
48-
fun Long.toHexString(): String = toString(HEX_RADIX)
49-
5031
/**
5132
* Converts this [Long] into a [ByteArray] representation.
5233
*/
@@ -56,11 +37,3 @@ internal fun Long.toByteArray(): ByteArray {
5637
@Suppress("UnsafeThirdPartyFunctionCall")
5738
return ByteBuffer.allocate(Long.SIZE_BYTES).putLong(this).array()
5839
}
59-
60-
/**
61-
* Converts this [BigInteger] into hexadecimal representation.
62-
*/
63-
@InternalApi
64-
fun BigInteger.toHexString(): String {
65-
return toLong().toHexString()
66-
}

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/utils/ThreadExt.kt

Lines changed: 0 additions & 31 deletions
This file was deleted.

dd-sdk-android-core/src/main/kotlin/com/datadog/android/error/internal/DatadogExceptionHandler.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ import com.datadog.android.core.InternalSdkCore
1515
import com.datadog.android.core.feature.event.JvmCrash
1616
import com.datadog.android.core.feature.event.ThreadDump
1717
import com.datadog.android.core.internal.thread.waitToIdle
18-
import com.datadog.android.core.internal.utils.asString
19-
import com.datadog.android.core.internal.utils.loggableStackTrace
2018
import com.datadog.android.core.internal.utils.triggerUploadWorker
19+
import com.datadog.android.internal.utils.asString
2120
import com.datadog.android.internal.utils.loggableStackTrace
2221
import java.lang.ref.WeakReference
2322
import java.util.concurrent.ThreadPoolExecutor

dd-sdk-android-core/src/test/kotlin/com/datadog/android/DatadogTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import com.datadog.android.core.internal.HashGenerator
1818
import com.datadog.android.core.internal.NoOpInternalSdkCore
1919
import com.datadog.android.core.internal.SdkCoreRegistry
2020
import com.datadog.android.core.internal.Sha256HashGenerator
21-
import com.datadog.android.core.internal.utils.loggableStackTrace
2221
import com.datadog.android.internal.utils.loggableStackTrace
2322
import com.datadog.android.privacy.TrackingConsent
2423
import com.datadog.android.utils.config.ApplicationContextTestConfiguration

dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/utils/MiscUtilsTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package com.datadog.android.core.internal.utils
99
import com.datadog.android.api.InternalLogger
1010
import com.datadog.android.core.internal.utils.JsonSerializer.ITEM_SERIALIZATION_ERROR
1111
import com.datadog.android.core.internal.utils.JsonSerializer.safeMapValuesToJson
12+
import com.datadog.android.internal.utils.NULL_MAP_VALUE
1213
import com.datadog.android.utils.forge.Configurator
1314
import com.datadog.android.utils.verifyLog
1415
import com.datadog.tools.unit.forge.anException

0 commit comments

Comments
 (0)