From 87787d2464a08e93ebece1267ccb169673f65b33 Mon Sep 17 00:00:00 2001 From: "Claudio D. Gasparini" Date: Mon, 7 Aug 2017 16:56:00 +0200 Subject: [PATCH] Enforce checkstyle for rsvp api/spi Change-Id: I7ceb91c1eaf1a1b3fb583eec31f08f5a497e4c8a Signed-off-by: Claudio D. Gasparini --- rsvp/spi/pom.xml | 12 +++++++ ...bstractRSVPExtensionProviderActivator.java | 1 + .../rsvp/parser/spi/LabelRegistry.java | 4 +-- .../spi/RSVPExtensionProviderContext.java | 15 ++++++--- .../rsvp/parser/spi/RSVPTeObjectRegistry.java | 2 +- ...iceLoaderRSVPExtensionProviderContext.java | 11 ++----- .../spi/pojo/SimpleEROSubobjectRegistry.java | 11 ++++--- .../parser/spi/pojo/SimpleLabelRegistry.java | 18 ++++++----- .../spi/pojo/SimpleRROSubobjectRegistry.java | 8 +++-- .../SimpleRSVPExtensionProviderContext.java | 31 ++++++++++++------- ...RSVPExtensionProviderContextActivator.java | 6 ++-- .../spi/pojo/SimpleRSVPObjectRegistry.java | 14 +++++---- .../spi/pojo/SimpleXROSubobjectRegistry.java | 11 ++++--- .../subobjects/AbstractRSVPObjectParser.java | 10 +++--- .../spi/subobjects/CommonPathKeyParser.java | 6 ++-- ...monUnnumberedInterfaceSubobjectParser.java | 13 ++++---- .../subobjects/EROSubobjectListParser.java | 11 ++++--- .../subobjects/RROSubobjectListParser.java | 6 ++-- .../subobjects/XROSubobjectListParser.java | 12 ++++--- 19 files changed, 121 insertions(+), 81 deletions(-) diff --git a/rsvp/spi/pom.xml b/rsvp/spi/pom.xml index 8474848e3f..849d97504d 100644 --- a/rsvp/spi/pom.xml +++ b/rsvp/spi/pom.xml @@ -72,6 +72,18 @@ + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + checkstyle.violationSeverity=error + + + + + scm:git:ssh://git.opendaylight.org:29418/bgpcep.git scm:git:ssh://git.opendaylight.org:29418/bgpcep.git diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/AbstractRSVPExtensionProviderActivator.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/AbstractRSVPExtensionProviderActivator.java index 1a8fdd9e7c..d9989eb648 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/AbstractRSVPExtensionProviderActivator.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/AbstractRSVPExtensionProviderActivator.java @@ -31,6 +31,7 @@ public abstract class AbstractRSVPExtensionProviderActivator implements AutoClos } @Override + @SuppressWarnings("checkstyle:IllegalCatch") public final synchronized void stop() { if (this.registrations == null) { return; diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/LabelRegistry.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/LabelRegistry.java index 2250fbf47e..e9a75b33cb 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/LabelRegistry.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/LabelRegistry.java @@ -15,12 +15,12 @@ public interface LabelRegistry { /** * Finds parser for given label C-type in the registry. Delegates parsing to found parser. * - * @param cType label type, key in parser registry + * @param ctype label type, key in parser registry * @param buffer label wrapped in ByteBuf * @return null if the parser for this label could not be found * @throws RSVPParsingException if the parsing did not succeed */ - LabelType parseLabel(int cType, ByteBuf buffer) throws RSVPParsingException; + LabelType parseLabel(int ctype, ByteBuf buffer) throws RSVPParsingException; /** * Find serializer for given label. Delegates parsing to found serializer. diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/RSVPExtensionProviderContext.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/RSVPExtensionProviderContext.java index 7d2680623e..a4ef81e783 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/RSVPExtensionProviderContext.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/RSVPExtensionProviderContext.java @@ -14,25 +14,30 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.label.subobject.LabelType; public interface RSVPExtensionProviderContext extends RSVPExtensionConsumerContext { - void registerRsvpObjectParser(int classNum, int cType, RSVPTeObjectParser parser); + void registerRsvpObjectParser(int classNum, int ctype, RSVPTeObjectParser parser); void registerRsvpObjectSerializer(Class objectClass, RSVPTeObjectSerializer serializer); - AutoCloseable registerXROSubobjectSerializer(Class subobjectClass, XROSubobjectSerializer serializer); + AutoCloseable registerXROSubobjectSerializer(Class subobjectClass, + XROSubobjectSerializer serializer); AutoCloseable registerXROSubobjectParser(int subobjectType, XROSubobjectParser parser); - AutoCloseable registerRROSubobjectSerializer(Class subobjectClass, RROSubobjectSerializer serializer); + AutoCloseable registerRROSubobjectSerializer(Class subobjectClass, RROSubobjectSerializer + serializer); AutoCloseable registerRROSubobjectParser(int subobjectType, RROSubobjectParser parser); - AutoCloseable registerEROSubobjectSerializer(Class subobjectClass, EROSubobjectSerializer serializer); + AutoCloseable registerEROSubobjectSerializer(Class subobjectClass, + EROSubobjectSerializer serializer); AutoCloseable registerEROSubobjectParser(int subobjectType, EROSubobjectParser parser); AutoCloseable registerLabelSerializer(Class labelClass, LabelSerializer serializer); - AutoCloseable registerLabelParser(int cType, LabelParser parser); + AutoCloseable registerLabelParser(int ctype, LabelParser parser); /** * Get the context-wide cache for a particular object type. diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/RSVPTeObjectRegistry.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/RSVPTeObjectRegistry.java index 4d24d7122d..0626c3e940 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/RSVPTeObjectRegistry.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/RSVPTeObjectRegistry.java @@ -12,7 +12,7 @@ import io.netty.buffer.ByteBuf; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.RsvpTeObject; public interface RSVPTeObjectRegistry { - RsvpTeObject parseRSPVTe(int classNum, int cType, ByteBuf buffer) throws RSVPParsingException; + RsvpTeObject parseRSPVTe(int classNum, int ctype, ByteBuf buffer) throws RSVPParsingException; void serializeRSPVTe(RsvpTeObject parameter, ByteBuf bytes); } diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/ServiceLoaderRSVPExtensionProviderContext.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/ServiceLoaderRSVPExtensionProviderContext.java index dda7edfadf..9f85624745 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/ServiceLoaderRSVPExtensionProviderContext.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/ServiceLoaderRSVPExtensionProviderContext.java @@ -8,7 +8,6 @@ package org.opendaylight.protocol.rsvp.parser.spi.pojo; - import java.util.ServiceLoader; import org.opendaylight.protocol.rsvp.parser.spi.RSVPExtensionProviderActivator; import org.opendaylight.protocol.rsvp.parser.spi.RSVPExtensionProviderContext; @@ -21,8 +20,8 @@ public final class ServiceLoaderRSVPExtensionProviderContext { public static RSVPExtensionProviderContext create() { final RSVPExtensionProviderContext ctx = new SimpleRSVPExtensionProviderContext(); - final ServiceLoader loader = ServiceLoader.load(RSVPExtensionProviderActivator - .class); + final ServiceLoader loader = ServiceLoader + .load(RSVPExtensionProviderActivator.class); for (final RSVPExtensionProviderActivator a : loader) { a.start(ctx); } @@ -38,11 +37,7 @@ public final class ServiceLoaderRSVPExtensionProviderContext { private static final RSVPExtensionProviderContext INSTANCE; static { - try { - INSTANCE = create(); - } catch (final Exception e) { - throw new ExceptionInInitializerError(e); - } + INSTANCE = create(); } private Holder() { diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleEROSubobjectRegistry.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleEROSubobjectRegistry.java index 82cd233f06..96caeec2d3 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleEROSubobjectRegistry.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleEROSubobjectRegistry.java @@ -21,7 +21,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yangtools.yang.binding.DataContainer; public final class SimpleEROSubobjectRegistry implements EROSubobjectRegistry { - private final HandlerRegistry handlers = new HandlerRegistry<>(); + private final HandlerRegistry handlers = + new HandlerRegistry<>(); public AutoCloseable registerSubobjectParser(final int subobjectType, final EROSubobjectParser parser) { Preconditions.checkArgument(subobjectType >= 0 && subobjectType <= Values.UNSIGNED_SHORT_MAX_VALUE); @@ -29,12 +30,13 @@ public final class SimpleEROSubobjectRegistry implements EROSubobjectRegistry { } public AutoCloseable registerSubobjectSerializer(final Class subobjectClass, - final EROSubobjectSerializer serializer) { + final EROSubobjectSerializer serializer) { return this.handlers.registerSerializer(subobjectClass, serializer); } @Override - public SubobjectContainer parseSubobject(final int type, final ByteBuf buffer, final boolean loose) throws RSVPParsingException { + public SubobjectContainer parseSubobject(final int type, final ByteBuf buffer, final boolean loose) throws + RSVPParsingException { Preconditions.checkArgument(type >= 0 && type <= Values.UNSIGNED_SHORT_MAX_VALUE); final EROSubobjectParser parser = this.handlers.getParser(type); if (parser == null) { @@ -45,7 +47,8 @@ public final class SimpleEROSubobjectRegistry implements EROSubobjectRegistry { @Override public void serializeSubobject(final SubobjectContainer subobject, final ByteBuf buffer) { - final EROSubobjectSerializer serializer = this.handlers.getSerializer(subobject.getSubobjectType().getImplementedInterface()); + final EROSubobjectSerializer serializer = this.handlers.getSerializer(subobject.getSubobjectType() + .getImplementedInterface()); if (serializer == null) { return; } diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleLabelRegistry.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleLabelRegistry.java index 192eee568b..6ceb722e89 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleLabelRegistry.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleLabelRegistry.java @@ -22,19 +22,20 @@ import org.opendaylight.yangtools.yang.binding.DataContainer; public final class SimpleLabelRegistry implements LabelRegistry { private final HandlerRegistry handlers = new HandlerRegistry<>(); - public AutoCloseable registerLabelParser(final int cType, final LabelParser parser) { - Preconditions.checkArgument(cType >= 0 && cType <= Values.UNSIGNED_BYTE_MAX_VALUE); - return this.handlers.registerParser(cType, parser); + public AutoCloseable registerLabelParser(final int ctype, final LabelParser parser) { + Preconditions.checkArgument(ctype >= 0 && ctype <= Values.UNSIGNED_BYTE_MAX_VALUE); + return this.handlers.registerParser(ctype, parser); } - public AutoCloseable registerLabelSerializer(final Class labelClass, final LabelSerializer serializer) { + public AutoCloseable registerLabelSerializer(final Class labelClass, + final LabelSerializer serializer) { return this.handlers.registerSerializer(labelClass, serializer); } @Override - public LabelType parseLabel(final int cType, final ByteBuf buffer) throws RSVPParsingException { - Preconditions.checkArgument(cType >= 0 && cType <= Values.UNSIGNED_BYTE_MAX_VALUE); - final LabelParser parser = this.handlers.getParser(cType); + public LabelType parseLabel(final int ctype, final ByteBuf buffer) throws RSVPParsingException { + Preconditions.checkArgument(ctype >= 0 && ctype <= Values.UNSIGNED_BYTE_MAX_VALUE); + final LabelParser parser = this.handlers.getParser(ctype); if (parser == null) { return null; } @@ -42,7 +43,8 @@ public final class SimpleLabelRegistry implements LabelRegistry { } @Override - public void serializeLabel(final boolean unidirectional, final boolean global, final LabelType label, final ByteBuf buffer) { + public void serializeLabel(final boolean unidirectional, final boolean global, final LabelType label, + final ByteBuf buffer) { final LabelSerializer serializer = this.handlers.getSerializer(label.getImplementedInterface()); if (serializer != null) { serializer.serializeLabel(unidirectional, global, label, buffer); diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRROSubobjectRegistry.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRROSubobjectRegistry.java index 28dbe13d89..3bc1bcb6c3 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRROSubobjectRegistry.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRROSubobjectRegistry.java @@ -21,7 +21,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yangtools.yang.binding.DataContainer; public final class SimpleRROSubobjectRegistry implements RROSubobjectRegistry { - private final HandlerRegistry handlers = new HandlerRegistry<>(); + private final HandlerRegistry handlers = + new HandlerRegistry<>(); public AutoCloseable registerSubobjectParser(final int subobjectType, final RROSubobjectParser parser) { Preconditions.checkArgument(subobjectType >= 0 && subobjectType <= Values.UNSIGNED_SHORT_MAX_VALUE); @@ -29,7 +30,7 @@ public final class SimpleRROSubobjectRegistry implements RROSubobjectRegistry { } public AutoCloseable registerSubobjectSerializer(final Class subobjectClass, - final RROSubobjectSerializer serializer) { + final RROSubobjectSerializer serializer) { return this.handlers.registerSerializer(subobjectClass, serializer); } @@ -45,7 +46,8 @@ public final class SimpleRROSubobjectRegistry implements RROSubobjectRegistry { @Override public void serializeSubobject(final SubobjectContainer subobject, final ByteBuf buffer) { - final RROSubobjectSerializer serializer = this.handlers.getSerializer(subobject.getSubobjectType().getImplementedInterface()); + final RROSubobjectSerializer serializer = this.handlers.getSerializer(subobject.getSubobjectType() + .getImplementedInterface()); if (serializer == null) { return; } diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContext.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContext.java index 34cf490e7c..4087ffafa8 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContext.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContext.java @@ -27,7 +27,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.SubobjectType; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.label.subobject.LabelType; -public class SimpleRSVPExtensionProviderContext extends SimpleRSVPExtensionConsumerContext implements RSVPExtensionProviderContext { +public class SimpleRSVPExtensionProviderContext extends SimpleRSVPExtensionConsumerContext implements + RSVPExtensionProviderContext { private static final int DEFAULT_MAXIMUM_CACHED_OBJECTS = 100000; @@ -37,8 +38,7 @@ public class SimpleRSVPExtensionProviderContext extends SimpleRSVPExtensionConsu public T getSharedReference(final T object) { final Cache cache = SimpleRSVPExtensionProviderContext.this.cacheRef.get(); - @SuppressWarnings("unchecked") - final T ret = (T) cache.getIfPresent(object); + @SuppressWarnings("unchecked") final T ret = (T) cache.getIfPresent(object); if (ret == null) { cache.put(object, object); return object; @@ -64,17 +64,19 @@ public class SimpleRSVPExtensionProviderContext extends SimpleRSVPExtensionConsu @Override - public void registerRsvpObjectParser(final int classNum, final int cType, final RSVPTeObjectParser parser) { - this.getRsvpRegistry().registerRsvpObjectParser(classNum, cType, parser); + public void registerRsvpObjectParser(final int classNum, final int ctype, final RSVPTeObjectParser parser) { + this.getRsvpRegistry().registerRsvpObjectParser(classNum, ctype, parser); } @Override - public void registerRsvpObjectSerializer(final Class objectClass, final RSVPTeObjectSerializer serializer) { + public void registerRsvpObjectSerializer(final Class objectClass, + final RSVPTeObjectSerializer serializer) { this.getRsvpRegistry().registerRsvpObjectSerializer(objectClass, serializer); } @Override - public AutoCloseable registerXROSubobjectSerializer(final Class subobjectClass, final XROSubobjectSerializer serializer) { + public AutoCloseable registerXROSubobjectSerializer(final Class subobjectClass, + final XROSubobjectSerializer serializer) { return this.getXROSubobjectHandlerRegistry().registerSubobjectSerializer(subobjectClass, serializer); } @@ -84,7 +86,9 @@ public class SimpleRSVPExtensionProviderContext extends SimpleRSVPExtensionConsu } @Override - public AutoCloseable registerRROSubobjectSerializer(final Class subobjectClass, final RROSubobjectSerializer serializer) { + public AutoCloseable registerRROSubobjectSerializer(final Class subobjectClass, + final RROSubobjectSerializer serializer) { return this.getRROSubobjectHandlerRegistry().registerSubobjectSerializer(subobjectClass, serializer); } @@ -94,7 +98,9 @@ public class SimpleRSVPExtensionProviderContext extends SimpleRSVPExtensionConsu } @Override - public AutoCloseable registerEROSubobjectSerializer(final Class subobjectClass, final EROSubobjectSerializer serializer) { + public AutoCloseable registerEROSubobjectSerializer(final Class + subobjectClass, final EROSubobjectSerializer serializer) { return this.getEROSubobjectHandlerRegistry().registerSubobjectSerializer(subobjectClass, serializer); } @@ -104,12 +110,13 @@ public class SimpleRSVPExtensionProviderContext extends SimpleRSVPExtensionConsu } @Override - public AutoCloseable registerLabelSerializer(final Class labelClass, final LabelSerializer serializer) { + public AutoCloseable registerLabelSerializer(final Class labelClass, + final LabelSerializer serializer) { return this.getLabelHandlerRegistry().registerLabelSerializer(labelClass, serializer); } @Override - public AutoCloseable registerLabelParser(final int cType, final LabelParser parser) { - return this.getLabelHandlerRegistry().registerLabelParser(cType, parser); + public AutoCloseable registerLabelParser(final int ctype, final LabelParser parser) { + return this.getLabelHandlerRegistry().registerLabelParser(ctype, parser); } } diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContextActivator.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContextActivator.java index b8e22aa9b0..120083cbee 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContextActivator.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContextActivator.java @@ -26,7 +26,7 @@ public class SimpleRSVPExtensionProviderContextActivator implements AutoCloseabl private final List extensionActivators; public SimpleRSVPExtensionProviderContextActivator(final RSVPExtensionProviderContext providerContext, - final List extensionActivators) { + final List extensionActivators) { this.providerContext = Preconditions.checkNotNull(providerContext); this.extensionActivators = Preconditions.checkNotNull(extensionActivators); } @@ -34,7 +34,7 @@ public class SimpleRSVPExtensionProviderContextActivator implements AutoCloseabl public void start() { LOG.debug("Starting {} RSVPExtensionProviderActivator instances", this.extensionActivators.size()); - for(final RSVPExtensionProviderActivator e : this.extensionActivators) { + for (final RSVPExtensionProviderActivator e : this.extensionActivators) { e.start(this.providerContext); } } @@ -43,7 +43,7 @@ public class SimpleRSVPExtensionProviderContextActivator implements AutoCloseabl public void close() { LOG.debug("Stopping {} RSVPExtensionProviderActivator instances", this.extensionActivators.size()); - for(final RSVPExtensionProviderActivator e : this.extensionActivators) { + for (final RSVPExtensionProviderActivator e : this.extensionActivators) { e.stop(); } } diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPObjectRegistry.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPObjectRegistry.java index 8bb582b126..1f8befeacf 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPObjectRegistry.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPObjectRegistry.java @@ -26,19 +26,21 @@ public final class SimpleRSVPObjectRegistry implements RSVPTeObjectRegistry { private final Table parserHandler = HashBasedTable.create(); private final Map, RSVPTeObjectSerializer> serializerHandler = new HashMap<>(); - public void registerRsvpObjectParser(final int classNum, final int cType, final RSVPTeObjectParser parser) { + public void registerRsvpObjectParser(final int classNum, final int ctype, final RSVPTeObjectParser parser) { Preconditions.checkArgument(classNum >= 0 && classNum <= Values.UNSIGNED_BYTE_MAX_VALUE); - Preconditions.checkArgument(cType >= 0 && cType <= Values.UNSIGNED_BYTE_MAX_VALUE); - this.parserHandler.put(classNum, cType, parser); + Preconditions.checkArgument(ctype >= 0 && ctype <= Values.UNSIGNED_BYTE_MAX_VALUE); + this.parserHandler.put(classNum, ctype, parser); } - public void registerRsvpObjectSerializer(final Class objectClass, final RSVPTeObjectSerializer serializer) { + public void registerRsvpObjectSerializer(final Class objectClass, + final RSVPTeObjectSerializer serializer) { this.serializerHandler.put(objectClass, serializer); } @Override - public RsvpTeObject parseRSPVTe(final int classNum, final int cType, final ByteBuf buffer) throws RSVPParsingException { - final RSVPTeObjectParser parser = this.parserHandler.get(classNum, cType); + public RsvpTeObject parseRSPVTe(final int classNum, final int ctype, final ByteBuf buffer) + throws RSVPParsingException { + final RSVPTeObjectParser parser = this.parserHandler.get(classNum, ctype); if (parser == null) { return null; } diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleXROSubobjectRegistry.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleXROSubobjectRegistry.java index 5ea933ab1b..658f3b0ac2 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleXROSubobjectRegistry.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleXROSubobjectRegistry.java @@ -21,7 +21,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yangtools.yang.binding.DataContainer; public class SimpleXROSubobjectRegistry implements XROSubobjectRegistry { - private final HandlerRegistry handlers = new HandlerRegistry<>(); + private final HandlerRegistry handlers = + new HandlerRegistry<>(); public AutoCloseable registerSubobjectParser(final int subobjectType, final XROSubobjectParser parser) { Preconditions.checkArgument(subobjectType >= 0 && subobjectType <= Values.UNSIGNED_SHORT_MAX_VALUE); @@ -29,12 +30,13 @@ public class SimpleXROSubobjectRegistry implements XROSubobjectRegistry { } public AutoCloseable registerSubobjectSerializer(final Class subobjectClass, - final XROSubobjectSerializer serializer) { + final XROSubobjectSerializer serializer) { return this.handlers.registerSerializer(subobjectClass, serializer); } @Override - public SubobjectContainer parseSubobject(final int type, final ByteBuf buffer, final boolean mandatory) throws RSVPParsingException { + public SubobjectContainer parseSubobject(final int type, final ByteBuf buffer, final boolean mandatory) + throws RSVPParsingException { Preconditions.checkArgument(type >= 0 && type <= Values.UNSIGNED_SHORT_MAX_VALUE); final XROSubobjectParser parser = this.handlers.getParser(type); if (parser == null) { @@ -45,7 +47,8 @@ public class SimpleXROSubobjectRegistry implements XROSubobjectRegistry { @Override public void serializeSubobject(final SubobjectContainer subobject, final ByteBuf buffer) { - final XROSubobjectSerializer serializer = this.handlers.getSerializer(subobject.getSubobjectType().getImplementedInterface()); + final XROSubobjectSerializer serializer = this.handlers.getSerializer(subobject.getSubobjectType() + .getImplementedInterface()); if (serializer == null) { return; } diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/AbstractRSVPObjectParser.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/AbstractRSVPObjectParser.java index adffa2af43..39ab88fadb 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/AbstractRSVPObjectParser.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/AbstractRSVPObjectParser.java @@ -27,11 +27,11 @@ public abstract class AbstractRSVPObjectParser implements RSVPTeObjectSerializer protected static final int TOKEN_BUCKET_TSPEC = 127; protected static final int FLAGS_SIZE = 8; - protected static void serializeAttributeHeader(final Integer valueLength, final short classNum, final short cType, - final ByteBuf byteAggregator) { + protected static void serializeAttributeHeader(final Integer valueLength, final short classNum, + final short ctype, final ByteBuf byteAggregator) { byteAggregator.writeShort(valueLength); byteAggregator.writeByte(classNum); - byteAggregator.writeByte(cType); + byteAggregator.writeByte(ctype); } protected static void writeAttributeFilter(final AttributeFilter attributeFilter, final ByteBuf body) { @@ -54,7 +54,7 @@ public abstract class AbstractRSVPObjectParser implements RSVPTeObjectSerializer localSerializeObject(rsvpTeObject, output); } - protected abstract void localSerializeObject(final RsvpTeObject rsvpTeObject, final ByteBuf output); + protected abstract void localSerializeObject(RsvpTeObject rsvpTeObject, ByteBuf output); - protected abstract RsvpTeObject localParseObject(final ByteBuf byteBuf) throws RSVPParsingException; + protected abstract RsvpTeObject localParseObject(ByteBuf byteBuf) throws RSVPParsingException; } diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonPathKeyParser.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonPathKeyParser.java index a16429741a..9cf96b08e7 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonPathKeyParser.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonPathKeyParser.java @@ -19,7 +19,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.explicit.route.subobjects.subobject.type.path.key._case.PathKeyBuilder; public class CommonPathKeyParser { - public static final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.explicit.route + public static org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.explicit.route .subobjects.subobject.type.path.key._case.PathKey parsePathKey(final int pceIdFLength, final ByteBuf buffer) { final int pathKey = buffer.readUnsignedShort(); final byte[] pceId = ByteArray.readBytes(buffer, pceIdFLength); @@ -29,8 +29,8 @@ public class CommonPathKeyParser { return pBuilder.build(); } - public static final ByteBuf serializePathKey(final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang - .rsvp.rev150820.explicit.route.subobjects.subobject.type.path.key._case.PathKey pk) { + public static ByteBuf serializePathKey(final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang + .rsvp.rev150820.explicit.route.subobjects.subobject.type.path.key._case.PathKey pk) { final ByteBuf body = Unpooled.buffer(); Preconditions.checkArgument(pk.getPathKey() != null, "PathKey is mandatory."); writeUnsignedShort(pk.getPathKey().getValue(), body); diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonUnnumberedInterfaceSubobjectParser.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonUnnumberedInterfaceSubobjectParser.java index bf8a74a49d..32f00f1373 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonUnnumberedInterfaceSubobjectParser.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/CommonUnnumberedInterfaceSubobjectParser.java @@ -8,28 +8,27 @@ package org.opendaylight.protocol.rsvp.parser.spi.subobjects; - -import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt; - import com.google.common.base.Preconditions; + import io.netty.buffer.ByteBuf; +import org.opendaylight.protocol.util.ByteBufWriteUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.UnnumberedCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.UnnumberedCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.unnumbered._case.Unnumbered; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.unnumbered._case.UnnumberedBuilder; public class CommonUnnumberedInterfaceSubobjectParser { - protected static final UnnumberedCase parseUnnumeredInterface(final ByteBuf buffer) { + protected static UnnumberedCase parseUnnumeredInterface(final ByteBuf buffer) { final UnnumberedBuilder ubuilder = new UnnumberedBuilder(); ubuilder.setRouterId(buffer.readUnsignedInt()); ubuilder.setInterfaceId(buffer.readUnsignedInt()); return new UnnumberedCaseBuilder().setUnnumbered(ubuilder.build()).build(); } - protected static final void serializeUnnumeredInterface(final Unnumbered unnumbered, final ByteBuf body) { + protected static void serializeUnnumeredInterface(final Unnumbered unnumbered, final ByteBuf body) { Preconditions.checkArgument(unnumbered.getRouterId() != null, "RouterId is mandatory."); - writeUnsignedInt(unnumbered.getRouterId(), body); + ByteBufWriteUtil.writeUnsignedInt(unnumbered.getRouterId(), body); Preconditions.checkArgument(unnumbered.getInterfaceId() != null, "InterfaceId is mandatory."); - writeUnsignedInt(unnumbered.getInterfaceId(), body); + ByteBufWriteUtil.writeUnsignedInt(unnumbered.getInterfaceId(), body); } } diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/EROSubobjectListParser.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/EROSubobjectListParser.java index 2651502a1f..80d7f92fec 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/EROSubobjectListParser.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/EROSubobjectListParser.java @@ -8,8 +8,8 @@ package org.opendaylight.protocol.rsvp.parser.spi.subobjects; - import com.google.common.base.Preconditions; + import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; import java.util.ArrayList; @@ -35,8 +35,10 @@ public abstract class EROSubobjectListParser extends AbstractRSVPObjectParser { Preconditions.checkArgument(buffer != null, "Array of bytes is mandatory. Can't be null."); final List subs = new ArrayList<>(); while (buffer.isReadable()) { - final boolean loose = ((buffer.getUnsignedByte(buffer.readerIndex()) & (1 << Values.FIRST_BIT_OFFSET)) != 0) ? true : false; - final int type = (buffer.readUnsignedByte() & Values.BYTE_MAX_VALUE_BYTES) & ~(1 << Values.FIRST_BIT_OFFSET); + final boolean loose = (buffer.getUnsignedByte(buffer.readerIndex()) & (1 << Values.FIRST_BIT_OFFSET)) + != 0; + final int type = (buffer.readUnsignedByte() & Values.BYTE_MAX_VALUE_BYTES) & ~(1 << Values + .FIRST_BIT_OFFSET); final int length = buffer.readUnsignedByte() - HEADER_LENGTH; if (length > buffer.readableBytes()) { throw new RSVPParsingException("Wrong length specified. Passed: " + length + "; Expected: <= " @@ -55,7 +57,8 @@ public abstract class EROSubobjectListParser extends AbstractRSVPObjectParser { } public final void serializeList(final List subobjects, final ByteBuf buffer) { - Preconditions.checkArgument(subobjects != null && !subobjects.isEmpty(), "RRO must contain at least one subobject."); + Preconditions.checkArgument(subobjects != null && !subobjects.isEmpty(), + "RRO must contain at least one subobject."); for (final SubobjectContainer subobject : subobjects) { this.subobjReg.serializeSubobject(subobject, buffer); } diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/RROSubobjectListParser.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/RROSubobjectListParser.java index 4ff8fe2c36..842c6138c4 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/RROSubobjectListParser.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/RROSubobjectListParser.java @@ -29,7 +29,8 @@ public abstract class RROSubobjectListParser extends AbstractRSVPObjectParser { } public List parseList(final ByteBuf buffer) throws RSVPParsingException { - Preconditions.checkArgument(buffer != null && buffer.isReadable(), "Array of bytes is mandatory. Can't be null or empty."); + Preconditions.checkArgument(buffer != null && buffer.isReadable(), + "Array of bytes is mandatory. Can't be null or empty."); final List subs = new ArrayList<>(); while (buffer.isReadable()) { final int type = buffer.readUnsignedByte(); @@ -51,7 +52,8 @@ public abstract class RROSubobjectListParser extends AbstractRSVPObjectParser { } public final void serializeList(final List subobjects, final ByteBuf buffer) { - Preconditions.checkArgument(subobjects != null && !subobjects.isEmpty(), "RRO must contain at least one subobject."); + Preconditions.checkArgument(subobjects != null && !subobjects.isEmpty(), + "RRO must contain at least one subobject."); for (final SubobjectContainer subobject : subobjects) { this.subobjReg.serializeSubobject(subobject, buffer); } diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/XROSubobjectListParser.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/XROSubobjectListParser.java index 89a7d9a5f3..da5b254f6e 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/XROSubobjectListParser.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/XROSubobjectListParser.java @@ -33,11 +33,14 @@ public abstract class XROSubobjectListParser extends AbstractRSVPObjectParser { public List parseList(final ByteBuf byteBuf) throws RSVPParsingException { final List subs = new ArrayList<>(); while (byteBuf.isReadable()) { - final boolean mandatory = ((byteBuf.getUnsignedByte(byteBuf.readerIndex()) & (1 << Values.FIRST_BIT_OFFSET)) != 0) ? true : false; - final int type = UnsignedBytes.checkedCast((byteBuf.readUnsignedByte() & Values.BYTE_MAX_VALUE_BYTES) & ~(1 << Values.FIRST_BIT_OFFSET)); + final boolean mandatory = (byteBuf.getUnsignedByte(byteBuf.readerIndex()) & (1 << Values + .FIRST_BIT_OFFSET)) != 0; + final int type = UnsignedBytes.checkedCast((byteBuf.readUnsignedByte() & Values.BYTE_MAX_VALUE_BYTES) & ~ + (1 << Values.FIRST_BIT_OFFSET)); final int length = byteBuf.readUnsignedByte() - HEADER_LENGHT; if (length > byteBuf.readableBytes()) { - throw new RSVPParsingException("Wrong length specified. Passed: " + length + "; Expected: <= " + byteBuf.readableBytes()); + throw new RSVPParsingException("Wrong length specified. Passed: " + length + + "; Expected: <= " + byteBuf.readableBytes()); } LOG.debug("Attempt to parse subobject from bytes: {}", ByteBufUtil.hexDump(byteBuf)); final SubobjectContainer sub = this.subobjReg.parseSubobject(type, byteBuf.readSlice(length), mandatory); @@ -53,7 +56,8 @@ public abstract class XROSubobjectListParser extends AbstractRSVPObjectParser { } public void serializeList(final List subobjects, final ByteBuf buffer) { - Preconditions.checkArgument(subobjects != null && !subobjects.isEmpty(), "XRO must contain at least one subobject."); + Preconditions.checkArgument(subobjects != null && !subobjects.isEmpty(), + "XRO must contain at least one subobject."); for (final SubobjectContainer subobject : subobjects) { this.subobjReg.serializeSubobject(subobject, buffer); } -- 2.36.6