diff options
Diffstat (limited to 'infra')
59 files changed, 119 insertions, 59 deletions
diff --git a/infra/binding-init/asciidoc/Readme.adoc b/infra/binding-init/asciidoc/Readme.adoc new file mode 100644 index 000000000..c1c6383e9 --- /dev/null +++ b/infra/binding-init/asciidoc/Readme.adoc @@ -0,0 +1,3 @@ += binding-init + +Overview of binding-init
\ No newline at end of file diff --git a/infra/binding-init/pom.xml b/infra/binding-init/pom.xml new file mode 100644 index 000000000..205021722 --- /dev/null +++ b/infra/binding-init/pom.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (c) 2017 Cisco and/or its affiliates. + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at: + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <artifactId>impl-parent</artifactId> + <groupId>io.fd.honeycomb.common</groupId> + <version>1.17.07-SNAPSHOT</version> + <relativePath>../../common/impl-parent</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + + <groupId>io.fd.honeycomb</groupId> + <artifactId>binding-init</artifactId> + <version>1.17.07-SNAPSHOT</version> + + <properties> + <slf4j-api.version>1.7.25</slf4j-api.version> + </properties> + + <dependencies> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j-api.version}</version> + </dependency> + </dependencies> +</project>
\ No newline at end of file diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/ProviderTrait.java b/infra/binding-init/src/main/java/io/fd/honeycomb/binding/init/ProviderTrait.java index a762a1618..ab000465f 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/ProviderTrait.java +++ b/infra/binding-init/src/main/java/io/fd/honeycomb/binding/init/ProviderTrait.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Cisco and/or its affiliates. + * Copyright (c) 2017 Cisco and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.honeycomb.infra.distro; +package io.fd.honeycomb.binding.init; import com.google.inject.Provider; import org.slf4j.Logger; diff --git a/infra/it/management/src/main/java/io/fd/honeycomb/management/jmx/ConnectorServerProvider.java b/infra/it/management/src/main/java/io/fd/honeycomb/management/jmx/ConnectorServerProvider.java index 625c63cb8..9d7b35661 100644 --- a/infra/it/management/src/main/java/io/fd/honeycomb/management/jmx/ConnectorServerProvider.java +++ b/infra/it/management/src/main/java/io/fd/honeycomb/management/jmx/ConnectorServerProvider.java @@ -17,13 +17,12 @@ package io.fd.honeycomb.management.jmx; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; +import javax.management.remote.JMXServiceURL; import org.eclipse.jetty.jmx.ConnectorServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.management.remote.JMXServiceURL; - /** * Provides and start JMX connector server * */ diff --git a/infra/it/management/src/main/java/io/fd/honeycomb/management/jmx/JMXServiceUrlProvider.java b/infra/it/management/src/main/java/io/fd/honeycomb/management/jmx/JMXServiceUrlProvider.java index 1b9136501..32ad57870 100644 --- a/infra/it/management/src/main/java/io/fd/honeycomb/management/jmx/JMXServiceUrlProvider.java +++ b/infra/it/management/src/main/java/io/fd/honeycomb/management/jmx/JMXServiceUrlProvider.java @@ -17,10 +17,9 @@ package io.fd.honeycomb.management.jmx; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; - -import javax.management.remote.JMXServiceURL; +import io.fd.honeycomb.binding.init.ProviderTrait; import java.net.MalformedURLException; +import javax.management.remote.JMXServiceURL; /** * Provides properly binded {@link JMXServiceURL} diff --git a/infra/minimal-distribution-core/pom.xml b/infra/minimal-distribution-core/pom.xml index 1763cce5e..53fea8c8c 100644 --- a/infra/minimal-distribution-core/pom.xml +++ b/infra/minimal-distribution-core/pom.xml @@ -53,6 +53,11 @@ <groupId>com.google.inject.extensions</groupId> <artifactId>guice-multibindings</artifactId> </dependency> + <dependency> + <groupId>io.fd.honeycomb</groupId> + <artifactId>binding-init</artifactId> + <version>${project.version}</version> + </dependency> <!-- ODL --> <dependency> <groupId>org.opendaylight.yangtools</groupId> diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/BindingDataBrokerProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/BindingDataBrokerProvider.java index e17355143..2f71a3027 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/BindingDataBrokerProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/BindingDataBrokerProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.distro.data; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.impl.BindingDOMDataBrokerAdapter; import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DOMNotificationServiceProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DOMNotificationServiceProvider.java index 424393b8d..4c419a8ab 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DOMNotificationServiceProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DOMNotificationServiceProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.distro.data; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration; import org.opendaylight.controller.md.sal.dom.broker.impl.DOMNotificationRouter; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataStoreProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataStoreProvider.java index 5b09f21f8..82b1ed32c 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataStoreProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataStoreProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.distro.data; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreFactory; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java index c5fcc050a..225102e1a 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.distro.data; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration; import org.opendaylight.controller.sal.core.api.model.SchemaService; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMBrokerProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMBrokerProvider.java index dd34c6c6f..3c665365d 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMBrokerProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMBrokerProvider.java @@ -17,8 +17,8 @@ package io.fd.honeycomb.infra.distro.data; import com.google.inject.Inject; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.impl.NorthboundFacadeHoneycombDOMBroker; -import io.fd.honeycomb.infra.distro.ProviderTrait; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; import org.opendaylight.controller.md.sal.dom.api.DOMRpcService; import org.opendaylight.controller.md.sal.dom.broker.impl.DOMNotificationRouter; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMDataBrokerProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMDataBrokerProvider.java index 92bbc512d..c23530d57 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMDataBrokerProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMDataBrokerProvider.java @@ -17,10 +17,10 @@ package io.fd.honeycomb.infra.distro.data; import com.google.inject.Inject; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.ModifiableDataManager; import io.fd.honeycomb.data.ReadableDataManager; import io.fd.honeycomb.data.impl.DataBroker; -import io.fd.honeycomb.infra.distro.ProviderTrait; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; public final class HoneycombDOMDataBrokerProvider extends ProviderTrait<DOMDataBroker> { diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMRpcServiceProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMRpcServiceProvider.java index 0459b2fef..324d636a6 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMRpcServiceProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMRpcServiceProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.distro.data; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.rpc.HoneycombDOMRpcService; import io.fd.honeycomb.rpc.RpcRegistry; import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombNotificationManagerProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombNotificationManagerProvider.java index f2e81a9f6..b31803877 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombNotificationManagerProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombNotificationManagerProvider.java @@ -18,7 +18,7 @@ package io.fd.honeycomb.infra.distro.data; import com.google.common.collect.Lists; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.notification.ManagedNotificationProducer; import io.fd.honeycomb.notification.NotificationCollector; import io.fd.honeycomb.notification.impl.HoneycombNotificationCollector; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java index f5f04d2a7..550b9bec5 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java @@ -18,7 +18,7 @@ package io.fd.honeycomb.infra.distro.data; 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 java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.ExecutorService; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ModifiableDTDelegProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ModifiableDTDelegProvider.java index b49381a27..419130cc1 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ModifiableDTDelegProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ModifiableDTDelegProvider.java @@ -18,9 +18,9 @@ package io.fd.honeycomb.infra.distro.data; import com.google.inject.Inject; import com.google.inject.name.Named; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.ModifiableDataManager; import io.fd.honeycomb.data.impl.ModifiableDataTreeDelegator; -import io.fd.honeycomb.infra.distro.ProviderTrait; import io.fd.honeycomb.infra.distro.data.context.ContextPipelineModule; import io.fd.honeycomb.translate.write.registry.WriterRegistry; import org.opendaylight.controller.md.sal.binding.api.DataBroker; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistingDataTreeProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistingDataTreeProvider.java index e7a654c7d..4e940d623 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistingDataTreeProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistingDataTreeProvider.java @@ -18,8 +18,8 @@ package io.fd.honeycomb.infra.distro.data; import com.google.inject.Inject; import com.google.inject.name.Named; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.impl.PersistingDataTreeAdapter; -import io.fd.honeycomb.infra.distro.ProviderTrait; import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration; import io.fd.honeycomb.infra.distro.data.context.ContextPipelineModule; import java.nio.file.Paths; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryBuilderProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryBuilderProvider.java index 92d9ce951..318436302 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryBuilderProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryBuilderProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.distro.data; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.rpc.RpcRegistryBuilder; import io.fd.honeycomb.rpc.RpcService; import java.util.HashSet; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryProvider.java index 4e09a9d2d..fd6499bb1 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.distro.data; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.rpc.RpcRegistry; import io.fd.honeycomb.rpc.RpcRegistryBuilder; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java index 6546ba2d2..fa37d10d7 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.distro.data.config; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder; import io.fd.honeycomb.translate.util.YangDAG; import io.fd.honeycomb.translate.write.WriterFactory; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/HoneycombContextDOMDataBrokerProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/HoneycombContextDOMDataBrokerProvider.java index 8e178203d..1ceed92c1 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/HoneycombContextDOMDataBrokerProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/HoneycombContextDOMDataBrokerProvider.java @@ -17,9 +17,9 @@ package io.fd.honeycomb.infra.distro.data.context; import com.google.inject.Inject; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.ModifiableDataManager; import io.fd.honeycomb.data.impl.DataBroker; -import io.fd.honeycomb.infra.distro.ProviderTrait; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; public final class HoneycombContextDOMDataBrokerProvider extends ProviderTrait<DOMDataBroker> { diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ModifiableDTMgrProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ModifiableDTMgrProvider.java index 9da97a8e4..c703e955e 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ModifiableDTMgrProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ModifiableDTMgrProvider.java @@ -17,9 +17,9 @@ package io.fd.honeycomb.infra.distro.data.context; import com.google.inject.Inject; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.ModifiableDataManager; import io.fd.honeycomb.data.impl.ModifiableDataTreeManager; -import io.fd.honeycomb.infra.distro.ProviderTrait; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; public final class ModifiableDTMgrProvider extends ProviderTrait<ModifiableDataManager> { diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/RealtimeMappingContextProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/RealtimeMappingContextProvider.java index cc1a8b1b8..3f39ce180 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/RealtimeMappingContextProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/RealtimeMappingContextProvider.java @@ -18,7 +18,7 @@ package io.fd.honeycomb.infra.distro.data.context; 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.MappingContext; import io.fd.honeycomb.translate.util.RealtimeMappingContext; import org.opendaylight.controller.md.sal.binding.api.DataBroker; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReadableDTDelegProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReadableDTDelegProvider.java index caac736b5..cdd3596d8 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReadableDTDelegProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReadableDTDelegProvider.java @@ -18,9 +18,9 @@ package io.fd.honeycomb.infra.distro.data.oper; import com.google.inject.Inject; import com.google.inject.name.Named; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.ReadableDataManager; import io.fd.honeycomb.data.impl.ReadableDataTreeDelegator; -import io.fd.honeycomb.infra.distro.ProviderTrait; import io.fd.honeycomb.infra.distro.data.context.ContextPipelineModule; import io.fd.honeycomb.translate.read.registry.ReaderRegistry; import org.opendaylight.controller.md.sal.binding.api.DataBroker; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java index 8f6bb0e6e..8e0b77674 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.distro.data.oper; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuilder; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ReaderRegistry; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapterProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapterProvider.java index 4f5185c40..5bf5991bc 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapterProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapterProvider.java @@ -22,9 +22,9 @@ import static io.fd.honeycomb.infra.distro.initializer.InitializerPipelineModule import com.google.inject.Inject; import com.google.inject.name.Named; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.init.DataTreeInitializer; import io.fd.honeycomb.data.init.InitializerRegistry; -import io.fd.honeycomb.infra.distro.ProviderTrait; import io.fd.honeycomb.translate.MappingContext; import io.fd.honeycomb.translate.read.registry.ReaderRegistry; import org.opendaylight.controller.md.sal.binding.api.DataBroker; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/ModifiableDTDelegInitProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/ModifiableDTDelegInitProvider.java index 3579ff11d..2ac315f8f 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/ModifiableDTDelegInitProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/ModifiableDTDelegInitProvider.java @@ -18,9 +18,9 @@ package io.fd.honeycomb.infra.distro.initializer; import com.google.inject.Inject; import com.google.inject.name.Named; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.ModifiableDataManager; import io.fd.honeycomb.data.impl.ModifiableDataTreeDelegator; -import io.fd.honeycomb.infra.distro.ProviderTrait; import io.fd.honeycomb.infra.distro.data.ConfigAndOperationalPipelineModule; import io.fd.honeycomb.infra.distro.data.context.ContextPipelineModule; import io.fd.honeycomb.translate.util.write.NoopWriterRegistry; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/PersistedFileInitializerProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/PersistedFileInitializerProvider.java index 58d63cfb3..b2c3cbb2d 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/PersistedFileInitializerProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/PersistedFileInitializerProvider.java @@ -17,8 +17,8 @@ package io.fd.honeycomb.infra.distro.initializer; import com.google.inject.Inject; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.data.init.RestoringInitializer; -import io.fd.honeycomb.infra.distro.ProviderTrait; import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration; import java.nio.file.Paths; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/HoneycombNotification2NetconfProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/HoneycombNotification2NetconfProvider.java index f60366c7e..49872ea67 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/HoneycombNotification2NetconfProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/HoneycombNotification2NetconfProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.distro.netconf; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration; import io.fd.honeycomb.notification.NotificationCollector; import io.fd.honeycomb.notification.impl.NotificationProducerRegistry; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfBindingBrokerProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfBindingBrokerProvider.java index 3d06b8d27..0ca25f635 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfBindingBrokerProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfBindingBrokerProvider.java @@ -18,8 +18,8 @@ package io.fd.honeycomb.infra.distro.netconf; import com.google.inject.Inject; import com.google.inject.name.Named; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.impl.FakeBindingAwareBroker; -import io.fd.honeycomb.infra.distro.ProviderTrait; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMdsalMapperProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMdsalMapperProvider.java index 9ede54f72..0cb68ba23 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMdsalMapperProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMdsalMapperProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.distro.netconf; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import org.opendaylight.controller.sal.core.api.Broker; import org.opendaylight.controller.sal.core.api.model.SchemaService; import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringMapperProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringMapperProvider.java index f617ded44..9169409d2 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringMapperProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringMapperProvider.java @@ -18,7 +18,7 @@ package io.fd.honeycomb.infra.distro.netconf; 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 java.lang.reflect.Constructor; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringReaderFactoryProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringReaderFactoryProvider.java index 3a4c13697..1931a57b6 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringReaderFactoryProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringReaderFactoryProvider.java @@ -18,7 +18,7 @@ package io.fd.honeycomb.infra.distro.netconf; 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/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringServiceProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringServiceProvider.java index 9858003f5..d8d7adeb4 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringServiceProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringServiceProvider.java @@ -18,7 +18,7 @@ package io.fd.honeycomb.infra.distro.netconf; 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 org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.impl.osgi.NetconfMonitoringServiceImpl; import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfNotificationMapperProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfNotificationMapperProvider.java index 2554d026c..4f869b1dc 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfNotificationMapperProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfNotificationMapperProvider.java @@ -18,7 +18,7 @@ package io.fd.honeycomb.infra.distro.netconf; 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 java.lang.reflect.Constructor; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfNotificationsReaderFactoryProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfNotificationsReaderFactoryProvider.java index b699439b4..326abec08 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfNotificationsReaderFactoryProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfNotificationsReaderFactoryProvider.java @@ -18,7 +18,7 @@ package io.fd.honeycomb.infra.distro.netconf; 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/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfServerDispatcherProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfServerDispatcherProvider.java index 00c2d1617..c5f0fc320 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfServerDispatcherProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfServerDispatcherProvider.java @@ -18,7 +18,7 @@ package io.fd.honeycomb.infra.distro.netconf; 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.netty.channel.nio.NioEventLoopGroup; import io.netty.util.Timer; import java.util.concurrent.TimeUnit; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfSshServerProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfSshServerProvider.java index 8d86677d3..b13d9c165 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfSshServerProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfSshServerProvider.java @@ -18,8 +18,8 @@ package io.fd.honeycomb.infra.distro.netconf; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.inject.Inject; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.infra.distro.InitializationException; -import io.fd.honeycomb.infra.distro.ProviderTrait; import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration; import io.fd.honeycomb.northbound.CredentialsConfiguration; import io.netty.channel.ChannelFuture; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfTcpServerProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfTcpServerProvider.java index 66b82eed9..37679d056 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfTcpServerProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfTcpServerProvider.java @@ -17,8 +17,8 @@ package io.fd.honeycomb.infra.distro.netconf; import com.google.inject.Inject; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.infra.distro.InitializationException; -import io.fd.honeycomb.infra.distro.ProviderTrait; import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration; import io.netty.channel.ChannelFuture; import io.netty.util.concurrent.GenericFutureListener; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NettyThreadGroupProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NettyThreadGroupProvider.java index e14952bba..c34d8c1f4 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NettyThreadGroupProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/netconf/NettyThreadGroupProvider.java @@ -18,7 +18,7 @@ package io.fd.honeycomb.infra.distro.netconf; 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.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration; import io.netty.channel.nio.NioEventLoopGroup; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/restconf/HttpConnectorProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/restconf/HttpConnectorProvider.java index f298df1d5..678791c63 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/restconf/HttpConnectorProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/restconf/HttpConnectorProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.distro.restconf; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/restconf/HttpsConnectorProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/restconf/HttpsConnectorProvider.java index 68c0fb5ac..3387c0f3b 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/restconf/HttpsConnectorProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/restconf/HttpsConnectorProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.distro.restconf; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration; import java.net.URL; import org.eclipse.jetty.http.HttpVersion; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/restconf/JettyServerProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/restconf/JettyServerProvider.java index 0c8087360..e596b276d 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/restconf/JettyServerProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/restconf/JettyServerProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.distro.restconf; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration; import io.fd.honeycomb.northbound.CredentialsConfiguration; import java.net.URL; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/restconf/RestconfProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/restconf/RestconfProvider.java index 6664c7d33..01f177e27 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/restconf/RestconfProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/restconf/RestconfProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.distro.restconf; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration; import org.opendaylight.controller.sal.core.api.Broker; import org.opendaylight.netconf.sal.rest.api.RestConnector; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java index e2d0fbfaa..b810980e6 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java @@ -20,7 +20,7 @@ import static io.fd.honeycomb.infra.distro.schema.YangModulesProvider.YangModule import com.google.common.base.MoreObjects; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import java.util.stream.Collectors; import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext; import org.opendaylight.yangtools.yang.binding.YangModelBindingProvider; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaServiceProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaServiceProvider.java index eb3552c12..157473a6c 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaServiceProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaServiceProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.distro.schema; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import org.opendaylight.controller.sal.core.api.model.SchemaService; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext; diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SerializerProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SerializerProvider.java index 2a1963c0a..ddc6667cd 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SerializerProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SerializerProvider.java @@ -17,7 +17,7 @@ package io.fd.honeycomb.infra.distro.schema; import com.google.inject.Inject; -import io.fd.honeycomb.infra.distro.ProviderTrait; +import io.fd.honeycomb.binding.init.ProviderTrait; import javassist.ClassPool; import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec; import org.opendaylight.yangtools.binding.data.codec.gen.impl.DataObjectSerializerGenerator; 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; diff --git a/infra/pom.xml b/infra/pom.xml index 845cad0fa..5c611685b 100644 --- a/infra/pom.xml +++ b/infra/pom.xml @@ -50,6 +50,7 @@ <module>bgp-distribution-test</module> <module>minimal-distribution-core</module> <module>northbound</module> + <module>binding-init</module> </modules> <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build --> |