Skip to content
Merged
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
5 changes: 4 additions & 1 deletion src/main/java/dev/openfeature/sdk/ImmutableMetadata.java
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public <T> T getValue(final String key, final Class<T> type) {
}

public Map<String, Object> asUnmodifiableMap() {
return Collections.unmodifiableMap(metadata);
return metadata.isEmpty() ? Collections.emptyMap() : Collections.unmodifiableMap(metadata);
}

public boolean isEmpty() {
Expand Down Expand Up @@ -199,6 +199,9 @@ public ImmutableMetadataBuilder addBoolean(final String key, final Boolean value
* Retrieve {@link ImmutableMetadata} with provided key,value pairs.
*/
public ImmutableMetadata build() {
if (metadata.isEmpty()) {
return EMPTY;
}
return new ImmutableMetadata(this.metadata);
}
}
Expand Down
16 changes: 16 additions & 0 deletions src/test/java/dev/openfeature/sdk/ImmutableMetadataTest.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package dev.openfeature.sdk;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;

import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

class ImmutableMetadataTest {
Expand Down Expand Up @@ -38,4 +40,18 @@ void retrieveAsUnmodifiableMap() {
assertEquals(unmodifiableMap.get("key1"), "value1");
Assertions.assertThrows(UnsupportedOperationException.class, () -> unmodifiableMap.put("key3", "value3"));
}

@Test
@DisplayName("empty builder returns EMPTY singleton")
void emptyBuilderReturnsEmptySingleton() {
assertThat(ImmutableMetadata.builder().build()).isSameAs(ImmutableMetadata.EMPTY);
}

@Test
@DisplayName("asUnmodifiableMap on empty metadata returns empty unmodifiable map")
void asUnmodifiableMapOnEmptyMetadataIsUnmodifiable() {
Map<String, Object> map = ImmutableMetadata.EMPTY.asUnmodifiableMap();
assertThat(map).isEmpty();
Assertions.assertThrows(UnsupportedOperationException.class, () -> map.put("key", "value"));
}
}
Loading