diff --git a/src/main/java/com/launchdarkly/openfeature/serverprovider/Provider.java b/src/main/java/com/launchdarkly/openfeature/serverprovider/Provider.java index 8304100..9d6cf53 100644 --- a/src/main/java/com/launchdarkly/openfeature/serverprovider/Provider.java +++ b/src/main/java/com/launchdarkly/openfeature/serverprovider/Provider.java @@ -36,12 +36,12 @@ public String getName() { private final Metadata metaData = new ProviderMetaData(); - private LDLogger logger; - private EvaluationDetailConverter evaluationDetailConverter; - private ValueConverter valueConverter; - private EvaluationContextConverter evaluationContextConverter; + private final LDLogger logger; + private final EvaluationDetailConverter evaluationDetailConverter; + private final ValueConverter valueConverter; + private final EvaluationContextConverter evaluationContextConverter; - private LDClientInterface client; + private final LDClientInterface client; /** * Create a provider with the given LaunchDarkly client and provider configuration. diff --git a/src/test/java/com/launchdarkly/openfeature/serverprovider/GivenAContextConverter.java b/src/test/java/com/launchdarkly/openfeature/serverprovider/ContextConverterTest.java similarity index 93% rename from src/test/java/com/launchdarkly/openfeature/serverprovider/GivenAContextConverter.java rename to src/test/java/com/launchdarkly/openfeature/serverprovider/ContextConverterTest.java index 4690225..fe4d9f2 100644 --- a/src/test/java/com/launchdarkly/openfeature/serverprovider/GivenAContextConverter.java +++ b/src/test/java/com/launchdarkly/openfeature/serverprovider/ContextConverterTest.java @@ -15,7 +15,7 @@ import static org.junit.Assert.*; -public class GivenAContextConverter { +public class ContextConverterTest { TestLogger testLogger = new TestLogger(); EvaluationContextConverter evaluationContextConverter = new EvaluationContextConverter( LDLogger.withAdapter(testLogger, "test-logger") @@ -31,7 +31,7 @@ public void itCanCreateAContextFromAKeyOnly() { LDContext converted = evaluationContextConverter.toLdContext(new ImmutableContext("the-key")); assertEquals(expectedContext, converted); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); attributes.put("key", new Value("the-key")); LDContext convertedKey = evaluationContextConverter.toLdContext(new ImmutableContext(attributes)); assertEquals(expectedContext, convertedKey); @@ -44,7 +44,7 @@ public void itCanCreateAContextFromAKeyAndKind() { LDContext expectedContext = LDContext.builder(ContextKind.of("organization"), "org-key").build(); LDContext converted = evaluationContextConverter - .toLdContext(new ImmutableContext("org-key", new HashMap() {{ + .toLdContext(new ImmutableContext("org-key", new HashMap() {{ put("kind", new Value("organization")); }})); @@ -66,7 +66,7 @@ public void itLogsAnErrorWhenThereIsNoTargetingKey() { public void itGivesTargetingKeyPrecedence() { LDContext expectedContext = LDContext.builder("key-to-use").build(); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); attributes.put("key", new Value("key-not-to-use")); LDContext converted = evaluationContextConverter.toLdContext( @@ -80,7 +80,7 @@ public void itGivesTargetingKeyPrecedence() { @Test public void itHandlesAKeyOfIncorrectType() { - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); attributes.put("key", new Value(0)); evaluationContextConverter.toLdContext( @@ -98,7 +98,7 @@ public void itHandlesAKeyOfIncorrectType() { public void itHandlesInvalidBuiltInAttributes() { LDContext expectedContext = LDContext.builder("user-key").build(); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); attributes.put("name", new Value(3)); attributes.put("anonymous", new Value("potato")); // The attributes were not valid, so they should be discarded. @@ -123,7 +123,7 @@ public void itHandlesValidBuiltInAttributes() { .anonymous(true) .build(); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); attributes.put("name", new Value("the-name")); attributes.put("anonymous", new Value(true)); @@ -148,9 +148,9 @@ public void itCanCreateAValidMultiKindContext() { .build() ); - EvaluationContext evaluationContext = new ImmutableContext(new HashMap() {{ + EvaluationContext evaluationContext = new ImmutableContext(new HashMap() {{ put("kind", new Value("multi")); - put("organization", new Value(new ImmutableStructure(new HashMap() {{ + put("organization", new Value(new ImmutableStructure(new HashMap() {{ put("name", new Value("the-org-name")); put("targetingKey", new Value("my-org-key")); put("myCustomAttribute", new Value("myAttributeValue")); @@ -158,7 +158,7 @@ public void itCanCreateAValidMultiKindContext() { add(new Value("myCustomAttribute")); }})); }}))); - put("user", new Value(new ImmutableStructure(new HashMap() {{ + put("user", new Value(new ImmutableStructure(new HashMap() {{ put("key", new Value("my-user-key")); put("anonymous", new Value(true)); put("myCustomAttribute", new Value("myAttributeValue")); diff --git a/src/test/java/com/launchdarkly/openfeature/serverprovider/GivenAnEvaluationDetailConverter.java b/src/test/java/com/launchdarkly/openfeature/serverprovider/EvaluationDetailConverterTest.java similarity index 96% rename from src/test/java/com/launchdarkly/openfeature/serverprovider/GivenAnEvaluationDetailConverter.java rename to src/test/java/com/launchdarkly/openfeature/serverprovider/EvaluationDetailConverterTest.java index 121ffa1..21c147a 100644 --- a/src/test/java/com/launchdarkly/openfeature/serverprovider/GivenAnEvaluationDetailConverter.java +++ b/src/test/java/com/launchdarkly/openfeature/serverprovider/EvaluationDetailConverterTest.java @@ -9,17 +9,13 @@ import static org.junit.Assert.*; -public class GivenAnEvaluationDetailConverter { +public class EvaluationDetailConverterTest { private final Double EPSILON = 0.00001; TestLogger testLogger = new TestLogger(); EvaluationDetailConverter evaluationDetailConverter = new EvaluationDetailConverter( LDLogger.withAdapter(testLogger, "test-logger") ); - private TestLogger.TestChannel logs() { - return testLogger.getChannel("test-logger"); - } - @Test public void itCanConvertDoubleEvaluationDetail() { EvaluationDetail inputDetail = EvaluationDetail.fromValue( @@ -27,7 +23,7 @@ public void itCanConvertDoubleEvaluationDetail() { ProviderEvaluation converted = evaluationDetailConverter.toEvaluationDetails(inputDetail); - assertEquals(3.0, converted.getValue().doubleValue(), EPSILON); + assertEquals(3.0, converted.getValue(), EPSILON); assertEquals("17", converted.getVariant()); assertEquals(Reason.DISABLED.toString(), converted.getReason()); } diff --git a/src/test/java/com/launchdarkly/openfeature/serverprovider/GivenAnLdValueConverter.java b/src/test/java/com/launchdarkly/openfeature/serverprovider/LdValueConverterTest.java similarity index 84% rename from src/test/java/com/launchdarkly/openfeature/serverprovider/GivenAnLdValueConverter.java rename to src/test/java/com/launchdarkly/openfeature/serverprovider/LdValueConverterTest.java index 2222d4f..e72950e 100644 --- a/src/test/java/com/launchdarkly/openfeature/serverprovider/GivenAnLdValueConverter.java +++ b/src/test/java/com/launchdarkly/openfeature/serverprovider/LdValueConverterTest.java @@ -4,19 +4,16 @@ import com.launchdarkly.sdk.ArrayBuilder; import com.launchdarkly.sdk.LDValue; import com.launchdarkly.sdk.ObjectBuilder; -import dev.openfeature.sdk.ImmutableStructure; import dev.openfeature.sdk.Structure; import dev.openfeature.sdk.Value; import org.junit.Test; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import static org.junit.Assert.*; -public class GivenAnLdValueConverter { - private LDValueConverter valueConverter = new LDValueConverter(LDLogger.none()); +public class LdValueConverterTest { + private final LDValueConverter valueConverter = new LDValueConverter(LDLogger.none()); private final Double EPSILON = 0.00001; @Test @@ -77,13 +74,6 @@ public void itCanConvertLists() { @Test public void itCanConvertStructures() { - Value ofValueStructure = new Value(new ImmutableStructure(new HashMap(){{ - put("aKey", new Value("aValue")); - put("structKey", new Value(new ImmutableStructure(new HashMap(){{ - put("bKey", new Value("bValue")); - }}))); - }})); - LDValue ldStructValue = new ObjectBuilder() .put("aKey", "aValue") .put("structKey", new ObjectBuilder().put("bKey", "bValue").build()).build(); diff --git a/src/test/java/com/launchdarkly/openfeature/serverprovider/ProviderConfigurationTests.java b/src/test/java/com/launchdarkly/openfeature/serverprovider/ProviderConfigurationTests.java index 46f71b0..e23ac67 100644 --- a/src/test/java/com/launchdarkly/openfeature/serverprovider/ProviderConfigurationTests.java +++ b/src/test/java/com/launchdarkly/openfeature/serverprovider/ProviderConfigurationTests.java @@ -1,13 +1,13 @@ package com.launchdarkly.openfeature.serverprovider; -import com.launchdarkly.logging.LDLogAdapter; import com.launchdarkly.logging.LDLogLevel; import com.launchdarkly.logging.LDLogger; import com.launchdarkly.sdk.server.Components; import com.launchdarkly.sdk.server.subsystems.LoggingConfiguration; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; public class ProviderConfigurationTests { diff --git a/src/test/java/com/launchdarkly/openfeature/serverprovider/GivenAProviderWithMockLdClient.java b/src/test/java/com/launchdarkly/openfeature/serverprovider/ProviderTest.java similarity index 99% rename from src/test/java/com/launchdarkly/openfeature/serverprovider/GivenAProviderWithMockLdClient.java rename to src/test/java/com/launchdarkly/openfeature/serverprovider/ProviderTest.java index c4dc6f6..7194764 100644 --- a/src/test/java/com/launchdarkly/openfeature/serverprovider/GivenAProviderWithMockLdClient.java +++ b/src/test/java/com/launchdarkly/openfeature/serverprovider/ProviderTest.java @@ -11,7 +11,7 @@ import static org.mockito.Mockito.*; import static org.junit.Assert.*; -public class GivenAProviderWithMockLdClient { +public class ProviderTest { LDClientInterface mockedLdClient = mock(LDClientInterface.class); Provider ldProvider = new Provider(mockedLdClient); diff --git a/src/test/java/com/launchdarkly/openfeature/serverprovider/TestLogger.java b/src/test/java/com/launchdarkly/openfeature/serverprovider/TestLogger.java index fddf8eb..be2e771 100644 --- a/src/test/java/com/launchdarkly/openfeature/serverprovider/TestLogger.java +++ b/src/test/java/com/launchdarkly/openfeature/serverprovider/TestLogger.java @@ -2,7 +2,6 @@ import com.launchdarkly.logging.LDLogAdapter; import com.launchdarkly.logging.LDLogLevel; -import jdk.nashorn.internal.runtime.regexp.joni.Regex; import java.util.ArrayList; import java.util.HashMap; @@ -12,16 +11,15 @@ * and validate the content of those messages. */ class TestLogger implements LDLogAdapter { - private HashMap channels = new HashMap<>(); + private final HashMap channels = new HashMap<>(); public TestChannel getChannel(String name) { return channels.get(name); } - public class TestChannel implements Channel { - private String name; + public static class TestChannel implements Channel { - private HashMap> messages = new HashMap(); + private final HashMap> messages = new HashMap<>(); public int countForLevel(LDLogLevel level) { if (messages.containsKey(level)) { @@ -32,9 +30,7 @@ public int countForLevel(LDLogLevel level) { public boolean expectedMessageInLevel(LDLogLevel level, String regexString) { if (messages.containsKey(level)) { - return messages.get(level).stream().anyMatch(value -> { - return value.matches(regexString); - }); + return messages.get(level).stream().anyMatch(value -> value.matches(regexString)); } return false; } @@ -43,12 +39,11 @@ public boolean containsAnyLogs() { return messages.size() != 0; } - private TestChannel(String name) { - this.name = name; + private TestChannel(String ignoredName) { } private void addMessage(LDLogLevel ldLogLevel, String message) { - ArrayList forLevel = messages.getOrDefault(ldLogLevel, new ArrayList()); + ArrayList forLevel = messages.getOrDefault(ldLogLevel, new ArrayList<>()); forLevel.add(message); diff --git a/src/test/java/com/launchdarkly/openfeature/serverprovider/GivenAValueConverter.java b/src/test/java/com/launchdarkly/openfeature/serverprovider/ValueConverterTest.java similarity index 92% rename from src/test/java/com/launchdarkly/openfeature/serverprovider/GivenAValueConverter.java rename to src/test/java/com/launchdarkly/openfeature/serverprovider/ValueConverterTest.java index 2a7ecd9..a60189a 100644 --- a/src/test/java/com/launchdarkly/openfeature/serverprovider/GivenAValueConverter.java +++ b/src/test/java/com/launchdarkly/openfeature/serverprovider/ValueConverterTest.java @@ -14,8 +14,8 @@ import static org.junit.Assert.*; -public class GivenAValueConverter { - private ValueConverter valueConverter = new ValueConverter(LDLogger.none()); +public class ValueConverterTest { + private final ValueConverter valueConverter = new ValueConverter(LDLogger.none()); private final Double EPSILON = 0.00001; @Test @@ -70,7 +70,7 @@ public void itCanConvertLists() { }}); LDValue ldValue = valueConverter.toLdValue(ofValueList); - List ldValueList = new ArrayList(); + List ldValueList = new ArrayList<>(); ldValue.values().forEach(ldValueList::add); assertEquals(5, ldValueList.size()); @@ -93,10 +93,10 @@ public void itCanConvertStructures() { LDValue ldValue = valueConverter.toLdValue(ofValueStructure); - List keyList = new ArrayList(); + List keyList = new ArrayList<>(); ldValue.keys().forEach(keyList::add); - List valueList = new ArrayList(); + List valueList = new ArrayList<>(); ldValue.values().forEach(valueList::add); assertEquals("aKey", keyList.get(0));