X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=transcriber%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fneutron%2Ftranscriber%2FAbstractNeutronInterface.java;h=c1374238cb563dab7061883c47fdffbec5c57f0f;hb=refs%2Fchanges%2F19%2F39819%2F3;hp=8e7341a420fa289a445619c00fe100da7dee30ee;hpb=d80d87b60de6946609bb0a9c6d28990517e5aa20;p=neutron.git diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/AbstractNeutronInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/AbstractNeutronInterface.java index 8e7341a42..c1374238c 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/AbstractNeutronInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/AbstractNeutronInterface.java @@ -52,7 +52,7 @@ public abstract class AbstractNeutronInterface T readMd(InstanceIdentifier path, ReadTransaction tx) { Preconditions.checkNotNull(tx); T result = null; - CheckedFuture, ReadFailedException> future = tx.read(LogicalDatastoreType.CONFIGURATION, path); + final CheckedFuture, ReadFailedException> future = tx.read(LogicalDatastoreType.CONFIGURATION, path); if (future != null) { Optional optional; try { @@ -84,7 +84,7 @@ public abstract class AbstractNeutronInterface iid = createInstanceIdentifier(item); + final T item = toMd(neutronObject); + final InstanceIdentifier iid = createInstanceIdentifier(item); tx.put(LogicalDatastoreType.CONFIGURATION, iid, item,true); - CheckedFuture future = tx.submit(); + final CheckedFuture future = tx.submit(); future.get(); // Check if it's successfuly committed, otherwise exception will be thrown. } @@ -127,7 +127,7 @@ public abstract class AbstractNeutronInterface= 0) { try { - WriteTransaction tx = getDataBroker().newWriteOnlyTransaction(); + final WriteTransaction tx = getDataBroker().newWriteOnlyTransaction(); updateMd(neutronObject, tx); return true; } catch (InterruptedException | ExecutionException e) { @@ -145,14 +145,14 @@ public abstract class AbstractNeutronInterface iid = createInstanceIdentifier(item); + final InstanceIdentifier iid = createInstanceIdentifier(item); tx.delete(LogicalDatastoreType.CONFIGURATION, iid); - CheckedFuture future = tx.submit(); + final CheckedFuture future = tx.submit(); future.get(); // Check if it's successfuly committed, otherwise exception will be thrown. } protected boolean removeMd(T item) { - ReadWriteTransaction tx = getDataBroker().newReadWriteTransaction(); + final ReadWriteTransaction tx = getDataBroker().newReadWriteTransaction(); try { removeMd(item, tx); return true; @@ -167,11 +167,11 @@ public abstract class AbstractNeutronInterface getAll(ReadTransaction tx) { Preconditions.checkNotNull(tx); - Set allNeutronObjects = new HashSet(); - U dataObjects = readMd(createInstanceIdentifier(), tx); + final Set allNeutronObjects = new HashSet(); + final U dataObjects = readMd(createInstanceIdentifier(), tx); if (dataObjects != null) { - for (T dataObject: getDataObjectList(dataObjects)) { + for (final T dataObject: getDataObjectList(dataObjects)) { allNeutronObjects.add(fromMd(dataObject)); } } LOGGER.debug("Exiting _getAll, Found {} OpenStackFirewall", allNeutronObjects.size()); - List ans = new ArrayList(); + final List ans = new ArrayList(); ans.addAll(allNeutronObjects); return ans; } @@ -288,7 +288,7 @@ public abstract class AbstractNeutronInterface= 0) { - ReadWriteTransaction tx = getDataBroker().newReadWriteTransaction(); + final ReadWriteTransaction tx = getDataBroker().newReadWriteTransaction(); try { return add(input, tx); } catch (InterruptedException | ExecutionException e) { @@ -318,7 +318,7 @@ public abstract class AbstractNeutronInterface= 0) { - ReadWriteTransaction tx = getDataBroker().newReadWriteTransaction(); + final ReadWriteTransaction tx = getDataBroker().newReadWriteTransaction(); try { return remove(uuid, tx); } catch (InterruptedException | ExecutionException e) { @@ -348,7 +348,7 @@ public abstract class AbstractNeutronInterface= 0) { - ReadWriteTransaction tx = getDataBroker().newReadWriteTransaction(); + final ReadWriteTransaction tx = getDataBroker().newReadWriteTransaction(); try { return update(uuid, delta, tx); } catch (InterruptedException | ExecutionException e) {