From 01fbed521b1300dcd8da01c2e2c9d552bd18c651 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 24 Sep 2020 13:05:07 +0200 Subject: [PATCH] Migrate users of addAugmentation() Builders have a simplified addAugmentation() method, migrate last two users to it. Change-Id: I71d3efeb15b8df4a9eb47bf0236447903fb640cd Signed-off-by: Robert Varga --- .../hwvtepsouthbound/it/HwvtepSouthboundIT.java | 2 +- .../utils/HwvtepSouthboundUtils.java | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hwvtepsouthbound/hwvtepsouthbound-it/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/it/HwvtepSouthboundIT.java b/hwvtepsouthbound/hwvtepsouthbound-it/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/it/HwvtepSouthboundIT.java index a189c255e..874db8033 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-it/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/it/HwvtepSouthboundIT.java +++ b/hwvtepsouthbound/hwvtepsouthbound-it/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/it/HwvtepSouthboundIT.java @@ -424,7 +424,7 @@ public class HwvtepSouthboundIT extends AbstractMdsalTestBase { psAugBuilder.setManagementIps(managementIps); psAugBuilder.setTunnelIps(tunnelIps); psAugBuilder.setTunnels(tunnels); - psNodeBuilder.addAugmentation(PhysicalSwitchAugmentation.class, psAugBuilder.build()); + psNodeBuilder.addAugmentation(psAugBuilder.build()); LOG.debug("Built with intent to store PhysicalSwitch data {}", psAugBuilder); Assert.assertTrue( mdsalUtils.merge(LogicalDatastoreType.CONFIGURATION, psIid, psNodeBuilder.build())); diff --git a/utils/hwvtepsouthbound-utils/src/main/java/org/opendaylight/ovsdb/utils/hwvtepsouthbound/utils/HwvtepSouthboundUtils.java b/utils/hwvtepsouthbound-utils/src/main/java/org/opendaylight/ovsdb/utils/hwvtepsouthbound/utils/HwvtepSouthboundUtils.java index d08d7ef18..f0cae55be 100644 --- a/utils/hwvtepsouthbound-utils/src/main/java/org/opendaylight/ovsdb/utils/hwvtepsouthbound/utils/HwvtepSouthboundUtils.java +++ b/utils/hwvtepsouthbound-utils/src/main/java/org/opendaylight/ovsdb/utils/hwvtepsouthbound/utils/HwvtepSouthboundUtils.java @@ -42,16 +42,14 @@ public final class HwvtepSouthboundUtils { } public static Node createNode(ConnectionInfo key) { - NodeBuilder nodeBuilder = new NodeBuilder(); - nodeBuilder.setNodeId(createNodeId(key.getRemoteIp(), key.getRemotePort())); - nodeBuilder.addAugmentation(HwvtepGlobalAugmentation.class, createHwvtepAugmentation(key)); - return nodeBuilder.build(); + return new NodeBuilder() + .setNodeId(createNodeId(key.getRemoteIp(), key.getRemotePort())) + .addAugmentation(createHwvtepAugmentation(key)) + .build(); } public static HwvtepGlobalAugmentation createHwvtepAugmentation(ConnectionInfo key) { - HwvtepGlobalAugmentationBuilder hwvtepGlobalBuilder = new HwvtepGlobalAugmentationBuilder(); - hwvtepGlobalBuilder.setConnectionInfo(key); - return hwvtepGlobalBuilder.build(); + return new HwvtepGlobalAugmentationBuilder().setConnectionInfo(key).build(); } public static InstanceIdentifier createInstanceIdentifier(ConnectionInfo key) { -- 2.36.6