re base code

[sdc.git] / openecomp-be / lib / openecomp-conflict-lib / openecomp-conflict-core / src / main / java / org / openecomp / conflicts / ItemMergeHandlerFactoryImpl.java

diff --git a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/ItemMergeHandlerFactoryImpl.java b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/ItemMergeHandlerFactoryImpl.java
index 1e3213a..3c879de 100644 (file)
--- a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/ItemMergeHandlerFactoryImpl.java
+++ b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/src/main/java/org/openecomp/conflicts/ItemMergeHandlerFactoryImpl.java
@@ -16,9 +16,6 @@
 
 package org.openecomp.conflicts;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
 import org.openecomp.conflicts.dao.ConflictsDaoFactory;
 import org.openecomp.conflicts.impl.VspMergeHandler;
 import org.openecomp.sdc.common.errors.CoreException;
@@ -28,6 +25,10 @@ import org.openecomp.sdc.versioning.AsdcItemManagerFactory;
 import org.openecomp.sdc.versioning.errors.EntityNotExistErrorBuilder;
 import org.openecomp.sdc.versioning.types.Item;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
 public class ItemMergeHandlerFactoryImpl extends ItemMergeHandlerFactory {
   // TODO: 11/1/2017 read this map from configuration, move Vsp merge handler to vsp lib, rearrange lib deps
   private static final Map<ItemType, ItemMergeHandler> MERGE_HANDLER_BY_ITEM_TYPE =