Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -269,11 +269,14 @@ private <T> ProviderEvaluation<T> resolve(Class<T> type, String key, EvaluationC

private static ImmutableMetadata getFlagMetadata(Map<String, Object> currentFlagSetMetadata, FeatureFlag flag) {
ImmutableMetadata.ImmutableMetadataBuilder metadataBuilder = ImmutableMetadata.builder();
for (Map.Entry<String, Object> entry : currentFlagSetMetadata.entrySet()) {
addEntryToMetadataBuilder(metadataBuilder, entry.getKey(), entry.getValue());

if (currentFlagSetMetadata != null) {
for (Map.Entry<String, Object> entry : currentFlagSetMetadata.entrySet()) {
addEntryToMetadataBuilder(metadataBuilder, entry.getKey(), entry.getValue());
}
}

if (flag != null) {
if (flag != null && flag.getMetadata() != null) {
for (Map.Entry<String, Object> entry : flag.getMetadata().entrySet()) {
addEntryToMetadataBuilder(metadataBuilder, entry.getKey(), entry.getValue());
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package dev.openfeature.contrib.tools.flagd.core;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatNoException;

import dev.openfeature.contrib.tools.flagd.api.FlagStoreException;
import dev.openfeature.sdk.ImmutableContext;
Expand Down Expand Up @@ -124,4 +125,25 @@ void setFlagsAndGetChangedKeys_detectsRemovedFlags() throws FlagStoreException {
// Then: boolFlag should be in the changed keys (it was removed)
assertThat(changedKeys).contains("boolFlag");
}

@Test
void resolveBooleanValue_flagWithNullMetadata_doesNotThrowNPE() {
String configWithNullMetadata = "{"
+ "\"$schema\": \"https://flagd.dev/schema/v0/flags.json\","
+ "\"flags\": {"
+ " \"nullMetadataFlag\": {"
+ " \"state\": \"ENABLED\","
+ " \"defaultVariant\": \"on\","
+ " \"variants\": { \"on\": true }"
+ " }"
+ "}"
+ "}";

assertThatNoException().isThrownBy(() -> {
flagdCore.setFlags(configWithNullMetadata);
ProviderEvaluation<Boolean> result =
flagdCore.resolveBooleanValue("nullMetadataFlag", new ImmutableContext());
assertThat(result.getFlagMetadata()).isNotNull();
});
}
}
Loading