Move Services test cases to vendor projects

indexer-service-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/CronServiceImplTest.java

@@ -24,9 +24,9 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.opengroup.osdu.core.api.DpsHeaders;
 import org.opengroup.osdu.indexer.service.CronServiceImpl;
-import org.opengroup.osdu.indexer.util.IRequestInfo;
 import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
 import org.opengroup.osdu.is.core.model.IndexInfo;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
 import org.opengroup.osdu.is.core.service.IndicesService;
 import org.opengroup.osdu.is.core.util.Config;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;

indexer-service-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ElasticSettingServiceTest.java

@@ -19,20 +19,16 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.opengroup.osdu.core.api.DpsHeaders;
 import org.opengroup.osdu.core.multitenancy.TenantInfo;
 import org.opengroup.osdu.indexer.service.ElasticSettingServiceImpl;
 import org.opengroup.osdu.is.core.cache.ElasticCredentialsCache;
 import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
 import org.opengroup.osdu.is.core.model.ClusterSettings;
-import org.opengroup.osdu.is.core.persistence.ElasticRepository;
+import org.opengroup.osdu.is.core.provider.interfaces.persistence.ElasticRepository;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
 import org.opengroup.osdu.is.core.service.TenantInfoService;
 import org.opengroup.osdu.is.core.util.AppException;
-import org.opengroup.osdu.is.core.util.IHeadersInfo;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -74,7 +70,7 @@ public class ElasticSettingServiceTest {
         when(tenantInfo.getName()).thenReturn("tenant1");
         when(this.headersInfo.getPartitionId()).thenReturn("tenant1");
         when(this.tenantInfoService.getTenantInfo()).thenReturn(tenantInfo);
-        ReflectionTestUtils.setField( sut, "GAE_SERVICE", "indexer");
+        sut.GAE_SERVICE = "indexer";
         clusterSettings = ClusterSettings.builder().host(host).port(port).userNameAndPassword(credentials).build();
         cacheKey = String.format("%s-%s", GAE_SERVICE, tenantInfo.getName());
     }

indexer-service-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexCopyServiceImplTest.java

@@ -34,14 +34,14 @@ import org.opengroup.osdu.core.api.DpsHeaders;
 import org.opengroup.osdu.indexer.logging.AuditLogger;
 import org.opengroup.osdu.indexer.service.IndexCopyServiceImpl;
 import org.opengroup.osdu.indexer.service.IndexerMappingService;
-import org.opengroup.osdu.indexer.util.IRequestInfo;
 import org.opengroup.osdu.is.core.model.ClusterSettings;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
 import org.opengroup.osdu.is.core.service.ElasticSettingService;
 import org.opengroup.osdu.is.core.service.IndicesService;
 import org.opengroup.osdu.is.core.util.AppException;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.opengroup.osdu.is.core.util.ElasticIndexNameResolver;
-import org.opengroup.osdu.is.core.util.IHeadersInfo;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.test.context.junit4.SpringRunner;
 

indexer-service-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/ReindexServiceTest.java

@@ -28,15 +28,14 @@ import org.opengroup.osdu.indexer.model.RecordQueryResponse;
 import org.opengroup.osdu.indexer.model.RecordReindexRequest;
 import org.opengroup.osdu.indexer.service.ReindexServiceImpl;
 import org.opengroup.osdu.indexer.service.StorageService;
-import org.opengroup.osdu.indexer.util.IRequestInfo;
 import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
 import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.*;
 
 import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
 import static org.mockito.MockitoAnnotations.initMocks;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
 import static org.powermock.api.mockito.PowerMockito.when;

indexer-service-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/StorageServiceTest.java

@@ -28,11 +28,11 @@ import org.opengroup.osdu.indexer.model.RecordQueryResponse;
 import org.opengroup.osdu.indexer.model.RecordReindexRequest;
 import org.opengroup.osdu.indexer.model.Records;
 import org.opengroup.osdu.indexer.service.StorageServiceImpl;
-import org.opengroup.osdu.indexer.util.IRequestInfo;
 import org.opengroup.osdu.indexer.util.JobStatus;
 import org.opengroup.osdu.indexer.util.RecordInfo;
 import org.opengroup.osdu.is.core.httpclient.HttpResponse;
 import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
 import org.opengroup.osdu.is.core.service.UrlFetchService;
 import org.opengroup.osdu.is.core.util.AppException;
 import org.springframework.http.HttpStatus;

indexer-service-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/TenantInfoServiceTest.java

@@ -24,8 +24,8 @@ import org.opengroup.osdu.core.api.DpsHeaders;
 import org.opengroup.osdu.core.multitenancy.ITenantFactory;
 import org.opengroup.osdu.core.multitenancy.TenantInfo;
 import org.opengroup.osdu.indexer.service.TenantInfoServiceImpl;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
 import org.opengroup.osdu.is.core.util.AppException;
-import org.opengroup.osdu.is.core.util.IHeadersInfo;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.junit4.SpringRunner;
 

indexer-service-gcp/src/test/java/org/opengroup/osdu/indexer/service/CronServiceImplTest.java

@@ -23,7 +23,6 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.opengroup.osdu.core.api.DpsHeaders;
-import org.opengroup.osdu.indexer.util.IRequestInfo;
 import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
 import org.opengroup.osdu.is.core.model.IndexInfo;
 import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;

indexer-service-gcp/src/test/java/org/opengroup/osdu/indexer/service/ElasticSettingServiceTest.java

@@ -20,17 +20,15 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.opengroup.osdu.core.multitenancy.TenantInfo;
 import org.opengroup.osdu.is.core.cache.ElasticCredentialsCache;
 import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
 import org.opengroup.osdu.is.core.model.ClusterSettings;
 import org.opengroup.osdu.is.core.provider.interfaces.persistence.ElasticRepository;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
 import org.opengroup.osdu.is.core.service.TenantInfoService;
 import org.opengroup.osdu.is.core.util.AppException;
-import org.opengroup.osdu.is.core.util.IHeadersInfo;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -73,7 +71,7 @@ public class ElasticSettingServiceTest {
         when(tenantInfo.getName()).thenReturn("tenant1");
         when(this.headersInfo.getPartitionId()).thenReturn("tenant1");
         when(this.tenantInfoService.getTenantInfo()).thenReturn(tenantInfo);
-        ReflectionTestUtils.setField(sut, "GAE_SERVICE", "indexer");
+        sut.GAE_SERVICE = "indexer";
         clusterSettings = ClusterSettings.builder().host(host).port(port).userNameAndPassword(credentials).build();
         cacheKey = String.format("%s-%s", GAE_SERVICE, tenantInfo.getName());
     }

indexer-service-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexCopyServiceImplTest.java

@@ -33,8 +33,6 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.opengroup.osdu.core.api.DpsHeaders;
 import org.opengroup.osdu.indexer.logging.AuditLogger;
-import org.opengroup.osdu.core.api.DpsHeaders;
-import org.opengroup.osdu.indexer.util.IRequestInfo;
 import org.opengroup.osdu.is.core.model.ClusterSettings;
 import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
 import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
@@ -43,9 +41,7 @@ import org.opengroup.osdu.is.core.service.IndicesService;
 import org.opengroup.osdu.is.core.util.AppException;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.opengroup.osdu.is.core.util.ElasticIndexNameResolver;
-import org.opengroup.osdu.is.core.util.IHeadersInfo;
 import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.io.IOException;
@@ -55,7 +51,6 @@ import java.util.Map;
 import java.util.UUID;
 
 import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.powermock.api.mockito.PowerMockito.when;