Uplift code base to java21

Issue-ID: POLICY-5466
Change-Id: I12f9d19069aac709e50ff6ad43af2f05def1eb83
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaConceptIdentifier.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaConceptIdentifier.java
index a243414..f30f62e 100644 (file)
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaConceptIdentifier.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaConceptIdentifier.java
@@ -3,7 +3,7 @@
  * ONAP Policy Models
  * ================================================================================
  * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2020-2021 Nordix Foundation.
+ * Modifications Copyright (C) 2020-2021, 2025 OpenInfra Foundation Europe. 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.
@@ -21,6 +21,7 @@
 
 package org.onap.policy.models.tosca.authorative.concepts;
 
+import java.io.Serial;
 import java.io.Serializable;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -36,6 +37,8 @@ import org.onap.policy.models.base.PfKey;
 @NoArgsConstructor
 public class ToscaConceptIdentifier extends ToscaNameVersion
                 implements Serializable, Comparable<ToscaConceptIdentifier> {
+
+    @Serial
     private static final long serialVersionUID = 8010649773816325786L;
 
 

diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaNameVersion.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaNameVersion.java
index 6c83269..9055e75 100644 (file)
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaNameVersion.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaNameVersion.java
@@ -3,6 +3,7 @@
  * ONAP Policy Models
  * ================================================================================
  * Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2025 OpenInfra Foundation Europe. 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,6 +21,8 @@
 
 package org.onap.policy.models.tosca.authorative.concepts;
 
+import java.io.Serial;
+import java.io.Serializable;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -34,7 +37,10 @@ import org.onap.policy.models.base.PfKey;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class ToscaNameVersion {
+public class ToscaNameVersion implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 8010649773816325786L;
 
     private String name;
 
@@ -51,7 +57,7 @@ public class ToscaNameVersion {
     }
 
     /**
-     * Create a PfConcceptKey from the TOSCA identifier.
+     * Create a PfConceptKey from the TOSCA identifier.
      *
      * @return the key
      */