Skip to content

Commit e61a462

Browse files
committed
fixup: extract consts
Signed-off-by: Todd Baert <[email protected]>
1 parent b6af7ec commit e61a462

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package dev.openfeature.contrib.providers.flagd.resolver.grpc;
2+
3+
public class Constants {
4+
public static final String CONFIGURATION_CHANGE = "configuration_change";
5+
public static final String PROVIDER_READY = "provider_ready";
6+
public static final String FLAGS_KEY = "flags";
7+
}

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

+3-7
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ class EventStreamObserver implements StreamObserver<EventStreamResponse> {
2424
private final Object sync;
2525
private final Cache cache;
2626

27-
public static final String CONFIGURATION_CHANGE = "configuration_change";
28-
public static final String PROVIDER_READY = "provider_ready";
29-
static final String FLAGS_KEY = "flags";
30-
3127
/**
3228
* Create a gRPC stream that get notified about flag changes.
3329
*
@@ -44,10 +40,10 @@ class EventStreamObserver implements StreamObserver<EventStreamResponse> {
4440
@Override
4541
public void onNext(EventStreamResponse value) {
4642
switch (value.getType()) {
47-
case CONFIGURATION_CHANGE:
43+
case Constants.CONFIGURATION_CHANGE:
4844
this.handleConfigurationChangeEvent(value);
4945
break;
50-
case PROVIDER_READY:
46+
case Constants.PROVIDER_READY:
5147
this.handleProviderReadyEvent();
5248
break;
5349
default:
@@ -83,7 +79,7 @@ private void handleConfigurationChangeEvent(EventStreamResponse value) {
8379
boolean cachingEnabled = this.cache.getEnabled();
8480

8581
Map<String, Value> data = value.getData().getFieldsMap();
86-
Value flagsValue = data.get(FLAGS_KEY);
82+
Value flagsValue = data.get(Constants.FLAGS_KEY);
8783
if (flagsValue == null) {
8884
if (cachingEnabled) {
8985
this.cache.clear();

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/resolver/grpc/EventStreamObserverTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void cacheBustingForKnownKeys() {
9393
Value flagsValue = mock(Value.class);
9494
Struct flagsStruct = mock(Struct.class);
9595
HashMap<String, Value> fields = new HashMap<>();
96-
fields.put(EventStreamObserver.FLAGS_KEY, flagsValue);
96+
fields.put(Constants.FLAGS_KEY, flagsValue);
9797
HashMap<String, Value> flags = new HashMap<>();
9898
flags.put(key1, null);
9999
flags.put(key2, null);

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/resolver/grpc/GrpcConnectorTest.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
44
import static org.junit.jupiter.api.Assertions.assertEquals;
55
import static org.junit.jupiter.api.Assertions.assertThrows;
6-
import static org.junit.jupiter.api.Assertions.fail;
76
import static org.mockito.ArgumentMatchers.any;
87
import static org.mockito.ArgumentMatchers.anyInt;
98
import static org.mockito.ArgumentMatchers.anyLong;
@@ -19,9 +18,6 @@
1918
import static org.mockito.Mockito.when;
2019

2120
import java.lang.reflect.Field;
22-
import java.util.List;
23-
import java.util.Map;
24-
import java.util.concurrent.atomic.AtomicBoolean;
2521
import java.util.function.Consumer;
2622

2723
import org.junit.jupiter.api.Test;
@@ -40,7 +36,6 @@
4036
import dev.openfeature.flagd.grpc.evaluation.ServiceGrpc;
4137
import dev.openfeature.flagd.grpc.evaluation.ServiceGrpc.ServiceBlockingStub;
4238
import dev.openfeature.flagd.grpc.evaluation.ServiceGrpc.ServiceStub;
43-
import dev.openfeature.sdk.internal.TriConsumer;
4439
import io.grpc.Channel;
4540
import io.grpc.netty.NettyChannelBuilder;
4641
import io.netty.channel.EventLoopGroup;
@@ -104,7 +99,7 @@ void initialization_succeed_with_connected_status() throws NoSuchFieldException,
10499
doAnswer((InvocationOnMock invocation) -> {
105100
EventStreamObserver eventStreamObserver = (EventStreamObserver) invocation.getArgument(1);
106101
eventStreamObserver
107-
.onNext(EventStreamResponse.newBuilder().setType(EventStreamObserver.PROVIDER_READY).build());
102+
.onNext(EventStreamResponse.newBuilder().setType(Constants.PROVIDER_READY).build());
108103
return null;
109104
}).when(mockStub).eventStream(any(), any());
110105

0 commit comments

Comments
 (0)