pom fixes

provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/DpsLogFactory.java

@@ -14,8 +14,8 @@
 
 package org.opengroup.osdu.indexer.di;
 
-import org.opengroup.osdu.core.common.model.core.DpsLog;
 import org.opengroup.osdu.core.gcp.logging.logger.AppEngineLoggingProvider;
+import org.opengroup.osdu.core.logging.DpsLog;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;

provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/TenantFactoryService.java

@@ -15,8 +15,8 @@
 package org.opengroup.osdu.indexer.di;
 
 import lombok.extern.java.Log;
-import org.opengroup.osdu.core.common.model.core.ITenantFactory;
 import org.opengroup.osdu.core.gcp.multitenancy.TenantFactory;
+import org.opengroup.osdu.core.multitenancy.ITenantFactory;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;

provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/TenantInfoFactory.java

 package org.opengroup.osdu.indexer.di;
 
 import lombok.extern.java.Log;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.model.core.ITenantFactory;
-import org.opengroup.osdu.core.common.model.core.TenantInfo;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.core.multitenancy.ITenantFactory;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;

provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/kms/KmsClient.java

@@ -25,8 +25,8 @@ import com.google.api.services.cloudkms.v1.model.DecryptRequest;
 import com.google.api.services.cloudkms.v1.model.DecryptResponse;
 import com.google.api.services.cloudkms.v1.model.EncryptRequest;
 import com.google.api.services.cloudkms.v1.model.EncryptResponse;
-import org.opengroup.osdu.core.common.spi.coreis.IKmsClient;
-import org.opengroup.osdu.core.common.service.coreis.Preconditions;
+import org.opengroup.osdu.is.core.provider.interfaces.kms.IKmsClient;
+import org.opengroup.osdu.is.core.util.Preconditions;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;

provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/middleware/IndexFilter.java

@@ -3,12 +3,11 @@ package org.opengroup.osdu.indexer.middleware;
 import com.google.common.base.Strings;
 import lombok.extern.java.Log;
 import org.apache.http.HttpStatus;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
-import org.opengroup.osdu.core.common.service.core.ResponseHeaders;
-import org.opengroup.osdu.core.common.model.coreis.DeploymentEnvironment;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
-import org.springframework.beans.factory.annotation.Qualifier;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.core.headers.ResponseHeaders;
+import org.opengroup.osdu.is.core.model.DeploymentEnvironment;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Component;
@@ -27,7 +26,6 @@ import java.util.Map;
 public class IndexFilter implements Filter {
 
     @Inject
-    @Qualifier("dpsHeaderFactorySearch")
     private DpsHeaders dpsHeaders;
 
     @Inject

provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/DatastoreCredential.java

@@ -26,9 +26,9 @@ import com.google.auth.oauth2.AccessToken;
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.gson.JsonObject;
 import org.apache.commons.lang3.time.DateUtils;
-import org.opengroup.osdu.core.common.model.core.TenantInfo;
-import org.opengroup.osdu.core.common.model.core.cryptographic.Crc32c;
 import org.opengroup.osdu.indexer.cache.DatastoreCredentialCache;
+import org.opengroup.osdu.core.cryptographic.Crc32c;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
 
 import java.util.Date;
 

provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/DatastoreFactory.java

@@ -19,8 +19,8 @@ import com.google.cloud.TransportOptions;
 import com.google.cloud.datastore.Datastore;
 import com.google.cloud.datastore.DatastoreOptions;
 import com.google.cloud.http.HttpTransportOptions;
-import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.opengroup.osdu.indexer.cache.DatastoreCredentialCache;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
 import org.springframework.stereotype.Component;
 import org.threeten.bp.Duration;
 

provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/persistence/ElasticRepositoryDatastore.java

@@ -20,12 +20,12 @@ import com.google.cloud.datastore.Entity;
 import com.google.cloud.datastore.Key;
 import lombok.extern.java.Log;
 import org.apache.http.HttpStatus;
-import org.opengroup.osdu.core.common.model.core.ClusterSettings;
-import org.opengroup.osdu.core.common.model.core.TenantInfo;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
-import org.opengroup.osdu.core.common.spi.coreis.IKmsClient;
-import org.opengroup.osdu.core.common.spi.coreis.ElasticRepository;
-import org.opengroup.osdu.core.common.service.coreis.Preconditions;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
+import org.opengroup.osdu.is.core.model.ClusterSettings;
+import org.opengroup.osdu.is.core.provider.interfaces.kms.IKmsClient;
+import org.opengroup.osdu.is.core.provider.interfaces.persistence.ElasticRepository;
+import org.opengroup.osdu.is.core.util.AppException;
+import org.opengroup.osdu.is.core.util.Preconditions;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import javax.inject.Inject;

provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/publish/PublisherImpl.java

@@ -27,15 +27,15 @@ import lombok.extern.java.Log;
 import org.apache.http.HttpStatus;
 import org.elasticsearch.common.Strings;
 
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.model.core.ITenantFactory;
-import org.opengroup.osdu.core.common.model.core.TenantInfo;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
-import org.opengroup.osdu.core.common.model.indexer.JobStatus;
-import org.opengroup.osdu.core.common.model.indexer.RecordStatus;
-import org.opengroup.osdu.core.common.spi.indexer.IPublisher;
+import org.opengroup.osdu.indexer.model.RecordStatus;
+import org.opengroup.osdu.indexer.provider.interfaces.IPublisher;
+import org.opengroup.osdu.indexer.util.JobStatus;
+import org.opengroup.osdu.core.api.DpsHeaders;
 import org.opengroup.osdu.core.gcp.PubSub.PubSubExtensions;
-import org.opengroup.osdu.core.common.model.coreis.DeploymentEnvironment;
+import org.opengroup.osdu.core.multitenancy.ITenantFactory;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
+import org.opengroup.osdu.is.core.model.DeploymentEnvironment;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;

provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/HeadersInfoGcpImpl.java

@@ -16,12 +16,11 @@ package org.opengroup.osdu.indexer.util;
 
 import com.google.common.base.Strings;
 import lombok.extern.java.Log;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
+import org.opengroup.osdu.core.api.DpsHeaders;
 import org.opengroup.osdu.core.gcp.model.AppEngineHeaders;
-import org.opengroup.osdu.core.common.model.coreis.SlbHeaders;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
-import org.opengroup.osdu.core.common.service.coreis.Preconditions;
-import org.springframework.beans.factory.annotation.Qualifier;
+import org.opengroup.osdu.is.core.model.SlbHeaders;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
+import org.opengroup.osdu.is.core.util.Preconditions;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
@@ -36,7 +35,6 @@ import java.util.stream.Collectors;
 public class HeadersInfoGcpImpl implements IHeadersInfo {
 
     @Inject
-    @Qualifier("dpsHeaderFactorySearch")
     private DpsHeaders headersMap;
 
     private static final HashSet<String> FORBIDDEN_FROM_LOGGING = new HashSet<>();

provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/RequestInfoImpl.java

@@ -3,16 +3,15 @@ package org.opengroup.osdu.indexer.util;
 import com.google.common.base.Strings;
 import lombok.extern.java.Log;
 import org.apache.http.HttpStatus;
-import org.opengroup.osdu.core.common.model.core.Constants;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.model.core.TenantInfo;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
-import org.opengroup.osdu.core.common.model.coreis.DeploymentEnvironment;
-import org.opengroup.osdu.core.common.spi.coreis.IServiceAccountJwtClient;
+import org.opengroup.osdu.core.api.DpsHeaders;
 import org.opengroup.osdu.core.gcp.model.AppEngineHeaders;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
-import org.springframework.beans.factory.annotation.Qualifier;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
+import org.opengroup.osdu.is.core.model.DeploymentEnvironment;
+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.provider.interfaces.util.IServiceAccountJwtClient;
+import org.opengroup.osdu.is.core.util.AppException;
+import org.opengroup.osdu.is.core.util.Constants;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
@@ -20,7 +19,7 @@ import org.springframework.web.context.annotation.RequestScope;
 import javax.inject.Inject;
 import java.util.Map;
 
-import static org.opengroup.osdu.core.common.model.core.DpsHeaders.AUTHORIZATION;
+import static org.opengroup.osdu.core.api.DpsHeaders.AUTHORIZATION;
 
 
 @Log
@@ -29,7 +28,6 @@ import static org.opengroup.osdu.core.common.model.core.DpsHeaders.AUTHORIZATION
 public class RequestInfoImpl implements IRequestInfo {
 
     @Inject
-    @Qualifier("dpsHeaderFactorySearch")
     private DpsHeaders dpsHeaders;
 
     @Inject
@@ -38,7 +36,6 @@ public class RequestInfoImpl implements IRequestInfo {
     private IServiceAccountJwtClient serviceAccountJwtClient;
 
     @Inject
-    @Qualifier("TenantInfoFactorySearch")
     private TenantInfo tenantInfo;
 
     @Value("${DEPLOYMENT_ENVIRONMENT}")

provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImpl.java

@@ -38,15 +38,14 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.model.core.ITenantFactory;
-import org.opengroup.osdu.core.common.model.core.TenantInfo;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.model.coreis.IdToken;
-import org.opengroup.osdu.core.common.spi.coreis.IJwtCache;
-import org.opengroup.osdu.core.common.spi.coreis.IServiceAccountJwtClient;
-import org.springframework.beans.factory.annotation.Qualifier;
+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.is.core.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.model.IdToken;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.IJwtCache;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IServiceAccountJwtClient;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
@@ -77,7 +76,6 @@ public class ServiceAccountJwtGcpClientImpl implements IServiceAccountJwtClient
     @Inject
     private JaxRsDpsLog log;
     @Inject
-    @Qualifier("dpsHeaderFactorySearch")
     private DpsHeaders dpsHeaders;
 
     @Value("${GOOGLE_AUDIENCES}")

provider/indexer-gcp/src/main/resources/application.properties

@@ -23,8 +23,8 @@ REDIS_SEARCH_PORT=6379
 DEFAULT_DATA_COUNTRY=US
 
 AUTHORIZE_API=https://entitlements-dot-opendes.appspot.com/entitlements/v1
-LEGALTAG_API=https://os-legal-dot-opendes.appspot.com/api/legal/v1
-CRS_API=https://crs-converter-gae-dot-opendes.appspot.com/api/crs/v1
+LEGALTAG_API=https://legal-dot-opendes.appspot.com/api/legal/v1
+CRS_API=https://crs-converter-dot-opendes.appspot.com/api/crs/v1
 
 
 #Default Cache Settings
@@ -44,8 +44,8 @@ CRON_EMPTY_INDEX_CLEANUP_THRESHOLD_DAYS=7
 GOOGLE_CLOUD_PROJECT=opendes
 GAE_SERVICE=indexer
 
-INDEXER_HOST=os-indexer-dot-opendes.appspot.com
-STORAGE_HOSTNAME=os-storage-dot-opendes.appspot.com
+#INDEXER_HOST=os-indexer-dot-opendes.appspot.com
+#STORAGE_HOSTNAME=os-storage-dot-opendes.appspot.com
 
 KEY_RING=csqp
 KMS_KEY=searchService

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

@@ -21,11 +21,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.model.coreis.IndexInfo;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
-import org.opengroup.osdu.core.common.service.coreis.IndicesService;
+import org.opengroup.osdu.core.api.DpsHeaders;
+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.ElasticClientHandler;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.test.context.junit4.SpringRunner;

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

@@ -19,16 +19,14 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.core.ClusterSettings;
-import org.opengroup.osdu.core.common.model.core.TenantInfo;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.coreis.IElasticCredentialsCache;
-import org.opengroup.osdu.core.common.spi.coreis.ElasticRepository;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
-import org.opengroup.osdu.core.common.service.coreis.TenantInfoService;
-import org.opengroup.osdu.indexer.IndexerApplication;
-import org.springframework.boot.test.context.SpringBootTest;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
+import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.model.ClusterSettings;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.IElasticCredentialsCache;
+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.springframework.test.context.junit4.SpringRunner;
 
 import static org.junit.Assert.assertEquals;

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

@@ -31,16 +31,16 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatchers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.core.ClusterSettings;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
-import org.opengroup.osdu.core.common.model.indexer.AuditLogger;
-import org.opengroup.osdu.core.common.spi.coreis.IHeadersInfo;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.indexer.logging.AuditLogger;
+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.core.common.service.coreis.IndicesService;
+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.core.common.service.coreis.ElasticIndexNameResolver;
+import org.opengroup.osdu.is.core.util.ElasticIndexNameResolver;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.test.context.junit4.SpringRunner;
 

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

@@ -31,9 +31,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
-import org.opengroup.osdu.core.common.model.indexer.IndexSchema;
-import org.opengroup.osdu.core.common.model.coreis.RecordMetaAttribute;
+import org.opengroup.osdu.indexer.model.IndexSchema;
+import org.opengroup.osdu.is.core.model.RecordMetaAttribute;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.opengroup.osdu.is.core.util.ElasticClientHandler;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;

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

@@ -22,15 +22,15 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
-import org.opengroup.osdu.core.common.model.indexer.OperationType;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.indexer.ISchemaCache;
-import org.opengroup.osdu.core.common.model.indexer.IndexSchema;
-import org.opengroup.osdu.core.common.model.coreis.RequestStatus;
-import org.opengroup.osdu.core.common.service.coreis.IndicesService;
+import org.opengroup.osdu.indexer.model.IndexSchema;
+import org.opengroup.osdu.indexer.model.OperationType;
+import org.opengroup.osdu.indexer.provider.interfaces.ISchemaCache;
+import org.opengroup.osdu.is.core.httpclient.RequestStatus;
+import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+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.core.common.service.coreis.ElasticIndexNameResolver;
+import org.opengroup.osdu.is.core.util.ElasticIndexNameResolver;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.test.context.junit4.SpringRunner;
 

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

@@ -21,12 +21,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.model.indexer.RecordQueryResponse;
-import org.opengroup.osdu.core.common.model.indexer.RecordReindexRequest;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.indexer.model.RecordQueryResponse;
+import org.opengroup.osdu.indexer.model.RecordReindexRequest;
 import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
+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.*;

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

@@ -23,17 +23,17 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
-import org.opengroup.osdu.core.common.model.indexer.JobStatus;
-import org.opengroup.osdu.core.common.model.indexer.RecordInfo;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.model.coreis.HttpResponse;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
-import org.opengroup.osdu.core.common.service.coreis.UrlFetchService;
-import org.opengroup.osdu.core.common.model.indexer.RecordQueryResponse;
-import org.opengroup.osdu.core.common.model.indexer.RecordReindexRequest;
-import org.opengroup.osdu.core.common.model.indexer.Records;
+import org.opengroup.osdu.core.api.DpsHeaders;
+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.opengroup.osdu.indexer.model.RecordQueryResponse;
+import org.opengroup.osdu.indexer.model.RecordReindexRequest;
+import org.opengroup.osdu.indexer.model.Records;
+import org.opengroup.osdu.indexer.util.JobStatus;
+import org.opengroup.osdu.indexer.util.RecordInfo;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.util.ReflectionTestUtils;