From 482ff719edbb728827976622cef63c876cb6676e Mon Sep 17 00:00:00 2001 From: Izabela Zawadzka Date: Mon, 15 Apr 2019 13:03:45 +0200 Subject: Add internal modifiers to comply with new HvVesCustomRule Change-Id: I33ad24179d05ded58f6784544be9bbdd56210720 Signed-off-by: Izabela Zawadzka Issue-ID: DCAEGEN2-1438 --- .../collectors/veshv/simulators/dcaeapp/impl/DcaeAppSimulator.kt | 4 ++-- .../veshv/simulators/dcaeapp/impl/MessageStreamValidation.kt | 2 +- .../veshv/simulators/dcaeapp/impl/adapters/DcaeAppApiServer.kt | 2 +- .../veshv/simulators/dcaeapp/impl/adapters/KafkaSource.kt | 2 +- .../simulators/dcaeapp/impl/config/ArgDcaeAppSimConfiguration.kt | 2 +- .../simulators/dcaeapp/impl/config/DcaeAppSimConfiguration.kt | 2 +- .../dcae/collectors/veshv/simulators/dcaeapp/impl/consumer.kt | 8 ++++---- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'sources/hv-collector-dcae-app-simulator') diff --git a/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/DcaeAppSimulator.kt b/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/DcaeAppSimulator.kt index 33e9a37e..122d9bf0 100644 --- a/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/DcaeAppSimulator.kt +++ b/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/DcaeAppSimulator.kt @@ -28,7 +28,7 @@ import java.util.Collections.synchronizedMap * @author Piotr Jaszczyk * @since August 2018 */ -class DcaeAppSimulator(private val consumerFactory: ConsumerFactory, +internal class DcaeAppSimulator(private val consumerFactory: ConsumerFactory, private val messageStreamValidation: MessageStreamValidation) { private val consumerState: MutableMap = synchronizedMap(mutableMapOf()) @@ -85,4 +85,4 @@ class DcaeAppSimulator(private val consumerFactory: ConsumerFactory, } } -class MissingConsumerException(message: String) : Throwable(message) +internal class MissingConsumerException(message: String) : Throwable(message) diff --git a/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/MessageStreamValidation.kt b/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/MessageStreamValidation.kt index 144aab02..06a8d742 100644 --- a/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/MessageStreamValidation.kt +++ b/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/MessageStreamValidation.kt @@ -31,7 +31,7 @@ import reactor.core.publisher.Mono import java.io.InputStream import javax.json.Json -class MessageStreamValidation( +internal class MessageStreamValidation( private val messageGenerator: VesEventGenerator, private val messageParametersParser: MessageParametersParser = MessageParametersParser.INSTANCE) { diff --git a/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/DcaeAppApiServer.kt b/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/DcaeAppApiServer.kt index 6a09be9f..2458b203 100644 --- a/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/DcaeAppApiServer.kt +++ b/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/DcaeAppApiServer.kt @@ -41,7 +41,7 @@ import java.net.InetSocketAddress * @author Piotr Jaszczyk * @since May 2018 */ -class DcaeAppApiServer(private val simulator: DcaeAppSimulator) { +internal class DcaeAppApiServer(private val simulator: DcaeAppSimulator) { fun start(socketAddress: InetSocketAddress, kafkaTopics: Set): Mono = Mono.defer { diff --git a/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/KafkaSource.kt b/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/KafkaSource.kt index 0fd3bb10..b91e7a1c 100644 --- a/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/KafkaSource.kt +++ b/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/KafkaSource.kt @@ -31,7 +31,7 @@ import reactor.kafka.receiver.ReceiverRecord * @author Piotr Jaszczyk * @since May 2018 */ -class KafkaSource(private val receiver: KafkaReceiver) { +internal class KafkaSource(private val receiver: KafkaReceiver) { fun start(): Flux> = receiver.receive() diff --git a/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/ArgDcaeAppSimConfiguration.kt b/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/ArgDcaeAppSimConfiguration.kt index f6d1eab7..fb0e61f5 100644 --- a/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/ArgDcaeAppSimConfiguration.kt +++ b/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/ArgDcaeAppSimConfiguration.kt @@ -34,7 +34,7 @@ import org.onap.dcae.collectors.veshv.domain.WireFrameMessage import org.onap.dcae.collectors.veshv.utils.arrow.OptionUtils.binding import java.net.InetSocketAddress -class ArgDcaeAppSimConfiguration : ArgBasedConfiguration(DefaultParser()) { +internal class ArgDcaeAppSimConfiguration : ArgBasedConfiguration(DefaultParser()) { override val cmdLineOptionsList: List = listOf( LISTEN_PORT, MAXIMUM_PAYLOAD_SIZE_BYTES, diff --git a/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/DcaeAppSimConfiguration.kt b/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/DcaeAppSimConfiguration.kt index 2b0382ac..a503e5b5 100644 --- a/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/DcaeAppSimConfiguration.kt +++ b/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/DcaeAppSimConfiguration.kt @@ -21,7 +21,7 @@ package org.onap.dcae.collectors.veshv.simulators.dcaeapp.impl.config import java.net.InetSocketAddress -data class DcaeAppSimConfiguration( +internal data class DcaeAppSimConfiguration( val apiAddress: InetSocketAddress, val maxPayloadSizeBytes: Int, val kafkaBootstrapServers: String, diff --git a/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/consumer.kt b/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/consumer.kt index a6d1eddb..2de89aae 100644 --- a/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/consumer.kt +++ b/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/consumer.kt @@ -28,7 +28,7 @@ import java.util.concurrent.ConcurrentLinkedQueue * @author Piotr Jaszczyk * @since June 2018 */ -class ConsumerState(private val messages: ConcurrentLinkedQueue) { +internal class ConsumerState(private val messages: ConcurrentLinkedQueue) { val messagesCount: Int by lazy { messages.size } @@ -38,12 +38,12 @@ class ConsumerState(private val messages: ConcurrentLinkedQueue) { } } -interface ConsumerStateProvider { +internal interface ConsumerStateProvider { fun currentState(): ConsumerState fun reset() } -class Consumer : ConsumerStateProvider { +internal class Consumer : ConsumerStateProvider { private var consumedMessages: ConcurrentLinkedQueue = ConcurrentLinkedQueue() @@ -61,7 +61,7 @@ class Consumer : ConsumerStateProvider { } } -class ConsumerFactory(private val kafkaBootstrapServers: String) { +internal class ConsumerFactory(private val kafkaBootstrapServers: String) { fun createConsumersForTopics(kafkaTopics: Set): Map = KafkaSource.create(kafkaBootstrapServers, kafkaTopics).let { kafkaSource -> val topicToConsumer = kafkaTopics.associate { it to Consumer() } -- cgit 1.2.3-korg