fix: Testing fixes and package renaming (#45)

* chore: Renaming package * fix: maven test * fix: int values * fix: mvn deps for junit
spotify · Sep 29, 2023 · f143c4a · f143c4a
1 parent 969b90f
commit f143c4a
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ management API. After that all interaction with the feature flags happens using
 ```java
 package com.spotify.confidence.openfeature;
 
-import dev.openfeature.contrib.providers.confidence.ConfidenceFeatureProvider;
+import com.spotify.confidence.ConfidenceFeatureProvider;
 import dev.openfeature.sdk.Client;
 import dev.openfeature.sdk.MutableContext;
 import dev.openfeature.sdk.OpenFeatureAPI;

diff --git a/pom.xml b/pom.xml
@@ -90,6 +90,12 @@
       <scope>test</scope>
       <version>3.24.2</version>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+      <version>${jupiter.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>

diff --git a/...confidence/ConfidenceFeatureProvider.java → ...confidence/ConfidenceFeatureProvider.java b/...confidence/ConfidenceFeatureProvider.java → ...confidence/ConfidenceFeatureProvider.java
@@ -1,4 +1,4 @@
-package dev.openfeature.contrib.providers.confidence;
+package com.spotify.confidence;
 
 import com.google.common.base.Strings;
 import com.google.protobuf.Struct;

diff --git a/...trib/providers/confidence/TypeMapper.java → ...va/com/spotify/confidence/TypeMapper.java b/...trib/providers/confidence/TypeMapper.java → ...va/com/spotify/confidence/TypeMapper.java
@@ -1,4 +1,4 @@
-package dev.openfeature.contrib.providers.confidence;
+package com.spotify.confidence;
 
 import com.google.protobuf.Struct;
 import com.google.protobuf.util.Values;
@@ -34,12 +34,13 @@ private static Value from(com.google.protobuf.Value value, FlagSchema schema) {
       case NUMBER_VALUE:
         switch (schema.getSchemaTypeCase()) {
           case INT_SCHEMA:
-            final long intVal = (long) value.getNumberValue();
+            final int intVal = (int) value.getNumberValue();
             if (intVal != value.getNumberValue()) {
               throw new ParseError(
-                  String.format("%s value should be an int64, but it is a double", mismatchPrefix));
+                  String.format(
+                      "%s value should be an int, but it is a double/long", mismatchPrefix));
             }
-            return new Value(value.getNumberValue());
+            return new Value(intVal);
           case DOUBLE_SCHEMA:
             return new Value(value.getNumberValue());
           default:

diff --git a/src/main/java/dev/openfeature/contrib/providers/confidence/package-info.java b/src/main/java/dev/openfeature/contrib/providers/confidence/package-info.java
diff --git a/...iders/confidence/FeatureProviderTest.java → ...otify/confidence/FeatureProviderTest.java b/...iders/confidence/FeatureProviderTest.java → ...otify/confidence/FeatureProviderTest.java
@@ -1,4 +1,4 @@
-package dev.openfeature.contrib.providers.confidence;
+package com.spotify.confidence;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -160,7 +160,7 @@ static void before() throws IOException {
     channel = InProcessChannelBuilder.forName(serverName).directExecutor().build();
 
     final FeatureProvider featureProvider =
-        new ConfidenceFeatureProvider(
+        new com.spotify.confidence.ConfidenceFeatureProvider(
             "fake-secret", FlagResolverServiceGrpc.newBlockingStub(channel));
 
     final OpenFeatureAPI api = OpenFeatureAPI.getInstance();
@@ -196,7 +196,9 @@ public void inconsistentTargetKey() {
             DEFAULT_VALUE,
             new MutableContext(
                 "my-targeting-key-1",
-                Map.of(ConfidenceFeatureProvider.TARGETING_KEY, new Value("my-targeting-key-2"))));
+                Map.of(
+                    com.spotify.confidence.ConfidenceFeatureProvider.TARGETING_KEY,
+                    new Value("my-targeting-key-2"))));
 
     assertThat(evaluationDetails.getValue()).isEqualTo(DEFAULT_VALUE);
     assertThat(evaluationDetails.getErrorCode()).isEqualTo(ErrorCode.INVALID_CONTEXT);