X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-dao%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fmodels%2Fdao%2FDummyTimestampEntity.java;h=76ac7f744224ad693d5fd164be578dfe780688b0;hb=938005505883cf7a636a8840e20e3dc8a0ad9176;hp=d18a91573ca540b527dd028d45945ee08d3c486f;hpb=88fb2e33c81fa0d69846e8d0d218b0ef4015a4ba;p=policy%2Fmodels.git diff --git a/models-dao/src/test/java/org/onap/policy/models/dao/DummyTimestampEntity.java b/models-dao/src/test/java/org/onap/policy/models/dao/DummyTimestampEntity.java index d18a91573..76ac7f744 100644 --- a/models-dao/src/test/java/org/onap/policy/models/dao/DummyTimestampEntity.java +++ b/models-dao/src/test/java/org/onap/policy/models/dao/DummyTimestampEntity.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2020 Nordix Foundation. + * Copyright (C) 2020, 2023 Nordix Foundation. + * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,29 +21,27 @@ package org.onap.policy.models.dao; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import java.io.Serial; import java.util.ArrayList; import java.util.List; - -import javax.persistence.Column; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; - import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NonNull; - -import org.onap.policy.common.utils.validation.Assertions; +import org.onap.policy.common.parameters.BeanValidationResult; import org.onap.policy.models.base.PfConcept; import org.onap.policy.models.base.PfKey; import org.onap.policy.models.base.PfTimestampKey; -import org.onap.policy.models.base.PfValidationResult; @Entity @Table(name = "DummyTimestampEntity") @Data @EqualsAndHashCode(callSuper = false) public class DummyTimestampEntity extends PfConcept { + @Serial private static final long serialVersionUID = -2962570563281067895L; @EmbeddedId() @@ -84,8 +83,10 @@ public class DummyTimestampEntity extends PfConcept { } @Override - public PfValidationResult validate(final PfValidationResult result) { - return key.validate(result); + public BeanValidationResult validate(@NonNull String fieldName) { + BeanValidationResult result = new BeanValidationResult(fieldName, this); + result.addResult(key.validate("key")); + return result; } @Override @@ -93,7 +94,6 @@ public class DummyTimestampEntity extends PfConcept { key.clean(); } - @Override public int compareTo(@NonNull final PfConcept otherObj) { if (this == otherObj) {