From 735469d5003388df3622819c3d1db0e89a64197c Mon Sep 17 00:00:00 2001 From: Jakub Dudycz Date: Mon, 8 Apr 2019 14:09:16 +0200 Subject: Move maxPayloadSizeBytes to CollectorConfiguration Signed-off-by: Jakub Dudycz Issue-ID: DCAEGEN2-1387 Change-Id: I37151a58f5244841243dc531912af2ef50ea5d3c --- .../dcae/collectors/veshv/config/api/ConfigurationModule.kt | 2 +- .../dcae/collectors/veshv/config/api/model/configuration.kt | 11 +++++++++-- .../dcae/collectors/veshv/config/impl/ConfigurationMerger.kt | 1 - .../collectors/veshv/config/impl/ConfigurationValidator.kt | 2 -- .../collectors/veshv/config/impl/partial_configuration.kt | 2 -- 5 files changed, 10 insertions(+), 8 deletions(-) (limited to 'sources/hv-collector-configuration/src/main/kotlin/org/onap') diff --git a/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/api/ConfigurationModule.kt b/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/api/ConfigurationModule.kt index 93381572..f0ee3a42 100644 --- a/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/api/ConfigurationModule.kt +++ b/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/api/ConfigurationModule.kt @@ -53,7 +53,7 @@ class ConfigurationModule { .throwOnLeft(::MissingArgumentException) .doOnNext { logger.info { "Using base configuration file: ${it.absolutePath}" } } .map { it.reader().use(configParser::parse) } - .doOnNext { logger.info { "Successfully parsed json file to configuration: $it" } } + .doOnNext { logger.info { "Successfully parsed configuration file to: $it" } } .cache() .flatMapMany { basePartialConfig -> cbsConfigurationProvider(basePartialConfig, configStateListener, mdc) diff --git a/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/api/model/configuration.kt b/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/api/model/configuration.kt index f745d595..8db2f770 100644 --- a/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/api/model/configuration.kt +++ b/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/api/model/configuration.kt @@ -37,7 +37,6 @@ data class HvVesConfiguration( data class ServerConfiguration( val listenPort: Int, - val maxPayloadSizeBytes: Int, val idleTimeout: Duration ) @@ -48,4 +47,12 @@ data class CbsConfiguration( data class CollectorConfiguration( val routing: Routing -) +) { + val maxPayloadSizeBytes by lazy { + routing.map { it.sink.maxPayloadSizeBytes() }.max() ?: DEFAULT_MAX_PAYLOAD_SIZE + } + + companion object { + internal const val DEFAULT_MAX_PAYLOAD_SIZE = 1024 * 1024 + } +} diff --git a/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationMerger.kt b/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationMerger.kt index e782a1e7..56e48038 100644 --- a/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationMerger.kt +++ b/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationMerger.kt @@ -33,7 +33,6 @@ internal class ConfigurationMerger { PartialConfiguration( listenPort = base.listenPort.updateToGivenOrNone(update.listenPort), idleTimeoutSec = base.idleTimeoutSec.updateToGivenOrNone(update.idleTimeoutSec), - maxPayloadSizeBytes = base.maxPayloadSizeBytes.updateToGivenOrNone(update.maxPayloadSizeBytes), firstRequestDelaySec = base.firstRequestDelaySec.updateToGivenOrNone(update.firstRequestDelaySec), requestIntervalSec = base.requestIntervalSec.updateToGivenOrNone(update.requestIntervalSec), diff --git a/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationValidator.kt b/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationValidator.kt index dddf0bed..613ae302 100644 --- a/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationValidator.kt +++ b/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationValidator.kt @@ -94,7 +94,6 @@ internal class ConfigurationValidator { partial.mapBinding { ServerConfiguration( it.listenPort.bind(), - it.maxPayloadSizeBytes.bind(), Duration.ofSeconds(it.idleTimeoutSec.bind()) ) } @@ -139,7 +138,6 @@ internal class ConfigurationValidator { .trustStorePassword(Passwords.fromString(trustStorePassword)) .build() - private fun validatedCollectorConfig(partial: PartialConfiguration) = partial.mapBinding { config -> CollectorConfiguration( diff --git a/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/partial_configuration.kt b/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/partial_configuration.kt index 30f6c3e3..d09a52e4 100644 --- a/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/partial_configuration.kt +++ b/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/partial_configuration.kt @@ -34,8 +34,6 @@ internal data class PartialConfiguration( val listenPort: Option = None, @SerializedName("server.idleTimeoutSec") val idleTimeoutSec: Option = None, - @SerializedName("server.maxPayloadSizeBytes") - val maxPayloadSizeBytes: Option = None, @SerializedName("cbs.firstRequestDelaySec") val firstRequestDelaySec: Option = None, -- cgit 1.2.3-korg