Merge branch 'master' into jdk-17-migration

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")

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);
             }

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

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);