Merge branch 'users/nikhil/fixHttpClientRS' into 'master'

Make HttpClientAzure conditionally primary

See merge request !158

(cherry picked from commit cbaabf2c)

09c45d20 Make HttpClientAzure conditionally primary
4a1771c6 Merge branch 'master'
df0ffc5a update fossa
5af41523 fix fossa

NOTICE

@@ -170,14 +170,14 @@ The following software have components provided under the terms of this license:
 - parent-join (from https://github.com/elastic/elasticsearch)
 - proton-j (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j)
 - rank-eval (from https://github.com/elastic/elasticsearch)
-- resilience4j (from https://github.com/resilience4j/resilience4j)
 - resilience4j (from https://resilience4j.readme.io)
 - resilience4j (from https://github.com/resilience4j/resilience4j)
-- resilience4j (from https://resilience4j.readme.io)
 - resilience4j (from https://github.com/resilience4j/resilience4j)
 - resilience4j (from https://github.com/resilience4j/resilience4j)
 - resilience4j (from https://github.com/resilience4j/resilience4j)
 - resilience4j (from https://resilience4j.readme.io)
+- resilience4j (from https://github.com/resilience4j/resilience4j)
+- resilience4j (from https://github.com/resilience4j/resilience4j)
 - rest (from https://github.com/elastic/elasticsearch)
 - rest-high-level (from https://github.com/elastic/elasticsearch)
 - rxjava (from https://github.com/ReactiveX/RxJava)

src/main/java/org/opengroup/osdu/azure/httpconfig/HttpClientAzure.java

@@ -27,6 +27,7 @@ import org.opengroup.osdu.core.common.http.HttpResponse;
 import org.opengroup.osdu.core.common.http.UrlFetchServiceImpl;
 import org.opengroup.osdu.core.common.model.http.AppException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 
@@ -41,6 +42,7 @@ import static java.util.Arrays.asList;
  */
 @Primary
 @Component
+@ConditionalOnProperty(value = "requestScope.enabled", havingValue = "true", matchIfMissing = true)
 public class HttpClientAzure implements IHttpClient {
     private static final String LOGGER_NAME = HttpClientAzure.class.getName();