Moved builders under impl in CPS Service

  - moved builders and fixed the Arch test

Issue-ID: CPS-2542
Change-Id: Iac9d47f20fff2e6fa415ada8bc17880b0b032591
Signed-off-by: leventecsanyi <levente.csanyi@est.tech>

6 files changed, 8 insertions, 10 deletions

diff --git a/cps-service/src/main/java/org/onap/cps/api/model/DataNode.java b/cps-service/src/main/java/org/onap/cps/api/model/DataNode.java
index be80b636ad..be559709f8 100644
--- a/cps-service/src/main/java/org/onap/cps/api/model/DataNode.java
+++ b/cps-service/src/main/java/org/onap/cps/api/model/DataNode.java
@@ -26,19 +26,18 @@ import java.io.Serializable;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
-import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
-@Setter(AccessLevel.PROTECTED)
+@Setter
 @Getter
 @EqualsAndHashCode
 public class DataNode implements Serializable {
 
     private static final long serialVersionUID = 1482619410918597467L;
 
-    DataNode() {}
+    public DataNode() {}
 
     private String dataspace;
     private String schemaSetName;
diff --git a/cps-service/src/main/java/org/onap/cps/api/model/DeltaReport.java b/cps-service/src/main/java/org/onap/cps/api/model/DeltaReport.java
index df642628d0..77d8d771c1 100644
--- a/cps-service/src/main/java/org/onap/cps/api/model/DeltaReport.java
+++ b/cps-service/src/main/java/org/onap/cps/api/model/DeltaReport.java
@@ -23,11 +23,10 @@ package org.onap.cps.api.model;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import java.io.Serializable;
 import java.util.Map;
-import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 
-@Setter(AccessLevel.PROTECTED)
+@Setter
 @Getter
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class DeltaReport {
@@ -36,7 +35,7 @@ public class DeltaReport {
     public static final String REMOVE_ACTION = "remove";
     public static final String REPLACE_ACTION = "replace";
 
-    DeltaReport() {}
+    public DeltaReport() {}
 
     private String action;
     private String xpath;
diff --git a/cps-service/src/main/java/org/onap/cps/impl/CpsDataServiceImpl.java b/cps-service/src/main/java/org/onap/cps/impl/CpsDataServiceImpl.java
index f2513173a6..653fd4803f 100644
--- a/cps-service/src/main/java/org/onap/cps/impl/CpsDataServiceImpl.java
+++ b/cps-service/src/main/java/org/onap/cps/impl/CpsDataServiceImpl.java
@@ -42,7 +42,6 @@ import org.onap.cps.api.CpsDeltaService;
 import org.onap.cps.api.exceptions.DataValidationException;
 import org.onap.cps.api.model.Anchor;
 import org.onap.cps.api.model.DataNode;
-import org.onap.cps.api.model.DataNodeBuilder;
 import org.onap.cps.api.model.DeltaReport;
 import org.onap.cps.api.parameters.FetchDescendantsOption;
 import org.onap.cps.cpspath.parser.CpsPathUtil;
diff --git a/cps-service/src/main/java/org/onap/cps/impl/CpsDeltaServiceImpl.java b/cps-service/src/main/java/org/onap/cps/impl/CpsDeltaServiceImpl.java
index 7a9d142506..d532001aec 100644
--- a/cps-service/src/main/java/org/onap/cps/impl/CpsDeltaServiceImpl.java
+++ b/cps-service/src/main/java/org/onap/cps/impl/CpsDeltaServiceImpl.java
@@ -32,7 +32,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.onap.cps.api.CpsDeltaService;
 import org.onap.cps.api.model.DataNode;
 import org.onap.cps.api.model.DeltaReport;
-import org.onap.cps.api.model.DeltaReportBuilder;
 import org.springframework.stereotype.Service;
 
 @Slf4j
diff --git a/cps-service/src/main/java/org/onap/cps/api/model/DataNodeBuilder.java b/cps-service/src/main/java/org/onap/cps/impl/DataNodeBuilder.java
index d509f53525..a78f3d9826 100644
--- a/cps-service/src/main/java/org/onap/cps/api/model/DataNodeBuilder.java
+++ b/cps-service/src/main/java/org/onap/cps/impl/DataNodeBuilder.java
@@ -20,7 +20,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.api.model;
+package org.onap.cps.impl;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -33,6 +33,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.onap.cps.api.exceptions.DataValidationException;
+import org.onap.cps.api.model.DataNode;
 import org.onap.cps.utils.YangUtils;
 import org.opendaylight.yangtools.yang.common.Ordering;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
diff --git a/cps-service/src/main/java/org/onap/cps/api/model/DeltaReportBuilder.java b/cps-service/src/main/java/org/onap/cps/impl/DeltaReportBuilder.java
index a8e922f3df..fdc2e939d6 100644
--- a/cps-service/src/main/java/org/onap/cps/api/model/DeltaReportBuilder.java
+++ b/cps-service/src/main/java/org/onap/cps/impl/DeltaReportBuilder.java
@@ -18,11 +18,12 @@
  *  ============LICENSE_END=========================================================
  */
 
-package org.onap.cps.api.model;
+package org.onap.cps.impl;
 
 import java.io.Serializable;
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
+import org.onap.cps.api.model.DeltaReport;
 
 @Slf4j
 public class DeltaReportBuilder {