diff options
author | Jan Srnicek <jsrnicek@cisco.com> | 2017-07-03 13:01:36 +0200 |
---|---|---|
committer | Jan Srnicek <jsrnicek@cisco.com> | 2017-07-03 13:01:36 +0200 |
commit | 299296e6ff842a1c275a67a07f2f3e09852c1959 (patch) | |
tree | c711ca6a4b5e3afc56374d67844fe9545452d0e9 /infra/northbound | |
parent | 106fdfe560a0e76c28780eceb3362cd78b06ebf2 (diff) |
HONEYCOMB-360 - Separate ProviderTrait to dedicated project
This change is necessary to break dep cycle, that would by introduced
by splitting netconf and data-core modules. Also allows to reduce
use in hc2vpp(some project incude whole minimal-distribution-core
just because of this one interface)
Change-Id: I7744b4dc78f6d6797263b10bbc4ead545a2f6593
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Diffstat (limited to 'infra/northbound')
11 files changed, 15 insertions, 10 deletions
diff --git a/infra/northbound/bgp/pom.xml b/infra/northbound/bgp/pom.xml index 60860a50a..c55abc6f2 100644 --- a/infra/northbound/bgp/pom.xml +++ b/infra/northbound/bgp/pom.xml @@ -55,6 +55,11 @@ <groupId>net.jmob</groupId> <artifactId>guice.conf</artifactId> </dependency> + <dependency> + <groupId>io.fd.honeycomb</groupId> + <artifactId>binding-init</artifactId> + <version>${project.version}</version> + </dependency> <!-- BGP translation layer --> <dependency> diff --git a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BGPDispatcherImplProvider.java b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BGPDispatcherImplProvider.java index c9ec39f35..92b743660 100644 --- a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BGPDispatcherImplProvider.java +++ b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BGPDispatcherImplProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.bgp; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.netty.channel.EventLoopGroup; import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionConsumerContext; import org.opendaylight.protocol.bgp.rib.impl.BGPDispatcherImpl; diff --git a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BGPExtensionConsumerContextProvider.java b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BGPExtensionConsumerContextProvider.java index 00e99ab99..106a882ec 100644 --- a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BGPExtensionConsumerContextProvider.java +++ b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BGPExtensionConsumerContextProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.bgp; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import java.util.ArrayList; import java.util.Set; import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionConsumerContext; diff --git a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpNeighboursProvider.java b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpNeighboursProvider.java index b62444108..9356b32b4 100644 --- a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpNeighboursProvider.java +++ b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpNeighboursProvider.java @@ -24,7 +24,7 @@ import static org.opendaylight.yangtools.sal.binding.generator.impl.BindingSchem import com.google.common.base.Optional; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import java.io.InputStream; import java.util.Map; import javax.annotation.Nonnull; diff --git a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpNettyThreadGroupProvider.java b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpNettyThreadGroupProvider.java index 8208a4320..9c4722eec 100644 --- a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpNettyThreadGroupProvider.java +++ b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpNettyThreadGroupProvider.java @@ -18,7 +18,7 @@ package io.fd.honeycomb.infra.bgp; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.netty.channel.nio.NioEventLoopGroup; final class BgpNettyThreadGroupProvider extends ProviderTrait<NioEventLoopGroup> { diff --git a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpRIBProvider.java b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpRIBProvider.java index a2bd56df3..9cd02b49e 100644 --- a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpRIBProvider.java +++ b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpRIBProvider.java @@ -18,7 +18,7 @@ package io.fd.honeycomb.infra.bgp; import com.google.common.collect.ImmutableList; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpReaderFactoryProvider.java b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpReaderFactoryProvider.java index b79074f10..728bb14e5 100644 --- a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpReaderFactoryProvider.java +++ b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpReaderFactoryProvider.java @@ -18,7 +18,7 @@ package io.fd.honeycomb.infra.bgp; import com.google.inject.Inject; import com.google.inject.name.Named; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; import io.fd.honeycomb.translate.util.read.BindingBrokerReader; diff --git a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpServerProvider.java b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpServerProvider.java index b972ee297..ba95d32a0 100644 --- a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpServerProvider.java +++ b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpServerProvider.java @@ -18,7 +18,7 @@ package io.fd.honeycomb.infra.bgp; import com.google.common.base.Preconditions; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.netty.channel.Channel; import io.netty.channel.ChannelConfig; import io.netty.channel.ChannelFuture; diff --git a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpWriterFactoryProvider.java b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpWriterFactoryProvider.java index 81faabbe5..f4d5b9416 100644 --- a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpWriterFactoryProvider.java +++ b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/BgpWriterFactoryProvider.java @@ -19,7 +19,7 @@ package io.fd.honeycomb.infra.bgp; import com.google.common.collect.Sets; import com.google.inject.Inject; import com.google.inject.name.Named; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.translate.util.write.BindingBrokerWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; diff --git a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/LocRibWriterProvider.java b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/LocRibWriterProvider.java index 1fc6b25ed..528b3a22a 100644 --- a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/LocRibWriterProvider.java +++ b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/LocRibWriterProvider.java @@ -19,7 +19,7 @@ package io.fd.honeycomb.infra.bgp; import com.google.inject.Inject; import com.google.inject.name.Named; import io.fd.honeycomb.bgp.translate.impl.LocRibWriter; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.translate.bgp.RouteWriterFactory; import java.util.HashSet; import java.util.Set; diff --git a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/RIBExtensionConsumerContextProvider.java b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/RIBExtensionConsumerContextProvider.java index b90b7880c..696726ac4 100644 --- a/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/RIBExtensionConsumerContextProvider.java +++ b/infra/northbound/bgp/src/main/java/io/fd/honeycomb/infra/bgp/RIBExtensionConsumerContextProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.bgp; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import java.util.ArrayList; import java.util.Set; import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext; |