fixup: fixing nit, and adding information for fallthrough

Signed-off-by: Simon Schrottner <[email protected]>

Author: aepfli

Diff for: providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdProvider.java

@@ -195,15 +195,19 @@ private void onProviderEvent(FlagdProviderEvent flagdProviderEvent) {
             enrichedContext = contextEnricher.apply(flagdProviderEvent.getSyncMetadata());
         }
 
+        /*
+        We only use Error and Ready as previous states.
+        As error will first be emitted as Stale, and only turns after a while into an emitted Error.
+        Ready is needed, as the InProcessResolver does not have a dedicated ready event, hence we need to
+        forward a configuration changed to the ready, if we are not in the ready state.
+         */
         switch (flagdProviderEvent.getEvent()) {
             case PROVIDER_CONFIGURATION_CHANGED:
                 if (previousEvent == ProviderEvent.PROVIDER_READY) {
-                    this.emitProviderConfigurationChanged(ProviderEventDetails.builder()
-                            .flagsChanged(flagdProviderEvent.getFlagsChanged())
-                            .message("configuration changed")
-                            .build());
+                    onConfigurationChanged(flagdProviderEvent);
                     break;
                 }
+                // intentional fall through, a not-ready change will trigger a ready.
             case PROVIDER_READY:
                 onReady();
                 previousEvent = ProviderEvent.PROVIDER_READY;
@@ -220,6 +224,14 @@ private void onProviderEvent(FlagdProviderEvent flagdProviderEvent) {
         }
     }
 
+    private void onConfigurationChanged(FlagdProviderEvent flagdProviderEvent) {
+        this.emitProviderConfigurationChanged(ProviderEventDetails.builder()
+                .flagsChanged(flagdProviderEvent.getFlagsChanged())
+                .message("configuration changed")
+                .build());
+        return;
+    }
+
     private void onReady() {
         if (!initialized) {
             initialized = true;

Diff for: providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/FlagdProviderTest.java

@@ -61,7 +61,6 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedConstruction;
 
@@ -320,13 +319,6 @@ void resolvers_should_not_cache_responses_if_not_static() {
         do_resolvers_cache_responses(DEFAULT.toString(), true, false);
     }
 
-    @Test
-    @Disabled(
-            "This test seems to be wrong on the way, we are handling caching, as we return values as long as we are in stale mode")
-    void resolvers_should_not_cache_responses_if_event_stream_not_alive() {
-        do_resolvers_cache_responses(STATIC_REASON, false, false);
-    }
-
     @Test
     void context_is_parsed_and_passed_to_grpc_service() {
         final String BOOLEAN_ATTR_KEY = "bool-attr";

Diff for: providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/resolver/common/GrpcConnectorTest.java

@@ -17,7 +17,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
@@ -71,39 +70,6 @@ private void tearDownGrpcServer() throws InterruptedException {
         }
     }
 
-    @Test
-    @Disabled("not sure this test makes sense in this kind of way")
-    void whenShuttingDownAndRestartingGrpcServer_ConsumerReceivesDisconnectedAndConnectedEvent() throws Exception {
-        CountDownLatch sync = new CountDownLatch(2);
-        ArrayList<Boolean> connectionStateChanges = Lists.newArrayList();
-        Consumer<FlagdProviderEvent> testConsumer = event -> {
-            connectionStateChanges.add(!event.isDisconnected());
-            sync.countDown();
-        };
-
-        GrpcConnector<ServiceGrpc.ServiceStub, ServiceGrpc.ServiceBlockingStub> instance = new GrpcConnector<>(
-                FlagdOptions.builder().build(),
-                ServiceGrpc::newStub,
-                ServiceGrpc::newBlockingStub,
-                testConsumer,
-                stub -> stub.eventStream(Evaluation.EventStreamRequest.getDefaultInstance(), mockEventStreamObserver),
-                testChannel);
-
-        instance.initialize();
-
-        // when shutting down server
-        testServer.shutdown();
-        testServer.awaitTermination(1, TimeUnit.SECONDS);
-
-        // when restarting server
-        setupTestGrpcServer();
-
-        // then consumer received DISCONNECTED and CONNECTED event
-        boolean finished = sync.await(10, TimeUnit.SECONDS);
-        Assertions.assertTrue(finished);
-        Assertions.assertEquals(Lists.newArrayList(DISCONNECTED, CONNECTED), connectionStateChanges);
-    }
-
     @Test
     void whenShuttingDownGrpcConnector_ConsumerReceivesDisconnectedEvent() throws Exception {
         CountDownLatch sync = new CountDownLatch(1);