fixup: shutdown

Author: toddbaert

providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/grpc/GrpcConnector.java

@@ -90,7 +90,7 @@ public void shutdown() throws Exception {
 
         try {
             if (this.channel != null && !this.channel.isShutdown()) {
-                this.channel.shutdownNow();
+                this.channel.shutdown();
                 this.channel.awaitTermination(this.deadline, TimeUnit.MILLISECONDS);
             }
         } finally {

providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/process/storage/connector/grpc/GrpcStreamConnector.java

@@ -84,7 +84,7 @@ public void shutdown() throws InterruptedException {
 
         try {
             if (this.channel != null && !this.channel.isShutdown()) {
-                this.channel.shutdownNow();
+                this.channel.shutdown();
                 this.channel.awaitTermination(this.deadline, TimeUnit.MILLISECONDS);
             }
         } finally {

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdInProcessCucumberTest.java

@@ -9,7 +9,7 @@
 import static io.cucumber.junit.platform.engine.Constants.PLUGIN_PROPERTY_NAME;
 import static io.cucumber.junit.platform.engine.Constants.GLUE_PROPERTY_NAME;
 
-@Order(value = 0)
+@Order(value = Integer.MAX_VALUE)
 @Suite
 @IncludeEngines("cucumber")
 @SelectClasspathResource("features/evaluation.feature")

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdRpcCucumberTest.java

@@ -9,7 +9,7 @@
 import static io.cucumber.junit.platform.engine.Constants.PLUGIN_PROPERTY_NAME;
 import static io.cucumber.junit.platform.engine.Constants.GLUE_PROPERTY_NAME;
 
-@Order(value = 0)
+@Order(value = Integer.MAX_VALUE)
 @Suite
 @IncludeEngines("cucumber")
 @SelectClasspathResource("features/evaluation.feature")

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/process/FlagdInProcessSetup.java

@@ -11,7 +11,7 @@
 import io.cucumber.java.BeforeAll;
 
 @Isolated()
-@Order(value = 0)
+@Order(value = Integer.MAX_VALUE)
 public class FlagdInProcessSetup {
 
     private static FeatureProvider provider;

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/rpc/FlagdRpcSetup.java

@@ -11,7 +11,7 @@
 import io.cucumber.java.BeforeAll;
 
 @Isolated()
-@Order(value = 0)
+@Order(value = Integer.MAX_VALUE)
 public class FlagdRpcSetup {
 
     private static FeatureProvider provider;

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/steps/StepDefinitions.java

@@ -29,7 +29,7 @@
  * Common test suite used by both RPC and in-process flagd providers.
  */
 @Isolated()
-@Order(value = 0)
+@Order(value = Integer.MAX_VALUE)
 public class StepDefinitions {
 
     private static Client client;

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/resolver/process/storage/connector/grpc/GrpcStreamConnectorTest.java

@@ -1,21 +1,5 @@
 package dev.openfeature.contrib.providers.flagd.resolver.process.storage.connector.grpc;
 
-import dev.openfeature.contrib.providers.flagd.FlagdOptions;
-import dev.openfeature.contrib.providers.flagd.resolver.process.storage.connector.StreamPayload;
-import dev.openfeature.contrib.providers.flagd.resolver.process.storage.connector.StreamPayloadType;
-import dev.openfeature.flagd.sync.FlagSyncServiceGrpc;
-import dev.openfeature.flagd.sync.SyncService;
-
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.parallel.Isolated;
-import org.mockito.Mockito;
-
-import java.lang.reflect.Field;
-import java.time.Duration;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.TimeUnit;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -24,7 +8,20 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-@Order(value = Integer.MAX_VALUE)
+import java.lang.reflect.Field;
+import java.time.Duration;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import dev.openfeature.contrib.providers.flagd.FlagdOptions;
+import dev.openfeature.contrib.providers.flagd.resolver.process.storage.connector.StreamPayload;
+import dev.openfeature.contrib.providers.flagd.resolver.process.storage.connector.StreamPayloadType;
+import dev.openfeature.flagd.sync.FlagSyncServiceGrpc;
+import dev.openfeature.flagd.sync.SyncService;
+
 class GrpcStreamConnectorTest {
 
     private static final Duration MAX_WAIT_MS = Duration.ofMillis(500);