pom fixes

provider/indexer-azure/pom.xml

@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.opengroup.osdu.indexer</groupId>
         <artifactId>indexer-service</artifactId>
-        <version>1.0.2</version>
-        <relativePath>../..</relativePath>
+        <version>1.0.0</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>indexer-azure</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.0-SNAPSHOT</version>
     <name>indexer-azure</name>
     <description>Indexer Service Azure</description>
     <packaging>jar</packaging>
@@ -90,15 +90,11 @@
             <artifactId>applicationinsights-logging-logback</artifactId>
             <version>[2.0,)</version>
         </dependency>
-        <dependency>
-            <groupId>org.opengroup.osdu</groupId>
-            <artifactId>os-core-common</artifactId>
-            <version>0.0.8</version>
-        </dependency>
+
         <dependency>
             <groupId>org.opengroup.osdu.indexer</groupId>
             <artifactId>indexer-core</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.0</version>
         </dependency>
 
         <dependency>
@@ -135,11 +131,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>java-jwt</artifactId>
-            <version>3.8.1</version>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/IndexerAzureApplication.java

@@ -20,7 +20,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @SpringBootApplication
-@ComponentScan({"org.opengroup.osdu.core.common", "org.opengroup.osdu.indexer"})
+@ComponentScan({"org.opengroup.osdu.is.core", "org.opengroup.osdu.indexer"})
 public class IndexerAzureApplication {
 
     public static void main(String[] args) {

provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/AttributesCache.java

@@ -14,8 +14,8 @@
 
 package org.opengroup.osdu.indexer.azure.cache;
 
-import org.opengroup.osdu.core.common.model.core.cache.VmCache;
-import org.opengroup.osdu.core.common.spi.coreis.IAttributesCache;
+import org.opengroup.osdu.core.cache.VmCache;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.IAttributesCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 

provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/CosmosDBSchemaCache.java

@@ -15,8 +15,8 @@
 package org.opengroup.osdu.indexer.azure.cache;
 
 
-import org.opengroup.osdu.core.common.model.core.cache.VmCache;
-import org.opengroup.osdu.core.common.model.storage.Schema;
+import org.opengroup.osdu.core.api.storage.models.Schema;
+import org.opengroup.osdu.core.cache.VmCache;
 import org.springframework.stereotype.Component;
 
 @Component

provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/ElasticCredentialsCache.java

 package org.opengroup.osdu.indexer.azure.cache;
 
-import org.opengroup.osdu.core.common.model.core.cache.VmCache;
-import org.opengroup.osdu.core.common.model.core.ClusterSettings;
-import org.opengroup.osdu.core.common.spi.coreis.IElasticCredentialsCache;
+import org.opengroup.osdu.core.cache.VmCache;
+import org.opengroup.osdu.is.core.model.ClusterSettings;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.IElasticCredentialsCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 

provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/IndexCache.java

 package org.opengroup.osdu.indexer.azure.cache;
 
-import org.opengroup.osdu.core.common.model.core.cache.VmCache;
-import org.opengroup.osdu.core.common.spi.coreis.IIndexCache;
+import org.opengroup.osdu.core.cache.VmCache;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.IIndexCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 

provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/JwtCache.java

 package org.opengroup.osdu.indexer.azure.cache;
 
-import org.opengroup.osdu.core.common.model.core.cache.VmCache;
-import org.opengroup.osdu.core.common.model.coreis.IdToken;
-import org.opengroup.osdu.core.common.spi.coreis.IJwtCache;
+import org.opengroup.osdu.core.cache.VmCache;
+import org.opengroup.osdu.is.core.model.IdToken;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.IJwtCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 

provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/KindsCache.java

 package org.opengroup.osdu.indexer.azure.cache;
 
-import org.opengroup.osdu.core.common.model.core.cache.VmCache;
-import org.opengroup.osdu.core.common.spi.coreis.IKindsCache;
+import org.opengroup.osdu.core.cache.VmCache;
+import org.opengroup.osdu.is.core.provider.interfaces.cache.IKindsCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 

provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/SchemaCache.java

 package org.opengroup.osdu.indexer.azure.cache;
 
-import org.opengroup.osdu.core.common.model.core.cache.VmCache;
-import org.opengroup.osdu.core.common.spi.indexer.ISchemaCache;
+import org.opengroup.osdu.core.cache.VmCache;
+import org.opengroup.osdu.indexer.provider.interfaces.ISchemaCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 

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

@@ -14,8 +14,8 @@
 
 package org.opengroup.osdu.indexer.azure.di;
 
-import org.opengroup.osdu.core.common.model.core.DpsLog;
-import org.opengroup.osdu.core.common.service.core.Log;
+import org.opengroup.osdu.core.logging.DpsLog;
+import org.opengroup.osdu.core.logging.Log;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;

provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/EntitlementsFactoryAzure.java

@@ -14,9 +14,9 @@
 
 package org.opengroup.osdu.indexer.azure.di;
 
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.service.core.entitlements.IEntitlementsFactory;
-import org.opengroup.osdu.core.common.service.core.entitlements.IEntitlementsService;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.core.api.entitlements.IEntitlementsFactory;
+import org.opengroup.osdu.core.api.entitlements.IEntitlementsService;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 

provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/EntitlementsServiceAzure.java

@@ -17,11 +17,11 @@ package org.opengroup.osdu.indexer.azure.di;
 import com.microsoft.azure.spring.autoconfigure.aad.UserPrincipal;
 import org.apache.http.HttpStatus;
 
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.model.core.entitlements.*;
-import org.opengroup.osdu.core.common.service.core.entitlements.IEntitlementsService;
-import org.opengroup.osdu.core.common.model.core.entitlements.*;
-import org.opengroup.osdu.core.common.service.core.HttpResponse;
+import org.opengroup.osdu.core.api.DpsHeaders;
+import org.opengroup.osdu.core.api.entitlements.EntitlementsException;
+import org.opengroup.osdu.core.api.entitlements.IEntitlementsService;
+import org.opengroup.osdu.core.api.entitlements.models.*;
+import org.opengroup.osdu.core.httpclient.HttpResponse;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;

provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/di/TenantFactoryImpl.java

@@ -14,9 +14,9 @@
 
 package org.opengroup.osdu.indexer.azure.di;
 
-import org.opengroup.osdu.core.common.model.core.ICache;
-import org.opengroup.osdu.core.common.model.core.ITenantFactory;
-import org.opengroup.osdu.core.common.model.core.TenantInfo;
+import org.opengroup.osdu.core.cache.ICache;
+import org.opengroup.osdu.core.multitenancy.ITenantFactory;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 

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

@@ -15,10 +15,9 @@
 package org.opengroup.osdu.indexer.azure.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.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.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
@@ -31,7 +30,6 @@ public class TenantInfoFactory extends AbstractFactoryBean<TenantInfo> {
     @Inject
     private ITenantFactory tenantFactory;
     @Inject
-    @Qualifier("dpsHeaderFactorySearch")
     private DpsHeaders headers;
     @Override
     protected TenantInfo createInstance() throws Exception {

provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/persistence/ElasticRepositoryCosmosDB.java

@@ -16,12 +16,12 @@ package org.opengroup.osdu.indexer.azure.persistence;
 
 import org.apache.http.HttpStatus;
 
-import org.opengroup.osdu.core.common.model.core.TenantInfo;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
 import org.opengroup.osdu.indexer.azure.model.ElasticSettingSchema;
-import org.opengroup.osdu.core.common.model.core.ClusterSettings;
-import org.opengroup.osdu.core.common.spi.coreis.ElasticRepository;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
-import org.opengroup.osdu.core.common.service.coreis.Preconditions;
+import org.opengroup.osdu.is.core.model.ClusterSettings;
+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-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java

@@ -24,12 +24,12 @@ import com.microsoft.azure.servicebus.Message;
 import com.microsoft.azure.servicebus.TopicClient;
 import org.elasticsearch.common.Strings;
 
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.model.indexer.JobStatus;
-import org.opengroup.osdu.core.common.model.indexer.RecordStatus;
-import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.spi.indexer.IPublisher;
-import org.opengroup.osdu.core.common.model.coreis.RecordChangedMessages;
+import org.opengroup.osdu.core.api.DpsHeaders;
+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.is.core.logging.JaxRsDpsLog;
+import org.opengroup.osdu.is.core.model.RecordChangedMessages;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 

provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/HeadersInfoAzureImpl.java

@@ -15,11 +15,10 @@
 package org.opengroup.osdu.indexer.azure.util;
 
 import lombok.extern.java.Log;
-import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-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.core.api.DpsHeaders;
+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.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
@@ -35,7 +34,6 @@ import java.util.stream.Collectors;
 public class HeadersInfoAzureImpl implements IHeadersInfo {
 
     @Inject
-    @Qualifier("dpsHeaderFactorySearch")
     private DpsHeaders headersMap;
 
     @Value("${indexer.queue.key}")

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

@@ -16,15 +16,13 @@ package org.opengroup.osdu.indexer.azure.util;
 
 import com.google.common.base.Strings;
 import org.apache.http.HttpStatus;
-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.IHeadersInfo;
-import org.opengroup.osdu.core.common.spi.coreis.IRequestInfo;
-import org.opengroup.osdu.core.common.spi.coreis.IServiceAccountJwtClient;
-import org.opengroup.osdu.core.common.model.coreis.AppException;
-import org.springframework.beans.factory.annotation.Qualifier;
+import org.opengroup.osdu.core.api.DpsHeaders;
+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.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
@@ -32,7 +30,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;
 import static org.opengroup.osdu.indexer.azure.util.HeadersInfoAzureImpl.INDEXER_QUEUE_KEY;
 
 
@@ -41,7 +39,6 @@ import static org.opengroup.osdu.indexer.azure.util.HeadersInfoAzureImpl.INDEXER
 public class RequestInfoImpl implements IRequestInfo {
 
     @Inject
-    @Qualifier("dpsHeaderFactorySearch")
     private DpsHeaders dpsHeaders;
 
     @Inject
@@ -50,7 +47,6 @@ public class RequestInfoImpl implements IRequestInfo {
     private IServiceAccountJwtClient serviceAccountJwtClient;
 
     @Inject
-    @Qualifier("TenantInfoFactorySearch")
     private TenantInfo tenantInfo;
 
     @Value("${DEPLOYMENT_ENVIRONMENT}")

provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/util/ServiceAccountJwtClientImpl.java

@@ -20,18 +20,17 @@ import com.microsoft.aad.adal4j.AuthenticationContext;
 import com.microsoft.aad.adal4j.AuthenticationResult;
 import com.microsoft.aad.adal4j.ClientCredential;
 import org.apache.http.HttpStatus;
-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.api.DpsHeaders;
+import org.opengroup.osdu.core.multitenancy.ITenantFactory;
+import org.opengroup.osdu.core.multitenancy.TenantInfo;
 import org.opengroup.osdu.indexer.azure.model.AADConfiguration;
 
-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.IHeadersInfo;
-import org.opengroup.osdu.core.common.spi.coreis.IServiceAccountJwtClient;
-import org.springframework.beans.factory.annotation.Qualifier;
+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.IHeadersInfo;
+import org.opengroup.osdu.is.core.provider.interfaces.util.IServiceAccountJwtClient;
+import org.opengroup.osdu.is.core.util.AppException;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
@@ -51,7 +50,6 @@ public class ServiceAccountJwtClientImpl implements IServiceAccountJwtClient {
     @Inject
     private IHeadersInfo headersInfoAzure;
     @Inject
-    @Qualifier("dpsHeaderFactorySearch")
     private DpsHeaders dpsHeaders;
     @Inject
     private IJwtCache cacheService;

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

@@ -22,13 +22,13 @@ 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.indexer.service.CronServiceImpl;
-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.common.service.coreis.Config;
+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;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.test.context.junit4.SpringRunner;