Browse Source

Fix EdqsState.isApiReady

pull/13528/head
ViacheslavKlimov 1 year ago
parent
commit
11fc6358b4
  1. 7
      common/data/src/main/java/org/thingsboard/server/common/data/edqs/EdqsState.java

7
common/data/src/main/java/org/thingsboard/server/common/data/edqs/EdqsState.java

@ -20,7 +20,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import org.apache.commons.lang3.BooleanUtils;
import static org.apache.commons.lang3.BooleanUtils.toBooleanDefaultIfNull;
@Getter @Getter
@NoArgsConstructor @NoArgsConstructor
@ -34,14 +35,14 @@ public class EdqsState {
private EdqsApiMode apiMode; private EdqsApiMode apiMode;
public boolean updateEdqsReady(boolean ready) { public boolean updateEdqsReady(boolean ready) {
boolean changed = BooleanUtils.toBooleanDefaultIfNull(this.edqsReady, false) != ready; boolean changed = toBooleanDefaultIfNull(this.edqsReady, false) != ready;
this.edqsReady = ready; this.edqsReady = ready;
return changed; return changed;
} }
@JsonIgnore @JsonIgnore
public boolean isApiReady() { public boolean isApiReady() {
return edqsReady && syncStatus == EdqsSyncStatus.FINISHED; return toBooleanDefaultIfNull(edqsReady, false) && syncStatus == EdqsSyncStatus.FINISHED;
} }
@JsonIgnore @JsonIgnore

Loading…
Cancel
Save