diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/provider/interfaces/IPublisher.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/provider/interfaces/IPublisher.java new file mode 100644 index 0000000000000000000000000000000000000000..2c2fc494da76c8a624862d796df22d4af3795300 --- /dev/null +++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/provider/interfaces/IPublisher.java @@ -0,0 +1,9 @@ +package org.opengroup.osdu.indexer.provider.interfaces; + +import org.opengroup.osdu.core.common.model.core.DpsHeaders; +import org.opengroup.osdu.core.common.model.indexer.JobStatus; + +public interface IPublisher { + + public void publishStatusChangedTagsToTopic(DpsHeaders headers, JobStatus indexerBatchStatus) throws Exception; +} diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/provider/interfaces/ISchemaCache.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/provider/interfaces/ISchemaCache.java new file mode 100644 index 0000000000000000000000000000000000000000..2ffd1fa0fb1419a330d4b8fa1f66bb6191b27236 --- /dev/null +++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/provider/interfaces/ISchemaCache.java @@ -0,0 +1,6 @@ +package org.opengroup.osdu.indexer.provider.interfaces; + +import org.opengroup.osdu.core.common.model.core.ICache; + +public interface ISchemaCache <String,V> extends ICache<String, V> { +} diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java index 7178261ed2c92cb591c51a2602c02caaa74cb315..0285fc5444d565c7b79de17efe1eec692cac2173 100644 --- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java +++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexSchemaServiceImpl.java @@ -27,7 +27,7 @@ import org.opengroup.osdu.core.common.model.indexer.IndexSchema; import org.opengroup.osdu.core.common.model.indexer.OperationType; import org.opengroup.osdu.core.common.model.indexer.Schema; import org.opengroup.osdu.core.common.model.indexer.StorageType; -import org.opengroup.osdu.core.common.spi.indexer.ISchemaCache; +import org.opengroup.osdu.indexer.provider.interfaces.ISchemaCache; import org.opengroup.osdu.indexer.util.TypeMapper; import org.opengroup.osdu.core.common.model.coreis.RequestStatus; import org.opengroup.osdu.core.common.model.coreis.RecordMetaAttribute; diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java index 644e5a2b952e86b70649eb08442cc54655d8614f..c94d139e2f0a59a7d52c5b9714f8d10d40ab4b3d 100644 --- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java +++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java @@ -36,7 +36,7 @@ import org.opengroup.osdu.core.common.model.AppException; import org.opengroup.osdu.core.common.model.indexer.*; import org.opengroup.osdu.core.common.model.storage.ConversionStatus; import org.opengroup.osdu.core.common.service.coreis.JaxRsDpsLog; -import org.opengroup.osdu.core.common.spi.indexer.IPublisher; +import org.opengroup.osdu.indexer.provider.interfaces.IPublisher; import org.opengroup.osdu.indexer.util.IndexerQueueTaskBuilder; import org.opengroup.osdu.core.common.model.coreis.RequestStatus; import org.opengroup.osdu.core.common.model.coreis.RecordChangedMessages; diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/SchemaCacheImpl.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/SchemaCacheImpl.java index 9434ed3b67731f362a827631ac62794fcafe694c..609fb09173db281297e07ae1e8ec7ff9d28f0060 100644 --- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/SchemaCacheImpl.java +++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/cache/SchemaCacheImpl.java @@ -15,7 +15,7 @@ package org.opengroup.osdu.indexer.aws.cache; import org.opengroup.osdu.core.common.model.core.cache.RedisCache; -import org.opengroup.osdu.core.common.spi.indexer.ISchemaCache; +import org.opengroup.osdu.indexer.provider.interfaces.ISchemaCache; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/publish/PublisherImpl.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/publish/PublisherImpl.java index 273fb5d19a1c0988f891bafd2bd92671095e3492..019c09eebea48864285c2265c59fb0a1832a4077 100644 --- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/publish/PublisherImpl.java +++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/publish/PublisherImpl.java @@ -20,7 +20,7 @@ import com.amazonaws.services.sns.AmazonSNS; import org.opengroup.osdu.core.common.model.core.DpsHeaders; import org.opengroup.osdu.core.aws.sns.AmazonSNSConfig; import org.opengroup.osdu.core.aws.sns.PublishRequestBuilder; -import org.opengroup.osdu.core.common.spi.indexer.IPublisher; +import org.opengroup.osdu.indexer.provider.interfaces.IPublisher; import org.opengroup.osdu.core.common.model.indexer.JobStatus; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/SchemaCache.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/SchemaCache.java index 77dc983f7946dfe97e7740ffe0c91647a61ae326..8ac913814f110e00d1d69846509df74b00f00f0a 100644 --- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/SchemaCache.java +++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/cache/SchemaCache.java @@ -1,7 +1,7 @@ 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.indexer.provider.interfaces.ISchemaCache; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java index 6aa81bcc627d7f176cda7a10395311c7dccd972a..be80fa344e698d90dab3c09edbb150668eae106c 100644 --- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java +++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/publish/PublisherImpl.java @@ -28,7 +28,7 @@ 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.indexer.provider.interfaces.IPublisher; import org.opengroup.osdu.core.common.model.coreis.RecordChangedMessages; import org.springframework.stereotype.Component; import org.springframework.web.context.annotation.RequestScope; diff --git a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerSchemaServiceTest.java b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerSchemaServiceTest.java index 800d73b0fbd123ebb2c39f0bdfeca4bcaedaa764..19cec3eaeb682cc494bf450f207aa1370af49717 100644 --- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerSchemaServiceTest.java +++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/service/IndexerSchemaServiceTest.java @@ -25,7 +25,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.opengroup.osdu.core.common.model.indexer.IndexSchema; import org.opengroup.osdu.core.common.model.indexer.OperationType; -import org.opengroup.osdu.core.common.spi.indexer.ISchemaCache; +import org.opengroup.osdu.indexer.provider.interfaces.ISchemaCache; import org.opengroup.osdu.indexer.service.IndexSchemaServiceImpl; import org.opengroup.osdu.indexer.service.IndexerMappingService; import org.opengroup.osdu.indexer.service.StorageService; diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/SchemaCache.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/SchemaCache.java index aab7acb542a7f82bf3a627a0cb245fca0e0cf0ff..bf07123ea3311d429175524efab35c3ba10c165d 100644 --- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/SchemaCache.java +++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/cache/SchemaCache.java @@ -1,7 +1,7 @@ package org.opengroup.osdu.indexer.cache; import org.opengroup.osdu.core.common.model.core.cache.RedisCache; -import org.opengroup.osdu.core.common.spi.indexer.ISchemaCache; +import org.opengroup.osdu.indexer.provider.interfaces.ISchemaCache; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/publish/PublisherImpl.java b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/publish/PublisherImpl.java index 83eeb4297fd0ff5f60c09d70fd96b25da1039f8e..dcca2be1aa1790d3253876548bcd808e8232b36e 100644 --- a/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/publish/PublisherImpl.java +++ b/provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/publish/PublisherImpl.java @@ -33,7 +33,7 @@ import org.opengroup.osdu.core.common.model.core.TenantInfo; import org.opengroup.osdu.core.common.model.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.provider.interfaces.IPublisher; import org.opengroup.osdu.core.gcp.PubSub.PubSubExtensions; import org.opengroup.osdu.core.common.model.coreis.DeploymentEnvironment; import org.springframework.beans.factory.annotation.Value; diff --git a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java index 2c04d8742d979d0a38a84e1937728259e4ba7f9b..9d63cc1119885ef67b5c444db933a9cb26cc1b25 100644 --- a/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java +++ b/provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/service/IndexerSchemaServiceTest.java @@ -25,7 +25,7 @@ import org.mockito.Mock; import org.opengroup.osdu.core.common.model.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.indexer.provider.interfaces.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;