Merge branch 'az/td-fix-azure-deploy' into 'master'

Resolve ConflictingBeanDefinition for DependencyLogger Bean and Upgrade reactor-core version in azure pom.xml

See merge request !357

provider/search-azure/pom.xml

@@ -41,7 +41,7 @@
         <spatial4j.version>0.7</spatial4j.version>
         <jts-io-common.version>1.15.0</jts-io-common.version>
         <reactor-netty.version>1.0.7</reactor-netty.version>
-        <reactor-core.version>3.4.6</reactor-core.version>
+        <reactor-core.version>3.4.21</reactor-core.version>
         <jackson-dataformat-xml.version>2.11.4</jackson-dataformat-xml.version>
         <jackson-databind.version>2.13.2.2</jackson-databind.version>
         <jackson.version>2.13.2</jackson.version>

provider/search-azure/src/main/java/org/opengroup/osdu/search/provider/azure/provider/impl/QueryBase.java

@@ -67,6 +67,7 @@ import org.opengroup.osdu.search.util.IDetailedBadRequestMessageUtil;
 import org.opengroup.osdu.search.util.IQueryParserUtil;
 import org.opengroup.osdu.search.util.ISortParserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletResponse;
@@ -107,6 +108,7 @@ abstract class QueryBase {
     private ElasticLoggingConfig elasticLoggingConfig;
 
     @Autowired
+    @Qualifier("azureUtilsDependencyLogger")
     private DependencyLogger dependencyLogger;
 
     static final String AGGREGATION_NAME = "agg";

provider/search-azure/src/main/java/org/opengroup/osdu/search/provider/azure/utils/DependencyLogger.java

@@ -20,7 +20,7 @@ import org.springframework.stereotype.Component;
 
 import java.time.Duration;
 
-@Component
+@Component("azureUtilsDependencyLogger")
 public class DependencyLogger {
 
     private static final String ECK_DEPENDENCY_TYPE = "Elasticsearch";
@@ -42,4 +42,4 @@ public class DependencyLogger {
         payload.setTarget(target);
         CoreLoggerFactory.getInstance().getLogger(ECK_LOGGER).logDependency(payload);
     }
-}
\ No newline at end of file
+}