Bug 8055: remove unnecessary type arguments

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

diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdates.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdates.java
index 2c93227e53f5f99262f64b9dd062c2e021f1c465..11c0e297a9dcaab439fd02f08deebfdc4dc9ea05 100644 (file)
--- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdates.java
+++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 EBay Software Foundation and others. All rights reserved.
+ * Copyright © 2014, 2017 EBay Software Foundation and others. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -18,7 +18,7 @@ public class TableUpdates extends Response {
     Map<String, TableUpdate> map = Maps.newHashMap();
 
     public TableUpdates() {
-        this(Maps.<String, TableUpdate>newHashMap());
+        this(Maps.newHashMap());
     }
 
     public TableUpdates(Map<String, TableUpdate> map) {

diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsdbMap.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsdbMap.java
index 9fddadd47fae6c3305861b14db2e7dd736df833a..abaa288499081a76891fd2fdbf97236af7521e2f 100644 (file)
--- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsdbMap.java
+++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsdbMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015 EBay Software Foundation and others. All rights reserved.
+ * Copyright © 2013, 2017 EBay Software Foundation and others. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -23,7 +23,7 @@ public class OvsdbMap<K, V> extends ForwardingMap<K, V> {
     Map<K, V> target = Maps.newHashMap();
 
     public OvsdbMap() {
-        this(Maps.<K,V>newHashMap());
+        this(Maps.newHashMap());
     }
 
     public OvsdbMap(Map<K, V> value) {

diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsdbSet.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsdbSet.java
index 6735733455f8b3e9a0c497278e3199dd3c9634c6..7c29701a8027098b586f5f1552c43b2380294e13 100644 (file)
--- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsdbSet.java
+++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsdbSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015 EBay Software Foundation and others. All rights reserved.
+ * Copyright © 2013, 2017 EBay Software Foundation and others. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -23,7 +23,7 @@ public class OvsdbSet<T> extends ForwardingSet<T> {
     Set<T> target = null;
 
     public OvsdbSet() {
-        this(Sets.<T>newHashSet());
+        this(Sets.newHashSet());
     }
 
     public OvsdbSet(Set<T> backing) {

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java
index 203d09d9c7ee488f43a601090583bc480a8f9619..17dc34b5a5ced0a1c1b839c404e5ca686a1958a8 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright © 2015, 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -240,7 +240,7 @@ public class OvsdbConnectionInstance {
     private void stampInstanceIdentifier(TransactionBuilder transaction,InstanceIdentifier<Node> iid,
             InstanceIdentifierCodec instanceIdentifierCodec) {
         OpenVSwitch ovs = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), OpenVSwitch.class);
-        ovs.setExternalIds(Collections.<String,String>emptyMap());
+        ovs.setExternalIds(Collections.emptyMap());
         TransactUtils.stampInstanceIdentifier(transaction, iid, ovs.getSchema(), ovs.getExternalIdsColumn().getSchema(),
                 instanceIdentifierCodec);
     }

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeUpdateCommand.java
index 748a47bf7308bf153801c8cab565c1b7aa648db8..2e419c86973b0005970bdeefad4e293a44f4ac5f 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeUpdateCommand.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeUpdateCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright © 2015, 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -189,7 +189,7 @@ public class BridgeUpdateCommand implements TransactCommand {
             String bridgeName, InstanceIdentifierCodec instanceIdentifierCodec) {
         Bridge bridge = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Bridge.class);
         bridge.setName(bridgeName);
-        bridge.setExternalIds(Collections.<String,String>emptyMap());
+        bridge.setExternalIds(Collections.emptyMap());
         Mutate mutate = TransactUtils.stampInstanceIdentifierMutation(transaction, iid, bridge.getSchema(),
                 bridge.getExternalIdsColumn().getSchema(), instanceIdentifierCodec);
         transaction.add(mutate

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/OvsdbNodeUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/OvsdbNodeUpdateCommand.java
index 2cda2281a6bf3380556564b454089cc2073159b9..ff451de7180b62b311da3da085b6898d3a491806 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/OvsdbNodeUpdateCommand.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/OvsdbNodeUpdateCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Intel Corporation and others.  All rights reserved.
+ * Copyright © 2015, 2017 Intel Corporation and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -104,7 +104,7 @@ public class OvsdbNodeUpdateCommand implements TransactCommand {
     private void stampInstanceIdentifier(TransactionBuilder transaction, InstanceIdentifier<Node> iid,
             InstanceIdentifierCodec instanceIdentifierCodec) {
         OpenVSwitch ovs = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), OpenVSwitch.class);
-        ovs.setExternalIds(Collections.<String,String>emptyMap());
+        ovs.setExternalIds(Collections.emptyMap());
         TransactUtils.stampInstanceIdentifier(transaction, iid, ovs.getSchema(),
                 ovs.getExternalIdsColumn().getSchema(), instanceIdentifierCodec);
     }

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointCreateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointCreateCommand.java
index 7798c28ffe745be1dffe111823dac283bde85a4d..ae62bf070000dab1cbe0535118dc396aef30b64d 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointCreateCommand.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointCreateCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Brocade Communications Systems, Inc. and others.  All rights reserved.
+ * Copyright © 2015, 2017 Brocade Communications Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -370,7 +370,7 @@ public class TerminationPointCreateCommand implements TransactCommand {
             InstanceIdentifierCodec instanceIdentifierCodec) {
         Port port = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Port.class);
         port.setName(interfaceName);
-        port.setExternalIds(Collections.<String,String>emptyMap());
+        port.setExternalIds(Collections.emptyMap());
         Mutate mutate = TransactUtils.stampInstanceIdentifierMutation(transaction, iid, port.getSchema(),
                 port.getExternalIdsColumn().getSchema(), instanceIdentifierCodec);
         transaction.add(mutate

diff --git a/utils/southbound-utils/src/main/java/org/opendaylight/ovsdb/utils/southbound/utils/SouthboundUtils.java b/utils/southbound-utils/src/main/java/org/opendaylight/ovsdb/utils/southbound/utils/SouthboundUtils.java
index 1e660efb13f78f56428bac9562212dee3aeed195..a481467ca82ad9ac8f6269c85ea0046a5af110e8 100644 (file)
--- a/utils/southbound-utils/src/main/java/org/opendaylight/ovsdb/utils/southbound/utils/SouthboundUtils.java
+++ b/utils/southbound-utils/src/main/java/org/opendaylight/ovsdb/utils/southbound/utils/SouthboundUtils.java
@@ -1055,7 +1055,7 @@ public class SouthboundUtils {
         List<OvsdbTerminationPointAugmentation> tpAugmentations = new ArrayList<>();
         if (node == null) {
             LOG.error("extractTerminationPointAugmentations: Node value is null");
-            return Collections.<OvsdbTerminationPointAugmentation>emptyList();
+            return Collections.emptyList();
         }
         List<TerminationPoint> terminationPoints = node.getTerminationPoint();
         if(terminationPoints != null && !terminationPoints.isEmpty()){
@@ -1102,7 +1102,7 @@ public class SouthboundUtils {
     public List<OvsdbTerminationPointAugmentation> readTerminationPointAugmentations(Node node) {
         if (node == null) {
             LOG.error("readTerminationPointAugmentations: Node value is null");
-            return Collections.<OvsdbTerminationPointAugmentation>emptyList();
+            return Collections.emptyList();
         }
         Node operNode = mdsalUtils.read(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier
                 .create(NetworkTopology.class)