Fix checkstyle in mdsal-binding-dom-adapter 99/45399/14
authorjanab <brinda.jana@nexusis.com>
Fri, 9 Sep 2016 03:05:14 +0000 (20:05 -0700)
committerRobert Varga <nite@hq.sk>
Wed, 5 Oct 2016 11:42:57 +0000 (11:42 +0000)
checkstyleViolationSeverity=error added
Fixed all CS errors. Code review comments are implemented.
Fixed the merge conflicts.

Change-Id: I8c2af744474a5ae6d28fb62b11ed0da65251825a
Signed-off-by: Brinda Jana <brinda.jana@nexusis.com>
60 files changed:
binding/mdsal-binding-dom-adapter/pom.xml
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedDataBroker.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedTransaction.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractWriteTransaction.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterBuilder.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterLoader.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMAdapterBuilder.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMAdapterLoader.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMCursorAwareWriteTransactionAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataBrokerAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeChangeListenerAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeChangeServiceAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeProducerAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeServiceAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeWriteCursorAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointServiceAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationListenerAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationPublishServiceAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationServiceAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMReadTransactionAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcAdapterRegistration.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcImplementationAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcProviderServiceAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcServiceAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMTransactionChainAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMWriteTransactionAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDataTreeChangeListenerRegistration.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingMountPointAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingRpcAdapterRegistration.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingStructuralType.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/ContextReferenceExtractor.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/DirectGetterRouteContextExtractor.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/GetValueRouteContextExtractor.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDOMRpcResultFuture.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDataObjectModification.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDataTreeModification.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazySerializedContainerNode.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazySerializedDOMNotification.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapter.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMAdapterLoaderTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeWriteCursorAdapterTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ContextExtractorTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDOMRpcResultFutureTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/LazySerializedContainerNodeTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapterTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractDataBrokerTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractNotificationBrokerTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AssertCollections.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/BindingNormalizedCodecTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Bug5524augmentUses.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/Bug5845booleanKeyTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/DataBrokerTestCustomizer.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/DataTreeChangeListenerTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/ForwardedNotificationAdapterTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/LeafDefaultValueTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/WriteTransactionTest.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/BindingBrokerTestFactory.java
binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/BindingTestContext.java

index 57e298aefa8698124ccd8da1acf2b375ac0ba1d8..6298d5efaeb0dd3fda76f93d172fb42100689421 100644 (file)
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <scm>
index 68d62ae8fccac5e6e01c4ac60d1fd2e0d6eb2031..d03f7fdeff8d096181c8fb134bf6af2888a7b609 100644 (file)
@@ -51,7 +51,8 @@ public abstract class AbstractForwardedDataBroker implements Delegator<DOMDataBr
 
         for (final Map.Entry<YangInstanceIdentifier, ? extends NormalizedNode<?, ?>> entry : normalized.entrySet()) {
             try {
-                final Optional<Entry<InstanceIdentifier<? extends DataObject>, DataObject>> potential = getCodec().toBinding(entry);
+                final Optional<Entry<InstanceIdentifier<? extends DataObject>, DataObject>> potential
+                        = getCodec().toBinding(entry);
                 if (potential.isPresent()) {
                     final Entry<InstanceIdentifier<? extends DataObject>, DataObject> binding = potential.get();
                     newMap.put(binding.getKey(), binding.getValue());
@@ -68,11 +69,13 @@ public abstract class AbstractForwardedDataBroker implements Delegator<DOMDataBr
         final Set<InstanceIdentifier<?>> hashSet = new HashSet<>();
         for (final YangInstanceIdentifier normalizedPath : normalized) {
             try {
-                final Optional<InstanceIdentifier<? extends DataObject>> potential = getCodec().toBinding(normalizedPath);
+                final Optional<InstanceIdentifier<? extends DataObject>> potential
+                        = getCodec().toBinding(normalizedPath);
                 if (potential.isPresent()) {
                     final InstanceIdentifier<? extends DataObject> binding = potential.get();
                     hashSet.add(binding);
-                } else if (normalizedPath.getLastPathArgument() instanceof YangInstanceIdentifier.AugmentationIdentifier) {
+                } else if (normalizedPath.getLastPathArgument()
+                        instanceof YangInstanceIdentifier.AugmentationIdentifier) {
                     hashSet.add(path);
                 }
             } catch (final DeserializationException e) {
@@ -86,7 +89,8 @@ public abstract class AbstractForwardedDataBroker implements Delegator<DOMDataBr
         if (path.isWildcarded()) {
             return Optional.absent();
         }
-        return (Optional<DataObject>) getCodec().deserializeFunction(path).apply(Optional.<NormalizedNode<?, ?>> of(data));
+        return (Optional<DataObject>) getCodec().deserializeFunction(path).apply(
+                Optional.<NormalizedNode<?, ?>>of(data));
     }
 
     @Override
index 6833f6ed8c5194819aaa0b8d0cb67fb6f889f49f..fff7c67dbaa77a05b916431ed527cea8e29c0975 100644 (file)
@@ -7,15 +7,14 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import org.opendaylight.mdsal.common.api.AsyncTransaction;
-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.base.Preconditions;
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.Futures;
+import org.opendaylight.mdsal.common.api.AsyncTransaction;
+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.concepts.Delegator;
 import org.opendaylight.yangtools.concepts.Identifiable;
 import org.opendaylight.yangtools.util.concurrent.MappingCheckedFuture;
@@ -30,7 +29,7 @@ abstract class AbstractForwardedTransaction<T extends AsyncTransaction<YangInsta
     private final T delegate;
     private final BindingToNormalizedNodeCodec codec;
 
-    public AbstractForwardedTransaction(final T delegateTx, final BindingToNormalizedNodeCodec codec) {
+    AbstractForwardedTransaction(final T delegateTx, final BindingToNormalizedNodeCodec codec) {
         this.delegate = Preconditions.checkNotNull(delegateTx, "Delegate must not be null");
         this.codec = Preconditions.checkNotNull(codec, "Codec must not be null");
     }
@@ -47,7 +46,8 @@ abstract class AbstractForwardedTransaction<T extends AsyncTransaction<YangInsta
     }
 
     @SuppressWarnings("unchecked")
-    protected final <S extends AsyncTransaction<YangInstanceIdentifier, NormalizedNode<?, ?>>> S getDelegateChecked(final Class<S> txType) {
+    protected final <S extends AsyncTransaction<YangInstanceIdentifier, NormalizedNode<?, ?>>> S getDelegateChecked(
+            final Class<S> txType) {
         Preconditions.checkState(txType.isInstance(delegate));
         return (S) delegate;
     }
index ad64a6c6e9e91d45ab87386ea7168e8acb415767..7c2829dab189625770616f2803e0741aadd04b6a 100644 (file)
@@ -7,14 +7,13 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
-
-import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.CheckedFuture;
 import java.util.Map.Entry;
+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.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.Identifiable;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -22,9 +21,8 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
 /**
- *
  * Abstract Base Transaction for transactions which are backed by
- * {@link DOMDataTreeWriteTransaction}
+ * {@link DOMDataTreeWriteTransaction}.
  */
 public abstract class AbstractWriteTransaction<T extends DOMDataTreeWriteTransaction> extends
         AbstractForwardedTransaction<T> {
@@ -62,7 +60,6 @@ public abstract class AbstractWriteTransaction<T extends DOMDataTreeWriteTransac
     }
 
     /**
-     *
      * Ensures list parent if item is list, otherwise noop.
      *
      * <p>
@@ -84,7 +81,7 @@ public abstract class AbstractWriteTransaction<T extends DOMDataTreeWriteTransac
      * put("/nodes/node/node[key]",domNode);
      * </pre>
      *
-     *
+     * <p>
      * In order to allow that to be inserted if necessary, if we know
      * item is list item, we will try to merge empty MapNode or OrderedNodeMap
      * to ensure list exists.
@@ -105,7 +102,7 @@ public abstract class AbstractWriteTransaction<T extends DOMDataTreeWriteTransac
     }
 
     /**
-     * @deprecated Use {@link YangInstanceIdentifier#getParent()} instead.
+     * Use {@link YangInstanceIdentifier#getParent()} instead.
      */
     @Deprecated
     protected static Optional<YangInstanceIdentifier> getParent(final YangInstanceIdentifier child) {
@@ -116,9 +113,9 @@ public abstract class AbstractWriteTransaction<T extends DOMDataTreeWriteTransac
      * Subclasses of this class are required to implement creation of parent nodes based on
      * behaviour of their underlying transaction.
      *
-     * @param store
-     * @param domPath
-     * @param path
+     * @param store an instance of LogicalDatastoreType
+     * @param domPath an instance of YangInstanceIdentifier
+     * @param path an instance of InstanceIdentifier
      */
     protected final void ensureParentsByMerge(final LogicalDatastoreType store, final YangInstanceIdentifier domPath,
             final InstanceIdentifier<?> path) {
index 40271264f9c6f329f169e7a0db445375f5288f39..7263fafb24289c51edec08561c30d5a9acf01269 100644 (file)
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableClassToInstanceMap;
@@ -24,12 +23,12 @@ public abstract class AdapterBuilder<T,D> implements Builder<T> {
     protected abstract T createInstance(ClassToInstanceMap<D> delegates);
 
     private void checkAllRequiredServices() {
-        for(final Class<? extends D> type : getRequiredDelegates()) {
+        for (final Class<? extends D> type : getRequiredDelegates()) {
             Preconditions.checkState(delegates.get(type) != null, "Requires service %s is not defined.",type);
         }
     }
 
-    public final <V extends D>void addDelegate(final Class<V> type,final D impl) {
+    public final <V extends D> void addDelegate(final Class<V> type,final D impl) {
         delegates.put(type,impl);
     }
 
index 385770a1cb18819e5fc3f445493fced846845c10..d1505f476cd7edbbaf5eb82ac6b1341ab9d77769 100644 (file)
@@ -18,9 +18,9 @@ public abstract class AdapterLoader<T, D> extends CacheLoader<Class<? extends T>
     public Optional<T> load(final Class<? extends T> key) {
 
         final AdapterBuilder<? extends T, D> builder = createBuilder(key);
-        for(final Class<? extends D> reqDeleg : builder.getRequiredDelegates()) {
+        for (final Class<? extends D> reqDeleg : builder.getRequiredDelegates()) {
             final D deleg = getDelegate(reqDeleg);
-            if(deleg != null) {
+            if (deleg != null) {
                 builder.addDelegate(reqDeleg,deleg);
             } else {
                 return Optional.absent();
index 5e2afc38087bce090c9c14330b13348a1e573acd..94758151e71be19d4e593869ec776186fb965ddc 100644 (file)
@@ -7,11 +7,10 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import org.opendaylight.mdsal.dom.api.DOMService;
-
-import org.opendaylight.mdsal.binding.api.BindingService;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ClassToInstanceMap;
+import org.opendaylight.mdsal.binding.api.BindingService;
+import org.opendaylight.mdsal.dom.api.DOMService;
 
 abstract class BindingDOMAdapterBuilder<T extends BindingService> extends AdapterBuilder<T, DOMService> {
 
index 9c00baefe3df37252b773d4068fa0b5466382180..b79f267a1a2e4dd53f4e665f1b733b4998cb7aad 100644 (file)
@@ -7,22 +7,22 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import org.opendaylight.mdsal.dom.api.DOMService;
-
-import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import java.util.Map;
 import org.opendaylight.mdsal.binding.api.BindingService;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.NotificationService;
+import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
 import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMAdapterBuilder.Factory;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import java.util.Map;
+import org.opendaylight.mdsal.dom.api.DOMService;
 
 public abstract class BindingDOMAdapterLoader extends AdapterLoader<BindingService, DOMService> {
 
 
-    private static final Map<Class<?>,BindingDOMAdapterBuilder.Factory<?>> FACTORIES = ImmutableMap.<Class<?>,BindingDOMAdapterBuilder.Factory<?>>builder()
+    private static final Map<Class<?>,BindingDOMAdapterBuilder.Factory<?>> FACTORIES = ImmutableMap.<Class<?>,
+                BindingDOMAdapterBuilder.Factory<?>>builder()
             .put(NotificationService.class,BindingDOMNotificationServiceAdapter.BUILDER_FACTORY)
             .put(NotificationPublishService.class,BindingDOMNotificationPublishServiceAdapter.BUILDER_FACTORY)
             .put(DataBroker.class,BindingDOMDataBrokerAdapter.BUILDER_FACTORY)
@@ -37,7 +37,8 @@ public abstract class BindingDOMAdapterLoader extends AdapterLoader<BindingServi
     }
 
     @Override
-    protected final AdapterBuilder<? extends BindingService, DOMService> createBuilder(final Class<? extends BindingService> key) {
+    protected final AdapterBuilder<? extends BindingService, DOMService> createBuilder(
+                final Class<? extends BindingService> key) {
         final Factory<?> factory = FACTORIES.get(key);
         Preconditions.checkArgument(factory != null, "Unsupported service type %s", key);
         final BindingDOMAdapterBuilder<?> builder = factory.newBuilder();
index b01dd9946eaa654700e9f2a1418062bd2a278325..6110acda6ee39d187116799b5b46ed61d74dfc2b 100644 (file)
@@ -20,7 +20,8 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteCursor;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
-public class BindingDOMCursorAwareWriteTransactionAdapter<T extends DOMDataTreeCursorAwareTransaction> implements CursorAwareWriteTransaction {
+public class BindingDOMCursorAwareWriteTransactionAdapter<T extends DOMDataTreeCursorAwareTransaction>
+        implements CursorAwareWriteTransaction {
 
     private T delegate;
     private BindingToNormalizedNodeCodec codec;
@@ -35,7 +36,8 @@ public class BindingDOMCursorAwareWriteTransactionAdapter<T extends DOMDataTreeC
     @Override
     public <T extends DataObject> DataTreeWriteCursor createCursor(final DataTreeIdentifier<T> path) {
         final YangInstanceIdentifier yPath = codec.toNormalized(path.getRootIdentifier());
-        final DOMDataTreeWriteCursor cursor = delegate.createCursor(new DOMDataTreeIdentifier(path.getDatastoreType(), yPath));
+        final DOMDataTreeWriteCursor cursor = delegate.createCursor(
+                new DOMDataTreeIdentifier(path.getDatastoreType(), yPath));
         return new BindingDOMDataTreeWriteCursorAdapter<>(path, cursor, codec);
     }
 
index acadb16829857b47038cd3a1d6b713deb9149bd2..a40b14ed8cd1333e0e289413e74394769d42aa55 100644 (file)
@@ -7,12 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-
-import org.opendaylight.mdsal.common.api.TransactionChainListener;
-
-import org.opendaylight.mdsal.dom.api.DOMDataBroker;
-import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService;
-import org.opendaylight.mdsal.dom.api.DOMService;
+import com.google.common.collect.ClassToInstanceMap;
+import com.google.common.collect.ImmutableSet;
+import java.util.Set;
 import org.opendaylight.mdsal.binding.api.BindingTransactionChain;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
@@ -21,23 +18,26 @@ import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMAdapterBuilder.Factory;
-import com.google.common.collect.ClassToInstanceMap;
-import com.google.common.collect.ImmutableSet;
-import java.util.Set;
+import org.opendaylight.mdsal.common.api.TransactionChainListener;
+import org.opendaylight.mdsal.dom.api.DOMDataBroker;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService;
+import org.opendaylight.mdsal.dom.api.DOMService;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 
+
 /**
  * The DataBrokerImpl simply defers to the DOMDataBroker for all its operations.
  * All transactions and listener registrations are wrapped by the DataBrokerImpl
  * to allow binding aware components to use the DataBroker transparently.
  *
+ * <p>
  * Besides this the DataBrokerImpl and it's collaborators also cache data that
  * is already transformed from the binding independent to binding aware format
  *
-
  */
-public class BindingDOMDataBrokerAdapter extends AbstractForwardedDataBroker implements DataBroker, DataTreeChangeService {
+public class BindingDOMDataBrokerAdapter extends AbstractForwardedDataBroker implements
+        DataBroker, DataTreeChangeService {
 
 
     static final Factory<DataBroker> BUILDER_FACTORY = new BindingDOMAdapterBuilder.Factory<DataBroker>() {
@@ -52,8 +52,9 @@ public class BindingDOMDataBrokerAdapter extends AbstractForwardedDataBroker imp
 
     public BindingDOMDataBrokerAdapter(final DOMDataBroker domDataBroker, final BindingToNormalizedNodeCodec codec) {
         super(domDataBroker, codec);
-        final DOMDataTreeChangeService domTreeChange = (DOMDataTreeChangeService) domDataBroker.getSupportedExtensions().get(DOMDataTreeChangeService.class);
-        if(domTreeChange != null) {
+        final DOMDataTreeChangeService domTreeChange
+            = (DOMDataTreeChangeService) domDataBroker.getSupportedExtensions().get(DOMDataTreeChangeService.class);
+        if (domTreeChange != null) {
             treeChangeService = BindingDOMDataTreeChangeServiceAdapter.create(codec, domTreeChange);
         } else {
             treeChangeService = null;
@@ -92,9 +93,10 @@ public class BindingDOMDataBrokerAdapter extends AbstractForwardedDataBroker imp
     }
 
     @Override
-    public <T extends DataObject, L extends DataTreeChangeListener<T>> ListenerRegistration<L> registerDataTreeChangeListener(
+    public <T extends DataObject, L extends DataTreeChangeListener<T>> ListenerRegistration<L>
+            registerDataTreeChangeListener(
             final DataTreeIdentifier<T> treeId, final L listener) {
-        if(treeChangeService == null) {
+        if (treeChangeService == null) {
             throw new UnsupportedOperationException("Underlying data broker does not expose DOMDataTreeChangeService.");
         }
         return treeChangeService.registerDataTreeChangeListener(treeId, listener);
index 6486232e1024c86f47ffa6e62c9c3ac70a52f81c..78e9e573b8409a14f807c0bc088a39b731ad5699 100644 (file)
@@ -7,13 +7,12 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-
-import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
-import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
-import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import com.google.common.base.Preconditions;
 import java.util.Collection;
+import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
+import org.opendaylight.mdsal.binding.api.DataTreeModification;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
 
@@ -29,8 +28,8 @@ final class BindingDOMDataTreeChangeListenerAdapter<T extends DataObject> implem
     private final DataTreeChangeListener<T> listener;
     private final LogicalDatastoreType store;
 
-    BindingDOMDataTreeChangeListenerAdapter(final BindingToNormalizedNodeCodec codec, final DataTreeChangeListener<T> listener,
-            final LogicalDatastoreType store) {
+    BindingDOMDataTreeChangeListenerAdapter(final BindingToNormalizedNodeCodec codec,
+            final DataTreeChangeListener<T> listener, final LogicalDatastoreType store) {
         this.codec = Preconditions.checkNotNull(codec);
         this.listener = Preconditions.checkNotNull(listener);
         this.store = Preconditions.checkNotNull(store);
@@ -38,7 +37,8 @@ final class BindingDOMDataTreeChangeListenerAdapter<T extends DataObject> implem
 
     @Override
     public void onDataTreeChanged(final Collection<DataTreeCandidate> domChanges) {
-        final Collection<DataTreeModification<T>> bindingChanges = LazyDataTreeModification.from(codec, domChanges, store);
+        final Collection<DataTreeModification<T>> bindingChanges
+                = LazyDataTreeModification.from(codec, domChanges, store);
         listener.onDataTreeChanged(bindingChanges);
     }
 }
index 4c5eedd44b2168182927980019e227736d77ae46..8a6a7045eca81920babbf7d0c061aa6b697a6f5a 100644 (file)
@@ -7,25 +7,23 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService;
-import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
-
+import com.google.common.base.Preconditions;
 import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
 import org.opendaylight.mdsal.binding.api.DataTreeChangeService;
 import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
-import com.google.common.base.Preconditions;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
-
 /**
- *
  * Adapter exposing Binding {@link DataTreeChangeService} and wrapping
  * {@link DOMDataTreeChangeService} and is responsible for translation
  * and instantiation of {@link BindingDOMDataTreeChangeListenerAdapter}
  * adapters.
  *
+ * <p>
  * Each registered {@link DataTreeChangeListener} is wrapped using
  * adapter and registered directly to DOM service.
  */
@@ -46,11 +44,13 @@ final class BindingDOMDataTreeChangeServiceAdapter implements DataTreeChangeServ
     }
 
     @Override
-    public <T extends DataObject, L extends DataTreeChangeListener<T>> ListenerRegistration<L> registerDataTreeChangeListener(
-            final DataTreeIdentifier<T> treeId, final L listener) {
+    public <T extends DataObject, L extends DataTreeChangeListener<T>> ListenerRegistration<L>
+            registerDataTreeChangeListener(final DataTreeIdentifier<T> treeId, final L listener) {
         final DOMDataTreeIdentifier domIdentifier = toDomTreeIdentifier(treeId);
-        final BindingDOMDataTreeChangeListenerAdapter<T> domListener = new BindingDOMDataTreeChangeListenerAdapter<>(codec,listener, treeId.getDatastoreType());
-        final ListenerRegistration<BindingDOMDataTreeChangeListenerAdapter<T>> domReg = dataTreeChangeService.registerDataTreeChangeListener(domIdentifier, domListener);
+        final BindingDOMDataTreeChangeListenerAdapter<T> domListener
+                = new BindingDOMDataTreeChangeListenerAdapter<>(codec,listener, treeId.getDatastoreType());
+        final ListenerRegistration<BindingDOMDataTreeChangeListenerAdapter<T>> domReg
+                = dataTreeChangeService.registerDataTreeChangeListener(domIdentifier, domListener);
         return new BindingDataTreeChangeListenerRegistration<>(listener,domReg);
     }
 
index dc74a0121b4108d3ae16ded42ddc32d5c43fc9e6..fd91c1c2af24e171c12705bb1050a79a3b7ef2cb 100644 (file)
@@ -13,13 +13,11 @@ import org.opendaylight.mdsal.binding.api.CursorAwareWriteTransaction;
 import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
 import org.opendaylight.mdsal.binding.api.DataTreeProducer;
 import org.opendaylight.mdsal.binding.api.DataTreeProducerException;
-import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeCursorAwareTransaction;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeProducer;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeProducerBusyException;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeProducerException;
-import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
 
 class BindingDOMDataTreeProducerAdapter implements DataTreeProducer {
 
index ece2fe833c037bef130fcde1d3a6e7f9a363c98a..29c034984bfe2801711cd51891f2ba4841c70a68 100644 (file)
@@ -24,7 +24,8 @@ class BindingDOMDataTreeServiceAdapter implements DataTreeService {
     private final DOMDataTreeService delegate;
     private final BindingToNormalizedNodeCodec codec;
 
-    private BindingDOMDataTreeServiceAdapter(final DOMDataTreeService delegate, final BindingToNormalizedNodeCodec codec) {
+    private BindingDOMDataTreeServiceAdapter(final DOMDataTreeService delegate,
+            final BindingToNormalizedNodeCodec codec) {
         this.delegate = Preconditions.checkNotNull(delegate, "delegate");
         this.codec = Preconditions.checkNotNull(codec, "codec");
     }
index 448c0bb53f36457000bb9136496ee579ba88faae..be5989d7944981889dd747f1e986091a95140188 100644 (file)
@@ -27,7 +27,8 @@ public class BindingDOMDataTreeWriteCursorAdapter<T extends DOMDataTreeWriteCurs
     private BindingToNormalizedNodeCodec codec;
     private final Deque<PathArgument> stack = new ArrayDeque<>();
 
-    public BindingDOMDataTreeWriteCursorAdapter(final DataTreeIdentifier<?> path, final T delegate, final BindingToNormalizedNodeCodec codec) {
+    public BindingDOMDataTreeWriteCursorAdapter(final DataTreeIdentifier<?> path, final T delegate,
+            final BindingToNormalizedNodeCodec codec) {
 
         this.delegate = delegate;
         this.codec = codec;
@@ -42,10 +43,12 @@ public class BindingDOMDataTreeWriteCursorAdapter<T extends DOMDataTreeWriteCurs
         return ret.getLastPathArgument();
     }
 
-    private <T extends DataObject> Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> convertToNormalized(final PathArgument child, final T data) {
+    private <T extends DataObject> Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> convertToNormalized(
+            final PathArgument child, final T data) {
         stack.push(child);
         final InstanceIdentifier<?> iid = InstanceIdentifier.create(stack);
-        final Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> entry = codec.toNormalizedNode(new SimpleEntry<>(iid, data));
+        final Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> entry
+            = codec.toNormalizedNode(new SimpleEntry<>(iid, data));
         stack.pop();
         return entry;
     }
index 40260da2fe374144a721bc8a3693b17bfb121f3e..2a3ae308ef1748d57cbea973702edbeb7b1e7e8a 100644 (file)
@@ -17,13 +17,15 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.impl.codec.DeserializationException;
 
-final class BindingDOMMountPointListenerAdapter<T extends MountPointListener> implements ListenerRegistration<T>, DOMMountPointListener {
+final class BindingDOMMountPointListenerAdapter<T extends MountPointListener> implements
+            ListenerRegistration<T>, DOMMountPointListener {
 
     private final T listener;
     private final ListenerRegistration<DOMMountPointListener> registration;
     private final BindingToNormalizedNodeCodec codec;
 
-    public BindingDOMMountPointListenerAdapter(final T listener, final BindingToNormalizedNodeCodec codec, final DOMMountPointService mountService) {
+    BindingDOMMountPointListenerAdapter(final T listener, final BindingToNormalizedNodeCodec codec,
+            final DOMMountPointService mountService) {
         this.listener = listener;
         this.codec = codec;
         this.registration = mountService.registerProvisionListener(this);
@@ -45,14 +47,16 @@ final class BindingDOMMountPointListenerAdapter<T extends MountPointListener> im
             final InstanceIdentifier<? extends DataObject> bindingPath = toBinding(path);
             listener.onMountPointCreated(bindingPath);
         } catch (final DeserializationException e) {
-            BindingDOMMountPointServiceAdapter.LOG.error("Unable to translate mountPoint path {}. Omitting event.",path,e);
+            BindingDOMMountPointServiceAdapter.LOG.error("Unable to translate mountPoint path {}."
+                    + " Omitting event.",path,e);
         }
 
     }
 
-    private InstanceIdentifier<? extends DataObject> toBinding(final YangInstanceIdentifier path) throws DeserializationException {
+    private InstanceIdentifier<? extends DataObject> toBinding(final YangInstanceIdentifier path)
+            throws DeserializationException {
         final Optional<InstanceIdentifier<? extends DataObject>> instanceIdentifierOptional = codec.toBinding(path);
-        if(instanceIdentifierOptional.isPresent()) {
+        if (instanceIdentifierOptional.isPresent()) {
             return instanceIdentifierOptional.get();
         } else {
             throw new DeserializationException("Deserialization unsuccessful, " + instanceIdentifierOptional);
@@ -65,7 +69,8 @@ final class BindingDOMMountPointListenerAdapter<T extends MountPointListener> im
             final InstanceIdentifier<? extends DataObject> bindingPath = toBinding(path);
             listener.onMountPointRemoved(bindingPath);
         } catch (final DeserializationException e) {
-            BindingDOMMountPointServiceAdapter.LOG.error("Unable to translate mountPoint path {}. Omitting event.",path,e);
+            BindingDOMMountPointServiceAdapter.LOG.error("Unable to translate mountPoint path {}."
+                    + " Omitting event.",path,e);
         }
     }
 }
\ No newline at end of file
index 6f106a6aac96d2c00c0120849ad15b6a4b556d69..7c5027e6c6949c58bbb4f4b2c7438e472c40b805 100644 (file)
@@ -7,15 +7,14 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import org.opendaylight.mdsal.dom.api.DOMMountPoint;
-import org.opendaylight.mdsal.dom.api.DOMMountPointService;
-
-import org.opendaylight.mdsal.binding.api.MountPoint;
-import org.opendaylight.mdsal.binding.api.MountPointService;
 import com.google.common.base.Optional;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import org.opendaylight.mdsal.binding.api.MountPoint;
+import org.opendaylight.mdsal.binding.api.MountPointService;
+import org.opendaylight.mdsal.dom.api.DOMMountPoint;
+import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
@@ -48,7 +47,7 @@ public class BindingDOMMountPointServiceAdapter implements MountPointService {
 
         YangInstanceIdentifier domPath = codec.toYangInstanceIdentifierBlocking(mountPoint);
         Optional<DOMMountPoint> domMount = mountService.getMountPoint(domPath);
-        if(domMount.isPresent()) {
+        if (domMount.isPresent()) {
             return Optional.<MountPoint>fromNullable(bindingMountpoints.getUnchecked(domMount.get()));
         }
         return Optional.absent();
index 9d8138384f95f04a5abbf4307fff5e5c9bb13275..bb37a935f3b57096dfffdb2cd230724bf83547fc 100644 (file)
@@ -31,7 +31,8 @@ class BindingDOMNotificationListenerAdapter implements DOMNotificationListener {
     private final NotificationListener delegate;
     private final Map<SchemaPath,NotificationListenerInvoker> invokers;
 
-    public BindingDOMNotificationListenerAdapter(final BindingNormalizedNodeSerializer codec, final NotificationListener delegate) {
+    BindingDOMNotificationListenerAdapter(final BindingNormalizedNodeSerializer codec,
+            final NotificationListener delegate) {
         this.codec = codec;
         this.delegate = delegate;
         this.invokers = createInvokerMapFor(delegate.getClass());
@@ -45,7 +46,7 @@ class BindingDOMNotificationListenerAdapter implements DOMNotificationListener {
     }
 
     private Notification deserialize(final DOMNotification notification) {
-        if(notification instanceof LazySerializedDOMNotification) {
+        if (notification instanceof LazySerializedDOMNotification) {
             return ((LazySerializedDOMNotification) notification).getBindingData();
         }
         return codec.fromNormalizedNodeNotification(notification.getType(), notification.getBody());
@@ -59,15 +60,17 @@ class BindingDOMNotificationListenerAdapter implements DOMNotificationListener {
         return invokers.keySet();
     }
 
-    public static Map<SchemaPath, NotificationListenerInvoker> createInvokerMapFor(final Class<? extends NotificationListener> implClz) {
+    public static Map<SchemaPath, NotificationListenerInvoker> createInvokerMapFor(
+            final Class<? extends NotificationListener> implClz) {
         final Map<SchemaPath, NotificationListenerInvoker> builder = new HashMap<>();
-        for(final TypeToken<?> ifaceToken : TypeToken.of(implClz).getTypes().interfaces()) {
+        for (final TypeToken<?> ifaceToken : TypeToken.of(implClz).getTypes().interfaces()) {
             Class<?> iface = ifaceToken.getRawType();
-            if(NotificationListener.class.isAssignableFrom(iface) && BindingReflections.isBindingClass(iface)) {
+            if (NotificationListener.class.isAssignableFrom(iface) && BindingReflections.isBindingClass(iface)) {
                 @SuppressWarnings("unchecked")
-                final Class<? extends NotificationListener> listenerType = (Class<? extends NotificationListener>) iface;
+                final Class<? extends NotificationListener> listenerType
+                        = (Class<? extends NotificationListener>) iface;
                 final NotificationListenerInvoker invoker = NotificationListenerInvoker.from(listenerType);
-                for(final SchemaPath path : getNotificationTypes(listenerType)) {
+                for (final SchemaPath path : getNotificationTypes(listenerType)) {
                     builder.put(path, invoker);
                 }
             }
@@ -79,8 +82,8 @@ class BindingDOMNotificationListenerAdapter implements DOMNotificationListener {
         // TODO: Investigate possibility and performance impact if we cache this or expose
         // it from NotificationListenerInvoker
         final Set<SchemaPath> ret = new HashSet<>();
-        for(final Method method : type.getMethods()) {
-            if(BindingReflections.isNotificationCallback(method)) {
+        for (final Method method : type.getMethods()) {
+            if (BindingReflections.isNotificationCallback(method)) {
                 final Class<?> notification = method.getParameterTypes()[0];
                 final QName name = BindingReflections.findQName(notification);
                 ret.add(SchemaPath.create(true, name));
index 5411b7de433fc9ad75637efefefda3932d794e68..2f09f365b41d9aaa279995c3e3fa93de32e60929 100644 (file)
@@ -7,34 +7,35 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import org.opendaylight.mdsal.dom.api.DOMNotification;
-import org.opendaylight.mdsal.dom.api.DOMNotificationPublishService;
-import org.opendaylight.mdsal.dom.api.DOMService;
-
-import org.opendaylight.mdsal.binding.api.NotificationPublishService;
-import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMAdapterBuilder.Factory;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMAdapterBuilder.Factory;
+import org.opendaylight.mdsal.dom.api.DOMNotification;
+import org.opendaylight.mdsal.dom.api.DOMNotificationPublishService;
+import org.opendaylight.mdsal.dom.api.DOMService;
 import org.opendaylight.yangtools.yang.binding.Notification;
 
 public class BindingDOMNotificationPublishServiceAdapter implements NotificationPublishService, AutoCloseable {
 
-    static final Factory<NotificationPublishService> BUILDER_FACTORY = new BindingDOMAdapterBuilder.Factory<NotificationPublishService>() {
+    static final Factory<NotificationPublishService> BUILDER_FACTORY
+            = new BindingDOMAdapterBuilder.Factory<NotificationPublishService>() {
 
-        @Override
-        public BindingDOMAdapterBuilder<NotificationPublishService> newBuilder() {
-            return new Builder();
-        }
+                @Override
+                public BindingDOMAdapterBuilder<NotificationPublishService> newBuilder() {
+                    return new Builder();
+                }
 
-    };
+            };
 
     private final BindingToNormalizedNodeCodec codecRegistry;
     private final DOMNotificationPublishService domPublishService;
 
-    public BindingDOMNotificationPublishServiceAdapter(final BindingToNormalizedNodeCodec codec, final DOMNotificationPublishService domPublishService) {
+    public BindingDOMNotificationPublishServiceAdapter(final BindingToNormalizedNodeCodec codec,
+            final DOMNotificationPublishService domPublishService) {
         this.codecRegistry = codec;
         this.domPublishService = domPublishService;
     }
@@ -61,8 +62,10 @@ public class BindingDOMNotificationPublishServiceAdapter implements Notification
     }
 
     @Override
-    public ListenableFuture<? extends Object> offerNotification(final Notification notification, final int timeout, final TimeUnit unit) throws InterruptedException {
-        ListenableFuture<?> offerResult = domPublishService.offerNotification(toDomNotification(notification), timeout, unit);
+    public ListenableFuture<? extends Object> offerNotification(final Notification notification,
+            final int timeout, final TimeUnit unit) throws InterruptedException {
+        ListenableFuture<?> offerResult = domPublishService.offerNotification(
+                toDomNotification(notification), timeout, unit);
         return DOMNotificationPublishService.REJECTED.equals(offerResult)
                 ? NotificationPublishService.REJECTED
                 : offerResult;
index aed8268e6a60ccd0f9369402af3b4f9cb7ef83b9..da5998786ee958f30deef70786468651f16b521a 100644 (file)
@@ -32,14 +32,16 @@ public class BindingDOMNotificationServiceAdapter implements NotificationService
     private final BindingNormalizedNodeSerializer codec;
     private final DOMNotificationService domNotifService;
 
-    public BindingDOMNotificationServiceAdapter(final BindingNormalizedNodeSerializer codec, final DOMNotificationService domNotifService) {
+    public BindingDOMNotificationServiceAdapter(final BindingNormalizedNodeSerializer codec,
+            final DOMNotificationService domNotifService) {
         this.codec = codec;
         this.domNotifService = domNotifService;
     }
 
     @Override
     public <T extends NotificationListener> ListenerRegistration<T> registerNotificationListener(final T listener) {
-        final BindingDOMNotificationListenerAdapter domListener = new BindingDOMNotificationListenerAdapter(codec, listener);
+        final BindingDOMNotificationListenerAdapter domListener
+                = new BindingDOMNotificationListenerAdapter(codec, listener);
         final ListenerRegistration<BindingDOMNotificationListenerAdapter> domRegistration =
                 domNotifService.registerNotificationListener(domListener, domListener.getSupportedNotifications());
         return new ListenerRegistrationImpl<>(listener, domRegistration);
@@ -50,10 +52,11 @@ public class BindingDOMNotificationServiceAdapter implements NotificationService
 
     }
 
-    private static class ListenerRegistrationImpl<T extends NotificationListener> extends AbstractListenerRegistration<T> {
+    private static class ListenerRegistrationImpl<T extends NotificationListener>
+            extends AbstractListenerRegistration<T> {
         private final ListenerRegistration<?> listenerRegistration;
 
-        public ListenerRegistrationImpl(final T listener, final ListenerRegistration<?> listenerRegistration) {
+        ListenerRegistrationImpl(final T listener, final ListenerRegistration<?> listenerRegistration) {
             super(listener);
             this.listenerRegistration = listenerRegistration;
         }
index 19ba673a267c9cd6db1e642ef84d12ba2303a276..4712a36d166c0e18c0ad9602db1c10a09113b25d 100644 (file)
@@ -7,16 +7,15 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
+import com.google.common.base.Optional;
+import com.google.common.util.concurrent.CheckedFuture;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.common.api.ReadFailedException;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
-import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
-
 class BindingDOMReadTransactionAdapter extends AbstractForwardedTransaction<DOMDataTreeReadTransaction> implements
         ReadTransaction {
 
index 0f197ec63fdceeccdaf9f95ad0f9b7599b919b27..3f08e58147f0e346915e751cf44c799ae618f329 100644 (file)
@@ -8,15 +8,14 @@
 package org.opendaylight.mdsal.binding.dom.adapter;
 
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration;
-
 import org.opendaylight.yangtools.concepts.AbstractObjectRegistration;
 import org.opendaylight.yangtools.yang.binding.RpcService;
 
-class BindingDOMRpcAdapterRegistration<T extends RpcService> extends AbstractObjectRegistration<T>{
+class BindingDOMRpcAdapterRegistration<T extends RpcService> extends AbstractObjectRegistration<T> {
 
     private final DOMRpcImplementationRegistration<?> reg;
 
-    public BindingDOMRpcAdapterRegistration(T instance, DOMRpcImplementationRegistration<?> reg) {
+    BindingDOMRpcAdapterRegistration(T instance, DOMRpcImplementationRegistration<?> reg) {
         super(instance);
         this.reg = reg;
     }
index a7f4bb882525655adde8b7ea069002f0a952f34a..5900ce3aaaa31264085225442d61e152f23632c3 100644 (file)
@@ -36,14 +36,16 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 public class BindingDOMRpcImplementationAdapter implements DOMRpcImplementation {
 
-    private static final Cache<Class<?>, RpcServiceInvoker> SERVICE_INVOKERS = CacheBuilder.newBuilder().weakKeys().build();
+    private static final Cache<Class<?>, RpcServiceInvoker> SERVICE_INVOKERS
+            = CacheBuilder.newBuilder().weakKeys().build();
 
     private final BindingNormalizedNodeCodecRegistry codec;
     private final RpcServiceInvoker invoker;
     private final RpcService delegate;
     private final QName inputQname;
 
-    public <T extends RpcService> BindingDOMRpcImplementationAdapter(final BindingNormalizedNodeCodecRegistry codec, final Class<T> type, final Map<SchemaPath, Method> localNameToMethod, final T delegate) {
+    public <T extends RpcService> BindingDOMRpcImplementationAdapter(final BindingNormalizedNodeCodecRegistry codec,
+            final Class<T> type, final Map<SchemaPath, Method> localNameToMethod, final T delegate) {
         try {
             this.invoker = SERVICE_INVOKERS.get(type, new Callable<RpcServiceInvoker>() {
                 @Override
@@ -66,7 +68,8 @@ public class BindingDOMRpcImplementationAdapter implements DOMRpcImplementation
     }
 
     @Override
-    public CheckedFuture<DOMRpcResult, DOMRpcException> invokeRpc(final DOMRpcIdentifier rpc, final NormalizedNode<?, ?> input) {
+    public CheckedFuture<DOMRpcResult, DOMRpcException> invokeRpc(final DOMRpcIdentifier rpc,
+            final NormalizedNode<?, ?> input) {
         final SchemaPath schemaPath = rpc.getType();
         final DataObject bindingInput = input != null ? deserilialize(rpc.getType(),input) : null;
         final ListenableFuture<RpcResult<?>> bindingResult = invoke(schemaPath,bindingInput);
index 9de1501aef0a5455e26138df165a65822ec0b0a1..6cbc67e2dd7468c09cf43224feb3064c4a2babff 100644 (file)
@@ -7,10 +7,6 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
-import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration;
-import org.opendaylight.mdsal.dom.api.DOMRpcProviderService;
-
 import com.google.common.collect.ImmutableSet;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -18,19 +14,24 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
+import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration;
+import org.opendaylight.mdsal.dom.api.DOMRpcProviderService;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.RpcService;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
+
 public class BindingDOMRpcProviderServiceAdapter {
 
     private static final Set<YangInstanceIdentifier> GLOBAL = ImmutableSet.of(YangInstanceIdentifier.builder().build());
     private final BindingToNormalizedNodeCodec codec;
     private final DOMRpcProviderService domRpcRegistry;
 
-    public BindingDOMRpcProviderServiceAdapter(final DOMRpcProviderService domRpcRegistry, final BindingToNormalizedNodeCodec codec) {
+    public BindingDOMRpcProviderServiceAdapter(final DOMRpcProviderService domRpcRegistry,
+            final BindingToNormalizedNodeCodec codec) {
         this.codec = codec;
         this.domRpcRegistry = domRpcRegistry;
     }
@@ -45,16 +46,19 @@ public class BindingDOMRpcProviderServiceAdapter {
         return register(type, implementation, toYangInstanceIdentifiers(paths));
     }
 
-    private <S extends RpcService, T extends S> ObjectRegistration<T> register(final Class<S> type, final T implementation, final Collection<YangInstanceIdentifier> rpcContextPaths) {
+    private <S extends RpcService, T extends S> ObjectRegistration<T> register(final Class<S> type,
+            final T implementation, final Collection<YangInstanceIdentifier> rpcContextPaths) {
         final Map<SchemaPath, Method> rpcs = codec.getRpcMethodToSchemaPath(type).inverse();
 
-        final BindingDOMRpcImplementationAdapter adapter = new BindingDOMRpcImplementationAdapter(codec.getCodecRegistry(), type, rpcs, implementation);
+        final BindingDOMRpcImplementationAdapter adapter = new BindingDOMRpcImplementationAdapter(
+                codec.getCodecRegistry(), type, rpcs, implementation);
         final Set<DOMRpcIdentifier> domRpcs = createDomRpcIdentifiers(rpcs.keySet(), rpcContextPaths);
         final DOMRpcImplementationRegistration<?> domReg = domRpcRegistry.registerRpcImplementation(adapter, domRpcs);
         return new BindingRpcAdapterRegistration<>(implementation, domReg);
     }
 
-    private static Set<DOMRpcIdentifier> createDomRpcIdentifiers(final Set<SchemaPath> rpcs, final Collection<YangInstanceIdentifier> paths) {
+    private static Set<DOMRpcIdentifier> createDomRpcIdentifiers(final Set<SchemaPath> rpcs,
+            final Collection<YangInstanceIdentifier> paths) {
         final Set<DOMRpcIdentifier> ret = new HashSet<>();
         for (final YangInstanceIdentifier path : paths) {
             for (final SchemaPath rpc : rpcs) {
index daa87a4398803756b1b3fd99fcc5279df0f7bd86..a4599c9815ff65d1226daf91eecc010300874a94 100644 (file)
@@ -7,11 +7,6 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import org.opendaylight.mdsal.dom.api.DOMRpcService;
-import org.opendaylight.mdsal.dom.api.DOMService;
-
-import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
-import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMAdapterBuilder.Factory;
 import com.google.common.base.Preconditions;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
@@ -19,9 +14,14 @@ import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableSet;
 import java.util.Set;
+import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMAdapterBuilder.Factory;
+import org.opendaylight.mdsal.dom.api.DOMRpcService;
+import org.opendaylight.mdsal.dom.api.DOMService;
 import org.opendaylight.yangtools.yang.binding.RpcService;
 import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
 
+
 public class BindingDOMRpcServiceAdapter implements RpcConsumerRegistry {
 
     protected static final Factory<RpcConsumerRegistry> BUILDER_FACTORY = new Factory<RpcConsumerRegistry>() {
index 58d1005fd8ffd55cf7386d1c42fa35a86b902bd7..a2226dfcf9af9604232c539ba745071eec2c73ac 100644 (file)
@@ -7,22 +7,21 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
+import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import org.opendaylight.mdsal.binding.api.BindingTransactionChain;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.AsyncTransaction;
 import org.opendaylight.mdsal.common.api.TransactionChain;
 import org.opendaylight.mdsal.common.api.TransactionChainListener;
 import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
-
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
-import org.opendaylight.mdsal.binding.api.BindingTransactionChain;
-import org.opendaylight.mdsal.binding.api.ReadTransaction;
-import org.opendaylight.mdsal.binding.api.WriteTransaction;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.CheckedFuture;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
 import org.opendaylight.yangtools.concepts.Delegator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,7 +35,7 @@ final class BindingDOMTransactionChainAdapter implements BindingTransactionChain
     private final DelegateChainListener domListener;
     private final TransactionChainListener bindingListener;
 
-    public BindingDOMTransactionChainAdapter(final DOMDataBroker chainFactory,
+    BindingDOMTransactionChainAdapter(final DOMDataBroker chainFactory,
             final BindingToNormalizedNodeCodec codec, final TransactionChainListener listener) {
         Preconditions.checkNotNull(chainFactory, "DOM Transaction chain factory must not be null");
         this.domListener = new DelegateChainListener();
@@ -73,8 +72,8 @@ final class BindingDOMTransactionChainAdapter implements BindingTransactionChain
             final WriteTransaction tx, final CheckedFuture<Void, TransactionCommitFailedException> future) {
         Futures.addCallback(future, new FutureCallback<Void>() {
             @Override
-            public void onFailure(final Throwable t) {
-                failTransactionChain(tx,t);
+            public void onFailure(final Throwable throwable) {
+                failTransactionChain(tx, throwable);
             }
 
             @Override
@@ -86,14 +85,14 @@ final class BindingDOMTransactionChainAdapter implements BindingTransactionChain
         return future;
     }
 
-    private void failTransactionChain(final WriteTransaction tx, final Throwable t) {
+    private void failTransactionChain(final WriteTransaction tx, final Throwable throwable) {
         /*
          *  We asume correct state change for underlaying transaction
          *
          * chain, so we are not changing any of our internal state
          * to mark that we failed.
          */
-        this.bindingListener.onTransactionChainFailed(this, tx, t);
+        this.bindingListener.onTransactionChainFailed(this, tx, throwable);
     }
 
     @Override
index eeaf5a0ceb6395c58a70035a629491b8da929ac5..e3eed744a5046f6fcd68fb0f2d6e2554582f70c7 100644 (file)
@@ -7,15 +7,15 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
-
 import com.google.common.util.concurrent.CheckedFuture;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
+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.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
+
 class BindingDOMWriteTransactionAdapter<T extends DOMDataTreeWriteTransaction> extends
         AbstractWriteTransaction<T> implements WriteTransaction {
 
index 3394c660be957bd232e03093f8d0bcc5fef76ec0..879e8a868deff453940146c71abbca2b0d5fa202 100644 (file)
@@ -7,13 +7,13 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
-
 import com.google.common.base.Preconditions;
+import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
 import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 
-class BindingDataTreeChangeListenerRegistration<L extends DataTreeChangeListener<?>> extends AbstractListenerRegistration<L> {
+class BindingDataTreeChangeListenerRegistration<L extends DataTreeChangeListener<?>>
+        extends AbstractListenerRegistration<L> {
 
     private final ListenerRegistration<?> domReg;
 
index dab7aa0d1877c846b60e72a766aa5952632ec031..069bf773b1bf162072d745279444f3bdf59b583a 100644 (file)
@@ -7,16 +7,16 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import org.opendaylight.mdsal.dom.api.DOMMountPoint;
-import org.opendaylight.mdsal.dom.api.DOMService;
-
-import org.opendaylight.mdsal.binding.api.BindingService;
-import org.opendaylight.mdsal.binding.api.MountPoint;
 import com.google.common.base.Optional;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.LoadingCache;
+import org.opendaylight.mdsal.binding.api.BindingService;
+import org.opendaylight.mdsal.binding.api.MountPoint;
+import org.opendaylight.mdsal.dom.api.DOMMountPoint;
+import org.opendaylight.mdsal.dom.api.DOMService;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
+
 public class BindingMountPointAdapter implements MountPoint {
 
     private final InstanceIdentifier<?> identifier;
@@ -41,7 +41,7 @@ public class BindingMountPointAdapter implements MountPoint {
     @Override
     public <T extends BindingService> Optional<T> getService(Class<T> service) {
         Optional<BindingService> potential = services.getUnchecked(service);
-        if(potential.isPresent()) {
+        if (potential.isPresent()) {
             return Optional.of(service.cast(potential.get()));
         }
         return Optional.absent();
index 5038af568b932544e8d121539b03c75c1e40071c..3d02212df50f1890b22a19f95aa2f0e879c8caa2 100644 (file)
@@ -8,15 +8,14 @@
 package org.opendaylight.mdsal.binding.dom.adapter;
 
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration;
-
 import org.opendaylight.yangtools.concepts.AbstractObjectRegistration;
 import org.opendaylight.yangtools.yang.binding.RpcService;
 
-class BindingRpcAdapterRegistration<T extends RpcService> extends AbstractObjectRegistration<T>{
+class BindingRpcAdapterRegistration<T extends RpcService> extends AbstractObjectRegistration<T> {
 
     private final DOMRpcImplementationRegistration<?> reg;
 
-    public BindingRpcAdapterRegistration(T instance, DOMRpcImplementationRegistration<?> reg) {
+    BindingRpcAdapterRegistration(T instance, DOMRpcImplementationRegistration<?> reg) {
         super(instance);
         this.reg = reg;
     }
index eca0082c4b69f782c03d77c3108e93c26c627c38..f6577a5e5923cdba57b93210e24f3d662fb9efa0 100644 (file)
@@ -25,17 +25,16 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode;
 
 /**
- *
  * Defines structural mapping of Normalized Node to Binding data
  * addressable by Instance Identifier.
  *
+ * <p>
  * Not all binding data are addressable by instance identifier
  * and there are some differences.
  *
+ * <p>
  * See {@link #NOT_ADDRESSABLE},{@link #INVISIBLE_CONTAINER},{@link #VISIBLE_CONTAINER}
  * for more details.
- *
- *
  */
 enum BindingStructuralType {
 
@@ -43,6 +42,7 @@ enum BindingStructuralType {
      * DOM Item is not addressable in Binding Instance Identifier,
      * data is not lost, but are available only via parent object.
      *
+     * <p>
      * Such types of data are leaf-lists, leafs, list without keys
      * or anyxml.
      *
@@ -52,8 +52,10 @@ enum BindingStructuralType {
      * Data container is addressable in NormalizedNode format,
      * but in Binding it is not represented in Instance Identifier.
      *
+     * <p>
      * This are choice / case nodes.
      *
+     * <p>
      * This data is still accessible using parent object and their
      * children are addressable.
      *
@@ -63,8 +65,10 @@ enum BindingStructuralType {
      * Data container is addressable in NormalizedNode format,
      * but in Binding it is not represented in Instance Identifier.
      *
+     * <p>
      * This are list nodes.
      *
+     * <p>
      * This data is still accessible using parent object and their
      * children are addressable.
      *
@@ -84,33 +88,33 @@ enum BindingStructuralType {
 
     static BindingStructuralType from(final DataTreeCandidateNode domChildNode) {
         final Optional<NormalizedNode<?, ?>> dataBased = domChildNode.getDataAfter().or(domChildNode.getDataBefore());
-        if(dataBased.isPresent()) {
+        if (dataBased.isPresent()) {
             return from(dataBased.get());
         }
         return from(domChildNode.getIdentifier());
     }
 
     private static BindingStructuralType from(final PathArgument identifier) {
-        if(identifier instanceof NodeIdentifierWithPredicates || identifier instanceof AugmentationIdentifier) {
+        if (identifier instanceof NodeIdentifierWithPredicates || identifier instanceof AugmentationIdentifier) {
             return VISIBLE_CONTAINER;
         }
-        if(identifier instanceof NodeWithValue) {
+        if (identifier instanceof NodeWithValue) {
             return NOT_ADDRESSABLE;
         }
         return UNKNOWN;
     }
 
     static BindingStructuralType from(final NormalizedNode<?, ?> data) {
-        if(isNotAddressable(data)) {
+        if (isNotAddressable(data)) {
             return NOT_ADDRESSABLE;
         }
-        if(data instanceof MapNode) {
+        if (data instanceof MapNode) {
             return INVISIBLE_LIST;
         }
-        if(data instanceof ChoiceNode) {
+        if (data instanceof ChoiceNode) {
             return INVISIBLE_CONTAINER;
         }
-        if(isVisibleContainer(data)) {
+        if (isVisibleContainer(data)) {
             return VISIBLE_CONTAINER;
         }
         return UNKNOWN;
@@ -120,11 +124,11 @@ enum BindingStructuralType {
         return data instanceof MapEntryNode || data instanceof ContainerNode || data instanceof AugmentationNode;
     }
 
-    private static boolean isNotAddressable(final NormalizedNode<?, ?> d) {
-        return d instanceof LeafNode
-                || d instanceof AnyXmlNode
-                || d instanceof LeafSetNode
-                || d instanceof LeafSetEntryNode;
+    private static boolean isNotAddressable(final NormalizedNode<?, ?> normalizedNode) {
+        return normalizedNode instanceof LeafNode
+                || normalizedNode instanceof AnyXmlNode
+                || normalizedNode instanceof LeafSetNode
+                || normalizedNode instanceof LeafSetEntryNode;
     }
 
 }
index c1a3e13c33f2a9dfb51b9aefff60d83682ccb9d0..2a7c32932b30a47899497d9dbf192eae8c2a7e86 100644 (file)
@@ -59,7 +59,8 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFactory, BindingNormalizedNodeSerializer, SchemaContextListener, AutoCloseable {
+public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFactory,
+        BindingNormalizedNodeSerializer, SchemaContextListener, AutoCloseable {
 
     private static final long WAIT_DURATION_SEC = 5;
     private static final Logger LOG = LoggerFactory.getLogger(BindingToNormalizedNodeCodec.class);
@@ -138,8 +139,9 @@ public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFacto
     }
 
     /**
-     * Converts Binding Map.Entry to DOM Map.Entry
+     * Converts Binding Map.Entry to DOM Map.Entry.
      *
+     * <p>
      * Same as {@link #toNormalizedNode(InstanceIdentifier, DataObject)}.
      *
      * @param binding Map Entry with InstanceIdentifier as key and DataObject as value.
@@ -184,10 +186,10 @@ public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFacto
     }
 
     /**
-     *
      * Returns a Binding-Aware instance identifier from normalized
      * instance-identifier if it is possible to create representation.
      *
+     * <p>
      * Returns Optional.absent for cases where target is mixin node except
      * augmentation.
      *
@@ -195,7 +197,8 @@ public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFacto
     public Optional<InstanceIdentifier<? extends DataObject>> toBinding(final YangInstanceIdentifier normalized)
                     throws DeserializationException {
         try {
-            return Optional.<InstanceIdentifier<? extends DataObject>>fromNullable(codecRegistry.fromYangInstanceIdentifier(normalized));
+            return Optional.<InstanceIdentifier<? extends DataObject>>fromNullable(
+                    codecRegistry.fromYangInstanceIdentifier(normalized));
         } catch (final IllegalArgumentException e) {
             return Optional.absent();
         }
@@ -206,8 +209,9 @@ public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFacto
                     throws DeserializationException {
         try {
             /*
-             * This cast is required, due to generics behaviour in openjdk / oracle javac
+             * This cast is required, due to generics behaviour in openjdk / oracle javac.
              *
+             * <p>
              * InstanceIdentifier has definition InstanceIdentifier<T extends DataObject>,
              * this means '?' is always Â <? extends DataObject>. Eclipse compiler
              * is able to determine this relationship and treats
@@ -215,11 +219,13 @@ public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFacto
              * as assignable. However openjdk / oracle javac treats this two types
              * as incompatible and issues a compile error.
              *
+             * <p>
              * It is safe to  loose generic information and cast it to other generic signature.
              *
              */
             @SuppressWarnings("unchecked")
-            final Entry<InstanceIdentifier<? extends DataObject>, DataObject> binding = Entry.class.cast(codecRegistry.fromNormalizedNode(normalized.getKey(), normalized.getValue()));
+            final Entry<InstanceIdentifier<? extends DataObject>, DataObject> binding = Entry.class.cast(
+                    codecRegistry.fromNormalizedNode(normalized.getKey(), normalized.getValue()));
             return Optional.fromNullable(binding);
         } catch (final IllegalArgumentException e) {
             return Optional.absent();
@@ -230,12 +236,13 @@ public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFacto
     public void onGlobalContextUpdated(final SchemaContext arg0) {
         runtimeContext = BindingRuntimeContext.create(classLoadingStrategy, arg0);
         codecRegistry.onBindingRuntimeContextUpdated(runtimeContext);
-        if(futureSchema != null) {
+        if (futureSchema != null) {
             futureSchema.onRuntimeContextUpdated(runtimeContext);
         }
     }
 
-    public <T extends DataObject> Function<Optional<NormalizedNode<?, ?>>, Optional<T>>  deserializeFunction(final InstanceIdentifier<T> path) {
+    public <T extends DataObject> Function<Optional<NormalizedNode<?, ?>>, Optional<T>>
+            deserializeFunction(final InstanceIdentifier<T> path) {
         return codecRegistry.deserializeFunction(path);
     }
 
@@ -288,7 +295,7 @@ public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFacto
         BindingRuntimeContext localRuntimeContext = runtimeContext;
         Module module = localRuntimeContext == null ? null :
             localRuntimeContext.getSchemaContext().findModuleByNamespaceAndRevision(namespace, revision);
-        if(module == null && futureSchema != null && futureSchema.waitForSchema(namespace,revision)) {
+        if (module == null && futureSchema != null && futureSchema.waitForSchema(namespace,revision)) {
             localRuntimeContext = runtimeContext;
             Preconditions.checkState(localRuntimeContext != null, "BindingRuntimeContext is not available.");
             module = localRuntimeContext.getSchemaContext().findModuleByNamespaceAndRevision(namespace, revision);
@@ -297,19 +304,21 @@ public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFacto
         return module;
     }
 
-    private void waitForSchema(final Collection<Class<?>> binding, final MissingSchemaException e) {
-        if(futureSchema != null) {
-            LOG.warn("Blocking thread to wait for schema convergence updates for {} {}",futureSchema.getDuration(), futureSchema.getUnit());
-            if(!futureSchema.waitForSchema(binding)) {
+    private void waitForSchema(final Collection<Class<?>> binding, final MissingSchemaException exception) {
+        if (futureSchema != null) {
+            LOG.warn("Blocking thread to wait for schema convergence updates for {} {}",
+                    futureSchema.getDuration(), futureSchema.getUnit());
+            if (!futureSchema.waitForSchema(binding)) {
                 return;
             }
         }
-        throw e;
+        throw exception;
     }
 
-    private Method findRpcMethod(final Class<? extends RpcService> key, final RpcDefinition rpcDef) throws NoSuchMethodException {
+    private Method findRpcMethod(final Class<? extends RpcService> key, final RpcDefinition rpcDef)
+            throws NoSuchMethodException {
         final String methodName = BindingMapping.getMethodName(rpcDef.getQName());
-        if(rpcDef.getInput() != null) {
+        if (rpcDef.getInput() != null) {
             final Class<?> inputClz = runtimeContext.getClassForSchema(rpcDef.getInput());
             return key.getMethod(methodName, inputClz);
         }
@@ -360,7 +369,7 @@ public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFacto
 
     private static Collection<Class<?>> decompose(final InstanceIdentifier<?> path) {
         final Set<Class<?>> clazzes = new HashSet<>();
-        for(final InstanceIdentifier.PathArgument arg : path.getPathArguments()) {
+        for (final InstanceIdentifier.PathArgument arg : path.getPathArguments()) {
             clazzes.add(arg.getType());
         }
         return clazzes;
index 1cfe005e7a02a991ce53f06f3b334f99fe8cd12e..e04c9256894fc3f3f07831e7a08645be6bb589c6 100644 (file)
@@ -54,10 +54,10 @@ abstract class ContextReferenceExtractor {
      * Binding DataObject.
      *
      * @param obj DataObject from which context reference
-     * should be extracted.
+     *     should be extracted.
      *
      * @return Instance Identifier representing context reference
-     * or null, if data object does not contain context reference.
+     *     or null, if data object does not contain context reference.
      */
     abstract @Nullable InstanceIdentifier<?> extract(DataObject obj);
 
@@ -88,7 +88,7 @@ abstract class ContextReferenceExtractor {
     private static Method findGetValueMethod(final Class<?> type, final Class<?> returnType) {
         try {
             final Method method = type.getMethod(GET_VALUE_NAME);
-            if(returnType.equals(method.getReturnType())) {
+            if (returnType.equals(method.getReturnType())) {
                 return method;
             }
         } catch (final NoSuchMethodException e) {
index b10db456dcf142db28a39012149eff0a849afb77..686147d624cac4ca42025d67285b24884a0dd0e5 100644 (file)
@@ -19,18 +19,19 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 final class DirectGetterRouteContextExtractor extends ContextReferenceExtractor {
 
-    private final static Lookup PUBLIC_LOOKUP = MethodHandles.publicLookup();
+    private static final Lookup PUBLIC_LOOKUP = MethodHandles.publicLookup();
     private final MethodHandle handle;
 
     private DirectGetterRouteContextExtractor(final MethodHandle rawHandle) {
         handle = rawHandle.asType(MethodType.methodType(InstanceIdentifier.class, DataObject.class));
     }
 
-    static final ContextReferenceExtractor create(final Method getterMethod) throws IllegalAccessException {
+    static ContextReferenceExtractor create(final Method getterMethod) throws IllegalAccessException {
         final MethodHandle getterHandle = PUBLIC_LOOKUP.unreflect(getterMethod);
         return new DirectGetterRouteContextExtractor(getterHandle);
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
     InstanceIdentifier<?> extract(final DataObject obj) {
         try {
index 3d796c1d9e795c2e6185137d5f59d8182f6434fa..96128243806f83b295fc73eb9fa944dc94201a76 100644 (file)
@@ -19,7 +19,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 final class GetValueRouteContextExtractor extends ContextReferenceExtractor {
 
-    private final static Lookup PUBLIC_LOOKUP = MethodHandles.publicLookup();
+    private static final Lookup PUBLIC_LOOKUP = MethodHandles.publicLookup();
     private final MethodHandle contextHandle;
     private final MethodHandle valueHandle;
 
@@ -35,6 +35,7 @@ final class GetValueRouteContextExtractor extends ContextReferenceExtractor {
         return new GetValueRouteContextExtractor(rawContextHandle, rawValueHandle);
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
     InstanceIdentifier<?> extract(final DataObject obj) {
         try {
index 66ca270b4f0b6ea151668c53e531f3d319369e0e..9ed31789e40c310352f194039d04e331f27580f1 100644 (file)
@@ -8,10 +8,6 @@
 
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
-
-import org.opendaylight.mdsal.dom.api.DOMRpcException;
-import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import com.google.common.util.concurrent.CheckedFuture;
@@ -20,6 +16,9 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import org.opendaylight.mdsal.dom.api.DOMRpcException;
+import org.opendaylight.mdsal.dom.api.DOMRpcResult;
+import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
 import org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeCodecRegistry;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
 import org.opendaylight.yangtools.yang.common.RpcResult;
index 69c3d6c872c5a4fb79e819e7dafa60e5fa412bf1..b4e14b6d772e1d729194fbde694d486bd9e6b246 100644 (file)
@@ -31,6 +31,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Lazily translated {@link DataObjectModification} based on {@link DataTreeCandidateNode}.
  *
+ * <p>
  * {@link LazyDataObjectModification} represents Data tree change event,
  * but whole tree is not translated or resolved eagerly, but only child nodes
  * which are directly accessed by user of data object modification.
@@ -39,7 +40,7 @@ import org.slf4j.LoggerFactory;
  */
 final class LazyDataObjectModification<T extends DataObject> implements DataObjectModification<T> {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LazyDataObjectModification.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LazyDataObjectModification.class);
 
     private final BindingCodecTreeNode<T> codec;
     private final DataTreeCandidateNode domData;
@@ -57,8 +58,8 @@ final class LazyDataObjectModification<T extends DataObject> implements DataObje
         return new LazyDataObjectModification<>(codec,domData);
     }
 
-    private static Collection<DataObjectModification<? extends DataObject>> from(final BindingCodecTreeNode<?> parentCodec,
-            final Collection<DataTreeCandidateNode> domChildNodes) {
+    private static Collection<DataObjectModification<? extends DataObject>> from(final BindingCodecTreeNode<?>
+            parentCodec, final Collection<DataTreeCandidateNode> domChildNodes) {
         final List<DataObjectModification<? extends DataObject>> result = new ArrayList<>(domChildNodes.size());
         populateList(result, parentCodec, domChildNodes);
         return result;
@@ -103,8 +104,8 @@ final class LazyDataObjectModification<T extends DataObject> implements DataObje
             case UNKNOWN:
             case VISIBLE_CONTAINER:
                 result.add(create(childCodec, domChildNode));
-            default:
                 break;
+            default:
         }
     }
 
@@ -137,7 +138,7 @@ final class LazyDataObjectModification<T extends DataObject> implements DataObje
 
     @Override
     public DataObjectModification.ModificationType getModificationType() {
-        switch(domData.getModificationType()) {
+        switch (domData.getModificationType()) {
             case APPEARED:
             case WRITE:
                 return DataObjectModification.ModificationType.WRITE;
@@ -163,7 +164,8 @@ final class LazyDataObjectModification<T extends DataObject> implements DataObje
 
     @SuppressWarnings("unchecked")
     @Override
-    public <C extends ChildOf<? super T>> Collection<DataObjectModification<C>> getModifiedChildren(Class<C> childType) {
+    public <C extends ChildOf<? super T>> Collection<DataObjectModification<C>>
+            getModifiedChildren(Class<C> childType) {
         List<DataObjectModification<C>> children = new ArrayList<>();
         for (DataObjectModification<? extends DataObject> potential : getModifiedChildren()) {
             if (childType.isAssignableFrom(potential.getDataType())) {
@@ -190,9 +192,10 @@ final class LazyDataObjectModification<T extends DataObject> implements DataObje
 
     @Override
     @SuppressWarnings("unchecked")
-    public <C extends Identifiable<K> & ChildOf<? super T>, K extends Identifier<C>> DataObjectModification<C> getModifiedChildListItem(
-            final Class<C> listItem, final K listKey) {
-        return (DataObjectModification<C>) getModifiedChild(new InstanceIdentifier.IdentifiableItem<>(listItem, listKey));
+    public <C extends Identifiable<K> & ChildOf<? super T>, K extends Identifier<C>> DataObjectModification<C>
+            getModifiedChildListItem(final Class<C> listItem, final K listKey) {
+        return (DataObjectModification<C>) getModifiedChild(new InstanceIdentifier.IdentifiableItem<>(
+                listItem, listKey));
     }
 
     @Override
index 3fc3be7c04de41ba6a47d6ecb0a6b0418304d163..52d649876325dbfde1e615df1acadb4f78d4ade8 100644 (file)
@@ -25,6 +25,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
 /**
  * Lazily translated {@link DataTreeModification} based on {@link DataTreeCandidate}.
  *
+ * <p>
  * {@link DataTreeModification} represents Data tree change event,
  * but whole tree is not translated or resolved eagerly, but only child nodes
  * which are directly accessed by user of data object modification.
@@ -51,8 +52,8 @@ class LazyDataTreeModification<T extends DataObject> implements DataTreeModifica
     }
 
     @SuppressWarnings({"unchecked", "rawtypes"})
-    static <T extends DataObject> DataTreeModification<T> create(final BindingToNormalizedNodeCodec codec, final DataTreeCandidate domChange,
-            final LogicalDatastoreType datastoreType) {
+    static <T extends DataObject> DataTreeModification<T> create(final BindingToNormalizedNodeCodec codec,
+            final DataTreeCandidate domChange, final LogicalDatastoreType datastoreType) {
         final Entry<InstanceIdentifier<?>, BindingCodecTreeNode<?>> codecCtx =
                 codec.getSubtreeCodec(domChange.getRootPath());
         final DataTreeIdentifier<?> path = DataTreeIdentifier.create(datastoreType, codecCtx.getKey());
@@ -61,15 +62,6 @@ class LazyDataTreeModification<T extends DataObject> implements DataTreeModifica
         return new LazyDataTreeModification(path, modification);
     }
 
-    static <T extends DataObject> Collection<DataTreeModification<T>> from(final BindingToNormalizedNodeCodec codec,
-            final Collection<DataTreeCandidate> domChanges, final LogicalDatastoreType datastoreType) {
-        final List<DataTreeModification<T>> result = new ArrayList<>(domChanges.size());
-        for (final DataTreeCandidate domChange : domChanges) {
-            result.add(LazyDataTreeModification.<T>create(codec, domChange, datastoreType));
-        }
-        return result;
-    }
-
     @SuppressWarnings({"unchecked", "rawtypes"})
     static <T extends DataObject> DataTreeModification<T> create(BindingToNormalizedNodeCodec codec,
             DOMDataTreeCandidate candidate) {
@@ -82,4 +74,13 @@ class LazyDataTreeModification<T extends DataObject> implements DataTreeModifica
         return new LazyDataTreeModification(path, modification);
     }
 
+    static <T extends DataObject> Collection<DataTreeModification<T>> from(final BindingToNormalizedNodeCodec codec,
+            final Collection<DataTreeCandidate> domChanges, final LogicalDatastoreType datastoreType) {
+        final List<DataTreeModification<T>> result = new ArrayList<>(domChanges.size());
+        for (final DataTreeCandidate domChange : domChanges) {
+            result.add(LazyDataTreeModification.<T>create(codec, domChange, datastoreType));
+        }
+        return result;
+    }
+
 }
index 5f62660c26ecae8427d1743aae43b1a4a5ce7252..e893a5cf68a9b90f11bbb60cf5dcbfc407404c19 100644 (file)
@@ -23,8 +23,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 /**
- *
- * FIXME: Should this be moved to binding-data-codec?
+ * FIXME: Should this be moved to binding-data-codec.
  *
  */
 class LazySerializedContainerNode implements ContainerNode {
index b6bd357a96894f514775e5491333ff918f9a8019..8ff3717b435dd6041a33ac1fadfbd6a815e94d4a 100644 (file)
@@ -17,6 +17,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 /**
  * Lazy serialized implementation of DOM Notification.
  *
+ * <p>
  * This implementation performs serialization of data, only if receiver
  * of notification actually accessed data from notification.
  *
@@ -29,7 +30,8 @@ public final class LazySerializedDOMNotification implements DOMNotification {
 
     private ContainerNode domBody;
 
-    private LazySerializedDOMNotification(final BindingNormalizedNodeSerializer codec, final Notification data, final SchemaPath type) {
+    private LazySerializedDOMNotification(final BindingNormalizedNodeSerializer codec,
+            final Notification data, final SchemaPath type) {
         super();
         this.codec = codec;
         this.data = data;
index a43bcb0629c298c1c457a8d69062632bc3db2ba5..3835bc9a500e88928f96b5e9d995365e388a0a61 100644 (file)
@@ -8,11 +8,6 @@
 
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import org.opendaylight.mdsal.dom.spi.RpcRoutingStrategy;
-
-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.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
@@ -23,6 +18,10 @@ import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.Map.Entry;
+import org.opendaylight.mdsal.dom.api.DOMRpcException;
+import org.opendaylight.mdsal.dom.api.DOMRpcResult;
+import org.opendaylight.mdsal.dom.api.DOMRpcService;
+import org.opendaylight.mdsal.dom.spi.RpcRoutingStrategy;
 import org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeCodecRegistry;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
 import org.opendaylight.yangtools.yang.binding.DataObject;
@@ -64,7 +63,7 @@ class RpcServiceAdapter implements InvocationHandler {
 
     private ListenableFuture<RpcResult<?>> invoke0(final SchemaPath schemaPath, final NormalizedNode<?, ?> input) {
         final CheckedFuture<DOMRpcResult, DOMRpcException> result = delegate.invokeRpc(schemaPath, input);
-        if(result instanceof LazyDOMRpcResultFuture) {
+        if (result instanceof LazyDOMRpcResultFuture) {
             return ((LazyDOMRpcResultFuture) result).getBindingFuture();
         }
 
@@ -103,22 +102,22 @@ class RpcServiceAdapter implements InvocationHandler {
         throw new UnsupportedOperationException("Method " + method.toString() + "is unsupported.");
     }
 
-    private static boolean isObjectMethod(final Method m) {
-        switch (m.getName()) {
+    private static boolean isObjectMethod(final Method method) {
+        switch (method.getName()) {
             case "toString":
-                return (m.getReturnType().equals(String.class) && m.getParameterTypes().length == 0);
+                return (method.getReturnType().equals(String.class) && method.getParameterTypes().length == 0);
             case "hashCode":
-                return (m.getReturnType().equals(int.class) && m.getParameterTypes().length == 0);
+                return (method.getReturnType().equals(int.class) && method.getParameterTypes().length == 0);
             case "equals":
-                return (m.getReturnType().equals(boolean.class) && m.getParameterTypes().length == 1 && m
+                return (method.getReturnType().equals(boolean.class) && method.getParameterTypes().length == 1 && method
                         .getParameterTypes()[0] == Object.class);
             default:
                 return false;
         }
     }
 
-    private Object callObjectMethod(final Object self, final Method m, final Object[] args) {
-        switch (m.getName()) {
+    private Object callObjectMethod(final Object self, final Method method, final Object[] args) {
+        switch (method.getName()) {
             case "toString":
                 return type.getName() + "$Adapter{delegate=" + delegate.toString() + "}";
             case "hashCode":
index 3d7e73329bf315ed4644bf2475b329a4fe982ca0..f76596e6f5b8723b242fd6a7341ddbd30397a511 100644 (file)
@@ -56,13 +56,15 @@ public class BindingDOMAdapterLoaderTest {
 
     @Test
     public void createChainTest() throws Exception {
-        bindingDOMDataBrokerAdapter = (BindingDOMDataBrokerAdapter) bindingDOMAdapterLoader.load(DataBroker.class).get();
+        bindingDOMDataBrokerAdapter
+                = (BindingDOMDataBrokerAdapter) bindingDOMAdapterLoader.load(DataBroker.class).get();
         assertNotNull(bindingDOMDataBrokerAdapter.createTransactionChain(null));
     }
 
     @Test(expected = UnsupportedOperationException.class)
     public void registerWithException() throws Exception {
-        bindingDOMDataBrokerAdapter = (BindingDOMDataBrokerAdapter) bindingDOMAdapterLoader.load(DataBroker.class).get();
+        bindingDOMDataBrokerAdapter
+                = (BindingDOMDataBrokerAdapter) bindingDOMAdapterLoader.load(DataBroker.class).get();
         bindingDOMDataBrokerAdapter.registerDataTreeChangeListener(null,null);
     }
 }
\ No newline at end of file
index 30a17e01491e8841634c26d80473edbec5a37000..9662a60ad1eb1f9f8433bc6e67e18c4c4ad5a0d8 100644 (file)
@@ -37,7 +37,8 @@ public class BindingDOMDataTreeWriteCursorAdapterTest {
     @Test
     public void basicTest() throws Exception {
         final DataTreeIdentifier identifier =
-                DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(DataObject.class));
+                DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL,
+                        InstanceIdentifier.create(DataObject.class));
         final DOMDataTreeWriteCursor delegate = mock(DOMDataTreeWriteCursor.class);
         final BindingNormalizedNodeCodecRegistry registry = mock(BindingNormalizedNodeCodecRegistry.class);
         final BindingToNormalizedNodeCodec codec =
index 9db629534398622bd04b497d94c9965afc529e90..401acfcd7e510d06cc3d950947a03cfb2bf4cd9d 100644 (file)
@@ -10,8 +10,6 @@ package org.opendaylight.mdsal.binding.dom.adapter;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
-import org.opendaylight.mdsal.binding.dom.adapter.ContextReferenceExtractor;
-
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.bi.ba.rpcservice.rev140701.RockTheHouseInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.bi.ba.rpcservice.rev140701.RockTheHouseInputBuilder;
@@ -73,4 +71,4 @@ public final class ContextExtractorTest {
         final InstanceIdentifier<?> extractedValue = extractor.extract(TEST_GROUPING);
         assertSame(TEST_ROUTE,extractedValue);
     }
- }
+}
index 3d72d8000b9156cd81da4e4e87ef1be7b5cdfb74..b06ed537c1418e2638ba3b0f4dda07dcec1ba5a3 100644 (file)
@@ -81,6 +81,7 @@ public class LazyDOMRpcResultFutureTest {
         assertNotNull(lazyDOMRpcResultFuture.get());
     }
 
+    @SuppressWarnings({"checkstyle:IllegalThrows","checkstyle:IllegalCatch"})
     @Test(expected = InterruptedException.class)
     public void checkedGetWithException() throws Throwable {
         doThrow(InterruptedException.class).when(future).get();
@@ -91,6 +92,7 @@ public class LazyDOMRpcResultFutureTest {
         }
     }
 
+    @SuppressWarnings({"checkstyle:IllegalThrows","checkstyle:IllegalCatch"})
     @Test(expected = InterruptedException.class)
     public void checkedGetWithException2() throws Throwable {
         doThrow(InterruptedException.class).when(future).get(1, TimeUnit.SECONDS);
index 26dee45dc4da22444b5c8ae0f07067ca6e122f01..00d7dde7395352175171cf207c8020a88782d4cf 100644 (file)
@@ -67,7 +67,8 @@ public class LazySerializedContainerNodeTest {
         assertTrue(lazySerializedContainerNode.getAttributes().isEmpty());
 
         assertTrue(lazySerializedContainerNode.getValue().isEmpty());
-        assertEquals(lazySerializedContainerNode.getIdentifier().getNodeType(), lazySerializedContainerNode.getNodeType());
+        assertEquals(lazySerializedContainerNode.getIdentifier().getNodeType(),
+                lazySerializedContainerNode.getNodeType());
         assertEquals(rpcName.getLastComponent(), lazySerializedContainerNode.getIdentifier().getNodeType());
         assertNull(lazySerializedContainerNode.getAttributeValue(null));
         assertEquals(dataObject, lazySerializedContainerNode.bindingData());
index 63063ee69243e1792874076150bdead59dd98286..e7df0124b44895bc57c84b50e5a807cdf6dea87e 100644 (file)
@@ -26,6 +26,7 @@ import org.opendaylight.yangtools.yang.binding.RpcService;
 
 public class RpcServiceAdapterTest {
 
+    @SuppressWarnings("checkstyle:IllegalThrows")
     @Test
     public void invoke() throws Throwable {
         final BindingBrokerTestFactory bindingBrokerTestFactory = new BindingBrokerTestFactory();
@@ -63,7 +64,9 @@ public class RpcServiceAdapterTest {
     private interface TestRpcService extends RpcService {
 
         String toString();
+
         int hashCode();
-        boolean equals(Object o);
+
+        boolean equals(Object object);
     }
 }
\ No newline at end of file
index c2b69dff83bd7721952522a91d2719594b745d0c..c1e3d629533532197329117c646fc6c2018fe75f 100644 (file)
@@ -7,14 +7,13 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter.test;
 
-import org.opendaylight.mdsal.dom.api.DOMDataBroker;
-
-import org.opendaylight.mdsal.binding.api.DataBroker;
+import com.google.common.util.concurrent.ListenableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import com.google.common.util.concurrent.ListenableFuture;
 
 public class AbstractDataBrokerTest extends AbstractSchemaAwareTest {
 
@@ -36,7 +35,7 @@ public class AbstractDataBrokerTest extends AbstractSchemaAwareTest {
         // Intentionally left No-op, subclasses may customize it
     }
 
-   protected DataBrokerTestCustomizer createDataBrokerTestCustomizer() {
+    protected DataBrokerTestCustomizer createDataBrokerTestCustomizer() {
         return new DataBrokerTestCustomizer();
     }
 
index 14baea9195298f9e175e57c7a00c559f10579205..c711bca0f668d421fb8b31a8f6a04f1c58514ead 100644 (file)
@@ -7,14 +7,13 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter.test;
 
-import org.opendaylight.mdsal.dom.broker.DOMNotificationRouter;
-
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.NotificationService;
 import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec;
+import org.opendaylight.mdsal.dom.broker.DOMNotificationRouter;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
-public class AbstractNotificationBrokerTest extends AbstractSchemaAwareTest{
+public class AbstractNotificationBrokerTest extends AbstractSchemaAwareTest {
     private BindingToNormalizedNodeCodec bindingToNormalizedNodeCodec;
     private DOMNotificationRouter domNotificationRouter;
     private NotificationService notificationService;
index a74a325516811c1d46b4cda478d2292a989dd296..8492a04630219966d08a3252e97a118a6eaeb2c1 100644 (file)
@@ -30,15 +30,15 @@ public class AssertCollections {
 
     }
 
-    public static void assertNotContains(final Collection<?> set, final Object... values) {
+    public static void assertContains(final Map<?,?> map, final Object... values) {
         for (Object key : values) {
-            Assert.assertFalse(set.contains(key));
+            Assert.assertTrue(map.containsKey(key));
         }
     }
 
-    public static void assertContains(final Map<?,?> map, final Object... values) {
+    public static void assertNotContains(final Collection<?> set, final Object... values) {
         for (Object key : values) {
-            Assert.assertTrue(map.containsKey(key));
+            Assert.assertFalse(set.contains(key));
         }
     }
 
@@ -47,4 +47,7 @@ public class AssertCollections {
             Assert.assertFalse(map.containsKey(key));
         }
     }
+
+
+
 }
index 752e03274a3ea7cf88875fc39fabec14b2e37e46..7e4d5e834ad2bd937d280da9b7e058ba4b069404 100644 (file)
@@ -9,9 +9,10 @@
 package org.opendaylight.mdsal.binding.dom.adapter.test;
 
 import static org.junit.Assert.assertTrue;
-import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec;
+
 import javassist.ClassPool;
 import org.junit.Test;
+import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugment;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeLeafOnlyAugment;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.Top;
@@ -33,20 +34,23 @@ public class BindingNormalizedCodecTest extends AbstractSchemaAwareTest {
     private static final TopLevelListKey TOP_FOO_KEY = new TopLevelListKey("foo");
     private static final InstanceIdentifier<TopLevelList> BA_TOP_LEVEL_LIST = InstanceIdentifier
             .builder(Top.class).child(TopLevelList.class, TOP_FOO_KEY).toInstance();
-    private static final InstanceIdentifier<TreeLeafOnlyAugment> BA_TREE_LEAF_ONLY = BA_TOP_LEVEL_LIST.augmentation(TreeLeafOnlyAugment.class);
-    private static final InstanceIdentifier<TreeComplexUsesAugment> BA_TREE_COMPLEX_USES = BA_TOP_LEVEL_LIST.augmentation(TreeComplexUsesAugment.class);
+    private static final InstanceIdentifier<TreeLeafOnlyAugment> BA_TREE_LEAF_ONLY
+            = BA_TOP_LEVEL_LIST.augmentation(TreeLeafOnlyAugment.class);
+    private static final InstanceIdentifier<TreeComplexUsesAugment> BA_TREE_COMPLEX_USES
+            = BA_TOP_LEVEL_LIST.augmentation(TreeComplexUsesAugment.class);
     private static final QName SIMPLE_VALUE_QNAME = QName.create(TreeComplexUsesAugment.QNAME, "simple-value");
 
 
-   private BindingToNormalizedNodeCodec codec;
+    private BindingToNormalizedNodeCodec codec;
 
     @Override
     protected void setupWithSchema(final SchemaContext context) {
-        final DataObjectSerializerGenerator streamWriter = StreamWriterGenerator.create(JavassistUtils.forClassPool(ClassPool.getDefault()));
+        final DataObjectSerializerGenerator streamWriter
+                = StreamWriterGenerator.create(JavassistUtils.forClassPool(ClassPool.getDefault()));
         final BindingNormalizedNodeCodecRegistry registry = new BindingNormalizedNodeCodecRegistry(streamWriter);
         codec = new BindingToNormalizedNodeCodec(GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(), registry);
         codec.onGlobalContextUpdated(context);
-    };
+    }
 
     @Test
     public void testComplexAugmentationSerialization() {
index 3bc5421ede7a06846149bc42084596362f8d117e..4807ef4ea4a3c534d462ee8df94d0fe5dad01459 100644 (file)
@@ -46,8 +46,9 @@ public class Bug5524augmentUses extends AbstractDataBrokerTest {
 
     @Test
     public void testBug5224() throws Exception {
-        final BindingToNormalizedNodeCodec mappingService = new BindingToNormalizedNodeCodec(GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(),
-                new BindingNormalizedNodeCodecRegistry(StreamWriterGenerator.create(JavassistUtils.forClassPool(ClassPool.getDefault()))));
+        final BindingToNormalizedNodeCodec mappingService = new BindingToNormalizedNodeCodec(
+                GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(), new BindingNormalizedNodeCodecRegistry(
+                        StreamWriterGenerator.create(JavassistUtils.forClassPool(ClassPool.getDefault()))));
         final ModuleInfoBackedContext moduleInfoBackedContext = ModuleInfoBackedContext.create();
         moduleInfoBackedContext.registerModuleInfo(BindingReflections.getModuleInfo(Module4Main.class));
         mappingService.onGlobalContextUpdated(moduleInfoBackedContext.tryToCreateSchemaContext().get());
@@ -56,26 +57,30 @@ public class Bug5524augmentUses extends AbstractDataBrokerTest {
                 new ContainerModule4Builder().setListModule11(Collections.singletonList(
                         new ListModule11Builder().setListModule12(Collections.singletonList(
                                 new ListModule12Builder().setContainerModule1(
-                                        new ContainerModule1Builder().addAugmentation(ContainerModule11.class, new ContainerModule11Builder().build()).build())
-                                        .build())).build())).build()).build();
+                                        new ContainerModule1Builder().addAugmentation(ContainerModule11.class,
+                                                new ContainerModule11Builder().build()).build())
+                                                    .build())).build())).build()).build();
 
         final Module4Main manualModule4Main = new Module4MainBuilder().setContainerModule4(
                 new ContainerModule4Builder().setManualListModule11(Collections.singletonList(
                         new ManualListModule11Builder().setManualListModule12(Collections.singletonList(
                                 new ManualListModule12Builder().setManualContainerModule1(
-                                        new ManualContainerModule1Builder().addAugmentation(ManualContainerModule11.class, new ManualContainerModule11Builder().build()).build())
-                                        .build())).build())).build()).build();
+                                        new ManualContainerModule1Builder().addAugmentation(
+                                                ManualContainerModule11.class, new ManualContainerModule11Builder()
+                                                    .build()).build()).build())).build())).build()).build();
 
         final Module4Main contManualModule4Main = new Module4MainBuilder().setContainerModule4(
                 new ContainerModule4Builder().setContainerManualListModule11(Collections.singletonList(
-                        new ContainerManualListModule11Builder().setContainerManualListModule12(Collections.singletonList(
+                        new ContainerManualListModule11Builder().setContainerManualListModule12(
+                                Collections.singletonList(
                                 new ContainerManualListModule12Builder().setContainerManualContainerModule1(
-                                        new ContainerManualContainerModule1Builder().setContainerManualContainerModule2
-                                                (new ContainerManualContainerModule2Builder().build()).build())
+                                        new ContainerManualContainerModule1Builder().setContainerManualContainerModule2(
+                                                new ContainerManualContainerModule2Builder().build()).build())
                                         .build())).build())).build()).build();
 
         final BindingCodecTree codecContext = mappingService.getCodecFactory().getCodecContext();
-        final BindingCodecTreeNode<Module4Main> subtreeCodec = codecContext.getSubtreeCodec(InstanceIdentifier.create(Module4Main.class));
+        final BindingCodecTreeNode<Module4Main> subtreeCodec = codecContext.getSubtreeCodec(
+                InstanceIdentifier.create(Module4Main.class));
         final NormalizedNode<?, ?> serialized = subtreeCodec.serialize(module4Main);
         final NormalizedNode<?, ?> manualSerialized = subtreeCodec.serialize(manualModule4Main);
         final NormalizedNode<?, ?> containerManualSerialized = subtreeCodec.serialize(contManualModule4Main);
index c71b779f44356671720a6662fcd127825da7cca1..ef938040fb98bb9fbf276dd9e8a78bc29373f371 100644 (file)
@@ -35,8 +35,9 @@ public class Bug5845booleanKeyTest extends AbstractDataBrokerTest {
 
     @Test
     public void testBug5845() throws Exception {
-        final BindingToNormalizedNodeCodec mappingService = new BindingToNormalizedNodeCodec(GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(),
-                new BindingNormalizedNodeCodecRegistry(StreamWriterGenerator.create(JavassistUtils.forClassPool(ClassPool.getDefault()))));
+        final BindingToNormalizedNodeCodec mappingService = new BindingToNormalizedNodeCodec(
+                GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(), new BindingNormalizedNodeCodecRegistry(
+                        StreamWriterGenerator.create(JavassistUtils.forClassPool(ClassPool.getDefault()))));
         final ModuleInfoBackedContext moduleInfoBackedContext = ModuleInfoBackedContext.create();
         moduleInfoBackedContext.registerModuleInfo(BindingReflections.getModuleInfo(BooleanContainer.class));
         mappingService.onGlobalContextUpdated(moduleInfoBackedContext.tryToCreateSchemaContext().get());
@@ -57,7 +58,8 @@ public class Bug5845booleanKeyTest extends AbstractDataBrokerTest {
                 .build();
 
         final BindingCodecTree codecContext = mappingService.getCodecFactory().getCodecContext();
-        final BindingCodecTreeNode<BooleanContainer> subtreeCodec = codecContext.getSubtreeCodec(InstanceIdentifier.create(BooleanContainer.class));
+        final BindingCodecTreeNode<BooleanContainer> subtreeCodec = codecContext.getSubtreeCodec(
+                InstanceIdentifier.create(BooleanContainer.class));
         final NormalizedNode<?, ?> serializedInt = subtreeCodec.serialize(booleanContainerInt);
         assertNotNull(serializedInt);
         final NormalizedNode<?, ?> serialized = subtreeCodec.serialize(booleanContainer);
index bae3dae6c58e182e71c9a6ce0ce47dc54412549d..df0ee65d3d5a32bf9c4a0826ee47caf88a039978 100644 (file)
@@ -7,10 +7,6 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter.test;
 
-import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore;
-
-import org.opendaylight.mdsal.dom.spi.store.DOMStore;
-import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -23,10 +19,13 @@ import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMNotificationPublishS
 import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMNotificationServiceAdapter;
 import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec;
 import org.opendaylight.mdsal.binding.dom.adapter.test.util.MockSchemaService;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.broker.DOMNotificationRouter;
 import org.opendaylight.mdsal.dom.broker.SerializedDOMDataBroker;
+import org.opendaylight.mdsal.dom.spi.store.DOMStore;
+import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore;
 import org.opendaylight.yangtools.binding.data.codec.gen.impl.DataObjectSerializerGenerator;
 import org.opendaylight.yangtools.binding.data.codec.gen.impl.StreamWriterGenerator;
 import org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeCodecRegistry;
@@ -102,7 +101,7 @@ public class DataBrokerTestCustomizer {
     }
 
     private DOMDataBroker getDOMDataBroker() {
-        if(domDataBroker == null) {
+        if (domDataBroker == null) {
             domDataBroker = createDOMDataBroker();
         }
         return domDataBroker;
index 7518b90df311e883f0fb8316b3f8c69b9ee045cd..aa583d657363d80dabb6ba9adcd919fb9f675fbd 100644 (file)
@@ -47,15 +47,15 @@ import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
 public class DataTreeChangeListenerTest extends AbstractDataBrokerTest {
 
     private static final InstanceIdentifier<Top> TOP_PATH = InstanceIdentifier.create(Top.class);
-    private static final PathArgument TOP_ARGUMENT= TOP_PATH.getPathArguments().iterator().next();
+    private static final PathArgument TOP_ARGUMENT = TOP_PATH.getPathArguments().iterator().next();
     private static final InstanceIdentifier<TopLevelList> FOO_PATH = path(TOP_FOO_KEY);
     private static final PathArgument FOO_ARGUMENT = Iterables.getLast(FOO_PATH.getPathArguments());
     private static final TopLevelList FOO_DATA = topLevelList(TOP_FOO_KEY, complexUsesAugment(USES_ONE_KEY));
     private static final InstanceIdentifier<TopLevelList> BAR_PATH = path(TOP_BAR_KEY);
     private static final PathArgument BAR_ARGUMENT = Iterables.getLast(BAR_PATH.getPathArguments());
     private static final TopLevelList BAR_DATA = topLevelList(TOP_BAR_KEY);
-    private static final DataTreeIdentifier<Top> TOP_IDENTIFIER = DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL,
-            TOP_PATH);
+    private static final DataTreeIdentifier<Top> TOP_IDENTIFIER
+            = DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL, TOP_PATH);
 
     private static final Top TOP_INITIAL_DATA = top(FOO_DATA);
 
@@ -100,16 +100,20 @@ public class DataTreeChangeListenerTest extends AbstractDataBrokerTest {
         createAndVerifyTop(listener);
 
         putTx(BAR_PATH, BAR_DATA).submit().checkedGet();
-        final DataObjectModification<Top> afterBarPutEvent = Iterables.getOnlyElement(listener.nextEvent()).getRootNode();
+        final DataObjectModification<Top> afterBarPutEvent
+                = Iterables.getOnlyElement(listener.nextEvent()).getRootNode();
         verifyModification(afterBarPutEvent, TOP_ARGUMENT, ModificationType.SUBTREE_MODIFIED);
-        final DataObjectModification<TopLevelList> barPutMod = afterBarPutEvent.getModifiedChildListItem(TopLevelList.class, TOP_BAR_KEY);
+        final DataObjectModification<TopLevelList> barPutMod = afterBarPutEvent.getModifiedChildListItem(
+                TopLevelList.class, TOP_BAR_KEY);
         assertNotNull(barPutMod);
         verifyModification(barPutMod, BAR_ARGUMENT, ModificationType.WRITE);
 
         deleteTx(BAR_PATH).submit().checkedGet();
-        final DataObjectModification<Top> afterBarDeleteEvent = Iterables.getOnlyElement(listener.nextEvent()).getRootNode();
+        final DataObjectModification<Top> afterBarDeleteEvent
+                = Iterables.getOnlyElement(listener.nextEvent()).getRootNode();
         verifyModification(afterBarDeleteEvent, TOP_ARGUMENT, ModificationType.SUBTREE_MODIFIED);
-        final DataObjectModification<TopLevelList> barDeleteMod = afterBarDeleteEvent.getModifiedChildListItem(TopLevelList.class, TOP_BAR_KEY);
+        final DataObjectModification<TopLevelList> barDeleteMod = afterBarDeleteEvent.getModifiedChildListItem(
+                TopLevelList.class, TOP_BAR_KEY);
         verifyModification(barDeleteMod, BAR_ARGUMENT, ModificationType.DELETE);
 
         dataBrokerImpl.registerDataTreeChangeListener(TOP_IDENTIFIER, listener).close();
@@ -118,7 +122,8 @@ public class DataTreeChangeListenerTest extends AbstractDataBrokerTest {
     @Test
     public void testWildcardedListListener() throws Exception {
         final EventCapturingListener<TopLevelList> listener = new EventCapturingListener<>();
-        final DataTreeIdentifier<TopLevelList> wildcard = DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL, TOP_PATH.child(TopLevelList.class));
+        final DataTreeIdentifier<TopLevelList> wildcard = DataTreeIdentifier.create(
+                LogicalDatastoreType.OPERATIONAL, TOP_PATH.child(TopLevelList.class));
         dataBrokerImpl.registerDataTreeChangeListener(wildcard, listener);
 
         putTx(TOP_PATH, TOP_INITIAL_DATA).submit().checkedGet();
@@ -151,8 +156,8 @@ public class DataTreeChangeListenerTest extends AbstractDataBrokerTest {
         assertEquals(TOP_INITIAL_DATA, initialNode.getDataAfter());
     }
 
-    private void verifyModification(final DataObjectModification<? extends DataObject> barWrite, final PathArgument pathArg,
-            final ModificationType eventType) {
+    private void verifyModification(final DataObjectModification<? extends DataObject> barWrite,
+            final PathArgument pathArg, final ModificationType eventType) {
         assertEquals(pathArg.getType(), barWrite.getDataType());
         assertEquals(eventType,barWrite.getModificationType());
         assertEquals(pathArg, barWrite.getIdentifier());
index 36072ffaa0cfabb0c6cb21ccbfc376f523e595b7..cfececf899b9141efd7cfe8e5fa65a609fcdd142 100644 (file)
@@ -11,8 +11,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertTrue;
 
-import org.opendaylight.mdsal.binding.api.NotificationPublishService;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import java.util.ArrayList;
@@ -23,6 +21,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.junit.Assert;
 import org.junit.Test;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.OpendaylightMdsalBindingTestListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.TwoLevelListChanged;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.TwoLevelListChangedBuilder;
@@ -111,7 +110,7 @@ public class ForwardedNotificationAdapterTest extends AbstractNotificationBroker
         private final List<TwoLevelListChanged> receivedNotifications = new ArrayList<>();
         private final CountDownLatch latch;
 
-        public TestNotifListener(final CountDownLatch latch) {
+        TestNotifListener(final CountDownLatch latch) {
             this.latch = latch;
         }
 
index d3d127793e2b7e4ff5a2202309562190ad223ca8..02363d7841a1700f52d3ebbd687beb80383064e5 100644 (file)
@@ -55,47 +55,48 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public class LeafDefaultValueTest extends AbstractDataBrokerTest {
 
-    private static final InstanceIdentifier<TinyIntContainer> TINY_INT_NODE_PATH = InstanceIdentifier.create
-            (TinyIntContainer.class);
-    private static final InstanceIdentifier<SmallIntContainer> SMALL_INT_NODE_PATH = InstanceIdentifier.create
-            (SmallIntContainer.class);
-    private static final InstanceIdentifier<NormalIntContainer> NORMAL_INT_NODE_PATH = InstanceIdentifier.create
-            (NormalIntContainer.class);
-    private static final InstanceIdentifier<BigIntContainer> BIG_INT_NODE_PATH = InstanceIdentifier.create
-            (BigIntContainer.class);
+    private static final InstanceIdentifier<TinyIntContainer> TINY_INT_NODE_PATH
+            = InstanceIdentifier.create(TinyIntContainer.class);
+    private static final InstanceIdentifier<SmallIntContainer> SMALL_INT_NODE_PATH
+            = InstanceIdentifier.create(SmallIntContainer.class);
+    private static final InstanceIdentifier<NormalIntContainer> NORMAL_INT_NODE_PATH
+            = InstanceIdentifier.create(NormalIntContainer.class);
+    private static final InstanceIdentifier<BigIntContainer> BIG_INT_NODE_PATH
+            = InstanceIdentifier.create(BigIntContainer.class);
 
-    private static final InstanceIdentifier<TinyUintContainer> TINY_UINT_NODE_PATH = InstanceIdentifier.create
-            (TinyUintContainer.class);
-    private static final InstanceIdentifier<SmallUintContainer> SMALL_UINT_NODE_PATH = InstanceIdentifier.create
-            (SmallUintContainer.class);
-    private static final InstanceIdentifier<NormalUintContainer> NORMAL_UINT_NODE_PATH = InstanceIdentifier.create
-            (NormalUintContainer.class);
-    private static final InstanceIdentifier<BigUintContainer> BIG_UINT_NODE_PATH = InstanceIdentifier.create
-            (BigUintContainer.class);
+    private static final InstanceIdentifier<TinyUintContainer> TINY_UINT_NODE_PATH
+            = InstanceIdentifier.create(TinyUintContainer.class);
+    private static final InstanceIdentifier<SmallUintContainer> SMALL_UINT_NODE_PATH
+            = InstanceIdentifier.create(SmallUintContainer.class);
+    private static final InstanceIdentifier<NormalUintContainer> NORMAL_UINT_NODE_PATH
+            = InstanceIdentifier.create(NormalUintContainer.class);
+    private static final InstanceIdentifier<BigUintContainer> BIG_UINT_NODE_PATH
+            = InstanceIdentifier.create(BigUintContainer.class);
 
-    private static final InstanceIdentifier<DecimalContainer> DECIMAL_NODE_PATH = InstanceIdentifier.create
-            (DecimalContainer.class);
+    private static final InstanceIdentifier<DecimalContainer> DECIMAL_NODE_PATH
+            = InstanceIdentifier.create(DecimalContainer.class);
 
-    private static final InstanceIdentifier<StringContainer> STRING_NODE_PATH = InstanceIdentifier.create
-            (StringContainer.class);
+    private static final InstanceIdentifier<StringContainer> STRING_NODE_PATH
+            = InstanceIdentifier.create(StringContainer.class);
 
-    private static final InstanceIdentifier<BooleanContainer> BOOLEAN_NODE_PATH = InstanceIdentifier.create
-            (BooleanContainer.class);
+    private static final InstanceIdentifier<BooleanContainer> BOOLEAN_NODE_PATH
+            = InstanceIdentifier.create(BooleanContainer.class);
 
-    private static final InstanceIdentifier<EnumContainer> ENUM_NODE_PATH = InstanceIdentifier.create(EnumContainer
-            .class);
+    private static final InstanceIdentifier<EnumContainer> ENUM_NODE_PATH
+            = InstanceIdentifier.create(EnumContainer.class);
 
-    private static final InstanceIdentifier<BitsContainer> BITS_NODE_PATH = InstanceIdentifier.create(BitsContainer
-            .class);
+    private static final InstanceIdentifier<BitsContainer> BITS_NODE_PATH
+            = InstanceIdentifier.create(BitsContainer.class);
 
-    private static final InstanceIdentifier<BinaryContainer> BINARY_NODE_PATH = InstanceIdentifier.create
-            (BinaryContainer.class);
+    private static final InstanceIdentifier<BinaryContainer> BINARY_NODE_PATH
+            = InstanceIdentifier.create(BinaryContainer.class);
 
-    private static final InstanceIdentifier<IdentityrefContainer> IDENTITYREF_NODE_PATH = InstanceIdentifier.create
-            (IdentityrefContainer.class);
+    private static final InstanceIdentifier<IdentityrefContainer> IDENTITYREF_NODE_PATH
+            = InstanceIdentifier.create(IdentityrefContainer.class);
 
     @Test
-    public void testTinyIntDefaultValue() throws ExecutionException, InterruptedException, TransactionCommitFailedException {
+    public void testTinyIntDefaultValue() throws ExecutionException, InterruptedException,
+            TransactionCommitFailedException {
         final WriteTransaction writeTx = getDataBroker().newWriteOnlyTransaction();
         writeTx.put(LogicalDatastoreType.OPERATIONAL, TINY_INT_NODE_PATH, new TinyIntContainerBuilder().build());
         writeTx.submit().checkedGet();
@@ -106,17 +107,18 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest {
 
         assertTrue(tinyIntContainerNode.isPresent());
 
-        TinyIntContainer tIntCont = tinyIntContainerNode.get();
-        assertEquals(-18, tIntCont.getTinyIntLeaf().getValue().byteValue());
-        assertEquals(-18, tIntCont.getTinyIntLeaf2().getValue().byteValue());
-        assertEquals(-15, tIntCont.getTinyIntLeaf3().getValue().byteValue());
-        assertEquals(-18, tIntCont.getTinyIntLeaf4().getValue().byteValue());
-        assertEquals(-120, tIntCont.getTinyIntLeaf5().byteValue());
-        assertEquals(null, tIntCont.getTinyIntLeaf6());
+        TinyIntContainer tinyIntContainer = tinyIntContainerNode.get();
+        assertEquals(-18, tinyIntContainer.getTinyIntLeaf().getValue().byteValue());
+        assertEquals(-18, tinyIntContainer.getTinyIntLeaf2().getValue().byteValue());
+        assertEquals(-15, tinyIntContainer.getTinyIntLeaf3().getValue().byteValue());
+        assertEquals(-18, tinyIntContainer.getTinyIntLeaf4().getValue().byteValue());
+        assertEquals(-120, tinyIntContainer.getTinyIntLeaf5().byteValue());
+        assertEquals(null, tinyIntContainer.getTinyIntLeaf6());
     }
 
     @Test
-    public void testSmallIntDefaultValue() throws ExecutionException, InterruptedException, TransactionCommitFailedException {
+    public void testSmallIntDefaultValue() throws ExecutionException, InterruptedException,
+            TransactionCommitFailedException {
         final WriteTransaction writeTx = getDataBroker().newWriteOnlyTransaction();
         writeTx.put(LogicalDatastoreType.OPERATIONAL, SMALL_INT_NODE_PATH, new SmallIntContainerBuilder().build());
         writeTx.submit().checkedGet();
@@ -127,13 +129,13 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest {
 
         assertTrue(smallIntContainerNode.isPresent());
 
-        SmallIntContainer sIntCont = smallIntContainerNode.get();
-        assertEquals(-20000, sIntCont.getSmallIntLeaf().getValue().shortValue());
-        assertEquals(-20000, sIntCont.getSmallIntLeaf2().getValue().shortValue());
-        assertEquals(-15000, sIntCont.getSmallIntLeaf3().getValue().shortValue());
-        assertEquals(-20000, sIntCont.getSmallIntLeaf4().getValue().shortValue());
-        assertEquals(-5000, sIntCont.getSmallIntLeaf5().shortValue());
-        assertEquals(null, sIntCont.getSmallIntLeaf6());
+        SmallIntContainer smallIntContainer = smallIntContainerNode.get();
+        assertEquals(-20000, smallIntContainer.getSmallIntLeaf().getValue().shortValue());
+        assertEquals(-20000, smallIntContainer.getSmallIntLeaf2().getValue().shortValue());
+        assertEquals(-15000, smallIntContainer.getSmallIntLeaf3().getValue().shortValue());
+        assertEquals(-20000, smallIntContainer.getSmallIntLeaf4().getValue().shortValue());
+        assertEquals(-5000, smallIntContainer.getSmallIntLeaf5().shortValue());
+        assertEquals(null, smallIntContainer.getSmallIntLeaf6());
     }
 
     @Test
@@ -149,13 +151,13 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest {
 
         assertTrue(normalIntContainerNode.isPresent());
 
-        NormalIntContainer nIntCont = normalIntContainerNode.get();
-        assertEquals(-200000, nIntCont.getNormalIntLeaf().getValue().intValue());
-        assertEquals(-200000, nIntCont.getNormalIntLeaf2().getValue().intValue());
-        assertEquals(-130000, nIntCont.getNormalIntLeaf3().getValue().intValue());
-        assertEquals(-200000, nIntCont.getNormalIntLeaf4().getValue().intValue());
-        assertEquals(-95000, nIntCont.getNormalIntLeaf5().intValue());
-        assertEquals(null, nIntCont.getNormalIntLeaf6());
+        NormalIntContainer normalIntContainer = normalIntContainerNode.get();
+        assertEquals(-200000, normalIntContainer.getNormalIntLeaf().getValue().intValue());
+        assertEquals(-200000, normalIntContainer.getNormalIntLeaf2().getValue().intValue());
+        assertEquals(-130000, normalIntContainer.getNormalIntLeaf3().getValue().intValue());
+        assertEquals(-200000, normalIntContainer.getNormalIntLeaf4().getValue().intValue());
+        assertEquals(-95000, normalIntContainer.getNormalIntLeaf5().intValue());
+        assertEquals(null, normalIntContainer.getNormalIntLeaf6());
     }
 
     @Test
@@ -171,13 +173,13 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest {
 
         assertTrue(bigIntContainerNode.isPresent());
 
-        BigIntContainer bIntCont = bigIntContainerNode.get();
-        assertEquals(-3300000000L, bIntCont.getBigIntLeaf().getValue().longValue());
-        assertEquals(-3300000000L, bIntCont.getBigIntLeaf2().getValue().longValue());
-        assertEquals(-2800000000L, bIntCont.getBigIntLeaf3().getValue().longValue());
-        assertEquals(-3300000000L, bIntCont.getBigIntLeaf4().getValue().longValue());
-        assertEquals(-2500000000L, bIntCont.getBigIntLeaf5().longValue());
-        assertEquals(null, bIntCont.getBigIntLeaf6());
+        BigIntContainer bigIntContainer = bigIntContainerNode.get();
+        assertEquals(-3300000000L, bigIntContainer.getBigIntLeaf().getValue().longValue());
+        assertEquals(-3300000000L, bigIntContainer.getBigIntLeaf2().getValue().longValue());
+        assertEquals(-2800000000L, bigIntContainer.getBigIntLeaf3().getValue().longValue());
+        assertEquals(-3300000000L, bigIntContainer.getBigIntLeaf4().getValue().longValue());
+        assertEquals(-2500000000L, bigIntContainer.getBigIntLeaf5().longValue());
+        assertEquals(null, bigIntContainer.getBigIntLeaf6());
     }
 
     @Test
@@ -193,13 +195,13 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest {
 
         assertTrue(tinyUintContainerNode.isPresent());
 
-        TinyUintContainer tUintCont = tinyUintContainerNode.get();
-        assertEquals(150, tUintCont.getTinyUintLeaf().getValue().shortValue());
-        assertEquals(150, tUintCont.getTinyUintLeaf2().getValue().shortValue());
-        assertEquals(170, tUintCont.getTinyUintLeaf3().getValue().shortValue());
-        assertEquals(150, tUintCont.getTinyUintLeaf4().getValue().shortValue());
-        assertEquals(155, tUintCont.getTinyUintLeaf5().shortValue());
-        assertEquals(null, tUintCont.getTinyUintLeaf6());
+        TinyUintContainer tinyUintContainer = tinyUintContainerNode.get();
+        assertEquals(150, tinyUintContainer.getTinyUintLeaf().getValue().shortValue());
+        assertEquals(150, tinyUintContainer.getTinyUintLeaf2().getValue().shortValue());
+        assertEquals(170, tinyUintContainer.getTinyUintLeaf3().getValue().shortValue());
+        assertEquals(150, tinyUintContainer.getTinyUintLeaf4().getValue().shortValue());
+        assertEquals(155, tinyUintContainer.getTinyUintLeaf5().shortValue());
+        assertEquals(null, tinyUintContainer.getTinyUintLeaf6());
     }
 
     @Test
@@ -215,13 +217,13 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest {
 
         assertTrue(smallUintContainerNode.isPresent());
 
-        SmallUintContainer sUintCont = smallUintContainerNode.get();
-        assertEquals(35000, sUintCont.getSmallUintLeaf().getValue().intValue());
-        assertEquals(35000, sUintCont.getSmallUintLeaf2().getValue().intValue());
-        assertEquals(45000, sUintCont.getSmallUintLeaf3().getValue().intValue());
-        assertEquals(35000, sUintCont.getSmallUintLeaf4().getValue().intValue());
-        assertEquals(62000, sUintCont.getSmallUintLeaf5().intValue());
-        assertEquals(null, sUintCont.getSmallUintLeaf6());
+        SmallUintContainer smallUintContainer = smallUintContainerNode.get();
+        assertEquals(35000, smallUintContainer.getSmallUintLeaf().getValue().intValue());
+        assertEquals(35000, smallUintContainer.getSmallUintLeaf2().getValue().intValue());
+        assertEquals(45000, smallUintContainer.getSmallUintLeaf3().getValue().intValue());
+        assertEquals(35000, smallUintContainer.getSmallUintLeaf4().getValue().intValue());
+        assertEquals(62000, smallUintContainer.getSmallUintLeaf5().intValue());
+        assertEquals(null, smallUintContainer.getSmallUintLeaf6());
     }
 
     @Test
@@ -237,13 +239,13 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest {
 
         assertTrue(normalUintContainerNode.isPresent());
 
-        NormalUintContainer nUintCont = normalUintContainerNode.get();
-        assertEquals(100000, nUintCont.getNormalUintLeaf().getValue().longValue());
-        assertEquals(100000, nUintCont.getNormalUintLeaf2().getValue().longValue());
-        assertEquals(250000, nUintCont.getNormalUintLeaf3().getValue().longValue());
-        assertEquals(100000, nUintCont.getNormalUintLeaf4().getValue().longValue());
-        assertEquals(150000, nUintCont.getNormalUintLeaf5().longValue());
-        assertEquals(null, nUintCont.getNormalUintLeaf6());
+        NormalUintContainer normalUintContainer = normalUintContainerNode.get();
+        assertEquals(100000, normalUintContainer.getNormalUintLeaf().getValue().longValue());
+        assertEquals(100000, normalUintContainer.getNormalUintLeaf2().getValue().longValue());
+        assertEquals(250000, normalUintContainer.getNormalUintLeaf3().getValue().longValue());
+        assertEquals(100000, normalUintContainer.getNormalUintLeaf4().getValue().longValue());
+        assertEquals(150000, normalUintContainer.getNormalUintLeaf5().longValue());
+        assertEquals(null, normalUintContainer.getNormalUintLeaf6());
     }
 
     @Test
@@ -259,13 +261,13 @@ public class LeafDefaultValueTest extends AbstractDataBrokerTest {
 
         assertTrue(bigUintContainerNode.isPresent());
 
-        BigUintContainer bUintCont = bigUintContainerNode.get();
-        assertEquals(5000000000L, bUintCont.getBigUintLeaf().getValue().longValue());
-        assertEquals(5000000000L, bUintCont.getBigUintLeaf2().getValue().longValue());
-        assertEquals(5800000000L, bUintCont.getBigUintLeaf3().getValue().longValue());
-        assertEquals(5000000000L, bUintCont.getBigUintLeaf4().getValue().longValue());
-        assertEquals(6500000000L, bUintCont.getBigUintLeaf5().longValue());
-        assertEquals(null, bUintCont.getBigUintLeaf6());
+        BigUintContainer bigUintContainer = bigUintContainerNode.get();
+        assertEquals(5000000000L, bigUintContainer.getBigUintLeaf().getValue().longValue());
+        assertEquals(5000000000L, bigUintContainer.getBigUintLeaf2().getValue().longValue());
+        assertEquals(5800000000L, bigUintContainer.getBigUintLeaf3().getValue().longValue());
+        assertEquals(5000000000L, bigUintContainer.getBigUintLeaf4().getValue().longValue());
+        assertEquals(6500000000L, bigUintContainer.getBigUintLeaf5().longValue());
+        assertEquals(null, bigUintContainer.getBigUintLeaf6());
     }
 
     @Test
index 43b0da336031cbd7784a45e9303edb07019b113c..431ffc775b666b6ba8ac206a2f1809a387200653 100644 (file)
@@ -9,14 +9,13 @@ package org.opendaylight.mdsal.binding.dom.adapter.test;
 
 import static org.junit.Assert.assertTrue;
 
-import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
-
-import org.opendaylight.mdsal.binding.api.ReadTransaction;
-import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import com.google.common.base.Optional;
 import java.util.concurrent.ExecutionException;
 import org.junit.Test;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.Top;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.TopBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.two.level.list.TopLevelList;
@@ -24,13 +23,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.te
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.two.level.list.TopLevelListKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-
 public class WriteTransactionTest extends AbstractDataBrokerTest {
 
     private static final InstanceIdentifier<Top> TOP_PATH = InstanceIdentifier.create(Top.class);
     private static final TopLevelListKey TOP_LIST_KEY = new TopLevelListKey("foo");
     private static final InstanceIdentifier<TopLevelList> NODE_PATH = TOP_PATH.child(TopLevelList.class, TOP_LIST_KEY);
     private static final TopLevelList NODE = new TopLevelListBuilder().setKey(TOP_LIST_KEY).build();
+
     @Test
     public void test() throws InterruptedException, ExecutionException {
         final WriteTransaction writeTx = getDataBroker().newWriteOnlyTransaction();
@@ -40,7 +39,8 @@ public class WriteTransactionTest extends AbstractDataBrokerTest {
     }
 
     @Test
-    public void testPutCreateParentsSuccess() throws TransactionCommitFailedException, InterruptedException, ExecutionException {
+    public void testPutCreateParentsSuccess() throws TransactionCommitFailedException,
+            InterruptedException, ExecutionException {
 
         final WriteTransaction writeTx = getDataBroker().newWriteOnlyTransaction();
         writeTx.put(LogicalDatastoreType.OPERATIONAL, NODE_PATH, NODE,true);
@@ -54,7 +54,8 @@ public class WriteTransactionTest extends AbstractDataBrokerTest {
     }
 
     @Test
-    public void testMergeCreateParentsSuccess() throws TransactionCommitFailedException, InterruptedException, ExecutionException {
+    public void testMergeCreateParentsSuccess() throws TransactionCommitFailedException,
+            InterruptedException, ExecutionException {
 
         final WriteTransaction writeTx = getDataBroker().newWriteOnlyTransaction();
         writeTx.merge(LogicalDatastoreType.OPERATIONAL, NODE_PATH, NODE,true);
index 5dd85353f1d9971a43353af078ba675f2d8f06e3..7f9de19f2792e4b5460235e86ffbd23f4ec12ea9 100644 (file)
@@ -7,14 +7,12 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter.test.util;
 
-import java.util.concurrent.ExecutorService;
-
-import javassist.ClassPool;
-
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
+import java.util.concurrent.ExecutorService;
+import javassist.ClassPool;
 
 @Beta
 public class BindingBrokerTestFactory {
@@ -49,7 +47,7 @@ public class BindingBrokerTestFactory {
     }
 
     public ClassPool getClassPool() {
-        if(classPool == null) {
+        if (classPool == null) {
             return CLASS_POOL;
         }
 
index d8a9eec25925cb3e52be20b919e6e54996c58550..a9f36c336ac2c8bb89754a9e337704790d569231 100644 (file)
@@ -94,7 +94,8 @@ public class BindingTestContext implements AutoCloseable {
         return codec;
     }
 
-    protected BindingTestContext(final ListeningExecutorService executor, final ClassPool classPool, final boolean startWithSchema) {
+    protected BindingTestContext(final ListeningExecutorService executor,
+            final ClassPool classPool, final boolean startWithSchema) {
         this.executor = executor;
         this.classPool = classPool;
         this.startWithSchema = startWithSchema;
@@ -143,7 +144,8 @@ public class BindingTestContext implements AutoCloseable {
     public void startBindingToDomMappingService() {
         checkState(classPool != null, "ClassPool needs to be present");
 
-        final DataObjectSerializerGenerator generator = StreamWriterGenerator.create(JavassistUtils.forClassPool(classPool));
+        final DataObjectSerializerGenerator generator
+                = StreamWriterGenerator.create(JavassistUtils.forClassPool(classPool));
         final BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(generator);
         final GeneratedClassLoadingStrategy loading = GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy();
         codec = new BindingToNormalizedNodeCodec(loading,  codecRegistry);