From 8d4bfab5cafc67a5fb0c0933cd17834d66f0ab00 Mon Sep 17 00:00:00 2001 From: Gabriel Robitaille-Montpetit Date: Thu, 5 Nov 2015 10:56:45 -0500 Subject: [PATCH] Improved code readability / indentation Change-Id: I256bb5f3db0d0fa97a0305e8bfc7b36d38c04cc4 Signed-off-by: Gabriel Robitaille-Montpetit --- .../unimgr/command/EvcCreateCommand.java | 1 + .../unimgr/command/UniCreateCommand.java | 1 + .../unimgr/impl/UnimgrDataChangeListener.java | 35 ++++---- .../unimgr/impl/UnimgrMapper.java | 83 ++++++++++++------- .../unimgr/impl/UnimgrProvider.java | 32 ++++--- .../opendaylight/unimgr/impl/UnimgrUtils.java | 1 + 6 files changed, 96 insertions(+), 57 deletions(-) diff --git a/impl/src/main/java/org/opendaylight/unimgr/command/EvcCreateCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/EvcCreateCommand.java index 466f225c..8346220f 100644 --- a/impl/src/main/java/org/opendaylight/unimgr/command/EvcCreateCommand.java +++ b/impl/src/main/java/org/opendaylight/unimgr/command/EvcCreateCommand.java @@ -35,6 +35,7 @@ public class EvcCreateCommand extends AbstractCreateCommand { super.changes = changes; } + @SuppressWarnings("unchecked") @Override public void execute() { for (Entry, DataObject> created : changes.entrySet()) { diff --git a/impl/src/main/java/org/opendaylight/unimgr/command/UniCreateCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/UniCreateCommand.java index 764e7752..d5e66e5b 100644 --- a/impl/src/main/java/org/opendaylight/unimgr/command/UniCreateCommand.java +++ b/impl/src/main/java/org/opendaylight/unimgr/command/UniCreateCommand.java @@ -163,6 +163,7 @@ public class UniCreateCommand extends AbstractCreateCommand { .getConnectionInfo() .getRemoteIp() .equals(uniAugmentation.getIpAddress())) { + @SuppressWarnings("unchecked") InstanceIdentifier ovsdbNodeIid = (InstanceIdentifier) created.getKey(); Optional ovsdbNode = UnimgrUtils.readNode(dataBroker, LogicalDatastoreType.OPERATIONAL, diff --git a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrDataChangeListener.java b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrDataChangeListener.java index 249a6dd1..2bdc6afd 100644 --- a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrDataChangeListener.java +++ b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrDataChangeListener.java @@ -44,27 +44,31 @@ public class UnimgrDataChangeListener implements IUnimgrDataChangeListener { this.dataBroker = dataBroker; this.invoker = invoker; listeners = new HashSet>(); - listeners.add(dataBroker.registerDataChangeListener( - LogicalDatastoreType.CONFIGURATION, UnimgrMapper.createUniIid() - , this, DataChangeScope.SUBTREE)); - listeners.add(dataBroker.registerDataChangeListener( - LogicalDatastoreType.CONFIGURATION, UnimgrMapper.createEvcIid() - , this, DataChangeScope.SUBTREE)); - listeners.add(dataBroker.registerDataChangeListener( - LogicalDatastoreType.OPERATIONAL, UnimgrMapper.getOvsdbTopologyIdentifier() - , this, DataChangeScope.SUBTREE)); + listeners.add(dataBroker.registerDataChangeListener(LogicalDatastoreType.CONFIGURATION, + UnimgrMapper.createUniIid(), + this, + DataChangeScope.SUBTREE)); + listeners.add(dataBroker.registerDataChangeListener(LogicalDatastoreType.CONFIGURATION, + UnimgrMapper.createEvcIid(), + this, + DataChangeScope.SUBTREE)); + listeners.add(dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, + UnimgrMapper.getOvsdbTopologyIdentifier(), + this, + DataChangeScope.SUBTREE)); } @Override - public void onDataChanged( - AsyncDataChangeEvent, DataObject> change) { + public void onDataChanged(AsyncDataChangeEvent, + DataObject> change) { create(change.getCreatedData()); update(change.getUpdatedData()); delete(change); } @Override - public void create(Map, DataObject> changes) { + public void create(Map, + DataObject> changes) { if (changes != null) { List commands = new ArrayList(); commands.add(new UniCreateCommand(dataBroker, changes)); @@ -75,7 +79,8 @@ public class UnimgrDataChangeListener implements IUnimgrDataChangeListener { } @Override - public void update(Map, DataObject> changes) { + public void update(Map, + DataObject> changes) { if (changes != null) { List commands = new ArrayList(); commands.add(new UniUpdateCommand(dataBroker, changes)); @@ -86,8 +91,8 @@ public class UnimgrDataChangeListener implements IUnimgrDataChangeListener { } @Override - public void delete( - AsyncDataChangeEvent, DataObject> changes) { + public void delete(AsyncDataChangeEvent, + DataObject> changes) { if (changes != null) { List commands = new ArrayList(); commands.add(new UniDeleteCommand(dataBroker, changes)); diff --git a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrMapper.java b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrMapper.java index a478a50a..5eeda0ff 100755 --- a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrMapper.java +++ b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrMapper.java @@ -34,18 +34,23 @@ public class UnimgrMapper { public static InstanceIdentifier getOvsdbNodeIID(NodeId nodeId) { InstanceIdentifier nodePath = InstanceIdentifier - .create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID)) - .child(Node.class,new NodeKey(nodeId)); + .create(NetworkTopology.class) + .child(Topology.class, + new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID)) + .child(Node.class, + new NodeKey(nodeId)); return nodePath; } - public static InstanceIdentifier getOvsdbBridgeNodeIID(NodeId ovsdbNode, String bridgeName) { + public static InstanceIdentifier getOvsdbBridgeNodeIID(NodeId ovsdbNode, + String bridgeName) { NodeId bridgeNodeId = new NodeId(ovsdbNode + UnimgrConstants.DEFAULT_BRIDGE_NODE_ID_SUFFIX + bridgeName); InstanceIdentifier nodePath = InstanceIdentifier - .create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID)) - .child(Node.class,new NodeKey(bridgeNodeId)); + .create(NetworkTopology.class) + .child(Topology.class, + new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID)) + .child(Node.class, + new NodeKey(bridgeNodeId)); return nodePath; } @@ -55,28 +60,34 @@ public class UnimgrMapper { + ":" + UnimgrConstants.OVSDB_PORT; InstanceIdentifier nodePath = InstanceIdentifier - .create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID)) - .child(Node.class,new NodeKey(new NodeId(nodeId))); + .create(NetworkTopology.class) + .child(Topology.class, + new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID)) + .child(Node.class, + new NodeKey(new NodeId(nodeId))); return nodePath; } public static InstanceIdentifier getOvsdbTopologyIdentifier() { InstanceIdentifier path = InstanceIdentifier - .create(NetworkTopology.class) - .child(Topology.class, - new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID)) - .child(Node.class); + .create(NetworkTopology.class) + .child(Topology.class, + new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID)) + .child(Node.class); return path; } public static InstanceIdentifier createTerminationPointInstanceIdentifier( - Node bridgeNode, String portName) { - InstanceIdentifier terminationPointPath = InstanceIdentifier - .create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID)) - .child(Node.class,bridgeNode.getKey()) - .child(TerminationPoint.class, new TerminationPointKey(new TpId(portName))); + Node bridgeNode, + String portName) { + InstanceIdentifier terminationPointPath = + InstanceIdentifier + .create(NetworkTopology.class) + .child(Topology.class, + new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID)) + .child(Node.class,bridgeNode.getKey()) + .child(TerminationPoint.class, + new TerminationPointKey(new TpId(portName))); LOG.debug("Termination point InstanceIdentifier generated : {}",terminationPointPath); return terminationPointPath; @@ -89,15 +100,18 @@ public class UnimgrMapper { return iid; } - public static InstanceIdentifier createUniIid(DataBroker dataBroker, IpAddress ip) { + public static InstanceIdentifier createUniIid(DataBroker dataBroker, + IpAddress ip) { List uniNodes = UnimgrUtils.getUniNodes(dataBroker); for (Node node: uniNodes) { UniAugmentation uniAugmentation = node.getAugmentation(UniAugmentation.class); if (uniAugmentation.getIpAddress().equals(ip)) { InstanceIdentifier uniNode = InstanceIdentifier - .create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(UnimgrConstants.UNI_TOPOLOGY_ID)) - .child(Node.class, new NodeKey(node.getKey())); + .create(NetworkTopology.class) + .child(Topology.class, + new TopologyKey(UnimgrConstants.UNI_TOPOLOGY_ID)) + .child(Node.class, + new NodeKey(node.getKey())); return uniNode; } } @@ -105,23 +119,28 @@ public class UnimgrMapper { } public static InstanceIdentifier createEvcIid() { - InstanceIdentifier iid = InstanceIdentifier.create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(UnimgrConstants.EVC_TOPOLOGY_ID)) - .child(Node.class); + InstanceIdentifier iid = InstanceIdentifier + .create(NetworkTopology.class) + .child(Topology.class, + new TopologyKey(UnimgrConstants.EVC_TOPOLOGY_ID)) + .child(Node.class); return iid; } public static InstanceIdentifier createTopologyIid() { - InstanceIdentifier iid = InstanceIdentifier.create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(UnimgrConstants.UNI_TOPOLOGY_ID)); + InstanceIdentifier iid = InstanceIdentifier + .create(NetworkTopology.class) + .child(Topology.class, + new TopologyKey(UnimgrConstants.UNI_TOPOLOGY_ID)); return iid; } public static InstanceIdentifier getEvcLinkIID(LinkId id) { InstanceIdentifier linkPath = InstanceIdentifier - .create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(UnimgrConstants.EVC_TOPOLOGY_ID)) - .child(Link.class,new LinkKey(id)); + .create(NetworkTopology.class) + .child(Topology.class, + new TopologyKey(UnimgrConstants.EVC_TOPOLOGY_ID)) + .child(Link.class,new LinkKey(id)); return linkPath; } } diff --git a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrProvider.java b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrProvider.java index 97339cb0..f0871b63 100755 --- a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrProvider.java +++ b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrProvider.java @@ -50,19 +50,28 @@ public class UnimgrProvider implements BindingAwareProvider, AutoCloseable, IUni public void onSessionInitiated(ProviderContext session) { LOG.info("UnimgrProvider Session Initiated"); + // Retrieve the data broker to create transactions dataBroker = session.getSALService(DataBroker.class); invoker = new TransactionInvoker(); + // Register the unimgr OSGi CLI BundleContext context = FrameworkUtil.getBundle(this.getClass()).getBundleContext(); - unimgrConsoleRegistration = context.registerService(IUnimgrConsoleProvider.class, this, null); + unimgrConsoleRegistration = context.registerService(IUnimgrConsoleProvider.class, + this, + null); + // Register the uni data change listener listener = new UnimgrDataChangeListener(dataBroker, invoker); // Initialize operational and default config data in MD-SAL data store - initDatastore(LogicalDatastoreType.CONFIGURATION, UnimgrConstants.UNI_TOPOLOGY_ID); - initDatastore(LogicalDatastoreType.OPERATIONAL, UnimgrConstants.UNI_TOPOLOGY_ID); - initDatastore(LogicalDatastoreType.CONFIGURATION, UnimgrConstants.EVC_TOPOLOGY_ID); - initDatastore(LogicalDatastoreType.OPERATIONAL, UnimgrConstants.EVC_TOPOLOGY_ID); + initDatastore(LogicalDatastoreType.CONFIGURATION, + UnimgrConstants.UNI_TOPOLOGY_ID); + initDatastore(LogicalDatastoreType.OPERATIONAL, + UnimgrConstants.UNI_TOPOLOGY_ID); + initDatastore(LogicalDatastoreType.CONFIGURATION, + UnimgrConstants.EVC_TOPOLOGY_ID); + initDatastore(LogicalDatastoreType.OPERATIONAL, + UnimgrConstants.EVC_TOPOLOGY_ID); } @Override @@ -72,13 +81,16 @@ public class UnimgrProvider implements BindingAwareProvider, AutoCloseable, IUni listener.close(); } - protected void initDatastore(final LogicalDatastoreType type, TopologyId topoId) { + protected void initDatastore(final LogicalDatastoreType type, + TopologyId topoId) { InstanceIdentifier path = InstanceIdentifier - .create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(topoId)); + .create(NetworkTopology.class) + .child(Topology.class, + new TopologyKey(topoId)); initializeTopology(type); ReadWriteTransaction transaction = dataBroker.newReadWriteTransaction(); - CheckedFuture, ReadFailedException> unimgrTp = transaction.read(type, path); + CheckedFuture, ReadFailedException> unimgrTp = transaction.read(type, + path); try { if (!unimgrTp.get().isPresent()) { TopologyBuilder tpb = new TopologyBuilder(); @@ -112,7 +124,7 @@ public class UnimgrProvider implements BindingAwareProvider, AutoCloseable, IUni @Override public boolean addUni(Uni uni) { - //TODO Uncomment + //TODO This code was left commented as an example if (uni.getIpAddress() == null || uni.getMacAddress() == null) { return false; } diff --git a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java index 558e1e77..895e213b 100644 --- a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java +++ b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java @@ -112,6 +112,7 @@ public class UnimgrUtils { } } + @SuppressWarnings("unchecked") public static void createBridgeNode(DataBroker dataBroker, Node ovsdbNode, UniAugmentation uni, -- 2.36.6