From d5a18c14896525ec05b4aa7f0cf028389e4d7670 Mon Sep 17 00:00:00 2001 From: "Claudio D. Gasparini" Date: Wed, 6 Dec 2017 10:11:47 +0100 Subject: [PATCH] Clean up - remove unused imports - static declared as final - unnecesary private - remove deprecated checkedFuture Change-Id: I4def646d01969755394970661b81f21aa9827690 Signed-off-by: Claudio D. Gasparini --- .../bgp/flowspec/AbstractFlowspecNlriParser.java | 4 ++-- .../bgp/flowspec/handlers/AbstractOperandParser.java | 2 +- .../flowspec/ipv4/FlowspecIpv4NlriParserHelper.java | 6 +++--- .../flowspec/ipv6/FlowspecIpv6NlriParserHelper.java | 10 +++++----- .../impl/tlvs/AbstractNodeDescriptorTlvCodec.java | 4 ++-- .../protocol/bgp/mode/spi/AbstractRouteEntry.java | 10 +++++----- .../bgp/rib/impl/AbstractReflectingExportPolicy.java | 2 +- .../opendaylight/protocol/bgp/rib/impl/RIBImpl.java | 2 +- .../bgp/topology/provider/spi/BgpTopologyDeployer.java | 2 -- .../protocol/bmp/parser/message/TestUtil.java | 2 +- .../opendaylight/protocol/pcep/TerminationReason.java | 2 +- .../protocol/pcep/spi/AbstractMessageParser.java | 2 +- .../org/opendaylight/protocol/pcep/spi/PCEPErrors.java | 2 +- 13 files changed, 24 insertions(+), 26 deletions(-) diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java index 64f483054d..cde6b0bf99 100644 --- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java +++ b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java @@ -568,7 +568,7 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri return buffer.toString(); } - public static final int readNlriLength(@Nonnull final ByteBuf nlri) { + public static int readNlriLength(@Nonnull final ByteBuf nlri) { requireNonNull(nlri, "NLRI information cannot be null"); Preconditions.checkState(nlri.isReadable(), "NLRI Byte buffer is not readable."); int length = nlri.readUnsignedByte(); @@ -638,7 +638,7 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri } @Nullable - protected static final PathId readPathId(@Nonnull final ByteBuf nlri, final Class afi, + protected static PathId readPathId(@Nonnull final ByteBuf nlri, final Class afi, final Class safi, final PeerSpecificParserConstraint constraint) { if (MultiPathSupportUtil.isTableTypeSupported(constraint, new BgpTableTypeImpl(afi, safi))) { return PathIdUtil.readPathId(nlri); diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/handlers/AbstractOperandParser.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/handlers/AbstractOperandParser.java index 7bedbb193f..7e5d01844a 100644 --- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/handlers/AbstractOperandParser.java +++ b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/handlers/AbstractOperandParser.java @@ -33,7 +33,7 @@ public abstract class AbstractOperandParser { private static final int LENGTH_BITMASK = 48; @VisibleForTesting - public static final short parseLength(final byte op) { + public static short parseLength(final byte op) { return (short) (1 << ((op & LENGTH_BITMASK) >> LENGTH_SHIFT)); } diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv4/FlowspecIpv4NlriParserHelper.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv4/FlowspecIpv4NlriParserHelper.java index 3a84a540aa..7c22de524e 100644 --- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv4/FlowspecIpv4NlriParserHelper.java +++ b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv4/FlowspecIpv4NlriParserHelper.java @@ -40,7 +40,7 @@ public final class FlowspecIpv4NlriParserHelper { private FlowspecIpv4NlriParserHelper() {} - public static final void extractFlowspec(final ChoiceNode fsType, final FlowspecBuilder fsBuilder) { + public static void extractFlowspec(final ChoiceNode fsType, final FlowspecBuilder fsBuilder) { if (fsType.getChild(AbstractFlowspecNlriParser.DEST_PREFIX_NID).isPresent()) { fsBuilder.setFlowspecType( new DestinationPrefixCaseBuilder() @@ -60,7 +60,7 @@ public final class FlowspecIpv4NlriParserHelper { } } - public static final void buildFlowspecString(final FlowspecType value, final StringBuilder buffer) { + public static void buildFlowspecString(final FlowspecType value, final StringBuilder buffer) { if (value instanceof DestinationPrefixCase) { buffer.append("to "); buffer.append(((DestinationPrefixCase) value).getDestinationPrefix().getValue()); @@ -73,7 +73,7 @@ public final class FlowspecIpv4NlriParserHelper { } } - private static final List createProtocolsIps(final UnkeyedListNode protocolIpsData) { + private static List createProtocolsIps(final UnkeyedListNode protocolIpsData) { final List protocolIps = new ArrayList<>(); for (final UnkeyedListEntryNode node : protocolIpsData.getValue()) { diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv6/FlowspecIpv6NlriParserHelper.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv6/FlowspecIpv6NlriParserHelper.java index 99c9f01c97..6209580fd2 100644 --- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv6/FlowspecIpv6NlriParserHelper.java +++ b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/ipv6/FlowspecIpv6NlriParserHelper.java @@ -42,7 +42,7 @@ public final class FlowspecIpv6NlriParserHelper { private FlowspecIpv6NlriParserHelper() {} - public static final void extractFlowspec(final ChoiceNode fsType, final FlowspecBuilder fsBuilder) { + public static void extractFlowspec(final ChoiceNode fsType, final FlowspecBuilder fsBuilder) { if (fsType.getChild(AbstractFlowspecNlriParser.DEST_PREFIX_NID).isPresent()) { fsBuilder.setFlowspecType( new DestinationIpv6PrefixCaseBuilder() @@ -62,7 +62,7 @@ public final class FlowspecIpv6NlriParserHelper { } } - public static final void buildFlowspecString(final FlowspecType value, final StringBuilder buffer) { + public static void buildFlowspecString(final FlowspecType value, final StringBuilder buffer) { if (value instanceof DestinationIpv6PrefixCase) { buffer.append("to "); buffer.append(((DestinationIpv6PrefixCase) value).getDestinationPrefix().getValue()); @@ -78,7 +78,7 @@ public final class FlowspecIpv6NlriParserHelper { } } - private static final List createNextHeaders(final UnkeyedListNode nextHeadersData) { + private static List createNextHeaders(final UnkeyedListNode nextHeadersData) { final List nextHeaders = new ArrayList<>(); for (final UnkeyedListEntryNode node : nextHeadersData.getValue()) { @@ -97,7 +97,7 @@ public final class FlowspecIpv6NlriParserHelper { return nextHeaders; } - private static final List createFlowLabels(final UnkeyedListNode flowLabelsData) { + private static List createFlowLabels(final UnkeyedListNode flowLabelsData) { final List flowLabels = new ArrayList<>(); for (final UnkeyedListEntryNode node : flowLabelsData.getValue()) { @@ -116,7 +116,7 @@ public final class FlowspecIpv6NlriParserHelper { return flowLabels; } - private static final String stringFlowLabel(final List list) { + private static String stringFlowLabel(final List list) { final StringBuilder buffer = new StringBuilder(); boolean isFirst = true; for (final FlowLabel item : list) { diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/AbstractNodeDescriptorTlvCodec.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/AbstractNodeDescriptorTlvCodec.java index 397fe1c633..12804b10ee 100644 --- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/AbstractNodeDescriptorTlvCodec.java +++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/AbstractNodeDescriptorTlvCodec.java @@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.common.QName; abstract class AbstractNodeDescriptorTlvCodec { - protected static final NodeIdentifier parseNodeDescriptor(final ByteBuf value, final Map parsedSubTlvs) { + protected static NodeIdentifier parseNodeDescriptor(final ByteBuf value, final Map parsedSubTlvs) { parsedSubTlvs.putAll(SimpleNlriTypeRegistry.getInstance().parseSubTlvs(value)); final AsNumber asNumber = (AsNumber) parsedSubTlvs.get(AsNumTlvParser.AS_NUMBER_QNAME); final DomainIdentifier domainId = (DomainIdentifier) parsedSubTlvs.get(DomainIdTlvParser.DOMAIN_ID_QNAME); @@ -51,7 +51,7 @@ abstract class AbstractNodeDescriptorTlvCodec { }; } - protected static final void serializeNodeDescriptor(final NodeIdentifier tlv, final ByteBuf body) { + protected static void serializeNodeDescriptor(final NodeIdentifier tlv, final ByteBuf body) { final SimpleNlriTypeRegistry tlvReg = SimpleNlriTypeRegistry.getInstance(); tlvReg.serializeTlv(AsNumTlvParser.AS_NUMBER_QNAME, tlv.getAsNumber(), body); tlvReg.serializeTlv(DomainIdTlvParser.DOMAIN_ID_QNAME, tlv.getDomainId(), body); diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractRouteEntry.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractRouteEntry.java index 4297b1dca5..8281e3cb25 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractRouteEntry.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractRouteEntry.java @@ -33,7 +33,7 @@ public abstract class AbstractRouteEntry implements RouteEntry { protected static final NodeIdentifier ROUTES_IDENTIFIER = new NodeIdentifier(Routes.QNAME); private static final Logger LOG = LoggerFactory.getLogger(AbstractRouteEntry.class); - protected static final void fillLocRib(final YangInstanceIdentifier routeTarget, final NormalizedNode value, + protected static void fillLocRib(final YangInstanceIdentifier routeTarget, final NormalizedNode value, final DOMDataWriteTransaction tx) { if (value != null) { LOG.debug("Write route to LocRib {}", value); @@ -44,7 +44,7 @@ public abstract class AbstractRouteEntry implements RouteEntry { } } - protected static final void update(final PeerId destPeer, final YangInstanceIdentifier routeTarget, + protected static void update(final PeerId destPeer, final YangInstanceIdentifier routeTarget, final ContainerNode effAttr, final NormalizedNode value, final RIBSupport ribSup, final DOMDataWriteTransaction tx) { if (!writeRoute(destPeer, routeTarget, effAttr, value, ribSup, tx)) { @@ -52,7 +52,7 @@ public abstract class AbstractRouteEntry implements RouteEntry { } } - protected static final boolean writeRoute(final PeerId destPeer, final YangInstanceIdentifier routeTarget, + protected static boolean writeRoute(final PeerId destPeer, final YangInstanceIdentifier routeTarget, final ContainerNode effAttrib, final NormalizedNode value, final RIBSupport ribSup, final DOMDataWriteTransaction tx) { if (effAttrib != null && value != null) { @@ -70,7 +70,7 @@ public abstract class AbstractRouteEntry implements RouteEntry { tx.delete(LogicalDatastoreType.OPERATIONAL, routeTarget); } - protected static final boolean filterRoutes(final PeerId rootPeer, final PeerId destPeer, + protected static boolean filterRoutes(final PeerId rootPeer, final PeerId destPeer, final ExportPolicyPeerTracker peerPT, final TablesKey localTK, final PeerRole destPeerRole) { return !rootPeer.equals(destPeer) && isTableSupportedAndReady(destPeer, peerPT, localTK) && !PeerRole.Internal.equals(destPeerRole); } @@ -83,7 +83,7 @@ public abstract class AbstractRouteEntry implements RouteEntry { return true; } - protected static final YangInstanceIdentifier getAdjRibOutYII(final RIBSupport ribSup, + protected static YangInstanceIdentifier getAdjRibOutYII(final RIBSupport ribSup, final YangInstanceIdentifier rootPath, final PathArgument routeId, final TablesKey localTK) { return ribSup.routePath(rootPath.node(AdjRibOut.QNAME).node(Tables.QNAME).node(RibSupportUtils.toYangTablesKey(localTK)) .node(ROUTES_IDENTIFIER), routeId); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractReflectingExportPolicy.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractReflectingExportPolicy.java index ce5a034ec0..338d66ad1e 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractReflectingExportPolicy.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractReflectingExportPolicy.java @@ -44,7 +44,7 @@ abstract class AbstractReflectingExportPolicy extends AbstractExportPolicy { * @param attributes Input attributes, may not be null. * @return Modified (reflected) attributes. */ - @Nonnull protected static final ContainerNode reflectedFromInternalAttributes(@Nonnull final ContainerNode attributes) { + @Nonnull protected static ContainerNode reflectedFromInternalAttributes(@Nonnull final ContainerNode attributes) { return AttributeOperations.getInstance(attributes).reflectedAttributes(attributes); } } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java index 0a66e055ff..1ce2764b4b 100755 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java @@ -358,7 +358,7 @@ public final class RIBImpl extends BGPRIBStateImpl implements ClusterSingletonSe final DOMDataWriteTransaction t = this.domChain.newWriteOnlyTransaction(); t.delete(LogicalDatastoreType.OPERATIONAL, getYangRibId()); - final CheckedFuture cleanFuture = t.submit(); + final ListenableFuture cleanFuture = t.submit(); this.domChain.close(); return cleanFuture; diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/spi/BgpTopologyDeployer.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/spi/BgpTopologyDeployer.java index 89027fe805..bc6517887c 100644 --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/spi/BgpTopologyDeployer.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/spi/BgpTopologyDeployer.java @@ -10,9 +10,7 @@ package org.opendaylight.bgpcep.bgp.topology.provider.spi; import com.google.common.annotations.Beta; import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology; import org.opendaylight.yangtools.concepts.AbstractRegistration; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @Beta public interface BgpTopologyDeployer { diff --git a/bmp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java b/bmp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java index a1c79d07af..2bd3a26a6d 100644 --- a/bmp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java +++ b/bmp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java @@ -310,7 +310,7 @@ public final class TestUtil { return attribBuilder.build(); } - private static final List createCommunities() { + private static List createCommunities() { final List communities = Lists.newArrayList(); final CommunitiesBuilder commBuilder = new CommunitiesBuilder() .setAsNumber(new AsNumber(65535L)) diff --git a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/TerminationReason.java b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/TerminationReason.java index 9eae09028c..84815407eb 100644 --- a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/TerminationReason.java +++ b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/TerminationReason.java @@ -23,7 +23,7 @@ public enum TerminationReason { } } - private TerminationReason(final short value) { + TerminationReason(final short value) { this.value = value; } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java index 2edddd63be..6eb4283727 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java @@ -140,7 +140,7 @@ public abstract class AbstractMessageParser implements MessageParser, MessageSer } } - protected static final List addVendorInformationObjects(final List objects) { + protected static List addVendorInformationObjects(final List objects) { final List vendorInfo = new ArrayList<>(); while (!objects.isEmpty() && objects.get(0) instanceof VendorInformationObject) { final VendorInformationObject viObject = (VendorInformationObject) objects.get(0); diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPErrors.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPErrors.java index d32aa7163c..76e7db9546 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPErrors.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPErrors.java @@ -362,7 +362,7 @@ public enum PCEPErrors { return VALUE_MAP.get(new PCEPErrorIdentifier(errorType, errorValue)); } - private PCEPErrors(final int type, final int value) { + PCEPErrors(final int type, final int value) { this.errorId = new PCEPErrorIdentifier((short) type, (short) value); } -- 2.36.6