opt;

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/ObjectUtil.java

@@ -21,44 +21,38 @@ import java.util.List;
  */
 @Component
 public class ObjectUtil {
-    public static final LinkedList<Object[]> linkedListObj = new LinkedList<Object[]>();
-    public static final LinkedList<String> linkedListStr = new LinkedList<String>();
-    public static final HashMap<String, String> hashMapStringAndString = new HashMap<String, String>();
-    public static final HashMap<String, Object> hashMapStringAndObject = new HashMap<String, Object>();
-    public static final List<AdamEntersVo> arrayListObject = new ArrayList<>();
-    public static final LinkedMultiValueMap<String, String> linkedMultiValueMapStringAndString = new LinkedMultiValueMap<String, String>();
-    public static final BasicDBObject basicDBObject = new BasicDBObject();
+    private static final LinkedList<Object[]> linkedListObj = new LinkedList<Object[]>();
+    private static final LinkedList<String> linkedListStr = new LinkedList<String>();
+    private static final HashMap<String, String> hashMapStringAndString = new HashMap<String, String>();
+    private static final HashMap<String, Object> hashMapStringAndObject = new HashMap<String, Object>();
+    private static final ArrayList<AdamEntersVo> arrayListObject = new ArrayList<>();
+    private static final LinkedMultiValueMap<String, String> linkedMultiValueMapStringAndString = new LinkedMultiValueMap<String, String>();
+    private static final BasicDBObject basicDBObject = new BasicDBObject();
 
     public static final Object[] objectsArray = new Object[100];
 
     public static LinkedList<Object[]> cloneLinkedListObj() {
-        linkedListObj.clear();
-        return linkedListObj;
+        return (LinkedList<Object[]>) linkedListObj.clone();
     }
 
     public static LinkedList<String> cloneLinkedListStr() {
-        linkedListStr.clear();
-        return linkedListStr;
+        return (LinkedList<String>) linkedListStr.clone();
     }
 
     public static HashMap<String, String> cloneHashMapStringAndString() {
-        hashMapStringAndString.clear();
-        return hashMapStringAndString;
+        return (HashMap<String, String>) hashMapStringAndString.clone();
     }
 
     public static HashMap<String, Object> cloneHashMapStringAndObject() {
-        hashMapStringAndObject.clear();
-        return hashMapStringAndObject;
+        return (HashMap<String, Object>) hashMapStringAndObject.clone();
     }
 
-    public static List<AdamEntersVo> cloneArrayListObject() {
-        arrayListObject.clear();
-        return arrayListObject;
+    public static ArrayList<AdamEntersVo> cloneArrayListObject() {
+        return (ArrayList<AdamEntersVo>) arrayListObject.clone();
     }
 
     public static LinkedMultiValueMap<String, String> cloneLinkedMultiValueMapStringAndString() {
-        linkedMultiValueMapStringAndString.clear();
-        return linkedMultiValueMapStringAndString;
+        return linkedMultiValueMapStringAndString.clone();
     }
 
     public static Object[] cloneObjectsArray() {
@@ -66,7 +60,6 @@ public class ObjectUtil {
     }
 
     public static BasicDBObject cloneBasicDBObject() {
-        basicDBObject.clear();
-        return basicDBObject;
+        return (BasicDBObject) basicDBObject.clone();
     }
 }