From b802bce8a31e72c18c0b7bab93b8e1fc82641666 Mon Sep 17 00:00:00 2001 From: "Claudio D. Gasparini" Date: Fri, 12 Jan 2018 12:26:26 +0100 Subject: [PATCH] Remove no longer required method Change-Id: Ic987e86f09cff5df35f81c13a7385866727f30ed Signed-off-by: Claudio D. Gasparini --- .../protocol/bgp/rib/spi/PeerRoleUtil.java | 17 ----------------- .../protocol/bgp/rib/spi/PeerRoleUtilTest.java | 10 ---------- 2 files changed, 27 deletions(-) diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/PeerRoleUtil.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/PeerRoleUtil.java index 72f4413448..4733d6515b 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/PeerRoleUtil.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/PeerRoleUtil.java @@ -8,31 +8,14 @@ package org.opendaylight.protocol.bgp.rib.spi; -import com.google.common.base.Optional; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.PeerRole; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.rib.Peer; -import org.opendaylight.yangtools.yang.binding.BindingMapping; -import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; -import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public final class PeerRoleUtil { - public static final NodeIdentifier PEER_ROLE_NID = new NodeIdentifier(QName.create(Peer.QNAME, - "peer-role").intern()); private PeerRoleUtil() { throw new UnsupportedOperationException(); } - public static PeerRole roleForChange(final Optional> maybePeerRole) { - if (maybePeerRole.isPresent()) { - final LeafNode peerRoleLeaf = (LeafNode) maybePeerRole.get(); - return PeerRole.valueOf(BindingMapping.getClassName((String) peerRoleLeaf.getValue())); - } - return null; - } - public static String roleForString(final PeerRole role) { switch (role) { case Ebgp: diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/PeerRoleUtilTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/PeerRoleUtilTest.java index c3b79bfac0..e38c3716cc 100644 --- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/PeerRoleUtilTest.java +++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/PeerRoleUtilTest.java @@ -8,21 +8,11 @@ package org.opendaylight.protocol.bgp.rib.spi; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import com.google.common.base.Optional; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.PeerRole; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafNodeBuilder; public class PeerRoleUtilTest { - @Test - public void roleForChange() { - assertNull(PeerRoleUtil.roleForChange(Optional.fromNullable(null))); - assertEquals(PeerRole.Ebgp, PeerRoleUtil.roleForChange(Optional.of(new ImmutableLeafNodeBuilder<>() - .withNodeIdentifier(PeerRoleUtil.PEER_ROLE_NID).withValue("ebgp").build()))); - } - @Test public void roleForString() { assertEquals("ebgp", PeerRoleUtil.roleForString(PeerRole.Ebgp)); -- 2.36.6