diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-02-27 11:22:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-27 11:22:33 +0100 |
commit | 41e56e047be2fb831dd795c8d38e70db6b2ce785 (patch) | |
tree | d4664b855906fcbffc6f6ddce6206d700642532a | |
parent | 89bcb33930ad6f04e21a8699f7a7544b3cee9a5b (diff) | |
parent | dbe376c18668321cc698ac57965340a3c360b035 (diff) |
Merge pull request #26193 from vespa-engine/bjorncs/fix
Ignore entries with null value
-rw-r--r-- | vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/SignedIdentityDocument.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/SignedIdentityDocument.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/SignedIdentityDocument.java index 6661ac47b81..eba89b72d87 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/SignedIdentityDocument.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/SignedIdentityDocument.java @@ -5,6 +5,7 @@ import com.yahoo.vespa.athenz.api.AthenzService; import java.net.URL; import java.time.Instant; +import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -21,7 +22,13 @@ public record SignedIdentityDocument(String signature, int signingKeyVersion, Ve public SignedIdentityDocument { ipAddresses = Set.copyOf(ipAddresses); - unknownAttributes = Map.copyOf(unknownAttributes); + + Map<String, Object> nonNull = new HashMap<>(); + unknownAttributes.forEach((key, value) -> { + if (value != null) nonNull.put(key, value); + }); + // Map.copyOf() does not allow null values + unknownAttributes = Map.copyOf(nonNull); } public SignedIdentityDocument(String signature, int signingKeyVersion, VespaUniqueInstanceId providerUniqueId, |