From df11cfe397627561e2f814518b5343f3eba6f160 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 3 May 2023 18:49:13 +0200 Subject: [PATCH] Eliminate sal.connect.netconf.sal.tx package Transactions in this package are an implementation detail of the sal.connect.netconf.sal package. Move them and their tests, hiding them from outside view. JIRA: NETCONF-1006 Change-Id: I3f3cc23ca54bc1a0e3b25fb4a29f5c75a3d8bd5e Signed-off-by: Robert Varga --- .../sal/{tx => }/AbstractReadOnlyTx.java | 15 ++++--- .../netconf/sal/{tx => }/AbstractTxChain.java | 2 +- .../netconf/sal/{tx => }/AbstractWriteTx.java | 39 +++++++++---------- .../sal/{tx => }/FieldsAwareReadOnlyTx.java | 19 +++++---- .../sal/{tx => }/FieldsAwareReadWriteTx.java | 9 ++--- .../sal/{tx => }/FieldsAwareTxChain.java | 4 +- .../netconf/sal/NetconfDeviceDataBroker.java | 9 ----- .../netconf/sal/{tx => }/ReadOnlyTx.java | 6 +-- .../netconf/sal/{tx => }/ReadWriteTx.java | 7 ++-- .../connect/netconf/sal/{tx => }/TxChain.java | 6 +-- .../netconf/sal/{tx => }/TxListener.java | 6 +-- .../sal/{tx => }/WriteCandidateRunningTx.java | 15 ++++--- .../sal/{tx => }/WriteCandidateTx.java | 14 +++---- .../netconf/sal/{tx => }/WriteRunningTx.java | 16 ++++---- .../{tx => }/FieldsAwareReadOnlyTxTest.java | 2 +- .../{tx => }/FieldsAwareReadWriteTxTest.java | 2 +- .../sal/NetconfDataTreeServiceImplTest.java | 1 - .../sal/NetconfDeviceDataBrokerTest.java | 4 -- .../NetconfDeviceWriteOnlyTxTest.java | 3 +- .../netconf/sal/{tx => }/ReadOnlyTxTest.java | 2 +- .../netconf/sal/{tx => }/ReadWriteTxTest.java | 2 +- .../netconf/sal/{tx => }/TxChainTest.java | 8 ++-- .../netconf/sal/{tx => }/TxTestUtils.java | 28 ++++--------- .../{tx => }/WriteCandidateRunningTxTest.java | 2 +- .../sal/{tx => }/WriteCandidateTxTest.java | 2 +- .../sal/{tx => }/WriteRunningTxTest.java | 2 +- 26 files changed, 93 insertions(+), 132 deletions(-) rename plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/AbstractReadOnlyTx.java (93%) rename plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/AbstractTxChain.java (98%) rename plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/AbstractWriteTx.java (90%) rename plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/FieldsAwareReadOnlyTx.java (81%) rename plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/FieldsAwareReadWriteTx.java (78%) rename plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/FieldsAwareTxChain.java (90%) rename plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/ReadOnlyTx.java (70%) rename plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/ReadWriteTx.java (89%) rename plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/TxChain.java (84%) rename plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/TxListener.java (94%) rename plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/WriteCandidateRunningTx.java (79%) rename plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/WriteCandidateTx.java (92%) rename plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/WriteRunningTx.java (90%) rename plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/FieldsAwareReadOnlyTxTest.java (97%) rename plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/FieldsAwareReadWriteTxTest.java (95%) rename plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/NetconfDeviceWriteOnlyTxTest.java (99%) rename plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/ReadOnlyTxTest.java (98%) rename plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/ReadWriteTxTest.java (98%) rename plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/TxChainTest.java (98%) rename plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/TxTestUtils.java (55%) rename plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/WriteCandidateRunningTxTest.java (98%) rename plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/WriteCandidateTxTest.java (97%) rename plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/{tx => }/WriteRunningTxTest.java (97%) diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractReadOnlyTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractReadOnlyTx.java similarity index 93% rename from plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractReadOnlyTx.java rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractReadOnlyTx.java index 07492856e3..835328438e 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractReadOnlyTx.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractReadOnlyTx.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; @@ -75,16 +75,15 @@ abstract class AbstractReadOnlyTx implements DOMDataTreeReadTransaction { @Override public final FluentFuture> read(final LogicalDatastoreType store, final YangInstanceIdentifier path) { - switch (store) { - case CONFIGURATION: - return readConfigurationData(path); - case OPERATIONAL: - return readOperationalData(path); - default: + return switch (store) { + case CONFIGURATION -> readConfigurationData(path); + case OPERATIONAL -> readOperationalData(path); + default -> { LOG.info("Unknown datastore type: {}.", store); throw new IllegalArgumentException(String.format( "%s, Cannot read data %s for %s datastore, unknown datastore type", id, path, store)); - } + } + }; } @Override diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractTxChain.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractTxChain.java similarity index 98% rename from plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractTxChain.java rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractTxChain.java index bc0bcd213e..98844193e8 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractTxChain.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractTxChain.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import static com.google.common.base.Preconditions.checkState; diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractWriteTx.java similarity index 90% rename from plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractWriteTx.java index 4f7cfbb01e..0454cdbf43 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractWriteTx.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; @@ -43,18 +43,17 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public abstract class AbstractWriteTx implements DOMDataTreeWriteTransaction { - +abstract class AbstractWriteTx implements DOMDataTreeWriteTransaction { private static final Logger LOG = LoggerFactory.getLogger(AbstractWriteTx.class); - protected final RemoteDeviceId id; - protected final NetconfBaseOps netOps; - protected final boolean rollbackSupport; - protected final List> resultsFutures = new ArrayList<>(); + final RemoteDeviceId id; + final NetconfBaseOps netOps; + final boolean rollbackSupport; + final List> resultsFutures = new ArrayList<>(); private final List listeners = new CopyOnWriteArrayList<>(); // Allow commit to be called only once - protected volatile boolean finished = false; - protected final boolean isLockAllowed; + volatile boolean finished = false; + final boolean isLockAllowed; @SuppressFBWarnings(value = "MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR", justification = "Behavior-only subclasses") AbstractWriteTx(final RemoteDeviceId id, final NetconfBaseOps netconfOps, final boolean rollbackSupport, @@ -66,15 +65,15 @@ public abstract class AbstractWriteTx implements DOMDataTreeWriteTransaction { init(); } - protected static boolean isSuccess(final DOMRpcResult result) { + static boolean isSuccess(final DOMRpcResult result) { return result.errors().isEmpty(); } - protected void checkNotFinished() { + void checkNotFinished() { checkState(!isFinished(), "%s: Transaction %s already finished", id, getIdentifier()); } - protected boolean isFinished() { + boolean isFinished() { return finished; } @@ -90,9 +89,9 @@ public abstract class AbstractWriteTx implements DOMDataTreeWriteTransaction { } // FIXME: only called from ctor which needs @SuppressDBWarnings. Refactor class hierarchy without this method (here) - protected abstract void init(); + abstract void init(); - protected abstract void cleanup(); + abstract void cleanup(); @Override public Object getIdentifier() { @@ -176,7 +175,7 @@ public abstract class AbstractWriteTx implements DOMDataTreeWriteTransaction { return FluentFuture.from(resultFuture); } - protected final ListenableFuture> commitConfiguration() { + final ListenableFuture> commitConfiguration() { listeners.forEach(listener -> listener.onTransactionSubmitted(this)); checkNotFinished(); finished = true; @@ -202,7 +201,7 @@ public abstract class AbstractWriteTx implements DOMDataTreeWriteTransaction { return result; } - protected abstract ListenableFuture> performCommit(); + abstract ListenableFuture> performCommit(); private void checkEditable(final LogicalDatastoreType store) { checkNotFinished(); @@ -210,11 +209,11 @@ public abstract class AbstractWriteTx implements DOMDataTreeWriteTransaction { "Can edit only configuration data, not %s", store); } - protected abstract void editConfig(YangInstanceIdentifier path, Optional data, - DataContainerChild editStructure, - Optional defaultOperation, String operation); + abstract void editConfig(YangInstanceIdentifier path, Optional data, + DataContainerChild editStructure, Optional defaultOperation, + String operation); - protected ListenableFuture> resultsToTxStatus() { + ListenableFuture> resultsToTxStatus() { final SettableFuture> transformed = SettableFuture.create(); Futures.addCallback(Futures.allAsList(resultsFutures), new FutureCallback>() { diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadOnlyTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/FieldsAwareReadOnlyTx.java similarity index 81% rename from plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadOnlyTx.java rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/FieldsAwareReadOnlyTx.java index 334a3bddc0..4c247dc255 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadOnlyTx.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/FieldsAwareReadOnlyTx.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import com.google.common.util.concurrent.FluentFuture; import java.util.List; @@ -21,27 +21,26 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public final class FieldsAwareReadOnlyTx extends AbstractReadOnlyTx implements NetconfDOMFieldsReadTransaction { +final class FieldsAwareReadOnlyTx extends AbstractReadOnlyTx implements NetconfDOMFieldsReadTransaction { private static final Logger LOG = LoggerFactory.getLogger(FieldsAwareReadOnlyTx.class); - public FieldsAwareReadOnlyTx(final NetconfBaseOps netconfOps, final RemoteDeviceId id) { + FieldsAwareReadOnlyTx(final NetconfBaseOps netconfOps, final RemoteDeviceId id) { super(netconfOps, id); } @Override public FluentFuture> read(final LogicalDatastoreType store, final YangInstanceIdentifier path, final List fields) { - switch (store) { - case CONFIGURATION: - return readConfigurationData(path, fields); - case OPERATIONAL: - return readOperationalData(path, fields); - default: + return switch (store) { + case CONFIGURATION -> readConfigurationData(path, fields); + case OPERATIONAL -> readOperationalData(path, fields); + default -> { LOG.warn("Unknown datastore type: {}.", store); throw new IllegalArgumentException(String.format( "%s, Cannot read data %s with fields %s for %s datastore, unknown datastore type", id, path, fields, store)); - } + } + }; } private @NonNull FluentFuture> readConfigurationData( diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadWriteTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/FieldsAwareReadWriteTx.java similarity index 78% rename from plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadWriteTx.java rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/FieldsAwareReadWriteTx.java index 0e47971af6..3ba4e8dd82 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadWriteTx.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/FieldsAwareReadWriteTx.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import com.google.common.util.concurrent.FluentFuture; import java.util.List; @@ -17,11 +17,10 @@ import org.opendaylight.netconf.dom.api.tx.NetconfDOMFieldsReadWriteTransaction; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -public final class FieldsAwareReadWriteTx extends ReadWriteTx +final class FieldsAwareReadWriteTx extends ReadWriteTx implements NetconfDOMFieldsReadWriteTransaction { - - public FieldsAwareReadWriteTx(final NetconfDOMFieldsReadTransaction readTransaction, - final DOMDataTreeWriteTransaction writeTransaction) { + FieldsAwareReadWriteTx(final NetconfDOMFieldsReadTransaction readTransaction, + final DOMDataTreeWriteTransaction writeTransaction) { super(readTransaction, writeTransaction); } diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareTxChain.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/FieldsAwareTxChain.java similarity index 90% rename from plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareTxChain.java rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/FieldsAwareTxChain.java index e96d308208..51ebf0fdec 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareTxChain.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/FieldsAwareTxChain.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import static java.util.Objects.requireNonNull; @@ -19,7 +19,7 @@ import org.opendaylight.netconf.dom.api.tx.NetconfDOMFieldsTransactionChain; public final class FieldsAwareTxChain extends AbstractTxChain implements NetconfDOMFieldsTransactionChain { private final NetconfDOMDataBrokerFieldsExtension dataBrokerFieldsExtension; - public FieldsAwareTxChain(final DOMDataBroker dataBroker, final DOMTransactionChainListener listener, + FieldsAwareTxChain(final DOMDataBroker dataBroker, final DOMTransactionChainListener listener, final NetconfDOMDataBrokerFieldsExtension dataBrokerFieldsExtension) { super(dataBroker, listener); this.dataBrokerFieldsExtension = requireNonNull(dataBrokerFieldsExtension); diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBroker.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBroker.java index e365567ab0..61971f86e8 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBroker.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBroker.java @@ -25,15 +25,6 @@ import org.opendaylight.netconf.dom.api.tx.NetconfDOMFieldsReadTransaction; import org.opendaylight.netconf.dom.api.tx.NetconfDOMFieldsReadWriteTransaction; import org.opendaylight.netconf.dom.api.tx.NetconfDOMFieldsTransactionChain; import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfSessionPreferences; -import org.opendaylight.netconf.sal.connect.netconf.sal.tx.FieldsAwareReadOnlyTx; -import org.opendaylight.netconf.sal.connect.netconf.sal.tx.FieldsAwareReadWriteTx; -import org.opendaylight.netconf.sal.connect.netconf.sal.tx.FieldsAwareTxChain; -import org.opendaylight.netconf.sal.connect.netconf.sal.tx.ReadOnlyTx; -import org.opendaylight.netconf.sal.connect.netconf.sal.tx.ReadWriteTx; -import org.opendaylight.netconf.sal.connect.netconf.sal.tx.TxChain; -import org.opendaylight.netconf.sal.connect.netconf.sal.tx.WriteCandidateRunningTx; -import org.opendaylight.netconf.sal.connect.netconf.sal.tx.WriteCandidateTx; -import org.opendaylight.netconf.sal.connect.netconf.sal.tx.WriteRunningTx; import org.opendaylight.netconf.sal.connect.netconf.util.NetconfBaseOps; import org.opendaylight.yangtools.rfc8528.data.api.MountPointContext; diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/ReadOnlyTx.java similarity index 70% rename from plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTx.java rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/ReadOnlyTx.java index 2c1c659cd5..2c5bb7224d 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTx.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/ReadOnlyTx.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceId; import org.opendaylight.netconf.sal.connect.netconf.util.NetconfBaseOps; -public final class ReadOnlyTx extends AbstractReadOnlyTx { - public ReadOnlyTx(final NetconfBaseOps netconfOps, final RemoteDeviceId id) { +final class ReadOnlyTx extends AbstractReadOnlyTx { + ReadOnlyTx(final NetconfBaseOps netconfOps, final RemoteDeviceId id) { super(netconfOps, id); } } diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/ReadWriteTx.java similarity index 89% rename from plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTx.java rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/ReadWriteTx.java index 9397c8671f..bb36b67783 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTx.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/ReadWriteTx.java @@ -5,8 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import com.google.common.util.concurrent.FluentFuture; import java.util.Optional; @@ -19,11 +18,11 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -public class ReadWriteTx implements DOMDataTreeReadWriteTransaction { +class ReadWriteTx implements DOMDataTreeReadWriteTransaction { private final DOMDataTreeWriteTransaction delegateWriteTx; final T delegateReadTx; - public ReadWriteTx(final T delegateReadTx, final DOMDataTreeWriteTransaction delegateWriteTx) { + ReadWriteTx(final T delegateReadTx, final DOMDataTreeWriteTransaction delegateWriteTx) { this.delegateReadTx = delegateReadTx; this.delegateWriteTx = delegateWriteTx; } diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChain.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/TxChain.java similarity index 84% rename from plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChain.java rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/TxChain.java index c634a6154e..a8a87861cd 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChain.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/TxChain.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import org.opendaylight.mdsal.dom.api.DOMDataBroker; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction; @@ -16,8 +16,8 @@ import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener; /** * {@link DOMTransactionChain} implementation for Netconf connector. */ -public final class TxChain extends AbstractTxChain { - public TxChain(final DOMDataBroker dataBroker, final DOMTransactionChainListener listener) { +final class TxChain extends AbstractTxChain { + TxChain(final DOMDataBroker dataBroker, final DOMTransactionChainListener listener) { super(dataBroker, listener); } diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxListener.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/TxListener.java similarity index 94% rename from plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxListener.java rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/TxListener.java index 1c97cabe37..9e1d3db44e 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxListener.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/TxListener.java @@ -5,11 +5,9 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; interface TxListener { - /** * Invoked, when transaction completes successfully. * @param transaction transaction @@ -35,6 +33,4 @@ interface TxListener { * @param transaction transaction */ void onTransactionSubmitted(AbstractWriteTx transaction); - - } diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteCandidateRunningTx.java similarity index 79% rename from plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTx.java rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteCandidateRunningTx.java index fe9fd2c5c0..76665ee7e7 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTx.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteCandidateRunningTx.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceId; import org.opendaylight.netconf.sal.connect.netconf.util.NetconfBaseOps; @@ -20,27 +20,26 @@ import org.slf4j.LoggerFactory; *
  • Running datastore is locked as the first thing and this lock has to succeed
    • * */ -public class WriteCandidateRunningTx extends WriteCandidateTx { +class WriteCandidateRunningTx extends WriteCandidateTx { private static final Logger LOG = LoggerFactory.getLogger(WriteCandidateRunningTx.class); - public WriteCandidateRunningTx(final RemoteDeviceId id, final NetconfBaseOps netOps, - final boolean rollbackSupport) { + WriteCandidateRunningTx(final RemoteDeviceId id, final NetconfBaseOps netOps, final boolean rollbackSupport) { this(id, netOps, rollbackSupport, true); } - public WriteCandidateRunningTx(final RemoteDeviceId id, final NetconfBaseOps netconfOps, - final boolean rollbackSupport, final boolean isLockAllowed) { + WriteCandidateRunningTx(final RemoteDeviceId id, final NetconfBaseOps netconfOps, final boolean rollbackSupport, + final boolean isLockAllowed) { super(id, netconfOps, rollbackSupport, isLockAllowed); } @Override - protected synchronized void init() { + synchronized void init() { lockRunning(); super.init(); } @Override - protected void cleanupOnSuccess() { + void cleanupOnSuccess() { super.cleanupOnSuccess(); unlockRunning(); } diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteCandidateTx.java similarity index 92% rename from plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTx.java rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteCandidateTx.java index 1d125edb14..713c4d4efd 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTx.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteCandidateTx.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -45,20 +45,20 @@ import org.slf4j.LoggerFactory; *
  • Commit and Unlock candidate datastore async
    • * */ -public class WriteCandidateTx extends AbstractWriteTx { +class WriteCandidateTx extends AbstractWriteTx { private static final Logger LOG = LoggerFactory.getLogger(WriteCandidateTx.class); - public WriteCandidateTx(final RemoteDeviceId id, final NetconfBaseOps netconfOps, final boolean rollbackSupport) { + WriteCandidateTx(final RemoteDeviceId id, final NetconfBaseOps netconfOps, final boolean rollbackSupport) { this(id, netconfOps, rollbackSupport, true); } - public WriteCandidateTx(final RemoteDeviceId id, final NetconfBaseOps netconfOps, final boolean rollbackSupport, + WriteCandidateTx(final RemoteDeviceId id, final NetconfBaseOps netconfOps, final boolean rollbackSupport, final boolean isLockAllowed) { super(id, netconfOps, rollbackSupport, isLockAllowed); } @Override - protected synchronized void init() { + synchronized void init() { LOG.trace("{}: Initializing {} transaction", id, getClass().getSimpleName()); lock(); } @@ -90,7 +90,7 @@ public class WriteCandidateTx extends AbstractWriteTx { } @Override - protected void cleanup() { + void cleanup() { discardChanges(); cleanupOnSuccess(); } @@ -125,7 +125,7 @@ public class WriteCandidateTx extends AbstractWriteTx { return txResult; } - protected void cleanupOnSuccess() { + void cleanupOnSuccess() { unlock(); } diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteRunningTx.java similarity index 90% rename from plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteRunningTx.java index 525c927b03..a1417c381b 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteRunningTx.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import com.google.common.util.concurrent.ListenableFuture; import java.util.ArrayList; @@ -40,23 +40,22 @@ import org.slf4j.LoggerFactory; *
  • Unlock running datastore on tx commit
    • * */ -public class WriteRunningTx extends AbstractWriteTx { - +class WriteRunningTx extends AbstractWriteTx { private static final Logger LOG = LoggerFactory.getLogger(WriteRunningTx.class); + private final List changes = new ArrayList<>(); - public WriteRunningTx(final RemoteDeviceId id, final NetconfBaseOps netOps, - final boolean rollbackSupport) { + WriteRunningTx(final RemoteDeviceId id, final NetconfBaseOps netOps, final boolean rollbackSupport) { this(id, netOps, rollbackSupport, true); } - public WriteRunningTx(final RemoteDeviceId id, final NetconfBaseOps netconfOps, final boolean rollbackSupport, + WriteRunningTx(final RemoteDeviceId id, final NetconfBaseOps netconfOps, final boolean rollbackSupport, final boolean isLockAllowed) { super(id, netconfOps, rollbackSupport, isLockAllowed); } @Override - protected synchronized void init() { + synchronized void init() { lock(); } @@ -69,7 +68,7 @@ public class WriteRunningTx extends AbstractWriteTx { } @Override - protected void cleanup() { + void cleanup() { unlock(); } @@ -99,7 +98,6 @@ public class WriteRunningTx extends AbstractWriteTx { } private static final class Change { - private final DataContainerChild editStructure; private final Optional defaultOperation; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadOnlyTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/FieldsAwareReadOnlyTxTest.java similarity index 97% rename from plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadOnlyTxTest.java rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/FieldsAwareReadOnlyTxTest.java index a42e0293c0..93478a15e2 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadOnlyTxTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/FieldsAwareReadOnlyTxTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadWriteTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/FieldsAwareReadWriteTxTest.java similarity index 95% rename from plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadWriteTxTest.java rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/FieldsAwareReadWriteTxTest.java index b7fedd99e8..c4d8feee98 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadWriteTxTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/FieldsAwareReadWriteTxTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import static org.mockito.Mockito.verify; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDataTreeServiceImplTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDataTreeServiceImplTest.java index f34814f5f7..962c6e1c0b 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDataTreeServiceImplTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDataTreeServiceImplTest.java @@ -41,7 +41,6 @@ import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceId; import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceServices.Rpcs; import org.opendaylight.netconf.client.mdsal.impl.NetconfMessageTransformer; import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfSessionPreferences; -import org.opendaylight.netconf.sal.connect.netconf.sal.tx.TxTestUtils; import org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.IetfNetconfService; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.NetconfState; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBrokerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBrokerTest.java index 0831843a13..c009d95779 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBrokerTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBrokerTest.java @@ -39,10 +39,6 @@ import org.opendaylight.netconf.dom.api.tx.NetconfDOMDataBrokerFieldsExtension; import org.opendaylight.netconf.dom.api.tx.NetconfDOMFieldsReadTransaction; import org.opendaylight.netconf.dom.api.tx.NetconfDOMFieldsReadWriteTransaction; import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfSessionPreferences; -import org.opendaylight.netconf.sal.connect.netconf.sal.tx.AbstractWriteTx; -import org.opendaylight.netconf.sal.connect.netconf.sal.tx.WriteCandidateRunningTx; -import org.opendaylight.netconf.sal.connect.netconf.sal.tx.WriteCandidateTx; -import org.opendaylight.netconf.sal.connect.netconf.sal.tx.WriteRunningTx; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.IetfNetconfService; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.monitoring.rev220718.NetconfTcp; import org.opendaylight.yangtools.rfc8528.data.util.EmptyMountPointContext; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/NetconfDeviceWriteOnlyTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceWriteOnlyTxTest.java similarity index 99% rename from plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/NetconfDeviceWriteOnlyTxTest.java rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceWriteOnlyTxTest.java index 550d2d6ef1..368e68880a 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/NetconfDeviceWriteOnlyTxTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceWriteOnlyTxTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import static org.junit.Assert.assertThrows; import static org.mockito.ArgumentMatchers.any; @@ -53,7 +53,6 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class NetconfDeviceWriteOnlyTxTest extends AbstractBaseSchemasTest { - private final RemoteDeviceId id = new RemoteDeviceId("test-mount", new InetSocketAddress(99)); @Mock diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/ReadOnlyTxTest.java similarity index 98% rename from plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTxTest.java rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/ReadOnlyTxTest.java index fd2293de56..600091471c 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTxTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/ReadOnlyTxTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import static org.junit.Assert.assertNotEquals; import static org.mockito.ArgumentMatchers.any; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/ReadWriteTxTest.java similarity index 98% rename from plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTxTest.java rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/ReadWriteTxTest.java index e5e1039360..9ddf93d40f 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTxTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/ReadWriteTxTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChainTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/TxChainTest.java similarity index 98% rename from plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChainTest.java rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/TxChainTest.java index e47e3ba621..a6d8ebee0f 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChainTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/TxChainTest.java @@ -5,8 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; @@ -17,6 +16,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.mdsal.common.api.TransactionCommitFailedException; @@ -27,7 +27,6 @@ import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class TxChainTest { - @Mock private DOMDataBroker broker; @Mock @@ -46,7 +45,8 @@ public class TxChainTest { private AutoCloseable registration2; @Mock private AutoCloseable registration3; - private final ArgumentCaptor captor = ArgumentCaptor.forClass(TxListener.class); + @Captor + private ArgumentCaptor captor; private TxChain chain; @Before diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxTestUtils.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/TxTestUtils.java similarity index 55% rename from plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxTestUtils.java rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/TxTestUtils.java index 498812a46a..9159f4da52 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxTestUtils.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/TxTestUtils.java @@ -5,47 +5,35 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; public final class TxTestUtils { - private static final QName Q_NAME_1 = QName.create("test:namespace", "2013-07-22", "c"); private static final QName Q_NAME_2 = QName.create(Q_NAME_1, "a"); private TxTestUtils() { - + // Hidden on purpose } static YangInstanceIdentifier getContainerId() { - return YangInstanceIdentifier.builder() - .node(Q_NAME_1) - .build(); + return YangInstanceIdentifier.builder().node(Q_NAME_1).build(); } - public static YangInstanceIdentifier getLeafId() { - return YangInstanceIdentifier.builder() - .node(Q_NAME_1) - .node(Q_NAME_2) - .build(); + static YangInstanceIdentifier getLeafId() { + return YangInstanceIdentifier.builder().node(Q_NAME_1).node(Q_NAME_2).build(); } static ContainerNode getContainerNode() { - return Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(Q_NAME_1)) - .build(); + return ImmutableNodes.containerNode(Q_NAME_1); } public static LeafNode getLeafNode() { - return Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(Q_NAME_2)) - .withValue("data") - .build(); + return ImmutableNodes.leafNode(Q_NAME_2, "data"); } } diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteCandidateRunningTxTest.java similarity index 98% rename from plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTxTest.java rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteCandidateRunningTxTest.java index 816c0420f2..62d0616646 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTxTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteCandidateRunningTxTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteCandidateTxTest.java similarity index 97% rename from plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTxTest.java rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteCandidateTxTest.java index d4b8bef422..ce1f385a06 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTxTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteCandidateTxTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteRunningTxTest.java similarity index 97% rename from plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTxTest.java rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteRunningTxTest.java index 2f5797c0cb..d5b4f8c0e4 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTxTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/WriteRunningTxTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.sal.connect.netconf.sal.tx; +package org.opendaylight.netconf.sal.connect.netconf.sal; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; -- 2.36.6