From: Robert Varga Date: Fri, 24 Apr 2020 15:35:57 +0000 (+0200) Subject: Fix checkstyle X-Git-Tag: release/aluminium~61 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2e838c61e3fe52471e47222f50c88c9416c26c14;p=bgpcep.git Fix checkstyle Upgraded checkstyle finds a number of issues, fix them up. Change-Id: I501fe4a7b80efd96cb3904cbb857e1bff9556ae7 Signed-off-by: Robert Varga (cherry picked from commit 5c8ed0f8cd482fe14b96cab76f79c3d599783166) --- diff --git a/algo/algo-impl/src/main/java/org/opendaylight/algo/impl/ConstrainedShortestPathFirst.java b/algo/algo-impl/src/main/java/org/opendaylight/algo/impl/ConstrainedShortestPathFirst.java index 9127dbbe41..74e32b38be 100644 --- a/algo/algo-impl/src/main/java/org/opendaylight/algo/impl/ConstrainedShortestPathFirst.java +++ b/algo/algo-impl/src/main/java/org/opendaylight/algo/impl/ConstrainedShortestPathFirst.java @@ -9,7 +9,6 @@ package org.opendaylight.algo.impl; import java.util.HashMap; import java.util.List; - import org.opendaylight.graph.ConnectedEdge; import org.opendaylight.graph.ConnectedGraph; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.graph.rev191125.graph.topology.graph.VertexKey; @@ -21,7 +20,6 @@ import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** * This Class implements a simple Constrained Shortest Path First path computation algorithm that take into account * Bandwidth and TE Metric as constraints. @@ -29,7 +27,6 @@ import org.slf4j.LoggerFactory; * @author Olivier Dugeon * @author Philippe Niger * @author Philippe Cadro - * */ public class ConstrainedShortestPathFirst extends AbstractPathComputation { diff --git a/algo/algo-impl/src/main/java/org/opendaylight/algo/impl/Samcra.java b/algo/algo-impl/src/main/java/org/opendaylight/algo/impl/Samcra.java index 2aa124f66c..94e67960b9 100644 --- a/algo/algo-impl/src/main/java/org/opendaylight/algo/impl/Samcra.java +++ b/algo/algo-impl/src/main/java/org/opendaylight/algo/impl/Samcra.java @@ -10,7 +10,6 @@ package org.opendaylight.algo.impl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; - import org.opendaylight.graph.ConnectedEdge; import org.opendaylight.graph.ConnectedGraph; import org.opendaylight.graph.ConnectedVertex; @@ -33,11 +32,8 @@ import org.slf4j.LoggerFactory; * @author Philippe Niger * @author Olivier Dugeon * @author Philippe Cadro - * */ - public class Samcra extends AbstractPathComputation { - /* * This class stores the set of paths which has been computed for a given Connected Vertex: * - pathCount number of active paths @@ -47,7 +43,6 @@ public class Samcra extends AbstractPathComputation { * Each path is represented by a "CspfPath" class to encompass path predecessor, path status * and path length information */ - private static class SamcraPath { private ConnectedVertex cvertex; diff --git a/algo/algo-impl/src/main/java/org/opendaylight/algo/impl/ShortestPathFirst.java b/algo/algo-impl/src/main/java/org/opendaylight/algo/impl/ShortestPathFirst.java index a65d94fcf3..cf0a5b5f98 100644 --- a/algo/algo-impl/src/main/java/org/opendaylight/algo/impl/ShortestPathFirst.java +++ b/algo/algo-impl/src/main/java/org/opendaylight/algo/impl/ShortestPathFirst.java @@ -9,7 +9,6 @@ package org.opendaylight.algo.impl; import java.util.HashMap; import java.util.List; - import org.opendaylight.graph.ConnectedEdge; import org.opendaylight.graph.ConnectedGraph; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.graph.rev191125.graph.topology.graph.VertexKey; @@ -21,14 +20,12 @@ import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** * This Class implements a simple Shortest Path First path computation algorithm based on standard IGP Metric. * * @author Olivier Dugeon * @author Philippe Niger * @author Philippe Cadro - * */ public class ShortestPathFirst extends AbstractPathComputation { diff --git a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpHandlerFactory.java b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpHandlerFactory.java index 10ec092a81..385a608f08 100644 --- a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpHandlerFactory.java +++ b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpHandlerFactory.java @@ -11,7 +11,6 @@ import static java.util.Objects.requireNonNull; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelOutboundHandler; - import org.opendaylight.protocol.bmp.spi.registry.BmpMessageRegistry; public final class BmpHandlerFactory { @@ -30,5 +29,4 @@ public final class BmpHandlerFactory { public ChannelHandler[] getDecoders() { return new ChannelHandler[]{new BmpMessageHeaderDecoder(), new BmpByteToMessageDecoder(this.registry),}; } - } diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPKeepAliveMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPKeepAliveMessageParser.java index 50ab7092cf..beaa545330 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPKeepAliveMessageParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPKeepAliveMessageParser.java @@ -8,12 +8,9 @@ package org.opendaylight.protocol.pcep.parser.message; import com.google.common.base.Preconditions; - import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; - import java.util.List; - import org.opendaylight.protocol.pcep.spi.AbstractMessageParser; import org.opendaylight.protocol.pcep.spi.MessageUtil; import org.opendaylight.protocol.pcep.spi.ObjectRegistry; diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPExplicitRouteObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPExplicitRouteObjectParser.java index c1177fccc2..e34391c759 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPExplicitRouteObjectParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPExplicitRouteObjectParser.java @@ -8,10 +8,8 @@ package org.opendaylight.protocol.pcep.parser.object; import com.google.common.base.Preconditions; - import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; - import org.opendaylight.protocol.pcep.spi.EROSubobjectRegistry; import org.opendaylight.protocol.pcep.spi.ObjectUtil; import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException; @@ -24,7 +22,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ * Parser for {@link Ero}. */ public final class PCEPExplicitRouteObjectParser extends AbstractEROWithSubobjectsParser { - private static final int CLASS = 7; private static final int TYPE = 1; diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPReportedRouteObjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPReportedRouteObjectParser.java index 31e9fc8fd6..88d6cba445 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPReportedRouteObjectParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/PCEPReportedRouteObjectParser.java @@ -8,10 +8,8 @@ package org.opendaylight.protocol.pcep.parser.object; import com.google.common.base.Preconditions; - import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; - import org.opendaylight.protocol.pcep.spi.ObjectUtil; import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException; import org.opendaylight.protocol.pcep.spi.RROSubobjectRegistry; @@ -24,9 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ * Parser for {@link Rro}. */ public final class PCEPReportedRouteObjectParser extends AbstractRROWithSubobjectsParser { - public static final int CLASS = 8; - public static final int TYPE = 1; public PCEPReportedRouteObjectParser(final RROSubobjectRegistry subobjReg) { diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPHandlerFactory.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPHandlerFactory.java index 10944c5c27..3fe350d62f 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPHandlerFactory.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPHandlerFactory.java @@ -11,7 +11,6 @@ import static java.util.Objects.requireNonNull; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelOutboundHandler; - import org.opendaylight.protocol.pcep.spi.MessageRegistry; /** diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/MessageSerializer.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/MessageSerializer.java index c780233dbb..bc3dd35348 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/MessageSerializer.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/MessageSerializer.java @@ -8,11 +8,9 @@ package org.opendaylight.protocol.pcep.spi; import io.netty.buffer.ByteBuf; - import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.Message; public interface MessageSerializer { - /** * Serializes given message to bytes wrapped in given ByteBuf. * @param message PCEP message to be serialized diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/RROSubobjectParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/RROSubobjectParser.java index 7fc5b7ba3e..5a8a4e8a5d 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/RROSubobjectParser.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/RROSubobjectParser.java @@ -8,7 +8,6 @@ package org.opendaylight.protocol.pcep.spi; import io.netty.buffer.ByteBuf; - import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.reported.route.object.rro.Subobject; /**