Clean up A1 controller dependencies

[nonrtric.git] / sdnc-a1-controller / northbound / nonrt-ric-api / provider / src / main / java / org / o_ran_sc / nonrtric / sdnc_a1 / northbound / provider / NonrtRicApiProvider.java

diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/provider/NonrtRicApiProvider.java b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/provider/NonrtRicApiProvider.java
index a0a6fad..a432d0c 100644 (file)
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/provider/NonrtRicApiProvider.java
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/o_ran_sc/nonrtric/sdnc_a1/northbound/provider/NonrtRicApiProvider.java
@@ -31,8 +31,6 @@ import org.o_ran_sc.nonrtric.sdnc_a1.northbound.restadapter.RestAdapterImpl;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
 import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.A1ADAPTERAPIService;
 import org.opendaylight.yang.gen.v1.org.o_ran_sc.nonrtric.sdnc_a1.northbound.a1.adapter.rev200122.DeleteA1PolicyInput;
@@ -86,7 +84,6 @@ public class NonrtRicApiProvider implements AutoCloseable, A1ADAPTERAPIService {
   protected DataBroker dataBroker;
   protected NotificationPublishService notificationService;
   protected RpcProviderRegistry rpcRegistry;
-  protected BindingAwareBroker.RpcRegistration<?> rpcRegistration;
   private RestAdapter restAdapter;
 
   public NonrtRicApiProvider(DataBroker dataBroker, NotificationPublishService notificationPublishService,
@@ -97,25 +94,18 @@ public class NonrtRicApiProvider implements AutoCloseable, A1ADAPTERAPIService {
     setNotificationService(notificationPublishService);
     setRpcRegistry(rpcProviderRegistry);
     initialize();
-
   }
 
   public void initialize() {
     log.info("Initializing provider for {}", APP_NAME);
-    createContainers();
     restAdapter = new RestAdapterImpl();
     log.info("Initialization complete for {}", APP_NAME);
   }
 
-  protected void initializeChild() {
-    // Override if you have custom initialization intelligence
-  }
-
   @Override
   public void close() throws Exception {
     log.info("Closing provider for {}", APP_NAME);
     executor.shutdown();
-    rpcRegistration.close();
     log.info("Successfully closed provider for {}", APP_NAME);
   }
 
@@ -140,21 +130,6 @@ public class NonrtRicApiProvider implements AutoCloseable, A1ADAPTERAPIService {
     }
   }
 
-  private void createContainers() {
-
-    final WriteTransaction t = dataBroker.newReadWriteTransaction();
-
-    try {
-      CheckedFuture<Void, TransactionCommitFailedException> checkedFuture = t.submit();
-      checkedFuture.get();
-      log.info("Create containers succeeded!");
-
-    } catch (InterruptedException | ExecutionException e) {
-      log.error("Create containers failed: ", e);
-      Thread.currentThread().interrupt();
-    }
-  }
-
   @Override
   public ListenableFuture<RpcResult<PutA1PolicyOutput>> putA1Policy(PutA1PolicyInput input) {
     log.info("Start of putPolicy");
@@ -210,7 +185,7 @@ public class NonrtRicApiProvider implements AutoCloseable, A1ADAPTERAPIService {
     return Futures.immediateFuture(rpcResult);
   }
 
-  private GetA1PolicyOutput getA1(GetA1PolicyInput input) {
+  protected GetA1PolicyOutput getA1(GetA1PolicyInput input) {
     log.info("Start of getA1");
     GetA1PolicyOutputBuilder getPolicyResponseBuilder = new GetA1PolicyOutputBuilder();