Merge pull request #21626 from vespa-engine/olaa/return-preapprove-payload

Payload contains pre-approval status

1 files changed, 5 insertions, 4 deletions

diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/bindings/RoleEntity.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/bindings/RoleEntity.java
index ffc06b9a2e3..32efb1d1a39 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/bindings/RoleEntity.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/bindings/RoleEntity.java
@@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author mortent
@@ -27,10 +28,10 @@ public class RoleEntity {
                       @JsonProperty("reviewEnabled") Boolean reviewEnabled,
                       @JsonProperty("auditLog") List<AuditLogEntry> auditLog) {
         this.roleName = roleName;
-        this.roleMembers = roleMembers;
-        this.selfServe = selfServe;
-        this.reviewEnabled = reviewEnabled;
-        this.auditLog = auditLog == null ? new ArrayList<>() : auditLog;
+        this.roleMembers = Optional.ofNullable(roleMembers).orElse(new ArrayList<>());
+        this.selfServe = Optional.ofNullable(selfServe).orElse(false);
+        this.reviewEnabled = Optional.ofNullable(reviewEnabled).orElse(false);
+        this.auditLog = Optional.ofNullable(auditLog).orElse(new ArrayList<>());;
     }
 
     public String roleName() {