diff options
author | Jan Srnicek <jsrnicek@cisco.com> | 2016-11-21 12:24:08 +0100 |
---|---|---|
committer | Jan Srnicek <jsrnicek@cisco.com> | 2016-11-24 12:50:14 +0000 |
commit | 0d9be1f529fe370be518be823850ad186390ff46 (patch) | |
tree | 7985ff762b3aa212ea8137643107ddc0b8d8bf91 /lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/LispStateReaderFactory.java | |
parent | e259ab7990b8179eda4462907ecebccd0e85b587 (diff) |
HONEYCOMB-282 - Lisp factories refactoring
Refactoring to remove boilerplate code/for more readability
Change-Id: I1ed09160a183c748e698087edf57063e25e8d953
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Diffstat (limited to 'lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/LispStateReaderFactory.java')
-rwxr-xr-x | lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/LispStateReaderFactory.java | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/LispStateReaderFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/LispStateReaderFactory.java index 24907641f..44f1e6ba5 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/LispStateReaderFactory.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/factory/LispStateReaderFactory.java @@ -16,24 +16,12 @@ package io.fd.hc2vpp.lisp.translate.read.factory; -import static com.google.common.base.Preconditions.checkNotNull; -import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.ADJACENCIES_IDENTIFICATION_CONTEXT; -import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.INTERFACE_CONTEXT; -import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.LOCAL_MAPPING_CONTEXT; -import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.LOCATOR_SET_CONTEXT; -import static io.fd.hc2vpp.lisp.cfgattrs.LispConfiguration.REMOTE_MAPPING_CONTEXT; - -import com.google.inject.Inject; -import com.google.inject.name.Named; -import io.fd.hc2vpp.lisp.context.util.AdjacenciesMappingContext; -import io.fd.hc2vpp.lisp.context.util.EidMappingContext; +import io.fd.hc2vpp.lisp.translate.AbstractLispInfraFactoryBase; import io.fd.hc2vpp.lisp.translate.read.LispStateCustomizer; import io.fd.hc2vpp.lisp.translate.read.PitrCfgCustomizer; import io.fd.honeycomb.translate.impl.read.GenericReader; import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.hc2vpp.common.translate.util.NamingContext; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.LispState; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev161214.lisp.feature.data.grouping.LispFeatureData; @@ -45,24 +33,9 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** * Initialize readers for {@link LispState} */ -public class LispStateReaderFactory extends AbstractLispReaderFactoryBase implements ReaderFactory { - - private final AdjacenciesMappingContext adjacenciesIdentificationContext; +public class LispStateReaderFactory extends AbstractLispInfraFactoryBase implements ReaderFactory { - @Inject - public LispStateReaderFactory(final FutureJVppCore vppApi, - @Named(INTERFACE_CONTEXT) final NamingContext interfaceContext, - @Named(LOCATOR_SET_CONTEXT) final NamingContext locatorSetContext, - @Named("bridge-domain-context") final NamingContext bridgeDomainContext, - @Named(LOCAL_MAPPING_CONTEXT) final EidMappingContext localMappingContext, - @Named(REMOTE_MAPPING_CONTEXT) final EidMappingContext remoteMappingContext, - @Named(ADJACENCIES_IDENTIFICATION_CONTEXT) final - AdjacenciesMappingContext adjacenciesIdentificationContext) { - super(InstanceIdentifier.create(LispState.class), vppApi, interfaceContext, locatorSetContext, - bridgeDomainContext, localMappingContext, remoteMappingContext); - this.adjacenciesIdentificationContext = - checkNotNull(adjacenciesIdentificationContext, "Adjacencies mapping context cannot be null"); - } + private static final InstanceIdentifier<LispState> lispStateId = InstanceIdentifier.create(LispState.class); @Override public void init(@Nonnull final ModifiableReaderRegistryBuilder registry) { @@ -70,13 +43,6 @@ public class LispStateReaderFactory extends AbstractLispReaderFactoryBase implem registry.add(new GenericReader<>(lispStateId, new LispStateCustomizer(vppApi))); registry.addStructuralReader(lispStateId.child(LispFeatureData.class), LispFeatureDataBuilder.class); - LocatorSetsReaderFactory.newInstance(lispStateId, vppApi, interfaceContext, locatorSetContext).init(registry); - MapResolversReaderFactory.newInstance(lispStateId, vppApi).init(registry); - EidTableReaderFactory - .newInstance(lispStateId, vppApi, interfaceContext, locatorSetContext, bridgeDomainContext, - localMappingContext, remoteMappingContext, adjacenciesIdentificationContext) - .init(registry); - registry.add(new GenericReader<>(lispStateId.child(LispFeatureData.class).child(PitrCfg.class), new PitrCfgCustomizer(vppApi))); } |