From ca51815074f30f680b601f8b59ef559316a97e9a Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Mon, 13 May 2024 16:18:29 +0400 Subject: [PATCH 01/15] Added app sub dir --- .../com/exactpro/th2/lwdataprovider/AbstractJsonFormatter.kt | 0 .../src}/main/kotlin/com/exactpro/th2/lwdataprovider/Context.kt | 0 .../com/exactpro/th2/lwdataprovider/CustomProtoJsonFormatter.kt | 0 .../com/exactpro/th2/lwdataprovider/CustomSimpleJsonFormatter.kt | 0 .../src}/main/kotlin/com/exactpro/th2/lwdataprovider/Decoder.kt | 0 .../main/kotlin/com/exactpro/th2/lwdataprovider/Extensions.kt | 0 .../com/exactpro/th2/lwdataprovider/LwDataProviderException.kt | 0 .../src}/main/kotlin/com/exactpro/th2/lwdataprovider/Main.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/ProviderStreamInfo.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/RabbitMqDecoder.kt | 0 .../main/kotlin/com/exactpro/th2/lwdataprovider/RequestContext.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/ResponseHandlers.kt | 0 .../src}/main/kotlin/com/exactpro/th2/lwdataprovider/SseEvent.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/SseResponseBuilder.kt | 0 .../src}/main/kotlin/com/exactpro/th2/lwdataprovider/Utils.kt | 0 .../th2/lwdataprovider/configuration/ByteSizeDeserializer.kt | 0 .../exactpro/th2/lwdataprovider/configuration/Configuration.kt | 0 .../com/exactpro/th2/lwdataprovider/configuration/Variable.kt | 0 .../com/exactpro/th2/lwdataprovider/db/CradleEventExtractor.kt | 0 .../com/exactpro/th2/lwdataprovider/db/CradleMessageExtractor.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/db/DataMeasurement.kt | 0 .../main/kotlin/com/exactpro/th2/lwdataprovider/db/DataSink.kt | 0 .../com/exactpro/th2/lwdataprovider/db/GeneralCradleExtractor.kt | 0 .../com/exactpro/th2/lwdataprovider/db/util/MeasurementUtil.kt | 0 .../com/exactpro/th2/lwdataprovider/db/util/RequestSyncUtil.kt | 0 .../lwdataprovider/entities/exceptions/ChannelClosedException.kt | 0 .../th2/lwdataprovider/entities/exceptions/HandleDataException.kt | 0 .../lwdataprovider/entities/exceptions/InvalidRequestException.kt | 0 .../entities/exceptions/ParseEventTreeNodeException.kt | 0 .../exactpro/th2/lwdataprovider/entities/internal/Direction.kt | 0 .../th2/lwdataprovider/entities/internal/ProviderEventId.kt | 0 .../th2/lwdataprovider/entities/internal/ResponseFormat.kt | 0 .../th2/lwdataprovider/entities/requests/AllPageInfoRequest.kt | 0 .../th2/lwdataprovider/entities/requests/GetEventRequest.kt | 0 .../lwdataprovider/entities/requests/GetGroupMessageRequest.kt | 0 .../th2/lwdataprovider/entities/requests/GetMessageRequest.kt | 0 .../th2/lwdataprovider/entities/requests/MessagesGroupRequest.kt | 0 .../th2/lwdataprovider/entities/requests/ProviderMessageStream.kt | 0 .../lwdataprovider/entities/requests/QueueEventsScopeRequest.kt | 0 .../lwdataprovider/entities/requests/QueueMessageGroupsRequest.kt | 0 .../th2/lwdataprovider/entities/requests/SearchDirection.kt | 0 .../th2/lwdataprovider/entities/requests/SseEventSearchRequest.kt | 0 .../lwdataprovider/entities/requests/SseMessageSearchRequest.kt | 0 .../lwdataprovider/entities/requests/SsePageInfosSearchRequest.kt | 0 .../entities/requests/converter/GrpcFilterConverter.kt | 0 .../entities/requests/converter/HttpFilterConverter.kt | 0 .../lwdataprovider/entities/requests/util/SseSearchRequestUtil.kt | 0 .../th2/lwdataprovider/entities/responses/BaseEventEntity.kt | 0 .../th2/lwdataprovider/entities/responses/CustomSerializer.kt | 0 .../com/exactpro/th2/lwdataprovider/entities/responses/Event.kt | 0 .../lwdataprovider/entities/responses/LastScannedObjectInfo.kt | 0 .../th2/lwdataprovider/entities/responses/MessageBatch.kt | 0 .../exactpro/th2/lwdataprovider/entities/responses/PageInfo.kt | 0 .../th2/lwdataprovider/entities/responses/ProviderMessage.kt | 0 .../th2/lwdataprovider/entities/responses/ProviderMessage53.kt | 0 .../entities/responses/ProviderMessage53Transport.kt | 0 .../th2/lwdataprovider/entities/responses/ResponseMessage.kt | 0 .../exactpro/th2/lwdataprovider/entities/responses/StreamInfo.kt | 0 .../responses/ser/InstantBackwardCompatibilitySerializer.kt | 0 .../lwdataprovider/entities/responses/ser/SerializationUtil.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/filter/DataFilter.kt | 0 .../com/exactpro/th2/lwdataprovider/filter/FilterFactory.kt | 0 .../com/exactpro/th2/lwdataprovider/filter/JoinedDataFilter.kt | 0 .../th2/lwdataprovider/filter/events/EventsFilterFactory.kt | 0 .../th2/lwdataprovider/filter/events/impl/EventSimpleFilter.kt | 0 .../th2/lwdataprovider/grpc/GrpcDataProviderBackPressure.kt | 0 .../com/exactpro/th2/lwdataprovider/grpc/GrpcDataProviderImpl.kt | 0 .../exactpro/th2/lwdataprovider/grpc/GrpcEventRequestContext.kt | 0 .../exactpro/th2/lwdataprovider/grpc/GrpcMessageRequestContext.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcServer.kt | 0 .../main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcUtils.kt | 0 .../com/exactpro/th2/lwdataprovider/grpc/QueueGrpcProvider.kt | 0 .../exactpro/th2/lwdataprovider/handlers/AbstractBasicDataSink.kt | 0 .../th2/lwdataprovider/handlers/AbstractCancelableHandler.kt | 0 .../com/exactpro/th2/lwdataprovider/handlers/AbstractDataSink.kt | 0 .../lwdataprovider/handlers/AbstractParsedStoredMessageHandler.kt | 0 .../exactpro/th2/lwdataprovider/handlers/GeneralCradleHandler.kt | 0 .../th2/lwdataprovider/handlers/MessageResponseHandler.kt | 0 .../exactpro/th2/lwdataprovider/handlers/QueueEventsHandler.kt | 0 .../exactpro/th2/lwdataprovider/handlers/QueueMessagesHandler.kt | 0 .../exactpro/th2/lwdataprovider/handlers/SearchEventsHandler.kt | 0 .../exactpro/th2/lwdataprovider/handlers/SearchMessagesHandler.kt | 0 .../com/exactpro/th2/lwdataprovider/handlers/util/PullingUtil.kt | 0 .../th2/lwdataprovider/handlers/util/StoredMessageFilterUtil.kt | 0 .../exactpro/th2/lwdataprovider/http/AbstractRequestHandler.kt | 0 .../exactpro/th2/lwdataprovider/http/AbstractSseRequestHandler.kt | 0 .../main/kotlin/com/exactpro/th2/lwdataprovider/http/Emitter.kt | 0 .../com/exactpro/th2/lwdataprovider/http/FileDownloadHandler.kt | 0 .../exactpro/th2/lwdataprovider/http/GetAllPageInfosServlet.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/http/GetBookIDs.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/http/GetEventScopes.kt | 0 .../com/exactpro/th2/lwdataprovider/http/GetEventsServlet.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/http/GetMessageById.kt | 0 .../com/exactpro/th2/lwdataprovider/http/GetMessageGroups.kt | 0 .../exactpro/th2/lwdataprovider/http/GetMessageGroupsServlet.kt | 0 .../com/exactpro/th2/lwdataprovider/http/GetMessagesServlet.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/http/GetOneEvent.kt | 0 .../com/exactpro/th2/lwdataprovider/http/GetPageInfosServlet.kt | 0 .../com/exactpro/th2/lwdataprovider/http/GetSessionAliases.kt | 0 .../th2/lwdataprovider/http/GetSingleMessageByGroupAndId.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/http/HttpServer.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/http/JavalinContext.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/http/JavalinHandler.kt | 0 .../main/kotlin/com/exactpro/th2/lwdataprovider/http/SseClient.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/http/SseHandler.kt | 0 .../com/exactpro/th2/lwdataprovider/http/SseRequestContext.kt | 0 .../com/exactpro/th2/lwdataprovider/http/TaskDownloadHandler.kt | 0 .../exactpro/th2/lwdataprovider/http/listener/ProgressListener.kt | 0 .../th2/lwdataprovider/http/serializers/BookIdDeserializer.kt | 0 .../http/serializers/CustomMillisOrNanosInstantDeserializer.kt | 0 .../exactpro/th2/lwdataprovider/http/util/JsonStreamingUtil.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/http/util/QueryUtil.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/http/util/SseUtil.kt | 0 .../th2/lwdataprovider/metrics/DataMeasurementHistogram.kt | 0 .../exactpro/th2/lwdataprovider/metrics/DataMeasurementImpl.kt | 0 .../exactpro/th2/lwdataprovider/metrics/DataMeasurementSummary.kt | 0 .../com/exactpro/th2/lwdataprovider/metrics/DecodingMetrics.kt | 0 .../com/exactpro/th2/lwdataprovider/metrics/HttpWriteMetrics.kt | 0 .../com/exactpro/th2/lwdataprovider/metrics/MeasurementImpl.kt | 0 .../com/exactpro/th2/lwdataprovider/metrics/ResponseQueue.kt | 0 .../com/exactpro/th2/lwdataprovider/producers/EventProducer.kt | 0 .../exactpro/th2/lwdataprovider/producers/GrpcMessageProducer.kt | 0 .../com/exactpro/th2/lwdataprovider/producers/MessageProducer.kt | 0 .../exactpro/th2/lwdataprovider/producers/MessageProducer53.kt | 0 .../th2/lwdataprovider/producers/MessageProducer53Transport.kt | 0 .../com/exactpro/th2/lwdataprovider/producers/ParsedFormats.kt | 0 .../com/exactpro/th2/lwdataprovider/transport/TransportUtils.kt | 0 .../com/exactpro/th2/lwdataprovider/workers/DecodeQueueBuffer.kt | 0 .../com/exactpro/th2/lwdataprovider/workers/KeepAliveHandler.kt | 0 .../th2/lwdataprovider/workers/ProtoCodecMessageListener.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/workers/RequestId.kt | 0 .../com/exactpro/th2/lwdataprovider/workers/RequestsBuffer.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/workers/TaskManager.kt | 0 .../com/exactpro/th2/lwdataprovider/workers/TimeoutChecker.kt | 0 .../com/exactpro/th2/lwdataprovider/workers/TimeoutWatcher.kt | 0 .../th2/lwdataprovider/workers/TransportCodecMessageListener.kt | 0 {src => app/src}/main/resources/application.conf | 0 .../kotlin/com/exactpro/th2/lwdataprovider/EventBodyConverter.kt | 0 .../exactpro/th2/lwdataprovider/TestCustomProtoJsonFormatter.kt | 0 .../exactpro/th2/lwdataprovider/TestCustomSimpleJsonFormatter.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/TestRabbitMqDecoder.kt | 0 .../com/exactpro/th2/lwdataprovider/TestSseEventSearchRequest.kt | 0 .../exactpro/th2/lwdataprovider/TestSseMessageSearchRequest.kt | 0 .../exactpro/th2/lwdataprovider/TestStoredMessageFilterUtil.kt | 0 .../configuration/TestCustomConfigurationClassDeserialization.kt | 0 .../exactpro/th2/lwdataprovider/db/TestCradleEventExtractor.kt | 0 .../exactpro/th2/lwdataprovider/db/TestCradleMessageExtractor.kt | 0 .../db/integration/AbstractCradleIntegrationTest.kt | 0 .../db/integration/TestCradleMessageExtractorIntegration.kt | 0 .../entities/requests/converter/TestHttpFilterConverter.kt | 0 .../lwdataprovider/entities/responses/TestCustomSerializerKt.kt | 0 .../th2/lwdataprovider/entities/responses/TestResponseMessage.kt | 0 .../entities/responses/TestStoredMessageIdSerializer.kt | 0 .../th2/lwdataprovider/handlers/TestSearchMessagesHandler.kt | 0 .../exactpro/th2/lwdataprovider/http/AbstractHttpHandlerTest.kt | 0 .../exactpro/th2/lwdataprovider/http/TestFileDownloadHandler.kt | 0 .../th2/lwdataprovider/http/TestGetAllPageInfosServlet.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/http/TestGetBookIDs.kt | 0 .../com/exactpro/th2/lwdataprovider/http/TestGetEventScopes.kt | 0 .../com/exactpro/th2/lwdataprovider/http/TestGetEventsServlet.kt | 0 .../com/exactpro/th2/lwdataprovider/http/TestGetMessageById.kt | 0 .../com/exactpro/th2/lwdataprovider/http/TestGetMessageGroups.kt | 0 .../th2/lwdataprovider/http/TestGetMessageGroupsServlet.kt | 0 .../http/TestGetMessageGroupsServletTransportMode.kt | 0 .../exactpro/th2/lwdataprovider/http/TestGetMessagesServlet.kt | 0 .../com/exactpro/th2/lwdataprovider/http/TestGetOneEvent.kt | 0 .../exactpro/th2/lwdataprovider/http/TestGetPageInfosServlet.kt | 0 .../com/exactpro/th2/lwdataprovider/http/TestGetSessionAliases.kt | 0 .../th2/lwdataprovider/http/TestGetSingleMessageByGroupAndId.kt | 0 .../exactpro/th2/lwdataprovider/http/TestTaskDownloadHandler.kt | 0 .../com/exactpro/th2/lwdataprovider/http/TestTimeConversion.kt | 0 .../kotlin/com/exactpro/th2/lwdataprovider/util/CradleTestUtil.kt | 0 .../com/exactpro/th2/lwdataprovider/util/DummyDataMeasurement.kt | 0 .../com/exactpro/th2/lwdataprovider/util/VerificationUtil.kt | 0 {src => app/src}/test/resources/log4j2.properties | 0 .../resources/mockito-extensions/org.mockito.plugins.MockMaker | 0 176 files changed, 0 insertions(+), 0 deletions(-) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/AbstractJsonFormatter.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/Context.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/CustomProtoJsonFormatter.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/CustomSimpleJsonFormatter.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/Decoder.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/Extensions.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/LwDataProviderException.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/Main.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/ProviderStreamInfo.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/RabbitMqDecoder.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/RequestContext.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/ResponseHandlers.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/SseEvent.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/SseResponseBuilder.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/Utils.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/ByteSizeDeserializer.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/Configuration.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/Variable.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/db/CradleEventExtractor.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/db/CradleMessageExtractor.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/db/DataMeasurement.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/db/DataSink.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/db/GeneralCradleExtractor.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/db/util/MeasurementUtil.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/db/util/RequestSyncUtil.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/ChannelClosedException.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/HandleDataException.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/InvalidRequestException.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/ParseEventTreeNodeException.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/internal/Direction.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/internal/ProviderEventId.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/internal/ResponseFormat.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/AllPageInfoRequest.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/GetEventRequest.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/GetGroupMessageRequest.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/GetMessageRequest.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/MessagesGroupRequest.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/ProviderMessageStream.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/QueueEventsScopeRequest.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/QueueMessageGroupsRequest.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SearchDirection.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SseEventSearchRequest.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SseMessageSearchRequest.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SsePageInfosSearchRequest.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/converter/GrpcFilterConverter.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/converter/HttpFilterConverter.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/util/SseSearchRequestUtil.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/BaseEventEntity.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/CustomSerializer.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/Event.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/LastScannedObjectInfo.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/MessageBatch.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/PageInfo.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ProviderMessage.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ProviderMessage53.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ProviderMessage53Transport.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ResponseMessage.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/StreamInfo.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ser/InstantBackwardCompatibilitySerializer.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ser/SerializationUtil.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/filter/DataFilter.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/filter/FilterFactory.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/filter/JoinedDataFilter.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/filter/events/EventsFilterFactory.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/filter/events/impl/EventSimpleFilter.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcDataProviderBackPressure.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcDataProviderImpl.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcEventRequestContext.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcMessageRequestContext.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcServer.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcUtils.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/QueueGrpcProvider.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractBasicDataSink.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractCancelableHandler.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractDataSink.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractParsedStoredMessageHandler.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/GeneralCradleHandler.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/MessageResponseHandler.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/QueueEventsHandler.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/QueueMessagesHandler.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/SearchEventsHandler.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/SearchMessagesHandler.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/util/PullingUtil.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/util/StoredMessageFilterUtil.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/AbstractRequestHandler.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/AbstractSseRequestHandler.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/Emitter.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/FileDownloadHandler.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetAllPageInfosServlet.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetBookIDs.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetEventScopes.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetEventsServlet.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessageById.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessageGroups.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessageGroupsServlet.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessagesServlet.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetOneEvent.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetPageInfosServlet.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetSessionAliases.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetSingleMessageByGroupAndId.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/HttpServer.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/JavalinContext.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/JavalinHandler.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/SseClient.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/SseHandler.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/SseRequestContext.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/TaskDownloadHandler.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/listener/ProgressListener.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/serializers/BookIdDeserializer.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/serializers/CustomMillisOrNanosInstantDeserializer.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/util/JsonStreamingUtil.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/util/QueryUtil.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/http/util/SseUtil.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DataMeasurementHistogram.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DataMeasurementImpl.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DataMeasurementSummary.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DecodingMetrics.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/HttpWriteMetrics.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/MeasurementImpl.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/ResponseQueue.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/producers/EventProducer.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/producers/GrpcMessageProducer.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/producers/MessageProducer.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/producers/MessageProducer53.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/producers/MessageProducer53Transport.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/producers/ParsedFormats.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/transport/TransportUtils.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/workers/DecodeQueueBuffer.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/workers/KeepAliveHandler.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/workers/ProtoCodecMessageListener.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/workers/RequestId.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/workers/RequestsBuffer.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TaskManager.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TimeoutChecker.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TimeoutWatcher.kt (100%) rename {src => app/src}/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TransportCodecMessageListener.kt (100%) rename {src => app/src}/main/resources/application.conf (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/EventBodyConverter.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/TestCustomProtoJsonFormatter.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/TestCustomSimpleJsonFormatter.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/TestRabbitMqDecoder.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/TestSseEventSearchRequest.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/TestSseMessageSearchRequest.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/TestStoredMessageFilterUtil.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/configuration/TestCustomConfigurationClassDeserialization.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/db/TestCradleEventExtractor.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/db/TestCradleMessageExtractor.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/db/integration/AbstractCradleIntegrationTest.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/db/integration/TestCradleMessageExtractorIntegration.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/converter/TestHttpFilterConverter.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/TestCustomSerializerKt.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/TestResponseMessage.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/TestStoredMessageIdSerializer.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/handlers/TestSearchMessagesHandler.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/http/AbstractHttpHandlerTest.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestFileDownloadHandler.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetAllPageInfosServlet.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetBookIDs.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetEventScopes.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetEventsServlet.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageById.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageGroups.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageGroupsServlet.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageGroupsServletTransportMode.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessagesServlet.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetOneEvent.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetPageInfosServlet.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetSessionAliases.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetSingleMessageByGroupAndId.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestTaskDownloadHandler.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestTimeConversion.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/util/CradleTestUtil.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/util/DummyDataMeasurement.kt (100%) rename {src => app/src}/test/kotlin/com/exactpro/th2/lwdataprovider/util/VerificationUtil.kt (100%) rename {src => app/src}/test/resources/log4j2.properties (100%) rename {src => app/src}/test/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%) diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/AbstractJsonFormatter.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/AbstractJsonFormatter.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/AbstractJsonFormatter.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/AbstractJsonFormatter.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/Context.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/Context.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/Context.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/Context.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/CustomProtoJsonFormatter.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/CustomProtoJsonFormatter.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/CustomProtoJsonFormatter.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/CustomProtoJsonFormatter.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/CustomSimpleJsonFormatter.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/CustomSimpleJsonFormatter.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/CustomSimpleJsonFormatter.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/CustomSimpleJsonFormatter.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/Decoder.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/Decoder.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/Decoder.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/Decoder.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/Extensions.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/Extensions.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/Extensions.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/Extensions.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/LwDataProviderException.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/LwDataProviderException.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/LwDataProviderException.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/LwDataProviderException.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/Main.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/Main.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/Main.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/Main.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/ProviderStreamInfo.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/ProviderStreamInfo.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/ProviderStreamInfo.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/ProviderStreamInfo.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/RabbitMqDecoder.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/RabbitMqDecoder.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/RabbitMqDecoder.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/RabbitMqDecoder.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/RequestContext.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/RequestContext.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/RequestContext.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/RequestContext.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/ResponseHandlers.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/ResponseHandlers.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/ResponseHandlers.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/ResponseHandlers.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/SseEvent.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/SseEvent.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/SseEvent.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/SseEvent.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/SseResponseBuilder.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/SseResponseBuilder.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/SseResponseBuilder.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/SseResponseBuilder.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/Utils.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/Utils.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/Utils.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/Utils.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/ByteSizeDeserializer.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/ByteSizeDeserializer.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/ByteSizeDeserializer.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/ByteSizeDeserializer.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/Configuration.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/Configuration.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/Configuration.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/Configuration.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/Variable.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/Variable.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/Variable.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/configuration/Variable.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/CradleEventExtractor.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/CradleEventExtractor.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/db/CradleEventExtractor.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/CradleEventExtractor.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/CradleMessageExtractor.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/CradleMessageExtractor.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/db/CradleMessageExtractor.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/CradleMessageExtractor.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/DataMeasurement.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/DataMeasurement.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/db/DataMeasurement.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/DataMeasurement.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/DataSink.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/DataSink.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/db/DataSink.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/DataSink.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/GeneralCradleExtractor.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/GeneralCradleExtractor.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/db/GeneralCradleExtractor.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/GeneralCradleExtractor.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/util/MeasurementUtil.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/util/MeasurementUtil.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/db/util/MeasurementUtil.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/util/MeasurementUtil.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/util/RequestSyncUtil.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/util/RequestSyncUtil.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/db/util/RequestSyncUtil.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/db/util/RequestSyncUtil.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/ChannelClosedException.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/ChannelClosedException.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/ChannelClosedException.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/ChannelClosedException.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/HandleDataException.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/HandleDataException.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/HandleDataException.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/HandleDataException.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/InvalidRequestException.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/InvalidRequestException.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/InvalidRequestException.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/InvalidRequestException.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/ParseEventTreeNodeException.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/ParseEventTreeNodeException.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/ParseEventTreeNodeException.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/exceptions/ParseEventTreeNodeException.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/internal/Direction.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/internal/Direction.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/internal/Direction.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/internal/Direction.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/internal/ProviderEventId.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/internal/ProviderEventId.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/internal/ProviderEventId.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/internal/ProviderEventId.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/internal/ResponseFormat.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/internal/ResponseFormat.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/internal/ResponseFormat.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/internal/ResponseFormat.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/AllPageInfoRequest.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/AllPageInfoRequest.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/AllPageInfoRequest.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/AllPageInfoRequest.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/GetEventRequest.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/GetEventRequest.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/GetEventRequest.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/GetEventRequest.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/GetGroupMessageRequest.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/GetGroupMessageRequest.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/GetGroupMessageRequest.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/GetGroupMessageRequest.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/GetMessageRequest.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/GetMessageRequest.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/GetMessageRequest.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/GetMessageRequest.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/MessagesGroupRequest.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/MessagesGroupRequest.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/MessagesGroupRequest.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/MessagesGroupRequest.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/ProviderMessageStream.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/ProviderMessageStream.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/ProviderMessageStream.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/ProviderMessageStream.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/QueueEventsScopeRequest.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/QueueEventsScopeRequest.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/QueueEventsScopeRequest.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/QueueEventsScopeRequest.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/QueueMessageGroupsRequest.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/QueueMessageGroupsRequest.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/QueueMessageGroupsRequest.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/QueueMessageGroupsRequest.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SearchDirection.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SearchDirection.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SearchDirection.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SearchDirection.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SseEventSearchRequest.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SseEventSearchRequest.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SseEventSearchRequest.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SseEventSearchRequest.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SseMessageSearchRequest.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SseMessageSearchRequest.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SseMessageSearchRequest.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SseMessageSearchRequest.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SsePageInfosSearchRequest.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SsePageInfosSearchRequest.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SsePageInfosSearchRequest.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/SsePageInfosSearchRequest.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/converter/GrpcFilterConverter.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/converter/GrpcFilterConverter.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/converter/GrpcFilterConverter.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/converter/GrpcFilterConverter.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/converter/HttpFilterConverter.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/converter/HttpFilterConverter.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/converter/HttpFilterConverter.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/converter/HttpFilterConverter.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/util/SseSearchRequestUtil.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/util/SseSearchRequestUtil.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/util/SseSearchRequestUtil.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/util/SseSearchRequestUtil.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/BaseEventEntity.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/BaseEventEntity.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/BaseEventEntity.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/BaseEventEntity.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/CustomSerializer.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/CustomSerializer.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/CustomSerializer.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/CustomSerializer.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/Event.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/Event.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/Event.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/Event.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/LastScannedObjectInfo.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/LastScannedObjectInfo.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/LastScannedObjectInfo.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/LastScannedObjectInfo.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/MessageBatch.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/MessageBatch.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/MessageBatch.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/MessageBatch.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/PageInfo.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/PageInfo.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/PageInfo.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/PageInfo.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ProviderMessage.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ProviderMessage.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ProviderMessage.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ProviderMessage.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ProviderMessage53.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ProviderMessage53.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ProviderMessage53.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ProviderMessage53.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ProviderMessage53Transport.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ProviderMessage53Transport.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ProviderMessage53Transport.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ProviderMessage53Transport.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ResponseMessage.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ResponseMessage.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ResponseMessage.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ResponseMessage.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/StreamInfo.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/StreamInfo.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/StreamInfo.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/StreamInfo.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ser/InstantBackwardCompatibilitySerializer.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ser/InstantBackwardCompatibilitySerializer.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ser/InstantBackwardCompatibilitySerializer.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ser/InstantBackwardCompatibilitySerializer.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ser/SerializationUtil.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ser/SerializationUtil.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ser/SerializationUtil.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/ser/SerializationUtil.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/DataFilter.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/DataFilter.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/DataFilter.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/DataFilter.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/FilterFactory.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/FilterFactory.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/FilterFactory.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/FilterFactory.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/JoinedDataFilter.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/JoinedDataFilter.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/JoinedDataFilter.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/JoinedDataFilter.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/events/EventsFilterFactory.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/events/EventsFilterFactory.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/events/EventsFilterFactory.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/events/EventsFilterFactory.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/events/impl/EventSimpleFilter.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/events/impl/EventSimpleFilter.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/events/impl/EventSimpleFilter.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/filter/events/impl/EventSimpleFilter.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcDataProviderBackPressure.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcDataProviderBackPressure.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcDataProviderBackPressure.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcDataProviderBackPressure.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcDataProviderImpl.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcDataProviderImpl.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcDataProviderImpl.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcDataProviderImpl.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcEventRequestContext.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcEventRequestContext.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcEventRequestContext.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcEventRequestContext.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcMessageRequestContext.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcMessageRequestContext.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcMessageRequestContext.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcMessageRequestContext.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcServer.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcServer.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcServer.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcServer.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcUtils.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcUtils.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcUtils.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/GrpcUtils.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/QueueGrpcProvider.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/QueueGrpcProvider.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/QueueGrpcProvider.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/grpc/QueueGrpcProvider.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractBasicDataSink.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractBasicDataSink.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractBasicDataSink.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractBasicDataSink.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractCancelableHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractCancelableHandler.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractCancelableHandler.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractCancelableHandler.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractDataSink.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractDataSink.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractDataSink.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractDataSink.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractParsedStoredMessageHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractParsedStoredMessageHandler.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractParsedStoredMessageHandler.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/AbstractParsedStoredMessageHandler.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/GeneralCradleHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/GeneralCradleHandler.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/GeneralCradleHandler.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/GeneralCradleHandler.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/MessageResponseHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/MessageResponseHandler.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/MessageResponseHandler.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/MessageResponseHandler.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/QueueEventsHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/QueueEventsHandler.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/QueueEventsHandler.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/QueueEventsHandler.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/QueueMessagesHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/QueueMessagesHandler.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/QueueMessagesHandler.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/QueueMessagesHandler.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/SearchEventsHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/SearchEventsHandler.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/SearchEventsHandler.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/SearchEventsHandler.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/SearchMessagesHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/SearchMessagesHandler.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/SearchMessagesHandler.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/SearchMessagesHandler.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/util/PullingUtil.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/util/PullingUtil.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/util/PullingUtil.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/util/PullingUtil.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/util/StoredMessageFilterUtil.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/util/StoredMessageFilterUtil.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/util/StoredMessageFilterUtil.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/handlers/util/StoredMessageFilterUtil.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/AbstractRequestHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/AbstractRequestHandler.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/AbstractRequestHandler.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/AbstractRequestHandler.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/AbstractSseRequestHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/AbstractSseRequestHandler.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/AbstractSseRequestHandler.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/AbstractSseRequestHandler.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/Emitter.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/Emitter.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/Emitter.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/Emitter.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/FileDownloadHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/FileDownloadHandler.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/FileDownloadHandler.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/FileDownloadHandler.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetAllPageInfosServlet.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetAllPageInfosServlet.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetAllPageInfosServlet.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetAllPageInfosServlet.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetBookIDs.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetBookIDs.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetBookIDs.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetBookIDs.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetEventScopes.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetEventScopes.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetEventScopes.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetEventScopes.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetEventsServlet.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetEventsServlet.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetEventsServlet.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetEventsServlet.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessageById.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessageById.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessageById.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessageById.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessageGroups.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessageGroups.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessageGroups.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessageGroups.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessageGroupsServlet.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessageGroupsServlet.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessageGroupsServlet.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessageGroupsServlet.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessagesServlet.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessagesServlet.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessagesServlet.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetMessagesServlet.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetOneEvent.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetOneEvent.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetOneEvent.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetOneEvent.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetPageInfosServlet.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetPageInfosServlet.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetPageInfosServlet.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetPageInfosServlet.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetSessionAliases.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetSessionAliases.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetSessionAliases.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetSessionAliases.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetSingleMessageByGroupAndId.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetSingleMessageByGroupAndId.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetSingleMessageByGroupAndId.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/GetSingleMessageByGroupAndId.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/HttpServer.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/HttpServer.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/HttpServer.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/HttpServer.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/JavalinContext.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/JavalinContext.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/JavalinContext.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/JavalinContext.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/JavalinHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/JavalinHandler.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/JavalinHandler.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/JavalinHandler.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/SseClient.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/SseClient.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/SseClient.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/SseClient.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/SseHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/SseHandler.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/SseHandler.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/SseHandler.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/SseRequestContext.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/SseRequestContext.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/SseRequestContext.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/SseRequestContext.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/TaskDownloadHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/TaskDownloadHandler.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/TaskDownloadHandler.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/TaskDownloadHandler.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/listener/ProgressListener.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/listener/ProgressListener.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/listener/ProgressListener.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/listener/ProgressListener.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/serializers/BookIdDeserializer.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/serializers/BookIdDeserializer.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/serializers/BookIdDeserializer.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/serializers/BookIdDeserializer.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/serializers/CustomMillisOrNanosInstantDeserializer.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/serializers/CustomMillisOrNanosInstantDeserializer.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/serializers/CustomMillisOrNanosInstantDeserializer.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/serializers/CustomMillisOrNanosInstantDeserializer.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/util/JsonStreamingUtil.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/util/JsonStreamingUtil.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/util/JsonStreamingUtil.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/util/JsonStreamingUtil.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/util/QueryUtil.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/util/QueryUtil.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/util/QueryUtil.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/util/QueryUtil.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/util/SseUtil.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/util/SseUtil.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/http/util/SseUtil.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/util/SseUtil.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DataMeasurementHistogram.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DataMeasurementHistogram.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DataMeasurementHistogram.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DataMeasurementHistogram.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DataMeasurementImpl.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DataMeasurementImpl.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DataMeasurementImpl.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DataMeasurementImpl.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DataMeasurementSummary.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DataMeasurementSummary.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DataMeasurementSummary.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DataMeasurementSummary.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DecodingMetrics.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DecodingMetrics.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DecodingMetrics.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/DecodingMetrics.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/HttpWriteMetrics.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/HttpWriteMetrics.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/HttpWriteMetrics.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/HttpWriteMetrics.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/MeasurementImpl.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/MeasurementImpl.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/MeasurementImpl.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/MeasurementImpl.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/ResponseQueue.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/ResponseQueue.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/ResponseQueue.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/metrics/ResponseQueue.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/EventProducer.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/EventProducer.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/EventProducer.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/EventProducer.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/GrpcMessageProducer.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/GrpcMessageProducer.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/GrpcMessageProducer.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/GrpcMessageProducer.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/MessageProducer.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/MessageProducer.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/MessageProducer.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/MessageProducer.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/MessageProducer53.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/MessageProducer53.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/MessageProducer53.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/MessageProducer53.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/MessageProducer53Transport.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/MessageProducer53Transport.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/MessageProducer53Transport.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/MessageProducer53Transport.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/ParsedFormats.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/ParsedFormats.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/ParsedFormats.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/producers/ParsedFormats.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/transport/TransportUtils.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/transport/TransportUtils.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/transport/TransportUtils.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/transport/TransportUtils.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/DecodeQueueBuffer.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/DecodeQueueBuffer.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/DecodeQueueBuffer.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/DecodeQueueBuffer.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/KeepAliveHandler.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/KeepAliveHandler.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/KeepAliveHandler.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/KeepAliveHandler.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/ProtoCodecMessageListener.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/ProtoCodecMessageListener.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/ProtoCodecMessageListener.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/ProtoCodecMessageListener.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/RequestId.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/RequestId.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/RequestId.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/RequestId.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/RequestsBuffer.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/RequestsBuffer.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/RequestsBuffer.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/RequestsBuffer.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TaskManager.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TaskManager.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TaskManager.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TaskManager.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TimeoutChecker.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TimeoutChecker.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TimeoutChecker.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TimeoutChecker.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TimeoutWatcher.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TimeoutWatcher.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TimeoutWatcher.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TimeoutWatcher.kt diff --git a/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TransportCodecMessageListener.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TransportCodecMessageListener.kt similarity index 100% rename from src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TransportCodecMessageListener.kt rename to app/src/main/kotlin/com/exactpro/th2/lwdataprovider/workers/TransportCodecMessageListener.kt diff --git a/src/main/resources/application.conf b/app/src/main/resources/application.conf similarity index 100% rename from src/main/resources/application.conf rename to app/src/main/resources/application.conf diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/EventBodyConverter.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/EventBodyConverter.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/EventBodyConverter.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/EventBodyConverter.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestCustomProtoJsonFormatter.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestCustomProtoJsonFormatter.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/TestCustomProtoJsonFormatter.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestCustomProtoJsonFormatter.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestCustomSimpleJsonFormatter.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestCustomSimpleJsonFormatter.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/TestCustomSimpleJsonFormatter.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestCustomSimpleJsonFormatter.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestRabbitMqDecoder.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestRabbitMqDecoder.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/TestRabbitMqDecoder.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestRabbitMqDecoder.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestSseEventSearchRequest.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestSseEventSearchRequest.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/TestSseEventSearchRequest.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestSseEventSearchRequest.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestSseMessageSearchRequest.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestSseMessageSearchRequest.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/TestSseMessageSearchRequest.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestSseMessageSearchRequest.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestStoredMessageFilterUtil.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestStoredMessageFilterUtil.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/TestStoredMessageFilterUtil.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/TestStoredMessageFilterUtil.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/configuration/TestCustomConfigurationClassDeserialization.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/configuration/TestCustomConfigurationClassDeserialization.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/configuration/TestCustomConfigurationClassDeserialization.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/configuration/TestCustomConfigurationClassDeserialization.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/db/TestCradleEventExtractor.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/db/TestCradleEventExtractor.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/db/TestCradleEventExtractor.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/db/TestCradleEventExtractor.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/db/TestCradleMessageExtractor.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/db/TestCradleMessageExtractor.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/db/TestCradleMessageExtractor.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/db/TestCradleMessageExtractor.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/db/integration/AbstractCradleIntegrationTest.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/db/integration/AbstractCradleIntegrationTest.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/db/integration/AbstractCradleIntegrationTest.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/db/integration/AbstractCradleIntegrationTest.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/db/integration/TestCradleMessageExtractorIntegration.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/db/integration/TestCradleMessageExtractorIntegration.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/db/integration/TestCradleMessageExtractorIntegration.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/db/integration/TestCradleMessageExtractorIntegration.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/converter/TestHttpFilterConverter.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/converter/TestHttpFilterConverter.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/converter/TestHttpFilterConverter.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/entities/requests/converter/TestHttpFilterConverter.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/TestCustomSerializerKt.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/TestCustomSerializerKt.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/TestCustomSerializerKt.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/TestCustomSerializerKt.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/TestResponseMessage.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/TestResponseMessage.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/TestResponseMessage.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/TestResponseMessage.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/TestStoredMessageIdSerializer.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/TestStoredMessageIdSerializer.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/TestStoredMessageIdSerializer.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/entities/responses/TestStoredMessageIdSerializer.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/handlers/TestSearchMessagesHandler.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/handlers/TestSearchMessagesHandler.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/handlers/TestSearchMessagesHandler.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/handlers/TestSearchMessagesHandler.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/AbstractHttpHandlerTest.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/AbstractHttpHandlerTest.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/http/AbstractHttpHandlerTest.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/AbstractHttpHandlerTest.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestFileDownloadHandler.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestFileDownloadHandler.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestFileDownloadHandler.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestFileDownloadHandler.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetAllPageInfosServlet.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetAllPageInfosServlet.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetAllPageInfosServlet.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetAllPageInfosServlet.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetBookIDs.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetBookIDs.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetBookIDs.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetBookIDs.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetEventScopes.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetEventScopes.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetEventScopes.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetEventScopes.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetEventsServlet.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetEventsServlet.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetEventsServlet.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetEventsServlet.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageById.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageById.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageById.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageById.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageGroups.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageGroups.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageGroups.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageGroups.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageGroupsServlet.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageGroupsServlet.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageGroupsServlet.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageGroupsServlet.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageGroupsServletTransportMode.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageGroupsServletTransportMode.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageGroupsServletTransportMode.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessageGroupsServletTransportMode.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessagesServlet.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessagesServlet.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessagesServlet.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetMessagesServlet.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetOneEvent.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetOneEvent.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetOneEvent.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetOneEvent.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetPageInfosServlet.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetPageInfosServlet.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetPageInfosServlet.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetPageInfosServlet.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetSessionAliases.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetSessionAliases.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetSessionAliases.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetSessionAliases.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetSingleMessageByGroupAndId.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetSingleMessageByGroupAndId.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetSingleMessageByGroupAndId.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestGetSingleMessageByGroupAndId.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestTaskDownloadHandler.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestTaskDownloadHandler.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestTaskDownloadHandler.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestTaskDownloadHandler.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestTimeConversion.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestTimeConversion.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestTimeConversion.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/http/TestTimeConversion.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/util/CradleTestUtil.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/util/CradleTestUtil.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/util/CradleTestUtil.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/util/CradleTestUtil.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/util/DummyDataMeasurement.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/util/DummyDataMeasurement.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/util/DummyDataMeasurement.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/util/DummyDataMeasurement.kt diff --git a/src/test/kotlin/com/exactpro/th2/lwdataprovider/util/VerificationUtil.kt b/app/src/test/kotlin/com/exactpro/th2/lwdataprovider/util/VerificationUtil.kt similarity index 100% rename from src/test/kotlin/com/exactpro/th2/lwdataprovider/util/VerificationUtil.kt rename to app/src/test/kotlin/com/exactpro/th2/lwdataprovider/util/VerificationUtil.kt diff --git a/src/test/resources/log4j2.properties b/app/src/test/resources/log4j2.properties similarity index 100% rename from src/test/resources/log4j2.properties rename to app/src/test/resources/log4j2.properties diff --git a/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker From 6dfec8b52f8605ee8ea62ca6e751fed10769f56d Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Mon, 13 May 2024 19:26:34 +0400 Subject: [PATCH 02/15] Migrated to th2 gradle plugin `0.0.6` --- .github/workflows/dev-build.yml | 4 +- .github/workflows/dev-release-build.yml | 6 +- README.md | 7 + app/build.gradle.kts | 80 +++++++++ app/gradle.properties | 6 + build.gradle | 167 ------------------ build.gradle.kts | 87 +++++++++ buildSrc/build.gradle | 11 -- ....exactpro.th2.artifacts-convensions.gradle | 88 --------- ...com.exactpro.th2.common-convensions.gradle | 69 -------- gradle.properties | 5 - grpc/build.gradle | 79 --------- grpc/build.gradle.kts | 14 ++ grpc/gradle.properties | 2 +- grpc/package_info.json | 2 +- grpc/setup.py | 6 +- .../lw_data_provider.proto | 0 .../queue_data_provider.proto | 0 settings.gradle | 39 ---- settings.gradle.kts | 14 ++ utils/build.gradle | 21 --- utils/build.gradle.kts | 19 ++ 22 files changed, 238 insertions(+), 488 deletions(-) create mode 100644 app/build.gradle.kts create mode 100644 app/gradle.properties delete mode 100644 build.gradle create mode 100644 build.gradle.kts delete mode 100644 buildSrc/build.gradle delete mode 100644 buildSrc/src/main/groovy/com.exactpro.th2.artifacts-convensions.gradle delete mode 100644 buildSrc/src/main/groovy/com.exactpro.th2.common-convensions.gradle delete mode 100644 grpc/build.gradle create mode 100644 grpc/build.gradle.kts rename grpc/{ => src/main}/proto/th2_grpc_lw_data_provider/lw_data_provider.proto (100%) rename grpc/{ => src/main}/proto/th2_grpc_lw_data_provider/queue_data_provider.proto (100%) delete mode 100644 settings.gradle create mode 100644 settings.gradle.kts delete mode 100644 utils/build.gradle create mode 100644 utils/build.gradle.kts diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index 6f23ed41..7276e919 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -19,6 +19,8 @@ jobs: app-version: name: Collect app version uses: th2-net/.github/.github/workflows/compound-prebuild-java-dev-workflow.yml@main + with: + project-path: app build-and-publish-grpc-java: name: Build and publish Java gRPC distributions uses: th2-net/.github/.github/workflows/compaund-java-multi-project-build.yml@main @@ -66,7 +68,7 @@ jobs: docker-username: ${{ github.actor }} version: ${{ needs.app-version.outputs.version }} versionNumber: ${{ needs.app-version.outputs.versionNumber }} - dockerContext: '.' + dockerContext: 'app' gradleParameters: ${{ format('["clean", "build", "dockerPrepare", "-Pversion_suffix={0}"]', needs.app-version.outputs.versionSuffix) }} secrets: docker-password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/dev-release-build.yml b/.github/workflows/dev-release-build.yml index 260cb4e2..2e246a2b 100644 --- a/.github/workflows/dev-release-build.yml +++ b/.github/workflows/dev-release-build.yml @@ -10,7 +10,7 @@ jobs: name: Extract app version uses: th2-net/.github/.github/workflows/compound-prebuild-java-workflow.yml@main with: - project-path: . + project-path: app get-previous-tag: name: Get previous tag runs-on: ubuntu-20.04 @@ -43,7 +43,7 @@ jobs: base: ${{ needs.get-previous-tag.outputs.tag }} filters: | app: - - 'gradle.properties' + - 'app/gradle.properties' grpc: - 'grpc/gradle.properties' utils: @@ -146,7 +146,7 @@ jobs: docker-username: ${{ github.actor }} version: ${{ needs.app-version.outputs.version }}-dev versionNumber: ${{ needs.app-version.outputs.version }} - dockerContext: '.' + dockerContext: 'app' gradleParameters: '["clean", "build", "dockerPrepare"]' secrets: docker-password: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index ed2080e1..569f7aa1 100644 --- a/README.md +++ b/README.md @@ -224,6 +224,13 @@ spec: # Release notes: +## 2.8.0 ++ Migrated to th2 gradle plugin `0.0.6` ++ Updated bom: `4.6.1-dev` ++ Updated cradle api: `5.3.0-dev` ++ Updated common: `5.11.0-dev` ++ Updated micrometer-bom: `1.12.5` + ## 2.7.0 + Updated cradle api: `5.2.0-dev` diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 00000000..f968e2ad --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,80 @@ +plugins { + `java-library` + `maven-publish` + + kotlin("kapt") + kotlin("plugin.serialization") + id("com.exactpro.th2.gradle.component") +} + +val cradleApiVersion: String by rootProject.extra +val javalin: String by rootProject.extra +val commonVersion: String by rootProject.extra + +dependencies { + implementation("com.exactpro.th2:common:${commonVersion}") { + exclude(group = "com.exactpro.th2", module = "cradle-core") + exclude(group = "com.exactpro.th2", module = "cradle-cassandra") + } + + implementation(platform("org.eclipse.jetty:jetty-bom:11.0.15")) { + because("vulnerabilities in version 11.0.13. Can be removed after updating Javalin and Kotlin") + } + + implementation("io.javalin:javalin:$javalin") + implementation("io.javalin:javalin-micrometer:$javalin") + + implementation(platform("io.micrometer:micrometer-bom:1.12.5")) { + because("should match the version in javalin-micrometer") + } + + implementation("io.micrometer:micrometer-registry-prometheus") + implementation("org.apache.commons:commons-lang3") + + kapt("io.javalin.community.openapi:openapi-annotation-processor:$javalin") + + implementation("io.javalin.community.openapi:javalin-openapi-plugin:$javalin") { + because("for /openapi route with JSON scheme") + } +// swagger-ui-3.52.5.jar (pkg:maven/org.webjars/swagger-ui@3.52.5) : CVE-2018-25031 +// implementation("io.javalin.community.openapi:javalin-swagger-plugin:$javalin") { +// because("for Swagger UI") +// } + implementation("io.javalin.community.openapi:javalin-redoc-plugin:$javalin") { + because("for Re Doc UI") + } + + implementation("com.exactpro.th2:cradle-cassandra:$cradleApiVersion") + implementation("net.jpountz.lz4:lz4:1.3.0") { + because("cassandra driver requires lz4 impl in classpath for compression") + } + implementation(project(":grpc-lw-data-provider")) + + implementation("io.prometheus:simpleclient") { + because("need add custom metrics to provider") + } + + implementation("org.apache.commons:commons-lang3") + + implementation("com.fasterxml.jackson.core:jackson-core") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") + + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.5.1") + + implementation("io.netty:netty-buffer") + + testImplementation("io.javalin:javalin-testtools:$javalin") + + testImplementation(testFixtures("com.exactpro.th2:common:${commonVersion}")) + testImplementation(platform("org.testcontainers:testcontainers-bom:1.19.8")) + testImplementation("org.testcontainers:junit-jupiter") + testImplementation("org.testcontainers:cassandra") + + testImplementation("com.datastax.oss:java-driver-core") +} + +application { + applicationName = "service" + mainClass.set("com.exactpro.th2.lwdataprovider.MainKt") +} \ No newline at end of file diff --git a/app/gradle.properties b/app/gradle.properties new file mode 100644 index 00000000..21c0ff98 --- /dev/null +++ b/app/gradle.properties @@ -0,0 +1,6 @@ +kotlin.code.style=official +release_version=2.8.0 + +description='th2 Lightweight data provider component' +vcs_url=https://github.com/th2-net/th2-lw-data-provider +kapt.include.compile.classpath=false \ No newline at end of file diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 878b26f2..00000000 --- a/build.gradle +++ /dev/null @@ -1,167 +0,0 @@ -import com.github.jk1.license.filter.LicenseBundleNormalizer -import com.github.jk1.license.render.JsonReportRenderer - -plugins { - id 'com.exactpro.th2.artifacts-convensions' - id 'application' - id 'com.palantir.docker' version '0.25.0' - id "io.github.gradle-nexus.publish-plugin" version "1.3.0" - id 'org.jetbrains.kotlin.kapt' - id "org.owasp.dependencycheck" version "8.3.1" - id 'org.jetbrains.kotlin.plugin.serialization' version "1.8.22" - id "com.gorylenko.gradle-git-properties" version "2.4.1" - id 'com.github.jk1.dependency-license-report' version '2.5' - id "de.undercouch.download" version "5.4.0" -} - -ext { - dockerImageVersion = release_version - cradleApiVersion = '5.2.0-dev' - javalin = '5.4.2' -} - -dependencyCheck { - formats = ['SARIF', 'JSON', 'HTML'] - failBuildOnCVSS = 5 - //FIXME: we should check all used dependencies - skipConfigurations = ['kapt', 'kaptClasspath_kaptKotlin', 'kaptTest', 'kaptTestFixtures'] - suppressionFile = file('suppressions.xml') - analyzers { - assemblyEnabled = false - nugetconfEnabled = false - nodeEnabled = false - } -} - -dependencies { - implementation("com.exactpro.th2:common:${commonVersion}") { - exclude group: 'com.exactpro.th2', module: 'cradle-core' - exclude group: 'com.exactpro.th2', module: 'cradle-cassandra' - } - - implementation(platform('org.eclipse.jetty:jetty-bom:11.0.15')) { - because('vulnerabilities in version 11.0.13. Can be removed after updating Javalin and Kotlin') - } - - implementation "io.javalin:javalin:$javalin" - implementation "io.javalin:javalin-micrometer:$javalin" - - implementation(platform('io.micrometer:micrometer-bom:1.10.1')) { - because('should match the version in javalin-micrometer') - } - - implementation('io.micrometer:micrometer-registry-prometheus') - implementation 'org.apache.commons:commons-lang3' - - kapt("io.javalin.community.openapi:openapi-annotation-processor:$javalin") - - implementation("io.javalin.community.openapi:javalin-openapi-plugin:$javalin") { - because("for /openapi route with JSON scheme") - } -// swagger-ui-3.52.5.jar (pkg:maven/org.webjars/swagger-ui@3.52.5) : CVE-2018-25031 -// implementation("io.javalin.community.openapi:javalin-swagger-plugin:$javalin") { -// because("for Swagger UI") -// } - implementation("io.javalin.community.openapi:javalin-redoc-plugin:$javalin") { - because("for Re Doc UI") - } - - implementation("com.exactpro.th2:cradle-cassandra:$cradleApiVersion") - implementation('net.jpountz.lz4:lz4:1.3.0') { - because('cassandra driver requires lz4 impl in classpath for compression') - } - implementation project(':grpc-lw-data-provider') - - implementation('io.prometheus:simpleclient') { - because('need add custom metrics to provider') - } - - implementation('org.apache.commons:commons-lang3') - - implementation 'com.fasterxml.jackson.core:jackson-core' - implementation 'com.fasterxml.jackson.module:jackson-module-kotlin' - implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310' - - implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.5.1' - - implementation 'io.netty:netty-buffer' - - testImplementation "io.javalin:javalin-testtools:$javalin" - - testImplementation(testFixtures("com.exactpro.th2:common:${commonVersion}")) - testImplementation platform('org.testcontainers:testcontainers-bom:1.19.7') - testImplementation 'org.testcontainers:junit-jupiter' - testImplementation "org.testcontainers:cassandra" - - testImplementation 'com.datastax.oss:java-driver-core' -} - -test { - useJUnitPlatform { - excludeTags('integration-test') - } -} - -tasks.register('integrationTest', Test) { - group = 'verification' - useJUnitPlatform { - includeTags('integration-test') - } - testLogging { - showStandardStreams = true - } -} - -applicationName = 'service' - -distTar { - archiveFileName.set("${applicationName}.tar") -} - -dockerPrepare { - dependsOn distTar -} - -docker { - copySpec.from(tarTree("$buildDir/distributions/${applicationName}.tar")) -} - -application { - mainClass.set('com.exactpro.th2.lwdataprovider.MainKt') -} - -configurations.configureEach { - resolutionStrategy.cacheChangingModulesFor 0, 'seconds' - resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds' -} - -// For GitHub only -nexusPublishing { - repositories { - sonatype { - nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) - snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) - } - } -} - -licenseReport { - def licenseNormalizerBundlePath = "$buildDir/license-normalizer-bundle.json" - - if (!file(licenseNormalizerBundlePath).exists()) { - download.run { - src 'https://raw.githubusercontent.com/th2-net/.github/main/license-compliance/gradle-license-report/license-normalizer-bundle.json' - dest "$buildDir/license-normalizer-bundle.json" - overwrite false - } - } - - filters = [ - new LicenseBundleNormalizer(licenseNormalizerBundlePath, false) - ] - renderers = [ - new JsonReportRenderer('licenses.json', false), - ] - excludeOwnGroup = false - allowedLicensesFile = new URL("https://raw.githubusercontent.com/th2-net/.github/main/license-compliance/gradle-license-report/allowed-licenses.json") -} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..624fbb4a --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,87 @@ +plugins { + id("com.exactpro.th2.gradle.base") version "0.0.6" + id("com.exactpro.th2.gradle.publish") version "0.0.6" + + kotlin("jvm") version "1.8.22" + kotlin("kapt") version "1.8.22" apply false + id("org.jetbrains.kotlin.plugin.serialization") version "1.8.22" apply false + + id("com.exactpro.th2.gradle.grpc") version "0.0.6" apply false + id("com.exactpro.th2.gradle.component") version "0.0.6" apply false +} + +val cradleApiVersion by extra("5.3.0-dev") +val javalin by extra("5.4.2") +val commonVersion by extra("5.11.0-dev") + +dependencyCheck { + skipConfigurations = listOf("kapt", "kaptClasspath_kaptKotlin", "kaptTest", "kaptTestFixtures") + suppressionFile = "supressions.xml" +} + +allprojects { + group = "com.exactpro.th2" + version = project.findProperty("release_version") + val suffix: String = project.findProperty("version_suffix").toString() + if (!suffix.isEmpty()) { + version = "$version-$suffix" + } +} + +subprojects { + apply(plugin = "kotlin") + + kotlin { + jvmToolchain(11) + } + + repositories { + mavenCentral() + maven { + name = "Sonatype_snapshots" + url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") + } + + maven { + name = "Sonatype_releases" + url = uri("https://s01.oss.sonatype.org/content/repositories/releases/") + } + } + + configurations.all { + resolutionStrategy.cacheChangingModulesFor(0, "seconds") + resolutionStrategy.cacheDynamicVersionsFor(0, "seconds") + } + + dependencies { + implementation("org.slf4j:slf4j-api") + implementation("io.github.microutils:kotlin-logging:3.0.5") + + testImplementation("org.apache.logging.log4j:log4j-slf4j2-impl") { + because("logging in testing") + } + testImplementation("org.apache.logging.log4j:log4j-core") { + because("logging in testing") + } + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") + testImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1") + testImplementation("io.strikt:strikt-core:0.34.1") + testImplementation("io.strikt:strikt-jackson:0.34.1") + } + + tasks.test { + useJUnitPlatform { + excludeTags("integration-test") + } + } + + tasks.register("integrationTest") { + group = "verification" + useJUnitPlatform { + includeTags("integration-test") + } + testLogging { + showStandardStreams = true + } + } +} \ No newline at end of file diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle deleted file mode 100644 index 14071c81..00000000 --- a/buildSrc/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -plugins { - id 'groovy-gradle-plugin' -} - -repositories { - gradlePluginPortal() -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22" -} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/com.exactpro.th2.artifacts-convensions.gradle b/buildSrc/src/main/groovy/com.exactpro.th2.artifacts-convensions.gradle deleted file mode 100644 index 70de3804..00000000 --- a/buildSrc/src/main/groovy/com.exactpro.th2.artifacts-convensions.gradle +++ /dev/null @@ -1,88 +0,0 @@ -plugins { - id 'com.exactpro.th2.common-convensions' - id 'java-library' - id 'maven-publish' - id 'signing' -} - -java { - withJavadocJar() - withSourcesJar() -} - -publishing { - publications { - mavenJava(MavenPublication) { - from(components.java) - pom { - name = rootProject.name - packaging = 'jar' - description = rootProject.description - url = rootProject.vcs_url - scm { - url = rootProject.vcs_url - } - licenses { - license { - name = 'The Apache License, Version 2.0' - url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - developers { - developer { - id = 'developer' - name = 'developer' - email = 'developer@exactpro.com' - } - } - scm { - url = rootProject.vcs_url - } - } - } - } - repositories { - //Nexus repo to publish from gitlab - maven { - name = 'nexus' - credentials { - username = project.findProperty('nexus_user') - password = project.findProperty('nexus_password') - } - url = project.findProperty('nexus_url') - } - } -} - -tasks.withType(PublishToMavenRepository).configureEach { - onlyIf { - (repository == publishing.repositories.nexus && - project.hasProperty('nexus_user') && - project.hasProperty('nexus_password') && - project.hasProperty('nexus_url')) || - (repository == publishing.repositories.sonatype && - project.hasProperty('sonatypeUsername') && - project.hasProperty('sonatypePassword')) - } -} -tasks.withType(Sign).configureEach { - onlyIf { - project.hasProperty('signingKey') && - project.hasProperty('signingPassword') - } -} -// disable running task 'initializeSonatypeStagingRepository' on a gitlab -tasks.whenTaskAdded { task -> - if (task.name == 'initializeSonatypeStagingRepository' && - !(project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')) - ) { - task.enabled = false - } -} - -signing { - String signingKey = findProperty("signingKey") - String signingPassword = findProperty("signingPassword") - useInMemoryPgpKeys(signingKey, signingPassword) - sign publishing.publications.mavenJava -} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/com.exactpro.th2.common-convensions.gradle b/buildSrc/src/main/groovy/com.exactpro.th2.common-convensions.gradle deleted file mode 100644 index 50c2f95d..00000000 --- a/buildSrc/src/main/groovy/com.exactpro.th2.common-convensions.gradle +++ /dev/null @@ -1,69 +0,0 @@ -plugins { - id 'org.jetbrains.kotlin.jvm' -} - -group 'com.exactpro.th2' -version release_version - -ext { - commonVersion = '5.10.0-dev' -} - -sourceCompatibility = 11 -targetCompatibility = 11 - -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { - kotlinOptions { - jvmTarget = "11" - } -} - -configurations.configureEach { - resolutionStrategy.cacheChangingModulesFor 0, 'seconds' - resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds' -} - -group = 'com.exactpro.th2' -version = release_version -String suffix = property('version_suffix').toString() -if (!suffix.isEmpty()) { - version = "$version-$suffix" -} - -dependencies { - implementation platform('com.exactpro.th2:bom:4.6.0') - implementation 'org.slf4j:slf4j-api' - implementation 'io.github.microutils:kotlin-logging:3.0.5' - - testImplementation('org.apache.logging.log4j:log4j-slf4j2-impl') { - because('logging in testing') - } - testImplementation('org.apache.logging.log4j:log4j-core') { - because('logging in testing') - } - testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2' - testImplementation 'org.mockito.kotlin:mockito-kotlin:5.2.1' - testImplementation 'io.strikt:strikt-core:0.34.1' - testImplementation 'io.strikt:strikt-jackson:0.34.1' -} - -test { - useJUnitPlatform() - testLogging { - showStandardStreams = true - } -} - -jar { - manifest { - attributes( - 'Created-By': "${System.getProperty('java.version')} (${System.getProperty('java.vendor')})", - 'Specification-Title': '', - 'Specification-Vendor': 'Exactpro Systems LLC', - 'Implementation-Title': project.archivesBaseName, - 'Implementation-Vendor': 'Exactpro Systems LLC', - 'Implementation-Vendor-Id': 'com.exactpro', - 'Implementation-Version': project.version - ) - } -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 6c976004..5195dcc1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,9 +16,4 @@ kotlin.code.style=official -release_version=2.8.0 -description='th2 Lightweight data provider component' -vcs_url=https://github.com/th2-net/th2-lw-data-provider -docker_image_name= -kapt.include.compile.classpath=false version_suffix= \ No newline at end of file diff --git a/grpc/build.gradle b/grpc/build.gradle deleted file mode 100644 index b8953451..00000000 --- a/grpc/build.gradle +++ /dev/null @@ -1,79 +0,0 @@ -import static org.gradle.api.file.DuplicatesStrategy.INCLUDE - -plugins { - id 'com.exactpro.th2.artifacts-convensions' - id "com.google.protobuf" version "0.9.4" -} - -ext { - grpcVersion = '1.56.0' - protobufVersion = '3.23.2' - serviceGeneratorVersion = '3.5.1' - genBaseDir = file("${buildDir}/generated/source/proto") // from protobuf plugin -} - -dependencies { - api "com.exactpro.th2:grpc-common:4.5.0-dev" - api "com.google.protobuf:protobuf-java-util" - api "io.grpc:grpc-stub" - implementation "io.grpc:grpc-protobuf" - implementation "io.grpc:grpc-core" - implementation "io.grpc:grpc-netty" - - implementation "javax.annotation:javax.annotation-api:1.3.2" - - api "com.exactpro.th2:grpc-service-generator:$serviceGeneratorVersion" -} - -sourceSets { - main { - proto { - srcDirs 'proto' - } - // the proto plugins add generated dir to source sets - resources { - srcDirs "$genBaseDir/main/services/java/resources" - } - } -} - -protobuf { - protoc { - artifact = "com.google.protobuf:protoc:${protobufVersion}" - } - plugins { - grpc { - artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}" - } - services { - artifact = "com.exactpro.th2:grpc-service-generator:${serviceGeneratorVersion}:all@jar" - } - } - generateProtoTasks { - ofSourceSet('main').configureEach { - plugins { - grpc {} - services { - option 'javaInterfacesPath=./java' - option 'javaInterfacesImplPath=./java' - option 'javaMetaInfPath=./java/resources' - option 'pythonPath=./python' - } - } - } - } -} - -compileJava.dependsOn('generateProto') -processResources.dependsOn('generateProto') -sourcesJar.dependsOn('generateProto') - -tasks { - processResources { - duplicatesStrategy = INCLUDE - } -} - -clean { - delete genBaseDir -} \ No newline at end of file diff --git a/grpc/build.gradle.kts b/grpc/build.gradle.kts new file mode 100644 index 00000000..dc777714 --- /dev/null +++ b/grpc/build.gradle.kts @@ -0,0 +1,14 @@ +plugins { + `java-library` + `maven-publish` + + id("com.exactpro.th2.gradle.grpc") +} + +dependencies { + api("com.exactpro.th2:grpc-common:4.5.0-dev") +} + +th2Grpc { + service.set(true) +} \ No newline at end of file diff --git a/grpc/gradle.properties b/grpc/gradle.properties index b619165e..09132229 100644 --- a/grpc/gradle.properties +++ b/grpc/gradle.properties @@ -1,2 +1,2 @@ kotlin.code.style=official -release_version=2.3.1 \ No newline at end of file +release_version=2.4.0 \ No newline at end of file diff --git a/grpc/package_info.json b/grpc/package_info.json index 15776a30..11eb9924 100644 --- a/grpc/package_info.json +++ b/grpc/package_info.json @@ -1,4 +1,4 @@ { "package_name": "th2_grpc_lw_data_provider", - "package_version": "2.3.1" + "package_version": "2.4.0" } diff --git a/grpc/setup.py b/grpc/setup.py index 72d5fae9..96d69532 100644 --- a/grpc/setup.py +++ b/grpc/setup.py @@ -37,7 +37,7 @@ def finalize_options(self): pass def run(self): - proto_path = os.path.abspath('proto') + proto_path = os.path.abspath('src/main/proto') gen_path = os.path.abspath('build/generated/source/proto/main/services/python') if not os.path.exists(gen_path): @@ -70,7 +70,7 @@ def run(self): class CustomDist(sdist): def run(self): - copy_tree(f'proto/{package_name}', package_name) + copy_tree(f'src/main/proto/{package_name}', package_name) copy_tree(f'build/generated/source/proto/main/services/python/{package_name}', package_name) Path(f'{package_name}/__init__.py').touch() @@ -120,7 +120,7 @@ def make_packages(root_dir): license='Apache License 2.0', python_requires='>=3.7', install_requires=[ - 'th2-grpc-common==4.3.0.dev0', + 'th2-grpc-common==4.5.0.dev0', 'mypy-protobuf==3.4' ], packages=packages, diff --git a/grpc/proto/th2_grpc_lw_data_provider/lw_data_provider.proto b/grpc/src/main/proto/th2_grpc_lw_data_provider/lw_data_provider.proto similarity index 100% rename from grpc/proto/th2_grpc_lw_data_provider/lw_data_provider.proto rename to grpc/src/main/proto/th2_grpc_lw_data_provider/lw_data_provider.proto diff --git a/grpc/proto/th2_grpc_lw_data_provider/queue_data_provider.proto b/grpc/src/main/proto/th2_grpc_lw_data_provider/queue_data_provider.proto similarity index 100% rename from grpc/proto/th2_grpc_lw_data_provider/queue_data_provider.proto rename to grpc/src/main/proto/th2_grpc_lw_data_provider/queue_data_provider.proto diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 4e9d78d7..00000000 --- a/settings.gradle +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * Copyright 2009-2022 Exactpro (Exactpro Systems Limited) - * - * 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. - ******************************************************************************/ - -rootProject.name = 'lw-data-provider' - -include 'grpc' -include 'utils' - -project(':grpc').name = 'grpc-lw-data-provider' -project(':utils').name = 'lw-data-provider-utils' - -dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - mavenCentral() - maven { - name 'Sonatype_snapshots' - url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' - } - maven { - name 'Sonatype_releases' - url 'https://s01.oss.sonatype.org/content/repositories/releases/' - } - mavenLocal() - } -} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..7423edce --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,14 @@ +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + mavenCentral() + } +} + +include("app") +include("grpc") +include("utils") + +project(":app").name = "lw-data-provider" +project(":grpc").name = "grpc-lw-data-provider" +project(":utils").name = "lw-data-provider-utils" \ No newline at end of file diff --git a/utils/build.gradle b/utils/build.gradle deleted file mode 100644 index 7b62d862..00000000 --- a/utils/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - id 'com.exactpro.th2.artifacts-convensions' - id 'java-library' -} - -dependencies { - api project(':grpc-lw-data-provider') - implementation("com.exactpro.th2:common:${commonVersion}") { - exclude group: 'com.exactpro.th2', module: 'cradle-core' - exclude group: 'com.exactpro.th2', module: 'cradle-cassandra' - } - - implementation 'io.github.microutils:kotlin-logging:3.0.5' - - testImplementation 'org.mockito.kotlin:mockito-kotlin:5.2.1' - testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5' -} - -test { - useJUnitPlatform() -} \ No newline at end of file diff --git a/utils/build.gradle.kts b/utils/build.gradle.kts new file mode 100644 index 00000000..bdba12f6 --- /dev/null +++ b/utils/build.gradle.kts @@ -0,0 +1,19 @@ +plugins { + `java-library` + `maven-publish` +} + +val commonVersion: String by rootProject.extra + +dependencies { + api(project(":grpc-lw-data-provider")) + implementation("com.exactpro.th2:common:${commonVersion}") { + exclude(group = "com.exactpro.th2", module = "cradle-core") + exclude(group = "com.exactpro.th2", module = "cradle-cassandra") + } + + implementation("io.github.microutils:kotlin-logging:3.0.5") + + testImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1") + testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") +} \ No newline at end of file From 6d32fa624fedc17fe325d68a99dfb1cc32a188c2 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Mon, 13 May 2024 19:28:29 +0400 Subject: [PATCH 03/15] corrected after review --- README.md | 1 + utils/gradle.properties | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 569f7aa1..e5aaf322 100644 --- a/README.md +++ b/README.md @@ -229,6 +229,7 @@ spec: + Updated bom: `4.6.1-dev` + Updated cradle api: `5.3.0-dev` + Updated common: `5.11.0-dev` ++ Updated grpc-common: `4.5.0-dev` + Updated micrometer-bom: `1.12.5` ## 2.7.0 diff --git a/utils/gradle.properties b/utils/gradle.properties index 14da1e2e..4a3ad527 100644 --- a/utils/gradle.properties +++ b/utils/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official -release_version=0.0.1 +release_version=0.0.2 description='th2 Lightweight data provider utils' vcs_url=https://github.com/th2-net/th2-lw-data-provider \ No newline at end of file From 7f7d3e38f14b57e4ad7e5ace5827c2b3785c07c4 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Mon, 13 May 2024 19:48:16 +0400 Subject: [PATCH 04/15] corrected after review --- .github/workflows/build.yml | 5 +++-- .github/workflows/dev-build.yml | 1 + .github/workflows/dev-release-build.yml | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a9feabac..98f9bcc5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: base: ${{ github.ref }} filters: | app: - - 'gradle.properties' + - 'app/gradle.properties' grpc: - 'grpc/gradle.properties' utils: @@ -78,6 +78,7 @@ jobs: uses: th2-net/.github/.github/workflows/owasp-gradle-scan.yml@main with: multiproject: true + nvd-api-key: ${{ secrets.NVD_APIKEY }} publish-docker: name: Build and publish docker image if: | @@ -92,7 +93,7 @@ jobs: docker-username: ${{ github.actor }} version: ${{ needs.versions.outputs.version }} versionNumber: ${{ needs.versions.outputs.version }} - dockerContext: '.' + dockerContext: 'app' gradleParameters: '["clean", "build", "dockerPrepare"]' secrets: docker-password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index 7276e919..5a00e52e 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -59,6 +59,7 @@ jobs: uses: th2-net/.github/.github/workflows/owasp-gradle-scan.yml@main with: multiproject: true + nvd-api-key: ${{ secrets.NVD_APIKEY }} publish-docker: name: Build docker image needs: diff --git a/.github/workflows/dev-release-build.yml b/.github/workflows/dev-release-build.yml index 2e246a2b..2d95b931 100644 --- a/.github/workflows/dev-release-build.yml +++ b/.github/workflows/dev-release-build.yml @@ -131,6 +131,7 @@ jobs: uses: th2-net/.github/.github/workflows/owasp-gradle-scan.yml@main with: multiproject: true + nvd-api-key: ${{ secrets.NVD_APIKEY }} publish-docker: name: Build and publish docker image From 9ef6ea94692663abbab7bc3cf638f5f7347590b6 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Mon, 13 May 2024 19:59:58 +0400 Subject: [PATCH 05/15] corrected after review --- .github/workflows/build.yml | 3 +-- .github/workflows/ci-unwelcome-words.yml | 4 ++-- .github/workflows/dev-build.yml | 1 - .github/workflows/dev-release-build.yml | 9 ++++----- .github/workflows/integration-tests.yml | 2 +- Dockerfile | 2 +- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 98f9bcc5..4f204456 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: app: ${{ steps.filter.outputs.app }} grpc: ${{ steps.filter.outputs.grpc }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dorny/paths-filter@v2 id: filter with: @@ -93,7 +93,6 @@ jobs: docker-username: ${{ github.actor }} version: ${{ needs.versions.outputs.version }} versionNumber: ${{ needs.versions.outputs.version }} - dockerContext: 'app' gradleParameters: '["clean", "build", "dockerPrepare"]' secrets: docker-password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ci-unwelcome-words.yml b/.github/workflows/ci-unwelcome-words.yml index a7e7f3a5..4e5f3a6e 100644 --- a/.github/workflows/ci-unwelcome-words.yml +++ b/.github/workflows/ci-unwelcome-words.yml @@ -7,11 +7,11 @@ jobs: test: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ github.sha }} - name: Checkout tool - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: exactpro-th2/ci-github-action ref: master diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index 5a00e52e..25ab17ce 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -69,7 +69,6 @@ jobs: docker-username: ${{ github.actor }} version: ${{ needs.app-version.outputs.version }} versionNumber: ${{ needs.app-version.outputs.versionNumber }} - dockerContext: 'app' gradleParameters: ${{ format('["clean", "build", "dockerPrepare", "-Pversion_suffix={0}"]', needs.app-version.outputs.versionSuffix) }} secrets: docker-password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/dev-release-build.yml b/.github/workflows/dev-release-build.yml index 2d95b931..b31bb111 100644 --- a/.github/workflows/dev-release-build.yml +++ b/.github/workflows/dev-release-build.yml @@ -15,7 +15,7 @@ jobs: name: Get previous tag runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ github.ref }} fetch-depth: 100 @@ -36,7 +36,7 @@ jobs: app: ${{ steps.filter.outputs.app }} grpc: ${{ steps.filter.outputs.grpc }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dorny/paths-filter@v2 id: filter with: @@ -71,7 +71,7 @@ jobs: - changes if: ${{ needs.changes.outputs.grpc == 'true' }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 'zulu' '11' uses: actions/setup-java@v3 with: @@ -111,7 +111,7 @@ jobs: always() && (needs.changes.outputs.utils == 'true' || needs.changes.outputs.grpc == 'true') steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 'zulu' '11' uses: actions/setup-java@v3 with: @@ -147,7 +147,6 @@ jobs: docker-username: ${{ github.actor }} version: ${{ needs.app-version.outputs.version }}-dev versionNumber: ${{ needs.app-version.outputs.version }} - dockerContext: 'app' gradleParameters: '["clean", "build", "dockerPrepare"]' secrets: docker-password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index b7c4570e..b5b7c503 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -9,7 +9,7 @@ jobs: tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 'zulu' '11' uses: actions/setup-java@v3 with: diff --git a/Dockerfile b/Dockerfile index 1664ab51..9190fa3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM adoptopenjdk/openjdk11:alpine WORKDIR /home -COPY ./build/docker . +COPY ./app/build/docker . ENTRYPOINT ["/home/service/bin/service"] From 9f3325fc6ebfae55f003d93e073328beb86fef2f Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Mon, 13 May 2024 20:05:48 +0400 Subject: [PATCH 06/15] corrected after CI --- build.gradle.kts | 2 +- suppressions.xml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 624fbb4a..da4f3f72 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,7 +16,7 @@ val commonVersion by extra("5.11.0-dev") dependencyCheck { skipConfigurations = listOf("kapt", "kaptClasspath_kaptKotlin", "kaptTest", "kaptTestFixtures") - suppressionFile = "supressions.xml" + suppressionFile = "suppressions.xml" } allprojects { diff --git a/suppressions.xml b/suppressions.xml index a7dc9b5c..cfc00b82 100644 --- a/suppressions.xml +++ b/suppressions.xml @@ -6,4 +6,10 @@ ^pkg:maven/com\.exactpro\.th2/task-utils@.*$ cpe:/a:utils_project:utils + + + + ^pkg:maven/com\.exactpro\.th2/grpc-.*@.*$ + cpe:/a:grpc:grpc + \ No newline at end of file From bab43ccbb1726e1a21d54ea0860775bf6529238a Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Mon, 13 May 2024 20:14:16 +0400 Subject: [PATCH 07/15] corrected after review --- build.gradle.kts | 13 ------------- settings.gradle.kts | 9 +++++++++ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index da4f3f72..7e69864c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,19 +35,6 @@ subprojects { jvmToolchain(11) } - repositories { - mavenCentral() - maven { - name = "Sonatype_snapshots" - url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") - } - - maven { - name = "Sonatype_releases" - url = uri("https://s01.oss.sonatype.org/content/repositories/releases/") - } - } - configurations.all { resolutionStrategy.cacheChangingModulesFor(0, "seconds") resolutionStrategy.cacheDynamicVersionsFor(0, "seconds") diff --git a/settings.gradle.kts b/settings.gradle.kts index 7423edce..7348c5bb 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,6 +2,15 @@ dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { mavenCentral() + maven { + name = "Sonatype_snapshots" + url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") + } + + maven { + name = "Sonatype_releases" + url = uri("https://s01.oss.sonatype.org/content/repositories/releases/") + } } } From aea03b5aff595c2120cf756b59c3a73747fdac70 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Tue, 14 May 2024 15:43:00 +0400 Subject: [PATCH 08/15] Refactored --- .github/workflows/build.yml | 2 ++ README.md | 3 +-- app/gradle.properties | 2 +- grpc/README.md | 8 +++++++- grpc/gradle.properties | 2 +- grpc/package_info.json | 2 +- utils/README.md | 9 ++++++++- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4f204456..889398be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,6 +13,8 @@ jobs: versions: name: Extract app version uses: th2-net/.github/.github/workflows/compound-prebuild-java-workflow.yml@main + with: + project-path: app changes: name: Collect changed files runs-on: ubuntu-20.04 diff --git a/README.md b/README.md index e5aaf322..65ab8d63 100644 --- a/README.md +++ b/README.md @@ -224,12 +224,11 @@ spec: # Release notes: -## 2.8.0 +## 2.9.0 + Migrated to th2 gradle plugin `0.0.6` + Updated bom: `4.6.1-dev` + Updated cradle api: `5.3.0-dev` + Updated common: `5.11.0-dev` -+ Updated grpc-common: `4.5.0-dev` + Updated micrometer-bom: `1.12.5` ## 2.7.0 diff --git a/app/gradle.properties b/app/gradle.properties index 21c0ff98..dbb96888 100644 --- a/app/gradle.properties +++ b/app/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official -release_version=2.8.0 +release_version=2.9.0 description='th2 Lightweight data provider component' vcs_url=https://github.com/th2-net/th2-lw-data-provider diff --git a/grpc/README.md b/grpc/README.md index c68c2b01..b9f80bdf 100644 --- a/grpc/README.md +++ b/grpc/README.md @@ -1,7 +1,13 @@ -# gRPC for lw-data-provider (2.3.0) +# gRPC for lw-data-provider (2.3.2) ## Release notes: +### 2.3.2 + +#### Updated: + ++ th2-grpc-common: `4.5.0.rc1` + ### 2.3.1 #### Updated: diff --git a/grpc/gradle.properties b/grpc/gradle.properties index 09132229..1cb88d23 100644 --- a/grpc/gradle.properties +++ b/grpc/gradle.properties @@ -1,2 +1,2 @@ kotlin.code.style=official -release_version=2.4.0 \ No newline at end of file +release_version=2.3.2 \ No newline at end of file diff --git a/grpc/package_info.json b/grpc/package_info.json index 11eb9924..2fcf1651 100644 --- a/grpc/package_info.json +++ b/grpc/package_info.json @@ -1,4 +1,4 @@ { "package_name": "th2_grpc_lw_data_provider", - "package_version": "2.4.0" + "package_version": "2.3.2" } diff --git a/utils/README.md b/utils/README.md index f0ca83f5..27b83170 100644 --- a/utils/README.md +++ b/utils/README.md @@ -1,7 +1,14 @@ -# utils for lw-data-provider (0.0.1) +# utils for lw-data-provider (0.0.2) # Release notes: +# 0.0.2 + +## Updates: ++ bom: `4.6.1` ++ common: `5.11.0-dev` ++ grpc-lw-data-provider: `2.3.2-dev` + # 0.0.1 ## Feature: From 5d3312f5da1d4e2e9498873d5be385af4f8d17cf Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 15 May 2024 10:03:19 +0400 Subject: [PATCH 09/15] Corrected after review --- .github/workflows/build.yml | 1 + .github/workflows/dev-build.yml | 1 + .github/workflows/dev-release-build.yml | 1 + README.md | 1 + app/build.gradle.kts | 3 +-- grpc/setup.py | 2 +- 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 889398be..981247b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,6 +95,7 @@ jobs: docker-username: ${{ github.actor }} version: ${{ needs.versions.outputs.version }} versionNumber: ${{ needs.versions.outputs.version }} + dockerContext: '.' gradleParameters: '["clean", "build", "dockerPrepare"]' secrets: docker-password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index 25ab17ce..84f2081e 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -69,6 +69,7 @@ jobs: docker-username: ${{ github.actor }} version: ${{ needs.app-version.outputs.version }} versionNumber: ${{ needs.app-version.outputs.versionNumber }} + dockerContext: '.' gradleParameters: ${{ format('["clean", "build", "dockerPrepare", "-Pversion_suffix={0}"]', needs.app-version.outputs.versionSuffix) }} secrets: docker-password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/dev-release-build.yml b/.github/workflows/dev-release-build.yml index b31bb111..5a93f0be 100644 --- a/.github/workflows/dev-release-build.yml +++ b/.github/workflows/dev-release-build.yml @@ -147,6 +147,7 @@ jobs: docker-username: ${{ github.actor }} version: ${{ needs.app-version.outputs.version }}-dev versionNumber: ${{ needs.app-version.outputs.version }} + dockerContext: '.' gradleParameters: '["clean", "build", "dockerPrepare"]' secrets: docker-password: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 65ab8d63..abcd5a09 100644 --- a/README.md +++ b/README.md @@ -230,6 +230,7 @@ spec: + Updated cradle api: `5.3.0-dev` + Updated common: `5.11.0-dev` + Updated micrometer-bom: `1.12.5` ++ Updated jetty-bom: `11.0.20` ## 2.7.0 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f968e2ad..ee5bd462 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { exclude(group = "com.exactpro.th2", module = "cradle-cassandra") } - implementation(platform("org.eclipse.jetty:jetty-bom:11.0.15")) { + implementation(platform("org.eclipse.jetty:jetty-bom:11.0.20")) { because("vulnerabilities in version 11.0.13. Can be removed after updating Javalin and Kotlin") } @@ -75,6 +75,5 @@ dependencies { } application { - applicationName = "service" mainClass.set("com.exactpro.th2.lwdataprovider.MainKt") } \ No newline at end of file diff --git a/grpc/setup.py b/grpc/setup.py index 96d69532..3fa44c1f 100644 --- a/grpc/setup.py +++ b/grpc/setup.py @@ -120,7 +120,7 @@ def make_packages(root_dir): license='Apache License 2.0', python_requires='>=3.7', install_requires=[ - 'th2-grpc-common==4.5.0.dev0', + 'th2-grpc-common==4.5.0.rc1', 'mypy-protobuf==3.4' ], packages=packages, From df0774a8928afa60e589294256bad9606b49a6b5 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 15 May 2024 10:44:34 +0400 Subject: [PATCH 10/15] Corrected after review (migrated to toml) --- app/build.gradle.kts | 38 ++++++++++------------ build.gradle.kts | 28 +++++++--------- gradle/libs.versions.toml | 41 ++++++++++++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 18 +---------- grpc/build.gradle.kts | 4 +-- utils/build.gradle.kts | 8 ++--- 6 files changed, 76 insertions(+), 61 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ee5bd462..12f46e5b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -2,50 +2,46 @@ plugins { `java-library` `maven-publish` - kotlin("kapt") - kotlin("plugin.serialization") - id("com.exactpro.th2.gradle.component") + alias(libs.plugins.kapt) + alias(libs.plugins.serialization) + alias(libs.plugins.th2.component) } -val cradleApiVersion: String by rootProject.extra -val javalin: String by rootProject.extra -val commonVersion: String by rootProject.extra - dependencies { - implementation("com.exactpro.th2:common:${commonVersion}") { + implementation(libs.th2.common) { exclude(group = "com.exactpro.th2", module = "cradle-core") exclude(group = "com.exactpro.th2", module = "cradle-cassandra") } - implementation(platform("org.eclipse.jetty:jetty-bom:11.0.20")) { + implementation(platform(libs.jetty.bom)) { because("vulnerabilities in version 11.0.13. Can be removed after updating Javalin and Kotlin") } - implementation("io.javalin:javalin:$javalin") - implementation("io.javalin:javalin-micrometer:$javalin") + implementation(libs.javalin) + implementation(libs.javalin.micrometer) - implementation(platform("io.micrometer:micrometer-bom:1.12.5")) { + implementation(platform(libs.micrometer.bom)) { because("should match the version in javalin-micrometer") } implementation("io.micrometer:micrometer-registry-prometheus") implementation("org.apache.commons:commons-lang3") - kapt("io.javalin.community.openapi:openapi-annotation-processor:$javalin") + kapt(libs.openapi.annotation.processor) - implementation("io.javalin.community.openapi:javalin-openapi-plugin:$javalin") { + implementation(libs.javalin.openapi.plugin) { because("for /openapi route with JSON scheme") } // swagger-ui-3.52.5.jar (pkg:maven/org.webjars/swagger-ui@3.52.5) : CVE-2018-25031 // implementation("io.javalin.community.openapi:javalin-swagger-plugin:$javalin") { // because("for Swagger UI") // } - implementation("io.javalin.community.openapi:javalin-redoc-plugin:$javalin") { + implementation(libs.javalin.redoc.plugin) { because("for Re Doc UI") } - implementation("com.exactpro.th2:cradle-cassandra:$cradleApiVersion") - implementation("net.jpountz.lz4:lz4:1.3.0") { + implementation(libs.cradle.cassandra) + implementation(libs.lz4) { because("cassandra driver requires lz4 impl in classpath for compression") } implementation(project(":grpc-lw-data-provider")) @@ -60,14 +56,14 @@ dependencies { implementation("com.fasterxml.jackson.module:jackson-module-kotlin") implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.5.1") + implementation(libs.kotlinx.serialization.json.jvm) implementation("io.netty:netty-buffer") - testImplementation("io.javalin:javalin-testtools:$javalin") + testImplementation(libs.javalin.testtools) - testImplementation(testFixtures("com.exactpro.th2:common:${commonVersion}")) - testImplementation(platform("org.testcontainers:testcontainers-bom:1.19.8")) + testImplementation(testFixtures(libs.th2.common)) + testImplementation(platform(libs.testcontainers.bom)) testImplementation("org.testcontainers:junit-jupiter") testImplementation("org.testcontainers:cassandra") diff --git a/build.gradle.kts b/build.gradle.kts index 7e69864c..4987a644 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,19 +1,15 @@ plugins { - id("com.exactpro.th2.gradle.base") version "0.0.6" - id("com.exactpro.th2.gradle.publish") version "0.0.6" + alias(libs.plugins.th2.base) + alias(libs.plugins.th2.publish) - kotlin("jvm") version "1.8.22" - kotlin("kapt") version "1.8.22" apply false - id("org.jetbrains.kotlin.plugin.serialization") version "1.8.22" apply false + alias(libs.plugins.kotlin) + alias(libs.plugins.kapt) apply false + alias(libs.plugins.serialization) apply false - id("com.exactpro.th2.gradle.grpc") version "0.0.6" apply false - id("com.exactpro.th2.gradle.component") version "0.0.6" apply false + alias(libs.plugins.th2.grpc) apply false + alias(libs.plugins.th2.component) apply false } -val cradleApiVersion by extra("5.3.0-dev") -val javalin by extra("5.4.2") -val commonVersion by extra("5.11.0-dev") - dependencyCheck { skipConfigurations = listOf("kapt", "kaptClasspath_kaptKotlin", "kaptTest", "kaptTestFixtures") suppressionFile = "suppressions.xml" @@ -42,7 +38,7 @@ subprojects { dependencies { implementation("org.slf4j:slf4j-api") - implementation("io.github.microutils:kotlin-logging:3.0.5") + implementation(rootProject.libs.kotlin.logging) testImplementation("org.apache.logging.log4j:log4j-slf4j2-impl") { because("logging in testing") @@ -50,10 +46,10 @@ subprojects { testImplementation("org.apache.logging.log4j:log4j-core") { because("logging in testing") } - testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") - testImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1") - testImplementation("io.strikt:strikt-core:0.34.1") - testImplementation("io.strikt:strikt-jackson:0.34.1") + implementation(rootProject.libs.junit.jupiter) + implementation(rootProject.libs.mockito.kotlin) + implementation(rootProject.libs.strikt.core) + implementation(rootProject.libs.strikt.jackson) } tasks.test { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..5c7f1693 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,41 @@ +[versions] +kotlin = "1.8.22" +th2-plugin = "0.0.6" +strikt = "0.34.1" +javalin = "5.4.2" + +[libraries] +th2-common = { group = "com.exactpro.th2", name = "common", version = "5.11.0-dev" } +th2-grpc-common = { group = "com.exactpro.th2", name = "grpc-common", version = "4.5.0-dev" } +cradle-cassandra = { group = "com.exactpro.th2", name = "cradle-cassandra", version = "5.3.0-dev" } +lz4 = { group = "net.jpountz.lz4", name = "lz4", version = "1.3.0" } + +kotlin-logging = { group = "io.github.microutils", name = "kotlin-logging", version = "3.0.5" } +kotlinx-serialization-json-jvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json-jvm", version = "1.5.1" } + +testcontainers-bom = { group = "org.testcontainers", name = "testcontainers-bom", version = "1.19.8" } +junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version = "5.10.2" } +mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version = "5.3.1" } +strikt-core = { group = "io.strikt", name = "strikt-core", version.ref = "strikt" } +strikt-jackson = { group = "io.strikt", name = "strikt-jackson", version.ref = "strikt" } + +openapi-annotation-processor = { group = "io.javalin.community.openapi", name = "openapi-annotation-processor", version.ref = "javalin" } +javalin-openapi-plugin = { group = "io.javalin.community.openapi", name = "javalin-openapi-plugin", version.ref = "javalin" } +javalin-redoc-plugin = { group = "io.javalin.community.openapi", name = "javalin-redoc-plugin", version.ref = "javalin" } +javalin-testtools = { group = "io.javalin", name = "javalin-testtools", version.ref = "javalin" } +javalin = { group = "io.javalin", name = "javalin", version.ref = "javalin" } +javalin-micrometer = { group = "io.javalin", name = "javalin-micrometer", version.ref = "javalin" } + +# vulnerabilities in version 11.0.13. Can be removed after updating Javalin and Kotlin +jetty-bom = { group = "org.eclipse.jetty", name = "jetty-bom", version = "11.0.20" } +micrometer-bom = { group = "io.micrometer", name = "micrometer-bom", version = "1.12.5" } + +[plugins] +kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } +serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } + +th2-base = { id = "com.exactpro.th2.gradle.base", version.ref = "th2-plugin" } +th2-publish = { id = "com.exactpro.th2.gradle.publish", version.ref = "th2-plugin" } +th2-grpc = { id = "com.exactpro.th2.gradle.grpc", version.ref = "th2-plugin" } +th2-component = { id = "com.exactpro.th2.gradle.component", version.ref = "th2-plugin" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2ab4a974..7293cece 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,21 +1,5 @@ -################################################################################ -# Copyright 2009-2023 Exactpro (Exactpro Systems Limited) -# -# 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. -################################################################################ - #Tue Apr 14 11:21:33 MSK 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists diff --git a/grpc/build.gradle.kts b/grpc/build.gradle.kts index dc777714..6b22ea6e 100644 --- a/grpc/build.gradle.kts +++ b/grpc/build.gradle.kts @@ -2,11 +2,11 @@ plugins { `java-library` `maven-publish` - id("com.exactpro.th2.gradle.grpc") + alias(libs.plugins.th2.grpc) } dependencies { - api("com.exactpro.th2:grpc-common:4.5.0-dev") + api(libs.th2.grpc.common) } th2Grpc { diff --git a/utils/build.gradle.kts b/utils/build.gradle.kts index bdba12f6..06728777 100644 --- a/utils/build.gradle.kts +++ b/utils/build.gradle.kts @@ -3,17 +3,15 @@ plugins { `maven-publish` } -val commonVersion: String by rootProject.extra - dependencies { api(project(":grpc-lw-data-provider")) - implementation("com.exactpro.th2:common:${commonVersion}") { + implementation(libs.th2.common) { exclude(group = "com.exactpro.th2", module = "cradle-core") exclude(group = "com.exactpro.th2", module = "cradle-cassandra") } - implementation("io.github.microutils:kotlin-logging:3.0.5") + implementation(libs.kotlin.logging) - testImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1") + testImplementation(libs.mockito.kotlin) testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") } \ No newline at end of file From 131eca6f74a8ba22f4b632884b18d3797c28a419 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 15 May 2024 11:24:50 +0400 Subject: [PATCH 11/15] updated javalin to "5.6.5", javalin openapi to "5.6.4" --- gradle/libs.versions.toml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5c7f1693..fb169f7f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,8 @@ kotlin = "1.8.22" th2-plugin = "0.0.6" strikt = "0.34.1" -javalin = "5.4.2" +javalin = "5.6.5" +openapi = "5.6.4" [libraries] th2-common = { group = "com.exactpro.th2", name = "common", version = "5.11.0-dev" } @@ -19,14 +20,14 @@ mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", versio strikt-core = { group = "io.strikt", name = "strikt-core", version.ref = "strikt" } strikt-jackson = { group = "io.strikt", name = "strikt-jackson", version.ref = "strikt" } -openapi-annotation-processor = { group = "io.javalin.community.openapi", name = "openapi-annotation-processor", version.ref = "javalin" } -javalin-openapi-plugin = { group = "io.javalin.community.openapi", name = "javalin-openapi-plugin", version.ref = "javalin" } -javalin-redoc-plugin = { group = "io.javalin.community.openapi", name = "javalin-redoc-plugin", version.ref = "javalin" } +openapi-annotation-processor = { group = "io.javalin.community.openapi", name = "openapi-annotation-processor", version.ref = "openapi" } +javalin-openapi-plugin = { group = "io.javalin.community.openapi", name = "javalin-openapi-plugin", version.ref = "openapi" } +javalin-redoc-plugin = { group = "io.javalin.community.openapi", name = "javalin-redoc-plugin", version.ref = "openapi" } javalin-testtools = { group = "io.javalin", name = "javalin-testtools", version.ref = "javalin" } javalin = { group = "io.javalin", name = "javalin", version.ref = "javalin" } javalin-micrometer = { group = "io.javalin", name = "javalin-micrometer", version.ref = "javalin" } -# vulnerabilities in version 11.0.13. Can be removed after updating Javalin and Kotlin +# vulnerabilities in version 11.0.20. Can be removed after updating Javalin and Kotlin jetty-bom = { group = "org.eclipse.jetty", name = "jetty-bom", version = "11.0.20" } micrometer-bom = { group = "io.micrometer", name = "micrometer-bom", version = "1.12.5" } From 6e00546759466471c2bf0c89a024f331b38c7799 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 15 May 2024 12:18:38 +0400 Subject: [PATCH 12/15] corrected after review --- app/build.gradle.kts | 4 +--- gradle/libs.versions.toml | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 12f46e5b..73a4c8ef 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,9 +13,7 @@ dependencies { exclude(group = "com.exactpro.th2", module = "cradle-cassandra") } - implementation(platform(libs.jetty.bom)) { - because("vulnerabilities in version 11.0.13. Can be removed after updating Javalin and Kotlin") - } + implementation(platform(libs.jetty.bom)) implementation(libs.javalin) implementation(libs.javalin.micrometer) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fb169f7f..b67a0cc2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,7 +27,6 @@ javalin-testtools = { group = "io.javalin", name = "javalin-testtools", version. javalin = { group = "io.javalin", name = "javalin", version.ref = "javalin" } javalin-micrometer = { group = "io.javalin", name = "javalin-micrometer", version.ref = "javalin" } -# vulnerabilities in version 11.0.20. Can be removed after updating Javalin and Kotlin jetty-bom = { group = "org.eclipse.jetty", name = "jetty-bom", version = "11.0.20" } micrometer-bom = { group = "io.micrometer", name = "micrometer-bom", version = "1.12.5" } From a95cce00b29f6cce78e40f369bf2f08af7b4b002 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 15 May 2024 12:30:39 +0400 Subject: [PATCH 13/15] corrected after review --- README.md | 14 +++++++++----- app/build.gradle.kts | 7 +++---- .../exactpro/th2/lwdataprovider/http/HttpServer.kt | 14 +++++++------- gradle/libs.versions.toml | 1 + 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index abcd5a09..a4241513 100644 --- a/README.md +++ b/README.md @@ -226,11 +226,15 @@ spec: ## 2.9.0 + Migrated to th2 gradle plugin `0.0.6` -+ Updated bom: `4.6.1-dev` -+ Updated cradle api: `5.3.0-dev` -+ Updated common: `5.11.0-dev` -+ Updated micrometer-bom: `1.12.5` -+ Updated jetty-bom: `11.0.20` ++ Added swagger library ++ Updated: + + bom: `4.6.1-dev` + + cradle api: `5.3.0-dev` + + common: `5.11.0-dev` + + micrometer-bom: `1.12.5` + + jetty-bom: `11.0.20` + + javalin: `5.6.5` + + javalin-openapi: `5.6.4` ## 2.7.0 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 73a4c8ef..a384316d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -30,10 +30,9 @@ dependencies { implementation(libs.javalin.openapi.plugin) { because("for /openapi route with JSON scheme") } -// swagger-ui-3.52.5.jar (pkg:maven/org.webjars/swagger-ui@3.52.5) : CVE-2018-25031 -// implementation("io.javalin.community.openapi:javalin-swagger-plugin:$javalin") { -// because("for Swagger UI") -// } + implementation(libs.javalin.swagger.plugin) { + because("for Swagger UI") + } implementation(libs.javalin.redoc.plugin) { because("for Re Doc UI") } diff --git a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/HttpServer.kt b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/HttpServer.kt index 91e19b6a..6136194a 100644 --- a/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/HttpServer.kt +++ b/app/src/main/kotlin/com/exactpro/th2/lwdataprovider/http/HttpServer.kt @@ -42,8 +42,8 @@ import io.javalin.openapi.plugin.OpenApiPlugin import io.javalin.openapi.plugin.OpenApiPluginConfiguration import io.javalin.openapi.plugin.redoc.ReDocConfiguration import io.javalin.openapi.plugin.redoc.ReDocPlugin -//import io.javalin.openapi.plugin.swagger.SwaggerConfiguration -//import io.javalin.openapi.plugin.swagger.SwaggerPlugin +import io.javalin.openapi.plugin.swagger.SwaggerConfiguration +import io.javalin.openapi.plugin.swagger.SwaggerPlugin import io.javalin.validation.JavalinValidation import io.micrometer.core.instrument.Clock import io.micrometer.core.instrument.Tag @@ -171,7 +171,7 @@ class HttpServer(private val context: Context) { setupOpenApi(it, externalContextPath) -// setupSwagger(it) + setupSwagger(it) setupReDoc(it, externalContextPath) }.apply { @@ -202,10 +202,10 @@ class HttpServer(private val context: Context) { it.plugins.register(ReDocPlugin(reDocConfiguration)) } -// private fun setupSwagger(it: JavalinConfig) { -// val swaggerConfiguration = SwaggerConfiguration() -// it.plugins.register(SwaggerPlugin(swaggerConfiguration)) -// } + private fun setupSwagger(it: JavalinConfig) { + val swaggerConfiguration = SwaggerConfiguration() + it.plugins.register(SwaggerPlugin(swaggerConfiguration)) + } private fun setupOpenApi(it: JavalinConfig, externalContextPath: String?) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b67a0cc2..dd944d0c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,6 +23,7 @@ strikt-jackson = { group = "io.strikt", name = "strikt-jackson", version.ref = " openapi-annotation-processor = { group = "io.javalin.community.openapi", name = "openapi-annotation-processor", version.ref = "openapi" } javalin-openapi-plugin = { group = "io.javalin.community.openapi", name = "javalin-openapi-plugin", version.ref = "openapi" } javalin-redoc-plugin = { group = "io.javalin.community.openapi", name = "javalin-redoc-plugin", version.ref = "openapi" } +javalin-swagger-plugin = { group = "io.javalin.community.openapi", name = "javalin-swagger-plugin", version.ref = "openapi" } javalin-testtools = { group = "io.javalin", name = "javalin-testtools", version.ref = "javalin" } javalin = { group = "io.javalin", name = "javalin", version.ref = "javalin" } javalin-micrometer = { group = "io.javalin", name = "javalin-micrometer", version.ref = "javalin" } From d8dfe0162345e1ad041cff81adeafacd2ab737d9 Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 15 May 2024 12:45:46 +0400 Subject: [PATCH 14/15] corrected after review --- .github/workflows/build.yml | 1 + .github/workflows/dev-build.yml | 1 + .github/workflows/dev-release-build.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 981247b6..f342527b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,6 +80,7 @@ jobs: uses: th2-net/.github/.github/workflows/owasp-gradle-scan.yml@main with: multiproject: true + secrets: nvd-api-key: ${{ secrets.NVD_APIKEY }} publish-docker: name: Build and publish docker image diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index 84f2081e..d020997c 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -59,6 +59,7 @@ jobs: uses: th2-net/.github/.github/workflows/owasp-gradle-scan.yml@main with: multiproject: true + secrets: nvd-api-key: ${{ secrets.NVD_APIKEY }} publish-docker: name: Build docker image diff --git a/.github/workflows/dev-release-build.yml b/.github/workflows/dev-release-build.yml index 5a93f0be..6b6e9cc2 100644 --- a/.github/workflows/dev-release-build.yml +++ b/.github/workflows/dev-release-build.yml @@ -131,6 +131,7 @@ jobs: uses: th2-net/.github/.github/workflows/owasp-gradle-scan.yml@main with: multiproject: true + secrets: nvd-api-key: ${{ secrets.NVD_APIKEY }} publish-docker: From 5b8110e260c965a0aa5354feb14f7f2b2aefa3ac Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 15 May 2024 12:52:49 +0400 Subject: [PATCH 15/15] removed jetty-bom --- app/build.gradle.kts | 2 -- gradle/libs.versions.toml | 1 - 2 files changed, 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a384316d..aab5d500 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,8 +13,6 @@ dependencies { exclude(group = "com.exactpro.th2", module = "cradle-cassandra") } - implementation(platform(libs.jetty.bom)) - implementation(libs.javalin) implementation(libs.javalin.micrometer) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dd944d0c..2b423031 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -28,7 +28,6 @@ javalin-testtools = { group = "io.javalin", name = "javalin-testtools", version. javalin = { group = "io.javalin", name = "javalin", version.ref = "javalin" } javalin-micrometer = { group = "io.javalin", name = "javalin-micrometer", version.ref = "javalin" } -jetty-bom = { group = "org.eclipse.jetty", name = "jetty-bom", version = "11.0.20" } micrometer-bom = { group = "io.micrometer", name = "micrometer-bom", version = "1.12.5" } [plugins]