Java 17 Upgrade

[policy/models.git] / models-base / src / main / java / org / onap / policy / models / base / PfConcept.java

diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfConcept.java b/models-base/src/main/java/org/onap/policy/models/base/PfConcept.java
index 5273bd3..c8be88d 100644 (file)
--- a/models-base/src/main/java/org/onap/policy/models/base/PfConcept.java
+++ b/models-base/src/main/java/org/onap/policy/models/base/PfConcept.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- *  Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ *  Copyright (C) 2019, 2023 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2021 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.
@@ -21,31 +21,29 @@
 
 package org.onap.policy.models.base;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import lombok.NonNull;
 
 /**
  * This class is the base class for all Policy Framework concept classes. It enforces implementation of abstract methods
- * and interfaces on all concepts that are sub-classes of this class.
+ * and interfaces on all concepts that are subclasses of this class.
  */
 
-public abstract class PfConcept implements Serializable, Comparable<PfConcept> {
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public abstract class PfConcept extends Validated implements Serializable, Comparable<PfConcept> {
+    @Serial
     private static final long serialVersionUID = -7434939557282697490L;
 
-    /**
-     * Default constructor.
-     */
-    public PfConcept() {
-        // Default Constructor
-    }
-
     /**
      * Copy constructor.
      *
      * @param copyConcept the concept to copy from
      */
-    public PfConcept(@NonNull final PfConcept copyConcept) {
+    protected PfConcept(@NonNull final PfConcept copyConcept) {
         // nothing else to do (other than @NonNull check)
     }
 
@@ -64,15 +62,6 @@ public abstract class PfConcept implements Serializable, Comparable<PfConcept> {
      */
     public abstract List<PfKey> getKeys();
 
-    /**
-     * Validate that this concept is structurally correct.
-     *
-     * @param result the parameter in which the result of the validation will be returned
-     * @return the validation result that was passed in in the @{link result} field with the result of this validation
-     *         added
-     */
-    public abstract PfValidationResult validate(@NonNull final PfValidationResult result);
-
     /**
      * Clean this concept, tidy up any superfluous information such as leading and trailing white space.
      */