From 299296e6ff842a1c275a67a07f2f3e09852c1959 Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Mon, 3 Jul 2017 13:01:36 +0200 Subject: 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 --- .../infra/distro/initializer/InitializerRegistryAdapterProvider.java | 2 +- .../infra/distro/initializer/ModifiableDTDelegInitProvider.java | 2 +- .../infra/distro/initializer/PersistedFileInitializerProvider.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer') 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; -- cgit 1.2.3-korg