fixup: some sonar issues

Signed-off-by: Simon Schrottner <simon.schrottner@dynatrace.com>

Author: aepfli

openfeature-api/src/main/java/dev/openfeature/api/AbstractEventProvider.java

@@ -7,10 +7,6 @@
 import dev.openfeature.api.internal.TriConsumer;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Abstract EventProvider. Providers must extend this class to support events.
@@ -25,9 +21,7 @@
  * @see Provider
  */
 public abstract class AbstractEventProvider implements EventProvider {
-    private static final Logger log = LoggerFactory.getLogger(AbstractEventProvider.class);
     private EventEmitter eventEmitter;
-    private final ExecutorService emitterExecutor = Executors.newCachedThreadPool();
     private List<Hook<?>> hooks;
 
     public void setEventEmitter(EventEmitter eventEmitter) {

openfeature-api/src/test/java/dev/openfeature/api/DefaultEvaluationEventTest.java

@@ -1,5 +1,6 @@
 package dev.openfeature.api;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -140,14 +141,13 @@ void equals_shouldWorkCorrectly() {
         assertNotEquals(event1, event4);
         assertNotEquals(event4, event1);
 
-        // Self-equality
-        assertEquals(event1, event1);
-
-        // Null comparison
-        assertNotEquals(event1, null);
-
-        // Different class comparison
-        assertNotEquals(event1, "not an event");
+        assertThat(event1)
+                // Self-equality
+                .isEqualTo(event1)
+                // Null comparison
+                .isNotEqualTo(null)
+                // Different class comparison
+                .isNotEqualTo("not an event");
     }
 
     @Test

openfeature-api/src/test/java/dev/openfeature/api/EnhancedImmutableMetadataTest.java

@@ -1,7 +1,7 @@
 package dev.openfeature.api;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -217,20 +217,21 @@ void equals_shouldWorkCorrectly() {
                 .build();
 
         // Same content should be equal
-        assertEquals(metadata1, metadata2);
-        assertEquals(metadata2, metadata1);
+        assertThat(metadata2).isEqualTo(metadata1);
+        assertThat(metadata1)
+                .isEqualTo(metadata2)
 
-        // Different content should not be equal
-        assertNotEquals(metadata1, metadata3);
+                // Different content should not be equal
+                .isNotEqualTo(metadata3)
 
-        // Self-equality
-        assertEquals(metadata1, metadata1);
+                // Self-equality
+                .isEqualTo(metadata1)
 
-        // Null comparison
-        assertNotEquals(metadata1, null);
+                // Null comparison
+                .isNotEqualTo(null)
 
-        // Different class comparison
-        assertNotEquals(metadata1, "not metadata");
+                // Different class comparison
+                .isNotEqualTo("not metadata");
     }
 
     @Test

openfeature-api/src/test/java/dev/openfeature/api/EnumTest.java

@@ -187,9 +187,6 @@ void providerState_matchesEvent_shouldHandleAllStatesAndEvents() {
             for (ProviderEvent event : ProviderEvent.values()) {
                 boolean result = state.matchesEvent(event);
 
-                // Assert the method doesn't throw exceptions and returns a boolean
-                assertNotNull(result);
-
                 // Verify the expected matches
                 if ((state == ProviderState.READY && event == ProviderEvent.PROVIDER_READY)
                         || (state == ProviderState.STALE && event == ProviderEvent.PROVIDER_STALE)

openfeature-api/src/test/java/dev/openfeature/api/evaluation/DefaultFlagEvaluationDetailsTest.java

@@ -13,14 +13,14 @@ class DefaultFlagEvaluationDetailsTest {
 
     @Test
     @DisplayName("Should create empty evaluation details with builder")
-    public void empty() {
+    void empty() {
         FlagEvaluationDetails<Integer> details = new DefaultFlagEvaluationDetails<>();
         assertNotNull(details);
     }
 
     @Test
     @DisplayName("Should create evaluation details with all fields using builder")
-    public void builderWithAllFields() {
+    void builderWithAllFields() {
 
         String flagKey = "my-flag";
         Integer value = 100;
@@ -44,9 +44,9 @@ public void builderWithAllFields() {
 
     @Test
     @DisplayName("should be able to compare 2 FlagEvaluationDetails")
-    public void compareFlagEvaluationDetails() {
+    void compareFlagEvaluationDetails() {
         String flagKey = "my-flag";
-        FlagEvaluationDetails fed1 = new DefaultFlagEvaluationDetails<>(
+        FlagEvaluationDetails<Boolean> fed1 = new DefaultFlagEvaluationDetails<>(
                 flagKey,
                 false,
                 null,
@@ -55,7 +55,7 @@ public void compareFlagEvaluationDetails() {
                 "error XXX",
                 Metadata.immutableBuilder().add("metadata", "1").build());
 
-        FlagEvaluationDetails fed2 = new DefaultFlagEvaluationDetails<>(
+        FlagEvaluationDetails<Boolean> fed2 = new DefaultFlagEvaluationDetails<>(
                 flagKey,
                 false,
                 null,

openfeature-api/src/test/java/dev/openfeature/api/lifecycle/DefaultHookDataTest.java

@@ -2,7 +2,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.Assertions.*;
 
 import org.junit.jupiter.api.Test;
 

openfeature-api/src/test/java/dev/openfeature/api/types/ImmutableStructureTest.java

@@ -1,5 +1,6 @@
 package dev.openfeature.api.types;
 
+import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -157,7 +158,7 @@ void objectMapTest() {
     void constructorHandlesNullValue() {
         HashMap<String, Value> attrs = new HashMap<>();
         attrs.put("null", null);
-        new ImmutableStructure(attrs);
+        assertThatCode(()-> new ImmutableStructure(attrs)).doesNotThrowAnyException();
     }
 
     @Test

openfeature-sdk/src/main/java/dev/openfeature/sdk/EventEmitter.java renamed to openfeature-sdk/src/main/java/dev/openfeature/sdk/DefaultEventEmitter.java

@@ -4,6 +4,7 @@
 import dev.openfeature.api.Provider;
 import dev.openfeature.api.ProviderEvent;
 import dev.openfeature.api.evaluation.EvaluationContext;
+import dev.openfeature.api.events.EventEmitter;
 import dev.openfeature.api.events.EventProvider;
 import dev.openfeature.api.events.ProviderEventDetails;
 import dev.openfeature.api.internal.TriConsumer;
@@ -25,13 +26,13 @@
  *
  * @see Provider
  */
-class EventEmitter implements dev.openfeature.api.events.EventEmitter {
-    private static final Logger log = LoggerFactory.getLogger(EventEmitter.class);
+class DefaultEventEmitter implements EventEmitter {
+    private static final Logger log = LoggerFactory.getLogger(DefaultEventEmitter.class);
     private final EventProviderListener eventProviderListener;
     private final ExecutorService emitterExecutor = Executors.newCachedThreadPool();
     private final EventProvider provider;
 
-    protected EventEmitter(EventProvider provider, EventProviderListener eventProviderListener) {
+    protected DefaultEventEmitter(EventProvider provider, EventProviderListener eventProviderListener) {
         this.provider = provider;
         this.eventProviderListener = eventProviderListener;
     }

openfeature-sdk/src/main/java/dev/openfeature/sdk/FeatureProviderStateManager.java

@@ -23,7 +23,7 @@ public FeatureProviderStateManager(Provider delegate) {
         this.delegate = delegate;
         if (delegate instanceof AbstractEventProvider) {
             ((AbstractEventProvider) delegate)
-                    .setEventEmitter(new EventEmitter((AbstractEventProvider) delegate, this));
+                    .setEventEmitter(new DefaultEventEmitter((AbstractEventProvider) delegate, this));
         }
     }
 

openfeature-sdk/src/main/java/dev/openfeature/sdk/providers/memory/ContextEvaluator.java

@@ -9,5 +9,5 @@
  */
 public interface ContextEvaluator<T> {
 
-    T evaluate(Flag flag, EvaluationContext evaluationContext);
+    T evaluate(Flag<T> flag, EvaluationContext evaluationContext);
 }