[Java] Fixing codacy - ConcurrentHashMap (#221)

* feat: concurrent hash map

* fix: codacy

* fix: codacy

* fix: revert split up

* feat: revert transport

* fix: rever change

* fix: revert splitted

sdk-java/src/main/java/ly/count/sdk/java/Config.java

@@ -4,12 +4,12 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import ly.count.sdk.java.internal.CoreFeature;
 import ly.count.sdk.java.internal.Log;
 import ly.count.sdk.java.internal.LogCallback;
@@ -214,7 +214,7 @@ public String toString() {
      */
     protected boolean enableBackendMode = false;
 
-    protected final Map<String, String> metricOverride = new HashMap<>();
+    protected final Map<String, String> metricOverride = new ConcurrentHashMap<>();
 
     /**
      * Salt string for parameter tampering protection

sdk-java/src/main/java/ly/count/sdk/java/internal/CrashImpl.java

@@ -8,6 +8,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import ly.count.sdk.java.Crash;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -150,7 +151,7 @@ public Map<String, String> getSegments() {
                 return null;
             }
             JSONObject object = this.data.getJSONObject("_custom");
-            Map<String, String> map = new HashMap<>();
+            Map<String, String> map = new ConcurrentHashMap<>();
             Iterator<String> iterator = object.keys();
             while (iterator.hasNext()) {
                 String key = iterator.next();

sdk-java/src/main/java/ly/count/sdk/java/internal/Device.java

@@ -1,15 +1,15 @@
 package ly.count.sdk.java.internal;
 
 import com.sun.management.OperatingSystemMXBean;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.io.File;
 import java.lang.management.ManagementFactory;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * Class encapsulating most of device-specific logic: metrics, info, etc.
@@ -31,7 +31,7 @@ public class Device {
 
     private Log L;
 
-    private final Map<String, String> metricOverride = new HashMap<>();
+    private final Map<String, String> metricOverride = new ConcurrentHashMap<>();
 
     protected Device() {
         dev = this;

sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleBackendMode.java

@@ -8,6 +8,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -21,7 +22,7 @@ public class ModuleBackendMode extends ModuleBase {
     protected boolean disabledModule = false;
 
     protected int eventQSize = 0;
-    protected final Map<String, JSONArray> eventQueues = new HashMap<>();
+    protected final Map<String, JSONArray> eventQueues = new ConcurrentHashMap<>();
 
     final String[] userPredefinedKeys = { "name", "username", "email", "organization", "phone", "gender", "byear" };
 
@@ -181,8 +182,8 @@ private void recordUserPropertiesInternal(String deviceID, Map<String, Object> u
 
         removeInvalidDataFromSegments(userProperties);
 
-        Map<String, Object> userDetail = new HashMap<>();
-        Map<String, Object> customDetail = new HashMap<>();
+        Map<String, Object> userDetail = new ConcurrentHashMap<>();
+        Map<String, Object> customDetail = new ConcurrentHashMap<>();
         for (Map.Entry<String, Object> item : userProperties.entrySet()) {
             if (Arrays.stream(userPredefinedKeys).anyMatch(item.getKey()::equalsIgnoreCase)) {
                 userDetail.put(item.getKey(), item.getValue());

sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleDeviceIdCore.java

@@ -1,8 +1,8 @@
 package ly.count.sdk.java.internal;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 import ly.count.sdk.java.Config;
 import ly.count.sdk.java.Countly;
 
@@ -44,7 +44,7 @@ public String generate(InternalConfig config) {
         }
     }
 
-    private static final Map<Integer, DeviceIdGenerator> generators = new HashMap<>();
+    private static final Map<Integer, DeviceIdGenerator> generators = new ConcurrentHashMap<>();
 
     protected DeviceId deviceIdInterface;
 

sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleFeedback.java

@@ -1,10 +1,10 @@
 package ly.count.sdk.java.internal;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nullable;
 import ly.count.sdk.java.Countly;
 import org.json.JSONArray;
@@ -243,7 +243,7 @@ private void reportFeedbackWidgetManuallyInternal(CountlyFeedbackWidget widgetIn
             }
         }
 
-        Map<String, Object> segm = new HashMap<>();
+        Map<String, Object> segm = new ConcurrentHashMap<>();
         segm.put("platform", internalConfig.getSdkPlatform());
         segm.put("app_version", cachedAppVersion);
         segm.put("widget_id", widgetInfo.widgetId);

sdk-java/src/main/java/ly/count/sdk/java/internal/Params.java

@@ -3,9 +3,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -230,7 +230,7 @@ public String remove(final String key) {
      * @return map of the Params object
      */
     public Map<String, String> map() {
-        Map<String, String> map = new HashMap<>();
+        Map<String, String> map = new ConcurrentHashMap<>();
         List<String> pairs = new ArrayList<>(Arrays.asList(params.toString().split("&")));
         for (String pair : pairs) {
             String[] comps = pair.split("=");

sdk-java/src/main/java/ly/count/sdk/java/internal/SDKCore.java

@@ -2,11 +2,11 @@
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nullable;
 import ly.count.sdk.java.Config;
 
@@ -74,7 +74,7 @@ protected static void registerDefaultModuleMappings() {
     /**
      * Selected by config map of module mappings
      */
-    private static final Map<Integer, Class<? extends ModuleBase>> moduleMappings = new HashMap<>();
+    private static final Map<Integer, Class<? extends ModuleBase>> moduleMappings = new ConcurrentHashMap<>();
 
     protected static void registerModuleMapping(int feature, Class<? extends ModuleBase> cls) {
         if (cls != null) {
@@ -427,7 +427,7 @@ public void init(final InternalConfig givenConfig) {
         //setup and perform migrations
         MigrationHelper migrationHelper = new MigrationHelper(L);
         migrationHelper.setupMigrations(config.storageProvider);
-        Map<String, Object> migrationParams = new HashMap<>();
+        Map<String, Object> migrationParams = new ConcurrentHashMap<>();
         migrationParams.put("sdk_path", config.getSdkStorageRootDirectory());
         migrationHelper.applyMigrations(migrationParams);
 

sdk-java/src/main/java/ly/count/sdk/java/internal/Utils.java

@@ -17,10 +17,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Utility class
@@ -269,7 +269,7 @@ public static Map<String, String> fixSegmentKeysAndValues(final int keyLength, f
             return segments;
         }
 
-        Map<String, String> segmentation = new HashMap<>();
+        Map<String, String> segmentation = new ConcurrentHashMap<>();
 
         for (Map.Entry<String, String> entry : segments.entrySet()) {
             String k = entry.getKey();

sdk-java/src/test/java/ly/count/sdk/java/internal/ConfigTests.java

@@ -1,8 +1,8 @@
 package ly.count.sdk.java.internal;
 
 import java.net.URL;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import ly.count.sdk.java.Config;
 import org.junit.Assert;
 import org.junit.Test;
@@ -126,7 +126,7 @@ public void metricOverride() {
         Map<String, String> initialVals = internalConfig.getMetricOverride();
         Assert.assertEquals(0, initialVals.size());
 
-        Map<String, String> newVals = new HashMap<>();
+        Map<String, String> newVals = new ConcurrentHashMap<>();
         newVals.put("a", "1");
         newVals.put("b", "2");
 

sdk-java/src/test/java/ly/count/sdk/java/internal/DeviceTests.java

@@ -1,10 +1,9 @@
 package ly.count.sdk.java.internal;
 
-import org.json.JSONObject;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import org.junit.Assert;
 import org.junit.Test;
-import java.util.HashMap;
-import java.util.Map;
 
 public class DeviceTests {
 
@@ -13,7 +12,7 @@ public class DeviceTests {
      */
     @Test
     public void metricOverride_1() {
-        Map<String, String> newVals = new HashMap<>();
+        Map<String, String> newVals = new ConcurrentHashMap<>();
         newVals.put("a12345", "1qwer");
         newVals.put("b5678", "2sdfg");
 

sdk-java/src/test/java/ly/count/sdk/java/internal/EventImplTests.java

@@ -3,6 +3,7 @@
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Test;
@@ -110,7 +111,7 @@ public void recorderCalledAfterRecord() {
             Assert.assertEquals(true, eventImpl1.getSegment("test"));
         }, "test_event", L);
 
-        Map<String, Object> segmentation = new HashMap<>();
+        Map<String, Object> segmentation = new ConcurrentHashMap<>();
         segmentation.put("test", true);
 
         event.count = 5;
@@ -130,7 +131,7 @@ public void validateToJson() {
         EventImpl event = new EventImpl((event1) -> {
         }, "test_buy_event", L);
 
-        Map<String, Object> segmentation = new HashMap<>();
+        Map<String, Object> segmentation = new ConcurrentHashMap<>();
         segmentation.put("valid", false);
 
         event.duration = 34.0;
@@ -161,7 +162,7 @@ public void validateFromJson() {
         EventImpl event = new EventImpl((event1) -> {
         }, "test_sell_event", L);
 
-        Map<String, Object> segmentation = new HashMap<>();
+        Map<String, Object> segmentation = new ConcurrentHashMap<>();
         segmentation.put("sold", true);
 
         event.count = 3;
@@ -214,7 +215,7 @@ public void validateFromJson_toJson_segmentation() {
         segmentation.put("divisor", 0.2f);
         event.segmentation = segmentation;
 
-        Map<String, Object> expectedSegmentation = new HashMap<>();
+        Map<String, Object> expectedSegmentation = new ConcurrentHashMap<>();
         expectedSegmentation.put("sold", true);
         expectedSegmentation.put("price", BigDecimal.valueOf(9.43));
         expectedSegmentation.put("quantity", 3);
@@ -242,7 +243,7 @@ public void testGetters() {
         EventImpl event = new EventImpl((event1) -> {
         }, "test_getter_event", L);
 
-        Map<String, Object> segmentation = new HashMap<>();
+        Map<String, Object> segmentation = new ConcurrentHashMap<>();
         segmentation.put("get_func", 90);
 
         event.count = 47;
@@ -270,7 +271,7 @@ public void testSetters() {
         event.setDuration(78);
         event.setSum(46);
 
-        Map<String, String> segmentation = new HashMap<>();
+        Map<String, String> segmentation = new ConcurrentHashMap<>();
         segmentation.put("donated_amount", "37656387");
         event.setSegmentation(segmentation);
 

sdk-java/src/test/java/ly/count/sdk/java/internal/MigrationHelperTests.java

@@ -4,9 +4,9 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 import ly.count.sdk.java.Countly;
 import org.junit.After;
 import org.junit.Assert;
@@ -156,7 +156,7 @@ public void applyMigrations_legacyToLatest() {
         MigrationHelper migrationHelper = new MigrationHelper(mock(Log.class));
         migrationHelper.setupMigrations(storageProvider);
         Assert.assertEquals(0, migrationHelper.currentDataModelVersion); //legacy state
-        Map<String, Object> migrationParams = new HashMap<>();
+        Map<String, Object> migrationParams = new ConcurrentHashMap<>();
         migrationParams.put("sdk_path", TestUtils.getTestSDirectory());
         //apply migrations
         migrationHelper.applyMigrations(migrationParams);
@@ -179,7 +179,7 @@ public void applyMigrations_latestToLatest() throws IOException {
         migrationHelper.setupMigrations(storageProvider);
         Assert.assertEquals(expectedLatestSchemaVersion, migrationHelper.currentDataModelVersion); //latest state
         //run migration helper apply
-        migrationHelper.applyMigrations(new HashMap<>());
+        migrationHelper.applyMigrations(new ConcurrentHashMap<>());
         //check migration version is at the latest after apply both from class and file
         Assert.assertEquals(expectedLatestSchemaVersion, migrationHelper.currentDataModelVersion);
         Assert.assertEquals(expectedLatestSchemaVersion, TestUtils.getJsonStorageProperty(SDKStorage.key_migration_version));
@@ -203,7 +203,7 @@ public void applyMigrations_0to1() throws IOException {
         //run migration helper
         Assert.assertNull(storageProvider.getDeviceID());
         Assert.assertNull(storageProvider.getDeviceIdType());
-        Map<String, Object> migrationParams = new HashMap<>();
+        Map<String, Object> migrationParams = new ConcurrentHashMap<>();
         migrationParams.put("sdk_path", TestUtils.getTestSDirectory());
         Assert.assertTrue(migrationHelper.migration_DeleteConfigFile_01(migrationParams));
 
@@ -291,7 +291,7 @@ public void applyMigrations_1to2_nothingToMigrate() throws IOException {
         setDataVersionInConfigFile(1); // set previous data version
         initStorage();
 
-        Map<String, Object> migrationParams = new HashMap<>();
+        Map<String, Object> migrationParams = new ConcurrentHashMap<>();
         migrationParams.put("sdk_path", TestUtils.getTestSDirectory());
 
         MigrationHelper migrationHelper = new MigrationHelper(mock(Log.class));
@@ -319,7 +319,7 @@ public void applyMigrations_1to2_nullMigrationParams() throws IOException {
         Assert.assertEquals(1, migrationHelper.currentDataModelVersion);
         migrationHelper.logger = Mockito.spy(migrationHelper.logger);
 
-        Assert.assertFalse(migrationHelper.migration_UserImplFile_02(new HashMap<>()));
+        Assert.assertFalse(migrationHelper.migration_UserImplFile_02(new ConcurrentHashMap<>()));
         Assert.assertEquals(2, migrationHelper.currentDataModelVersion);
         Mockito.verify(migrationHelper.logger, Mockito.times(1)).d("[MigrationHelper] migration_UserImplFile_02, No files to delete, returning");
     }