Cleanup of Lisp in VPP renderer

[groupbasedpolicy.git] / renderers / vpp / src / main / java / org / opendaylight / groupbasedpolicy / renderer / vpp / lisp / LispStateCommandExecutor.java

diff --git a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/lisp/LispStateCommandExecutor.java b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/lisp/LispStateCommandExecutor.java
index 35f31f9771dd8a9155c743e728a3fbef0008ae1d..95bb1e60f565432aa08036668694452b83857798 100644 (file)
--- a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/lisp/LispStateCommandExecutor.java
+++ b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/lisp/LispStateCommandExecutor.java
@@ -12,16 +12,12 @@ import org.opendaylight.groupbasedpolicy.renderer.vpp.commands.lisp.AbstractLisp
 import org.opendaylight.groupbasedpolicy.renderer.vpp.util.GbpNetconfTransaction;
 import org.opendaylight.groupbasedpolicy.renderer.vpp.util.General;
 import org.opendaylight.groupbasedpolicy.renderer.vpp.util.LispUtil;
-import org.opendaylight.groupbasedpolicy.renderer.vpp.util.VppIidFactory;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Function;
-
 public class LispStateCommandExecutor {
     private static final Logger LOG = LoggerFactory.getLogger(LispStateCommandExecutor.class);
 
@@ -31,16 +27,14 @@ public class LispStateCommandExecutor {
         return executeCommand(nodeIid, lispStateCommand);
     }
 
-    public static <T extends DataObject> boolean executePutCommand(String hostName,
-            AbstractLispCommand<T> lispStateCommand) {
+    static <T extends DataObject> boolean executePutCommand(String hostName, AbstractLispCommand<T> lispStateCommand) {
         lispStateCommand.setOperation(General.Operations.PUT);
-        return executeCommand(LispUtil.HOSTNAME_TO_IID.apply(hostName), lispStateCommand);
+        return executeCommand(LispUtil.hostnameToIid(hostName), lispStateCommand);
     }
 
-    public static <T extends DataObject> boolean executeMergeCommand(String hostName,
-        AbstractLispCommand<T> lispStateCommand) {
+    static <T extends DataObject> boolean executeMergeCommand(String hostName, AbstractLispCommand<T> lispStateCommand) {
         lispStateCommand.setOperation(General.Operations.MERGE);
-        return executeCommand(LispUtil.HOSTNAME_TO_IID.apply(hostName), lispStateCommand);
+        return executeCommand(LispUtil.hostnameToIid(hostName), lispStateCommand);
     }
 
     public static <T extends DataObject> boolean executeDeleteCommand(InstanceIdentifier<Node> nodeIid,
@@ -49,14 +43,13 @@ public class LispStateCommandExecutor {
         return executeCommand(nodeIid, lispStateCommand);
     }
 
-    public static <T extends DataObject> boolean executeDeleteCommand(String hostName,
-            AbstractLispCommand<T> lispStateCommand) {
+    static <T extends DataObject> boolean executeDeleteCommand(String hostName, AbstractLispCommand<T> lispStateCommand) {
         lispStateCommand.setOperation(General.Operations.DELETE);
-        return executeCommand(LispUtil.HOSTNAME_TO_IID.apply(hostName), lispStateCommand);
+        return executeCommand(LispUtil.hostnameToIid(hostName), lispStateCommand);
     }
 
-    public static <T extends DataObject> boolean executeCommand(InstanceIdentifier<Node> nodeIid,
-            AbstractLispCommand<T> lispStateCommand) {
+    private static <T extends DataObject> boolean executeCommand(InstanceIdentifier<Node> nodeIid,
+        AbstractLispCommand<T> lispStateCommand) {
         final boolean transactionState;
         switch (lispStateCommand.getOperation()) {
             case MERGE: