1 files changed, 18 insertions, 6 deletions

diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Ric.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Ric.java
index f43737f5..2971feb2 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Ric.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Ric.java
@@ -30,17 +30,20 @@ import lombok.Setter;
 
 import org.onap.ccsdk.oran.a1policymanagementservice.clients.A1Client.A1ProtocolType;
 import org.onap.ccsdk.oran.a1policymanagementservice.configuration.RicConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Holds information about a Near-RT RIC.
  */
 public class Ric {
+    private static final Logger logger = LoggerFactory.getLogger(Ric.class);
 
     @Setter
     private RicConfig ricConfig;
     private RicState state = RicState.UNAVAILABLE;
     private Map<String, PolicyType> supportedPolicyTypes = new HashMap<>();
-    @Getter
+
     @Setter
     private A1ProtocolType protocolVersion = A1ProtocolType.UNKNOWN;
 
@@ -54,11 +57,11 @@ public class Ric {
      */
     public Ric(RicConfig ricConfig) {
         this.ricConfig = ricConfig;
-        this.lock = new Lock(ricConfig.ricId());
+        this.lock = new Lock(ricConfig.getRicId());
     }
 
     public String id() {
-        return ricConfig.ricId();
+        return ricConfig.getRicId();
     }
 
     public RicConfig getConfig() {
@@ -70,16 +73,25 @@ public class Ric {
     }
 
     public synchronized void setState(RicState state) {
+        logger.debug("Ric {} state set to {}", getConfig().getRicId(), state);
         this.state = state;
     }
 
+    public synchronized A1ProtocolType getProtocolVersion() {
+        if (this.ricConfig.getCustomAdapterClass().isEmpty()) {
+            return this.protocolVersion;
+        } else {
+            return A1ProtocolType.CUSTOM_PROTOCOL;
+        }
+    }
+
     /**
      * Gets the nodes managed by this Ric.
      *
      * @return a vector containing the nodes managed by this Ric.
      */
     public synchronized Collection<String> getManagedElementIds() {
-        return new Vector<>(ricConfig.managedElementIds());
+        return new Vector<>(ricConfig.getManagedElementIds());
     }
 
     /**
@@ -89,7 +101,7 @@ public class Ric {
      * @return true if the given node is managed by this Ric.
      */
     public synchronized boolean isManaging(String managedElementId) {
-        return ricConfig.managedElementIds().contains(managedElementId);
+        return ricConfig.getManagedElementIds().contains(managedElementId);
     }
 
     /**
@@ -135,7 +147,7 @@ public class Ric {
     @Override
     public synchronized String toString() {
         return Ric.class.getSimpleName() + ": " + "name: " + id() + ", state: " + state + ", baseUrl: "
-                + ricConfig.baseUrl() + ", managedNodes: " + ricConfig.managedElementIds();
+                + ricConfig.getBaseUrl() + ", managedNodes: " + ricConfig.getManagedElementIds();
     }
 
     /**