pom fixes

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

@@ -20,11 +20,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.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.spi.coreis.IHeadersInfo;
+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.provider.interfaces.util.IHeadersInfo;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.junit4.SpringRunner;
 

provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/HeadersInfoGcpImplTest.java

@@ -19,10 +19,10 @@ 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.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.service.coreis.HeadersUtil;
+import org.opengroup.osdu.is.core.model.SlbHeaders;
+import org.opengroup.osdu.is.core.util.HeadersUtil;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.LinkedMultiValueMap;

provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImplTest.java

@@ -32,15 +32,15 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
-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.service.coreis.JaxRsDpsLog;
 import org.opengroup.osdu.indexer.service.TenantInfoServiceImpl;
-import org.opengroup.osdu.core.common.model.coreis.DeploymentEnvironment;
-import org.opengroup.osdu.core.common.model.coreis.IdToken;
-import org.opengroup.osdu.core.common.spi.coreis.IJwtCache;
-import org.opengroup.osdu.core.common.service.coreis.Config;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
+import org.opengroup.osdu.is.core.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.model.DeploymentEnvironment;
+import org.opengroup.osdu.is.core.model.IdToken;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.IJwtCache;
+import org.opengroup.osdu.is.core.util.AppException;
+import org.opengroup.osdu.is.core.util.Config;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.test.context.junit4.SpringRunner;
 

provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/TraceIdExtractorTest.java

@@ -16,7 +16,7 @@ package org.opengroup.osdu.indexer.util;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-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.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.LinkedMultiValueMap;

testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/util/IBMHTTPClient.java

+package org.opengroup.osdu.util;
+
+import lombok.ToString;
+import lombok.extern.java.Log;
+
+import java.io.IOException;
+
+@Log
+@ToString
+public class GCPHTTPClient extends HTTPClient {
+
+    private static String token = null;
+
+    @Override
+    public synchronized String getAccessToken() {
+        if(token == null) {
+            try {
+                token = "Bearer " + JwtTokenUtil.getAccessToken();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return token;
+    }
+}
\ No newline at end of file