fixup: spotless and gemini feedback

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

Author: aepfli

providers/flagd/README.md

@@ -85,11 +85,6 @@ export FLAGD_SOURCE_SELECTOR="source=my-app"
 > 
 > Users do not need to make any code changes. The SDK handles selector normalization automatically.
 
-**Backward compatibility:**
-- Both header and request body approaches work with current flagd versions
-- Older flagd versions that only support request body selectors are still supported
-- Future flagd versions may remove request body selector support, but the SDK will continue to work using headers
-
 For more details on selector normalization, see the [flagd selector normalization issue](https://github.com/open-feature/flagd/issues/1814).
 
 #### Sync-metadata

providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/common/ChannelBuilder.java

@@ -33,6 +33,10 @@
 /** gRPC channel builder helper. */
 @SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "we don't care to serialize this")
 public class ChannelBuilder {
+
+    private static final Metadata.Key<String> FLAGD_SELECTOR_KEY =
+            Metadata.Key.of("flagd-selector", Metadata.ASCII_STRING_MARSHALLER);
+
     /**
      * Controls retry (not-reconnection) policy for failed RPCs.
      */
@@ -128,14 +132,14 @@ public static ManagedChannel nettyChannel(final FlagdOptions options) {
             final String defaultTarget = String.format("%s:%s", options.getHost(), options.getPort());
             final String targetUri = isValidTargetUri(options.getTargetUri()) ? options.getTargetUri() : defaultTarget;
 
-            final NettyChannelBuilder builder =
+            final NettyChannelBuilder channelBuilder =
                     NettyChannelBuilder.forTarget(targetUri).keepAliveTime(keepAliveMs, TimeUnit.MILLISECONDS);
 
             if (options.getDefaultAuthority() != null) {
-                builder.overrideAuthority(options.getDefaultAuthority());
+                channelBuilder.overrideAuthority(options.getDefaultAuthority());
             }
             if (options.getClientInterceptors() != null) {
-                builder.intercept(options.getClientInterceptors());
+                channelBuilder.intercept(options.getClientInterceptors());
             }
             if (options.isTls()) {
                 SslContextBuilder sslContext = GrpcSslContexts.forClient();
@@ -147,17 +151,21 @@ public static ManagedChannel nettyChannel(final FlagdOptions options) {
                     }
                 }
 
-                builder.sslContext(sslContext.build());
+                channelBuilder.sslContext(sslContext.build());
             } else {
-                builder.usePlaintext();
+                channelBuilder.usePlaintext();
             }
 
             // telemetry interceptor if option is provided
             if (options.getOpenTelemetry() != null) {
-                builder.intercept(new FlagdGrpcInterceptor(options.getOpenTelemetry()));
+                channelBuilder.intercept(new FlagdGrpcInterceptor(options.getOpenTelemetry()));
+            }
+            // add header-based selector interceptor if selector is provided
+            if (options.getSelector() != null) {
+                channelBuilder.intercept(createSelectorInterceptor(options.getSelector()));
             }
 
-            return builder.defaultServiceConfig(buildRetryPolicy(options))
+            return channelBuilder.defaultServiceConfig(buildRetryPolicy(options))
                     .enableRetry()
                     .build();
         } catch (SSLException ssle) {
@@ -188,7 +196,7 @@ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
                         next.newCall(method, callOptions)) {
                     @Override
                     public void start(Listener<RespT> responseListener, Metadata headers) {
-                        headers.put(Metadata.Key.of("flagd-selector", Metadata.ASCII_STRING_MARSHALLER), selector);
+                        headers.put(FLAGD_SELECTOR_KEY, selector);
                         super.start(responseListener, headers);
                     }
                 };

providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/process/storage/connector/sync/SyncStreamQueueSource.java

@@ -16,13 +16,6 @@
 import dev.openfeature.flagd.grpc.sync.Sync.SyncFlagsResponse;
 import dev.openfeature.sdk.Awaitable;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import io.grpc.CallOptions;
-import io.grpc.Channel;
-import io.grpc.ClientCall;
-import io.grpc.ClientInterceptor;
-import io.grpc.ForwardingClientCall;
-import io.grpc.Metadata;
-import io.grpc.MethodDescriptor;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import io.grpc.stub.StreamObserver;
@@ -42,7 +35,6 @@
         justification = "We need to expose the BlockingQueue to allow consumers to read from it")
 public class SyncStreamQueueSource implements QueueSource {
     private static final int QUEUE_SIZE = 5;
-
     private final AtomicBoolean shutdown = new AtomicBoolean(false);
     private final AtomicBoolean shouldThrottle = new AtomicBoolean(false);
     private final int streamDeadline;
@@ -275,30 +267,6 @@ private void syncFlags(SyncStreamObserver streamObserver) {
         streamObserver.done.await();
     }
 
-    /**
-     * Creates a ClientInterceptor that adds the flagd-selector header to gRPC requests.
-     * This is the preferred approach for passing selectors as per flagd issue #1814.
-     *
-     * @param selector the selector value to pass in the header
-     * @return a ClientInterceptor that adds the flagd-selector header
-     */
-    private static ClientInterceptor createSelectorInterceptor(String selector) {
-        return new ClientInterceptor() {
-            @Override
-            public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
-                    MethodDescriptor<ReqT, RespT> method, CallOptions callOptions, Channel next) {
-                return new ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(
-                        next.newCall(method, callOptions)) {
-                    @Override
-                    public void start(Listener<RespT> responseListener, Metadata headers) {
-                        headers.put(Metadata.Key.of("flagd-selector", Metadata.ASCII_STRING_MARSHALLER), selector);
-                        super.start(responseListener, headers);
-                    }
-                };
-            }
-        };
-    }
-
     private void enqueueError(String message) {
         enqueueError(outgoingQueue, message);
     }