diff options
| author |   Michael Lando <ml636r@att.com> | 2018-07-29 16:13:45 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2018-07-29 16:20:34 +0300 |
| commit | 5b593496b8f1b8e8be8d7d2dbcc223332e65a49b (patch) | |
| tree | 2f9dfc45191e723da69cf74be7829784e9741b94 /openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/impl/VspMergeHandler.java | |
| parent | 9200382f2ce7b4bb729aa287d0878004b2d2b4f9 (diff) | |
re base code
Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5
Issue-ID: SDC-1566
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/impl/VspMergeHandler.java')
| -rw-r--r-- | openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/impl/VspMergeHandler.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/impl/VspMergeHandler.java b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/impl/VspMergeHandler.java index 8a5a53f98b..0422f728ab 100644 --- a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/impl/VspMergeHandler.java +++ b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/impl/VspMergeHandler.java @@ -2,11 +2,7 @@ package org.openecomp.conflicts.impl; import org.openecomp.conflicts.ItemMergeHandler; import org.openecomp.conflicts.dao.ConflictsDao; -import org.openecomp.conflicts.types.Conflict; -import org.openecomp.conflicts.types.ConflictInfo; -import org.openecomp.conflicts.types.ConflictResolution; -import org.openecomp.conflicts.types.ItemVersionConflict; -import org.openecomp.conflicts.types.Resolution; +import org.openecomp.conflicts.types.*; import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.errors.ErrorCategory; import org.openecomp.sdc.common.errors.ErrorCode; @@ -18,12 +14,7 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.openecomp.sdc.datatypes.model.ElementType.NetworkPackage; -import static org.openecomp.sdc.datatypes.model.ElementType.OrchestrationTemplate; -import static org.openecomp.sdc.datatypes.model.ElementType.OrchestrationTemplateCandidate; -import static org.openecomp.sdc.datatypes.model.ElementType.OrchestrationTemplateCandidateContent; -import static org.openecomp.sdc.datatypes.model.ElementType.OrchestrationTemplateValidationData; -import static org.openecomp.sdc.datatypes.model.ElementType.VspModel; +import static org.openecomp.sdc.datatypes.model.ElementType.*; public class VspMergeHandler implements ItemMergeHandler { |