Fix raw type warnings and null safety errors

This fixes up warnings.

Change-Id: Ib46adb83ea76cb0c2e62d9976e87d0d81b7275be
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRoutingTable.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRoutingTable.java
index 7a4eb83116010703a0ec04a890d41648dc836f83..dca4a1de7ff160dd6876fd39810fd90e1765a3d9 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRoutingTable.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRoutingTable.java
@@ -48,7 +48,7 @@ abstract class AbstractDOMRoutingTable<I, D, M, L extends EventListener,
         this.schemaContext = schemaContext;
     }
 
-    AbstractDOMRoutingTable setSchemaContext(final SchemaContext context) {
+    AbstractDOMRoutingTable<I, D, M, L, E> setSchemaContext(final SchemaContext context) {
         final Builder<SchemaPath, E> b = ImmutableMap.builder();
 
         for (Entry<SchemaPath, E> e : operations.entrySet()) {
@@ -62,7 +62,7 @@ abstract class AbstractDOMRoutingTable<I, D, M, L extends EventListener,
         return newInstance(b.build(), context);
     }
 
-    AbstractDOMRoutingTable add(final M implementation, final Set<I> oprsToAdd) {
+    AbstractDOMRoutingTable<I, D, M, L, E> add(final M implementation, final Set<I> oprsToAdd) {
         if (oprsToAdd.isEmpty()) {
             return this;
         }
@@ -100,7 +100,7 @@ abstract class AbstractDOMRoutingTable<I, D, M, L extends EventListener,
         return newInstance(mb.build(), schemaContext);
     }
 
-    AbstractDOMRoutingTable remove(final M implementation, final Set<I> instances) {
+    AbstractDOMRoutingTable<I, D, M, L, E> remove(final M implementation, final Set<I> instances) {
         if (instances.isEmpty()) {
             return this;
         }
@@ -143,15 +143,14 @@ abstract class AbstractDOMRoutingTable<I, D, M, L extends EventListener,
         return ret;
     }
 
-    @Nullable AbstractDOMRoutingTableEntry getEntry(final @NonNull SchemaPath type) {
+    @Nullable AbstractDOMRoutingTableEntry<D, M, L> getEntry(final @NonNull SchemaPath type) {
         return operations.get(type);
     }
 
-    protected abstract AbstractDOMRoutingTable newInstance(
-        Map<SchemaPath, E> operations, SchemaContext schemaContext);
+    protected abstract AbstractDOMRoutingTable<I, D, M, L, E> newInstance(Map<SchemaPath, E> operations,
+            SchemaContext schemaContext);
 
     abstract ListMultimap<SchemaPath, D> decomposeIdentifiers(Set<I> instances);
 
-    abstract E createOperationEntry(SchemaContext context, SchemaPath key,
-        Map<D, List<M>> implementations);
+    abstract E createOperationEntry(SchemaContext context, SchemaPath key, Map<D, List<M>> implementations);
 }

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRoutingTableEntry.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRoutingTableEntry.java
index b783ab6a0400c1bb2e110b2c27e55235c98de875..89cd70de5fb0690aa9deac4f8a591c84a332fe61 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRoutingTableEntry.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRoutingTableEntry.java
@@ -63,7 +63,7 @@ abstract class AbstractDOMRoutingTableEntry<D, M, L extends EventListener> {
      * @param newOprs  the List of new RPCs/Actions that the DOMOperationImplementation provides, must be mutable
      * @return a new instance of DOMActionRoutingTableEntry with the additions
      */
-    AbstractDOMRoutingTableEntry add(final M implementation, final List<D> newOprs) {
+    AbstractDOMRoutingTableEntry<D, M, L> add(final M implementation, final List<D> newOprs) {
         final Builder<D, List<M>> vb = ImmutableMap.builder();
         for (final Entry<D, List<M>> ve : implementations.entrySet()) {
             if (newOprs.remove(ve.getKey())) {
@@ -88,7 +88,7 @@ abstract class AbstractDOMRoutingTableEntry<D, M, L extends EventListener> {
         return newInstance(vb.build());
     }
 
-    AbstractDOMRoutingTableEntry remove(final M implementation, final List<D> removed) {
+    AbstractDOMRoutingTableEntry<D, M, L> remove(final M implementation, final List<D> removed) {
         final Builder<D, List<M>> vb = ImmutableMap.builder();
         for (final Entry<D, List<M>> ve : implementations.entrySet()) {
             if (removed.remove(ve.getKey())) {
@@ -110,5 +110,5 @@ abstract class AbstractDOMRoutingTableEntry<D, M, L extends EventListener> {
 
     protected abstract Comparator<M> implComparator();
 
-    protected abstract AbstractDOMRoutingTableEntry newInstance(Map<D, List<M>> impls);
+    protected abstract AbstractDOMRoutingTableEntry<D, M, L> newInstance(Map<D, List<M>> impls);
 }

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMActionRoutingTable.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMActionRoutingTable.java
index 6fdfc124a2d461a17883cca3a3381014bc9b2a9e..b2556893b40dc81cc01b47bdb1ce57783635219e 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMActionRoutingTable.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMActionRoutingTable.java
@@ -14,7 +14,6 @@ import com.google.common.collect.ListMultimap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.mdsal.dom.api.DOMActionAvailabilityExtension.AvailabilityListener;
 import org.opendaylight.mdsal.dom.api.DOMActionImplementation;
 import org.opendaylight.mdsal.dom.api.DOMActionInstance;
@@ -31,7 +30,6 @@ import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;
  * Definition of Action routing table.
  */
 @Beta
-@NonNullByDefault
 final class DOMActionRoutingTable extends AbstractDOMRoutingTable<DOMActionInstance, DOMDataTreeIdentifier,
         DOMActionImplementation, AvailabilityListener, DOMActionRoutingTableEntry> {
     static final DOMActionRoutingTable EMPTY = new DOMActionRoutingTable(ImmutableMap.of(), null);

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRoutingTable.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRoutingTable.java
index 432d3b2aeaa7cddaf4d09a8ffb1f59d0f2af6cb6..6a70f38ba36664c56c0f906e0555d93f87f1da9f 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRoutingTable.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRoutingTable.java
@@ -39,7 +39,7 @@ final class DOMRpcRoutingTable extends AbstractDOMRoutingTable<DOMRpcIdentifier,
     }
 
     @Override
-    protected AbstractDOMRoutingTable newInstance(final Map<SchemaPath, AbstractDOMRpcRoutingTableEntry> operations,
+    protected DOMRpcRoutingTable newInstance(final Map<SchemaPath, AbstractDOMRpcRoutingTableEntry> operations,
             final SchemaContext schemaContext) {
         return new DOMRpcRoutingTable(operations, schemaContext);
     }

diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMForwardedWriteTransactionTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMForwardedWriteTransactionTest.java
index 34f76547e72e8745e629e955a7bf728e9bfb1d0e..3b6318bda0af8d5c7968d49d05568f218048f91d 100644 (file)
--- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMForwardedWriteTransactionTest.java
+++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMForwardedWriteTransactionTest.java
@@ -27,7 +27,7 @@ import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction;
 public class DOMForwardedWriteTransactionTest {
 
     @Mock
-    private AbstractDOMForwardedTransactionFactory abstractDOMForwardedTransactionFactory;
+    private AbstractDOMForwardedTransactionFactory<?> abstractDOMForwardedTransactionFactory;
 
     @Mock
     private DOMStoreWriteTransaction domStoreWriteTransaction;