Merge "Refactoring java packages" into tosca-poc

4 files changed, 4 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index a159c8426..31aad71b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/target
+target
 .settings
 .classpath
 .project
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java
index e18af7188..5fac9a213 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataExecutor.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP CLAMP
  * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,7 +30,6 @@ import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.PostConstruct;
 import org.onap.policy.clamp.clds.tosca.update.execution.cds.ToscaMetadataCdsProcess;
-import org.onap.policy.clamp.clds.tosca.update.execution.target.ToscaMetadataTargetProcess;
 import org.onap.policy.clamp.loop.service.Service;
 import org.onap.policy.clamp.tosca.DictionaryService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/target/ToscaMetadataTargetProcess.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataTargetProcess.java
index dcfd0594f..0ffd86f47 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/target/ToscaMetadataTargetProcess.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/ToscaMetadataTargetProcess.java
@@ -21,13 +21,11 @@
  *
  */
 
-package org.onap.policy.clamp.clds.tosca.update.execution.target;
+package org.onap.policy.clamp.clds.tosca.update.execution;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.google.gson.JsonObject;
-import org.onap.policy.clamp.clds.tosca.update.execution.ToscaMetadataExecutor;
-import org.onap.policy.clamp.clds.tosca.update.execution.ToscaMetadataProcess;
 import org.onap.policy.clamp.loop.service.Service;
 import org.onap.policy.clamp.policy.operational.OperationalPolicyRepresentationBuilder;
 
@@ -36,6 +34,7 @@ import org.onap.policy.clamp.policy.operational.OperationalPolicyRepresentationB
  */
 public class ToscaMetadataTargetProcess extends ToscaMetadataProcess {
 
+
     private static final EELFLogger logger =
             EELFManager.getInstance().getLogger(ToscaMetadataTargetProcess.class);
 
diff --git a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java
index 4ad47422c..c80c91170 100644
--- a/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java
+++ b/src/main/java/org/onap/policy/clamp/clds/tosca/update/execution/cds/ToscaMetadataCdsProcess.java
@@ -31,9 +31,7 @@ import com.google.gson.JsonObject;
 import java.util.Map;
 import java.util.Set;
 import org.onap.policy.clamp.clds.tosca.ToscaSchemaConstants;
-import org.onap.policy.clamp.clds.tosca.ToscaSchemaConstants;
 import org.onap.policy.clamp.clds.tosca.update.execution.ToscaMetadataProcess;
-import org.onap.policy.clamp.clds.tosca.update.execution.target.ToscaMetadataTargetProcess;
 import org.onap.policy.clamp.loop.service.Service;