summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
5b69c8e)
... by reverting to a variant of the previous executeModification()
implementation.
Change-Id: I9a0480868bce2682e4ecc0e635a4db9f897d8511
Signed-off-by: Stephen Kitt <skitt@redhat.com>
import com.google.common.util.concurrent.SettableFuture;
import java.util.Optional;
import java.util.SortedSet;
import com.google.common.util.concurrent.SettableFuture;
import java.util.Optional;
import java.util.SortedSet;
+import java.util.function.Consumer;
import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
import org.opendaylight.controller.cluster.datastore.messages.AbstractRead;
import org.opendaylight.mdsal.common.api.ReadFailedException;
import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
import org.opendaylight.controller.cluster.datastore.messages.AbstractRead;
import org.opendaylight.mdsal.common.api.ReadFailedException;
protected abstract DOMStoreReadTransaction getReadDelegate();
protected abstract DOMStoreReadTransaction getReadDelegate();
@SuppressWarnings("checkstyle:IllegalCatch")
@SuppressWarnings("checkstyle:IllegalCatch")
- public void executeDelete(final YangInstanceIdentifier path, final Boolean havePermit) {
+ private void executeModification(Consumer<DOMStoreWriteTransaction> consumer) {
incrementModificationCount();
if (operationError == null) {
try {
incrementModificationCount();
if (operationError == null) {
try {
- getWriteDelegate().delete(path);
+ consumer.accept(getWriteDelegate());
} catch (Exception e) {
operationError = e;
}
} catch (Exception e) {
operationError = e;
}
- @SuppressWarnings("checkstyle:IllegalCatch")
+ public void executeDelete(final YangInstanceIdentifier path, final Boolean havePermit) {
+ executeModification(transaction -> transaction.delete(path));
+ }
+
+ @Override
public void executeMerge(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data,
final Boolean havePermit) {
public void executeMerge(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data,
final Boolean havePermit) {
- incrementModificationCount();
- if (operationError == null) {
- try {
- getWriteDelegate().merge(path, data);
- } catch (Exception e) {
- operationError = e;
- }
- }
+ executeModification(transaction -> transaction.merge(path, data));
- @SuppressWarnings("checkstyle:IllegalCatch")
public void executeWrite(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data,
final Boolean havePermit) {
public void executeWrite(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data,
final Boolean havePermit) {
- incrementModificationCount();
- if (operationError == null) {
- try {
- getWriteDelegate().write(path, data);
- } catch (Exception e) {
- operationError = e;
- }
- }
+ executeModification(transaction -> transaction.write(path, data));