libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

narrows condition status to a string (#22439)

Browse source 
Closes #21299
This commit is contained in:
Steven Hawkins 2023-09-22 12:29:29 -04:00 committed by GitHub
parent 48a0b3436d
commit 0bae359058
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
operator/src/main/java/org/keycloak/operator/crds/v2alpha1/StatusCondition.java
View file

@ -17,15 +17,11 @@
package org.keycloak.operator.crds.v2alpha1; package org.keycloak.operator.crds.v2alpha1;
import io.fabric8.kubernetes.api.model.AnyType;
import java.util.Objects; import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.TextNode;
/** /**
* @author Vaclav Muzikar <vmuzikar@redhat.com> * @author Vaclav Muzikar <vmuzikar@redhat.com>
@ -39,7 +35,7 @@ public class StatusCondition {
} }
private String type; private String type;
private JsonNode status = TextNode.valueOf(Status.Unknown.name()); private String status = Status.Unknown.name();
private String message; private String message;
private String lastTransitionTime; private String lastTransitionTime;
private Long observedGeneration; private Long observedGeneration;
@ -54,43 +50,30 @@ public class StatusCondition {
@JsonIgnore @JsonIgnore
public Boolean getStatus() { public Boolean getStatus() {
if (status == null || status.isNull()) { if (status == null || Status.Unknown.name().equals(status)) {
return null;
}
// account for the legacy boolean string as well
switch (status.asText()) {
case "false":
case "False":
return false;
case "true":
case "True":
return true;
default:
return null; return null;
} }
return Status.True.name().equals(status);
} }
@JsonProperty("status") @JsonProperty("status")
public String getStatusString() { public String getStatusString() {
if (status == null || status.isNull()) { return status;
return null;
}
return status.asText();
} }
@JsonProperty("status") @JsonProperty("status")
public void setStatusString(String status) { public void setStatusString(String status) {
this.status = TextNode.valueOf(status); this.status = status;
} }
@JsonIgnore @JsonIgnore
public void setStatus(Boolean status) { public void setStatus(Boolean status) {
if (status == null) { if (status == null) {
this.status = TextNode.valueOf(Status.Unknown.name()); this.status = Status.Unknown.name();
} else if (status) { } else if (status) {
this.status = TextNode.valueOf(Status.True.name()); this.status = Status.True.name();
} else { } else {
this.status = TextNode.valueOf(Status.False.name()); this.status = Status.False.name();
} }
} }