Commit 21eae7ea authored by Krishna Nikhil Vedurumudi's avatar Krishna Nikhil Vedurumudi Committed by David Diederich
Browse files

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
parent 4ef59a50
Pipeline #73450 failed with stage
in 2 minutes and 3 seconds
...@@ -170,14 +170,14 @@ The following software have components provided under the terms of this license: ...@@ -170,14 +170,14 @@ The following software have components provided under the terms of this license:
- parent-join (from https://github.com/elastic/elasticsearch) - parent-join (from https://github.com/elastic/elasticsearch)
- proton-j (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j) - proton-j (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j)
- rank-eval (from https://github.com/elastic/elasticsearch) - rank-eval (from https://github.com/elastic/elasticsearch)
- resilience4j (from https://github.com/resilience4j/resilience4j)
- resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io)
- 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)
- resilience4j (from https://github.com/resilience4j/resilience4j) - 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://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 (from https://github.com/elastic/elasticsearch)
- rest-high-level (from https://github.com/elastic/elasticsearch) - rest-high-level (from https://github.com/elastic/elasticsearch)
- rxjava (from https://github.com/ReactiveX/RxJava) - rxjava (from https://github.com/ReactiveX/RxJava)
......
...@@ -27,6 +27,7 @@ import org.opengroup.osdu.core.common.http.HttpResponse; ...@@ -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.http.UrlFetchServiceImpl;
import org.opengroup.osdu.core.common.model.http.AppException; import org.opengroup.osdu.core.common.model.http.AppException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -41,6 +42,7 @@ import static java.util.Arrays.asList; ...@@ -41,6 +42,7 @@ import static java.util.Arrays.asList;
*/ */
@Primary @Primary
@Component @Component
@ConditionalOnProperty(value = "requestScope.enabled", havingValue = "true", matchIfMissing = true)
public class HttpClientAzure implements IHttpClient { public class HttpClientAzure implements IHttpClient {
private static final String LOGGER_NAME = HttpClientAzure.class.getName(); private static final String LOGGER_NAME = HttpClientAzure.class.getName();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment