diff --git a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/config/AzureBootstrapConfig.java b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/config/AzureBootstrapConfig.java index 17b8d526b78fba8ce7819d73bce2302515ebaaf6..2546e920b63a4445370f291bed95036f2e81fe6d 100644 --- a/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/config/AzureBootstrapConfig.java +++ b/provider/indexer-azure/src/main/java/org/opengroup/osdu/indexer/azure/config/AzureBootstrapConfig.java @@ -39,8 +39,8 @@ public class AzureBootstrapConfig { @Value("${azure.servicebus.reindex.topic-name}") private String serviceBusReindexTopicName; - @Value("${publish.indexing.progress}") - private boolean publishIndexingProgress; + @Value("${publish.to.azure.servicebus.topic.enabled}") + private boolean shouldPublishToServiceBusTopic; @Value("${ELASTIC_CACHE_EXPIRATION}") private Integer elasticCacheExpiration; @@ -67,10 +67,8 @@ public class AzureBootstrapConfig { } @Bean - @Named("PUBLISH_TO_INDEXING_PROGRESS_TOPIC") - public Boolean publishIndexingProgress() { - return publishIndexingProgress; - } + @Named("PUBLISH_TO_SERVICE_BUS_INDEXERSTATUS_TOPIC_ENABLED") + public boolean shouldPublishToServiceBusTopic() { return shouldPublishToServiceBusTopic;} @Bean @Named("ELASTIC_CACHE_EXPIRATION") 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 4d29f6d3c96bc08c68352c0e636890e289819181..4b8bc2730357f1a4ffe167a2541080a7fe56e0ad 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 @@ -57,8 +57,8 @@ public class PublisherImpl implements IPublisher { private String serviceBusTopic; @Inject - @Named("PUBLISH_TO_INDEXING_PROGRESS_TOPIC") - private boolean publishToIndexingProgressTopic; + @Named("PUBLISH_TO_SERVICE_BUS_INDEXERSTATUS_TOPIC_ENABLED") + private boolean shouldPublishToServiceBusTopic; @Override public void publishStatusChangedTagsToTopic(DpsHeaders headers, JobStatus indexerBatchStatus) throws Exception { @@ -76,7 +76,7 @@ public class PublisherImpl implements IPublisher { message.setContentType("application/json"); try { - if(publishToIndexingProgressTopic) { + if(shouldPublishToServiceBusTopic) { logger.debug("Indexer publishes message " + headers.getCorrelationId()); topicClientFactory.getClient(headers.getPartitionId(), serviceBusTopic).send(message); } diff --git a/provider/indexer-azure/src/main/resources/application.properties b/provider/indexer-azure/src/main/resources/application.properties index 2e870669aa046452a3d94e847578089fd3a3afe6..c510590320ff79871298500f3bbda69eee26e10e 100644 --- a/provider/indexer-azure/src/main/resources/application.properties +++ b/provider/indexer-azure/src/main/resources/application.properties @@ -69,7 +69,7 @@ azure.cosmosdb.database=${cosmosdb_database} #AzureServiceBusconfiguration azure.servicebus.topic-name=${servicebus_topic_name} azure.servicebus.reindex.topic-name=${reindex_topic_name} -publish.indexing.progress=false +publish.to.azure.servicebus.topic.enabled=false #Indexer-Queue-header indexer.queue.key=abcd diff --git a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/publish/PublisherImplTest.java b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/publish/PublisherImplTest.java index 565b99dc8cb70b8ceaebe695ef1600954d5ed325..d130ea279a2bc445944a2af2af10e0f9f810d5cb 100644 --- a/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/publish/PublisherImplTest.java +++ b/provider/indexer-azure/src/test/java/org/opengroup/osdu/indexer/azure/publish/PublisherImplTest.java @@ -23,8 +23,8 @@ public class PublisherImplTest { private static String serviceBusTopicField = "serviceBusTopic"; private static String serviceBusTopicValue = "recordChangeTopic"; - private static String publishToIndexingProgressTopicField = "publishToIndexingProgressTopic"; - private static Boolean publishToIndexingProgressTopicValue = true; + private static String shouldPublishToServiceBusTopicField = "shouldPublishToServiceBusTopic"; + private static Boolean shouldPublishToServiceBusTopicValue = true; private static String partitionId = "opendes"; @Mock @@ -45,7 +45,7 @@ public class PublisherImplTest { @Test public void should_invoke_getPartitionIdOfdpsHeaders_when_publishStatusChangedTagsToTopic_isCalled() throws Exception { ReflectionTestUtils.setField(sut,serviceBusTopicField,serviceBusTopicValue); - ReflectionTestUtils.setField(sut,publishToIndexingProgressTopicField,publishToIndexingProgressTopicValue); + ReflectionTestUtils.setField(sut,shouldPublishToServiceBusTopicField,shouldPublishToServiceBusTopicValue); when(dpsHeaders.getPartitionId()).thenReturn(partitionId); sut.publishStatusChangedTagsToTopic(dpsHeaders, jobStatus); @@ -56,7 +56,7 @@ public class PublisherImplTest { @Test public void should_invoke_getAccountIdOfDpsHeaders_when_publishStatusChangedTagsToTopic_isCalledWithGetPartitionIdReturningEmptyString() throws Exception { ReflectionTestUtils.setField(sut,serviceBusTopicField,serviceBusTopicValue); - ReflectionTestUtils.setField(sut,publishToIndexingProgressTopicField,publishToIndexingProgressTopicValue); + ReflectionTestUtils.setField(sut,shouldPublishToServiceBusTopicField,shouldPublishToServiceBusTopicValue); when(dpsHeaders.getPartitionId()).thenReturn(""); sut.publishStatusChangedTagsToTopic(dpsHeaders, jobStatus); @@ -67,7 +67,7 @@ public class PublisherImplTest { @Test public void should_invoke_getClientOftopicClientFactory_when_publishStatusChangedTagsToTopic_isCalled() throws Exception { ReflectionTestUtils.setField(sut,serviceBusTopicField,serviceBusTopicValue); - ReflectionTestUtils.setField(sut,publishToIndexingProgressTopicField,publishToIndexingProgressTopicValue); + ReflectionTestUtils.setField(sut,shouldPublishToServiceBusTopicField,shouldPublishToServiceBusTopicValue); when(dpsHeaders.getPartitionId()).thenReturn(partitionId); sut.publishStatusChangedTagsToTopic(dpsHeaders, jobStatus);