Sabarish K R E · David Diederich
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/IndexerMappingServiceTest.java
    }

+    @Test
+    public void should_returnCorrectMapping_duringConcurrentCalls() throws Exception {
+
+        /* We attempt to call the function IndexerMappingServiceImpl.getIndexMappingFromRecordSchema concurrently for
+         * two differ kinds concurrently. You can observe that this operation is not threadsafe, and one of the two
+         * responses will have an incorrect value for the authority. Kind 1 either has Kind 2's authority or vice-versa.
+         */
+
+        Gson gson = new GsonBuilder().serializeNulls().create();
+        ExecutorService executor = Executors.newFixedThreadPool(10);
+
+        int totalRuns = 10;
+        for (int x = 0; x < totalRuns; x++) {
+            System.out.println(String.format("------- Run %d/%d ----", (x + 1), totalRuns));