From dde383a2aa75f94c26d7949665b79cc95486a223 Mon Sep 17 00:00:00 2001 From: Piotr Jaszczyk Date: Wed, 28 Nov 2018 15:46:50 +0100 Subject: [PATCH] Custom detekt rule for logger usage check Check if logger invocations don't use unoptimal invocations, eg. concatenation `debug("a=" + a)` instead of lambda use `debug {"a=" + a}` Unfortunately to avoid defining dependencies in many places and having circural dependencies it was necessarry to reorganize the maven module structure. The goal was to have `sources` module with production code and `build` module with build-time tooling (detekt rules among them). Issue-ID: DCAEGEN2-1002 Change-Id: I36e677b98972aaae6905d722597cbce5e863d201 Signed-off-by: Piotr Jaszczyk --- build/hv-collector-analysis/pom.xml | 150 +++++++++++++++++++++ .../veshv/analysis/SuboptimalLoggerUsage.kt | 92 +++++++++++++ .../veshv/analysis/VesHvRuleSetProvider.kt | 36 +++++ ...io.gitlab.arturbosch.detekt.api.RuleSetProvider | 1 + .../src/main/resources/onap-detekt-config.yml | 5 + .../veshv/analysis/SuboptimalLoggerUsageTest.kt | 126 +++++++++++++++++ .../services/javax.script.ScriptEngineFactory | 1 + .../hv-collector-coverage}/check-coverage.sh | 0 .../hv-collector-coverage}/pom.xml | 2 +- {hv-collector-analysis => build}/pom.xml | 45 +++---- pom.xml | 112 +++------------ .../hv-collector-core}/pom.xml | 2 +- .../dcae/collectors/veshv/boundary/adapters.kt | 0 .../org/onap/dcae/collectors/veshv/boundary/api.kt | 0 .../collectors/veshv/factory/CollectorFactory.kt | 0 .../dcae/collectors/veshv/factory/ServerFactory.kt | 0 .../dcae/collectors/veshv/impl/MessageValidator.kt | 0 .../org/onap/dcae/collectors/veshv/impl/Router.kt | 0 .../onap/dcae/collectors/veshv/impl/VesDecoder.kt | 0 .../dcae/collectors/veshv/impl/VesHvCollector.kt | 4 +- .../veshv/impl/adapters/AdapterFactory.kt | 0 .../impl/adapters/ConsulConfigurationProvider.kt | 0 .../collectors/veshv/impl/adapters/HttpAdapter.kt | 0 .../veshv/impl/adapters/LoggingSinkProvider.kt | 0 .../veshv/impl/adapters/kafka/KafkaSink.kt | 0 .../veshv/impl/adapters/kafka/KafkaSinkProvider.kt | 0 .../impl/adapters/kafka/ProtobufSerializer.kt | 0 .../impl/adapters/kafka/VesMessageSerializer.kt | 0 .../collectors/veshv/impl/socket/NettyTcpServer.kt | 0 .../collectors/veshv/impl/wire/WireChunkDecoder.kt | 0 .../veshv/impl/wire/WireFrameException.kt | 0 .../veshv/model/CollectorConfiguration.kt | 0 .../veshv/model/ConfigurationProviderParams.kt | 0 .../dcae/collectors/veshv/model/RoutedMessage.kt | 0 .../collectors/veshv/model/ServerConfiguration.kt | 0 .../onap/dcae/collectors/veshv/model/VesMessage.kt | 0 .../onap/dcae/collectors/veshv/model/routing.kt | 0 .../collectors/veshv/impl/MessageValidatorTest.kt | 0 .../onap/dcae/collectors/veshv/impl/RouterTest.kt | 0 .../dcae/collectors/veshv/impl/VesDecoderTest.kt | 0 .../adapters/ConsulConfigurationProviderTest.kt | 0 .../veshv/impl/adapters/HttpAdapterTest.kt | 0 .../veshv/impl/wire/WireChunkDecoderTest.kt | 0 .../src/test/resources/logback-test.xml | 0 .../hv-collector-ct}/pom.xml | 2 +- .../tests/component/PerformanceSpecification.kt | 0 .../dcae/collectors/veshv/tests/component/Sut.kt | 0 .../veshv/tests/component/VesHvSpecification.kt | 0 .../collectors/veshv/tests/component/spekUtils.kt | 0 .../veshv/tests/fakes/FakeHealthState.kt | 0 .../collectors/veshv/tests/fakes/configuration.kt | 0 .../dcae/collectors/veshv/tests/fakes/metrics.kt | 0 .../onap/dcae/collectors/veshv/tests/fakes/sink.kt | 0 .../src/test/resources/logback-test.xml | 0 .../hv-collector-dcae-app-simulator}/Dockerfile | 0 .../hv-collector-dcae-app-simulator}/pom.xml | 2 +- .../simulators/dcaeapp/impl/DcaeAppSimulator.kt | 0 .../dcaeapp/impl/MessageStreamValidation.kt | 0 .../dcaeapp/impl/adapters/DcaeAppApiServer.kt | 0 .../dcaeapp/impl/adapters/KafkaSource.kt | 0 .../impl/config/ArgDcaeAppSimConfiguration.kt | 0 .../dcaeapp/impl/config/DcaeAppSimConfiguration.kt | 0 .../veshv/simulators/dcaeapp/impl/consumer.kt | 0 .../collectors/veshv/simulators/dcaeapp/main.kt | 0 .../src/main/resources/logback.xml | 0 .../veshv/simulators/dcaeapp/impl/ConsumerTest.kt | 0 .../dcaeapp/impl/DcaeAppSimulatorTest.kt | 0 .../dcaeapp/impl/MessageStreamValidationTest.kt | 0 .../dcaeapp/impl/adapters/KafkaSourceTest.kt | 0 .../impl/config/ArgDcaeAppSimConfigurationTest.kt | 0 .../hv-collector-domain}/pom.xml | 2 +- .../onap/dcae/collectors/veshv/domain/ByteData.kt | 0 .../collectors/veshv/domain/PayloadContentType.kt | 0 .../veshv/domain/SecurityConfiguration.kt | 0 .../dcae/collectors/veshv/domain/VesEventDomain.kt | 0 .../org/onap/dcae/collectors/veshv/domain/codec.kt | 0 .../onap/dcae/collectors/veshv/domain/errors.kt | 0 .../dcae/collectors/veshv/domain/validation.kt | 0 .../dcae/collectors/veshv/domain/wire_frame.kt | 0 .../src/main/proto/event/VesEvent.proto | 0 .../src/main/proto/measurements/README.md | 0 .../collectors/veshv/domain/WireFrameCodecsTest.kt | 0 .../src/test/resources/logback.xml | 0 .../hv-collector-health-check}/pom.xml | 2 +- .../veshv/healthcheck/api/HealthDescription.kt | 0 .../veshv/healthcheck/api/HealthState.kt | 0 .../veshv/healthcheck/api/HealthStatus.kt | 0 .../healthcheck/factory/HealthCheckApiServer.kt | 0 .../veshv/healthcheck/impl/HealthStateImpl.kt | 0 .../impl/HealthStateProviderImplTest.kt | 0 .../hv-collector-main}/Dockerfile | 0 .../hv-collector-main}/pom.xml | 2 +- .../collectors/veshv/main/ArgVesHvConfiguration.kt | 0 .../collectors/veshv/main/MicrometerMetrics.kt | 0 .../org/onap/dcae/collectors/veshv/main/main.kt | 0 .../veshv/main/servers/HealthCheckServer.kt | 0 .../collectors/veshv/main/servers/ServerStarter.kt | 0 .../collectors/veshv/main/servers/VesServer.kt | 0 .../src/main/resources/logback.xml | 0 .../src/main/scripts/healthcheck.sh | 0 .../veshv/main/ArgVesHvConfigurationTest.kt | 0 .../collectors/veshv/main/MicrometerMetricsTest.kt | 0 .../dcae/collectors/veshv/main/NioBuffersTest.kt | 0 .../hv-collector-ssl}/pom.xml | 2 +- .../veshv/ssl/boundary/ClientSslContextFactory.kt | 0 .../veshv/ssl/boundary/ServerSslContextFactory.kt | 0 .../veshv/ssl/boundary/SslContextFactory.kt | 0 .../dcae/collectors/veshv/ssl/boundary/utils.kt | 0 .../dcae/collectors/veshv/ssl/impl/SslFactories.kt | 0 .../ssl/boundary/ServerSslContextFactoryTest.kt | 0 .../src/test/resources/logback-test.xml | 0 .../src/test/resources/ssl/ca.crt | 0 .../src/test/resources/ssl/server.crt | 0 .../src/test/resources/ssl/server.key | 0 .../src/test/resources/ssl/server.ks.pkcs12 | Bin .../src/test/resources/ssl/trust.pkcs12 | Bin .../hv-collector-test-utils}/pom.xml | 2 +- .../dcae/collectors/veshv/tests/utils/arrow.kt | 0 .../collectors/veshv/tests/utils/assertions.kt | 0 .../collectors/veshv/tests/utils/configurations.kt | 0 .../dcae/collectors/veshv/tests/utils/messages.kt | 0 .../dcae/collectors/veshv/tests/utils/vesEvents.kt | 0 .../org.mockito.plugins.MockMaker | 0 .../hv-collector-utils}/pom.xml | 2 +- .../onap/dcae/collectors/veshv/utils/arrow/core.kt | 0 .../dcae/collectors/veshv/utils/arrow/effects.kt | 0 .../utils/commandline/ArgBasedConfiguration.kt | 0 .../veshv/utils/commandline/CommandLineOption.kt | 0 .../veshv/utils/commandline/WrongArgumentError.kt | 0 .../veshv/utils/commandline/extensions.kt | 0 .../onap/dcae/collectors/veshv/utils/http/http.kt | 0 .../dcae/collectors/veshv/utils/http/ratpack.kt | 0 .../dcae/collectors/veshv/utils/logging/Logger.kt | 2 +- .../veshv/utils/logging/reactive_logging.kt | 0 .../dcae/collectors/veshv/utils/server_handle.kt | 0 .../collectors/veshv/utils/arrow/CoreKtTest.kt | 0 .../utils/commandline/CommandLineOptionTest.kt | 0 .../utils/commandline/WrongArgumentErrorTest.kt | 0 .../collectors/veshv/utils/http/ResponsesTest.kt | 0 .../collectors/veshv/utils/logging/LoggerTest.kt | 0 .../hv-collector-ves-message-generator}/pom.xml | 2 +- .../ves/message/generator/api/MessageGenerator.kt | 0 .../ves/message/generator/api/MessageParameters.kt | 0 .../generator/api/MessageParametersParser.kt | 0 .../veshv/ves/message/generator/api/MessageType.kt | 0 .../generator/factory/MessageGeneratorFactory.kt | 0 .../generator/impl/CommonEventHeaderParser.kt | 0 .../message/generator/impl/MessageGeneratorImpl.kt | 0 .../generator/impl/MessageParametersParserImpl.kt | 0 .../ves/message/generator/impl/PayloadGenerator.kt | 0 .../generator/impl/CommonEventHeaderParserTest.kt | 0 .../generator/impl/MessageGeneratorImplTest.kt | 0 .../generator/impl/MessageParametersParserTest.kt | 0 .../message/generator/impl/PayloadGeneratorTest.kt | 0 .../veshv/ves/message/generator/impl/parameters.kt | 0 .../hv-collector-xnf-simulator}/Dockerfile | 0 .../hv-collector-xnf-simulator}/pom.xml | 2 +- .../veshv/simulators/xnf/impl/XnfSimulator.kt | 0 .../simulators/xnf/impl/adapters/VesHvClient.kt | 0 .../simulators/xnf/impl/adapters/XnfApiServer.kt | 0 .../impl/config/ArgXnfSimulatorConfiguration.kt | 0 .../xnf/impl/config/SimulatorConfiguration.kt | 0 .../veshv/simulators/xnf/impl/simulations.kt | 0 .../dcae/collectors/veshv/simulators/xnf/main.kt | 0 .../src/main/resources/logback.xml | 0 .../veshv/main/OngoingSimulationsTest.kt | 0 .../dcae/collectors/veshv/main/XnfSimulatorTest.kt | 0 sources/pom.xml | 135 +++++++++++++++++++ 168 files changed, 600 insertions(+), 133 deletions(-) create mode 100644 build/hv-collector-analysis/pom.xml create mode 100644 build/hv-collector-analysis/src/main/kotlin/org/onap/dcae/collectors/veshv/analysis/SuboptimalLoggerUsage.kt create mode 100644 build/hv-collector-analysis/src/main/kotlin/org/onap/dcae/collectors/veshv/analysis/VesHvRuleSetProvider.kt create mode 100644 build/hv-collector-analysis/src/main/resources/META-INF/services/io.gitlab.arturbosch.detekt.api.RuleSetProvider rename {hv-collector-analysis => build/hv-collector-analysis}/src/main/resources/onap-detekt-config.yml (99%) create mode 100644 build/hv-collector-analysis/src/test/kotlin/org/onap/dcae/collectors/veshv/analysis/SuboptimalLoggerUsageTest.kt create mode 100644 build/hv-collector-analysis/src/test/resources/META-INF/services/javax.script.ScriptEngineFactory rename {hv-collector-coverage => build/hv-collector-coverage}/check-coverage.sh (100%) rename {hv-collector-coverage => build/hv-collector-coverage}/pom.xml (98%) rename {hv-collector-analysis => build}/pom.xml (54%) rename {hv-collector-core => sources/hv-collector-core}/pom.xml (98%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/boundary/adapters.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/boundary/api.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/factory/CollectorFactory.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/factory/ServerFactory.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/MessageValidator.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/Router.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/VesDecoder.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/VesHvCollector.kt (97%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/AdapterFactory.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProvider.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/HttpAdapter.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/LoggingSinkProvider.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSink.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSinkProvider.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/ProtobufSerializer.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/VesMessageSerializer.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/wire/WireChunkDecoder.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/wire/WireFrameException.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/model/CollectorConfiguration.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/model/ConfigurationProviderParams.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/model/RoutedMessage.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/model/ServerConfiguration.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/model/VesMessage.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/main/kotlin/org/onap/dcae/collectors/veshv/model/routing.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/MessageValidatorTest.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/RouterTest.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/VesDecoderTest.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProviderTest.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/HttpAdapterTest.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/wire/WireChunkDecoderTest.kt (100%) rename {hv-collector-core => sources/hv-collector-core}/src/test/resources/logback-test.xml (100%) rename {hv-collector-ct => sources/hv-collector-ct}/pom.xml (98%) rename {hv-collector-ct => sources/hv-collector-ct}/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/PerformanceSpecification.kt (100%) rename {hv-collector-ct => sources/hv-collector-ct}/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/Sut.kt (100%) rename {hv-collector-ct => sources/hv-collector-ct}/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/VesHvSpecification.kt (100%) rename {hv-collector-ct => sources/hv-collector-ct}/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/spekUtils.kt (100%) rename {hv-collector-ct => sources/hv-collector-ct}/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/FakeHealthState.kt (100%) rename {hv-collector-ct => sources/hv-collector-ct}/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/configuration.kt (100%) rename {hv-collector-ct => sources/hv-collector-ct}/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/metrics.kt (100%) rename {hv-collector-ct => sources/hv-collector-ct}/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/sink.kt (100%) rename {hv-collector-ct => sources/hv-collector-ct}/src/test/resources/logback-test.xml (100%) rename {hv-collector-dcae-app-simulator => sources/hv-collector-dcae-app-simulator}/Dockerfile (100%) rename {hv-collector-dcae-app-simulator => sources/hv-collector-dcae-app-simulator}/pom.xml (98%) rename {hv-collector-dcae-app-simulator => sources/hv-collector-dcae-app-simulator}/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/DcaeAppSimulator.kt (100%) rename {hv-collector-dcae-app-simulator => sources/hv-collector-dcae-app-simulator}/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/MessageStreamValidation.kt (100%) rename {hv-collector-dcae-app-simulator => sources/hv-collector-dcae-app-simulator}/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/DcaeAppApiServer.kt (100%) rename {hv-collector-dcae-app-simulator => sources/hv-collector-dcae-app-simulator}/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/KafkaSource.kt (100%) rename {hv-collector-dcae-app-simulator => sources/hv-collector-dcae-app-simulator}/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/ArgDcaeAppSimConfiguration.kt (100%) rename {hv-collector-dcae-app-simulator => sources/hv-collector-dcae-app-simulator}/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/DcaeAppSimConfiguration.kt (100%) rename {hv-collector-dcae-app-simulator => sources/hv-collector-dcae-app-simulator}/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/consumer.kt (100%) rename {hv-collector-dcae-app-simulator => sources/hv-collector-dcae-app-simulator}/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/main.kt (100%) rename {hv-collector-dcae-app-simulator => sources/hv-collector-dcae-app-simulator}/src/main/resources/logback.xml (100%) rename {hv-collector-dcae-app-simulator => sources/hv-collector-dcae-app-simulator}/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/ConsumerTest.kt (100%) rename {hv-collector-dcae-app-simulator => sources/hv-collector-dcae-app-simulator}/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/DcaeAppSimulatorTest.kt (100%) rename {hv-collector-dcae-app-simulator => sources/hv-collector-dcae-app-simulator}/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/MessageStreamValidationTest.kt (100%) rename {hv-collector-dcae-app-simulator => sources/hv-collector-dcae-app-simulator}/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/KafkaSourceTest.kt (100%) rename {hv-collector-dcae-app-simulator => sources/hv-collector-dcae-app-simulator}/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/ArgDcaeAppSimConfigurationTest.kt (100%) rename {hv-collector-domain => sources/hv-collector-domain}/pom.xml (98%) rename {hv-collector-domain => sources/hv-collector-domain}/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/ByteData.kt (100%) rename {hv-collector-domain => sources/hv-collector-domain}/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/PayloadContentType.kt (100%) rename {hv-collector-domain => sources/hv-collector-domain}/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/SecurityConfiguration.kt (100%) rename {hv-collector-domain => sources/hv-collector-domain}/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/VesEventDomain.kt (100%) rename {hv-collector-domain => sources/hv-collector-domain}/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/codec.kt (100%) rename {hv-collector-domain => sources/hv-collector-domain}/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/errors.kt (100%) rename {hv-collector-domain => sources/hv-collector-domain}/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/validation.kt (100%) rename {hv-collector-domain => sources/hv-collector-domain}/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/wire_frame.kt (100%) rename {hv-collector-domain => sources/hv-collector-domain}/src/main/proto/event/VesEvent.proto (100%) rename {hv-collector-domain => sources/hv-collector-domain}/src/main/proto/measurements/README.md (100%) rename {hv-collector-domain => sources/hv-collector-domain}/src/test/kotlin/org/onap/dcae/collectors/veshv/domain/WireFrameCodecsTest.kt (100%) rename {hv-collector-domain => sources/hv-collector-domain}/src/test/resources/logback.xml (100%) rename {hv-collector-health-check => sources/hv-collector-health-check}/pom.xml (97%) rename {hv-collector-health-check => sources/hv-collector-health-check}/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/api/HealthDescription.kt (100%) rename {hv-collector-health-check => sources/hv-collector-health-check}/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/api/HealthState.kt (100%) rename {hv-collector-health-check => sources/hv-collector-health-check}/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/api/HealthStatus.kt (100%) rename {hv-collector-health-check => sources/hv-collector-health-check}/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/factory/HealthCheckApiServer.kt (100%) rename {hv-collector-health-check => sources/hv-collector-health-check}/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/impl/HealthStateImpl.kt (100%) rename {hv-collector-health-check => sources/hv-collector-health-check}/src/test/kotlin/org/onap/dcae/collectors/veshv/healthcheck/impl/HealthStateProviderImplTest.kt (100%) rename {hv-collector-main => sources/hv-collector-main}/Dockerfile (100%) rename {hv-collector-main => sources/hv-collector-main}/pom.xml (98%) rename {hv-collector-main => sources/hv-collector-main}/src/main/kotlin/org/onap/dcae/collectors/veshv/main/ArgVesHvConfiguration.kt (100%) rename {hv-collector-main => sources/hv-collector-main}/src/main/kotlin/org/onap/dcae/collectors/veshv/main/MicrometerMetrics.kt (100%) rename {hv-collector-main => sources/hv-collector-main}/src/main/kotlin/org/onap/dcae/collectors/veshv/main/main.kt (100%) rename {hv-collector-main => sources/hv-collector-main}/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/HealthCheckServer.kt (100%) rename {hv-collector-main => sources/hv-collector-main}/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/ServerStarter.kt (100%) rename {hv-collector-main => sources/hv-collector-main}/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/VesServer.kt (100%) rename {hv-collector-main => sources/hv-collector-main}/src/main/resources/logback.xml (100%) rename {hv-collector-main => sources/hv-collector-main}/src/main/scripts/healthcheck.sh (100%) rename {hv-collector-main => sources/hv-collector-main}/src/test/kotlin/org/onap/dcae/collectors/veshv/main/ArgVesHvConfigurationTest.kt (100%) rename {hv-collector-main => sources/hv-collector-main}/src/test/kotlin/org/onap/dcae/collectors/veshv/main/MicrometerMetricsTest.kt (100%) rename {hv-collector-main => sources/hv-collector-main}/src/test/kotlin/org/onap/dcae/collectors/veshv/main/NioBuffersTest.kt (100%) rename {hv-collector-ssl => sources/hv-collector-ssl}/pom.xml (98%) rename {hv-collector-ssl => sources/hv-collector-ssl}/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/ClientSslContextFactory.kt (100%) rename {hv-collector-ssl => sources/hv-collector-ssl}/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/ServerSslContextFactory.kt (100%) rename {hv-collector-ssl => sources/hv-collector-ssl}/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/SslContextFactory.kt (100%) rename {hv-collector-ssl => sources/hv-collector-ssl}/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/utils.kt (100%) rename {hv-collector-ssl => sources/hv-collector-ssl}/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/impl/SslFactories.kt (100%) rename {hv-collector-ssl => sources/hv-collector-ssl}/src/test/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/ServerSslContextFactoryTest.kt (100%) rename {hv-collector-ssl => sources/hv-collector-ssl}/src/test/resources/logback-test.xml (100%) rename {hv-collector-ssl => sources/hv-collector-ssl}/src/test/resources/ssl/ca.crt (100%) rename {hv-collector-ssl => sources/hv-collector-ssl}/src/test/resources/ssl/server.crt (100%) rename {hv-collector-ssl => sources/hv-collector-ssl}/src/test/resources/ssl/server.key (100%) rename {hv-collector-ssl => sources/hv-collector-ssl}/src/test/resources/ssl/server.ks.pkcs12 (100%) rename {hv-collector-ssl => sources/hv-collector-ssl}/src/test/resources/ssl/trust.pkcs12 (100%) rename {hv-collector-test-utils => sources/hv-collector-test-utils}/pom.xml (97%) rename {hv-collector-test-utils => sources/hv-collector-test-utils}/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/arrow.kt (100%) rename {hv-collector-test-utils => sources/hv-collector-test-utils}/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/assertions.kt (100%) rename {hv-collector-test-utils => sources/hv-collector-test-utils}/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/configurations.kt (100%) rename {hv-collector-test-utils => sources/hv-collector-test-utils}/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/messages.kt (100%) rename {hv-collector-test-utils => sources/hv-collector-test-utils}/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/vesEvents.kt (100%) rename {hv-collector-test-utils => sources/hv-collector-test-utils}/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%) rename {hv-collector-utils => sources/hv-collector-utils}/pom.xml (98%) rename {hv-collector-utils => sources/hv-collector-utils}/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/core.kt (100%) rename {hv-collector-utils => sources/hv-collector-utils}/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/effects.kt (100%) rename {hv-collector-utils => sources/hv-collector-utils}/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/ArgBasedConfiguration.kt (100%) rename {hv-collector-utils => sources/hv-collector-utils}/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOption.kt (100%) rename {hv-collector-utils => sources/hv-collector-utils}/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/WrongArgumentError.kt (100%) rename {hv-collector-utils => sources/hv-collector-utils}/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/extensions.kt (100%) rename {hv-collector-utils => sources/hv-collector-utils}/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/http/http.kt (100%) rename {hv-collector-utils => sources/hv-collector-utils}/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/http/ratpack.kt (100%) rename {hv-collector-utils => sources/hv-collector-utils}/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/logging/Logger.kt (98%) rename {hv-collector-utils => sources/hv-collector-utils}/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/logging/reactive_logging.kt (100%) rename {hv-collector-utils => sources/hv-collector-utils}/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/server_handle.kt (100%) rename {hv-collector-utils => sources/hv-collector-utils}/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/CoreKtTest.kt (100%) rename {hv-collector-utils => sources/hv-collector-utils}/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOptionTest.kt (100%) rename {hv-collector-utils => sources/hv-collector-utils}/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/WrongArgumentErrorTest.kt (100%) rename {hv-collector-utils => sources/hv-collector-utils}/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/http/ResponsesTest.kt (100%) rename {hv-collector-utils => sources/hv-collector-utils}/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/logging/LoggerTest.kt (100%) rename {hv-collector-ves-message-generator => sources/hv-collector-ves-message-generator}/pom.xml (98%) rename {hv-collector-ves-message-generator => sources/hv-collector-ves-message-generator}/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageGenerator.kt (100%) rename {hv-collector-ves-message-generator => sources/hv-collector-ves-message-generator}/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageParameters.kt (100%) rename {hv-collector-ves-message-generator => sources/hv-collector-ves-message-generator}/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageParametersParser.kt (100%) rename {hv-collector-ves-message-generator => sources/hv-collector-ves-message-generator}/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageType.kt (100%) rename {hv-collector-ves-message-generator => sources/hv-collector-ves-message-generator}/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/factory/MessageGeneratorFactory.kt (100%) rename {hv-collector-ves-message-generator => sources/hv-collector-ves-message-generator}/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/CommonEventHeaderParser.kt (100%) rename {hv-collector-ves-message-generator => sources/hv-collector-ves-message-generator}/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageGeneratorImpl.kt (100%) rename {hv-collector-ves-message-generator => sources/hv-collector-ves-message-generator}/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageParametersParserImpl.kt (100%) rename {hv-collector-ves-message-generator => sources/hv-collector-ves-message-generator}/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/PayloadGenerator.kt (100%) rename {hv-collector-ves-message-generator => sources/hv-collector-ves-message-generator}/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/CommonEventHeaderParserTest.kt (100%) rename {hv-collector-ves-message-generator => sources/hv-collector-ves-message-generator}/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageGeneratorImplTest.kt (100%) rename {hv-collector-ves-message-generator => sources/hv-collector-ves-message-generator}/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageParametersParserTest.kt (100%) rename {hv-collector-ves-message-generator => sources/hv-collector-ves-message-generator}/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/PayloadGeneratorTest.kt (100%) rename {hv-collector-ves-message-generator => sources/hv-collector-ves-message-generator}/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/parameters.kt (100%) rename {hv-collector-xnf-simulator => sources/hv-collector-xnf-simulator}/Dockerfile (100%) rename {hv-collector-xnf-simulator => sources/hv-collector-xnf-simulator}/pom.xml (98%) rename {hv-collector-xnf-simulator => sources/hv-collector-xnf-simulator}/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/XnfSimulator.kt (100%) rename {hv-collector-xnf-simulator => sources/hv-collector-xnf-simulator}/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/VesHvClient.kt (100%) rename {hv-collector-xnf-simulator => sources/hv-collector-xnf-simulator}/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/XnfApiServer.kt (100%) rename {hv-collector-xnf-simulator => sources/hv-collector-xnf-simulator}/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/config/ArgXnfSimulatorConfiguration.kt (100%) rename {hv-collector-xnf-simulator => sources/hv-collector-xnf-simulator}/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/config/SimulatorConfiguration.kt (100%) rename {hv-collector-xnf-simulator => sources/hv-collector-xnf-simulator}/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/simulations.kt (100%) rename {hv-collector-xnf-simulator => sources/hv-collector-xnf-simulator}/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/main.kt (100%) rename {hv-collector-xnf-simulator => sources/hv-collector-xnf-simulator}/src/main/resources/logback.xml (100%) rename {hv-collector-xnf-simulator => sources/hv-collector-xnf-simulator}/src/test/kotlin/org/onap/dcae/collectors/veshv/main/OngoingSimulationsTest.kt (100%) rename {hv-collector-xnf-simulator => sources/hv-collector-xnf-simulator}/src/test/kotlin/org/onap/dcae/collectors/veshv/main/XnfSimulatorTest.kt (100%) create mode 100644 sources/pom.xml diff --git a/build/hv-collector-analysis/pom.xml b/build/hv-collector-analysis/pom.xml new file mode 100644 index 00000000..7a553b4e --- /dev/null +++ b/build/hv-collector-analysis/pom.xml @@ -0,0 +1,150 @@ + + + + 4.0.0 + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + org.onap.dcaegen2.collectors.hv-ves + hv-collector-build + 1.1.0-SNAPSHOT + .. + + + hv-collector-analysis + 1.1.0-SNAPSHOT + VES HighVolume Collector :: Code analysis configuration + + + + io.gitlab.arturbosch.detekt + detekt-api + ${detekt.version} + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + + + org.jetbrains.kotlin + kotlin-reflect + + + org.jetbrains.kotlin + kotlin-compiler-embeddable + + + + org.jetbrains.kotlin + kotlin-script-runtime + + + org.jetbrains.kotlin + kotlin-script-util + + + + io.gitlab.arturbosch.detekt + detekt-test + ${detekt.version} + test + + + org.jetbrains.spek + spek-api + + + org.jetbrains.spek + spek-junit-platform-engine + + + org.jetbrains.kotlin + kotlin-test + + + org.assertj + assertj-core + + + + + ${project.basedir}/src/main/kotlin + ${project.basedir}/src/test/kotlin + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + org.apache.maven.plugins + maven-resources-plugin + + UTF-8 + + + + + kotlin-maven-plugin + org.jetbrains.kotlin + ${kotlin.version} + + 1.8 + + + + compile + + compile + + + + ${project.build.sourceDirectory} + + + + + test-compile + + test-compile + + + + ${project.build.testSourceDirectory} + + + + + + + + diff --git a/build/hv-collector-analysis/src/main/kotlin/org/onap/dcae/collectors/veshv/analysis/SuboptimalLoggerUsage.kt b/build/hv-collector-analysis/src/main/kotlin/org/onap/dcae/collectors/veshv/analysis/SuboptimalLoggerUsage.kt new file mode 100644 index 00000000..a070584c --- /dev/null +++ b/build/hv-collector-analysis/src/main/kotlin/org/onap/dcae/collectors/veshv/analysis/SuboptimalLoggerUsage.kt @@ -0,0 +1,92 @@ +/* + * ============LICENSE_START======================================================= + * dcaegen2-collectors-veshv + * ================================================================================ + * Copyright (C) 2018 NOKIA + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.dcae.collectors.veshv.analysis + +import io.gitlab.arturbosch.detekt.api.CodeSmell +import io.gitlab.arturbosch.detekt.api.Config +import io.gitlab.arturbosch.detekt.api.Debt +import io.gitlab.arturbosch.detekt.api.Entity +import io.gitlab.arturbosch.detekt.api.Issue +import io.gitlab.arturbosch.detekt.api.Rule +import io.gitlab.arturbosch.detekt.api.Severity +import org.jetbrains.kotlin.com.intellij.psi.PsiElement +import org.jetbrains.kotlin.psi.KtCallExpression +import org.jetbrains.kotlin.psi.KtOperationExpression +import org.jetbrains.kotlin.psi.KtStringTemplateExpression +import org.jetbrains.kotlin.psi.KtValueArgumentList +import org.jetbrains.kotlin.psi.psiUtil.anyDescendantOfType + +/** + * @author Piotr Jaszczyk + * @since November 2018 + */ +class SuboptimalLoggerUsage(config: Config) : Rule(config) { + + override val issue = Issue(javaClass.simpleName, + Severity.Performance, + """ + Reports usage of unoptimized logger calls. + In Kotlin every method call (including logger calls) is eagerly evaluated by default. That means that + each argument will be evaluated even if loglevel is higher than in current call. The most common way of + mitigating this issue is to use lazy loading by means of lambda expressions, so instead of + log.debug("a=${'$'}a") we can write log.debug{ "a=${'$'}a" }. Logging string literals is fine - no + additional computation will be performed.""".trimIndent(), + Debt(mins = 10)) + + private val loggerNames = config.valueOrDefault("loggerNames", DEFAULT_LOGGER_NAMES).split(",") + + private val loggingMethods = config.valueOrDefault("loggingMethodNames", DEFAULT_LOGGING_METHOD_NAMES).split(",") + + override fun visitCallExpression(expression: KtCallExpression) { + val targetObject = expression.parent.firstChild + val methodName = expression.firstChild + + logExpressionArguments(targetObject, methodName) + ?.let(this::checkGettingWarningMessage) + ?.let { reportCodeSmell(expression, it) } + } + + private fun logExpressionArguments(targetObject: PsiElement, methodName: PsiElement) = + if (isLogExpression(targetObject, methodName)) + methodName.nextSibling as? KtValueArgumentList + else null + + private fun isLogExpression(targetObject: PsiElement, methodName: PsiElement) = + loggerNames.any(targetObject::textMatches) && loggingMethods.any(methodName::textMatches) + + private fun checkGettingWarningMessage(args: KtValueArgumentList) = when { + args.anyDescendantOfType { true } -> + "should not use any operators in logging expression" + args.anyDescendantOfType { true } -> + "should not call anything in logging expression" + args.anyDescendantOfType { it.hasInterpolation() } -> + "should not use string interpolation in logging expression" + else -> null + } + + private fun reportCodeSmell(expression: KtCallExpression, message: String) { + report(CodeSmell(issue, Entity.from(expression), message)) + } + + companion object { + const val DEFAULT_LOGGER_NAMES = "logger,LOGGER,log,LOG" + const val DEFAULT_LOGGING_METHOD_NAMES = "trace,debug,info,warn,error,severe" + } +} diff --git a/build/hv-collector-analysis/src/main/kotlin/org/onap/dcae/collectors/veshv/analysis/VesHvRuleSetProvider.kt b/build/hv-collector-analysis/src/main/kotlin/org/onap/dcae/collectors/veshv/analysis/VesHvRuleSetProvider.kt new file mode 100644 index 00000000..eec933dc --- /dev/null +++ b/build/hv-collector-analysis/src/main/kotlin/org/onap/dcae/collectors/veshv/analysis/VesHvRuleSetProvider.kt @@ -0,0 +1,36 @@ +/* + * ============LICENSE_START======================================================= + * dcaegen2-collectors-veshv + * ================================================================================ + * Copyright (C) 2018 NOKIA + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.dcae.collectors.veshv.analysis + +import io.gitlab.arturbosch.detekt.api.Config +import io.gitlab.arturbosch.detekt.api.RuleSet +import io.gitlab.arturbosch.detekt.api.RuleSetProvider + +/** + * @author Piotr Jaszczyk + * @since November 2018 + */ +class VesHvRuleSetProvider : RuleSetProvider { + override val ruleSetId: String + get() = "HvVesCustomRules" + + override fun instance(config: Config) = RuleSet(ruleSetId, listOf(SuboptimalLoggerUsage(config))) + +} diff --git a/build/hv-collector-analysis/src/main/resources/META-INF/services/io.gitlab.arturbosch.detekt.api.RuleSetProvider b/build/hv-collector-analysis/src/main/resources/META-INF/services/io.gitlab.arturbosch.detekt.api.RuleSetProvider new file mode 100644 index 00000000..2b26f32f --- /dev/null +++ b/build/hv-collector-analysis/src/main/resources/META-INF/services/io.gitlab.arturbosch.detekt.api.RuleSetProvider @@ -0,0 +1 @@ +org.onap.dcae.collectors.veshv.analysis.VesHvRuleSetProvider \ No newline at end of file diff --git a/hv-collector-analysis/src/main/resources/onap-detekt-config.yml b/build/hv-collector-analysis/src/main/resources/onap-detekt-config.yml similarity index 99% rename from hv-collector-analysis/src/main/resources/onap-detekt-config.yml rename to build/hv-collector-analysis/src/main/resources/onap-detekt-config.yml index 99faaa79..f705d36c 100644 --- a/hv-collector-analysis/src/main/resources/onap-detekt-config.yml +++ b/build/hv-collector-analysis/src/main/resources/onap-detekt-config.yml @@ -473,3 +473,8 @@ style: WildcardImport: active: true excludeImports: 'java.util.*,kotlinx.android.synthetic.*' + +HvVesCustomRules: + active: true + SuboptimalLoggerUsage: + active: true diff --git a/build/hv-collector-analysis/src/test/kotlin/org/onap/dcae/collectors/veshv/analysis/SuboptimalLoggerUsageTest.kt b/build/hv-collector-analysis/src/test/kotlin/org/onap/dcae/collectors/veshv/analysis/SuboptimalLoggerUsageTest.kt new file mode 100644 index 00000000..0a1d658b --- /dev/null +++ b/build/hv-collector-analysis/src/test/kotlin/org/onap/dcae/collectors/veshv/analysis/SuboptimalLoggerUsageTest.kt @@ -0,0 +1,126 @@ +/* + * ============LICENSE_START======================================================= + * dcaegen2-collectors-veshv + * ================================================================================ + * Copyright (C) 2018 NOKIA + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.dcae.collectors.veshv.analysis + +import io.gitlab.arturbosch.detekt.api.Config +import io.gitlab.arturbosch.detekt.test.TestConfig +import io.gitlab.arturbosch.detekt.test.assertThat +import io.gitlab.arturbosch.detekt.test.compileAndLint +import org.jetbrains.spek.api.Spek +import org.jetbrains.spek.api.dsl.describe +import org.jetbrains.spek.api.dsl.it +import org.jetbrains.spek.api.dsl.xdescribe + +/** + * @author Piotr Jaszczyk @nokia.com> + * @since November 2018 + */ +internal class SuboptimalLoggerUsageTest : Spek({ + + fun checkPassingCase(code: String, cut: SuboptimalLoggerUsage = SuboptimalLoggerUsage(Config.empty)) { + describe(code) { + val findings = cut.compileAndLint(CodeSamples.code(code)) + + it("should pass") { + assertThat(findings).isEmpty() + } + } + } + + fun checkFailingCase(code: String, cut: SuboptimalLoggerUsage = SuboptimalLoggerUsage(Config.empty)) { + describe(code) { + val findings = cut.compileAndLint(CodeSamples.code(code)) + + it("should fail") { + assertThat(findings).isNotEmpty() + } + } + } + + describe("passing cases") { + checkPassingCase(CodeSamples.noConcatCall) + checkPassingCase(CodeSamples.exceptionCall) + checkPassingCase(CodeSamples.lambdaCall) + checkPassingCase(CodeSamples.lambdaFunctionCall) + checkPassingCase(CodeSamples.lambdaExceptionCall) + } + + + describe("failing cases") { + checkFailingCase(CodeSamples.plainConcatCall) + checkFailingCase(CodeSamples.expansionCall) + checkFailingCase(CodeSamples.plainConcatExceptionCall) + checkFailingCase(CodeSamples.expansionExceptionCall) + } + + describe("custom configuration") { + val cut = SuboptimalLoggerUsage(TestConfig(mapOf("loggerNames" to "l,lo", "loggingMethodNames" to "print"))) + val strangeLogger = """ + val l = object { + fun print(m: String) { } + } + val lo = l + """.trimIndent() + + checkPassingCase(CodeSamples.plainConcatCall, cut) + + checkPassingCase(""" + $strangeLogger + l.print("n")""".trimIndent(), cut) + + checkFailingCase(""" + $strangeLogger + l.print("n=" + n)""".trimIndent(), cut) + + checkFailingCase(""" + $strangeLogger + lo.print("n=${'$'}n")""".trimIndent(), cut) + } +}) + +object CodeSamples { + private val codeBefore = """ + object logger { + fun debug(msg: String) { println(msg) } + fun debug(msg: String, ex: Throwable) { println(msg + ". Cause: " + ex) } + fun debug(msg: () -> String) { println(msg()) } + fun debug(ex: Throwable, msg: () -> String) { println(msg() + ". Cause: " + ex) } + } + + fun execute(n: Integer) { + val ex = Exception() + + """.trimIndent() + private const val codeAfter = """}""" + + const val noConcatCall = """logger.debug("Executing...")""" + const val exceptionCall = """logger.debug("Fail", ex)""" + const val lambdaCall = """logger.debug{ "n=${'$'}n" }""" + const val lambdaFunctionCall = """logger.debug { n.toString() }""" + const val lambdaExceptionCall = """logger.debug(ex) { "epic fail on n=" + n }""" + + const val plainConcatCall = """logger.debug("n=" + n)""" + const val expansionCall = """logger.debug("n=${'$'}n")""" + const val plainConcatExceptionCall = """logger.debug("Fail. n=" + n, ex)""" + const val expansionExceptionCall = """logger.debug("Fail. n=${'$'}n", ex)""" + + + fun code(core: String) = codeBefore + core + codeAfter +} \ No newline at end of file diff --git a/build/hv-collector-analysis/src/test/resources/META-INF/services/javax.script.ScriptEngineFactory b/build/hv-collector-analysis/src/test/resources/META-INF/services/javax.script.ScriptEngineFactory new file mode 100644 index 00000000..f8f59003 --- /dev/null +++ b/build/hv-collector-analysis/src/test/resources/META-INF/services/javax.script.ScriptEngineFactory @@ -0,0 +1 @@ +org.jetbrains.kotlin.script.jsr223.KotlinJsr223JvmLocalScriptEngineFactory \ No newline at end of file diff --git a/hv-collector-coverage/check-coverage.sh b/build/hv-collector-coverage/check-coverage.sh similarity index 100% rename from hv-collector-coverage/check-coverage.sh rename to build/hv-collector-coverage/check-coverage.sh diff --git a/hv-collector-coverage/pom.xml b/build/hv-collector-coverage/pom.xml similarity index 98% rename from hv-collector-coverage/pom.xml rename to build/hv-collector-coverage/pom.xml index f1e5c742..9b3f257a 100644 --- a/hv-collector-coverage/pom.xml +++ b/build/hv-collector-coverage/pom.xml @@ -32,7 +32,7 @@ org.onap.dcaegen2.collectors.hv-ves - ves-hv-collector + hv-collector-build 1.1.0-SNAPSHOT .. diff --git a/hv-collector-analysis/pom.xml b/build/pom.xml similarity index 54% rename from hv-collector-analysis/pom.xml rename to build/pom.xml index 9ace2758..fb1b8fb3 100644 --- a/hv-collector-analysis/pom.xml +++ b/build/pom.xml @@ -18,9 +18,8 @@ ~ limitations under the License. ~ ============LICENSE_END========================================================= --> - + + 4.0.0 @@ -30,30 +29,20 @@ - org.onap.dcaegen2.collectors.hv-ves - hv-collector-analysis - 1.1.0-SNAPSHOT - VES HighVolume Collector :: Code analysis configuration - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - + + org.onap.dcaegen2.collectors.hv-ves + ves-hv-collector + 1.1.0-SNAPSHOT + .. + - - org.apache.maven.plugins - maven-resources-plugin - 3.1.0 - - UTF-8 - - - - + hv-collector-build + 1.1.0-SNAPSHOT + VES HighVolume Collector :: Build-time modules + pom - \ No newline at end of file + + hv-collector-analysis + hv-collector-coverage + + diff --git a/pom.xml b/pom.xml index 2381a608..5a83fc81 100644 --- a/pom.xml +++ b/pom.xml @@ -44,19 +44,8 @@ pom - hv-collector-analysis - hv-collector-core - hv-collector-coverage - hv-collector-ct - hv-collector-dcae-app-simulator - hv-collector-domain - hv-collector-health-check - hv-collector-main - hv-collector-ssl - hv-collector-test-utils - hv-collector-utils - hv-collector-ves-message-generator - hv-collector-xnf-simulator + build + sources @@ -65,7 +54,7 @@ 3.7.0 1.7 0.8.2 - 60 + 1.0.0-RC11 3.6.1 @@ -81,6 +70,7 @@ false false true + 60 false @@ -125,7 +115,6 @@ ${kotlin.version} 1.8 - enable @@ -271,82 +260,6 @@ - - - maven-checkstyle-plugin - 2.17 - - - org.onap.oparent - checkstyle - 1.1.1 - - - - - - check-license-kotlin - - check - - process-sources - - onap-checkstyle/check-license.xml - false - true - false - **\/*.kt - true - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.8 - - - - detekt - verify - - run - - - - - - - - - - - - - - - - - - - - - - io.gitlab.arturbosch.detekt - detekt-cli - 1.0.0-RC11 - - - ${project.groupId} - hv-collector-analysis - 1.1.0-SNAPSHOT - - - - kr.motd.maven @@ -520,6 +433,23 @@ kotlin-reflect ${kotlin.version} + + org.jetbrains.kotlin + kotlin-compiler-embeddable + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-script-runtime + ${kotlin.version} + runtime + + + org.jetbrains.kotlin + kotlin-script-util + ${kotlin.version} + runtime + org.jetbrains.kotlinx kotlinx-coroutines-core diff --git a/hv-collector-core/pom.xml b/sources/hv-collector-core/pom.xml similarity index 98% rename from hv-collector-core/pom.xml rename to sources/hv-collector-core/pom.xml index a8135292..7f7922e1 100644 --- a/hv-collector-core/pom.xml +++ b/sources/hv-collector-core/pom.xml @@ -32,7 +32,7 @@ org.onap.dcaegen2.collectors.hv-ves - ves-hv-collector + hv-collector-sources 1.1.0-SNAPSHOT .. diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/boundary/adapters.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/boundary/adapters.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/boundary/adapters.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/boundary/adapters.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/boundary/api.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/boundary/api.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/boundary/api.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/boundary/api.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/factory/CollectorFactory.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/factory/CollectorFactory.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/factory/CollectorFactory.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/factory/CollectorFactory.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/factory/ServerFactory.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/factory/ServerFactory.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/factory/ServerFactory.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/factory/ServerFactory.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/MessageValidator.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/MessageValidator.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/MessageValidator.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/MessageValidator.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/Router.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/Router.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/Router.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/Router.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/VesDecoder.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/VesDecoder.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/VesDecoder.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/VesDecoder.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/VesHvCollector.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/VesHvCollector.kt similarity index 97% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/VesHvCollector.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/VesHvCollector.kt index b700f135..2f12e0cd 100644 --- a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/VesHvCollector.kt +++ b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/VesHvCollector.kt @@ -77,7 +77,9 @@ internal class VesHvCollector( private fun findRoute(msg: VesMessage): Mono = omitWhenNone((router::findDestination)(msg)) private fun omitWhenNone(it: Option): Mono = it.fold( - { Mono.empty() }, + { + logger.info("ommiting the message" + 5) + Mono.empty() }, { Mono.just(it) }) private fun releaseBuffersMemory(wireChunkDecoder: WireChunkDecoder) = wireChunkDecoder.release() diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/AdapterFactory.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/AdapterFactory.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/AdapterFactory.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/AdapterFactory.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProvider.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProvider.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProvider.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProvider.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/HttpAdapter.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/HttpAdapter.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/HttpAdapter.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/HttpAdapter.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/LoggingSinkProvider.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/LoggingSinkProvider.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/LoggingSinkProvider.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/LoggingSinkProvider.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSink.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSink.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSink.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSink.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSinkProvider.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSinkProvider.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSinkProvider.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSinkProvider.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/ProtobufSerializer.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/ProtobufSerializer.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/ProtobufSerializer.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/ProtobufSerializer.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/VesMessageSerializer.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/VesMessageSerializer.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/VesMessageSerializer.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/VesMessageSerializer.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/socket/NettyTcpServer.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/wire/WireChunkDecoder.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/wire/WireChunkDecoder.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/wire/WireChunkDecoder.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/wire/WireChunkDecoder.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/wire/WireFrameException.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/wire/WireFrameException.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/wire/WireFrameException.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/wire/WireFrameException.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/CollectorConfiguration.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/CollectorConfiguration.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/CollectorConfiguration.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/CollectorConfiguration.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/ConfigurationProviderParams.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/ConfigurationProviderParams.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/ConfigurationProviderParams.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/ConfigurationProviderParams.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/RoutedMessage.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/RoutedMessage.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/RoutedMessage.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/RoutedMessage.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/ServerConfiguration.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/ServerConfiguration.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/ServerConfiguration.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/ServerConfiguration.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/VesMessage.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/VesMessage.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/VesMessage.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/VesMessage.kt diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/routing.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/routing.kt similarity index 100% rename from hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/routing.kt rename to sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/model/routing.kt diff --git a/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/MessageValidatorTest.kt b/sources/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/MessageValidatorTest.kt similarity index 100% rename from hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/MessageValidatorTest.kt rename to sources/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/MessageValidatorTest.kt diff --git a/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/RouterTest.kt b/sources/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/RouterTest.kt similarity index 100% rename from hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/RouterTest.kt rename to sources/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/RouterTest.kt diff --git a/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/VesDecoderTest.kt b/sources/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/VesDecoderTest.kt similarity index 100% rename from hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/VesDecoderTest.kt rename to sources/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/VesDecoderTest.kt diff --git a/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProviderTest.kt b/sources/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProviderTest.kt similarity index 100% rename from hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProviderTest.kt rename to sources/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/ConsulConfigurationProviderTest.kt diff --git a/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/HttpAdapterTest.kt b/sources/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/HttpAdapterTest.kt similarity index 100% rename from hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/HttpAdapterTest.kt rename to sources/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/HttpAdapterTest.kt diff --git a/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/wire/WireChunkDecoderTest.kt b/sources/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/wire/WireChunkDecoderTest.kt similarity index 100% rename from hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/wire/WireChunkDecoderTest.kt rename to sources/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/wire/WireChunkDecoderTest.kt diff --git a/hv-collector-core/src/test/resources/logback-test.xml b/sources/hv-collector-core/src/test/resources/logback-test.xml similarity index 100% rename from hv-collector-core/src/test/resources/logback-test.xml rename to sources/hv-collector-core/src/test/resources/logback-test.xml diff --git a/hv-collector-ct/pom.xml b/sources/hv-collector-ct/pom.xml similarity index 98% rename from hv-collector-ct/pom.xml rename to sources/hv-collector-ct/pom.xml index 07da24b1..61ac426b 100644 --- a/hv-collector-ct/pom.xml +++ b/sources/hv-collector-ct/pom.xml @@ -32,7 +32,7 @@ org.onap.dcaegen2.collectors.hv-ves - ves-hv-collector + hv-collector-sources 1.1.0-SNAPSHOT .. diff --git a/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/PerformanceSpecification.kt b/sources/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/PerformanceSpecification.kt similarity index 100% rename from hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/PerformanceSpecification.kt rename to sources/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/PerformanceSpecification.kt diff --git a/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/Sut.kt b/sources/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/Sut.kt similarity index 100% rename from hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/Sut.kt rename to sources/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/Sut.kt diff --git a/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/VesHvSpecification.kt b/sources/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/VesHvSpecification.kt similarity index 100% rename from hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/VesHvSpecification.kt rename to sources/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/VesHvSpecification.kt diff --git a/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/spekUtils.kt b/sources/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/spekUtils.kt similarity index 100% rename from hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/spekUtils.kt rename to sources/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/component/spekUtils.kt diff --git a/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/FakeHealthState.kt b/sources/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/FakeHealthState.kt similarity index 100% rename from hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/FakeHealthState.kt rename to sources/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/FakeHealthState.kt diff --git a/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/configuration.kt b/sources/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/configuration.kt similarity index 100% rename from hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/configuration.kt rename to sources/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/configuration.kt diff --git a/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/metrics.kt b/sources/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/metrics.kt similarity index 100% rename from hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/metrics.kt rename to sources/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/metrics.kt diff --git a/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/sink.kt b/sources/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/sink.kt similarity index 100% rename from hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/sink.kt rename to sources/hv-collector-ct/src/test/kotlin/org/onap/dcae/collectors/veshv/tests/fakes/sink.kt diff --git a/hv-collector-ct/src/test/resources/logback-test.xml b/sources/hv-collector-ct/src/test/resources/logback-test.xml similarity index 100% rename from hv-collector-ct/src/test/resources/logback-test.xml rename to sources/hv-collector-ct/src/test/resources/logback-test.xml diff --git a/hv-collector-dcae-app-simulator/Dockerfile b/sources/hv-collector-dcae-app-simulator/Dockerfile similarity index 100% rename from hv-collector-dcae-app-simulator/Dockerfile rename to sources/hv-collector-dcae-app-simulator/Dockerfile diff --git a/hv-collector-dcae-app-simulator/pom.xml b/sources/hv-collector-dcae-app-simulator/pom.xml similarity index 98% rename from hv-collector-dcae-app-simulator/pom.xml rename to sources/hv-collector-dcae-app-simulator/pom.xml index 82e99f95..c34e885d 100644 --- a/hv-collector-dcae-app-simulator/pom.xml +++ b/sources/hv-collector-dcae-app-simulator/pom.xml @@ -32,7 +32,7 @@ org.onap.dcaegen2.collectors.hv-ves - ves-hv-collector + hv-collector-sources 1.1.0-SNAPSHOT .. diff --git a/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 similarity index 100% rename from hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/DcaeAppSimulator.kt rename to sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/DcaeAppSimulator.kt diff --git a/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 similarity index 100% rename from hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/MessageStreamValidation.kt rename to sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/MessageStreamValidation.kt diff --git a/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 similarity index 100% rename from hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/DcaeAppApiServer.kt rename to sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/DcaeAppApiServer.kt diff --git a/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 similarity index 100% rename from hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/KafkaSource.kt rename to sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/KafkaSource.kt diff --git a/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 similarity index 100% rename from hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/ArgDcaeAppSimConfiguration.kt rename to sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/ArgDcaeAppSimConfiguration.kt diff --git a/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 similarity index 100% rename from hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/DcaeAppSimConfiguration.kt rename to sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/DcaeAppSimConfiguration.kt diff --git a/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 similarity index 100% rename from hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/consumer.kt rename to sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/consumer.kt diff --git a/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/main.kt b/sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/main.kt similarity index 100% rename from hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/main.kt rename to sources/hv-collector-dcae-app-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/main.kt diff --git a/hv-collector-dcae-app-simulator/src/main/resources/logback.xml b/sources/hv-collector-dcae-app-simulator/src/main/resources/logback.xml similarity index 100% rename from hv-collector-dcae-app-simulator/src/main/resources/logback.xml rename to sources/hv-collector-dcae-app-simulator/src/main/resources/logback.xml diff --git a/hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/ConsumerTest.kt b/sources/hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/ConsumerTest.kt similarity index 100% rename from hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/ConsumerTest.kt rename to sources/hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/ConsumerTest.kt diff --git a/hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/DcaeAppSimulatorTest.kt b/sources/hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/DcaeAppSimulatorTest.kt similarity index 100% rename from hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/DcaeAppSimulatorTest.kt rename to sources/hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/DcaeAppSimulatorTest.kt diff --git a/hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/MessageStreamValidationTest.kt b/sources/hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/MessageStreamValidationTest.kt similarity index 100% rename from hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/MessageStreamValidationTest.kt rename to sources/hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/MessageStreamValidationTest.kt diff --git a/hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/KafkaSourceTest.kt b/sources/hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/KafkaSourceTest.kt similarity index 100% rename from hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/KafkaSourceTest.kt rename to sources/hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/adapters/KafkaSourceTest.kt diff --git a/hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/ArgDcaeAppSimConfigurationTest.kt b/sources/hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/ArgDcaeAppSimConfigurationTest.kt similarity index 100% rename from hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/ArgDcaeAppSimConfigurationTest.kt rename to sources/hv-collector-dcae-app-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/simulators/dcaeapp/impl/config/ArgDcaeAppSimConfigurationTest.kt diff --git a/hv-collector-domain/pom.xml b/sources/hv-collector-domain/pom.xml similarity index 98% rename from hv-collector-domain/pom.xml rename to sources/hv-collector-domain/pom.xml index e03de3ca..f60cb604 100644 --- a/hv-collector-domain/pom.xml +++ b/sources/hv-collector-domain/pom.xml @@ -32,7 +32,7 @@ org.onap.dcaegen2.collectors.hv-ves - ves-hv-collector + hv-collector-sources 1.1.0-SNAPSHOT .. diff --git a/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/ByteData.kt b/sources/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/ByteData.kt similarity index 100% rename from hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/ByteData.kt rename to sources/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/ByteData.kt diff --git a/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/PayloadContentType.kt b/sources/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/PayloadContentType.kt similarity index 100% rename from hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/PayloadContentType.kt rename to sources/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/PayloadContentType.kt diff --git a/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/SecurityConfiguration.kt b/sources/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/SecurityConfiguration.kt similarity index 100% rename from hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/SecurityConfiguration.kt rename to sources/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/SecurityConfiguration.kt diff --git a/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/VesEventDomain.kt b/sources/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/VesEventDomain.kt similarity index 100% rename from hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/VesEventDomain.kt rename to sources/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/VesEventDomain.kt diff --git a/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/codec.kt b/sources/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/codec.kt similarity index 100% rename from hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/codec.kt rename to sources/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/codec.kt diff --git a/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/errors.kt b/sources/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/errors.kt similarity index 100% rename from hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/errors.kt rename to sources/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/errors.kt diff --git a/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/validation.kt b/sources/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/validation.kt similarity index 100% rename from hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/validation.kt rename to sources/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/validation.kt diff --git a/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/wire_frame.kt b/sources/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/wire_frame.kt similarity index 100% rename from hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/wire_frame.kt rename to sources/hv-collector-domain/src/main/kotlin/org/onap/dcae/collectors/veshv/domain/wire_frame.kt diff --git a/hv-collector-domain/src/main/proto/event/VesEvent.proto b/sources/hv-collector-domain/src/main/proto/event/VesEvent.proto similarity index 100% rename from hv-collector-domain/src/main/proto/event/VesEvent.proto rename to sources/hv-collector-domain/src/main/proto/event/VesEvent.proto diff --git a/hv-collector-domain/src/main/proto/measurements/README.md b/sources/hv-collector-domain/src/main/proto/measurements/README.md similarity index 100% rename from hv-collector-domain/src/main/proto/measurements/README.md rename to sources/hv-collector-domain/src/main/proto/measurements/README.md diff --git a/hv-collector-domain/src/test/kotlin/org/onap/dcae/collectors/veshv/domain/WireFrameCodecsTest.kt b/sources/hv-collector-domain/src/test/kotlin/org/onap/dcae/collectors/veshv/domain/WireFrameCodecsTest.kt similarity index 100% rename from hv-collector-domain/src/test/kotlin/org/onap/dcae/collectors/veshv/domain/WireFrameCodecsTest.kt rename to sources/hv-collector-domain/src/test/kotlin/org/onap/dcae/collectors/veshv/domain/WireFrameCodecsTest.kt diff --git a/hv-collector-domain/src/test/resources/logback.xml b/sources/hv-collector-domain/src/test/resources/logback.xml similarity index 100% rename from hv-collector-domain/src/test/resources/logback.xml rename to sources/hv-collector-domain/src/test/resources/logback.xml diff --git a/hv-collector-health-check/pom.xml b/sources/hv-collector-health-check/pom.xml similarity index 97% rename from hv-collector-health-check/pom.xml rename to sources/hv-collector-health-check/pom.xml index 6ecdc95b..3e5c6aa0 100644 --- a/hv-collector-health-check/pom.xml +++ b/sources/hv-collector-health-check/pom.xml @@ -18,7 +18,7 @@ org.onap.dcaegen2.collectors.hv-ves - ves-hv-collector + hv-collector-sources 1.1.0-SNAPSHOT .. diff --git a/hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/api/HealthDescription.kt b/sources/hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/api/HealthDescription.kt similarity index 100% rename from hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/api/HealthDescription.kt rename to sources/hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/api/HealthDescription.kt diff --git a/hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/api/HealthState.kt b/sources/hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/api/HealthState.kt similarity index 100% rename from hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/api/HealthState.kt rename to sources/hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/api/HealthState.kt diff --git a/hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/api/HealthStatus.kt b/sources/hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/api/HealthStatus.kt similarity index 100% rename from hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/api/HealthStatus.kt rename to sources/hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/api/HealthStatus.kt diff --git a/hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/factory/HealthCheckApiServer.kt b/sources/hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/factory/HealthCheckApiServer.kt similarity index 100% rename from hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/factory/HealthCheckApiServer.kt rename to sources/hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/factory/HealthCheckApiServer.kt diff --git a/hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/impl/HealthStateImpl.kt b/sources/hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/impl/HealthStateImpl.kt similarity index 100% rename from hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/impl/HealthStateImpl.kt rename to sources/hv-collector-health-check/src/main/kotlin/org/onap/dcae/collectors/veshv/healthcheck/impl/HealthStateImpl.kt diff --git a/hv-collector-health-check/src/test/kotlin/org/onap/dcae/collectors/veshv/healthcheck/impl/HealthStateProviderImplTest.kt b/sources/hv-collector-health-check/src/test/kotlin/org/onap/dcae/collectors/veshv/healthcheck/impl/HealthStateProviderImplTest.kt similarity index 100% rename from hv-collector-health-check/src/test/kotlin/org/onap/dcae/collectors/veshv/healthcheck/impl/HealthStateProviderImplTest.kt rename to sources/hv-collector-health-check/src/test/kotlin/org/onap/dcae/collectors/veshv/healthcheck/impl/HealthStateProviderImplTest.kt diff --git a/hv-collector-main/Dockerfile b/sources/hv-collector-main/Dockerfile similarity index 100% rename from hv-collector-main/Dockerfile rename to sources/hv-collector-main/Dockerfile diff --git a/hv-collector-main/pom.xml b/sources/hv-collector-main/pom.xml similarity index 98% rename from hv-collector-main/pom.xml rename to sources/hv-collector-main/pom.xml index 9e7101b0..a94d6346 100644 --- a/hv-collector-main/pom.xml +++ b/sources/hv-collector-main/pom.xml @@ -32,7 +32,7 @@ org.onap.dcaegen2.collectors.hv-ves - ves-hv-collector + hv-collector-sources 1.1.0-SNAPSHOT .. diff --git a/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/ArgVesHvConfiguration.kt b/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/ArgVesHvConfiguration.kt similarity index 100% rename from hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/ArgVesHvConfiguration.kt rename to sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/ArgVesHvConfiguration.kt diff --git a/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/MicrometerMetrics.kt b/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/MicrometerMetrics.kt similarity index 100% rename from hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/MicrometerMetrics.kt rename to sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/MicrometerMetrics.kt diff --git a/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/main.kt b/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/main.kt similarity index 100% rename from hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/main.kt rename to sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/main.kt diff --git a/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/HealthCheckServer.kt b/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/HealthCheckServer.kt similarity index 100% rename from hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/HealthCheckServer.kt rename to sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/HealthCheckServer.kt diff --git a/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/ServerStarter.kt b/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/ServerStarter.kt similarity index 100% rename from hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/ServerStarter.kt rename to sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/ServerStarter.kt diff --git a/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/VesServer.kt b/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/VesServer.kt similarity index 100% rename from hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/VesServer.kt rename to sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/VesServer.kt diff --git a/hv-collector-main/src/main/resources/logback.xml b/sources/hv-collector-main/src/main/resources/logback.xml similarity index 100% rename from hv-collector-main/src/main/resources/logback.xml rename to sources/hv-collector-main/src/main/resources/logback.xml diff --git a/hv-collector-main/src/main/scripts/healthcheck.sh b/sources/hv-collector-main/src/main/scripts/healthcheck.sh similarity index 100% rename from hv-collector-main/src/main/scripts/healthcheck.sh rename to sources/hv-collector-main/src/main/scripts/healthcheck.sh diff --git a/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/ArgVesHvConfigurationTest.kt b/sources/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/ArgVesHvConfigurationTest.kt similarity index 100% rename from hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/ArgVesHvConfigurationTest.kt rename to sources/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/ArgVesHvConfigurationTest.kt diff --git a/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/MicrometerMetricsTest.kt b/sources/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/MicrometerMetricsTest.kt similarity index 100% rename from hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/MicrometerMetricsTest.kt rename to sources/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/MicrometerMetricsTest.kt diff --git a/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/NioBuffersTest.kt b/sources/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/NioBuffersTest.kt similarity index 100% rename from hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/NioBuffersTest.kt rename to sources/hv-collector-main/src/test/kotlin/org/onap/dcae/collectors/veshv/main/NioBuffersTest.kt diff --git a/hv-collector-ssl/pom.xml b/sources/hv-collector-ssl/pom.xml similarity index 98% rename from hv-collector-ssl/pom.xml rename to sources/hv-collector-ssl/pom.xml index e9cbdc22..6001ba94 100644 --- a/hv-collector-ssl/pom.xml +++ b/sources/hv-collector-ssl/pom.xml @@ -32,7 +32,7 @@ org.onap.dcaegen2.collectors.hv-ves - ves-hv-collector + hv-collector-sources 1.1.0-SNAPSHOT .. diff --git a/hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/ClientSslContextFactory.kt b/sources/hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/ClientSslContextFactory.kt similarity index 100% rename from hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/ClientSslContextFactory.kt rename to sources/hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/ClientSslContextFactory.kt diff --git a/hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/ServerSslContextFactory.kt b/sources/hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/ServerSslContextFactory.kt similarity index 100% rename from hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/ServerSslContextFactory.kt rename to sources/hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/ServerSslContextFactory.kt diff --git a/hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/SslContextFactory.kt b/sources/hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/SslContextFactory.kt similarity index 100% rename from hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/SslContextFactory.kt rename to sources/hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/SslContextFactory.kt diff --git a/hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/utils.kt b/sources/hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/utils.kt similarity index 100% rename from hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/utils.kt rename to sources/hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/utils.kt diff --git a/hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/impl/SslFactories.kt b/sources/hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/impl/SslFactories.kt similarity index 100% rename from hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/impl/SslFactories.kt rename to sources/hv-collector-ssl/src/main/kotlin/org/onap/dcae/collectors/veshv/ssl/impl/SslFactories.kt diff --git a/hv-collector-ssl/src/test/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/ServerSslContextFactoryTest.kt b/sources/hv-collector-ssl/src/test/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/ServerSslContextFactoryTest.kt similarity index 100% rename from hv-collector-ssl/src/test/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/ServerSslContextFactoryTest.kt rename to sources/hv-collector-ssl/src/test/kotlin/org/onap/dcae/collectors/veshv/ssl/boundary/ServerSslContextFactoryTest.kt diff --git a/hv-collector-ssl/src/test/resources/logback-test.xml b/sources/hv-collector-ssl/src/test/resources/logback-test.xml similarity index 100% rename from hv-collector-ssl/src/test/resources/logback-test.xml rename to sources/hv-collector-ssl/src/test/resources/logback-test.xml diff --git a/hv-collector-ssl/src/test/resources/ssl/ca.crt b/sources/hv-collector-ssl/src/test/resources/ssl/ca.crt similarity index 100% rename from hv-collector-ssl/src/test/resources/ssl/ca.crt rename to sources/hv-collector-ssl/src/test/resources/ssl/ca.crt diff --git a/hv-collector-ssl/src/test/resources/ssl/server.crt b/sources/hv-collector-ssl/src/test/resources/ssl/server.crt similarity index 100% rename from hv-collector-ssl/src/test/resources/ssl/server.crt rename to sources/hv-collector-ssl/src/test/resources/ssl/server.crt diff --git a/hv-collector-ssl/src/test/resources/ssl/server.key b/sources/hv-collector-ssl/src/test/resources/ssl/server.key similarity index 100% rename from hv-collector-ssl/src/test/resources/ssl/server.key rename to sources/hv-collector-ssl/src/test/resources/ssl/server.key diff --git a/hv-collector-ssl/src/test/resources/ssl/server.ks.pkcs12 b/sources/hv-collector-ssl/src/test/resources/ssl/server.ks.pkcs12 similarity index 100% rename from hv-collector-ssl/src/test/resources/ssl/server.ks.pkcs12 rename to sources/hv-collector-ssl/src/test/resources/ssl/server.ks.pkcs12 diff --git a/hv-collector-ssl/src/test/resources/ssl/trust.pkcs12 b/sources/hv-collector-ssl/src/test/resources/ssl/trust.pkcs12 similarity index 100% rename from hv-collector-ssl/src/test/resources/ssl/trust.pkcs12 rename to sources/hv-collector-ssl/src/test/resources/ssl/trust.pkcs12 diff --git a/hv-collector-test-utils/pom.xml b/sources/hv-collector-test-utils/pom.xml similarity index 97% rename from hv-collector-test-utils/pom.xml rename to sources/hv-collector-test-utils/pom.xml index 9dad2ace..aebdd654 100644 --- a/hv-collector-test-utils/pom.xml +++ b/sources/hv-collector-test-utils/pom.xml @@ -13,7 +13,7 @@ org.onap.dcaegen2.collectors.hv-ves - ves-hv-collector + hv-collector-sources 1.1.0-SNAPSHOT .. diff --git a/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/arrow.kt b/sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/arrow.kt similarity index 100% rename from hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/arrow.kt rename to sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/arrow.kt diff --git a/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/assertions.kt b/sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/assertions.kt similarity index 100% rename from hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/assertions.kt rename to sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/assertions.kt diff --git a/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/configurations.kt b/sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/configurations.kt similarity index 100% rename from hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/configurations.kt rename to sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/configurations.kt diff --git a/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/messages.kt b/sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/messages.kt similarity index 100% rename from hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/messages.kt rename to sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/messages.kt diff --git a/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/vesEvents.kt b/sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/vesEvents.kt similarity index 100% rename from hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/vesEvents.kt rename to sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/vesEvents.kt diff --git a/hv-collector-test-utils/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker b/sources/hv-collector-test-utils/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from hv-collector-test-utils/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to sources/hv-collector-test-utils/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/hv-collector-utils/pom.xml b/sources/hv-collector-utils/pom.xml similarity index 98% rename from hv-collector-utils/pom.xml rename to sources/hv-collector-utils/pom.xml index d38ccb9b..66879ff7 100644 --- a/hv-collector-utils/pom.xml +++ b/sources/hv-collector-utils/pom.xml @@ -36,7 +36,7 @@ org.onap.dcaegen2.collectors.hv-ves - ves-hv-collector + hv-collector-sources 1.1.0-SNAPSHOT .. diff --git a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/core.kt b/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/core.kt similarity index 100% rename from hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/core.kt rename to sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/core.kt diff --git a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/effects.kt b/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/effects.kt similarity index 100% rename from hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/effects.kt rename to sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/effects.kt diff --git a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/ArgBasedConfiguration.kt b/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/ArgBasedConfiguration.kt similarity index 100% rename from hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/ArgBasedConfiguration.kt rename to sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/ArgBasedConfiguration.kt diff --git a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOption.kt b/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOption.kt similarity index 100% rename from hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOption.kt rename to sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOption.kt diff --git a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/WrongArgumentError.kt b/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/WrongArgumentError.kt similarity index 100% rename from hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/WrongArgumentError.kt rename to sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/WrongArgumentError.kt diff --git a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/extensions.kt b/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/extensions.kt similarity index 100% rename from hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/extensions.kt rename to sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/extensions.kt diff --git a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/http/http.kt b/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/http/http.kt similarity index 100% rename from hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/http/http.kt rename to sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/http/http.kt diff --git a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/http/ratpack.kt b/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/http/ratpack.kt similarity index 100% rename from hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/http/ratpack.kt rename to sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/http/ratpack.kt diff --git a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/logging/Logger.kt b/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/logging/Logger.kt similarity index 98% rename from hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/logging/Logger.kt rename to sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/logging/Logger.kt index e8b9f439..033dd5e5 100644 --- a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/logging/Logger.kt +++ b/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/logging/Logger.kt @@ -22,7 +22,7 @@ package org.onap.dcae.collectors.veshv.utils.logging import kotlin.reflect.KClass import org.slf4j.LoggerFactory -@Suppress("TooManyFunctions") +@Suppress("TooManyFunctions", "SuboptimalLoggerUsage") class Logger(val logger: org.slf4j.Logger) { constructor(clazz: KClass) : this(LoggerFactory.getLogger(clazz.java)) constructor(name: String) : this(LoggerFactory.getLogger(name)) diff --git a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/logging/reactive_logging.kt b/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/logging/reactive_logging.kt similarity index 100% rename from hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/logging/reactive_logging.kt rename to sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/logging/reactive_logging.kt diff --git a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/server_handle.kt b/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/server_handle.kt similarity index 100% rename from hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/server_handle.kt rename to sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/server_handle.kt diff --git a/hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/CoreKtTest.kt b/sources/hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/CoreKtTest.kt similarity index 100% rename from hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/CoreKtTest.kt rename to sources/hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/CoreKtTest.kt diff --git a/hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOptionTest.kt b/sources/hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOptionTest.kt similarity index 100% rename from hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOptionTest.kt rename to sources/hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOptionTest.kt diff --git a/hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/WrongArgumentErrorTest.kt b/sources/hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/WrongArgumentErrorTest.kt similarity index 100% rename from hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/WrongArgumentErrorTest.kt rename to sources/hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/WrongArgumentErrorTest.kt diff --git a/hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/http/ResponsesTest.kt b/sources/hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/http/ResponsesTest.kt similarity index 100% rename from hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/http/ResponsesTest.kt rename to sources/hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/http/ResponsesTest.kt diff --git a/hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/logging/LoggerTest.kt b/sources/hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/logging/LoggerTest.kt similarity index 100% rename from hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/logging/LoggerTest.kt rename to sources/hv-collector-utils/src/test/kotlin/org/onap/dcae/collectors/veshv/utils/logging/LoggerTest.kt diff --git a/hv-collector-ves-message-generator/pom.xml b/sources/hv-collector-ves-message-generator/pom.xml similarity index 98% rename from hv-collector-ves-message-generator/pom.xml rename to sources/hv-collector-ves-message-generator/pom.xml index dae42e2d..c5ce7f65 100644 --- a/hv-collector-ves-message-generator/pom.xml +++ b/sources/hv-collector-ves-message-generator/pom.xml @@ -32,7 +32,7 @@ org.onap.dcaegen2.collectors.hv-ves - ves-hv-collector + hv-collector-sources 1.1.0-SNAPSHOT .. diff --git a/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageGenerator.kt b/sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageGenerator.kt similarity index 100% rename from hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageGenerator.kt rename to sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageGenerator.kt diff --git a/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageParameters.kt b/sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageParameters.kt similarity index 100% rename from hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageParameters.kt rename to sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageParameters.kt diff --git a/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageParametersParser.kt b/sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageParametersParser.kt similarity index 100% rename from hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageParametersParser.kt rename to sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageParametersParser.kt diff --git a/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageType.kt b/sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageType.kt similarity index 100% rename from hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageType.kt rename to sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/api/MessageType.kt diff --git a/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/factory/MessageGeneratorFactory.kt b/sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/factory/MessageGeneratorFactory.kt similarity index 100% rename from hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/factory/MessageGeneratorFactory.kt rename to sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/factory/MessageGeneratorFactory.kt diff --git a/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/CommonEventHeaderParser.kt b/sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/CommonEventHeaderParser.kt similarity index 100% rename from hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/CommonEventHeaderParser.kt rename to sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/CommonEventHeaderParser.kt diff --git a/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageGeneratorImpl.kt b/sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageGeneratorImpl.kt similarity index 100% rename from hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageGeneratorImpl.kt rename to sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageGeneratorImpl.kt diff --git a/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageParametersParserImpl.kt b/sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageParametersParserImpl.kt similarity index 100% rename from hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageParametersParserImpl.kt rename to sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageParametersParserImpl.kt diff --git a/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/PayloadGenerator.kt b/sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/PayloadGenerator.kt similarity index 100% rename from hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/PayloadGenerator.kt rename to sources/hv-collector-ves-message-generator/src/main/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/PayloadGenerator.kt diff --git a/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/CommonEventHeaderParserTest.kt b/sources/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/CommonEventHeaderParserTest.kt similarity index 100% rename from hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/CommonEventHeaderParserTest.kt rename to sources/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/CommonEventHeaderParserTest.kt diff --git a/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageGeneratorImplTest.kt b/sources/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageGeneratorImplTest.kt similarity index 100% rename from hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageGeneratorImplTest.kt rename to sources/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageGeneratorImplTest.kt diff --git a/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageParametersParserTest.kt b/sources/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageParametersParserTest.kt similarity index 100% rename from hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageParametersParserTest.kt rename to sources/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/MessageParametersParserTest.kt diff --git a/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/PayloadGeneratorTest.kt b/sources/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/PayloadGeneratorTest.kt similarity index 100% rename from hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/PayloadGeneratorTest.kt rename to sources/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/PayloadGeneratorTest.kt diff --git a/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/parameters.kt b/sources/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/parameters.kt similarity index 100% rename from hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/parameters.kt rename to sources/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/parameters.kt diff --git a/hv-collector-xnf-simulator/Dockerfile b/sources/hv-collector-xnf-simulator/Dockerfile similarity index 100% rename from hv-collector-xnf-simulator/Dockerfile rename to sources/hv-collector-xnf-simulator/Dockerfile diff --git a/hv-collector-xnf-simulator/pom.xml b/sources/hv-collector-xnf-simulator/pom.xml similarity index 98% rename from hv-collector-xnf-simulator/pom.xml rename to sources/hv-collector-xnf-simulator/pom.xml index 6526915a..de262567 100644 --- a/hv-collector-xnf-simulator/pom.xml +++ b/sources/hv-collector-xnf-simulator/pom.xml @@ -32,7 +32,7 @@ org.onap.dcaegen2.collectors.hv-ves - ves-hv-collector + hv-collector-sources 1.1.0-SNAPSHOT .. diff --git a/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/XnfSimulator.kt b/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/XnfSimulator.kt similarity index 100% rename from hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/XnfSimulator.kt rename to sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/XnfSimulator.kt diff --git a/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/VesHvClient.kt b/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/VesHvClient.kt similarity index 100% rename from hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/VesHvClient.kt rename to sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/VesHvClient.kt diff --git a/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/XnfApiServer.kt b/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/XnfApiServer.kt similarity index 100% rename from hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/XnfApiServer.kt rename to sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/XnfApiServer.kt diff --git a/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/config/ArgXnfSimulatorConfiguration.kt b/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/config/ArgXnfSimulatorConfiguration.kt similarity index 100% rename from hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/config/ArgXnfSimulatorConfiguration.kt rename to sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/config/ArgXnfSimulatorConfiguration.kt diff --git a/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/config/SimulatorConfiguration.kt b/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/config/SimulatorConfiguration.kt similarity index 100% rename from hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/config/SimulatorConfiguration.kt rename to sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/config/SimulatorConfiguration.kt diff --git a/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/simulations.kt b/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/simulations.kt similarity index 100% rename from hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/simulations.kt rename to sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/simulations.kt diff --git a/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/main.kt b/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/main.kt similarity index 100% rename from hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/main.kt rename to sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/main.kt diff --git a/hv-collector-xnf-simulator/src/main/resources/logback.xml b/sources/hv-collector-xnf-simulator/src/main/resources/logback.xml similarity index 100% rename from hv-collector-xnf-simulator/src/main/resources/logback.xml rename to sources/hv-collector-xnf-simulator/src/main/resources/logback.xml diff --git a/hv-collector-xnf-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/main/OngoingSimulationsTest.kt b/sources/hv-collector-xnf-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/main/OngoingSimulationsTest.kt similarity index 100% rename from hv-collector-xnf-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/main/OngoingSimulationsTest.kt rename to sources/hv-collector-xnf-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/main/OngoingSimulationsTest.kt diff --git a/hv-collector-xnf-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/main/XnfSimulatorTest.kt b/sources/hv-collector-xnf-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/main/XnfSimulatorTest.kt similarity index 100% rename from hv-collector-xnf-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/main/XnfSimulatorTest.kt rename to sources/hv-collector-xnf-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/main/XnfSimulatorTest.kt diff --git a/sources/pom.xml b/sources/pom.xml new file mode 100644 index 00000000..06726bbb --- /dev/null +++ b/sources/pom.xml @@ -0,0 +1,135 @@ + + + + + 4.0.0 + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + org.onap.dcaegen2.collectors.hv-ves + ves-hv-collector + 1.1.0-SNAPSHOT + .. + + + hv-collector-sources + 1.1.0-SNAPSHOT + VES HighVolume Collector :: Sources + pom + + + + + maven-checkstyle-plugin + 2.17 + + + org.onap.oparent + checkstyle + 1.1.1 + + + + + + check-license-kotlin + + check + + process-sources + + onap-checkstyle/check-license.xml + false + true + false + **\/*.kt + true + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.8 + + + + detekt + verify + + run + + + + + + + + + + + + + + + + + + + + io.gitlab.arturbosch.detekt + detekt-cli + ${detekt.version} + + + ${project.groupId} + hv-collector-analysis + 1.1.0-SNAPSHOT + + + + + + + + hv-collector-core + hv-collector-ct + hv-collector-dcae-app-simulator + hv-collector-domain + hv-collector-health-check + hv-collector-main + hv-collector-ssl + hv-collector-test-utils + hv-collector-utils + hv-collector-ves-message-generator + hv-collector-xnf-simulator + + -- 2.16.6