Skip to content

Commit 7d2022d

Browse files
committed
merge with master branch
Signed-off-by: christian.lutnik <[email protected]>
1 parent bee7edd commit 7d2022d

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
<!-- this can be overriden in child POMs to support specific SDK requirements -->
6969
<groupId>dev.openfeature</groupId>
7070
<artifactId>sdk</artifactId>
71-
<!-- 1.14 <= v < 2.0 (excluding 2.0 pre-releases)-->
72-
<version>[1.14,1.99999)</version>
71+
<!-- 1.14.1 <= v < 2.0 (excluding 2.0 pre-releases)-->
72+
<version>[1.14.1,1.99999)</version>
7373
<!-- use the version provided at runtime -->
7474
<scope>provided</scope>
7575
</dependency>

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,9 @@ EvaluationContext getEnrichedContext() {
205205
return syncResources.getEnrichedContext();
206206
}
207207

208-
@SuppressWarnings("checkstyle:fallthrough")
209208
private void onProviderEvent(FlagdProviderEvent flagdProviderEvent) {
210-
209+
log.info("FlagdProviderEvent event {} ", flagdProviderEvent.getEvent());
211210
synchronized (syncResources) {
212-
log.info("FlagdProviderEvent event {} ", flagdProviderEvent.getEvent());
213211
syncResources.setSyncMetadata(flagdProviderEvent.getSyncMetadata());
214212
if (flagdProviderEvent.getSyncMetadata() != null) {
215213
syncResources.setEnrichedContext(contextEnricher.apply(flagdProviderEvent.getSyncMetadata()));
@@ -233,7 +231,7 @@ private void onProviderEvent(FlagdProviderEvent flagdProviderEvent) {
233231
onReady();
234232
syncResources.setPreviousEvent(ProviderEvent.PROVIDER_READY);
235233
break;
236-
// intentional fall through, a not-ready change will trigger a ready.
234+
237235
case PROVIDER_READY:
238236
onReady();
239237
syncResources.setPreviousEvent(ProviderEvent.PROVIDER_READY);
@@ -244,8 +242,8 @@ private void onProviderEvent(FlagdProviderEvent flagdProviderEvent) {
244242
onError();
245243
syncResources.setPreviousEvent(ProviderEvent.PROVIDER_ERROR);
246244
}
247-
248245
break;
246+
249247
default:
250248
log.info("Unknown event {}", flagdProviderEvent.getEvent());
251249
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
@Order(value = Integer.MAX_VALUE)
1717
@Suite
1818
@IncludeEngines("cucumber")
19-
//@SelectFile("test-harness/gherkin/config.feature")
19+
// @SelectFile("test-harness/gherkin/config.feature")
2020
@SelectDirectories("test-harness/gherkin")
2121
@ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "pretty")
2222
@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "dev.openfeature.contrib.providers.flagd.e2e.steps.config")

0 commit comments

Comments
 (0)