From 2863144fca46ac7336cc7b7a6ff124799eb87428 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20de=20Talhou=C3=ABt?= Date: Wed, 14 Sep 2016 18:55:26 -0400 Subject: [PATCH] Clean-up mdsal-netconf-connector MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - add FIXME to address duplicated code - remove unsed API - remove iner generic type - use lambda when possible - reduce visibility of param when possible Change-Id: Id0ce780026c20ab67d3621b7162653606235634c Signed-off-by: Alexis de Talhouët --- netconf/mdsal-netconf-connector/pom.xml | 8 -------- .../mdsal/connector/CurrentSchemaContext.java | 15 +++++---------- .../MdsalNetconfOperationServiceFactory.java | 2 +- .../mdsal/connector/OperationProvider.java | 2 +- .../mdsal/connector/TransactionProvider.java | 15 --------------- .../netconf/mdsal/connector/ops/Commit.java | 4 +++- .../mdsal/connector/ops/DiscardChanges.java | 2 +- .../netconf/mdsal/connector/ops/EditConfig.java | 2 +- .../netconf/mdsal/connector/ops/Lock.java | 2 ++ .../netconf/mdsal/connector/ops/Unlock.java | 2 ++ 10 files changed, 16 insertions(+), 38 deletions(-) diff --git a/netconf/mdsal-netconf-connector/pom.xml b/netconf/mdsal-netconf-connector/pom.xml index f37105ad8b..5980c902e4 100644 --- a/netconf/mdsal-netconf-connector/pom.xml +++ b/netconf/mdsal-netconf-connector/pom.xml @@ -38,14 +38,6 @@ org.opendaylight.yangtools yang-data-impl - - - - - org.opendaylight.yangtools - object-cache-api - - org.opendaylight.yangtools diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/CurrentSchemaContext.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/CurrentSchemaContext.java index a45d5a6377..fa7f273465 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/CurrentSchemaContext.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/CurrentSchemaContext.java @@ -23,10 +23,10 @@ import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceProvider; public class CurrentSchemaContext implements SchemaContextListener, AutoCloseable { - final AtomicReference currentContext = new AtomicReference(); + private final AtomicReference currentContext = new AtomicReference(); private final ListenerRegistration schemaContextListenerListenerRegistration; - private final Set listeners1 = Collections.synchronizedSet(Sets.newHashSet()); - private SchemaSourceProvider rootSchemaSourceProvider; + private final Set listeners1 = Collections.synchronizedSet(Sets.newHashSet()); + private final SchemaSourceProvider rootSchemaSourceProvider; public SchemaContext getCurrentContext() { Preconditions.checkState(currentContext.get() != null, "Current context not received"); @@ -44,7 +44,7 @@ public class CurrentSchemaContext implements SchemaContextListener, AutoCloseabl // FIXME is notifying all the listeners from this callback wise ? final Set addedCaps = MdsalNetconfOperationServiceFactory.transformCapabilities(currentContext.get(), rootSchemaSourceProvider); for (final CapabilityListener listener : listeners1) { - listener.onCapabilitiesChanged(addedCaps, Collections.emptySet()); + listener.onCapabilitiesChanged(addedCaps, Collections.emptySet()); } } @@ -58,11 +58,6 @@ public class CurrentSchemaContext implements SchemaContextListener, AutoCloseabl public AutoCloseable registerCapabilityListener(final CapabilityListener listener) { listener.onCapabilitiesChanged(MdsalNetconfOperationServiceFactory.transformCapabilities(currentContext.get(), rootSchemaSourceProvider), Collections.emptySet()); listeners1.add(listener); - return new AutoCloseable() { - @Override - public void close() throws Exception { - listeners1.remove(listener); - } - }; + return () -> listeners1.remove(listener); } } \ No newline at end of file diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java index 56eb032a99..b450a9d0c8 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java @@ -96,7 +96,7 @@ public class MdsalNetconfOperationServiceFactory implements NetconfOperationServ final Module module, final SchemaSourceProvider rootSchemaSourceProviderDependency) { final SourceIdentifier moduleSourceIdentifier = SourceIdentifier.create(module.getName(), - (SimpleDateFormatUtil.DEFAULT_DATE_REV == module.getRevision() ? Optional.absent() : + (SimpleDateFormatUtil.DEFAULT_DATE_REV == module.getRevision() ? Optional.absent() : Optional.of(SimpleDateFormatUtil.getRevisionFormat().format(module.getRevision())))); InputStream sourceStream = null; diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/OperationProvider.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/OperationProvider.java index c356e4f361..5bf9fb15ad 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/OperationProvider.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/OperationProvider.java @@ -40,7 +40,7 @@ final class OperationProvider { } Set getOperations() { - return Sets.newHashSet( + return Sets.newHashSet( new Commit(netconfSessionIdForReporting, transactionProvider), new DiscardChanges(netconfSessionIdForReporting, transactionProvider), new EditConfig(netconfSessionIdForReporting, schemaContext, transactionProvider), diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java index f5e303ebd6..a39042f881 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java @@ -112,21 +112,6 @@ public class TransactionProvider implements AutoCloseable{ return runningTransaction; } - public synchronized boolean commitRunningTransaction(DOMDataReadWriteTransaction tx) throws DocumentedException { - allOpenReadWriteTransactions.remove(tx); - - CheckedFuture future = tx.submit(); - try { - future.checkedGet(); - } catch (TransactionCommitFailedException e) { - LOG.debug("Transaction {} failed on", tx, e); - throw new DocumentedException("Transaction commit failed on " + e.getMessage() + " " + netconfSessionIdForReporting, - ErrorType.application, ErrorTag.operation_failed, ErrorSeverity.error); - } - - return true; - } - public synchronized void abortRunningTransaction(DOMDataReadWriteTransaction tx) { LOG.debug("Aborting current running Transaction"); Preconditions.checkState(runningTransaction != null, NO_TRANSACTION_FOUND_FOR_SESSION + netconfSessionIdForReporting); diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java index 43e12a3494..820cca65ad 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java @@ -20,6 +20,8 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; +// FIXME duplicated code +// netconf/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/Commit.java public class Commit extends AbstractSingletonNetconfOperation { private static final Logger LOG = LoggerFactory.getLogger(Commit.class); @@ -39,7 +41,7 @@ public class Commit extends AbstractSingletonNetconfOperation { boolean commitStatus = transactionProvider.commitTransaction(); LOG.trace("Commit completed successfully {}", commitStatus); - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); } @Override diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java index bc7ee21e58..8d3765e109 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java @@ -52,7 +52,7 @@ public class DiscardChanges extends AbstractSingletonNetconfOperation { throw new DocumentedException(e.getMessage(), e, ErrorType.application, ErrorTag.operation_failed, ErrorSeverity.error, errorInfo); } - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); } @Override diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java index 48c353ec5e..0d569e6012 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java @@ -87,7 +87,7 @@ public class EditConfig extends AbstractSingletonNetconfOperation { executeOperations(changeTracker); } - return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); + return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent()); } private void executeOperations(final DataTreeChangeTracker changeTracker) throws DocumentedException { diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java index 15e58b0d54..73559967f2 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java @@ -19,6 +19,8 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; +// FIXME Duplicated code +// netconf/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Lock.java public class Lock extends AbstractSingletonNetconfOperation { private static final Logger LOG = LoggerFactory.getLogger(Lock.class); diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java index 2284d11ea3..9d2daa5189 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java @@ -19,6 +19,8 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; +// FIXME Duplicated code +// netconf/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/UnLock.java public class Unlock extends AbstractSingletonNetconfOperation { private static final Logger LOG = LoggerFactory.getLogger(Unlock.class); -- 2.36.6