Skip to content

Commit d11e4a9

Browse files
committed
chore(flagd): Capitalize ID in providerID, for consistency with Go
Signed-off-by: Maks Osowski <[email protected]>
1 parent c24fcb5 commit d11e4a9

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

providers/flagd/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Given below are the supported configurations:
116116
| streamDeadlineMs | FLAGD_STREAM_DEADLINE_MS | int | 600000 | rpc & in-process |
117117
| keepAliveTime | FLAGD_KEEP_ALIVE_TIME_MS | long | 0 | rpc & in-process |
118118
| selector | FLAGD_SOURCE_SELECTOR | String | null | in-process |
119-
| providerId | FLAGD_SOURCE_PROVIDER_ID | String | null | in-process |
119+
| providerID | FLAGD_SOURCE_PROVIDER_ID | String | null | in-process |
120120
| cache | FLAGD_CACHE | String - lru, disabled | lru | rpc |
121121
| maxCacheSize | FLAGD_MAX_CACHE_SIZE | int | 1000 | rpc |
122122
| maxEventStreamRetries | FLAGD_MAX_EVENT_STREAM_RETRIES | int | 5 | rpc |

providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdOptions.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ public class FlagdOptions {
108108
private String selector = fallBackToEnvOrDefault(Config.SOURCE_SELECTOR_ENV_VAR_NAME, null);
109109

110110
/**
111-
* ProviderId to be used with flag sync gRPC contract.
111+
* ProviderID to be used with flag sync gRPC contract.
112112
**/
113113
@Builder.Default
114-
private String providerId = fallBackToEnvOrDefault(Config.SOURCE_PROVIDER_ID_ENV_VAR_NAME, null);
114+
private String providerID = fallBackToEnvOrDefault(Config.SOURCE_PROVIDER_ID_ENV_VAR_NAME, null);
115115

116116
/**
117117
* gRPC client KeepAlive in milliseconds. Disabled with 0.

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class GrpcStreamConnector implements Connector {
3434
private final BlockingQueue<QueuePayload> blockingQueue = new LinkedBlockingQueue<>(QUEUE_SIZE);
3535
private final int deadline;
3636
private final String selector;
37-
private final String providerId;
37+
private final String providerID;
3838
private final GrpcConnector<
3939
FlagSyncServiceGrpc.FlagSyncServiceStub, FlagSyncServiceGrpc.FlagSyncServiceBlockingStub>
4040
grpcConnector;
@@ -46,7 +46,7 @@ public class GrpcStreamConnector implements Connector {
4646
public GrpcStreamConnector(final FlagdOptions options, Consumer<FlagdProviderEvent> onConnectionEvent) {
4747
deadline = options.getDeadline();
4848
selector = options.getSelector();
49-
providerId = options.getProviderId();
49+
providerID = options.getProviderID();
5050
streamReceiver = new LinkedBlockingQueue<>(QUEUE_SIZE);
5151
grpcConnector = new GrpcConnector<>(
5252
options,
@@ -55,14 +55,14 @@ public GrpcStreamConnector(final FlagdOptions options, Consumer<FlagdProviderEve
5555
onConnectionEvent,
5656
stub -> {
5757
String localSelector = selector;
58-
String localProviderId = providerId;
58+
String localProviderID = providerID;
5959

6060
final SyncFlagsRequest.Builder syncRequest = SyncFlagsRequest.newBuilder();
6161
if (localSelector != null) {
6262
syncRequest.setSelector(localSelector);
6363
}
64-
if (localProviderId != null) {
65-
syncRequest.setProviderId(localProviderId);
64+
if (localProviderID != null) {
65+
syncRequest.setProviderId(localProviderID);
6666
}
6767

6868
stub.syncFlags(syncRequest.build(), new GrpcStreamHandler(streamReceiver));

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/FlagdOptionsTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void TestDefaults() {
4141
assertEquals(DEFAULT_CACHE, builder.getCacheType());
4242
assertEquals(DEFAULT_MAX_CACHE_SIZE, builder.getMaxCacheSize());
4343
assertNull(builder.getSelector());
44-
assertNull(builder.getProviderId());
44+
assertNull(builder.getProviderID());
4545
assertNull(builder.getOpenTelemetry());
4646
assertNull(builder.getCustomConnector());
4747
assertNull(builder.getOfflineFlagSourcePath());
@@ -62,7 +62,7 @@ void TestBuilderOptions() {
6262
.cacheType("lru")
6363
.maxCacheSize(100)
6464
.selector("app=weatherApp")
65-
.providerId("test/provider/id_1")
65+
.providerID("test/provider/id_1")
6666
.openTelemetry(openTelemetry)
6767
.customConnector(connector)
6868
.resolverType(Resolver.IN_PROCESS)
@@ -77,7 +77,7 @@ void TestBuilderOptions() {
7777
assertEquals("lru", flagdOptions.getCacheType());
7878
assertEquals(100, flagdOptions.getMaxCacheSize());
7979
assertEquals("app=weatherApp", flagdOptions.getSelector());
80-
assertEquals("test/provider/id_1", flagdOptions.getProviderId());
80+
assertEquals("test/provider/id_1", flagdOptions.getProviderID());
8181
assertEquals(openTelemetry, flagdOptions.getOpenTelemetry());
8282
assertEquals(connector, flagdOptions.getCustomConnector());
8383
assertEquals(Resolver.IN_PROCESS, flagdOptions.getResolverType());

0 commit comments

Comments
 (0)