diff options
author | 2020-12-17 12:17:37 +0100 | |
---|---|---|
committer | 2020-12-28 12:21:36 +0000 | |
commit | f282dc63f560fe3fc3f885097f43142bfc2f9824 (patch) | |
tree | 89c16afa2a7e6c981cadea4283f7d6892a71dc8f /sources/hv-collector-configuration/src/main/kotlin/org/onap | |
parent | 589f62651fdc96e3c76845ea2f99866f85e98d0d (diff) |
Upgrade hv-ves, reactor, protobuf and sdk versions
Reactor from Dysprosium-SR11 to 2020.0.2
Protobuf from 3.6.1 to 3.14.0
SDK from 1.4.4 to 1.5.0
Issue-ID: DCAEGEN2-2537
Signed-off-by: Pawel <pawel.kasperkiewicz@nokia.com>
Change-Id: Ie3fc82c67ba096efcd0c584cf3f7f35128962efe
Diffstat (limited to 'sources/hv-collector-configuration/src/main/kotlin/org/onap')
2 files changed, 6 insertions, 4 deletions
diff --git a/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/CbsClientAdapter.kt b/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/CbsClientAdapter.kt index 905c737e..1f5c0c23 100644 --- a/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/CbsClientAdapter.kt +++ b/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/CbsClientAdapter.kt @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * dcaegen2-collectors-veshv * ================================================================================ - * Copyright (C) 2019 NOKIA + * Copyright (C) 2019-2020 NOKIA * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,6 +29,7 @@ import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsRequest import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext import reactor.core.publisher.Mono import reactor.retry.Retry +import reactor.util.retry.Retry.withThrowable import java.time.Duration import java.util.concurrent.atomic.AtomicReference @@ -53,7 +54,7 @@ internal class CbsClientAdapter(private val cbsClientMono: Mono<CbsClient>, "CBS client successfully created, first request will be sent in ${firstRequestDelay.seconds} s" } } - .retryWhen(retry) + .retryWhen(withThrowable(retry)) .delayElement(firstRequestDelay) .flatMapMany(::toPeriodicalConfigurations) .distinctUntilChanged() diff --git a/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/CbsConfigurationProvider.kt b/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/CbsConfigurationProvider.kt index 6f16b3d1..8e774f9d 100644 --- a/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/CbsConfigurationProvider.kt +++ b/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/CbsConfigurationProvider.kt @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * dcaegen2-collectors-veshv * ================================================================================ - * Copyright (C) 2018-2019 NOKIA + * Copyright (C) 2018-2020 NOKIA * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,6 +34,7 @@ import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.streams.Strea import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.streams.StreamPredicates.streamOfType import reactor.core.publisher.Flux import reactor.retry.Retry +import reactor.util.retry.Retry.withThrowable /** * @author Jakub Dudycz <jakub.dudycz@nokia.com> @@ -60,7 +61,7 @@ internal class CbsConfigurationProvider(private val cbsClientAdapter: CbsClientA .map(::parseConfiguration) .doOnNext { logger.info(mdc) { "Successfully parsed configuration json to:\n$it" } } .onErrorLog(logger, mdc) { "Error while creating configuration" } - .retryWhen(retry) + .retryWhen(withThrowable(retry)) private fun parseConfiguration(json: JsonObject) = configParser |