Code Review
/
policy
/
models.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Java 17 Upgrade
[policy/models.git]
/
models-tosca
/
src
/
main
/
java
/
org
/
onap
/
policy
/
models
/
tosca
/
simple
/
concepts
/
JpaToscaNodeTemplates.java
diff --git
a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaNodeTemplates.java
b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaNodeTemplates.java
index
6c83f67
..
0a14e43
100644
(file)
--- a/
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaNodeTemplates.java
+++ b/
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaNodeTemplates.java
@@
-1,6
+1,7
@@
/*-
* ============LICENSE_START=======================================================
/*-
* ============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.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-20,20
+21,21
@@
package org.onap.policy.models.tosca.simple.concepts;
package org.onap.policy.models.tosca.simple.concepts;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
+import java.io.Serial;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-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 lombok.ToString;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
import lombok.ToString;
+import org.onap.policy.common.parameters.BeanValidationResult;
import org.onap.policy.models.base.PfConceptContainer;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfConceptContainer;
import org.onap.policy.models.base.PfConceptKey;
-import org.onap.policy.models.base.PfValidationResult;
import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate;
import org.onap.policy.models.tosca.utils.ToscaUtils;
import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate;
import org.onap.policy.models.tosca.utils.ToscaUtils;
@@
-49,6
+51,7
@@
import org.onap.policy.models.tosca.utils.ToscaUtils;
public class JpaToscaNodeTemplates extends PfConceptContainer<JpaToscaNodeTemplate, ToscaNodeTemplate> {
public static final String DEFAULT_NAME = "ToscaNodeTemplatesSimple";
public static final String DEFAULT_VERSION = "1.0.0";
public class JpaToscaNodeTemplates extends PfConceptContainer<JpaToscaNodeTemplate, ToscaNodeTemplate> {
public static final String DEFAULT_NAME = "ToscaNodeTemplatesSimple";
public static final String DEFAULT_VERSION = "1.0.0";
+ @Serial
private static final long serialVersionUID = -4157979965271220098L;
/**
private static final long serialVersionUID = -4157979965271220098L;
/**
@@
-70,7
+73,7
@@
public class JpaToscaNodeTemplates extends PfConceptContainer<JpaToscaNodeTempla
}
/**
}
/**
- * This Constructor creates a
n
concept container with all of its fields defined.
+ * This Constructor creates a concept container with all of its fields defined.
*
* @param key the concept container key
* @param conceptMap the concepts to be stored in the concept container
*
* @param key the concept container key
* @param conceptMap the concepts to be stored in the concept container
@@
-99,8
+102,8
@@
public class JpaToscaNodeTemplates extends PfConceptContainer<JpaToscaNodeTempla
}
@Override
}
@Override
- public
PfValidationResult validate(@NonNull final PfValidationResult resultIn
) {
-
PfValidationResult result = super.validate(resultIn
);
+ public
BeanValidationResult validate(@NonNull String fieldName
) {
+
BeanValidationResult result = super.validate(fieldName
);
// Check that all ancestors of this node template exist
for (JpaToscaNodeTemplate nodeTemplate : this.getConceptMap().values()) {
// Check that all ancestors of this node template exist
for (JpaToscaNodeTemplate nodeTemplate : this.getConceptMap().values()) {