From: John  Keeney <John.Keeney@est.tech>
Date: Sun, 2 Aug 2020 12:32:19 +0000 (+0000)
Subject: Merge "Fix bug in A1 clients"
X-Git-Tag: 2.1.0~56
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;ds=inline;h=eb4ea800b974ca57fd4ad534171520f27032abf6;hp=-c;p=nonrtric.git

Merge "Fix bug in A1 clients"
---

eb4ea800b974ca57fd4ad534171520f27032abf6
diff --combined policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientFactory.java
index dba6c912,3297b622..113abcb6
--- a/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientFactory.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientFactory.java
@@@ -29,7 -29,7 +29,7 @@@ import org.slf4j.Logger
  import org.slf4j.LoggerFactory;
  import org.springframework.beans.factory.annotation.Autowired;
  import reactor.core.publisher.Mono;
 -
 +import lombok.Getter;
  /**
   * Factory for A1 clients that supports four different protocol versions of the
   * A1 api.
@@@ -38,7 -38,6 +38,7 @@@ public class A1ClientFactory 
  
      private static final Logger logger = LoggerFactory.getLogger(A1ClientFactory.class);
  
 +    @Getter
      private final ApplicationConfig appConfig;
  
      @Autowired
@@@ -75,9 -74,10 +75,10 @@@
              assertNoControllerConfig(ric, version);
              return new OscA1Client(ric.getConfig(), this.appConfig.getWebClientConfig());
          } else if (version == A1ProtocolType.SDNC_OSC_STD_V1_1 || version == A1ProtocolType.SDNC_OSC_OSC_V1) {
-             return new SdncOscA1Client(version, ric.getConfig(), getControllerConfig(ric));
+             return new SdncOscA1Client(version, ric.getConfig(), getControllerConfig(ric),
+                 this.appConfig.getWebClientConfig());
          } else if (version == A1ProtocolType.SDNC_ONAP) {
-             return new SdncOnapA1Client(ric.getConfig(), getControllerConfig(ric));
+             return new SdncOnapA1Client(ric.getConfig(), getControllerConfig(ric), this.appConfig.getWebClientConfig());
          } else {
              logger.error("Unhandled protocol: {}", version);
              throw new ServiceException("Unhandled protocol");