checkStyleViolationSeverity=error implemented for mdsal-dom-spi module 69/43669/13
authorjanab <brinda.jana@nexusis.com>
Wed, 10 Aug 2016 22:54:27 +0000 (15:54 -0700)
committerjanab <brinda.jana@nexusis.com>
Thu, 25 Aug 2016 16:29:47 +0000 (09:29 -0700)
Resolved the merge conflicts. Implemented code review comments.
Removed empty lines within import sections of some files
Implemented some more code review comments.
Somebody had changed checkStyleViolationSeverity to warning, so it was ignoring the trailing white spaces.
Fixed the pom for dom-api and spi module + fix the code.

Change-Id: I1ea8b60c8b5910ea9f30963ada55ecbed3363a95
Signed-off-by: Brinda Jana <brinda.jana@nexusis.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
44 files changed:
dom/mdsal-dom-api/pom.xml
dom/mdsal-dom-spi/pom.xml
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/AbstractDOMDataTreeChangeListenerRegistration.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/AbstractDOMRpcImplementationRegistration.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/AbstractDOMRpcProviderService.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/AbstractRegistrationTree.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DOMDataTreePrefixTable.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DOMNotificationSubscriptionListener.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DOMNotificationSubscriptionListenerRegistry.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DefaultDOMRpcResult.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBroker.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataReadOnlyTransaction.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataWriteTransaction.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMNotificationPublishService.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMNotificationService.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcImplementation.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcProviderService.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcResult.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcService.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMTransactionChain.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/RegistrationTreeSnapshot.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/RpcRoutingStrategy.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTransaction.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisher.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractSnapshotBackedTransactionChain.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/DOMStore.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/DOMStoreReadTransaction.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/DOMStoreThreePhaseCommitCohort.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/DOMStoreTransaction.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/DOMStoreTransactionChain.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/DOMStoreTransactionFactory.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/DOMStoreTreeChangePublisher.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/DOMStoreWriteTransaction.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/ForwardingDOMStoreThreePhaseCommitCohort.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransaction.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadWriteTransaction.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedTransactions.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransaction.java
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/package-info.java [deleted file]
dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/AbstractDOMRpcProviderServiceTest.java
dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransactionTest.java
dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadWriteTransactionTest.java
dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedTransactionsTest.java

index f6f085556f539b2554e2da2194b6ee0f845b112e..62f920e349943f48b97630a03dc32e38e5b914cc 100644 (file)
@@ -52,7 +52,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
           <configuration>
-              <propertyExpansion>checkstyle.violationSeverity=warning</propertyExpansion>
+              <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
           </configuration>
       </plugin>
     </plugins>
index 37a20c33abdd181f34d70956e41795e928fd5c58..8567c2f6f9f51a1a9504d3ae98ce4870744228fe 100644 (file)
     </dependency>
   </dependencies>
 
+  <build>
+      <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+                </configuration>
+            </plugin>
+        </plugins>
+  </build>
+
   <scm>
     <connection>scm:git:http://git.opendaylight.org/gerrit/mdsal.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/mdsal.git</developerConnection>
@@ -58,4 +70,4 @@
     </site>
   </distributionManagement>
 
-</project>
\ No newline at end of file
+</project>
index a4f774848cb0e24efa40f89c7b19c4a8b744ce2a..9caa1dc69cad9423dc34cb16d8d1b99a5feaa7ed 100644 (file)
@@ -8,7 +8,6 @@
 package org.opendaylight.mdsal.dom.spi;
 
 import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
-
 import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
 
 /**
@@ -17,7 +16,8 @@ import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
  *
  * @param <T> type of listener
  */
-public abstract class AbstractDOMDataTreeChangeListenerRegistration<T extends DOMDataTreeChangeListener> extends AbstractListenerRegistration<T> {
+public abstract class AbstractDOMDataTreeChangeListenerRegistration<T extends
+                DOMDataTreeChangeListener> extends AbstractListenerRegistration<T> {
     protected AbstractDOMDataTreeChangeListenerRegistration(final T listener) {
         super(listener);
     }
index 6428f56613089c41957be1c8d9ede93816cfdeb4..5df087fcbdecd37936d0cafc4e0c7d224862ecfa 100644 (file)
@@ -9,14 +9,14 @@ package org.opendaylight.mdsal.dom.spi;
 
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementation;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration;
-
 import org.opendaylight.yangtools.concepts.AbstractObjectRegistration;
 
 /**
  * Abstract base class for {@link DOMRpcImplementationRegistration} implementations.
  */
-public abstract class AbstractDOMRpcImplementationRegistration<T extends DOMRpcImplementation> extends AbstractObjectRegistration<T> implements DOMRpcImplementationRegistration<T> {
+public abstract class AbstractDOMRpcImplementationRegistration<T extends DOMRpcImplementation> extends
+        AbstractObjectRegistration<T> implements DOMRpcImplementationRegistration<T> {
     protected AbstractDOMRpcImplementationRegistration(final T instance) {
         super(instance);
     }
-}
+}
\ No newline at end of file
index c3e92a99ead13f5562899d77c4435d1e7b3c7bdf..9479cee25ce717c62f886aba18185b614eac9358 100644 (file)
@@ -7,19 +7,19 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
+import com.google.common.collect.ImmutableSet;
 import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementation;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration;
 import org.opendaylight.mdsal.dom.api.DOMRpcProviderService;
 
-import com.google.common.collect.ImmutableSet;
-
 /**
  * Convenience abstract base class for {@link DOMRpcProviderService} implementations.
  */
 public abstract class AbstractDOMRpcProviderService implements DOMRpcProviderService {
     @Override
-    public final <T extends DOMRpcImplementation> DOMRpcImplementationRegistration<T> registerRpcImplementation(final T implementation, final DOMRpcIdentifier... types) {
+    public final <T extends DOMRpcImplementation> DOMRpcImplementationRegistration<T>
+            registerRpcImplementation(final T implementation, final DOMRpcIdentifier... types) {
         return registerRpcImplementation(implementation, ImmutableSet.copyOf(types));
     }
 }
index 9da8f18cfa7ff4bf12e0542d30b0fa4193e67e52..c51a82405b408e0e3ea3c2f7e27fd48721633f04 100644 (file)
@@ -74,7 +74,8 @@ public abstract class AbstractRegistrationTree<T> {
      * @param node Tree node
      * @param registration Registration instance
      */
-    protected final void removeRegistration(@Nonnull final RegistrationTreeNode<T> node, @Nonnull final T registration) {
+    protected final void removeRegistration(@Nonnull final RegistrationTreeNode<T> node,
+            @Nonnull final T registration) {
         // Take the write lock
         rwLock.writeLock().lock();
         try {
index af4bbdd63d7ef0aaff6399bf8ca5cbc7829285c6..41eae94cebce88b10923ac474bf7bc4b1f1c189f 100644 (file)
@@ -20,10 +20,8 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Prefix table indexed by {@link DOMDataTreeIdentifier}.
- *
  * Stores values in tree and provides lookup of closest ancestor
  *
- *
  * @param <V> Value type
  */
 @Beta
@@ -31,7 +29,8 @@ import org.slf4j.LoggerFactory;
 public final class DOMDataTreePrefixTable<V> {
 
     private static final Logger LOG = LoggerFactory.getLogger(DOMDataTreePrefixTable.class);
-    private final Map<LogicalDatastoreType, DOMDataTreePrefixTableEntry<V>> roots = new EnumMap<>(LogicalDatastoreType.class);
+    private final Map<LogicalDatastoreType, DOMDataTreePrefixTableEntry<V>> roots =
+        new EnumMap<>(LogicalDatastoreType.class);
 
     private DOMDataTreePrefixTable() {
 
@@ -42,7 +41,6 @@ public final class DOMDataTreePrefixTable<V> {
     }
 
     /**
-     *
      * Lookups entry by provided {@link DOMDataTreeIdentifier}, if entry is not present returns
      * closest non-null entry towards root or null if no entry towards root exists.
      *
@@ -59,29 +57,28 @@ public final class DOMDataTreePrefixTable<V> {
     }
 
     /**
-     * Stores value associated to the prefix
+     * Stores value associated to the prefix.
      *
      * @param prefix DOM prefix of value
      * @param value Value to be stored
      * @throws IllegalStateException If value is already stored for provided prefix
      */
     public void store(@Nonnull final DOMDataTreeIdentifier prefix, @Nonnull final V value) {
-        DOMDataTreePrefixTableEntry<V> t = roots.get(prefix.getDatastoreType());
-        if (t == null) {
-            t = new DOMDataTreePrefixTableEntry<V>();
-            roots.put(prefix.getDatastoreType(), t);
+        DOMDataTreePrefixTableEntry<V> domDataTreePrefixTableEntry = roots.get(prefix.getDatastoreType());
+        if (domDataTreePrefixTableEntry == null) {
+            domDataTreePrefixTableEntry = new DOMDataTreePrefixTableEntry<V>();
+            roots.put(prefix.getDatastoreType(), domDataTreePrefixTableEntry);
         }
 
-        t.store(prefix.getRootIdentifier(), value);
+        domDataTreePrefixTableEntry.store(prefix.getRootIdentifier(), value);
     }
 
     /**
      * Removes value associated to the prefix.
-     *
      * Value is removed only and only if full prefix match for stored value. Removal of prefix does
      * not remove child prefixes.
      *
-     * @param prefix
+     * @param prefix to be removed
      */
     public void remove(@Nonnull final DOMDataTreeIdentifier prefix) {
         final DOMDataTreePrefixTableEntry<V> t = roots.get(prefix.getDatastoreType());
index 8bf60a38ac1ce605bebe721fabadb0291a63489d..2e3593ff086d2c76584b7d5aad41a7b9412a3cb7 100644 (file)
@@ -16,17 +16,14 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath;
  * Listener which is notified when subscriptions changes and
  * provides set of notification types for which currently
  * subscriptions are in place.
- *
  */
 @Beta
 public interface DOMNotificationSubscriptionListener extends EventListener {
 
     /**
-     * Invoked when notification subscription changed
+     * Invoked when notification subscription changed.
      *
-     * @param currentTypes Set of notification types
-     * for which listeners are registered.
+     * @param currentTypes Set of notification types for which listeners are registered.
      */
     void onSubscriptionChanged(Set<SchemaPath> currentTypes);
-
 }
index 9418e8f079311f85ed3f03cf8e4b2dd3c8d209b2..ddce0267d2ec4224d6ab8682db50ed0b1e12307a 100644 (file)
@@ -19,5 +19,4 @@ import org.opendaylight.yangtools.concepts.ListenerRegistration;
 public interface DOMNotificationSubscriptionListenerRegistry  {
 
     <L extends DOMNotificationSubscriptionListener> ListenerRegistration<L> registerSubscriptionListener(L listener);
-
 }
index ac0e7c944a50a087cba173037250344277d8a86c..e4b7739e0cc451c92627bfe1a1b202936b6b3ce4 100644 (file)
@@ -7,8 +7,6 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
-import org.opendaylight.mdsal.dom.api.DOMRpcResult;
-
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import java.io.Serializable;
@@ -17,6 +15,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Objects;
 import javax.annotation.Nonnull;
+import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import org.opendaylight.yangtools.concepts.Immutable;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
index 4f1ad7eed521114c88dca43e875e89ac470e02d0..f338227701589b09238ec8f7563e67716aed0478 100644 (file)
@@ -7,17 +7,15 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
+import com.google.common.collect.ForwardingObject;
+import java.util.Map;
+import javax.annotation.Nonnull;
 import org.opendaylight.mdsal.common.api.TransactionChainListener;
-
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataBrokerExtension;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
-import com.google.common.collect.ForwardingObject;
-import java.util.Map;
-import javax.annotation.Nonnull;
-
 
 /**
  * Utility {@link DOMDataBroker} implementation which forwards all interface
index 8507051e35a4518df182cdc1590641f92d31c36b..3c7de4b3bf9914172d207f1561524c7cb42c4c34 100644 (file)
@@ -7,14 +7,13 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
-import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.mdsal.common.api.ReadFailedException;
-
-import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
 import com.google.common.base.Optional;
 import com.google.common.collect.ForwardingObject;
 import com.google.common.util.concurrent.CheckedFuture;
 import javax.annotation.Nonnull;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.common.api.ReadFailedException;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
@@ -22,18 +21,21 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
  * Utility {@link DOMDataTreeReadTransaction} implementation which forwards all interface
  * method invocation to a delegate instance.
  */
-public abstract class ForwardingDOMDataReadOnlyTransaction extends ForwardingObject implements DOMDataTreeReadTransaction {
+public abstract class ForwardingDOMDataReadOnlyTransaction extends ForwardingObject
+        implements DOMDataTreeReadTransaction {
     @Override
     @Nonnull
     protected abstract DOMDataTreeReadTransaction delegate();
 
     @Override
-    public CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> read(final LogicalDatastoreType store, final YangInstanceIdentifier path) {
+    public CheckedFuture<Optional<NormalizedNode<?, ?>>,
+            ReadFailedException> read(final LogicalDatastoreType store, final YangInstanceIdentifier path) {
         return delegate().read(store, path);
     }
 
     @Override
-    public CheckedFuture<Boolean, ReadFailedException> exists(final LogicalDatastoreType store, final YangInstanceIdentifier path) {
+    public CheckedFuture<Boolean, ReadFailedException> exists(final LogicalDatastoreType store,
+            final YangInstanceIdentifier path) {
         return delegate().exists(store, path);
     }
 
index a2c3e22ba54a4b19553083da05ee3080537e0df4..ad213009c08876656efd36f634bdb928e6c49084 100644 (file)
@@ -7,12 +7,11 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
-import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
-
 import com.google.common.collect.ForwardingObject;
 import com.google.common.util.concurrent.CheckedFuture;
 import javax.annotation.Nonnull;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
@@ -21,7 +20,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
  * Utility {@link DOMDataTreeWriteTransaction} implementation which forwards all interface
  * method invocation to a delegate instance.
  */
-public abstract class ForwardingDOMDataWriteTransaction extends ForwardingObject implements DOMDataTreeWriteTransaction {
+public abstract class ForwardingDOMDataWriteTransaction extends ForwardingObject
+        implements DOMDataTreeWriteTransaction {
     @Override
     protected abstract @Nonnull DOMDataTreeWriteTransaction delegate();
 
@@ -31,12 +31,14 @@ public abstract class ForwardingDOMDataWriteTransaction extends ForwardingObject
     }
 
     @Override
-    public void put(final LogicalDatastoreType store, final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
+    public void put(final LogicalDatastoreType store, final YangInstanceIdentifier path,
+            final NormalizedNode<?, ?> data) {
         delegate().put(store, path, data);
     }
 
     @Override
-    public void merge(final LogicalDatastoreType store, final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
+    public void merge(final LogicalDatastoreType store, final YangInstanceIdentifier path,
+            final NormalizedNode<?, ?> data) {
         delegate().merge(store, path, data);
     }
 
index db5380529fd908d1f3eb0f22d639a69f1b9cfa51..4202f60f7fb7fd355c11703a3d36270dce3c0430 100644 (file)
@@ -7,23 +7,24 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
-import org.opendaylight.mdsal.dom.api.DOMNotification;
-import org.opendaylight.mdsal.dom.api.DOMNotificationPublishService;
-
 import com.google.common.collect.ForwardingObject;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.concurrent.TimeUnit;
+import org.opendaylight.mdsal.dom.api.DOMNotification;
+import org.opendaylight.mdsal.dom.api.DOMNotificationPublishService;
 
 /**
  * Utility implementations of {@link DOMNotificationPublishService} which forwards
  * all requests to a delegate instance.
  */
-public abstract class ForwardingDOMNotificationPublishService extends ForwardingObject implements DOMNotificationPublishService {
+public abstract class ForwardingDOMNotificationPublishService extends
+            ForwardingObject implements DOMNotificationPublishService {
     @Override
     protected abstract DOMNotificationPublishService delegate();
 
     @Override
-    public ListenableFuture<? extends Object> putNotification(final DOMNotification notification) throws InterruptedException {
+    public ListenableFuture<? extends Object> putNotification(
+            final DOMNotification notification) throws InterruptedException {
         return delegate().putNotification(notification);
     }
 
@@ -33,7 +34,8 @@ public abstract class ForwardingDOMNotificationPublishService extends Forwarding
     }
 
     @Override
-    public ListenableFuture<? extends Object> offerNotification(final DOMNotification notification, final long timeout,
+    public ListenableFuture<? extends Object> offerNotification(
+            final DOMNotification notification, final long timeout,
             final TimeUnit unit) throws InterruptedException {
         return delegate().offerNotification(notification, timeout, unit);
     }
index 97c5b256fe2e775be0f469de17125724a7bf1e8f..2e0f6e33525b92bcdd12fe2bbdcff43c1d3311e8 100644 (file)
@@ -7,11 +7,10 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
-import org.opendaylight.mdsal.dom.api.DOMNotificationListener;
-import org.opendaylight.mdsal.dom.api.DOMNotificationService;
-
 import com.google.common.collect.ForwardingObject;
 import java.util.Collection;
+import org.opendaylight.mdsal.dom.api.DOMNotificationListener;
+import org.opendaylight.mdsal.dom.api.DOMNotificationService;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
index 7f9e36b9457c6b8931b4b170ad320ee7d1c0515b..7125b79089b28f3992d5e94a1dca9a9724a55bae 100644 (file)
@@ -7,14 +7,13 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
+import com.google.common.collect.ForwardingObject;
+import com.google.common.util.concurrent.CheckedFuture;
+import javax.annotation.Nonnull;
 import org.opendaylight.mdsal.dom.api.DOMRpcException;
 import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementation;
 import org.opendaylight.mdsal.dom.api.DOMRpcResult;
-
-import com.google.common.collect.ForwardingObject;
-import com.google.common.util.concurrent.CheckedFuture;
-import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
 /**
@@ -26,7 +25,8 @@ public abstract class ForwardingDOMRpcImplementation extends ForwardingObject im
     protected abstract @Nonnull DOMRpcImplementation delegate();
 
     @Override
-    public CheckedFuture<DOMRpcResult, DOMRpcException> invokeRpc(final DOMRpcIdentifier type, final NormalizedNode<?, ?> input) {
+    public CheckedFuture<DOMRpcResult, DOMRpcException> invokeRpc(
+            final DOMRpcIdentifier type, final NormalizedNode<?, ?> input) {
         return delegate().invokeRpc(type, input);
     }
 }
index 85dac811ac78a52541e8918f689bf1107bbde3c5..0d473477e6574766640e064089b3cd5519c2aa4e 100644 (file)
@@ -7,15 +7,14 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
+import com.google.common.collect.ForwardingObject;
+import java.util.Set;
+import javax.annotation.Nonnull;
 import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementation;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration;
 import org.opendaylight.mdsal.dom.api.DOMRpcProviderService;
 
-import com.google.common.collect.ForwardingObject;
-import java.util.Set;
-import javax.annotation.Nonnull;
-
 /**
  * Utility class which implements {@link DOMRpcProviderService} by forwarding
  * requests to a backing instance.
@@ -25,12 +24,14 @@ public abstract class ForwardingDOMRpcProviderService extends ForwardingObject i
     protected abstract @Nonnull DOMRpcProviderService delegate();
 
     @Override
-    public <T extends DOMRpcImplementation> DOMRpcImplementationRegistration<T> registerRpcImplementation(final T implementation, final DOMRpcIdentifier... types) {
+    public <T extends DOMRpcImplementation> DOMRpcImplementationRegistration<T> registerRpcImplementation(
+            final T implementation, final DOMRpcIdentifier... types) {
         return delegate().registerRpcImplementation(implementation, types);
     }
 
     @Override
-    public <T extends DOMRpcImplementation> DOMRpcImplementationRegistration<T> registerRpcImplementation(final T implementation, final Set<DOMRpcIdentifier> types) {
+    public <T extends DOMRpcImplementation> DOMRpcImplementationRegistration<T> registerRpcImplementation(
+            final T implementation, final Set<DOMRpcIdentifier> types) {
         return delegate().registerRpcImplementation(implementation, types);
     }
 }
index cf28700c4b6b554fa90c1f73276d7732423da990..e2761ad5083cb2c73d875ddd380e554a1039d229 100644 (file)
@@ -7,11 +7,10 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
-import org.opendaylight.mdsal.dom.api.DOMRpcResult;
-
 import com.google.common.collect.ForwardingObject;
 import java.util.Collection;
 import javax.annotation.Nonnull;
+import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
index 26f1ca39f3ea1d787fe3b66577a87b5bc3091f41..555bbaae0dbc021dc844f6053e252d23e2b7fc04 100644 (file)
@@ -7,14 +7,13 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
+import com.google.common.collect.ForwardingObject;
+import com.google.common.util.concurrent.CheckedFuture;
+import javax.annotation.Nonnull;
 import org.opendaylight.mdsal.dom.api.DOMRpcAvailabilityListener;
 import org.opendaylight.mdsal.dom.api.DOMRpcException;
 import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
-
-import com.google.common.collect.ForwardingObject;
-import com.google.common.util.concurrent.CheckedFuture;
-import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
@@ -27,12 +26,14 @@ public abstract class ForwardingDOMRpcService extends ForwardingObject implement
     protected abstract @Nonnull DOMRpcService delegate();
 
     @Override
-    public CheckedFuture<DOMRpcResult, DOMRpcException> invokeRpc(final SchemaPath type, final NormalizedNode<?, ?> input) {
+    public CheckedFuture<DOMRpcResult, DOMRpcException> invokeRpc(
+            final SchemaPath type, final NormalizedNode<?, ?> input) {
         return delegate().invokeRpc(type, input);
     }
 
     @Override
-    public <T extends DOMRpcAvailabilityListener> ListenerRegistration<T> registerRpcListener(final T listener) {
+    public <T extends DOMRpcAvailabilityListener>
+            ListenerRegistration<T> registerRpcListener(final T listener) {
         return delegate().registerRpcListener(listener);
     }
 }
index c3f5da175cb6c2f829fe557cbbfbc7d2be882203..0e67634a9145b1e5a9a03ab313809c5c987a686f 100644 (file)
@@ -7,13 +7,12 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
+import com.google.common.collect.ForwardingObject;
+import javax.annotation.Nonnull;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
 
-import com.google.common.collect.ForwardingObject;
-import javax.annotation.Nonnull;
-
 /**
  * Utility {@link DOMTransactionChain} implementation which forwards all interface
  * method invocation to a delegate instance.
index f8248f243ce3216d3f16b437d642640b8203d69e..b3087034e4ad6ba1eda0eb421a8fd9a82daf5d96 100644 (file)
@@ -18,7 +18,8 @@ import java.util.concurrent.locks.Lock;
  */
 public final class RegistrationTreeSnapshot<T> implements AutoCloseable {
     @SuppressWarnings("rawtypes")
-    private static final AtomicIntegerFieldUpdater<RegistrationTreeSnapshot> CLOSED_UPDATER = AtomicIntegerFieldUpdater.newUpdater(RegistrationTreeSnapshot.class, "closed");
+    private static final AtomicIntegerFieldUpdater<RegistrationTreeSnapshot> CLOSED_UPDATER =
+        AtomicIntegerFieldUpdater.newUpdater(RegistrationTreeSnapshot.class, "closed");
     private final RegistrationTreeNode<T> node;
     private final Lock lock;
 
index 19760d54b9754aadeb34145e5173ea18d1dc284c..3d2d297e0afe79eea7386eea0d253cdbb9459461 100644 (file)
@@ -27,21 +27,18 @@ public abstract class RpcRoutingStrategy implements Identifiable<QName> {
     }
 
     /**
-     * Returns leaf QName in which RPC Route is stored
-     *
-     *
+     * Returns leaf QName in which RPC Route is stored.
      * @return leaf QName in which RPC Route is stored
      * @throws UnsupportedOperationException If RPC is not content routed.
-     *  ({@link #isContextBasedRouted()} returned <code>false</code>)
+     *      ({@link #isContextBasedRouted()} returned <code>false</code>)
      */
     public abstract QName getLeaf();
 
     /**
-     * Returns identity QName which represents RPC Routing context
-     *
+     * Returns identity QName which represents RPC Routing context.
      * @return identity QName which represents RPC Routing context
      * @throws UnsupportedOperationException If RPC is not content routed.
-     *  ({@link #isContextBasedRouted()} returned <code>false</code>)
+     *      ({@link #isContextBasedRouted()} returned <code>false</code>)
      */
     public abstract QName getContext();
 
@@ -107,7 +104,7 @@ public abstract class RpcRoutingStrategy implements Identifiable<QName> {
 
     private static final class GlobalRpcStrategy extends RpcRoutingStrategy {
 
-        public GlobalRpcStrategy(final QName identifier) {
+        GlobalRpcStrategy(final QName identifier) {
             super(identifier);
         }
 
index c2f349810675643ae1ce187e72fdce7c84040662..9058b66e392b0324034223e7baabd95d6c4aa5ef 100644 (file)
@@ -8,14 +8,13 @@
 
 package org.opendaylight.mdsal.dom.spi;
 
+import com.google.common.base.Optional;
+import com.google.common.collect.ClassToInstanceMap;
+import com.google.common.collect.ImmutableClassToInstanceMap;
 import org.opendaylight.mdsal.dom.api.DOMMountPoint;
 import org.opendaylight.mdsal.dom.api.DOMService;
-
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import com.google.common.base.Optional;
-import com.google.common.collect.ClassToInstanceMap;
-import com.google.common.collect.ImmutableClassToInstanceMap;
 
 public class SimpleDOMMountPoint implements DOMMountPoint {
 
@@ -23,10 +22,13 @@ public class SimpleDOMMountPoint implements DOMMountPoint {
     private final ClassToInstanceMap<DOMService> services;
     private final SchemaContext schemaContext;
 
-    public static final SimpleDOMMountPoint create(final YangInstanceIdentifier identifier, final ClassToInstanceMap<DOMService> services, final SchemaContext ctx) {
+    public static final SimpleDOMMountPoint create(final YangInstanceIdentifier identifier,
+            final ClassToInstanceMap<DOMService> services, final SchemaContext ctx) {
         return new SimpleDOMMountPoint(identifier, services, ctx);
     }
-    private SimpleDOMMountPoint(final YangInstanceIdentifier identifier, final ClassToInstanceMap<DOMService> services, final SchemaContext ctx) {
+
+    private SimpleDOMMountPoint(final YangInstanceIdentifier identifier,
+            final ClassToInstanceMap<DOMService> services, final SchemaContext ctx) {
         this.identifier = identifier;
         this.services = ImmutableClassToInstanceMap.copyOf(services);
         this.schemaContext = ctx;
index 062c765322072748a1a831fad1d1cda0cfcd4f3e..e8e6b50a53ac91b46e903994eb421fc9967d0035 100644 (file)
@@ -16,10 +16,8 @@ import javax.annotation.Nullable;
 
 /**
  * Abstract DOM Store Transaction.
- *
  * Convenience super implementation of DOM Store transaction which provides common implementation of
  * {@link #toString()} and {@link #getIdentifier()}.
- *
  * It can optionally capture the context where it was allocated.
  *
  * @param <T> identifier type
index cc8bee6d14f55e72f26b3ca90ae477d068ed466b..bffb506c7f97dd1d50d2962edcc308aa031ec879 100644 (file)
@@ -7,16 +7,15 @@
  */
 package org.opendaylight.mdsal.dom.spi.store;
 
-import org.opendaylight.mdsal.dom.spi.AbstractDOMDataTreeChangeListenerRegistration;
-import org.opendaylight.mdsal.dom.spi.AbstractRegistrationTree;
-import org.opendaylight.mdsal.dom.spi.RegistrationTreeNode;
-import org.opendaylight.mdsal.dom.spi.RegistrationTreeSnapshot;
-
-import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;
 import java.util.List;
 import javax.annotation.Nonnull;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
+import org.opendaylight.mdsal.dom.spi.AbstractDOMDataTreeChangeListenerRegistration;
+import org.opendaylight.mdsal.dom.spi.AbstractRegistrationTree;
+import org.opendaylight.mdsal.dom.spi.RegistrationTreeNode;
+import org.opendaylight.mdsal.dom.spi.RegistrationTreeSnapshot;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
@@ -28,28 +27,36 @@ import org.slf4j.LoggerFactory;
 /**
  * Abstract base class for {@link DOMStoreTreeChangePublisher} implementations.
  */
-public abstract class AbstractDOMStoreTreeChangePublisher extends AbstractRegistrationTree<AbstractDOMDataTreeChangeListenerRegistration<?>> implements DOMStoreTreeChangePublisher {
+public abstract class AbstractDOMStoreTreeChangePublisher
+    extends AbstractRegistrationTree<AbstractDOMDataTreeChangeListenerRegistration<?>>
+        implements DOMStoreTreeChangePublisher {
     private static final Logger LOG = LoggerFactory.getLogger(AbstractDOMStoreTreeChangePublisher.class);
 
     /**
-     * Callback for subclass to notify specified registrations of a candidate at a specified path. This method is guaranteed
+     * Callback for subclass to notify specified registrations
+     * of a candidate at a specified path. This method is guaranteed
      * to be only called from within {@link #processCandidateTree(DataTreeCandidate)}.
-     *
      * @param registrations Registrations which are affected by the candidate node
      * @param path Path of changed candidate node. Guaranteed to match the path specified by the registration
      * @param node Candidate node
      */
-    protected abstract void notifyListeners(@Nonnull Collection<AbstractDOMDataTreeChangeListenerRegistration<?>> registrations, @Nonnull YangInstanceIdentifier path, @Nonnull DataTreeCandidateNode node);
+    protected abstract void notifyListeners(
+            @Nonnull Collection<AbstractDOMDataTreeChangeListenerRegistration<?>> registrations,
+            @Nonnull YangInstanceIdentifier path, @Nonnull DataTreeCandidateNode node);
 
     /**
-     * Callback notifying the subclass that the specified registration is being closed and it's user no longer
-     * wishes to receive notifications. This notification is invoked while the {@link org.opendaylight.yangtools.concepts.ListenerRegistration#close()}
-     * method is executing. Subclasses can use this callback to properly remove any delayed notifications pending
+     * Callback notifying the subclass that the specified registration is being
+     * closed and it's user no longer
+     * wishes to receive notifications. This notification is invoked while
+     * the {@link org.opendaylight.yangtools.concepts.ListenerRegistration#close()}
+     * method is executing. Subclasses can use this callback to properly
+     * remove any delayed notifications pending
      * towards the registration.
      *
      * @param registration Registration which is being closed
      */
-    protected abstract void registrationRemoved(@Nonnull AbstractDOMDataTreeChangeListenerRegistration<?> registration);
+    protected abstract void registrationRemoved(
+            @Nonnull AbstractDOMDataTreeChangeListenerRegistration<?> registration);
 
     /**
      * Process a candidate tree with respect to registered listeners.
@@ -63,19 +70,24 @@ public abstract class AbstractDOMStoreTreeChangePublisher extends AbstractRegist
             return;
         }
 
-        try (final RegistrationTreeSnapshot<AbstractDOMDataTreeChangeListenerRegistration<?>> snapshot = takeSnapshot()) {
-            final List<PathArgument> toLookup = ImmutableList.copyOf(candidate.getRootPath().getPathArguments());
+        try (final RegistrationTreeSnapshot<AbstractDOMDataTreeChangeListenerRegistration<?>> snapshot
+                = takeSnapshot()) {
+            final List<PathArgument> toLookup
+                = ImmutableList.copyOf(candidate.getRootPath().getPathArguments());
             lookupAndNotify(toLookup, 0, snapshot.getRootNode(), candidate);
         }
     }
 
     @Override
-    public <L extends DOMDataTreeChangeListener> AbstractDOMDataTreeChangeListenerRegistration<L> registerTreeChangeListener(final YangInstanceIdentifier treeId, final L listener) {
+    public <L extends DOMDataTreeChangeListener> AbstractDOMDataTreeChangeListenerRegistration<L>
+        registerTreeChangeListener(final YangInstanceIdentifier treeId, final L listener) {
         // Take the write lock
         takeLock();
         try {
-            final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> node = findNodeFor(treeId.getPathArguments());
-            final AbstractDOMDataTreeChangeListenerRegistration<L> reg = new AbstractDOMDataTreeChangeListenerRegistration<L>(listener) {
+            final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> node =
+                    findNodeFor(treeId.getPathArguments());
+            final AbstractDOMDataTreeChangeListenerRegistration<L> reg =
+                    new AbstractDOMDataTreeChangeListenerRegistration<L>(listener) {
                 @Override
                 protected void removeRegistration() {
                     AbstractDOMStoreTreeChangePublisher.this.removeRegistration(node, this);
@@ -91,16 +103,20 @@ public abstract class AbstractDOMStoreTreeChangePublisher extends AbstractRegist
         }
     }
 
-    private void lookupAndNotify(final List<PathArgument> args, final int offset, final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> node, final DataTreeCandidate candidate) {
+    private void lookupAndNotify(final List<PathArgument> args,
+            final int offset, final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> node,
+                    final DataTreeCandidate candidate) {
         if (args.size() != offset) {
             final PathArgument arg = args.get(offset);
 
-            final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> exactChild = node.getExactChild(arg);
+            final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> exactChild
+                = node.getExactChild(arg);
             if (exactChild != null) {
                 lookupAndNotify(args, offset + 1, exactChild, candidate);
             }
 
-            for (RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> c : node.getInexactChildren(arg)) {
+            for (RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> c :
+                    node.getInexactChildren(arg)) {
                 lookupAndNotify(args, offset + 1, c, candidate);
             }
         } else {
@@ -108,7 +124,9 @@ public abstract class AbstractDOMStoreTreeChangePublisher extends AbstractRegist
         }
     }
 
-    private void notifyNode(final YangInstanceIdentifier path, final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> regNode, final DataTreeCandidateNode candNode) {
+    private void notifyNode(final YangInstanceIdentifier path,
+            final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> regNode,
+            final DataTreeCandidateNode candNode) {
         if (candNode.getModificationType() == ModificationType.UNMODIFIED) {
             LOG.debug("Skipping unmodified candidate {}", path);
             return;
@@ -121,12 +139,14 @@ public abstract class AbstractDOMStoreTreeChangePublisher extends AbstractRegist
 
         for (DataTreeCandidateNode candChild : candNode.getChildNodes()) {
             if (candChild.getModificationType() != ModificationType.UNMODIFIED) {
-                final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> regChild = regNode.getExactChild(candChild.getIdentifier());
+                final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> regChild =
+                        regNode.getExactChild(candChild.getIdentifier());
                 if (regChild != null) {
                     notifyNode(path.node(candChild.getIdentifier()), regChild, candChild);
                 }
 
-                for (RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> rc : regNode.getInexactChildren(candChild.getIdentifier())) {
+                for (RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> rc :
+                    regNode.getInexactChildren(candChild.getIdentifier())) {
                     notifyNode(path.node(candChild.getIdentifier()), rc, candChild);
                 }
             }
index 55634853387f5d0eb526dbd40397e55bd3697f36..61c88d8a331f983043858c52ee96c3a841abbcf6 100644 (file)
@@ -7,27 +7,28 @@
  */
 package org.opendaylight.mdsal.dom.spi.store;
 
-import org.opendaylight.mdsal.dom.spi.store.SnapshotBackedWriteTransaction.TransactionReadyPrototype;
-
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+
+import org.opendaylight.mdsal.dom.spi.store.SnapshotBackedWriteTransaction.TransactionReadyPrototype;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Abstract implementation of the {@link DOMStoreTransactionChain} interface relying on {@link DataTreeSnapshot} supplier
+ * Abstract implementation of the {@link DOMStoreTransactionChain}
+ * interface relying on {@link DataTreeSnapshot} supplier
  * and backend commit coordinator.
- *
  * @param <T> transaction identifier type
  */
 @Beta
-public abstract class AbstractSnapshotBackedTransactionChain<T> extends TransactionReadyPrototype<T> implements DOMStoreTransactionChain {
-    private static abstract class State {
+public abstract class AbstractSnapshotBackedTransactionChain<T>
+        extends TransactionReadyPrototype<T> implements DOMStoreTransactionChain {
+    private abstract static class State {
         /**
          * Allocate a new snapshot.
          *
@@ -69,13 +70,15 @@ public abstract class AbstractSnapshotBackedTransactionChain<T> extends Transact
         @Override
         protected DataTreeSnapshot getSnapshot() {
             final DataTreeSnapshot ret = snapshot;
-            Preconditions.checkState(ret != null, "Previous transaction %s is not ready yet", transaction.getIdentifier());
+            Preconditions.checkState(ret != null,
+                    "Previous transaction %s is not ready yet", transaction.getIdentifier());
             return ret;
         }
 
         void setSnapshot(final DataTreeSnapshot snapshot) {
             final boolean success = SNAPSHOT_UPDATER.compareAndSet(this, null, snapshot);
-            Preconditions.checkState(success, "Transaction %s has already been marked as ready", transaction.getIdentifier());
+            Preconditions.checkState(success,
+                    "Transaction %s has already been marked as ready", transaction.getIdentifier());
         }
     }
 
@@ -96,8 +99,10 @@ public abstract class AbstractSnapshotBackedTransactionChain<T> extends Transact
     }
 
     @SuppressWarnings("rawtypes")
-    private static final AtomicReferenceFieldUpdater<AbstractSnapshotBackedTransactionChain, State> STATE_UPDATER =
-            AtomicReferenceFieldUpdater.newUpdater(AbstractSnapshotBackedTransactionChain.class, State.class, "state");
+    private static final AtomicReferenceFieldUpdater<AbstractSnapshotBackedTransactionChain, State>
+        STATE_UPDATER =
+            AtomicReferenceFieldUpdater.newUpdater(AbstractSnapshotBackedTransactionChain.class,
+                    State.class, "state");
     private static final Logger LOG = LoggerFactory.getLogger(AbstractSnapshotBackedTransactionChain.class);
     private static final Shutdown CLOSED = new Shutdown("Transaction chain is closed");
     private static final Shutdown FAILED = new Shutdown("Transaction chain has failed");
@@ -126,7 +131,8 @@ public abstract class AbstractSnapshotBackedTransactionChain<T> extends Transact
 
     protected DOMStoreReadTransaction newReadOnlyTransaction(T transactionId) {
         final Entry<State, DataTreeSnapshot> entry = getSnapshot();
-        return SnapshotBackedTransactions.newReadTransaction(transactionId, getDebugTransactions(), entry.getValue());
+        return SnapshotBackedTransactions.newReadTransaction(transactionId,
+                getDebugTransactions(), entry.getValue());
     }
 
     @Override
@@ -140,7 +146,8 @@ public abstract class AbstractSnapshotBackedTransactionChain<T> extends Transact
 
         do {
             entry = getSnapshot();
-            ret = new SnapshotBackedReadWriteTransaction<T>(transactionId, getDebugTransactions(), entry.getValue(), this);
+            ret = new SnapshotBackedReadWriteTransaction<T>(transactionId,
+                    getDebugTransactions(), entry.getValue(), this);
         } while (!recordTransaction(entry.getKey(), ret));
 
         return ret;
@@ -157,7 +164,8 @@ public abstract class AbstractSnapshotBackedTransactionChain<T> extends Transact
 
         do {
             entry = getSnapshot();
-            ret = new SnapshotBackedWriteTransaction<T>(transactionId, getDebugTransactions(), entry.getValue(), this);
+            ret = new SnapshotBackedWriteTransaction<T>(transactionId,
+                    getDebugTransactions(), entry.getValue(), this);
         } while (!recordTransaction(entry.getKey(), ret));
 
         return ret;
@@ -171,7 +179,8 @@ public abstract class AbstractSnapshotBackedTransactionChain<T> extends Transact
             if (allocated.getTransaction().equals(tx)) {
                 final boolean success = STATE_UPDATER.compareAndSet(this, localState, idleState);
                 if (!success) {
-                    LOG.warn("Transaction {} aborted, but chain {} state already transitioned from {} to {}, very strange",
+                    LOG.warn("Transaction {} aborted, but chain {} s"
+                            + "tate already transitioned from {} to {}, very strange",
                         tx, this, localState, state);
                 }
             }
@@ -179,13 +188,15 @@ public abstract class AbstractSnapshotBackedTransactionChain<T> extends Transact
     }
 
     @Override
-    protected final DOMStoreThreePhaseCommitCohort transactionReady(final SnapshotBackedWriteTransaction<T> tx, final DataTreeModification tree) {
+    protected final DOMStoreThreePhaseCommitCohort transactionReady(
+            final SnapshotBackedWriteTransaction<T> tx, final DataTreeModification tree) {
         final State localState = state;
 
         if (localState instanceof Allocated) {
             final Allocated allocated = (Allocated)localState;
             final DOMStoreWriteTransaction transaction = allocated.getTransaction();
-            Preconditions.checkState(tx.equals(transaction), "Mis-ordered ready transaction %s last allocated was %s", tx, transaction);
+            Preconditions.checkState(tx.equals(transaction),
+                    "Mis-ordered ready transaction %s last allocated was %s", tx, transaction);
             allocated.setSnapshot(tree);
         } else {
             LOG.debug("Ignoring transaction {} readiness due to state {}", tx, localState);
@@ -199,7 +210,8 @@ public abstract class AbstractSnapshotBackedTransactionChain<T> extends Transact
         final State localState = state;
 
         do {
-            Preconditions.checkState(!CLOSED.equals(localState), "Transaction chain {} has been closed", this);
+            Preconditions.checkState(!CLOSED.equals(localState),
+                    "Transaction chain {} has been closed", this);
 
             if (FAILED.equals(localState)) {
                 LOG.debug("Ignoring user close in failed state");
@@ -210,7 +222,6 @@ public abstract class AbstractSnapshotBackedTransactionChain<T> extends Transact
 
     /**
      * Notify the base logic that a previously-submitted transaction has been committed successfully.
-     *
      * @param transaction Transaction which completed successfully.
      */
     protected final void onTransactionCommited(final SnapshotBackedWriteTransaction<T> transaction) {
@@ -234,17 +245,18 @@ public abstract class AbstractSnapshotBackedTransactionChain<T> extends Transact
         }
 
         if (!STATE_UPDATER.compareAndSet(this, localState, idleState)) {
-            LOG.debug("Transaction chain {} has already transitioned from {} to {}, not making it idle", this, localState, state);
+            LOG.debug("Transaction chain {} has already transitioned from "
+                    + "{} to {}, not making it idle", this, localState, state);
         }
     }
 
     /**
      * Notify the base logic that a previously-submitted transaction has failed.
-     *
      * @param transaction Transaction which failed.
      * @param cause Failure cause
      */
-    protected final void onTransactionFailed(final SnapshotBackedWriteTransaction<T> transaction, final Throwable cause) {
+    protected final void onTransactionFailed(
+            final SnapshotBackedWriteTransaction<T> transaction, final Throwable cause) {
         LOG.debug("Transaction chain {} failed on transaction {}", this, transaction, cause);
         state = FAILED;
     }
@@ -258,24 +270,22 @@ public abstract class AbstractSnapshotBackedTransactionChain<T> extends Transact
 
     /**
      * Inquire as to whether transactions should record their allocation context.
-     *
      * @return True if allocation context should be recorded.
      */
     protected abstract boolean getDebugTransactions();
 
     /**
      * Take a fresh {@link DataTreeSnapshot} from the backend.
-     *
      * @return A new snapshot.
      */
     protected abstract DataTreeSnapshot takeSnapshot();
 
     /**
      * Create a cohort for driving the transaction through the commit process.
-     *
      * @param transaction Transaction handle
      * @param modification {@link DataTreeModification} which needs to be applied to the backend
      * @return A {@link DOMStoreThreePhaseCommitCohort} cohort.
      */
-    protected abstract DOMStoreThreePhaseCommitCohort createCohort(final SnapshotBackedWriteTransaction<T> transaction, final DataTreeModification modification);
+    protected abstract DOMStoreThreePhaseCommitCohort createCohort(
+            final SnapshotBackedWriteTransaction<T> transaction, final DataTreeModification modification);
 }
index 52fb6573196c89466dd5fb5a452b82614c3a53bd..d63bf0288775a69f1722506673e58dfef0e81d91 100644 (file)
@@ -15,23 +15,24 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
  * <p>
  * DOM Data Store provides transactional tree-like storage for YANG-modeled
  * entities described by YANG schema and represented by {@link NormalizedNode}.
- *
  * Read and write access to stored data is provided only via transactions
+ *
+ * <p>
  * created using {@link #newReadOnlyTransaction()},
  * {@link #newWriteOnlyTransaction()} and {@link #newReadWriteTransaction()}, or
  * by creating {@link org.opendaylight.mdsal.common.api.TransactionChain}.
- *
  */
 public interface DOMStore extends DOMStoreTransactionFactory {
 
     /**
-     *
      * Creates new transaction chain.
      *
+     * <p>
      * Transactions in a chain need to be committed in sequence and each
      * transaction should see the effects of previous transactions as if they
      * happened.
      *
+     * <p>
      * See {@link DOMStoreTransactionChain} for more information.
      *
      * @return Newly created transaction chain.
index 8509cb403033a001a079e1d2656b26a26b472a59..9069c3cacd9914f404e4cf2878974fcc78b82c58 100644 (file)
@@ -7,17 +7,16 @@
  */
 package org.opendaylight.mdsal.dom.spi.store;
 
+import com.google.common.base.Optional;
+import com.google.common.util.concurrent.CheckedFuture;
 import org.opendaylight.mdsal.common.api.ReadFailedException;
-
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
 
 public interface DOMStoreReadTransaction extends DOMStoreTransaction {
 
     /**
-     * Reads data from provided logical data store located at provided path
+     * Reads data from provided logical data store located at provided path.
      *
      * @param path
      *            Path which uniquely identifies subtree which client want to
@@ -37,8 +36,8 @@ public interface DOMStoreReadTransaction extends DOMStoreTransaction {
 
     /**
      * Checks if data is available in the logical data store located at provided path.
-     * <p>
      *
+     * <p>
      * Note: a successful result from this method makes no guarantee that a subsequent call to {@link #read}
      * will succeed. It is possible that the data resides in a data store on a remote node and, if that
      * node goes down or a network failure occurs, a subsequent read would fail. Another scenario is if
index 418dfa77c9c8c3b2064e0227c807e69930379de1..283886918f3022a19c3cd0c8c266e56e55b52f11 100644 (file)
@@ -35,6 +35,7 @@ public interface DOMStoreThreePhaseCommitCohort {
     /**
      * Initiates a pre-commit phase of associated transaction on datastore.
      *
+     * <p>
      * This message is valid only and only if and only if the participant responded
      * on {@link #canCommit()} call with positive response.
      *
index 1a17cfb7935dbfe25e4dea448e540a9ea0f93d1a..37bffa37343644bd5e3ce319fe92e0c17447a04a 100644 (file)
@@ -10,19 +10,19 @@ package org.opendaylight.mdsal.dom.spi.store;
 import org.opendaylight.yangtools.concepts.Identifiable;
 
 /**
- * DOM Data Store transaction
+ * DOM Data Store transaction.
  *
+ * <p>
  * See {@link DOMStoreReadTransaction}, {@link DOMStoreWriteTransaction} and {@link DOMStoreReadWriteTransaction}
  * for specific transaction types.
- *
  */
 public interface DOMStoreTransaction extends AutoCloseable, Identifiable<Object> {
     /**
-     * Unique identifier of the transaction
+     * Unique identifier of the transaction.
      */
     @Override
-    public Object getIdentifier();
+    Object getIdentifier();
 
     @Override
     void close();
-}
+}
\ No newline at end of file
index 2ab83dc12e787f19b527e7dae7df30f61a22c504..dc1fb013413d265834388e9ffffeba8373781685 100644 (file)
@@ -18,15 +18,12 @@ public interface DOMStoreTransactionChain extends DOMStoreTransactionFactory, Au
     /**
      * Create a new read only transaction which will continue the chain. The
      * previous write transaction has to be either READY or CANCELLED.
-     *
      * If previous write transaction was already commited to data store, new
      * read-only transaction is same as obtained via {@link DOMStore#newReadOnlyTransaction()}
      * and contains merged result of previous one and current state of data store.
-     *
      * Otherwise read-only transaction presents isolated view as if previous read-write
      * transaction was successful. State which was introduced by other transactions
      * outside this transaction chain after creation of previous transaction is not visible.
-     *
      * @return New transaction in the chain.
      * @throws IllegalStateException
      *             if the previous transaction was not READY or CANCELLED, or
@@ -39,10 +36,12 @@ public interface DOMStoreTransactionChain extends DOMStoreTransactionFactory, Au
      * Create a new read write transaction which will continue the chain. The
      * previous read-write transaction has to be either COMMITED or CANCELLED.
      *
+     * <p>
      * If previous write transaction was already commited to data store, new
      * read-write transaction is same as obtained via {@link DOMStore#newReadWriteTransaction()}
      * and contains merged result of previous one and current state of data store.
      *
+     * <p>
      * Otherwise read-write transaction presents isolated view as if previous read-write
      * transaction was successful. State which was introduced by other transactions
      * outside this transaction chain after creation of previous transaction is not visible.
@@ -59,7 +58,6 @@ public interface DOMStoreTransactionChain extends DOMStoreTransactionFactory, Au
      * Create a new write-only transaction which will continue the chain. The
      * previous read-write transaction has to be either READY or CANCELLED.
      *
-     *
      * @return New transaction in the chain.
      * @throws IllegalStateException
      *             if the previous transaction was not READY or CANCELLED, or
@@ -71,6 +69,7 @@ public interface DOMStoreTransactionChain extends DOMStoreTransactionFactory, Au
     /**
      * Closes Transaction Chain.
      *
+     * <p>
      * Close method of transaction chain does not guarantee that
      * last alocated transaction is ready or was submitted.
      *
index 65f645ad89a7c465aed6185497f39ff389850ee4..418466f0703e74adaa7bfe7cc071f29d33bde89e 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.mdsal.dom.spi.store;
 
 /**
- * Factory for DOM Store Transactions
+ * Factory for DOM Store Transactions.
  *
  * <p>
  * Factory provides method to construct read-only, read-write and write-only
@@ -28,24 +28,23 @@ package org.opendaylight.mdsal.dom.spi.store;
 public interface DOMStoreTransactionFactory {
 
     /**
-     *
-     * Creates a read only transaction
+     * Creates a read only transaction.
      *
      * <p>
      * Creates a new read-only transaction, which provides read access to
      * snapshot of current state.
      *
+     * <p>
      * See {@link DOMStoreReadTransaction} for more information.
      *
      * @return new {@link DOMStoreReadTransaction}
      * @throws IllegalStateException
      *             If state of factory prevents allocating new transaction.
-     *
      */
     DOMStoreReadTransaction newReadOnlyTransaction();
 
     /**
-     * Creates write only transaction
+     * Creates write only transaction.
      *
      * <p>
      * See {@link DOMStoreWriteTransaction} for more information.
@@ -56,7 +55,7 @@ public interface DOMStoreTransactionFactory {
     DOMStoreWriteTransaction newWriteOnlyTransaction();
 
     /**
-     * Creates Read-Write transaction
+     * Creates Read-Write transaction.
      *
      * <p>
      * See {@link DOMStoreReadWriteTransaction} for more information.
index b1680be1fe13ececd6e6e6091a7c13243bd6d7b8..335a22d4eb0730c98a652d32908ebd678dc523c5 100644 (file)
@@ -21,35 +21,47 @@ public interface DOMStoreTreeChangePublisher {
      * Registers a {@link DOMDataTreeChangeListener} to receive
      * notifications when data changes under a given path in the conceptual data
      * tree.
+     *
      * <p>
      * You are able to register for notifications  for any node or subtree
      * which can be represented using {@link YangInstanceIdentifier}.
+     *
      * <p>
      * You are able to register for data change notifications for a subtree or leaf
      * even if it does not exist. You will receive notification once that node is
      * created.
+     *
      * <p>
      * If there is any pre-existing data in data tree on path for which you are
      * registering, you will receive initial data change event, which will
      * contain all pre-existing data, marked as created. If the data at the supplied
      * path does not exist, you will also receive initial data change event, which will
      * contain empty data tree modification, marked as unmodified.
+     *
      * <p>
      * This method returns a {@link ListenerRegistration} object. To
      * "unregister" your listener for changes call the {@link ListenerRegistration#close()}
      * method on this returned object.
+     *
      * <p>
      * You MUST explicitly unregister your listener when you no longer want to receive
      * notifications. This is especially true in OSGi environments, where failure to
      * do so during bundle shutdown can lead to stale listeners being still registered.
      *
+     * @param treeId
+     *            Data tree identifier of the subtree which should be watched for
+     *            changes.
+     * @param listener
+     *            Listener instance which is being registered
+     *
      * @param treeId   Data tree identifier of the subtree which should be watched for
      *                 changes.
      * @param listener Listener instance which is being registered
      * @return Listener registration object, which may be used to unregister
-     * your listener using {@link ListenerRegistration#close()} to stop
-     * delivery of change events.
+     *      your listener using {@link ListenerRegistration#close()} to stop
+     *      delivery of change events.
      */
     @Nonnull
-    <L extends DOMDataTreeChangeListener> ListenerRegistration<L> registerTreeChangeListener(@Nonnull YangInstanceIdentifier treeId, @Nonnull L listener);
+    <L extends DOMDataTreeChangeListener> ListenerRegistration<L> registerTreeChangeListener(
+            @Nonnull YangInstanceIdentifier treeId, @Nonnull L listener);
 }
index ca88ab25b9bd88ec24dd685cf134a31c7fb5ecac..b07b48fd9e4507b31417e6bdbd5e75309abfc9ba 100644 (file)
@@ -16,13 +16,12 @@ public interface DOMStoreWriteTransaction extends DOMStoreTransaction {
      * Store a provided data at specified path. This acts as a add / replace operation, which is to
      * say that whole subtree will be replaced by specified path.
      *
+     * <p>
      * If you need add or merge of current object with specified use
      * {@link #merge(YangInstanceIdentifier, NormalizedNode)}
      *
-     *
-     * @param path
+     * @param path YangInstanceIdentifier object to be written
      * @param data Data object to be written
-     *
      * @throws IllegalStateException if the client code already sealed transaction and invoked
      *         {@link #ready()}
      */
@@ -32,19 +31,18 @@ public interface DOMStoreWriteTransaction extends DOMStoreTransaction {
      * Store a provided data at specified path. This acts as a add / replace operation, which is to
      * say that whole subtree will be replaced by specified path.
      *
+     * <p>
      * If you need add or merge of current object with specified use
      * {@link #merge(YangInstanceIdentifier, NormalizedNode)}
      *
-     * @param path
+     * @param path YangInstanceIdentifier object to be merged
      * @param data Data object to be written
-     *
      * @throws IllegalStateException if the client code already sealed transaction and invoked
      *         {@link #ready()}
      */
     void merge(YangInstanceIdentifier path, NormalizedNode<?, ?> data);
 
     /**
-     *
      * Deletes data and whole subtree located at provided path.
      *
      * @param path
@@ -56,7 +54,6 @@ public interface DOMStoreWriteTransaction extends DOMStoreTransaction {
     void delete(YangInstanceIdentifier path);
 
     /**
-     *
      * Seals transaction, and returns three-phase commit cohort associated
      * with this transaction and DOM Store to be coordinated by coordinator.
      *
index 592aca20b24de49a431ff63688dba4a4372a506f..b7d4a144c54d2bf8a562d0ffd00f28a8edae724b 100644 (file)
@@ -16,7 +16,9 @@ import com.google.common.util.concurrent.ListenableFuture;
  * which forward most of their functionality to a backend {@link #delegate()}.
  */
 @Beta
-public abstract class ForwardingDOMStoreThreePhaseCommitCohort extends ForwardingObject implements DOMStoreThreePhaseCommitCohort {
+public abstract class ForwardingDOMStoreThreePhaseCommitCohort
+        extends ForwardingObject implements DOMStoreThreePhaseCommitCohort {
+
     @Override
     protected abstract DOMStoreThreePhaseCommitCohort delegate();
 
index 16539ccc19e7c304e740b8c48874955a291ac928..cfac80726230acc3bfdd6ba41d730a058c7277e7 100644 (file)
@@ -9,13 +9,12 @@ package org.opendaylight.mdsal.dom.spi.store;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.opendaylight.mdsal.common.api.ReadFailedException;
-
 import com.google.common.annotations.Beta;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.Futures;
+import org.opendaylight.mdsal.common.api.ReadFailedException;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot;
@@ -23,16 +22,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- *
- * Implementation of read-only transaction backed by {@link DataTreeSnapshot}
- *
  * Implementation of read-only transaction backed by {@link DataTreeSnapshot} which delegates most
  * of its calls to similar methods provided by underlying snapshot.
  *
  * @param <T> identifier type
  */
 @Beta
-public final class SnapshotBackedReadTransaction<T> extends AbstractDOMStoreTransaction<T> implements DOMStoreReadTransaction {
+public final class SnapshotBackedReadTransaction<T> extends
+        AbstractDOMStoreTransaction<T> implements DOMStoreReadTransaction {
+
     private static final Logger LOG = LoggerFactory.getLogger(SnapshotBackedReadTransaction.class);
     private volatile DataTreeSnapshot stableSnapshot;
 
@@ -55,6 +53,7 @@ public final class SnapshotBackedReadTransaction<T> extends AbstractDOMStoreTran
         stableSnapshot = null;
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
     public CheckedFuture<Optional<NormalizedNode<?,?>>, ReadFailedException> read(final YangInstanceIdentifier path) {
         LOG.debug("Tx: {} Read: {}", getIdentifier(), path);
@@ -67,9 +66,9 @@ public final class SnapshotBackedReadTransaction<T> extends AbstractDOMStoreTran
 
         try {
             return Futures.immediateCheckedFuture(snapshot.readNode(path));
-        } catch (final Exception e) {
+        } catch (Exception e) {
             LOG.error("Tx: {} Failed Read of {}", getIdentifier(), path, e);
-            return Futures.immediateFailedCheckedFuture(new ReadFailedException("Read failed",e));
+            return Futures.immediateFailedCheckedFuture(new ReadFailedException("Read failed", e));
         }
     }
 
@@ -80,7 +79,7 @@ public final class SnapshotBackedReadTransaction<T> extends AbstractDOMStoreTran
 
         try {
             return Futures.immediateCheckedFuture(read(path).checkedGet().isPresent());
-        } catch (final ReadFailedException e) {
+        } catch (ReadFailedException e) {
             return Futures.immediateFailedCheckedFuture(e);
         }
     }
index 634c323400c7e379e808d3edbd6de39d4b593d46..fe95c8e5365998a85e9559e061b507159e0d99de 100644 (file)
@@ -9,13 +9,12 @@ package org.opendaylight.mdsal.dom.spi.store;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.opendaylight.mdsal.dom.spi.store.SnapshotBackedWriteTransaction.TransactionReadyPrototype;
-
-import org.opendaylight.mdsal.common.api.ReadFailedException;
 import com.google.common.annotations.Beta;
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.Futures;
+import org.opendaylight.mdsal.common.api.ReadFailedException;
+import org.opendaylight.mdsal.dom.spi.store.SnapshotBackedWriteTransaction.TransactionReadyPrototype;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot;
@@ -29,7 +28,8 @@ import org.slf4j.LoggerFactory;
  * @param <T> identifier type
  */
 @Beta
-public final class SnapshotBackedReadWriteTransaction<T> extends SnapshotBackedWriteTransaction<T> implements DOMStoreReadWriteTransaction {
+public final class SnapshotBackedReadWriteTransaction<T> extends
+        SnapshotBackedWriteTransaction<T> implements DOMStoreReadWriteTransaction {
     private static final Logger LOG = LoggerFactory.getLogger(SnapshotBackedReadWriteTransaction.class);
 
     SnapshotBackedReadWriteTransaction(final T identifier, final boolean debug,
@@ -37,12 +37,14 @@ public final class SnapshotBackedReadWriteTransaction<T> extends SnapshotBackedW
         super(identifier, debug, snapshot, readyImpl);
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
     public CheckedFuture<Optional<NormalizedNode<?,?>>, ReadFailedException> read(final YangInstanceIdentifier path) {
         LOG.debug("Tx: {} Read: {}", getIdentifier(), path);
         checkNotNull(path, "Path must not be null.");
 
         final Optional<NormalizedNode<?, ?>> result;
+
         try {
             result = readSnapshotNode(path);
         } catch (Exception e) {
@@ -57,11 +59,11 @@ public final class SnapshotBackedReadWriteTransaction<T> extends SnapshotBackedW
         }
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
     public CheckedFuture<Boolean, ReadFailedException> exists(final YangInstanceIdentifier path) {
         try {
-            return Futures.immediateCheckedFuture(
-                read(path).checkedGet().isPresent());
+            return Futures.immediateCheckedFuture(read(path).checkedGet().isPresent());
         } catch (ReadFailedException e) {
             return Futures.immediateFailedCheckedFuture(e);
         }
index 4efd98e78dd8b24c13ab43df05af81612fecabdc..b58617ad5bf19af0cc62af0f78b51d491e5cbcfa 100644 (file)
@@ -7,9 +7,8 @@
  */
 package org.opendaylight.mdsal.dom.spi.store;
 
-import org.opendaylight.mdsal.dom.spi.store.SnapshotBackedWriteTransaction.TransactionReadyPrototype;
-
 import com.google.common.annotations.Beta;
+import org.opendaylight.mdsal.dom.spi.store.SnapshotBackedWriteTransaction.TransactionReadyPrototype;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot;
 
 /**
@@ -23,12 +22,12 @@ public final class SnapshotBackedTransactions {
 
     /**
      * Creates a new read-only transaction.
-     *
      * @param identifier Transaction Identifier
      * @param debug Enable transaction debugging
      * @param snapshot Snapshot which will be modified.
      */
-    public static <T> SnapshotBackedReadTransaction<T> newReadTransaction(final T identifier, final boolean debug, final DataTreeSnapshot snapshot) {
+    public static <T> SnapshotBackedReadTransaction<T> newReadTransaction(final T identifier,
+            final boolean debug, final DataTreeSnapshot snapshot) {
         return new SnapshotBackedReadTransaction<T>(identifier, debug, snapshot);
     }
 
@@ -40,8 +39,8 @@ public final class SnapshotBackedTransactions {
      * @param snapshot Snapshot which will be modified.
      * @param readyImpl Implementation of ready method.
      */
-    public static <T> SnapshotBackedReadWriteTransaction<T> newReadWriteTransaction(final T identifier, final boolean debug,
-            final DataTreeSnapshot snapshot, final TransactionReadyPrototype<T> readyImpl) {
+    public static <T> SnapshotBackedReadWriteTransaction<T> newReadWriteTransaction(final T identifier,
+            final boolean debug, final DataTreeSnapshot snapshot, final TransactionReadyPrototype<T> readyImpl) {
         return new SnapshotBackedReadWriteTransaction<T>(identifier, debug, snapshot, readyImpl);
     }
 
@@ -53,8 +52,8 @@ public final class SnapshotBackedTransactions {
      * @param snapshot Snapshot which will be modified.
      * @param readyImpl Implementation of ready method.
      */
-    public static <T> SnapshotBackedWriteTransaction<T> newWriteTransaction(final T identifier, final boolean debug,
-            final DataTreeSnapshot snapshot, final TransactionReadyPrototype<T> readyImpl) {
+    public static <T> SnapshotBackedWriteTransaction<T> newWriteTransaction(final T identifier,
+            final boolean debug, final DataTreeSnapshot snapshot, final TransactionReadyPrototype<T> readyImpl) {
         return new SnapshotBackedWriteTransaction<T>(identifier, debug, snapshot, readyImpl);
     }
 }
index 4ef16adc17fe594344636972759a65c766766a02..620438347ad3f4350a6c7a8a68e81300d7cd4316 100644 (file)
@@ -30,14 +30,22 @@ import org.slf4j.LoggerFactory;
  * @param <T> Identifier type
  */
 @Beta
-public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransaction<T> implements DOMStoreWriteTransaction {
+public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransaction<T>
+        implements DOMStoreWriteTransaction {
+
     private static final Logger LOG = LoggerFactory.getLogger(SnapshotBackedWriteTransaction.class);
+
     @SuppressWarnings("rawtypes")
-    private static final AtomicReferenceFieldUpdater<SnapshotBackedWriteTransaction, TransactionReadyPrototype> READY_UPDATER =
-            AtomicReferenceFieldUpdater.newUpdater(SnapshotBackedWriteTransaction.class, TransactionReadyPrototype.class, "readyImpl");
+    private static final AtomicReferenceFieldUpdater<SnapshotBackedWriteTransaction,
+        TransactionReadyPrototype> READY_UPDATER =
+            AtomicReferenceFieldUpdater.newUpdater(SnapshotBackedWriteTransaction.class,
+                    TransactionReadyPrototype.class, "readyImpl");
+
     @SuppressWarnings("rawtypes")
-    private static final AtomicReferenceFieldUpdater<SnapshotBackedWriteTransaction, DataTreeModification> TREE_UPDATER =
-            AtomicReferenceFieldUpdater.newUpdater(SnapshotBackedWriteTransaction.class, DataTreeModification.class, "mutableTree");
+    private static final AtomicReferenceFieldUpdater<SnapshotBackedWriteTransaction,
+        DataTreeModification> TREE_UPDATER =
+            AtomicReferenceFieldUpdater.newUpdater(SnapshotBackedWriteTransaction.class,
+                    DataTreeModification.class, "mutableTree");
 
     // non-null when not ready
     private volatile TransactionReadyPrototype<T> readyImpl;
@@ -52,6 +60,7 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
         LOG.debug("Write Tx: {} allocated with snapshot {}", identifier, snapshot);
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
     public void write(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
         checkNotReady();
@@ -62,7 +71,7 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
         try {
             tree.write(path, data);
             // FIXME: Add checked exception
-        } catch (final Exception e) {
+        } catch (Exception e) {
             LOG.error("Tx: {}, failed to write {}:{} in {}", getIdentifier(), path, data, tree, e);
             // Rethrow original ones if they are subclasses of RuntimeException
             // or Error
@@ -72,6 +81,7 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
         }
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
     public void merge(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
         checkNotReady();
@@ -82,7 +92,7 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
         try {
             tree.merge(path, data);
             // FIXME: Add checked exception
-        } catch (final Exception e) {
+        } catch (Exception e) {
             LOG.error("Tx: {}, failed to write {}:{} in {}", getIdentifier(), path, data, tree, e);
             // Rethrow original ones if they are subclasses of RuntimeException
             // or Error
@@ -92,6 +102,7 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
         }
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
     public void delete(final YangInstanceIdentifier path) {
         checkNotReady();
@@ -102,7 +113,7 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
         try {
             tree.delete(path);
             // FIXME: Add checked exception
-        } catch (final Exception e) {
+        } catch (Exception e) {
             LOG.error("Tx: {}, failed to delete {} in {}", getIdentifier(), path, tree, e);
             // Rethrow original ones if they are subclasses of RuntimeException
             // or Error
@@ -123,8 +134,9 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
         return readyImpl == null ? null : mutableTree.readNode(path);
     }
 
-    private final void checkNotReady() {
-        checkState(readyImpl != null, "Transaction %s is no longer open. No further modifications allowed.", getIdentifier());
+    private void checkNotReady() {
+        checkState(readyImpl != null,
+                "Transaction %s is no longer open. No further modifications allowed.", getIdentifier());
     }
 
     @Override
@@ -160,8 +172,9 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
     }
 
     /**
-     * Prototype implementation of {@link SnapshotBackedWriteTransaction#ready()}
+     * Prototype implementation of {@link SnapshotBackedWriteTransaction#ready()}.
      *
+     * <p>
      * This class is intended to be implemented by Transaction factories responsible for allocation
      * of {@link org.opendaylight.mdsal.dom.spi.store.SnapshotBackedWriteTransaction} and
      * providing underlying logic for applying implementation.
@@ -179,7 +192,6 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
 
         /**
          * Returns a commit coordinator associated with supplied transactions.
-         *
          * This call must not fail.
          *
          * @param tx
@@ -188,6 +200,7 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
          *            Modified data tree which has been constructed.
          * @return DOMStoreThreePhaseCommitCohort associated with transaction
          */
-        protected abstract DOMStoreThreePhaseCommitCohort transactionReady(SnapshotBackedWriteTransaction<T> tx, DataTreeModification tree);
+        protected abstract DOMStoreThreePhaseCommitCohort transactionReady(
+            SnapshotBackedWriteTransaction<T> tx, DataTreeModification tree);
     }
-}
\ No newline at end of file
+}
diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/package-info.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/package-info.java
deleted file mode 100644 (file)
index 644f70b..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-/*\r
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.\r
- *\r
- * This program and the accompanying materials are made available under the\r
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
- * and is available at http://www.eclipse.org/legal/epl-v10.html\r
- */\r
-package org.opendaylight.mdsal.dom.spi.store;
\ No newline at end of file
index 27b087a9372790c5854e3b26d845277b9e71a5ee..cb442fb9ccca278d2d8f208529b15bf58f156f3d 100644 (file)
@@ -31,8 +31,8 @@ public class AbstractDOMRpcProviderServiceTest extends AbstractDOMRpcProviderSer
 
     @Nonnull
     @Override
-    public <T extends DOMRpcImplementation> DOMRpcImplementationRegistration<T> registerRpcImplementation
-            (@Nonnull T implementation, @Nonnull Set<DOMRpcIdentifier> rpcs) {
+    public <T extends DOMRpcImplementation> DOMRpcImplementationRegistration<T> registerRpcImplementation(
+            @Nonnull T implementation, @Nonnull Set<DOMRpcIdentifier> rpcs) {
         return domRpcImplementationRegistration;
     }
 }
\ No newline at end of file
index e70dfcc0cfa7a0fc5370d98e638c96ca311f7de4..4d4e16f2ea3678304b3b6c2a70a9aabb78bd1417 100644 (file)
@@ -25,6 +25,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot;
 
+@SuppressWarnings("checkstyle:IllegalCatch")
 public class SnapshotBackedReadTransactionTest {
 
     private static final DataTreeSnapshot DATA_TREE_SNAPSHOT = mock(DataTreeSnapshot.class);
@@ -40,7 +41,6 @@ public class SnapshotBackedReadTransactionTest {
         assertTrue((Boolean) snapshotBackedReadTransaction.exists(YangInstanceIdentifier.EMPTY).get());
 
         assertEquals(optional, snapshotBackedReadTransaction.read(YangInstanceIdentifier.EMPTY).get());
-
         final Field stableSnapshotField = SnapshotBackedReadTransaction.class.getDeclaredField("stableSnapshot");
         stableSnapshotField.setAccessible(true);
 
@@ -51,6 +51,7 @@ public class SnapshotBackedReadTransactionTest {
         assertNull(stableSnapshot);
     }
 
+    @SuppressWarnings("checkstyle:IllegalThrows")
     @Test(expected = ReadFailedException.class)
     public void readTestWithException() throws Throwable {
         snapshotBackedReadTransaction.close();
@@ -62,6 +63,7 @@ public class SnapshotBackedReadTransactionTest {
         }
     }
 
+    @SuppressWarnings("checkstyle:IllegalThrows")
     @Test(expected = ReadFailedException.class)
     public void readNodeTestWithException() throws Throwable {
         doThrow(new NullPointerException("no Node")).when(DATA_TREE_SNAPSHOT).readNode(any());
@@ -74,8 +76,9 @@ public class SnapshotBackedReadTransactionTest {
         }
     }
 
+    @SuppressWarnings("checkstyle:IllegalThrows")
     @Test(expected = ReadFailedException.class)
-    public void existsTestWithException() throws Throwable {
+    public void existsTestWithException() throws Throwable  {
         doThrow(new NullPointerException("no Node")).when(DATA_TREE_SNAPSHOT).readNode(any());
 
         try {
index 7b361a9b24d317ab47e46584e369727a58b3572e..30484194721ee0eac79b3a324638617acbab2ccb 100644 (file)
@@ -29,7 +29,7 @@ public class SnapshotBackedReadWriteTransactionTest {
 
     private static final DataTreeSnapshot DATA_TREE_SNAPSHOT = mock(DataTreeSnapshot.class);
     private static final DataTreeModification DATA_TREE_MODIFICATION = mock(DataTreeModification.class);
-    private static final TransactionReadyPrototype TRANSACTION_READY_PROTOTYPE =  mock(TransactionReadyPrototype.class);
+    private static final TransactionReadyPrototype TRANSACTION_READY_PROTOTYPE = mock(TransactionReadyPrototype.class);
     private SnapshotBackedReadWriteTransaction snapshotBackedReadWriteTransaction;
 
     @Before
@@ -49,6 +49,7 @@ public class SnapshotBackedReadWriteTransactionTest {
         assertEquals(optional, snapshotBackedReadWriteTransaction.read(YangInstanceIdentifier.EMPTY).get());
     }
 
+    @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:IllegalCatch"})
     @Test(expected = ReadFailedException.class)
     public void readTestWithNullException() throws Throwable {
         doReturn(null).when(DATA_TREE_MODIFICATION).readNode(YangInstanceIdentifier.EMPTY);
@@ -60,6 +61,7 @@ public class SnapshotBackedReadWriteTransactionTest {
         }
     }
 
+    @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:IllegalCatch"})
     @Test(expected = ReadFailedException.class)
     public void readNodeTestWithException() throws Throwable {
         doThrow(new NullPointerException("no Node")).when(DATA_TREE_MODIFICATION).readNode(any());
@@ -71,6 +73,7 @@ public class SnapshotBackedReadWriteTransactionTest {
         }
     }
 
+    @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:IllegalCatch"})
     @Test(expected = ReadFailedException.class)
     public void existsTestWithException() throws Throwable {
         doThrow(new NullPointerException("no Node")).when(DATA_TREE_MODIFICATION).readNode(any());
@@ -81,4 +84,4 @@ public class SnapshotBackedReadWriteTransactionTest {
             throw e.getCause();
         }
     }
-}
\ No newline at end of file
+}
index 8e94bf2d66e80a04feb90ff686b147fcc68b8c8b..d3f6aeb7be31ced5bb5a4901fe4620224b94e890 100644 (file)
@@ -34,6 +34,7 @@ public class SnapshotBackedTransactionsTest {
                 new Object(), false, dataTreeSnapshot, transactionReadyPrototype));
     }
 
+    @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:IllegalCatch"})
     @Test(expected = UnsupportedOperationException.class)
     public void constructorTest() throws Throwable {
         Constructor<SnapshotBackedTransactions> constructor = SnapshotBackedTransactions.class.getDeclaredConstructor();