Move model base classes outside feature-lifecycle

So, it can be used in drools-application without
a feature dependency.

Issue-ID: POLICY-2360
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I1cf75bdd8739c35ea9b590896b177a519363e3d5

7 files changed, 10 insertions, 94 deletions

diff --git a/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/DroolsPolicy.java b/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/DroolsPolicy.java
deleted file mode 100644
index a0234661..00000000
--- a/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/DroolsPolicy.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.drools.domain.models;
-
-import com.google.gson.annotations.SerializedName;
-import lombok.Data;
-import lombok.experimental.SuperBuilder;
-
-@Data
-@SuperBuilder
-public abstract class DroolsPolicy {
-    @SerializedName("type")
-    protected String type;
-
-    @SerializedName("type_version")
-    protected String typeVersion;
-
-    @SerializedName("version")
-    protected String version;
-
-    @SerializedName("name")
-    protected String name;
-
-    @SerializedName("metadata")
-    protected Metadata metadata;
-}
diff --git a/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/Metadata.java b/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/Metadata.java
deleted file mode 100644
index fd68e5b5..00000000
--- a/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/Metadata.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.drools.domain.models;
-
-import com.google.gson.annotations.SerializedName;
-import java.io.Serializable;
-import lombok.Builder;
-import lombok.Data;
-
-/**
- * Metadata in Native Drools Policies.
- */
-
-@Data
-@Builder
-public class Metadata implements Serializable {
-
-    private static final long serialVersionUID = -1027974819756498893L;
-
-    @SerializedName("policy-id")
-    protected String policyId;
-}
diff --git a/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerCustomSerializer.java b/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerCustomSerializer.java
index bda7748d..d7956b41 100644
--- a/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerCustomSerializer.java
+++ b/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerCustomSerializer.java
@@ -22,12 +22,12 @@ package org.onap.policy.drools.domain.models.controller;
 
 import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
+import lombok.Builder;
 import lombok.Data;
-import lombok.experimental.SuperBuilder;
 
 
 @Data
-@SuperBuilder
+@Builder
 public class ControllerCustomSerializer implements Serializable {
     private static final long serialVersionUID = 1505345574249332514L;
 
diff --git a/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerProperties.java b/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerProperties.java
index 0ed6d33c..692b1790 100644
--- a/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerProperties.java
+++ b/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerProperties.java
@@ -24,8 +24,8 @@ import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
+import lombok.Builder;
 import lombok.Data;
-import lombok.experimental.SuperBuilder;
 
 
 /**
@@ -33,7 +33,7 @@ import lombok.experimental.SuperBuilder;
  */
 
 @Data
-@SuperBuilder
+@Builder
 public class ControllerProperties implements Serializable {
     private static final long serialVersionUID = 1259434187110418986L;
 
diff --git a/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerSerialization.java b/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerSerialization.java
index 77a5e93d..8daaa31f 100644
--- a/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerSerialization.java
+++ b/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerSerialization.java
@@ -22,12 +22,12 @@ package org.onap.policy.drools.domain.models.controller;
 
 import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
+import lombok.Builder;
 import lombok.Data;
-import lombok.experimental.SuperBuilder;
 
 
 @Data
-@SuperBuilder
+@Builder
 public class ControllerSerialization implements Serializable {
 
     @SerializedName("eventClass")
diff --git a/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerSinkTopic.java b/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerSinkTopic.java
index acb4fb01..ecd66a3f 100644
--- a/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerSinkTopic.java
+++ b/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerSinkTopic.java
@@ -23,8 +23,8 @@ package org.onap.policy.drools.domain.models.controller;
 import com.google.gson.annotations.SerializedName;
 import java.io.Serializable;
 import java.util.List;
+import lombok.Builder;
 import lombok.Data;
-import lombok.experimental.SuperBuilder;
 
 
 /**
@@ -32,7 +32,7 @@ import lombok.experimental.SuperBuilder;
  */
 
 @Data
-@SuperBuilder
+@Builder
 public class ControllerSinkTopic implements Serializable {
     private static final long serialVersionUID = 8770353732981476267L;
 
diff --git a/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerSourceTopic.java b/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerSourceTopic.java
index ffad9cfa..09344016 100644
--- a/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerSourceTopic.java
+++ b/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerSourceTopic.java
@@ -22,8 +22,8 @@ package org.onap.policy.drools.domain.models.controller;
 
 import java.io.Serializable;
 import java.util.List;
+import lombok.Builder;
 import lombok.Data;
-import lombok.experimental.SuperBuilder;
 
 
 /**
@@ -31,7 +31,7 @@ import lombok.experimental.SuperBuilder;
  */
 
 @Data
-@SuperBuilder
+@Builder
 public class ControllerSourceTopic implements Serializable {
     private static final long serialVersionUID = -1732598566914643612L;