diff --git a/lib/shared/internal/buildSrc/src/main/kotlin/Dependencies.kt b/lib/shared/internal/buildSrc/src/main/kotlin/Dependencies.kt index 747c2df3..89a5f147 100644 --- a/lib/shared/internal/buildSrc/src/main/kotlin/Dependencies.kt +++ b/lib/shared/internal/buildSrc/src/main/kotlin/Dependencies.kt @@ -4,7 +4,7 @@ object Versions { const val gson = "2.13.1" - const val launchdarklyJavaSdkCommon = "2.1.2" + const val launchdarklyJavaSdkCommon = "2.4.0" const val launchdarklyLogging = "1.1.1" const val okhttp = "4.12.0" const val testHelpers = "1.2.0" diff --git a/lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/fdv2/sources/FDv2ChangeSet.java b/lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/fdv2/sources/FDv2ChangeSet.java index 8ffc69e1..41d8eb4b 100644 --- a/lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/fdv2/sources/FDv2ChangeSet.java +++ b/lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/fdv2/sources/FDv2ChangeSet.java @@ -1,6 +1,7 @@ package com.launchdarkly.sdk.internal.fdv2.sources; import com.google.gson.JsonElement; +import com.launchdarkly.sdk.fdv2.Selector; import java.util.Collections; import java.util.List; diff --git a/lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/fdv2/sources/FDv2ProtocolHandler.java b/lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/fdv2/sources/FDv2ProtocolHandler.java index 5bdd7fc8..a00b48a8 100644 --- a/lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/fdv2/sources/FDv2ProtocolHandler.java +++ b/lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/fdv2/sources/FDv2ProtocolHandler.java @@ -1,5 +1,6 @@ package com.launchdarkly.sdk.internal.fdv2.sources; +import com.launchdarkly.sdk.fdv2.Selector; import com.launchdarkly.sdk.internal.fdv2.payloads.DeleteObject; import com.launchdarkly.sdk.internal.fdv2.payloads.Error; import com.launchdarkly.sdk.internal.fdv2.payloads.FDv2Event; diff --git a/lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/fdv2/sources/Selector.java b/lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/fdv2/sources/Selector.java deleted file mode 100644 index 5d13844c..00000000 --- a/lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/fdv2/sources/Selector.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.launchdarkly.sdk.internal.fdv2.sources; - -/** - * A selector can either be empty or it can contain state and a version. - */ -public final class Selector { - private final boolean isEmpty; - private final int version; - private final String state; - - private Selector(int version, String state, boolean isEmpty) { - this.version = version; - this.state = state; - this.isEmpty = isEmpty; - } - - /** - * If true, then this selector is empty. An empty selector cannot be used as a basis for a data source. - * - * @return whether the selector is empty - */ - public boolean isEmpty() { - return isEmpty; - } - - /** - * The version of the data associated with this selector. - * - * @return the version - */ - public int getVersion() { - return version; - } - - /** - * The state associated with the payload. - * - * @return the state identifier, or null if empty - */ - public String getState() { - return state; - } - - static Selector empty() { - return new Selector(0, null, true); - } - - /** - * Creates a new Selector with the given version and state. - * - * @param version the version number - * @param state the state identifier - * @return a new Selector instance - */ - public static Selector make(int version, String state) { - return new Selector(version, state, false); - } - - /** - * An empty selector instance. - */ - public static final Selector EMPTY = empty(); -} - -