From f12edd567505b7160bc98b82ebabd77a614137ba Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 29 Nov 2013 14:02:29 +0100 Subject: [PATCH] Squash more sonar warnings Change-Id: I401e595fccebf75b20281f1f688fdc6d79e383ed Signed-off-by: Robert Varga --- .../spi/BGPExtensionConsumerActivator.java | 4 +-- ...viceLoaderBGPExtensionProviderContext.java | 2 +- .../protocol/bgp/rib/impl/BGP.java | 2 +- .../bgp/rib/spi/AdjRIBsInFactory.java | 2 +- .../spi/RIBExtensionConsumerActivator.java | 4 +-- .../rib/spi/RIBExtensionConsumerContext.java | 4 +-- .../spi/RIBExtensionProviderActivator.java | 4 +-- .../rib/spi/RIBExtensionProviderContext.java | 3 +- ...viceLoaderRIBExtensionConsumerContext.java | 6 ++-- .../provider/AbstractTopologyBuilder.java | 5 ++-- .../bgp/topology/provider/LocRIBListener.java | 2 +- .../framework/ProtocolMessageFactory.java | 4 +-- .../framework/SessionListenerFactory.java | 2 +- .../framework/SessionNegotiatorFactory.java | 2 +- .../protocol/pcep/PCEPDispatcher.java | 2 +- .../protocol/pcep/PCEPSession.java | 6 ++-- .../pcep/PCEPSessionProposalFactory.java | 2 +- .../pcep/spi/EROSubobjectHandlerRegistry.java | 5 ++-- .../protocol/pcep/spi/EROSubobjectParser.java | 2 +- .../pcep/spi/EROSubobjectSerializer.java | 5 ++-- .../pcep/spi/LabelHandlerRegistry.java | 5 ++-- .../protocol/pcep/spi/LabelParser.java | 2 +- .../protocol/pcep/spi/LabelSerializer.java | 6 ++-- .../pcep/spi/MessageHandlerRegistry.java | 4 +-- .../protocol/pcep/spi/MessageSerializer.java | 5 ++-- .../pcep/spi/ObjectHandlerRegistry.java | 4 +-- .../protocol/pcep/spi/ObjectParser.java | 3 +- .../protocol/pcep/spi/ObjectSerializer.java | 6 ++-- .../spi/PCEPExtensionConsumerActivator.java | 4 +-- .../spi/PCEPExtensionConsumerContext.java | 16 +++++------ .../spi/PCEPExtensionProviderActivator.java | 4 +-- .../spi/PCEPExtensionProviderContext.java | 28 +++++++++---------- .../pcep/spi/RROSubobjectHandlerRegistry.java | 5 ++-- .../protocol/pcep/spi/RROSubobjectParser.java | 2 +- .../pcep/spi/RROSubobjectSerializer.java | 4 +-- .../protocol/pcep/spi/TlvHandlerRegistry.java | 4 +-- .../protocol/pcep/spi/TlvParser.java | 2 +- .../protocol/pcep/spi/TlvSerializer.java | 4 +-- .../pcep/spi/XROSubobjectHandlerRegistry.java | 5 ++-- .../protocol/pcep/spi/XROSubobjectParser.java | 2 +- .../pcep/spi/XROSubobjectSerializer.java | 4 +-- .../AbstractExtensionProviderActivator.java | 4 +-- 42 files changed, 90 insertions(+), 101 deletions(-) diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BGPExtensionConsumerActivator.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BGPExtensionConsumerActivator.java index 882832d86e..dafa0b786f 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BGPExtensionConsumerActivator.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/BGPExtensionConsumerActivator.java @@ -8,6 +8,6 @@ package org.opendaylight.protocol.bgp.parser.spi; public interface BGPExtensionConsumerActivator { - void start(BGPExtensionConsumerContext context) throws Exception; - void stop() throws Exception; + void start(BGPExtensionConsumerContext context); + void stop(); } \ No newline at end of file diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/ServiceLoaderBGPExtensionProviderContext.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/ServiceLoaderBGPExtensionProviderContext.java index 57a8a58afd..2a35d08bd2 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/ServiceLoaderBGPExtensionProviderContext.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/ServiceLoaderBGPExtensionProviderContext.java @@ -18,7 +18,7 @@ public final class ServiceLoaderBGPExtensionProviderContext { } - public static BGPExtensionConsumerContext createConsumerContext() throws Exception { + public static BGPExtensionConsumerContext createConsumerContext() { final BGPExtensionProviderContext ctx = new SimpleBGPExtensionProviderContext(); final ServiceLoader loader = ServiceLoader.load(BGPExtensionProviderActivator.class); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGP.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGP.java index e3af5d066c..65fe5eabbf 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGP.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGP.java @@ -28,6 +28,6 @@ public interface BGP { * @throws IllegalStateException if there is already a listener registered * @return ListenerRegistration */ - public ListenerRegistration registerUpdateListener(BGPSessionListener listener, + ListenerRegistration registerUpdateListener(BGPSessionListener listener, ReconnectStrategyFactory tcpStrategyFactory, ReconnectStrategy sessionStrategy); } diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AdjRIBsInFactory.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AdjRIBsInFactory.java index a6a1388f66..cc49cabe96 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AdjRIBsInFactory.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AdjRIBsInFactory.java @@ -14,5 +14,5 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.TablesKey; public interface AdjRIBsInFactory { - public AdjRIBsIn createAdjRIBsIn(final DataModificationTransaction trans, final Comparator comparator, final TablesKey key); + AdjRIBsIn createAdjRIBsIn(DataModificationTransaction trans, Comparator comparator, TablesKey key); } diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionConsumerActivator.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionConsumerActivator.java index 73b4330b2d..03f67220c4 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionConsumerActivator.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionConsumerActivator.java @@ -8,6 +8,6 @@ package org.opendaylight.protocol.bgp.rib.spi; public interface RIBExtensionConsumerActivator { - public void startRIBExtensionConsumer(RIBExtensionConsumerContext context) throws Exception; - public void stopRIBExtensionConsumer(RIBExtensionConsumerContext context) throws Exception; + void startRIBExtensionConsumer(RIBExtensionConsumerContext context); + void stopRIBExtensionConsumer(RIBExtensionConsumerContext context); } \ No newline at end of file diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionConsumerContext.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionConsumerContext.java index 95fc88c536..8cf093484b 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionConsumerContext.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionConsumerContext.java @@ -18,7 +18,5 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type * AdjRIBsIn instances, which handle the specifics. */ public interface RIBExtensionConsumerContext { - public AdjRIBsInFactory getAdjRIBsInFactory(Class afi, - Class safi); - + AdjRIBsInFactory getAdjRIBsInFactory(Class afi, Class safi); } \ No newline at end of file diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionProviderActivator.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionProviderActivator.java index 7c7e0de15e..fb2c1d3885 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionProviderActivator.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionProviderActivator.java @@ -8,6 +8,6 @@ package org.opendaylight.protocol.bgp.rib.spi; public interface RIBExtensionProviderActivator { - public void startRIBExtensionProvider(RIBExtensionProviderContext context); - public void stopRIBExtensionProvider(); + void startRIBExtensionProvider(RIBExtensionProviderContext context); + void stopRIBExtensionProvider(); } diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionProviderContext.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionProviderContext.java index 4d3b8ac442..fd1187e428 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionProviderContext.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBExtensionProviderContext.java @@ -26,6 +26,5 @@ public interface RIBExtensionProviderContext extends RIBExtensionConsumerContext * @param factory AdjRIBsInFactory * @return Registration handle. Call its close() method to remove it. */ - public AutoCloseable registerAdjRIBsInFactory(Class afi, - Class safi, AdjRIBsInFactory factory); + AutoCloseable registerAdjRIBsInFactory(Class afi, Class safi, AdjRIBsInFactory factory); } \ No newline at end of file diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/ServiceLoaderRIBExtensionConsumerContext.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/ServiceLoaderRIBExtensionConsumerContext.java index 1943a88067..e2251c31b4 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/ServiceLoaderRIBExtensionConsumerContext.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/ServiceLoaderRIBExtensionConsumerContext.java @@ -29,7 +29,7 @@ public final class ServiceLoaderRIBExtensionConsumerContext extends SimpleRIBExt } } - public static ServiceLoaderRIBExtensionConsumerContext createConsumerContext() throws Exception { + public static ServiceLoaderRIBExtensionConsumerContext createConsumerContext() { final ServiceLoader loader = ServiceLoader.load(RIBExtensionProviderActivator.class); final ServiceLoaderRIBExtensionConsumerContext ctx = new ServiceLoaderRIBExtensionConsumerContext(loader); @@ -37,11 +37,11 @@ public final class ServiceLoaderRIBExtensionConsumerContext extends SimpleRIBExt } @Override - public void close() throws Exception { + public void close() { for (RIBExtensionProviderActivator a : loader) { try { a.stopRIBExtensionProvider(); - } catch (Exception e) { + } catch (RuntimeException e) { LOG.warn("Stopping activator {} failed", a, e); } } diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java index 687397eb9b..bc26bcb4f7 100644 --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java @@ -10,6 +10,7 @@ package org.opendaylight.bgpcep.bgp.topology.provider; import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.concurrent.ExecutionException; import org.opendaylight.bgpcep.topology.TopologyReference; import org.opendaylight.controller.md.sal.common.api.TransactionStatus; @@ -113,7 +114,7 @@ public abstract class AbstractTopologyBuilder implements AutoCl } @Override - public final void close() throws Exception { + public final void close() throws InterruptedException, ExecutionException { final DataModificationTransaction trans = dataProvider.beginTransaction(); trans.removeOperationalData(getInstanceIdentifier()); trans.commit().get(); @@ -125,7 +126,7 @@ public abstract class AbstractTopologyBuilder implements AutoCl try { onLocRIBChange(trans, change); - } catch (Exception e) { + } catch (RuntimeException e) { LOG.info("Data change {} was not completely propagated to listener {}", change, this, e); } diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LocRIBListener.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LocRIBListener.java index 199d8ff7bd..b584ded111 100644 --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LocRIBListener.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LocRIBListener.java @@ -24,6 +24,6 @@ public interface LocRIBListener extends EventListener { * @param depth Subscription path depth. * @throws Exception throw it if you must. If you can handle it, please do so. */ - public void onLocRIBChange(DataModification, DataObject> trans, + void onLocRIBChange(DataModification, DataObject> trans, DataChangeEvent, DataObject> event) throws Exception; } diff --git a/framework/src/main/java/org/opendaylight/protocol/framework/ProtocolMessageFactory.java b/framework/src/main/java/org/opendaylight/protocol/framework/ProtocolMessageFactory.java index 2b898d51f7..b24ab01774 100644 --- a/framework/src/main/java/org/opendaylight/protocol/framework/ProtocolMessageFactory.java +++ b/framework/src/main/java/org/opendaylight/protocol/framework/ProtocolMessageFactory.java @@ -29,7 +29,7 @@ public interface ProtocolMessageFactory { * @throws DeserializerException if some parsing error occurs * @throws DocumentedException if some documented error occurs */ - public T parse(final byte[] bytes) throws DeserializerException, DocumentedException; + T parse(byte[] bytes) throws DeserializerException, DocumentedException; /** * Serializes protocol specific message to byte array. @@ -37,5 +37,5 @@ public interface ProtocolMessageFactory { * @param msg message to be serialized. * @return byte array resulting message */ - public byte[] put(final T msg); + byte[] put(T msg); } diff --git a/framework/src/main/java/org/opendaylight/protocol/framework/SessionListenerFactory.java b/framework/src/main/java/org/opendaylight/protocol/framework/SessionListenerFactory.java index 5b5c5fd203..56f887ea5a 100644 --- a/framework/src/main/java/org/opendaylight/protocol/framework/SessionListenerFactory.java +++ b/framework/src/main/java/org/opendaylight/protocol/framework/SessionListenerFactory.java @@ -18,5 +18,5 @@ public interface SessionListenerFactory> { * Returns one session listener * @return specific session listener */ - public T getSessionListener(); + T getSessionListener(); } diff --git a/framework/src/main/java/org/opendaylight/protocol/framework/SessionNegotiatorFactory.java b/framework/src/main/java/org/opendaylight/protocol/framework/SessionNegotiatorFactory.java index 6578c8e28d..58a9e472d9 100644 --- a/framework/src/main/java/org/opendaylight/protocol/framework/SessionNegotiatorFactory.java +++ b/framework/src/main/java/org/opendaylight/protocol/framework/SessionNegotiatorFactory.java @@ -24,5 +24,5 @@ public interface SessionNegotiatorFactory, L ext * @param promise Promise to be notified * @return new negotiator instance */ - public SessionNegotiator getSessionNegotiator(SessionListenerFactory factory, Channel channel, Promise promise); + SessionNegotiator getSessionNegotiator(SessionListenerFactory factory, Channel channel, Promise promise); } diff --git a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPDispatcher.java b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPDispatcher.java index 32f3edd643..ca9fb73c08 100644 --- a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPDispatcher.java +++ b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPDispatcher.java @@ -24,5 +24,5 @@ public interface PCEPDispatcher { * @param listenerFactory to create listeners for clients * @return instance of PCEPServer */ - public ChannelFuture createServer(final InetSocketAddress address, final SessionListenerFactory listenerFactory); + ChannelFuture createServer(InetSocketAddress address, SessionListenerFactory listenerFactory); } diff --git a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSession.java b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSession.java index da054ca7dd..27516a85dc 100644 --- a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSession.java +++ b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSession.java @@ -33,9 +33,9 @@ public interface PCEPSession extends ProtocolSession { */ Future sendMessage(Message message); - public void close(TerminationReason reason); + void close(TerminationReason reason); - public Tlvs getRemoteTlvs(); + Tlvs getRemoteTlvs(); - public InetAddress getRemoteAddress(); + InetAddress getRemoteAddress(); } diff --git a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSessionProposalFactory.java b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSessionProposalFactory.java index cadcc3abc2..d31eb5a725 100644 --- a/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSessionProposalFactory.java +++ b/pcep/api/src/main/java/org/opendaylight/protocol/pcep/PCEPSessionProposalFactory.java @@ -24,5 +24,5 @@ public interface PCEPSessionProposalFactory { * @param sessionId is used for creation of PCEPOpenObject * @return specific session proposal */ - public Open getSessionProposal(InetSocketAddress address, int sessionId); + Open getSessionProposal(InetSocketAddress address, int sessionId); } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/EROSubobjectHandlerRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/EROSubobjectHandlerRegistry.java index f7ebf51ac5..f70c72aa37 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/EROSubobjectHandlerRegistry.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/EROSubobjectHandlerRegistry.java @@ -10,7 +10,6 @@ package org.opendaylight.protocol.pcep.spi; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.basic.explicit.route.subobjects.SubobjectType; public interface EROSubobjectHandlerRegistry { - public EROSubobjectParser getSubobjectParser(int subobjectType); - - public EROSubobjectSerializer getSubobjectSerializer(SubobjectType subobject); + EROSubobjectParser getSubobjectParser(int subobjectType); + EROSubobjectSerializer getSubobjectSerializer(SubobjectType subobject); } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/EROSubobjectParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/EROSubobjectParser.java index 60fa18902d..ab2c453872 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/EROSubobjectParser.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/EROSubobjectParser.java @@ -10,5 +10,5 @@ package org.opendaylight.protocol.pcep.spi; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.explicit.route.object.ero.Subobjects; public interface EROSubobjectParser { - public Subobjects parseSubobject(final byte[] buffer, final boolean loose) throws PCEPDeserializerException; + Subobjects parseSubobject(byte[] buffer, boolean loose) throws PCEPDeserializerException; } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/EROSubobjectSerializer.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/EROSubobjectSerializer.java index d0d084ac2f..c4084c215c 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/EROSubobjectSerializer.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/EROSubobjectSerializer.java @@ -10,9 +10,8 @@ package org.opendaylight.protocol.pcep.spi; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.explicit.route.object.ero.Subobjects; public interface EROSubobjectSerializer { - @Deprecated - public int getType(); + int getType(); - public byte[] serializeSubobject(Subobjects subobject); + byte[] serializeSubobject(Subobjects subobject); } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/LabelHandlerRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/LabelHandlerRegistry.java index 967352abea..9fd7c5bc7b 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/LabelHandlerRegistry.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/LabelHandlerRegistry.java @@ -10,7 +10,6 @@ package org.opendaylight.protocol.pcep.spi; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.label.subobject.LabelType; public interface LabelHandlerRegistry { - public LabelParser getLabelParser(int cType); - - public LabelSerializer getLabelSerializer(LabelType label); + LabelParser getLabelParser(int cType); + LabelSerializer getLabelSerializer(LabelType label); } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/LabelParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/LabelParser.java index dad8b39931..0cae78c1ff 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/LabelParser.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/LabelParser.java @@ -10,5 +10,5 @@ package org.opendaylight.protocol.pcep.spi; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.label.subobject.LabelType; public interface LabelParser { - public LabelType parseLabel(final byte[] buffer) throws PCEPDeserializerException; + LabelType parseLabel(byte[] buffer) throws PCEPDeserializerException; } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/LabelSerializer.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/LabelSerializer.java index 11024bf258..90f4df8092 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/LabelSerializer.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/LabelSerializer.java @@ -10,9 +10,7 @@ package org.opendaylight.protocol.pcep.spi; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.label.subobject.LabelType; public interface LabelSerializer { - @Deprecated - public int getType(); - - public byte[] serializeLabel(LabelType subobject); + int getType(); + byte[] serializeLabel(LabelType subobject); } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/MessageHandlerRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/MessageHandlerRegistry.java index e9a5130092..4bda8a40a3 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/MessageHandlerRegistry.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/MessageHandlerRegistry.java @@ -10,6 +10,6 @@ package org.opendaylight.protocol.pcep.spi; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message; public interface MessageHandlerRegistry { - public MessageParser getMessageParser(int messageType); - public MessageSerializer getMessageSerializer(Message message); + MessageParser getMessageParser(int messageType); + MessageSerializer getMessageSerializer(Message message); } 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 edccf92405..fd0e450b35 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 @@ -12,8 +12,7 @@ import io.netty.buffer.ByteBuf; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message; public interface MessageSerializer { - public void serializeMessage(Message message, ByteBuf buffer); - @Deprecated - public int getMessageType(); + int getMessageType(); + void serializeMessage(Message message, ByteBuf buffer); } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectHandlerRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectHandlerRegistry.java index 0d5ca0c838..7933b36b73 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectHandlerRegistry.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectHandlerRegistry.java @@ -10,6 +10,6 @@ package org.opendaylight.protocol.pcep.spi; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Object; public interface ObjectHandlerRegistry { - public ObjectParser getObjectParser(int objectClass, int objectType); - public ObjectSerializer getObjectSerializer(Object object); + ObjectParser getObjectParser(int objectClass, int objectType); + ObjectSerializer getObjectSerializer(Object object); } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectParser.java index 66e4be5180..93507c4219 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectParser.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectParser.java @@ -11,6 +11,5 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.ObjectHeader; public interface ObjectParser { - - public Object parseObject(final ObjectHeader header, final byte[] buffer) throws PCEPDeserializerException; + Object parseObject(ObjectHeader header, byte[] buffer) throws PCEPDeserializerException; } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectSerializer.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectSerializer.java index d5ca955fb5..64ace106cc 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectSerializer.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectSerializer.java @@ -12,10 +12,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ public interface ObjectSerializer { @Deprecated - public int getObjectType(); + int getObjectType(); @Deprecated - public int getObjectClass(); + int getObjectClass(); - public byte[] serializeObject(Object object); + byte[] serializeObject(Object object); } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionConsumerActivator.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionConsumerActivator.java index 8759908a8d..f3658a15f3 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionConsumerActivator.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionConsumerActivator.java @@ -8,6 +8,6 @@ package org.opendaylight.protocol.pcep.spi; public interface PCEPExtensionConsumerActivator { - public void start(PCEPExtensionConsumerContext context); - public void stop(); + void start(PCEPExtensionConsumerContext context); + void stop(); } \ No newline at end of file diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionConsumerContext.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionConsumerContext.java index f4db40b8e0..8a0f74d659 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionConsumerContext.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionConsumerContext.java @@ -9,17 +9,17 @@ package org.opendaylight.protocol.pcep.spi; public interface PCEPExtensionConsumerContext { - public LabelHandlerRegistry getLabelHandlerRegistry(); - - public MessageHandlerRegistry getMessageHandlerRegistry(); + LabelHandlerRegistry getLabelHandlerRegistry(); - public ObjectHandlerRegistry getObjectHandlerRegistry(); + MessageHandlerRegistry getMessageHandlerRegistry(); - public EROSubobjectHandlerRegistry getEROSubobjectHandlerRegistry(); + ObjectHandlerRegistry getObjectHandlerRegistry(); - public RROSubobjectHandlerRegistry getRROSubobjectHandlerRegistry(); + EROSubobjectHandlerRegistry getEROSubobjectHandlerRegistry(); - public XROSubobjectHandlerRegistry getXROSubobjectHandlerRegistry(); + RROSubobjectHandlerRegistry getRROSubobjectHandlerRegistry(); - public TlvHandlerRegistry getTlvHandlerRegistry(); + XROSubobjectHandlerRegistry getXROSubobjectHandlerRegistry(); + + TlvHandlerRegistry getTlvHandlerRegistry(); } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionProviderActivator.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionProviderActivator.java index d2e4e653e9..ce028254d3 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionProviderActivator.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionProviderActivator.java @@ -8,6 +8,6 @@ package org.opendaylight.protocol.pcep.spi; public interface PCEPExtensionProviderActivator { - public void start(PCEPExtensionProviderContext context) throws Exception; - public void stop() throws Exception; + void start(PCEPExtensionProviderContext context); + void stop(); } \ No newline at end of file diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionProviderContext.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionProviderContext.java index 9e78e5115a..18cbdf2500 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionProviderContext.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PCEPExtensionProviderContext.java @@ -14,33 +14,33 @@ 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.rev130820.label.subobject.LabelType; public interface PCEPExtensionProviderContext extends PCEPExtensionConsumerContext { - public AutoCloseable registerLabelSerializer(Class labelClass, LabelSerializer serializer); + AutoCloseable registerLabelSerializer(Class labelClass, LabelSerializer serializer); - public AutoCloseable registerLabelParser(int cType, LabelParser parser); + AutoCloseable registerLabelParser(int cType, LabelParser parser); - public AutoCloseable registerEROSubobjectParser(int subobjectType, EROSubobjectParser parser); + AutoCloseable registerEROSubobjectParser(int subobjectType, EROSubobjectParser parser); - public AutoCloseable registerEROSubobjectSerializer(Class subobjectClass, EROSubobjectSerializer serializer); + AutoCloseable registerEROSubobjectSerializer(Class subobjectClass, EROSubobjectSerializer serializer); - public AutoCloseable registerMessageParser(int messageType, MessageParser parser); + AutoCloseable registerMessageParser(int messageType, MessageParser parser); - public AutoCloseable registerMessageSerializer(Class msgClass, MessageSerializer serializer); + AutoCloseable registerMessageSerializer(Class msgClass, MessageSerializer serializer); - public AutoCloseable registerObjectParser(int objectClass, int objectType, ObjectParser parser); + AutoCloseable registerObjectParser(int objectClass, int objectType, ObjectParser parser); - public AutoCloseable registerObjectSerializer(Class objClass, ObjectSerializer serializer); + AutoCloseable registerObjectSerializer(Class objClass, ObjectSerializer serializer); - public AutoCloseable registerRROSubobjectParser(int subobjectType, RROSubobjectParser parser); + AutoCloseable registerRROSubobjectParser(int subobjectType, RROSubobjectParser parser); - public AutoCloseable registerRROSubobjectSerializer( + AutoCloseable registerRROSubobjectSerializer( Class subobjectClass, RROSubobjectSerializer serializer); - public AutoCloseable registerTlvSerializer(Class tlvClass, TlvSerializer serializer); + AutoCloseable registerTlvSerializer(Class tlvClass, TlvSerializer serializer); - public AutoCloseable registerTlvParser(int tlvType, TlvParser parser); + AutoCloseable registerTlvParser(int tlvType, TlvParser parser); - public AutoCloseable registerXROSubobjectSerializer(Class subobjectClass, XROSubobjectSerializer serializer); + AutoCloseable registerXROSubobjectSerializer(Class subobjectClass, XROSubobjectSerializer serializer); - public AutoCloseable registerXROSubobjectParser(int subobjectType, XROSubobjectParser parser); + AutoCloseable registerXROSubobjectParser(int subobjectType, XROSubobjectParser parser); } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/RROSubobjectHandlerRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/RROSubobjectHandlerRegistry.java index 28fa344c0c..1c442672ad 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/RROSubobjectHandlerRegistry.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/RROSubobjectHandlerRegistry.java @@ -10,7 +10,6 @@ package org.opendaylight.protocol.pcep.spi; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.record.route.subobjects.SubobjectType; public interface RROSubobjectHandlerRegistry { - public RROSubobjectParser getSubobjectParser(int subobjectType); - - public RROSubobjectSerializer getSubobjectSerializer(SubobjectType subobject); + RROSubobjectParser getSubobjectParser(int subobjectType); + RROSubobjectSerializer getSubobjectSerializer(SubobjectType subobject); } 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 1d1dd39509..de8b0e9c35 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 @@ -10,5 +10,5 @@ package org.opendaylight.protocol.pcep.spi; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.reported.route.object.rro.Subobjects; public interface RROSubobjectParser { - public Subobjects parseSubobject(final byte[] buffer) throws PCEPDeserializerException; + Subobjects parseSubobject(byte[] buffer) throws PCEPDeserializerException; } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/RROSubobjectSerializer.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/RROSubobjectSerializer.java index 2b82dc2ff3..b1efa68cc6 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/RROSubobjectSerializer.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/RROSubobjectSerializer.java @@ -12,7 +12,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ public interface RROSubobjectSerializer { @Deprecated - public int getType(); + int getType(); - public byte[] serializeSubobject(Subobjects subobject); + byte[] serializeSubobject(Subobjects subobject); } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/TlvHandlerRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/TlvHandlerRegistry.java index 6274f08111..24c296dec8 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/TlvHandlerRegistry.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/TlvHandlerRegistry.java @@ -10,6 +10,6 @@ package org.opendaylight.protocol.pcep.spi; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Tlv; public interface TlvHandlerRegistry { - public TlvParser getTlvParser(int tlvType); - public TlvSerializer getTlvSerializer(Tlv tlv); + TlvParser getTlvParser(int tlvType); + TlvSerializer getTlvSerializer(Tlv tlv); } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/TlvParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/TlvParser.java index d3ceb18d81..beb6609068 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/TlvParser.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/TlvParser.java @@ -10,5 +10,5 @@ package org.opendaylight.protocol.pcep.spi; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Tlv; public interface TlvParser { - public Tlv parseTlv(final byte[] buffer) throws PCEPDeserializerException; + Tlv parseTlv(byte[] buffer) throws PCEPDeserializerException; } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/TlvSerializer.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/TlvSerializer.java index cfe9c94c5d..5cfce942b8 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/TlvSerializer.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/TlvSerializer.java @@ -12,7 +12,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ public interface TlvSerializer { @Deprecated - public int getType(); + int getType(); - public byte[] serializeTlv(Tlv tlv); + byte[] serializeTlv(Tlv tlv); } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/XROSubobjectHandlerRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/XROSubobjectHandlerRegistry.java index 3ad96724de..b8f08c067a 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/XROSubobjectHandlerRegistry.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/XROSubobjectHandlerRegistry.java @@ -10,7 +10,6 @@ package org.opendaylight.protocol.pcep.spi; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev130820.basic.explicit.route.subobjects.SubobjectType; public interface XROSubobjectHandlerRegistry { - public XROSubobjectParser getSubobjectParser(int subobjectType); - - public XROSubobjectSerializer getSubobjectSerializer(SubobjectType subobject); + XROSubobjectParser getSubobjectParser(int subobjectType); + XROSubobjectSerializer getSubobjectSerializer(SubobjectType subobject); } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/XROSubobjectParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/XROSubobjectParser.java index 1872bb05b9..17abf309e5 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/XROSubobjectParser.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/XROSubobjectParser.java @@ -10,5 +10,5 @@ package org.opendaylight.protocol.pcep.spi; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.exclude.route.object.xro.Subobjects; public interface XROSubobjectParser { - public Subobjects parseSubobject(final byte[] buffer, final boolean mandatory) throws PCEPDeserializerException; + Subobjects parseSubobject(byte[] buffer, boolean mandatory) throws PCEPDeserializerException; } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/XROSubobjectSerializer.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/XROSubobjectSerializer.java index 5b32dd9912..50ffcb31c8 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/XROSubobjectSerializer.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/XROSubobjectSerializer.java @@ -12,7 +12,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ public interface XROSubobjectSerializer { @Deprecated - public int getType(); + int getType(); - public byte[] serializeSubobject(Subobjects subobject); + byte[] serializeSubobject(Subobjects subobject); } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/AbstractExtensionProviderActivator.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/AbstractExtensionProviderActivator.java index 7768d6b45c..e4f7c1a2b9 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/AbstractExtensionProviderActivator.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/AbstractExtensionProviderActivator.java @@ -25,10 +25,10 @@ public abstract class AbstractExtensionProviderActivator implements PCEPExtensio private List registrations; @GuardedBy("this") - protected abstract List startImpl(PCEPExtensionProviderContext context) throws Exception; + protected abstract List startImpl(PCEPExtensionProviderContext context); @Override - public synchronized final void start(final PCEPExtensionProviderContext context) throws Exception { + public synchronized final void start(final PCEPExtensionProviderContext context) { Preconditions.checkState(this.registrations == null); this.registrations = Preconditions.checkNotNull(startImpl(context)); -- 2.36.6