diff options
author | 2018-07-31 14:49:35 +0200 | |
---|---|---|
committer | 2018-08-03 11:27:21 +0200 | |
commit | e688b54db7667e9a7a1cd8a0daa682e631c36368 (patch) | |
tree | e688d2c20227fafdd090614b25e21238e85dfea5 /hv-collector-core/src | |
parent | 185bc70fa1c024e532649bea650183e05c2d3d87 (diff) |
Remove default consul configuration
Default consul configuration is not needed in real life use case
and it doesnt even bring anything useful in our test environment,
since it's immediately overriden.
Tasks:
- remove default consul configuration
- make "config-url" argument required
Closes ONAP-727
Change-Id: I4a01cebfc6b2918fa3aa6020504def60572b09da
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-601
Diffstat (limited to 'hv-collector-core/src')
2 files changed, 1 insertions, 18 deletions
diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/factory/CollectorFactory.kt b/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/factory/CollectorFactory.kt index 7ce49a82..7be24d23 100644 --- a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/factory/CollectorFactory.kt +++ b/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/factory/CollectorFactory.kt @@ -28,12 +28,9 @@ import org.onap.dcae.collectors.veshv.domain.WireFrameDecoder import org.onap.dcae.collectors.veshv.impl.Router import org.onap.dcae.collectors.veshv.impl.VesDecoder import org.onap.dcae.collectors.veshv.impl.VesHvCollector -import org.onap.dcae.collectors.veshv.impl.adapters.ConsulConfigurationProvider import org.onap.dcae.collectors.veshv.impl.wire.WireChunkDecoder import org.onap.dcae.collectors.veshv.model.CollectorConfiguration -import org.onap.dcae.collectors.veshv.model.routing import org.onap.dcae.collectors.veshv.utils.logging.Logger -import org.onap.ves.VesEventV5 import java.util.concurrent.atomic.AtomicReference /** @@ -45,8 +42,7 @@ class CollectorFactory(val configuration: ConfigurationProvider, private val metrics: Metrics) { fun createVesHvCollectorProvider(): CollectorProvider { - val initialValue = createVesHvCollector(defaultConfiguration()) - val collector: AtomicReference<Collector> = AtomicReference(initialValue) + val collector: AtomicReference<Collector> = AtomicReference() configuration() .map(this::createVesHvCollector) .doOnNext { logger.info("Using updated configuration for new connections") } @@ -61,17 +57,6 @@ class CollectorFactory(val configuration: ConfigurationProvider, return collector::get } - private fun defaultConfiguration() = - CollectorConfiguration( - kafkaBootstrapServers = "kafka:9092", - routing = routing { - defineRoute { - fromDomain(VesEventV5.VesEvent.CommonEventHeader.Domain.HVRANMEAS) - toTopic("ves_hvRanMeas") - withFixedPartitioning() - } - }.build()) - private fun createVesHvCollector(config: CollectorConfiguration): Collector { return VesHvCollector( wireChunkDecoderSupplier = { alloc -> WireChunkDecoder(WireFrameDecoder(), alloc) }, diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/SslContextFactory.kt b/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/SslContextFactory.kt index 0dce0d61..3f7238f4 100644 --- a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/SslContextFactory.kt +++ b/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/SslContextFactory.kt @@ -19,9 +19,7 @@ */ package org.onap.dcae.collectors.veshv.impl.socket -import arrow.core.None import arrow.core.Option -import arrow.core.Some import io.netty.handler.ssl.ClientAuth import io.netty.handler.ssl.SslContext import io.netty.handler.ssl.SslContextBuilder |