Skip to content

Commit

Permalink
chore: rename package structure and artifact id (#72)
Browse files Browse the repository at this point in the history
  • Loading branch information
nicklasl authored Oct 2, 2023
1 parent b266dd5 commit 421782a
Show file tree
Hide file tree
Showing 23 changed files with 261 additions and 135 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.viewModelScope
import dev.openfeature.contrib.providers.ConfidenceFeatureProvider
import dev.openfeature.contrib.providers.InitialisationStrategy
import com.spotify.confidence.ConfidenceFeatureProvider
import com.spotify.confidence.InitialisationStrategy
import dev.openfeature.sdk.Client
import dev.openfeature.sdk.EvaluationContext
import dev.openfeature.sdk.FlagEvaluationDetails
Expand Down
8 changes: 4 additions & 4 deletions Provider/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ object Versions {
}

android {
namespace = "dev.openfeature.contrib.providers"
namespace = "com.spotify.confidence"
compileSdk = 33

defaultConfig {
minSdk = 21
version = "0.0.1"
version = Versions.providerVersion

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down Expand Up @@ -64,8 +64,8 @@ afterEvaluate {
publishing {
publications {
register<MavenPublication>("release") {
groupId = "dev.openfeature.contrib.providers"
artifactId = "confidence"
groupId = "com.spotify"
artifactId = "confidence-openfeature-provider-kotlin"
version = Versions.providerVersion

from(components["release"])
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
package dev.openfeature.contrib.providers
package com.spotify.confidence

import android.content.Context
import dev.openfeature.contrib.providers.apply.FlagApplier
import dev.openfeature.contrib.providers.apply.FlagApplierWithRetries
import dev.openfeature.contrib.providers.cache.DiskStorage
import dev.openfeature.contrib.providers.cache.InMemoryCache
import dev.openfeature.contrib.providers.cache.ProviderCache
import dev.openfeature.contrib.providers.cache.ProviderCache.CacheResolveResult
import dev.openfeature.contrib.providers.cache.StorageFileCache
import dev.openfeature.contrib.providers.client.ConfidenceClient
import dev.openfeature.contrib.providers.client.ConfidenceRegion
import dev.openfeature.contrib.providers.client.ConfidenceRemoteClient
import dev.openfeature.contrib.providers.client.ResolveReason
import dev.openfeature.contrib.providers.client.ResolveResponse
import com.spotify.confidence.apply.FlagApplier
import com.spotify.confidence.apply.FlagApplierWithRetries
import com.spotify.confidence.cache.DiskStorage
import com.spotify.confidence.cache.InMemoryCache
import com.spotify.confidence.cache.ProviderCache
import com.spotify.confidence.cache.ProviderCache.CacheResolveResult
import com.spotify.confidence.cache.StorageFileCache
import com.spotify.confidence.client.ConfidenceClient
import com.spotify.confidence.client.ConfidenceRegion
import com.spotify.confidence.client.ConfidenceRemoteClient
import com.spotify.confidence.client.ResolveResponse
import dev.openfeature.sdk.EvaluationContext
import dev.openfeature.sdk.FeatureProvider
import dev.openfeature.sdk.Hook
Expand Down Expand Up @@ -286,7 +285,7 @@ class ConfidenceFeatureProvider private constructor(
parsedKey: FlagKey,
defaultValue: T
): ProviderEvaluation<T> = when (resolveReason) {
ResolveReason.RESOLVE_REASON_MATCH -> {
com.spotify.confidence.client.ResolveReason.RESOLVE_REASON_MATCH -> {
val resolvedValue: Value = findValueFromValuePath(value, parsedKey.valuePath)
?: throw ParseError(
"Unable to parse flag value: ${parsedKey.valuePath.joinToString(separator = "/")}"
Expand All @@ -299,7 +298,7 @@ class ConfidenceFeatureProvider private constructor(
reason = Reason.TARGETING_MATCH.toString()
)
}
ResolveReason.RESOLVE_REASON_TARGETING_KEY_ERROR -> {
com.spotify.confidence.client.ResolveReason.RESOLVE_REASON_TARGETING_KEY_ERROR -> {
ProviderEvaluation(
value = defaultValue,
reason = Reason.ERROR.toString(),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.openfeature.contrib.providers
package com.spotify.confidence

import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineExceptionHandler
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.openfeature.contrib.providers.apply
package com.spotify.confidence.apply

interface FlagApplier {
fun apply(flagName: String, resolveToken: String)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package dev.openfeature.contrib.providers.apply
package com.spotify.confidence.apply

import android.content.Context
import dev.openfeature.contrib.providers.EventProcessor
import dev.openfeature.contrib.providers.client.AppliedFlag
import dev.openfeature.contrib.providers.client.ConfidenceClient
import dev.openfeature.contrib.providers.client.Result
import dev.openfeature.contrib.providers.client.serializers.UUIDSerializer
import com.spotify.confidence.EventProcessor
import com.spotify.confidence.client.AppliedFlag
import com.spotify.confidence.client.ConfidenceClient
import com.spotify.confidence.client.Result
import com.spotify.confidence.client.serializers.UUIDSerializer
import dev.openfeature.sdk.DateSerializer
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineExceptionHandler
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dev.openfeature.contrib.providers.cache
package com.spotify.confidence.cache

import dev.openfeature.contrib.providers.client.ResolvedFlag
import com.spotify.confidence.client.ResolvedFlag
import dev.openfeature.sdk.EvaluationContext

interface DiskStorage {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.openfeature.contrib.providers.cache
package com.spotify.confidence.cache

import dev.openfeature.contrib.providers.cache.ProviderCache.CacheResolveEntry
import dev.openfeature.contrib.providers.cache.ProviderCache.CacheResolveResult
import com.spotify.confidence.cache.ProviderCache.CacheResolveEntry
import com.spotify.confidence.cache.ProviderCache.CacheResolveResult
import dev.openfeature.sdk.EvaluationContext

open class InMemoryCache : ProviderCache {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dev.openfeature.contrib.providers.cache
package com.spotify.confidence.cache

import dev.openfeature.contrib.providers.client.ResolveReason
import com.spotify.confidence.client.ResolveReason
import dev.openfeature.sdk.EvaluationContext
import dev.openfeature.sdk.Value
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.openfeature.contrib.providers.cache
package com.spotify.confidence.cache

import android.content.Context
import dev.openfeature.contrib.providers.client.ResolvedFlag
import com.spotify.confidence.client.ResolvedFlag
import dev.openfeature.sdk.EvaluationContext
import dev.openfeature.sdk.Value
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.openfeature.contrib.providers.client
package com.spotify.confidence.client

import java.util.Calendar
import java.util.Date
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.openfeature.contrib.providers.client
package com.spotify.confidence.client

enum class ConfidenceRegion {
EUROPE,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.openfeature.contrib.providers.client
package com.spotify.confidence.client

import dev.openfeature.sdk.EvaluationContext

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package dev.openfeature.contrib.providers.client
package com.spotify.confidence.client

import dev.openfeature.contrib.providers.client.network.ApplyFlagsInteractor
import dev.openfeature.contrib.providers.client.network.ApplyFlagsInteractorImpl
import dev.openfeature.contrib.providers.client.network.ApplyFlagsRequest
import dev.openfeature.contrib.providers.client.network.ResolveFlagsInteractor
import dev.openfeature.contrib.providers.client.network.ResolveFlagsInteractorImpl
import dev.openfeature.contrib.providers.client.serializers.FlagsSerializer
import com.spotify.confidence.client.network.ApplyFlagsInteractor
import com.spotify.confidence.client.network.ApplyFlagsInteractorImpl
import com.spotify.confidence.client.network.ApplyFlagsRequest
import com.spotify.confidence.client.network.ResolveFlagsInteractor
import com.spotify.confidence.client.network.ResolveFlagsInteractorImpl
import com.spotify.confidence.client.serializers.FlagsSerializer
import dev.openfeature.sdk.EvaluationContext
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.Dispatchers
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.openfeature.contrib.providers.client
package com.spotify.confidence.client

import dev.openfeature.sdk.EvaluationContext
import dev.openfeature.sdk.ImmutableStructure
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.openfeature.contrib.providers.client
package com.spotify.confidence.client

import dev.openfeature.sdk.ImmutableStructure
import dev.openfeature.sdk.Structure
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package dev.openfeature.contrib.providers.client.network
package com.spotify.confidence.client.network

import dev.openfeature.contrib.providers.client.AppliedFlag
import dev.openfeature.contrib.providers.client.await
import dev.openfeature.contrib.providers.client.serializers.StructureSerializer
import dev.openfeature.contrib.providers.client.serializers.UUIDSerializer
import com.spotify.confidence.client.AppliedFlag
import com.spotify.confidence.client.await
import com.spotify.confidence.client.serializers.StructureSerializer
import com.spotify.confidence.client.serializers.UUIDSerializer
import dev.openfeature.sdk.DateSerializer
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.withContext
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package dev.openfeature.contrib.providers.client.network
package com.spotify.confidence.client.network

import dev.openfeature.contrib.providers.client.ResolveFlagsRequest
import dev.openfeature.contrib.providers.client.await
import dev.openfeature.contrib.providers.client.serializers.StructureSerializer
import dev.openfeature.contrib.providers.client.serializers.UUIDSerializer
import com.spotify.confidence.client.ResolveFlagsRequest
import com.spotify.confidence.client.await
import com.spotify.confidence.client.serializers.StructureSerializer
import com.spotify.confidence.client.serializers.UUIDSerializer
import dev.openfeature.sdk.DateSerializer
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.withContext
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package dev.openfeature.contrib.providers.client.serializers
package com.spotify.confidence.client.serializers

import dev.openfeature.contrib.providers.client.Flags
import dev.openfeature.contrib.providers.client.ResolveReason
import dev.openfeature.contrib.providers.client.ResolvedFlag
import dev.openfeature.contrib.providers.client.SchemaType
import com.spotify.confidence.client.Flags
import com.spotify.confidence.client.ResolveReason
import com.spotify.confidence.client.ResolvedFlag
import com.spotify.confidence.client.SchemaType
import dev.openfeature.sdk.DateSerializer
import dev.openfeature.sdk.ImmutableStructure
import dev.openfeature.sdk.Structure
Expand Down
Loading

0 comments on commit 421782a

Please sign in to comment.