X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fclients%2FA1ClientFactory.java;h=636a69f6e07fca32c5776e652cd8ed66855eb0fd;hb=d898170a0bb639b85a7f8770ddab2a3ccd181cfb;hp=6598c27672fa12e1b300e1fa3e9a5e6fad5acc48;hpb=063e00d7a9f1f56c8b0714602fcaecb3c4eac951;p=nonrtric.git

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientFactory.java b/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientFactory.java
index 6598c276..636a69f6 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientFactory.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientFactory.java
@@ -2,7 +2,7 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 Nordix Foundation
+ * Copyright (C) 2020 Nordix Foundation
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Mono;
 
 /**
- * Factory for A1 clients that supports four different protocol versions of the A1 api.
+ * Factory for A1 clients that supports four different protocol versions of the
+ * A1 api.
  */
 public class A1ClientFactory {
 
@@ -46,16 +47,17 @@ public class A1ClientFactory {
      * Creates an A1 client with the correct A1 protocol for the provided Ric.
      *
      * <p>
-     * It detects the protocol version by trial and error, since there is no getVersion method specified in the A1
-     * api yet.
+     * It detects the protocol version by trial and error, since there is no
+     * getVersion method specified in the A1 api yet.
      *
      * <p>
-     * As a side effect it also sets the protocol version in the provided Ric. This means that after the first
-     * successful creation it won't have to try which protocol to use, but can create the client directly.
+     * As a side effect it also sets the protocol version in the provided Ric. This
+     * means that after the first successful creation it won't have to try which
+     * protocol to use, but can create the client directly.
      *
-     * @param ric The Ric to get a client for.
-     * @return a client with the correct protocol, or a ServiceException if none of the protocols are supported by the
-     *         Ric.
+     * @param ric The RIC to get a client for.
+     * @return a client with the correct protocol, or a ServiceException if none of
+     *         the protocols are supported by the Ric.
      */
     public Mono<A1Client> createA1Client(Ric ric) {
         return getProtocolVersion(ric) //
@@ -69,20 +71,20 @@ public class A1ClientFactory {
             return Mono.just(createOscA1Client(ric));
         } else if (version == A1ProtocolType.SDNC_OSC) {
             return Mono.just(createSdncOscA1Client(ric));
-        } else { // A1ProtocolType.SDNR_ONAP
-            return Mono.just(createSdnrOnapA1Client(ric));
+        } else { // A1ProtocolType.SDNC_ONAP
+            return Mono.just(createSdncOnapA1Client(ric));
         }
     }
 
     private Mono<A1Client.A1ProtocolType> getProtocolVersion(Ric ric) {
         if (ric.getProtocolVersion() == A1ProtocolType.UNKNOWN) {
-            return fetchVersion(createSdnrOnapA1Client(ric)) //
-                .onErrorResume(err -> fetchVersion(createSdncOscA1Client(ric))) //
-                .onErrorResume(err -> fetchVersion(createOscA1Client(ric))) //
-                .onErrorResume(err -> fetchVersion(createStdA1ClientImpl(ric))) //
-                .doOnNext(version -> ric.setProtocolVersion(version))
+            return fetchVersion(createSdncOnapA1Client(ric)) //
+                .onErrorResume(notUsed -> fetchVersion(createSdncOscA1Client(ric))) //
+                .onErrorResume(notUsed -> fetchVersion(createOscA1Client(ric))) //
+                .onErrorResume(notUsed -> fetchVersion(createStdA1ClientImpl(ric))) //
+                .doOnNext(ric::setProtocolVersion)
                 .doOnNext(version -> logger.debug("Recover ric: {}, protocol version:{}", ric.name(), version)) //
-                .doOnError(t -> logger.warn("Could not get protocol version from RIC: {}", ric.name())); //
+                .doOnError(notUsed -> logger.warn("Could not get protocol version from RIC: {}", ric.name())); //
         } else {
             return Mono.just(ric.getProtocolVersion());
         }
@@ -101,8 +103,8 @@ public class A1ClientFactory {
             appConfig.getA1ControllerUsername(), appConfig.getA1ControllerPassword());
     }
 
-    protected A1Client createSdnrOnapA1Client(Ric ric) {
-        return new SdnrOnapA1Client(ric.getConfig(), appConfig.getA1ControllerBaseUrl(),
+    protected A1Client createSdncOnapA1Client(Ric ric) {
+        return new SdncOnapA1Client(ric.getConfig(), appConfig.getA1ControllerBaseUrl(),
             appConfig.getA1ControllerUsername(), appConfig.getA1ControllerPassword());
     }