Fixing Concurrency Issues with TypeMapper

test case demonstrating a thread-unsafe operation of IndexerMappingServiceImpl.getIndexMappingFromRecordSchema(..) and the fix for that

Conflicts:

indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceImpl.java

indexer-core/src/test/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceTest.java

@@ -14,32 +14,12 @@
 
 package org.opengroup.osdu.indexer.service;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockingDetails;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
-
 import com.google.gson.Gson;
-
-import java.io.IOException;
-
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
 import org.apache.http.StatusLine;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
-import org.elasticsearch.client.IndicesClient;
-import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.client.Response;
-import org.elasticsearch.client.RestClient;
-import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.client.*;
 import org.elasticsearch.client.indices.PutMappingRequest;
 import org.junit.Assert;
 import org.junit.Before;
@@ -49,6 +29,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 import org.mockito.invocation.Invocation;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.model.indexer.IndexSchema;
 import org.opengroup.osdu.core.common.model.search.RecordMetaAttribute;
@@ -56,7 +37,32 @@ import org.opengroup.osdu.core.common.search.ElasticIndexNameResolver;
 import org.opengroup.osdu.indexer.cache.PartitionSafeIndexCache;
 import org.opengroup.osdu.indexer.util.ElasticClientHandler;
 import org.opengroup.osdu.indexer.util.TypeMapper;
-import org.mockito.junit.MockitoJUnitRunner;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockingDetails;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
 
 @RunWith(MockitoJUnitRunner.class)
 public class IndexerMappingServiceTest {
@@ -252,8 +258,8 @@ public class IndexerMappingServiceTest {
             String dp1WksAuthorityMappingString = new Gson().toJson(((Map<String, Object>) dp1wksMapping.get("properties")).get("authority"));
             System.out.println(String.format("Kind: %s \nResult Authority Json: %s\nExpected Authority Json: %s",
                     kind, dp1WksAuthorityMappingString, "{\"type\":\"constant_keyword\",\"value\":\"dp1\"}"));
-            Assert.assertTrue("Authority Check Failed for " + kind, areJsonStringsEqual("{\"type\":\"constant_keyword\",\"value\":\"dp1\"}",dp1WksAuthorityMappingString));
-            Assert.assertTrue("Full mapping Check Failed for " + kind, areJsonStringsEqual(dp1MappingJsonExpected,(new Gson().toJson(dp1wksMapping))));
+            Assert.assertTrue("Authority Check Failed for " + kind, areJsonStringsEqual("{\"type\":\"constant_keyword\",\"value\":\"dp1\"}", dp1WksAuthorityMappingString));
+            Assert.assertTrue("Full mapping Check Failed for " + kind, areJsonStringsEqual(dp1MappingJsonExpected, (new Gson().toJson(dp1wksMapping))));
 
 
             //get & verify authority for first kind (osdu:wks..)
@@ -276,7 +282,7 @@ public class IndexerMappingServiceTest {
             IndexSchema emptyDataIndexSchema = IndexSchema.builder().kind(kind).type(type).metaSchema(getMetaAttributeMapping()).build();
             Map<String, Object> documentMapping = this.sut.getIndexMappingFromRecordSchema(emptyDataIndexSchema);
             String documentMappingJson = new Gson().toJson(documentMapping);
-            assertEquals(this.emptyDataValidMapping, documentMappingJson);
+            assertTrue(areJsonStringsEqual(this.emptyDataValidMapping, documentMappingJson));
         } catch (Exception e) {
             fail("Should not throw this exception" + e.getMessage());
         }