* ============LICENSE_START=======================================================
* ONAP Policy Model
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019, 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.models.pdp.persistence.concepts;
+import jakarta.persistence.Column;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import java.io.Serial;
import java.io.Serializable;
+import java.util.Date;
import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
-
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.onap.policy.common.utils.validation.Assertions;
+import org.apache.commons.lang3.builder.CompareToBuilder;
+import org.onap.policy.common.parameters.BeanValidationResult;
+import org.onap.policy.common.parameters.annotations.NotBlank;
+import org.onap.policy.common.parameters.annotations.NotNull;
import org.onap.policy.models.base.PfAuthorative;
import org.onap.policy.models.base.PfConcept;
import org.onap.policy.models.base.PfKey;
import org.onap.policy.models.base.PfReferenceKey;
-import org.onap.policy.models.base.PfValidationMessage;
-import org.onap.policy.models.base.PfValidationResult;
-import org.onap.policy.models.base.PfValidationResult.ValidationResult;
+import org.onap.policy.models.base.validation.annotations.VerifyKey;
import org.onap.policy.models.pdp.concepts.Pdp;
import org.onap.policy.models.pdp.enums.PdpHealthStatus;
import org.onap.policy.models.pdp.enums.PdpState;
@Data
@EqualsAndHashCode(callSuper = false)
public class JpaPdp extends PfConcept implements PfAuthorative<Pdp>, Serializable {
+ @Serial
private static final long serialVersionUID = -357224425637789775L;
@EmbeddedId
+ @VerifyKey
+ @NotNull
private PfReferenceKey key;
@Column
+ @NotNull
private PdpState pdpState;
@Column
+ @NotNull
private PdpHealthStatus healthy;
@Column
+ @NotBlank
private String message;
+ @Column(precision = 0)
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date lastUpdate;
+
/**
* The Default Constructor creates a {@link JpaPdp} object with a null key.
*/
* @param healthy the health state of the PDP
*/
public JpaPdp(@NonNull final PfReferenceKey key, @NonNull final PdpState pdpState,
- @NonNull PdpHealthStatus healthy) {
+ @NonNull PdpHealthStatus healthy) {
this.key = key;
this.pdpState = pdpState;
this.healthy = healthy;
+ this.lastUpdate = new Date();
}
/**
*
* @param copyConcept the concept to copy from
*/
- public JpaPdp(final JpaPdp copyConcept) {
+ public JpaPdp(@NonNull final JpaPdp copyConcept) {
super(copyConcept);
+ this.key = new PfReferenceKey(copyConcept.key);
+ this.pdpState = copyConcept.pdpState;
+ this.healthy = copyConcept.healthy;
+ this.message = copyConcept.message;
+ this.lastUpdate = copyConcept.lastUpdate;
}
/**
*
* @param authorativeConcept the authorative concept to copy from
*/
- public JpaPdp(final Pdp authorativeConcept) {
+ public JpaPdp(@NonNull final Pdp authorativeConcept) {
this.fromAuthorative(authorativeConcept);
}
@Override
public Pdp toAuthorative() {
- Pdp pdp = new Pdp();
+ var pdp = new Pdp();
pdp.setInstanceId(key.getLocalName());
pdp.setPdpState(pdpState);
pdp.setHealthy(healthy);
pdp.setMessage(message);
+ pdp.setLastUpdate(lastUpdate.toInstant());
return pdp;
}
@Override
- public void fromAuthorative(final Pdp pdp) {
- if (this.getKey().isNullKey()) {
+ public void fromAuthorative(@NonNull final Pdp pdp) {
+ if (this.key == null || this.getKey().isNullKey()) {
this.setKey(new PfReferenceKey());
getKey().setLocalName(pdp.getInstanceId());
}
this.setPdpState(pdp.getPdpState());
this.setHealthy(pdp.getHealthy());
this.setMessage(pdp.getMessage());
+
+ if (pdp.getLastUpdate() == null) {
+ this.setLastUpdate(new Date());
+ } else {
+ this.setLastUpdate(Date.from(pdp.getLastUpdate()));
+ }
}
@Override
}
@Override
- public PfValidationResult validate(final PfValidationResult resultIn) {
- PfValidationResult result = resultIn;
+ public BeanValidationResult validate(@NonNull String fieldName) {
+ BeanValidationResult result = super.validate(fieldName);
- if (key.isNullKey()) {
- result.addValidationMessage(
- new PfValidationMessage(key, this.getClass(), ValidationResult.INVALID, "key is a null key"));
- }
-
- result = key.validate(result);
-
- if (key.getParentConceptKey().isNullKey()) {
- result.addValidationMessage(new PfValidationMessage(key, this.getClass(), ValidationResult.INVALID,
- "parent of key is a null key"));
- }
+ validateKeyNotNull(result, "parent of key", key.getParentConceptKey());
if (PfKey.NULL_KEY_NAME.equals(key.getParentLocalName())) {
- result.addValidationMessage(new PfValidationMessage(key, this.getClass(), ValidationResult.INVALID,
- "local name of parent of key is null"));
- }
-
- if (pdpState == null) {
- result.addValidationMessage(new PfValidationMessage(key, this.getClass(), ValidationResult.INVALID,
- "PDP state may not be null"));
- }
-
- if (healthy == null) {
- result.addValidationMessage(new PfValidationMessage(key, this.getClass(), ValidationResult.INVALID,
- "PDP health status may not be null"));
- }
-
- if (StringUtils.isBlank(message)) {
- result.addValidationMessage(new PfValidationMessage(key, this.getClass(), ValidationResult.INVALID,
- "message may not be blank"));
+ addResult(result, "local name of parent of key", key.getParentLocalName(), IS_NULL);
}
return result;
return 0;
}
if (getClass() != otherConcept.getClass()) {
- return this.hashCode() - otherConcept.hashCode();
+ return getClass().getName().compareTo(otherConcept.getClass().getName());
}
final JpaPdp other = (JpaPdp) otherConcept;
- if (!key.equals(other.key)) {
- return key.compareTo(other.key);
- }
-
- int result = ObjectUtils.compare(pdpState, other.pdpState);
- if (result != 0) {
- return result;
- }
-
- result = ObjectUtils.compare(healthy, other.healthy);
- if (result != 0) {
- return result;
- }
-
- return ObjectUtils.compare(message, other.message);
- }
-
- @Override
- public PfConcept copyTo(@NonNull final PfConcept target) {
- Assertions.instanceOf(target, JpaPdp.class);
-
- final JpaPdp copy = ((JpaPdp) target);
- copy.setKey(new PfReferenceKey(key));
- copy.setPdpState(pdpState);
- copy.setHealthy(healthy);
- copy.setMessage(message);
- return copy;
+ // @formatter:off
+ return new CompareToBuilder()
+ .append(this.key, other.key)
+ .append(this.pdpState, other.pdpState)
+ .append(this.healthy, other.healthy)
+ .append(this.message, other.message)
+ .append(this.lastUpdate, other.lastUpdate)
+ .toComparison();
+ // @formatter:on
}
}
Code Review / policy / models.git / blobdiff