Removed unneccessary usage of Maps.newHashMap from the IT files 82/8182/2
authorMadhu Venugopal <mavenugo@gmail.com>
Fri, 20 Jun 2014 10:00:33 +0000 (03:00 -0700)
committerMadhu Venugopal <mavenugo@gmail.com>
Fri, 20 Jun 2014 17:10:32 +0000 (10:10 -0700)
Change-Id: I20d073c28110a4e4c64adeea5e7d892bd06e695e
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
library/src/test/java/org/opendaylight/ovsdb/lib/OvsDBClientTestIT.java
library/src/test/java/org/opendaylight/ovsdb/lib/OvsDBClientTestITTyped.java
schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/TypedVSwitchdSchemaIT.java

index 11e8207cdda65cff25ebe216721fb4827bd3af15..46242bd0c1e3eb230b40ba56a00289b655fa88eb 100644 (file)
@@ -46,7 +46,6 @@ import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.ListenableFuture;
 
@@ -244,7 +243,7 @@ public class OvsDBClientTestIT extends OvsdbTestBase {
                         .withId(namedUuid)
                         .value(name, testBridgeName)
                         .value(flood_vlans, Sets.newHashSet(100, 101, 4001))
-                        .value(externalIds, Maps.newHashMap(ImmutableMap.of("key","value"))))
+                        .value(externalIds, ImmutableMap.of("key","value")))
                 .add(op.comment("Inserting Bridge br-int"))
                 .add(op.update(bridge)
                         .set(fail_mode, "secure")
@@ -260,7 +259,7 @@ public class OvsDBClientTestIT extends OvsdbTestBase {
                         .where(name.opEqual(testBridgeName))
                         .build())
                 .add(op.mutate(bridge)
-                        .addMutation(externalIds, Mutator.INSERT, Maps.newHashMap(ImmutableMap.of("key2","value2")))
+                        .addMutation(externalIds, Mutator.INSERT, ImmutableMap.of("key2","value2"))
                         .where(name.opEqual(testBridgeName))
                         .build())
                 .add(op.mutate(ovsTable)
index 04fd3a299156fe29198e1c2669b68c6abe763d91..cf33bdc2a42122674f8171eedc092f38f808640c 100644 (file)
@@ -39,7 +39,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.ListenableFuture;
 
@@ -55,7 +54,7 @@ public class OvsDBClientTestITTyped extends OvsdbTestBase {
     public void testTypedBridgeCreate() throws IOException, InterruptedException, ExecutionException, NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
         TestBridge rBridge = ovs.createTypedRowWrapper(TestBridge.class);
         rBridge.setName(testBridgeName);
-        rBridge.setStatus(Maps.newHashMap(ImmutableMap.of("key","value")));
+        rBridge.setStatus(ImmutableMap.of("key","value"));
         rBridge.setFloodVlans(Sets.newHashSet(34));
 
         GenericTableSchema ovsTable = dbSchema.table("Open_vSwitch", GenericTableSchema.class);
index c7dac1ea5ae757c17df0fe80744a296702349557..3e762fb62b60eaa320cb13c5f131c012c678a64d 100644 (file)
@@ -35,7 +35,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.ListenableFuture;
 
@@ -55,7 +54,7 @@ public class TypedVSwitchdSchemaIT extends OvsdbTestBase {
     private void createTypedBridge() throws IOException, InterruptedException, ExecutionException, NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
         Bridge bridge = ovs.createTypedRowWrapper(Bridge.class);
         bridge.setName(testBridgeName);
-        bridge.setStatus(Maps.newHashMap(ImmutableMap.of("key","value")));
+        bridge.setStatus(ImmutableMap.of("key","value"));
         bridge.setFloodVlans(Sets.newHashSet(34));
 
         OpenVSwitch openVSwitch = ovs.createTypedRowWrapper(OpenVSwitch.class);