Cleanup: remove redundant type parameters

Change-Id: Ifcbaf9b3656af33de3fcdda76a671a1eb7cafaba
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/common/object-cache-api/src/test/java/org/opendaylight/yangtools/objcache/spi/CacheTest.java b/common/object-cache-api/src/test/java/org/opendaylight/yangtools/objcache/spi/CacheTest.java
index 483ef26b68db976036541ac2a6dd16c383183c94..9b7fb55efd1c6de1994e239533c6ce87e816c8f2 100644 (file)
--- a/common/object-cache-api/src/test/java/org/opendaylight/yangtools/objcache/spi/CacheTest.java
+++ b/common/object-cache-api/src/test/java/org/opendaylight/yangtools/objcache/spi/CacheTest.java
@@ -15,7 +15,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yangtools.objcache.ObjectCache;
-import org.opendaylight.yangtools.objcache.spi.AbstractObjectCache.SoftKey;
 
 import com.google.common.base.FinalizableReferenceQueue;
 import com.google.common.cache.CacheBuilder;
@@ -27,7 +26,7 @@ public class CacheTest {
     @Before
     public void setUp() {
         queue = new FinalizableReferenceQueue();
-        oc = new AbstractObjectCache(CacheBuilder.newBuilder().softValues().<SoftKey<?>, Object>build(), queue) {
+        oc = new AbstractObjectCache(CacheBuilder.newBuilder().softValues().build(), queue) {
         };
     }
 

diff --git a/common/object-cache-guava/src/main/java/org/opendaylight/yangtools/objcache/guava/GuavaObjectCache.java b/common/object-cache-guava/src/main/java/org/opendaylight/yangtools/objcache/guava/GuavaObjectCache.java
index 617a2936f49661c3dde7b75680fba146022d8122..5d0e2589ef9f785c147c35f502d82083ead0865f 100644 (file)
--- a/common/object-cache-guava/src/main/java/org/opendaylight/yangtools/objcache/guava/GuavaObjectCache.java
+++ b/common/object-cache-guava/src/main/java/org/opendaylight/yangtools/objcache/guava/GuavaObjectCache.java
@@ -15,10 +15,10 @@ import com.google.common.cache.CacheBuilderSpec;
 
 final class GuavaObjectCache extends AbstractObjectCache {
     public GuavaObjectCache(final FinalizableReferenceQueue  queue) {
-        super(CacheBuilder.newBuilder().softValues().<SoftKey<?>, Object>build(), queue);
+        super(CacheBuilder.newBuilder().softValues().build(), queue);
     }
 
     public GuavaObjectCache(final FinalizableReferenceQueue  queue, final CacheBuilderSpec spec) {
-        super(CacheBuilder.from(spec).<SoftKey<?>, Object>build(), queue);
+        super(CacheBuilder.from(spec).build(), queue);
     }
 }

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/LazyContainerNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/LazyContainerNode.java
index 7bbe831d5b27c761227b4b529eb0009bcdb478e9..47c68e22ec41a035e9a41fbce756909effff24a8 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/LazyContainerNode.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/LazyContainerNode.java
@@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
  */
 final class LazyContainerNode extends AbstractModifiedContainerNode {
     LazyContainerNode(final NormalizedNode<?, ?> data, final Version version, final Version subtreeVersion) {
-        this(data, version, MapAdaptor.getDefaultInstance().<PathArgument, TreeNode>initialSnapshot(1), subtreeVersion);
+        this(data, version, MapAdaptor.getDefaultInstance().initialSnapshot(1), subtreeVersion);
     }
 
     LazyContainerNode(final NormalizedNode<?, ?> data, final Version version, final Map<PathArgument, TreeNode> children,

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/LazyMutableContainerNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/LazyMutableContainerNode.java
index 29378674bb21ef3e4d5d553a5dee0db422bd2422..de20187c95a4de116ac16c47483afc175f6f613a 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/LazyMutableContainerNode.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/LazyMutableContainerNode.java
@@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum
  */
 final class LazyMutableContainerNode extends AbstractMutableContainerNode {
     LazyMutableContainerNode(final AbstractContainerNode parent) {
-        this(parent, MapAdaptor.getDefaultInstance().<PathArgument, TreeNode>initialSnapshot(1));
+        this(parent, MapAdaptor.getDefaultInstance().initialSnapshot(1));
     }
 
     LazyMutableContainerNode(final AbstractContainerNode parent, final Map<PathArgument, TreeNode> children) {