From d42bb84cc40c5082fa4edc60432a5266a3c39f4e Mon Sep 17 00:00:00 2001 From: Daniel Frick - taafrda7 Date: Mon, 17 Jun 2024 09:20:17 +0200 Subject: [PATCH 1/7] initial commit --- .gitignore | 15 + README.md | 59 +- build.gradle.kts | 178 ++++ buildSrc/README.md | 1 + config/detekt.yml | 781 ++++++++++++++++++ detekt_baseline.xml | 8 + docker-compose/docker-compose.yaml | 12 + docker-compose/wiremock/Dockerfile | 3 + .../wiremock/mappings/deleteDefault.json | 17 + .../wiremock/mappings/get_files_1.json | 167 ++++ .../wiremock/mappings/get_files_1234.json | 30 + .../wiremock/mappings/get_files_2345.json | 51 ++ .../wiremock/mappings/get_files_5.json | 217 +++++ .../wiremock/mappings/get_files_666.json | 30 + .../wiremock/mappings/pullDefault.json | 57 ++ .../wiremock/mappings/pushDefault.json | 22 + .../wiremock/mappings/push_files_1.json | 48 ++ .../wiremock/mappings/push_files_5.json | 22 + .../wiremock/mappings/push_files_666.json | 22 + gradle.properties | 26 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 61574 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 244 ++++++ gradlew.bat | 92 +++ settings.gradle.kts | 17 + .../cdr/clientvm/CdrClientVmApplication.kt | 20 + .../cdr/clientvm/config/CdrClientConfig.kt | 84 ++ .../cdr/clientvm/config/CdrClientContext.kt | 50 ++ .../cdr/clientvm/handler/FileHandlingBase.kt | 87 ++ .../cdr/clientvm/handler/PullFileHandling.kt | 234 ++++++ .../cdr/clientvm/handler/PushFileHandling.kt | 163 ++++ .../des/cdr/clientvm/scheduling/Scheduler.kt | 88 ++ src/main/resources/banner.txt | 10 + .../resources/config/application-client.yaml | 26 + .../resources/config/application-dev.yaml | 40 + src/main/resources/config/application.yaml | 44 + src/main/resources/logback-spring.xml | 81 ++ .../clientvm/CdrClientVmApplicationTest.kt | 21 + ...ulerAndFileHandlerMultipleConnectorTest.kt | 277 +++++++ .../clientvm/config/CdrClientConfigTest.kt | 243 ++++++ .../clientvm/handler/FileHandlingBaseTest.kt | 27 + .../clientvm/handler/PullFileHandlingTest.kt | 316 +++++++ .../clientvm/handler/PushFileHandlingTest.kt | 203 +++++ .../cdr/clientvm/scheduling/SchedulerTest.kt | 146 ++++ src/test/resources/application-test.yaml | 21 + src/test/resources/messages/dummy.txt | 1 + 46 files changed, 4306 insertions(+), 1 deletion(-) create mode 100644 build.gradle.kts create mode 100644 buildSrc/README.md create mode 100644 config/detekt.yml create mode 100644 detekt_baseline.xml create mode 100644 docker-compose/docker-compose.yaml create mode 100644 docker-compose/wiremock/Dockerfile create mode 100644 docker-compose/wiremock/mappings/deleteDefault.json create mode 100644 docker-compose/wiremock/mappings/get_files_1.json create mode 100644 docker-compose/wiremock/mappings/get_files_1234.json create mode 100644 docker-compose/wiremock/mappings/get_files_2345.json create mode 100644 docker-compose/wiremock/mappings/get_files_5.json create mode 100644 docker-compose/wiremock/mappings/get_files_666.json create mode 100644 docker-compose/wiremock/mappings/pullDefault.json create mode 100644 docker-compose/wiremock/mappings/pushDefault.json create mode 100644 docker-compose/wiremock/mappings/push_files_1.json create mode 100644 docker-compose/wiremock/mappings/push_files_5.json create mode 100644 docker-compose/wiremock/mappings/push_files_666.json create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts create mode 100644 src/main/kotlin/com/swisscom/health/des/cdr/clientvm/CdrClientVmApplication.kt create mode 100644 src/main/kotlin/com/swisscom/health/des/cdr/clientvm/config/CdrClientConfig.kt create mode 100644 src/main/kotlin/com/swisscom/health/des/cdr/clientvm/config/CdrClientContext.kt create mode 100644 src/main/kotlin/com/swisscom/health/des/cdr/clientvm/handler/FileHandlingBase.kt create mode 100644 src/main/kotlin/com/swisscom/health/des/cdr/clientvm/handler/PullFileHandling.kt create mode 100644 src/main/kotlin/com/swisscom/health/des/cdr/clientvm/handler/PushFileHandling.kt create mode 100644 src/main/kotlin/com/swisscom/health/des/cdr/clientvm/scheduling/Scheduler.kt create mode 100644 src/main/resources/banner.txt create mode 100644 src/main/resources/config/application-client.yaml create mode 100644 src/main/resources/config/application-dev.yaml create mode 100644 src/main/resources/config/application.yaml create mode 100644 src/main/resources/logback-spring.xml create mode 100644 src/test/kotlin/com/swisscom/health/des/cdr/clientvm/CdrClientVmApplicationTest.kt create mode 100644 src/test/kotlin/com/swisscom/health/des/cdr/clientvm/PullSchedulerAndFileHandlerMultipleConnectorTest.kt create mode 100644 src/test/kotlin/com/swisscom/health/des/cdr/clientvm/config/CdrClientConfigTest.kt create mode 100644 src/test/kotlin/com/swisscom/health/des/cdr/clientvm/handler/FileHandlingBaseTest.kt create mode 100644 src/test/kotlin/com/swisscom/health/des/cdr/clientvm/handler/PullFileHandlingTest.kt create mode 100644 src/test/kotlin/com/swisscom/health/des/cdr/clientvm/handler/PushFileHandlingTest.kt create mode 100644 src/test/kotlin/com/swisscom/health/des/cdr/clientvm/scheduling/SchedulerTest.kt create mode 100644 src/test/resources/application-test.yaml create mode 100644 src/test/resources/messages/dummy.txt diff --git a/.gitignore b/.gitignore index 524f096..4e76afb 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,18 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* replay_pid* + +# IntelliJ IDEA +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +# other +*.gradle +Java.gitignore +build/ +bin/ diff --git a/README.md b/README.md index 3f8a40c..0f4643a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,59 @@ -# cdr-client +# CDR Client The Swisscom Health Confidential Data Routing (CDR) Client + +## API +There is no endpoint (beside actuator/health) that are offered here. + +The CDR Client is triggered by a scheduler and synchronizes by the given delay time the files from the CDR API. + +### Functionality +For each defined connector the CDR Client calls the defined endpoints of the CDR API. + +For each connector one file after the other is pulled. Each file is written into a temporary folder defined as 'local-folder'. +The file is named after the received 'cdr-document-uuid' header that is a unique identifier created by the CDR API. +After saving the file to the temporary folder, a delete request for the given 'cdr-document-uuid' is sent to the CDR API. +After successfully deleting the file in the CDR API, the file is moved to the connector defined 'target-folder'. + +The temporary folders need to be monitored by another tool to make sure that no files are forgotten (should only happen if the move +to the destination folder is failing). + +For each connector one file after the other is pushed from the defined 'source-folder'. After the file is successfully uploaded it will be deleted. +If the upload failed with a response code of 4xx the file will be appended with '.error' and an additional file with the same name as the sent file, but with +the extension '.log' will be created and the received response body will be saved to this file. +If the upload failed with a response code of 5xx the file will be retried a defined amount of times, +see retry-delay in the [application-client.yaml](./src/main/resources/config/application-client.yaml) file. After reaching the max retry count the file will +be appended with '.error' and an additional file with the same name as the sent file, but with the extension '.log' will be created and the received response +body will be saved to this file. + +## Local development +To test some usecases there is a [docker-compose.yaml](./docker-compose/docker-compose.yaml) with wiremock that simulates the CDR API. Run with ```docker-compose down && docker-compose up --build```. + +If you want to work with a deployed CDR API you need to change the [application-dev.yaml](./src/main/resources/config/application-dev.yaml) + +Set the following spring profile to active: dev + +Following environment variables need to be set: +* cdrClient.localFolder=~/Documents/cdr/inflight +* cdrClient.targetFolder=~/Documents/cdr/target +* cdrClient.sourceFolder=~/Documents/cdr/source + +## Application Plugin +To create scripts to run the application locally one needs to run following gradle cmd: ```gradlew installDist``` + +This creates a folder ```build/install/cdr-client``` with scripts for windows and unix servers in the ```bin``` folder. + +To run the application locally one can call ```./build/install/cdr-client/bin/cdr-client```. It is required to have a ```application-customer.yaml``` and link it by adding following command line: ```JVM_OPTS="-Dspring.config.additional-location=./application-customer.yaml"```. +With a minimum configuration that looks like this: +``` +client: + local-folder: /tmp/cdr + endpoint: + host: cdr.health.swisscom.com + base-path: api/documents + customer: + - connector-id: 8000000000000 + content-type: application/forumdatenaustausch+xml;charset=UTF-8;version=4.5 + target-folder: /tmp/download/8000000000000 + source-folder: /tmp/source/8000000000000 + mode: test +``` diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..7183e09 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,178 @@ +import io.gitlab.arturbosch.detekt.Detekt +import org.springframework.boot.gradle.tasks.bundling.BootJar + +group = "com.swisscom.health.des.cdr" +version = "2.1.2-SNAPSHOT" +java.sourceCompatibility = JavaVersion.VERSION_17 + +val jvmVersion: String by project +val springCloudVersion: String by project +val jacocoVersion: String by project +val kotlinLoggingVersion: String by project +val mockkVersion: String by project +val logstashEncoderVersion: String by project +val micrometerTracingVersion: String by project +val detektKotlinVersion: String by project + +val outputDir: Provider = layout.buildDirectory.dir(".") + +plugins { + id("org.springframework.boot") + id("io.spring.dependency-management") + id("io.gitlab.arturbosch.detekt") + jacoco + application + kotlin("jvm") + kotlin("plugin.spring") + // https://docs.spring.io/spring-boot/docs/current/reference/html/features.html#features.kotlin.configuration-properties + // KAPT is end of life, but KSP is not supported yet: https://github.com/spring-projects/spring-boot/issues/28046 + kotlin("kapt") + `maven-publish` +} + +application { + mainClass = "com.swisscom.health.des.cdr.clientvm.CdrClientVmApplicationKt" + applicationDefaultJvmArgs = listOf("-Dspring.profiles.active=client,customer") +} +dependencyManagement { + imports { + mavenBom("org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}") + } +} + +dependencies { + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.boot:spring-boot-starter-web-services") + implementation("org.springframework.boot:spring-boot-starter-actuator") + implementation("org.springframework.cloud:spring-cloud-commons") + implementation("com.squareup.okhttp3:okhttp") + implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core") + implementation("io.github.oshai:kotlin-logging:${kotlinLoggingVersion}") + implementation("net.logstash.logback:logstash-logback-encoder:${logstashEncoderVersion}") + implementation("io.micrometer:micrometer-tracing:${micrometerTracingVersion}") + implementation("io.micrometer:micrometer-tracing-bridge-otel:${micrometerTracingVersion}") + + kapt("org.springframework.boot:spring-boot-configuration-processor") + + testImplementation("org.jacoco:org.jacoco.core:${jacocoVersion}") + testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.springframework.boot:spring-boot-starter-webflux") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test") + testImplementation("com.squareup.okhttp3:mockwebserver") { + // Unfortunately we cannot exclude JUnit 4 as MockWebServer implements interfaces from that version +// exclude(group = "junit", config = "junit") + } + testImplementation("io.mockk:mockk:${mockkVersion}") { + exclude(group = "junit", module = "junit") + } + testImplementation("org.junit.jupiter:junit-jupiter") + testImplementation("io.micrometer:micrometer-tracing-test") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") +} + +springBoot { + buildInfo() +} + +repositories { + mavenCentral() +} + +kotlin { + jvmToolchain { + languageVersion.set(JavaLanguageVersion.of(jvmVersion.toInt())) + } + compilerOptions { + freeCompilerArgs = listOf("-Xjsr305=strict") + } +} + +val jacocoTestCoverageVerification = tasks.named("jacocoTestCoverageVerification") { + violationRules { + /** + * Ensure tests cover at least 75% of the LoC. + */ + rule { + limit { + minimum = "0.75".toBigDecimal() + } + } + } +} + +val jacocoTestReport = tasks.named("jacocoTestReport") { + finalizedBy(jacocoTestCoverageVerification) // Verify after generating the report. + group = "Reporting" + + reports { + xml.required.set(true) + xml.outputLocation.set(File("${outputDir.get().asFile.absolutePath}/reports/jacoco.xml")) + csv.required.set(false) + html.required.set(true) + html.outputLocation.set(File("${outputDir.get().asFile.absolutePath}/reports/coverage")) + } +} + +tasks.withType { + useJUnitPlatform { + includeEngines("junit-jupiter") + } + finalizedBy(jacocoTestReport) +} + +jacoco { + toolVersion = jacocoVersion +} + +tasks.named("bootJar") { + manifest { + // Required so application name and version get rendered in the banner.txt; see + // https://stackoverflow.com/questions/34519759/application-version-does-not-show-up-in-spring-boot-banner-txt + attributes("Implementation-Title" to rootProject.name) + attributes("Implementation-Version" to archiveVersion) + } +} + +// https://docs.spring.io/spring-boot/docs/current/reference/html/howto.html#howto.properties-and-configuration.expand-properties.gradle +// and https://stackoverflow.com/questions/40096007/how-to-configure-the-processresources-task-in-a-gradle-kotlin-build +tasks.processResources { + filesMatching("**/application.yaml") { + expand(project.properties) + } +} + +tasks.withType { + baseline.set(File("${projectDir}/detekt_baseline.xml")) + reports { + xml { + required.set(true) + outputLocation.set(File("${outputDir.get().asFile.absolutePath}/reports/detekt.xml")) + } + html.required.set(false) + sarif.required.set(false) + txt.required.set(false) + } +} + +/** + * Detekt + * See https://docs.sonarqube.org/latest/analysis/scan/sonarscanner-for-gradle/ + */ +detekt { + buildUponDefaultConfig = false // preconfigure defaults + allRules = true + parallel = true + config.setFrom(files("$rootDir/config/detekt.yml")) // Global Detekt rule set. + baseline = file("$projectDir/detekt_baseline.xml") // Module specific suppression list. +} + +// https://github.com/detekt/detekt/issues/6198 +project.afterEvaluate { + configurations["detekt"].resolutionStrategy.eachDependency { + if (requested.group == "org.jetbrains.kotlin") { + useVersion(detektKotlinVersion) + } + } +} diff --git a/buildSrc/README.md b/buildSrc/README.md new file mode 100644 index 0000000..0584ba5 --- /dev/null +++ b/buildSrc/README.md @@ -0,0 +1 @@ +Currently not in use diff --git a/config/detekt.yml b/config/detekt.yml new file mode 100644 index 0000000..fb6b5af --- /dev/null +++ b/config/detekt.yml @@ -0,0 +1,781 @@ +build: + maxIssues: 0 + excludeCorrectable: false + weights: + # complexity: 2 + # LongParameterList: 1 + # style: 1 + # comments: 1 + +config: + validation: true + warningsAsErrors: false + checkExhaustiveness: false + # when writing own rules with new properties, exclude the property path e.g.: 'my_rule_set,.*>.*>[my_property]' + excludes: '' + +processors: + active: true + exclude: + - 'DetektProgressListener' + # - 'KtFileCountProcessor' + # - 'PackageCountProcessor' + # - 'ClassCountProcessor' + # - 'FunctionCountProcessor' + # - 'PropertyCountProcessor' + # - 'ProjectComplexityProcessor' + # - 'ProjectCognitiveComplexityProcessor' + # - 'ProjectLLOCProcessor' + # - 'ProjectCLOCProcessor' + # - 'ProjectLOCProcessor' + # - 'ProjectSLOCProcessor' + # - 'LicenseHeaderLoaderExtension' + +console-reports: + active: true + exclude: + - 'ProjectStatisticsReport' + - 'ComplexityReport' + - 'NotificationReport' + - 'FindingsReport' + - 'FileBasedFindingsReport' + # - 'LiteFindingsReport' + +output-reports: + active: true + exclude: [] + # - 'TxtOutputReport' + # - 'XmlOutputReport' + # - 'HtmlOutputReport' + # - 'MdOutputReport' + # - 'SarifOutputReport' + +comments: + active: true + AbsentOrWrongFileLicense: + active: false + licenseTemplateFile: 'license.template' + licenseTemplateIsRegex: false + CommentOverPrivateFunction: + active: false + CommentOverPrivateProperty: + active: false + DeprecatedBlockTag: + active: false + EndOfSentenceFormat: + active: false + endOfSentenceFormat: '([.?!][ \t\n\r\f<])|([.?!:]$)' + KDocReferencesNonPublicProperty: + active: false + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + OutdatedDocumentation: + active: false + matchTypeParameters: true + matchDeclarationsOrder: true + allowParamOnConstructorProperties: false + UndocumentedPublicClass: + active: false + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + searchInNestedClass: true + searchInInnerClass: true + searchInInnerObject: true + searchInInnerInterface: true + searchInProtectedClass: false + UndocumentedPublicFunction: + active: false + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + searchProtectedFunction: false + UndocumentedPublicProperty: + active: false + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + searchProtectedProperty: false + +complexity: + active: true + CognitiveComplexMethod: + active: false + threshold: 15 + ComplexCondition: + active: true + threshold: 4 + ComplexInterface: + active: false + threshold: 10 + includeStaticDeclarations: false + includePrivateDeclarations: false + ignoreOverloaded: false + CyclomaticComplexMethod: + active: true + threshold: 15 + ignoreSingleWhenExpression: false + ignoreSimpleWhenEntries: false + ignoreNestingFunctions: false + nestingFunctions: + - 'also' + - 'apply' + - 'forEach' + - 'isNotNull' + - 'ifNull' + - 'let' + - 'run' + - 'use' + - 'with' + LabeledExpression: + active: false + ignoredLabels: [] + LargeClass: + active: true + threshold: 600 + LongMethod: + active: true + threshold: 60 + LongParameterList: + active: true + functionThreshold: 6 + constructorThreshold: 7 + ignoreDefaultParameters: false + ignoreDataClasses: true + ignoreAnnotatedParameter: [] + MethodOverloading: + active: false + threshold: 6 + NamedArguments: + active: false + threshold: 3 + ignoreArgumentsMatchingNames: false + NestedBlockDepth: + active: true + threshold: 4 + NestedScopeFunctions: + active: false + threshold: 1 + functions: + - 'kotlin.apply' + - 'kotlin.run' + - 'kotlin.with' + - 'kotlin.let' + - 'kotlin.also' + ReplaceSafeCallChainWithRun: + active: false + StringLiteralDuplication: + active: false + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + threshold: 3 + ignoreAnnotation: true + excludeStringsWithLessThan5Characters: true + ignoreStringsRegex: '$^' + TooManyFunctions: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + thresholdInFiles: 11 + thresholdInClasses: 11 + thresholdInInterfaces: 11 + thresholdInObjects: 11 + thresholdInEnums: 11 + ignoreDeprecated: false + ignorePrivate: false + ignoreOverridden: false + ignoreAnnotatedFunctions: [] + +coroutines: + active: true + GlobalCoroutineUsage: + active: false + InjectDispatcher: + active: true + dispatcherNames: + - 'IO' + - 'Default' + - 'Unconfined' + RedundantSuspendModifier: + active: true + SleepInsteadOfDelay: + active: true + SuspendFunSwallowedCancellation: + active: false + SuspendFunWithCoroutineScopeReceiver: + active: false + SuspendFunWithFlowReturnType: + active: true + +empty-blocks: + active: true + EmptyCatchBlock: + active: true + allowedExceptionNameRegex: '_|(ignore|expected).*' + EmptyClassBlock: + active: true + EmptyDefaultConstructor: + active: true + EmptyDoWhileBlock: + active: true + EmptyElseBlock: + active: true + EmptyFinallyBlock: + active: true + EmptyForBlock: + active: true + EmptyFunctionBlock: + active: true + ignoreOverridden: false + EmptyIfBlock: + active: true + EmptyInitBlock: + active: true + EmptyKtFile: + active: true + EmptySecondaryConstructor: + active: true + EmptyTryBlock: + active: true + EmptyWhenBlock: + active: true + EmptyWhileBlock: + active: true + +exceptions: + active: true + ExceptionRaisedInUnexpectedLocation: + active: true + methodNames: + - 'equals' + - 'finalize' + - 'hashCode' + - 'toString' + InstanceOfCheckForException: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + NotImplementedDeclaration: + active: false + ObjectExtendsThrowable: + active: false + PrintStackTrace: + active: true + RethrowCaughtException: + active: true + ReturnFromFinally: + active: true + ignoreLabeled: false + SwallowedException: + active: true + ignoredExceptionTypes: + - 'InterruptedException' + - 'MalformedURLException' + - 'NumberFormatException' + - 'ParseException' + allowedExceptionNameRegex: '_|(ignore|expected).*' + ThrowingExceptionFromFinally: + active: true + ThrowingExceptionInMain: + active: false + ThrowingExceptionsWithoutMessageOrCause: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + exceptions: + - 'ArrayIndexOutOfBoundsException' + - 'Exception' + - 'IllegalArgumentException' + - 'IllegalMonitorStateException' + - 'IllegalStateException' + - 'IndexOutOfBoundsException' + - 'NullPointerException' + - 'RuntimeException' + - 'Throwable' + ThrowingNewInstanceOfSameException: + active: true + TooGenericExceptionCaught: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + exceptionNames: + - 'ArrayIndexOutOfBoundsException' + - 'Error' + - 'Exception' + - 'IllegalMonitorStateException' + - 'IndexOutOfBoundsException' + - 'NullPointerException' + - 'RuntimeException' + - 'Throwable' + allowedExceptionNameRegex: '_|(ignore|expected).*' + TooGenericExceptionThrown: + active: true + exceptionNames: + - 'Error' + - 'Exception' + - 'RuntimeException' + - 'Throwable' + +naming: + active: true + BooleanPropertyNaming: + active: false + allowedPattern: '^(is|has|are)' + ClassNaming: + active: true + classPattern: '[A-Z][a-zA-Z0-9]*' + ConstructorParameterNaming: + active: true + parameterPattern: '[a-z][A-Za-z0-9]*' + privateParameterPattern: '[a-z][A-Za-z0-9]*' + excludeClassPattern: '$^' + EnumNaming: + active: true + enumEntryPattern: '[A-Z][_a-zA-Z0-9]*' + ForbiddenClassName: + active: false + forbiddenName: [] + FunctionMaxLength: + active: false + maximumFunctionNameLength: 30 + FunctionMinLength: + active: false + minimumFunctionNameLength: 3 + FunctionNaming: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + functionPattern: '[a-z][a-zA-Z0-9]*' + excludeClassPattern: '$^' + FunctionParameterNaming: + active: true + parameterPattern: '[a-z][A-Za-z0-9]*' + excludeClassPattern: '$^' + InvalidPackageDeclaration: + active: true + rootPackage: '' + requireRootInDeclaration: false + LambdaParameterNaming: + active: false + parameterPattern: '[a-z][A-Za-z0-9]*|_' + MatchingDeclarationName: + active: true + mustBeFirst: true + MemberNameEqualsClassName: + active: true + ignoreOverridden: true + NoNameShadowing: + active: true + NonBooleanPropertyPrefixedWithIs: + active: false + ObjectPropertyNaming: + active: true + constantPattern: '[A-Za-z][_A-Za-z0-9]*' + propertyPattern: '[A-Za-z][_A-Za-z0-9]*' + privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*' + PackageNaming: + active: true + packagePattern: '[a-z]+(\.[a-z][A-Za-z0-9]*)*' + TopLevelPropertyNaming: + active: true + constantPattern: '[A-Z][_A-Z0-9]*' + propertyPattern: '[A-Za-z][_A-Za-z0-9]*' + privatePropertyPattern: '_?[A-Za-z][_A-Za-z0-9]*' + VariableMaxLength: + active: false + maximumVariableNameLength: 64 + VariableMinLength: + active: false + minimumVariableNameLength: 1 + VariableNaming: + active: true + variablePattern: '[a-z][A-Za-z0-9]*' + privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*' + excludeClassPattern: '$^' + +performance: + active: true + ArrayPrimitive: + active: true + CouldBeSequence: + active: false + threshold: 3 + ForEachOnRange: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + SpreadOperator: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + UnnecessaryPartOfBinaryExpression: + active: false + UnnecessaryTemporaryInstantiation: + active: true + +potential-bugs: + active: true + AvoidReferentialEquality: + active: true + forbiddenTypePatterns: + - 'kotlin.String' + CastNullableToNonNullableType: + active: false + CastToNullableType: + active: false + Deprecation: + active: false + DontDowncastCollectionTypes: + active: false + DoubleMutabilityForCollection: + active: true + mutableTypes: + - 'kotlin.collections.MutableList' + - 'kotlin.collections.MutableMap' + - 'kotlin.collections.MutableSet' + - 'java.util.ArrayList' + - 'java.util.LinkedHashSet' + - 'java.util.HashSet' + - 'java.util.LinkedHashMap' + - 'java.util.HashMap' + ElseCaseInsteadOfExhaustiveWhen: + active: false + ignoredSubjectTypes: [] + EqualsAlwaysReturnsTrueOrFalse: + active: true + EqualsWithHashCodeExist: + active: true + ExitOutsideMain: + active: false + ExplicitGarbageCollectionCall: + active: true + HasPlatformType: + active: true + IgnoredReturnValue: + active: true + restrictToConfig: true + returnValueAnnotations: + - 'CheckResult' + - '*.CheckResult' + - 'CheckReturnValue' + - '*.CheckReturnValue' + ignoreReturnValueAnnotations: + - 'CanIgnoreReturnValue' + - '*.CanIgnoreReturnValue' + returnValueTypes: + - 'kotlin.sequences.Sequence' + - 'kotlinx.coroutines.flow.*Flow' + - 'java.util.stream.*Stream' + ignoreFunctionCall: [] + ImplicitDefaultLocale: + active: true + ImplicitUnitReturnType: + active: false + allowExplicitReturnType: true + InvalidRange: + active: true + IteratorHasNextCallsNextMethod: + active: true + IteratorNotThrowingNoSuchElementException: + active: true + LateinitUsage: + active: false + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + ignoreOnClassesPattern: '' + MapGetWithNotNullAssertionOperator: + active: true + MissingPackageDeclaration: + active: false + excludes: ['**/*.kts'] + NullCheckOnMutableProperty: + active: false + NullableToStringCall: + active: false + PropertyUsedBeforeDeclaration: + active: false + UnconditionalJumpStatementInLoop: + active: false + UnnecessaryNotNullCheck: + active: false + UnnecessaryNotNullOperator: + active: true + UnnecessarySafeCall: + active: true + UnreachableCatchBlock: + active: true + UnreachableCode: + active: true + UnsafeCallOnNullableType: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**'] + UnsafeCast: + active: true + UnusedUnaryOperator: + active: true + UselessPostfixExpression: + active: true + WrongEqualsTypeParameter: + active: true + +style: + active: true + AlsoCouldBeApply: + active: false + BracesOnIfStatements: + active: false + singleLine: 'never' + multiLine: 'always' + BracesOnWhenStatements: + active: false + singleLine: 'necessary' + multiLine: 'consistent' + CanBeNonNullable: + active: false + CascadingCallWrapping: + active: false + includeElvis: true + ClassOrdering: + active: false + CollapsibleIfStatements: + active: false + DataClassContainsFunctions: + active: false + conversionFunctionPrefix: + - 'to' + allowOperators: false + DataClassShouldBeImmutable: + active: false + DestructuringDeclarationWithTooManyEntries: + active: true + maxDestructuringEntries: 3 + DoubleNegativeLambda: + active: false + negativeFunctions: + - reason: 'Use `takeIf` instead.' + value: 'takeUnless' + - reason: 'Use `all` instead.' + value: 'none' + negativeFunctionNameParts: + - 'not' + - 'non' + EqualsNullCall: + active: true + EqualsOnSignatureLine: + active: false + ExplicitCollectionElementAccessMethod: + active: false + ExplicitItLambdaParameter: + active: true + ExpressionBodySyntax: + active: false + includeLineWrapping: false + ForbiddenAnnotation: + active: false + annotations: + - reason: 'it is a java annotation. Use `Suppress` instead.' + value: 'java.lang.SuppressWarnings' + - reason: 'it is a java annotation. Use `kotlin.Deprecated` instead.' + value: 'java.lang.Deprecated' + - reason: 'it is a java annotation. Use `kotlin.annotation.MustBeDocumented` instead.' + value: 'java.lang.annotation.Documented' + - reason: 'it is a java annotation. Use `kotlin.annotation.Target` instead.' + value: 'java.lang.annotation.Target' + - reason: 'it is a java annotation. Use `kotlin.annotation.Retention` instead.' + value: 'java.lang.annotation.Retention' + - reason: 'it is a java annotation. Use `kotlin.annotation.Repeatable` instead.' + value: 'java.lang.annotation.Repeatable' + - reason: 'Kotlin does not support @Inherited annotation, see https://youtrack.jetbrains.com/issue/KT-22265' + value: 'java.lang.annotation.Inherited' + ForbiddenComment: + active: true + comments: + - reason: 'Forbidden STOPSHIP todo marker in comment, please address the problem before shipping the code.' + value: 'STOPSHIP:' + allowedPatterns: '' + ForbiddenImport: + active: false + imports: [] + forbiddenPatterns: '' + ForbiddenMethodCall: + active: false + methods: + - reason: 'print does not allow you to configure the output stream. Use a logger instead.' + value: 'kotlin.io.print' + - reason: 'println does not allow you to configure the output stream. Use a logger instead.' + value: 'kotlin.io.println' + ForbiddenSuppress: + active: false + rules: [] + ForbiddenVoid: + active: true + ignoreOverridden: false + ignoreUsageInGenerics: false + FunctionOnlyReturningConstant: + active: true + ignoreOverridableFunction: true + ignoreActualFunction: true + excludedFunctions: [] + LoopWithTooManyJumpStatements: + active: true + maxJumpCount: 1 + MagicNumber: + active: true + excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**', '**/*.kts'] + ignoreNumbers: + - '-1' + - '0' + - '1' + - '2' + ignoreHashCodeFunction: true + ignorePropertyDeclaration: false + ignoreLocalVariableDeclaration: false + ignoreConstantDeclaration: true + ignoreCompanionObjectPropertyDeclaration: true + ignoreAnnotation: false + ignoreNamedArgument: true + ignoreEnums: false + ignoreRanges: false + ignoreExtensionFunctions: true + MandatoryBracesLoops: + active: false + MaxChainedCallsOnSameLine: + active: false + maxChainedCalls: 5 + MaxLineLength: + active: true + maxLineLength: 160 + excludePackageStatements: true + excludeImportStatements: true + excludeCommentStatements: false + excludeRawStrings: true + MayBeConst: + active: true + ModifierOrder: + active: true + MultilineLambdaItParameter: + active: false + MultilineRawStringIndentation: + active: false + indentSize: 4 + trimmingMethods: + - 'trimIndent' + - 'trimMargin' + NestedClassesVisibility: + active: true + NewLineAtEndOfFile: + active: true + NoTabs: + active: false + NullableBooleanCheck: + active: false + ObjectLiteralToLambda: + active: true + OptionalAbstractKeyword: + active: true + OptionalUnit: + active: false + PreferToOverPairSyntax: + active: false + ProtectedMemberInFinalClass: + active: true + RedundantExplicitType: + active: false + RedundantHigherOrderMapUsage: + active: true + RedundantVisibilityModifierRule: + active: false + ReturnCount: + active: true + max: 2 + excludedFunctions: + - 'equals' + excludeLabeled: false + excludeReturnFromLambda: true + excludeGuardClauses: false + SafeCast: + active: true + SerialVersionUIDInSerializableClass: + active: true + SpacingBetweenPackageAndImports: + active: false + StringShouldBeRawString: + active: false + maxEscapedCharacterCount: 2 + ignoredCharacters: [] + ThrowsCount: + active: true + max: 2 + excludeGuardClauses: false + TrailingWhitespace: + active: false + TrimMultilineRawString: + active: false + trimmingMethods: + - 'trimIndent' + - 'trimMargin' + UnderscoresInNumericLiterals: + active: false + acceptableLength: 4 + allowNonStandardGrouping: false + UnnecessaryAbstractClass: + active: true + UnnecessaryAnnotationUseSiteTarget: + active: false + UnnecessaryApply: + active: true + UnnecessaryBackticks: + active: false + UnnecessaryBracesAroundTrailingLambda: + active: false + UnnecessaryFilter: + active: true + UnnecessaryInheritance: + active: true + UnnecessaryInnerClass: + active: false + UnnecessaryLet: + active: false + UnnecessaryParentheses: + active: false + allowForUnclearPrecedence: false + UntilInsteadOfRangeTo: + active: false + UnusedImports: + active: false + UnusedParameter: + active: true + allowedNames: 'ignored|expected' + UnusedPrivateClass: + active: true + UnusedPrivateMember: + active: true + allowedNames: '' + UnusedPrivateProperty: + active: true + allowedNames: '_|ignored|expected|serialVersionUID' + UseAnyOrNoneInsteadOfFind: + active: true + UseArrayLiteralsInAnnotations: + active: true + UseCheckNotNull: + active: true + UseCheckOrError: + active: true + UseDataClass: + active: false + allowVars: false + UseEmptyCounterpart: + active: false + UseIfEmptyOrIfBlank: + active: false + UseIfInsteadOfWhen: + active: false + ignoreWhenContainingVariableDeclaration: false + UseIsNullOrEmpty: + active: true + UseLet: + active: false + UseOrEmpty: + active: true + UseRequire: + active: true + UseRequireNotNull: + active: true + UseSumOfInsteadOfFlatMapSize: + active: false + UselessCallOnNotNull: + active: true + UtilityClassWithPublicConstructor: + active: true + VarCouldBeVal: + active: true + ignoreLateinitVar: false + WildcardImport: + active: true + excludeImports: + - 'java.util.*' diff --git a/detekt_baseline.xml b/detekt_baseline.xml new file mode 100644 index 0000000..d1c253e --- /dev/null +++ b/detekt_baseline.xml @@ -0,0 +1,8 @@ + + + + + MagicNumber:PasswordUtil.kt$3 + TooGenericExceptionCaught:CustomFunctionInvoker.kt$CustomFunctionInvoker$e: Exception + + diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml new file mode 100644 index 0000000..512cc54 --- /dev/null +++ b/docker-compose/docker-compose.yaml @@ -0,0 +1,12 @@ +services: + wiremock: + image: local.wiremock.cdrapi + build: ./wiremock + mem_limit: 256m + ports: + - "9090:8080" + - "8443:8443" + environment: + - TZ=Europe/Zurich + command: ["--verbose", "--https-port", "8443", "--global-response-templating"] + diff --git a/docker-compose/wiremock/Dockerfile b/docker-compose/wiremock/Dockerfile new file mode 100644 index 0000000..6186de3 --- /dev/null +++ b/docker-compose/wiremock/Dockerfile @@ -0,0 +1,3 @@ +FROM wiremock/wiremock:3.6.0-alpine + +COPY ./mappings/* /home/wiremock/mappings/ diff --git a/docker-compose/wiremock/mappings/deleteDefault.json b/docker-compose/wiremock/mappings/deleteDefault.json new file mode 100644 index 0000000..d2bdfce --- /dev/null +++ b/docker-compose/wiremock/mappings/deleteDefault.json @@ -0,0 +1,17 @@ +{ + "request": { + "urlPattern": "/documents/([a-z0-9-]*)", + "method": "DELETE", + "headers": { + "cdr-connector-id": { + "doesNotMatch": "(1|5|666|1234|2345)" + } + } + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "*/*" + } + } +} diff --git a/docker-compose/wiremock/mappings/get_files_1.json b/docker-compose/wiremock/mappings/get_files_1.json new file mode 100644 index 0000000..34403f0 --- /dev/null +++ b/docker-compose/wiremock/mappings/get_files_1.json @@ -0,0 +1,167 @@ +{ + "mappings": [ + { + "scenarioName": "Get the only File for connector 1 test", + "requiredScenarioState": "Started", + "newScenarioState": "File Downloaded", + "request": { + "method": "GET", + "urlPath": "/documents", + "queryParameters": { + "limit": { + "matches": "1" + } + }, + "headers": { + "cdr-connector-id": { + "equalTo": "1" + }, + "cdr-processing-mode": { + "equalTo": "test" + } + } + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "*/*", + "cdr-document-uuid": "234-test" + }, + "base64Body": "IlRoZSBjb3Ntb3MgaXMgd2l0aGluIHVzLiBXZSBhcmUgbWFkZSBvZiBzdGFyLXN0dWZmLiBXZSBhcmUgYSB3YXkgZm9yIHRoZSB1bml2ZXJzZSB0byBrbm93IGl0c2VsZi4iIC0gKENhcmwgU2FnYW4p" + } + }, + { + "scenarioName": "Get the only File for connector 1 test", + "requiredScenarioState": "File Downloaded", + "newScenarioState": "Done", + "request": { + "method": "DELETE", + "url": "/documents/234-test", + "headers": { + "cdr-connector-id": { + "equalTo": "1" + }, + "cdr-processing-mode": { + "equalTo": "test" + } + } + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "*/*" + } + } + }, + { + "scenarioName": "Get the only File for connector 1 test", + "requiredScenarioState": "Done", + "newScenarioState": "Started", + "request": { + "method": "GET", + "urlPath": "/documents", + "queryParameters": { + "limit": { + "matches": "1" + } + }, + "headers": { + "cdr-connector-id": { + "equalTo": "1" + }, + "cdr-processing-mode": { + "equalTo": "test" + } + } + }, + "response": { + "status": 204, + "headers": { + "Content-Type": "*/*" + } + } + }, + + { + "scenarioName": "Get the only File for connector 1 production", + "requiredScenarioState": "Started", + "newScenarioState": "File Downloaded", + "request": { + "method": "GET", + "urlPath": "/documents", + "queryParameters": { + "limit": { + "matches": "1" + } + }, + "headers": { + "cdr-connector-id": { + "equalTo": "1" + }, + "cdr-processing-mode": { + "equalTo": "production" + } + } + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "*/*", + "cdr-document-uuid": "234-prod" + }, + "base64Body": "IkJlIHlvdXJzZWxmOyBldmVyeW9uZSBlbHNlIGlzIGFscmVhZHkgdGFrZW4uIiAtIE9zY2FyIFdpbGRl" + } + }, + { + "scenarioName": "Get the only File for connector 1 production", + "requiredScenarioState": "File Downloaded", + "newScenarioState": "Done", + "request": { + "method": "DELETE", + "url": "/documents/234-prod", + "headers": { + "cdr-connector-id": { + "equalTo": "1" + }, + "cdr-processing-mode": { + "equalTo": "production" + } + } + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "*/*" + } + } + }, + { + "scenarioName": "Get the only File for connector 1 production", + "requiredScenarioState": "Done", + "newScenarioState": "Started", + "request": { + "method": "GET", + "urlPath": "/documents", + "queryParameters": { + "limit": { + "matches": "1" + } + }, + "headers": { + "cdr-connector-id": { + "equalTo": "1" + }, + "cdr-processing-mode": { + "equalTo": "production" + } + } + }, + "response": { + "status": 204, + "headers": { + "Content-Type": "*/*" + } + } + } + ] +} diff --git a/docker-compose/wiremock/mappings/get_files_1234.json b/docker-compose/wiremock/mappings/get_files_1234.json new file mode 100644 index 0000000..cf9dcd0 --- /dev/null +++ b/docker-compose/wiremock/mappings/get_files_1234.json @@ -0,0 +1,30 @@ +{ + "mappings": + [ + { + "scenarioName": "Get Files for connector 1234 - none there", + "requiredScenarioState": "Started", + "newScenarioState": "Started", + "request": { + "method": "GET", + "urlPath": "/documents", + "queryParameters": { + "limit": { + "matches": "1" + } + }, + "headers": { + "cdr-connector-id": { + "equalTo": "1234" + } + } + }, + "response": { + "status": 204, + "headers": { + "Content-Type": "*/*" + } + } + } + ] +} diff --git a/docker-compose/wiremock/mappings/get_files_2345.json b/docker-compose/wiremock/mappings/get_files_2345.json new file mode 100644 index 0000000..daf0c61 --- /dev/null +++ b/docker-compose/wiremock/mappings/get_files_2345.json @@ -0,0 +1,51 @@ +{ + "mappings": [ + { + "scenarioName": "Get the only File for connector 2345", + "requiredScenarioState": "Started", + "newScenarioState": "File Downloaded", + "request": { + "method": "GET", + "urlPath": "/documents", + "queryParameters": { + "limit": { + "matches": "1" + } + }, + "headers": { + "cdr-connector-id": { + "equalTo": "2345" + } + } + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "*/*", + "cdr-document-uuid": "456" + }, + "base64Body": "IlRoZSBjb3Ntb3MgaXMgd2l0aGluIHVzLiBXZSBhcmUgbWFkZSBvZiBzdGFyLXN0dWZmLiBXZSBhcmUgYSB3YXkgZm9yIHRoZSB1bml2ZXJzZSB0byBrbm93IGl0c2VsZi4iIC0gKENhcmwgU2FnYW4p" + } + }, + { + "scenarioName": "Get the only File for connector 2345", + "requiredScenarioState": "File Downloaded", + "newScenarioState": "Started", + "request": { + "method": "DELETE", + "url": "/documents/456", + "headers": { + "cdr-connector-id": { + "equalTo": "2345" + } + } + }, + "response": { + "status": 500, + "headers": { + "Content-Type": "*/*" + } + } + } + ] +} diff --git a/docker-compose/wiremock/mappings/get_files_5.json b/docker-compose/wiremock/mappings/get_files_5.json new file mode 100644 index 0000000..94b049d --- /dev/null +++ b/docker-compose/wiremock/mappings/get_files_5.json @@ -0,0 +1,217 @@ +{ + "mappings": [ + { + "scenarioName": "Get all Files for connector 5", + "requiredScenarioState": "Started", + "newScenarioState": "File Downloaded 1", + "request": { + "method": "GET", + "urlPath": "/documents", + "queryParameters": { + "limit": { + "matches": "1" + } + }, + "headers": { + "cdr-connector-id": { + "equalTo": "5" + } + } + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "*/*", + "cdr-document-uuid": "999" + }, + "base64Body": "IlRoZSBjb3Ntb3MgaXMgd2l0aGluIHVzLiBXZSBhcmUgbWFkZSBvZiBzdGFyLXN0dWZmLiBXZSBhcmUgYSB3YXkgZm9yIHRoZSB1bml2ZXJzZSB0byBrbm93IGl0c2VsZi4iIC0gKENhcmwgU2FnYW4p" + } + }, + { + "scenarioName": "Get all Files for connector 5", + "requiredScenarioState": "File Downloaded 1", + "newScenarioState": "Download File 2", + "request": { + "method": "DELETE", + "url": "/documents/999", + "headers": { + "cdr-connector-id": { + "equalTo": "5" + } + } + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "*/*" + } + } + }, + { + "scenarioName": "Get all Files for connector 5", + "requiredScenarioState": "Download File 2", + "newScenarioState": "File Downloaded 2", + "request": { + "method": "GET", + "urlPath": "/documents", + "queryParameters": { + "limit": { + "matches": "1" + } + }, + "headers": { + "cdr-connector-id": { + "equalTo": "5" + } + } + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "*/*", + "cdr-document-uuid": "888" + }, + "base64Body": "IkJlIHlvdXJzZWxmOyBldmVyeW9uZSBlbHNlIGlzIGFscmVhZHkgdGFrZW4uIiAtIE9zY2FyIFdpbGRl" + } + }, + { + "scenarioName": "Get all Files for connector 5", + "requiredScenarioState": "File Downloaded 2", + "newScenarioState": "Download File 3", + "request": { + "method": "DELETE", + "url": "/documents/888", + "headers": { + "cdr-connector-id": { + "equalTo": "5" + } + } + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "*/*" + } + } + }, + { + "scenarioName": "Get all Files for connector 5", + "requiredScenarioState": "Download File 3", + "newScenarioState": "File Downloaded 3", + "request": { + "method": "GET", + "urlPath": "/documents", + "queryParameters": { + "limit": { + "matches": "1" + } + }, + "headers": { + "cdr-connector-id": { + "equalTo": "5" + } + } + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "*/*", + "cdr-document-uuid": "777" + }, + "base64Body": "IkEgcm9vbSB3aXRob3V0IGJvb2tzIGlzIGxpa2UgYSBib2R5IHdpdGhvdXQgYSBzb3VsLiIgLSBNYXJjdXMgVHVsbGl1cyBDaWNlcm8=" + } + }, + { + "scenarioName": "Get all Files for connector 5", + "requiredScenarioState": "File Downloaded 3", + "newScenarioState": "Download File 4", + "request": { + "method": "DELETE", + "url": "/documents/777", + "headers": { + "cdr-connector-id": { + "equalTo": "5" + } + } + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "*/*" + } + } + }, + { + "scenarioName": "Get all Files for connector 5", + "requiredScenarioState": "Download File 4", + "newScenarioState": "File Downloaded 4", + "request": { + "method": "GET", + "urlPath": "/documents", + "queryParameters": { + "limit": { + "matches": "1" + } + }, + "headers": { + "cdr-connector-id": { + "equalTo": "5" + } + } + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "*/*", + "cdr-document-uuid": "666" + }, + "base64Body": "IkJlIHRoZSBjaGFuZ2UgdGhhdCB5b3Ugd2lzaCB0byBzZWUgaW4gdGhlIHdvcmxkLiIgLSBNYWhhdG1hIEdhbmRoaQ==" + } + }, + { + "scenarioName": "Get all Files for connector 5", + "requiredScenarioState": "File Downloaded 4", + "newScenarioState": "No more Files", + "request": { + "method": "DELETE", + "url": "/documents/666", + "headers": { + "cdr-connector-id": { + "equalTo": "5" + } + } + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "*/*" + } + } + }, + { + "scenarioName": "Get all Files for connector 5", + "requiredScenarioState": "No more Files", + "newScenarioState": "Started", + "request": { + "method": "GET", + "urlPath": "/documents", + "queryParameters": { + "limit": { + "matches": "1" + } + }, + "headers": { + "cdr-connector-id": { + "equalTo": "5" + } + } + }, + "response": { + "status": 204, + "headers": { + "Content-Type": "*/*" + } + } + } + ] +} diff --git a/docker-compose/wiremock/mappings/get_files_666.json b/docker-compose/wiremock/mappings/get_files_666.json new file mode 100644 index 0000000..aa16b77 --- /dev/null +++ b/docker-compose/wiremock/mappings/get_files_666.json @@ -0,0 +1,30 @@ +{ + "mappings": + [ + { + "scenarioName": "Get Files for connector 666 - Internal Server Error", + "requiredScenarioState": "Started", + "newScenarioState": "Started", + "request": { + "method": "GET", + "urlPath": "/documents", + "queryParameters": { + "limit": { + "matches": "1" + } + }, + "headers": { + "cdr-connector-id": { + "equalTo": "666" + } + } + }, + "response": { + "status": 500, + "headers": { + "Content-Type": "*/*" + } + } + } + ] +} diff --git a/docker-compose/wiremock/mappings/pullDefault.json b/docker-compose/wiremock/mappings/pullDefault.json new file mode 100644 index 0000000..1d9332f --- /dev/null +++ b/docker-compose/wiremock/mappings/pullDefault.json @@ -0,0 +1,57 @@ +{ + "mappings": [ + { + "scenarioName": "Default pull", + "requiredScenarioState": "Started", + "newScenarioState": "NoContent", + "request": { + "urlPath": "/documents", + "queryParameters": { + "limit": { + "matches": "1" + } + }, + "method": "GET", + "headers": { + "cdr-connector-id": { + "doesNotMatch": "(1|5|666|1234|2345)" + } + } + }, + "response": { + "transformers": ["random-value"], + "status": 200, + "headers": { + "Content-Type": "*/*", + "cdr-document-uuid": "{{randomValue length=10 type='ALPHANUMERIC'}}" + }, + "base64Body": "IlRoZSBjb3Ntb3MgaXMgd2l0aGluIHVzLiBXZSBhcmUgbWFkZSBvZiBzdGFyLXN0dWZmLiBXZSBhcmUgYSB3YXkgZm9yIHRoZSB1bml2ZXJzZSB0byBrbm93IGl0c2VsZi4iIC0gKENhcmwgU2FnYW4p" + } + }, + { + "scenarioName": "Default pull", + "requiredScenarioState": "NoContent", + "newScenarioState": "Started", + "request": { + "urlPath": "/documents", + "queryParameters": { + "limit": { + "matches": "1" + } + }, + "method": "GET", + "headers": { + "cdr-connector-id": { + "doesNotMatch": "(1|5|666|1234|2345)" + } + } + }, + "response": { + "status": 204, + "headers": { + "Content-Type": "*/*" + } + } + } + ] +} diff --git a/docker-compose/wiremock/mappings/pushDefault.json b/docker-compose/wiremock/mappings/pushDefault.json new file mode 100644 index 0000000..4754f7b --- /dev/null +++ b/docker-compose/wiremock/mappings/pushDefault.json @@ -0,0 +1,22 @@ +{ + "mappings": [ + { + "request": { + "urlPath": "/documents", + "method": "POST", + "headers": { + "cdr-connector-id": { + "doesNotMatch": "(1|5|666)" + } + } + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "application/json; charset=utf-8" + }, + "body": "{\"message\": \"Upload successful\"}" + } + } + ] +} diff --git a/docker-compose/wiremock/mappings/push_files_1.json b/docker-compose/wiremock/mappings/push_files_1.json new file mode 100644 index 0000000..22b5d1e --- /dev/null +++ b/docker-compose/wiremock/mappings/push_files_1.json @@ -0,0 +1,48 @@ +{ + "mappings": [ + { + "request": { + "method": "POST", + "urlPath": "/documents", + "headers": { + "cdr-connector-id": { + "equalTo": "1" + }, + "cdr-processing-mode": { + "not": { + "equalTo": "test" + } + } + } + }, + "response": { + "status": 400, + "headers": { + "Content-Type": "application/problem+json; charset=utf-8" + }, + "body": "{\"message\": \"Invalid input.\"}" + } + }, + { + "request": { + "method": "POST", + "url": "/documents", + "headers": { + "cdr-connector-id": { + "equalTo": "1" + }, + "cdr-processing-mode": { + "equalTo": "test" + } + } + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "application/json; charset=utf-8" + }, + "body": "{\"message\": \"Upload successful\"}" + } + } + ] +} diff --git a/docker-compose/wiremock/mappings/push_files_5.json b/docker-compose/wiremock/mappings/push_files_5.json new file mode 100644 index 0000000..57f3934 --- /dev/null +++ b/docker-compose/wiremock/mappings/push_files_5.json @@ -0,0 +1,22 @@ +{ + "mappings": [ + { + "request": { + "method": "POST", + "urlPath": "/documents", + "headers": { + "cdr-connector-id": { + "equalTo": "5" + } + } + }, + "response": { + "status": 500, + "headers": { + "Content-Type": "application/problem+json; charset=utf-8" + }, + "body": "{\"message\": \"This will be repeated endlessly.\"}" + } + } + ] +} diff --git a/docker-compose/wiremock/mappings/push_files_666.json b/docker-compose/wiremock/mappings/push_files_666.json new file mode 100644 index 0000000..0bfa30c --- /dev/null +++ b/docker-compose/wiremock/mappings/push_files_666.json @@ -0,0 +1,22 @@ +{ + "mappings": [ + { + "request": { + "method": "POST", + "urlPath": "/documents", + "headers": { + "cdr-connector-id": { + "equalTo": "666" + } + } + }, + "response": { + "status": 403, + "headers": { + "Content-Type": "application/problem+json; charset=utf-8" + }, + "body": "{\"message\": \"The user is not authorized.\"}" + } + } + ] +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..4ff6fea --- /dev/null +++ b/gradle.properties @@ -0,0 +1,26 @@ +kotlin.code.style=official +############ +# Version Management +############ +############ +# Kotlin +############ +jvmVersion=17 +kotlinVersion=1.9.24 +kotlinxSerializationVersion=1.6.3 +############ +# Plugins +############ +detektVersion=1.23.6 +springBootVersion=3.2.4 +springDependencyManagementVersion=1.1.4 +############ +# Dependencies +############ +detektKotlinVersion=1.9.23 +jacocoVersion=0.8.12 +kotlinLoggingVersion=6.0.9 +logstashEncoderVersion=7.4 +micrometerTracingVersion=1.3.0 +mockkVersion=1.13.10 +springCloudVersion=2023.0.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..943f0cbfa754578e88a3dae77fce6e3dea56edbf GIT binary patch literal 61574 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 ScNgau(U?ep-K_E5zy1%ZQTdPn literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..2617362 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..65dcd68 --- /dev/null +++ b/gradlew @@ -0,0 +1,244 @@ +#!/bin/sh + +# +# Copyright Š 2015-2021 the original authors. +# +# 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 +# +# https://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. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions ÂĢ$varÂģ, ÂĢ${var}Âģ, ÂĢ${var:-default}Âģ, ÂĢ${var+SET}Âģ, +# ÂĢ${var#prefix}Âģ, ÂĢ${var%suffix}Âģ, and ÂĢ$( cmd )Âģ; +# * compound commands having a testable exit status, especially ÂĢcaseÂģ; +# * various built-in commands including ÂĢcommandÂģ, ÂĢsetÂģ, and ÂĢulimitÂģ. +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..1305796 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,17 @@ +rootProject.name = "cdr-client" + +pluginManagement { + val kotlinVersion: String by settings + val springBootVersion: String by settings + val springDependencyManagementVersion: String by settings + val detektVersion: String by settings + + plugins { + id("org.springframework.boot") version springBootVersion + id("io.spring.dependency-management") version springDependencyManagementVersion + id("io.gitlab.arturbosch.detekt") version detektVersion + kotlin("jvm") version kotlinVersion + kotlin("plugin.spring") version kotlinVersion + kotlin("kapt") version kotlinVersion + } +} diff --git a/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/CdrClientVmApplication.kt b/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/CdrClientVmApplication.kt new file mode 100644 index 0000000..337e980 --- /dev/null +++ b/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/CdrClientVmApplication.kt @@ -0,0 +1,20 @@ +package com.swisscom.health.des.cdr.clientvm + +import com.swisscom.health.des.cdr.clientvm.config.CdrClientConfig +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.context.properties.EnableConfigurationProperties +import org.springframework.boot.runApplication +import org.springframework.scheduling.annotation.EnableScheduling + +/** + * Spring Boot entry point + */ +@SpringBootApplication +@EnableConfigurationProperties(CdrClientConfig::class) +@EnableScheduling +class CdrClientVmApplication + +@Suppress("SpreadOperator") +fun main(args: Array) { + runApplication(*args) +} diff --git a/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/config/CdrClientConfig.kt b/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/config/CdrClientConfig.kt new file mode 100644 index 0000000..67b4ab1 --- /dev/null +++ b/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/config/CdrClientConfig.kt @@ -0,0 +1,84 @@ +package com.swisscom.health.des.cdr.clientvm.config + +import io.github.oshai.kotlinlogging.KotlinLogging +import jakarta.annotation.PostConstruct +import org.springframework.boot.context.properties.ConfigurationProperties +import java.io.File +import java.time.Duration + + +private val logger = KotlinLogging.logger {} + +/** + * CDR client specific configuration + */ +@ConfigurationProperties("client") +data class CdrClientConfig( + val functionKey: String, + val scheduleDelay: String, + val localFolder: String, + val endpoint: Endpoint, + val customer: List, + val pullThreadPoolSize: Int, + val pushThreadPoolSize: Int, + val retryDelay: Array, +) { + + /** + * Clients identified by their customer id + */ + data class Connector( + val connectorId: String, + val targetFolder: String, + val sourceFolder: String, + val contentType: String, + val mode: Mode, + ) + + /** + * CDR API definition + */ + data class Endpoint( + val scheme: String, + val host: String, + val port: Int, + val basePath: String, + ) + + enum class Mode(val value: String) { + TEST("test"), PRODUCTION("production"); + } + + @PostConstruct + fun checkAndReport() { + if (customer.isEmpty()) { + error("There where no customer entries configured") + } + // we don't check target folder for duplicate as this can be configured deliberately by customers + if (duplicateFolderUsage() || duplicateUsage(Connector::sourceFolder)) { + error("Duplicate folder usage detected. Please make sure that each customer has a unique source and that no target folder is used " + + "at the same time as source folder.") + } + checkNoConnectorIdHasTheSameModeDefinedTwice() + File(localFolder).mkdirs() + logger.debug { "Client configuration: $this" } + } + + private fun duplicateFolderUsage(): Boolean = customer.map { it.sourceFolder }.intersect(customer.map { it.targetFolder }.toSet()).isNotEmpty() + + private fun duplicateUsage(selector: (Connector) -> T): Boolean = + customer.map(selector).distinct().size != customer.size + + private fun checkNoConnectorIdHasTheSameModeDefinedTwice(): Unit = + customer.groupBy { it.connectorId }.filter { cd -> cd.value.size > 1 }.values.forEach { connector -> + val modeConnectorsMap: Map> = connector.groupBy { cr -> cr.mode } + if (modeConnectorsMap.values.any { it.size > 1 }) { + error("A single connector ID has production or test defined twice.") + } + } + + override fun toString(): String { + return "CdrClientConfig(functionKey='xxx', scheduleDelay='$scheduleDelay', localFolder='$localFolder', " + + "customer=$customer, endpoint=$endpoint)" + } +} diff --git a/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/config/CdrClientContext.kt b/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/config/CdrClientContext.kt new file mode 100644 index 0000000..d6f79f1 --- /dev/null +++ b/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/config/CdrClientContext.kt @@ -0,0 +1,50 @@ +package com.swisscom.health.des.cdr.clientvm.config + +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.asCoroutineDispatcher +import okhttp3.OkHttpClient +import org.springframework.beans.factory.annotation.Value +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit + +/** + * A Spring configuration class for creating and configuring beans used by the CDR client. + */ +@Configuration +class CdrClientContext { + + /** + * Creates and returns an instance of the OkHttpClient. + * + * @param builder The OkHttpClient.Builder used to build the client. + * @return The fully constructed OkHttpClient. + */ + @Bean + fun okHttpClient( + builder: OkHttpClient.Builder, + @Value("\${client.connection-timeout-ms}") timeout: Long, + @Value("\${client.read-timeout-ms}") readTimeout: Long + ): OkHttpClient = + builder.connectTimeout(timeout, TimeUnit.MILLISECONDS).readTimeout(readTimeout, TimeUnit.MILLISECONDS) + .build() + + /** + * Creates and returns an instance of the OkHttpClient.Builder if one does not already exist. + * + * @return The OkHttpClient.Builder instance. + */ + @Bean + @ConditionalOnMissingBean + fun okHttpClientBuilder(): OkHttpClient.Builder? { + return OkHttpClient.Builder() + } + + @Bean(name = ["pullDispatcher"]) + fun pullDispatcher(config: CdrClientConfig): CoroutineDispatcher = Executors.newFixedThreadPool(config.pullThreadPoolSize).asCoroutineDispatcher() + + @Bean(name = ["pushDispatcher"]) + fun pushDispatcher(config: CdrClientConfig): CoroutineDispatcher = Executors.newFixedThreadPool(config.pushThreadPoolSize).asCoroutineDispatcher() +} diff --git a/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/handler/FileHandlingBase.kt b/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/handler/FileHandlingBase.kt new file mode 100644 index 0000000..e8efbfb --- /dev/null +++ b/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/handler/FileHandlingBase.kt @@ -0,0 +1,87 @@ +package com.swisscom.health.des.cdr.clientvm.handler + +import com.swisscom.health.des.cdr.clientvm.config.CdrClientConfig +import io.github.oshai.kotlinlogging.KLogger +import io.micrometer.tracing.Tracer +import okhttp3.Headers +import org.springframework.util.LinkedMultiValueMap +import org.springframework.util.MultiValueMap +import org.springframework.web.util.UriComponentsBuilder +import java.net.URL +import java.nio.file.Files +import java.nio.file.Path + + +internal const val FUNCTION_KEY_HEADER = "x-functions-key" +internal const val CONNECTOR_ID_HEADER = "cdr-connector-id" +internal const val CDR_PROCESSING_MODE_HEADER = "cdr-processing-mode" +internal const val AZURE_TRACE_ID_HEADER = "x-ms-request-id" + +/** + * Helper function to check for each call if a path is a directory and writable. + * This to prevent unexpected behaviour should access rights change during runtime. + */ +fun pathIsDirectoryAndWritable(path: Path, what: String, logger: KLogger): Boolean = + when { + !Files.isDirectory(path) -> { + logger.error { "Configured path '$path' isn't a directory. Therefore no files are $what until a directory is configured." } + false + } + + !Files.isWritable(path) -> { + logger.error { "Configured path '$path' isn't writable by running user. Therefore no files are $what until access rights are corrected." } + false + } + + else -> true + } + +/** + * Basic functionality needed in all FileHandling classes + */ +abstract class FileHandlingBase(protected val cdrClientConfig: CdrClientConfig, private val tracer: Tracer) { + + /** + * Builds a target URL from an endpoint and a path. + * + * @param path the path to add to the URL + * @return the resulting URL + */ + protected fun buildTargetUrl(path: String, queryParameters: MultiValueMap = LinkedMultiValueMap()): URL { + return UriComponentsBuilder + .newInstance() + .scheme(cdrClientConfig.endpoint.scheme) + .host(cdrClientConfig.endpoint.host) + .port(cdrClientConfig.endpoint.port) + .path(path) + .queryParams(queryParameters) + .build() + .toUri() + .toURL() + } + + /** + * Build headers with connector-id, function key, processing mode and trace id. + */ + protected fun buildBaseHeaders(connectorId: String, mode: CdrClientConfig.Mode): Headers { + val traceId = tracer.currentSpan()?.context()?.traceId() ?: "" + return Headers.Builder().run { + this[CONNECTOR_ID_HEADER] = connectorId + this[FUNCTION_KEY_HEADER] = cdrClientConfig.functionKey + this[CDR_PROCESSING_MODE_HEADER] = mode.value + this[AZURE_TRACE_ID_HEADER] = traceId + this.build() + } + } + + /** + * Helper function to run a block of code with a new span. + */ + protected fun traced(spanName: String, block: () -> A): A { + val newSpan = tracer.spanBuilder().name(spanName).start() + return tracer.withSpan(newSpan).use { + block() + } + } + +} diff --git a/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/handler/PullFileHandling.kt b/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/handler/PullFileHandling.kt new file mode 100644 index 0000000..1171fbf --- /dev/null +++ b/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/handler/PullFileHandling.kt @@ -0,0 +1,234 @@ +package com.swisscom.health.des.cdr.clientvm.handler + +import com.swisscom.health.des.cdr.clientvm.config.CdrClientConfig +import io.github.oshai.kotlinlogging.KotlinLogging +import io.micrometer.tracing.Tracer +import okhttp3.Headers +import okhttp3.OkHttpClient +import okhttp3.Request +import okhttp3.Response +import org.springframework.http.HttpStatus +import org.springframework.stereotype.Component +import org.springframework.util.LinkedMultiValueMap +import java.io.File +import java.io.IOException +import java.io.InputStream +import java.net.URL +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.StandardCopyOption +import kotlin.io.path.outputStream + +private val logger = KotlinLogging.logger {} +internal const val PULL_RESULT_ID_HEADER = "cdr-document-uuid" + +/** + * A class responsible for handling files for a customer by syncing the files to a local folder, + * and moving the files to the customer folder after successfully downloading them locally. + */ +@Component +@Suppress("TooManyFunctions") +class PullFileHandling( + cdrClientConfig: CdrClientConfig, + private val httpClient: OkHttpClient, + tracer: Tracer, +) : FileHandlingBase(cdrClientConfig, tracer) { + /** + * Downloads files for a specific customer. + * + * @param connector the connector to synchronize + */ + suspend fun pullSyncConnector(connector: CdrClientConfig.Connector) { + traced("Pull Sync Connector ${connector.connectorId}") { + logger.info { "Sync connector '${connector.connectorId}' (${connector.mode}) - pulling" } + var counter = 0 + var tryNext: Boolean + runCatching { + do { + tryNext = checkDirectoryAndProcessFile(connector) + if (tryNext) counter++ + } while (tryNext) + }.onFailure { + logger.info { "Synced '$counter' file(s) before exception happened" } + throw it + } + logger.info { "Sync connector done - '$counter' file(s) pulled" } + } + } + + private fun checkDirectoryAndProcessFile(connector: CdrClientConfig.Connector): Boolean = + if (pathIsDirectoryAndWritable(Path.of(connector.targetFolder), "pulled", logger)) { + requestFileAndDecideIfNextFileShouldBeCalled(connector) + } else { + false + } + + /** + * Requests a file and decides if the next file should be called. + * + * @param connector the connector to request a file for + * @return whether to try the next file + */ + private fun requestFileAndDecideIfNextFileShouldBeCalled(connector: CdrClientConfig.Connector): Boolean = + requestFile(connector).use { response -> + return when { + response.isNoContentFound() -> false + + !response.isSuccessWithContent() -> { + logger.error { + "Error requesting file for connector '${connector.connectorId}' (${connector.mode}), because of: (${response.code}) ${response.message}" + } + false + } + + else -> { + val pullResultHeader = response.headers[PULL_RESULT_ID_HEADER] + return if (pullResultHeader == null) { + logger.error { "didn't receive header '$PULL_RESULT_ID_HEADER'" } + false + } else { + syncFileToLocalFolder(response.body!!.byteStream(), pullResultHeader) + acknowledgeFileDownload(connector, pullResultHeader) + && moveFileToClientFolder(connector, pullResultHeader) + } + } + } + } + + /** + * Sends a GET-Request to the CDR API to request a file. + * + * @param connector the connector to request a file for + * @return the HTTP response for the request + */ + private fun requestFile(connector: CdrClientConfig.Connector): Response { + logger.debug { "Request file start" } + val queryParameters = LinkedMultiValueMap() + queryParameters.add("limit", "1") + val response = httpClient.newCall( + createGetRequest( + buildTargetUrl(cdrClientConfig.endpoint.basePath, queryParameters), buildBaseHeaders(connector.connectorId, connector.mode) + ) + ).execute() + logger.debug { "Request file done" } + return response + } + + /** + * Checks if an HTTP response is successful. + * + * @return whether the response is a success or not + */ + fun Response.isSuccessWithContent(): Boolean = this.isSuccessful && this.body != null + + /** + * Checks if the HTTP response is of status code 204 (NO_CONTENT). + */ + fun Response.isNoContentFound(): Boolean = this.code == HttpStatus.NO_CONTENT.value() + + /** + * Creates a GET request with the given target and headers + * @param to the target URL for the request + * @param headers the headers for the request + * @return the created GET request + */ + private fun createGetRequest(to: URL, headers: Headers): Request { + return Request.Builder() + .url(to) + .headers(headers) + .get() + .build() + } + + /** + * Creates a DELETE request with the given target and headers + * @param to the target URL for the request + * @param headers the headers for the request + * @return the created DELETE request + */ + private fun createDeleteRequest(to: URL, headers: Headers): Request { + return Request.Builder() + .url(to) + .headers(headers) + .delete() + .build() + } + + /** + * Synchronizes the file for the given transaction ID to the local folder + * @param inputStream the input stream for the file + * @param pullResultId the ID to identify the pulled file + */ + private fun syncFileToLocalFolder(inputStream: InputStream, pullResultId: String) = + Path.of(cdrClientConfig.localFolder, getTempFileName(pullResultId)).outputStream().use { output -> inputStream.copyTo(output) } + + /** + * Reports the success of the transaction to the connectors' endpoint. + * Needs to be done after each file as otherwise the CDR API will provide the same file again. + * + * @param connector the connector for whom the file was requested + * @param pullResultId the ID to identify the pulled file + * @return true if the reporting was successful, false otherwise + */ + private fun acknowledgeFileDownload(connector: CdrClientConfig.Connector, pullResultId: String): Boolean { + logger.debug { "Acknowledge pulled file start" } + httpClient.newCall( + createDeleteRequest( + buildTargetUrl("${cdrClientConfig.endpoint.basePath}/$pullResultId"), + buildBaseHeaders(connector.connectorId, connector.mode) + ) + ).execute().use { response -> + return if (response.isSuccessful) { + logger.debug { "Acknowledge pulled file done" } + true + } else { + logger.error { + "Error when acknowledging file with identifier '$pullResultId' of connector '${connector.connectorId}' (${connector.mode}): " + + "(${response.code}) ${response.message}" + } + false + } + } + } + + /** + * Moves the file from the local folder to the connectors target folder. + * If the target folder does not exist, it will be created. + * If the file already exists in the target folder, it will be overwritten. + * The file that is currently on the local file system, without file extension, will be moved to the target folder, also with no file extension. + * The file extension is changed from .tmp to .xml after a successful file copy. + * + * @param connector the connector for whom the file was requested + * @param pullResultId the ID to identify the pulled file + */ + private fun moveFileToClientFolder(connector: CdrClientConfig.Connector, pullResultId: String): Boolean { + return try { + logger.debug { "Move file to target directory start" } + val tmpFileName = getTempFileName(pullResultId) + val sourceFile = File(cdrClientConfig.localFolder, tmpFileName) + val targetFolder = File(connector.targetFolder) + targetFolder.mkdirs() + val targetFile = File(targetFolder, tmpFileName) + Files.move( + sourceFile.toPath(), + targetFile.toPath(), + StandardCopyOption.REPLACE_EXISTING + ) + logger.debug { "Move file to target directory done" } + // be aware, that this is not an atomic operation on Windows operating system (but it is on Unix-based systems) + if (targetFile.renameTo(targetFile.toPath().resolveSibling("$pullResultId.xml").toFile())) { + logger.debug { "Rename file in target directory done" } + } else { + logger.error { "Unable to rename file for transactionId '$pullResultId'" } + return false + } + true + } catch (e: IOException) { + logger.error { "Unable to move file for transactionId '$pullResultId': ${e.message}" } + false + } + } + + private fun getTempFileName(pullResultId: String) = "${pullResultId}.tmp" + +} diff --git a/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/handler/PushFileHandling.kt b/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/handler/PushFileHandling.kt new file mode 100644 index 0000000..cb751c9 --- /dev/null +++ b/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/handler/PushFileHandling.kt @@ -0,0 +1,163 @@ +package com.swisscom.health.des.cdr.clientvm.handler + +import com.swisscom.health.des.cdr.clientvm.config.CdrClientConfig +import io.github.oshai.kotlinlogging.KotlinLogging +import io.micrometer.tracing.Tracer +import kotlinx.coroutines.delay +import kotlinx.coroutines.runBlocking +import okhttp3.Headers +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.OkHttpClient +import okhttp3.Request +import okhttp3.RequestBody +import okhttp3.RequestBody.Companion.toRequestBody +import okhttp3.Response +import org.springframework.http.HttpStatus +import org.springframework.stereotype.Component +import java.net.URL +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.StandardOpenOption +import kotlin.io.path.deleteIfExists +import kotlin.io.path.readBytes + + +private val logger = KotlinLogging.logger {} + +/** + * A class responsible for handling files for a connector by syncing the files from a local folder to the CDR API. + * Only files with an '.xml' extension are uploaded. + * 4xx errors are not retried, the xml is rewritten to .xml.error and a .xml.response file is created with the response body. + * Other non-2xx responses are retried with a delay. + * Deletes the local file after successful upload. + */ +@Component +@Suppress("TooManyFunctions") +class PushFileHandling( + cdrClientConfig: CdrClientConfig, + private val httpClient: OkHttpClient, + tracer: Tracer, +) : FileHandlingBase(cdrClientConfig, tracer) { + + /** + * Uploads files for a specific customer. + * @param connector the connector to synchronize + */ + suspend fun pushSyncConnector(connector: CdrClientConfig.Connector) { + traced("Push Sync Connector ${connector.connectorId}") { + logger.info { "Sync connector '${connector.connectorId}' (${connector.mode}) - pushing" } + val path = Path.of(connector.sourceFolder) + var counter = 0 + if (pathIsDirectoryAndWritable(path, "uploaded", logger)) { + runCatching { + Files.list(path).use { files -> + files.filter { it.fileName.toString().endsWith(".xml") } + .forEach { file -> + runBlocking { + handleFile(file, connector, counter).let { newCount -> + counter = newCount + } + } + } + } + }.onFailure { + logger.info { "Synced '$counter' file(s) for connector '${connector.connectorId}' (${connector.mode}) before exception happened" } + throw it + } + } + logger.info { "Sync connector done - '$counter' file(s) pushed" } + } + } + + /** + * Retries the upload of a file until it is successful or a 4xx error occured. + */ + private suspend fun handleFile(file: Path, connector: CdrClientConfig.Connector, counter: Int): Int { + logger.debug { "Push file '$file'" } + var returnCount = counter + var retryCount = 0 + var retryNeeded = true + while (retryNeeded) { + writeFileToApi(file, connector).use { + retryNeeded = handleResponseAndReturnTrueIfRetryIsNeeded(file, it, retryCount) + if (!retryNeeded && it.isSuccessful) { + returnCount++ + } + if (retryNeeded && retryCount < cdrClientConfig.retryDelay.size - 1) { + retryCount++ + } + } + } + return returnCount + } + + private fun writeFileToApi(file: Path, connector: CdrClientConfig.Connector): Response { + // TODO: change this to handle big files + return httpClient.newCall( + createPostRequest( + file.readBytes().toRequestBody(connector.contentType.toMediaType()), + buildTargetUrl(cdrClientConfig.endpoint.basePath), + buildBaseHeaders(connector.connectorId, connector.mode) + ) + ).execute() + } + + /** + * Checks the HTTP return status of the API and decides whether a retry is needed and/or an error needs to be logged. + */ + private suspend fun handleResponseAndReturnTrueIfRetryIsNeeded(file: Path, response: Response, retryCount: Int): Boolean { + val responseStatus: HttpStatus? = HttpStatus.resolve(response.code) + return if (responseStatus != null) { + when { + responseStatus.is2xxSuccessful -> { + if (!file.deleteIfExists()) { + logger.warn { "Tried to delete the file '$file' but it was already gone" } + } + false + } + + responseStatus.is4xxClientError -> { + logger.error { + "File synchronization failed for '${file.fileName}'. Received a 4xx client error (response code: '${response.code}'). " + + "No retry will be attempted due to client-side issue." + } + renameFileToErrorAndCreateLogFile(file, response) + false + } + + else -> { + logger.error { + "Failed to sync file '${file.fileName}', retry will be attempted in '${cdrClientConfig.retryDelay[retryCount]}' - " + + "'${response.message}': ${response.body?.string() ?: "no response body"}" + } + delay(cdrClientConfig.retryDelay[retryCount].toMillis()) + true + } + } + } else { + logger.error { "Unknown HTTP response code retrieved ('${response.code}') - couldn't evaluate HttpStatus" } + true + } + } + + /** + * For an error case and to prevent a failed file to be uploaded again it renames the file to '.error' and creates a file with the response body. + */ + private fun renameFileToErrorAndCreateLogFile(file: Path, response: Response) { + val errorFile = file.resolveSibling("${file.fileName}.error") + val logFile = file.resolveSibling("${file.fileName}.response") + if (!file.toFile().renameTo(errorFile.toFile())) { + logger.error { "Failed to rename file '${file.fileName}'" } + } + response.body?.byteStream() + ?.use { inputStream -> Files.write(logFile, inputStream.readBytes(), StandardOpenOption.APPEND, StandardOpenOption.CREATE) } + } + + private fun createPostRequest(requestBody: RequestBody, to: URL, headers: Headers): Request = + Request.Builder() + .url(to) + .headers(headers) + .post(requestBody) + .build() + +} diff --git a/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/scheduling/Scheduler.kt b/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/scheduling/Scheduler.kt new file mode 100644 index 0000000..ae6f8d2 --- /dev/null +++ b/src/main/kotlin/com/swisscom/health/des/cdr/clientvm/scheduling/Scheduler.kt @@ -0,0 +1,88 @@ +package com.swisscom.health.des.cdr.clientvm.scheduling + +import com.swisscom.health.des.cdr.clientvm.config.CdrClientConfig +import com.swisscom.health.des.cdr.clientvm.handler.PullFileHandling +import com.swisscom.health.des.cdr.clientvm.handler.PushFileHandling +import com.swisscom.health.des.cdr.clientvm.handler.pathIsDirectoryAndWritable +import io.github.oshai.kotlinlogging.KotlinLogging +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.withContext +import org.springframework.scheduling.annotation.Scheduled +import org.springframework.stereotype.Service +import java.nio.file.Path + +private val logger = KotlinLogging.logger {} + +/** + * A Spring service that defines a scheduled task to synchronize files to client folders. + * @property cdrClientConfig An instance of [CdrClientConfig], which is a configuration class for the CDR client. + * @property pullFileHandling An instance of [PullFileHandling], which is a service that provides methods for syncing files to client folders. + */ +@Service +class Scheduler( + private val cdrClientConfig: CdrClientConfig, + private val pullFileHandling: PullFileHandling, + private val pushFileHandling: PushFileHandling, +) { + + /** + * A scheduled task that syncs files to client folders at regular intervals. + */ + @Scheduled(fixedDelayString = "\${client.schedule-delay}") + fun syncFilesToClientFolders() { + logger.info { "Triggered pull sync" } + runBlocking { + callPullFileHandling() + } + } + + /** + * Calls the file handling service for each connector in the configuration, in parallel using coroutines. + */ + private suspend fun callPullFileHandling() { + withContext(Dispatchers.IO) { + if (pathIsDirectoryAndWritable(Path.of(cdrClientConfig.localFolder), "pulled", logger)) { + cdrClientConfig.customer.forEach { connector -> + launch { + runCatching { + pullFileHandling.pullSyncConnector(connector) + }.onFailure { + logger.error(it) { "Error syncing connector '${connector.connectorId}'. Reason: ${it.message}" } + } + } + } + } + } + } + + /** + * A scheduled task that syncs local files to the CDR API at regular intervals. + */ + @Scheduled(fixedDelayString = "\${client.schedule-delay}") + fun syncFilesToApi() { + logger.info { "Triggered push sync" } + runBlocking { + callPushFileHandling() + } + } + + /** + * Calls the file handling service for each connector in the configuration, in parallel using coroutines. + */ + private suspend fun callPushFileHandling() { + withContext(Dispatchers.IO) { + cdrClientConfig.customer.forEach { connector -> + launch { + runCatching { + pushFileHandling.pushSyncConnector(connector) + }.onFailure { + logger.error(it) { "Error syncing connector '${connector.connectorId}'. Reason: ${it.message}" } + } + } + } + } + } + +} diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt new file mode 100644 index 0000000..07294c9 --- /dev/null +++ b/src/main/resources/banner.txt @@ -0,0 +1,10 @@ + .:. ,-----. ,--. ,-----.,--.,--. ,--. ,--. ,--. + .:.:.:::. ' .--./,-| |,--.--.' .--./| |`--' ,---. ,--,--, ,-' '-.\ `.' /,--,--,--. + .::::...:::: | | ' .-. || .--'| | | |,--.| .-. :| \'-. .-' \ / | | +:::::. :::..:. ' '--'\ `-' || | ' '--'\| || |\ --.| || | | | \ / | | | | +.::. ::::::. `-----'`---' `--' `-----'`--'`--' `----'`--''--' `--' `-' `--`--`--' + .... ::::::::. + ..: ::::::::: ${application.title} ${application.version} + ::..::::::::: Powered by Spring Boot ${spring-boot.version} + .. :::::::. + ::::.. diff --git a/src/main/resources/config/application-client.yaml b/src/main/resources/config/application-client.yaml new file mode 100644 index 0000000..7b57e7a --- /dev/null +++ b/src/main/resources/config/application-client.yaml @@ -0,0 +1,26 @@ +client: + functionKey: ${cdrClient.functionKey} + local-folder: ${cdrClient.localFolder} + schedule-delay: PT10M + connection-timeout-ms: 5000 + #we want the read timeout to be longer than a connection timeout between backend and db + read-timeout-ms: 35000 + pull-thread-pool-size: 10 + push-thread-pool-size: 10 + retry-delay: + - 1s + - 2s + - 8s + - 32s + - 10m + endpoint: + scheme: https + port: 443 + # host: dev-cdr-functions.azurewebsites.net + base-path: documents + customer: + # MUST BE SET IN ENVIRONMENT + # - connector-id: 1 + # content-type: application/forumdatenaustausch+xml;charset=UTF-8;version=4.5 + # target-folder: /tmp/download + # source-folder: /tmp/upload diff --git a/src/main/resources/config/application-dev.yaml b/src/main/resources/config/application-dev.yaml new file mode 100644 index 0000000..ce35d43 --- /dev/null +++ b/src/main/resources/config/application-dev.yaml @@ -0,0 +1,40 @@ +client: + functionKey: ${cdrClient.functionKey} + local-folder: ${cdrClient.localFolder} + schedule-delay: PT30S + endpoint: + scheme: http + port: 9090 + host: localhost + base-path: documents + customer: + - connector-id: 1 + content-type: application/forumdatenaustausch+xml;charset=UTF-8;version=4.5 + target-folder: ${cdrClient.targetFolder}/${client.customer[0].connector-id}/test + source-folder: ${cdrClient.sourceFolder}/${client.customer[0].connector-id}/test + mode: test + - connector-id: 1 + content-type: application/forumdatenaustausch+xml;charset=UTF-8;version=4.5 + target-folder: ${cdrClient.targetFolder}/${client.customer[1].connector-id} + source-folder: ${cdrClient.sourceFolder}/${client.customer[1].connector-id} + mode: production + - connector-id: 1234 + content-type: application/forumdatenaustausch+xml;charset=UTF-8;version=4.5 + target-folder: ${cdrClient.targetFolder}/${client.customer[2].connector-id} + source-folder: ${cdrClient.sourceFolder}/${client.customer[2].connector-id} + mode: test + - connector-id: 5 + content-type: application/forumdatenaustausch+xml;charset=UTF-8;version=4.5 + target-folder: ${cdrClient.targetFolder}/${client.customer[3].connector-id} + source-folder: ${cdrClient.sourceFolder}/${client.customer[3].connector-id} + mode: test + - connector-id: 666 + content-type: application/forumdatenaustausch+xml;charset=UTF-8;version=4.5 + target-folder: ${cdrClient.targetFolder}/${client.customer[4].connector-id} + source-folder: ${cdrClient.sourceFolder}/${client.customer[4].connector-id} + mode: production + - connector-id: 2345 + content-type: application/forumdatenaustausch+xml;charset=UTF-8;version=4.5 + target-folder: ${cdrClient.targetFolder}/${client.customer[5].connector-id} + source-folder: ${cdrClient.sourceFolder}/${client.customer[5].connector-id} + mode: production diff --git a/src/main/resources/config/application.yaml b/src/main/resources/config/application.yaml new file mode 100644 index 0000000..465add3 --- /dev/null +++ b/src/main/resources/config/application.yaml @@ -0,0 +1,44 @@ +spring: + main: + web-application-type: none + application: + name: CDR Client + output: + ansi: + enabled: detect + profiles: + include: + - client + task: + scheduling: + pool: + size: 2 + +server: + address: 0.0.0.0 + port: 8080 + shutdown: "graceful" + servlet: + encoding: + charset: UTF-8 + enabled: true + force: true + tomcat: + connection-timeout: 1s + keep-alive-timeout: 30s + +management: + endpoints: + web: + exposure: + include: "actuator,health" + enabled-by-default: true + +logging: + pattern: + dateformat: "\"yyyy-MM-dd'T'HH:mm:ss.SSSXXX\", UTC" + level: + root: INFO + com.swisscom.health.des.cdr: INFO + charset: + console: UTF-8 diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..5ab0818 --- /dev/null +++ b/src/main/resources/logback-spring.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + %highlight(%d{"yyyy-MM-dd'T'HH:mm:ss.SSSXXX", UTC}) | %highlight(${LOG_LEVEL_PATTERN:-%5p}) | %highlight(%magenta(${PID:- })) | %highlight(%yellow(%X{traceId:-None})) | %highlight([%15.15t]) | %highlight(%cyan(%-40.40logger{39})) | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%ex} + + + + + + + + + + + ${LOGGING_FILE_NAME:-./cdr-client.log} + true + + + ${LOGGING_FILE_NAME:-./cdr-client.log}.%d{yyyy-MM-dd}.%i.log + ${LOGGING_LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-100MB} + ${LOGGING_LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-2} + + + + %d{"yyyy-MM-dd'T'HH:mm:ss.SSSXXX", UTC} | ${%level:-%5p} | ${PID:- } | %X{traceId:-None} | [%15.15t] | %-40.40logger{39} | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%ex} + + + + + + + + timestamp + UTC + + + logger + + + level + + + thread + + + mdc + + + + + + stackTrace + + + 200 + 14000 + true + + + + + exceptionClass + + + + + + + + + + + diff --git a/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/CdrClientVmApplicationTest.kt b/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/CdrClientVmApplicationTest.kt new file mode 100644 index 0000000..4d36df2 --- /dev/null +++ b/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/CdrClientVmApplicationTest.kt @@ -0,0 +1,21 @@ +package com.swisscom.health.des.cdr.clientvm + +import org.junit.jupiter.api.Assertions.assertNotNull +import org.junit.jupiter.api.Test +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.test.context.ActiveProfiles + +@SpringBootTest +@ActiveProfiles("test") +internal class CdrClientVmApplicationTest { + + @Autowired + private lateinit var cdrClientVmApplication: CdrClientVmApplication + + @Test + fun `test that application is starting`(){ + assertNotNull(cdrClientVmApplication) + } + +} diff --git a/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/PullSchedulerAndFileHandlerMultipleConnectorTest.kt b/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/PullSchedulerAndFileHandlerMultipleConnectorTest.kt new file mode 100644 index 0000000..1ea3aba --- /dev/null +++ b/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/PullSchedulerAndFileHandlerMultipleConnectorTest.kt @@ -0,0 +1,277 @@ +package com.swisscom.health.des.cdr.clientvm + +import com.swisscom.health.des.cdr.clientvm.config.CdrClientConfig +import com.swisscom.health.des.cdr.clientvm.handler.CONNECTOR_ID_HEADER +import com.swisscom.health.des.cdr.clientvm.handler.PULL_RESULT_ID_HEADER +import com.swisscom.health.des.cdr.clientvm.handler.PullFileHandling +import com.swisscom.health.des.cdr.clientvm.handler.PushFileHandling +import com.swisscom.health.des.cdr.clientvm.scheduling.Scheduler +import io.micrometer.tracing.Span +import io.micrometer.tracing.TraceContext +import io.micrometer.tracing.Tracer +import io.mockk.every +import io.mockk.impl.annotations.MockK +import io.mockk.junit5.MockKExtension +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.advanceUntilIdle +import kotlinx.coroutines.test.runTest +import okhttp3.OkHttpClient +import okhttp3.mockwebserver.Dispatcher +import okhttp3.mockwebserver.MockResponse +import okhttp3.mockwebserver.MockWebServer +import okhttp3.mockwebserver.RecordedRequest +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.extension.ExtendWith +import org.junit.jupiter.api.io.TempDir +import org.springframework.core.io.ClassPathResource +import org.springframework.http.HttpStatus +import java.io.File +import java.nio.charset.StandardCharsets +import java.util.UUID + +@ExtendWith(MockKExtension::class) +internal class PullSchedulerAndFileHandlerMultipleConnectorTest { + + @MockK + private lateinit var config: CdrClientConfig + + @MockK + private lateinit var tracer: Tracer + + @MockK + private lateinit var spanBuilder: Span.Builder + + @MockK + private lateinit var span: Span + + @MockK + private lateinit var spanInScope: Tracer.SpanInScope + + @MockK + private lateinit var traceContext: TraceContext + + @MockK + private lateinit var pushFileHandling: PushFileHandling + + @TempDir + private lateinit var folder: File + + private lateinit var cdrServiceMock: MockWebServer + + private lateinit var scheduler: Scheduler + private lateinit var pullFileHandling: PullFileHandling + + private var counterOne = 0 + private var counterTwo = 0 + + private val directory1 = "customer" + private val directory2 = "otherOne" + private val inflightFolder = "inflight" + private val connectorId1 = "1234" + private val connectorId2 = "3456" + + @BeforeEach + fun setup() { + folder.mkdirs() + cdrServiceMock = MockWebServer() + cdrServiceMock.start() + + val endpoint = CdrClientConfig.Endpoint( + host = cdrServiceMock.hostName, + basePath = "documents", + scheme = "http", + port = cdrServiceMock.port, + ) + val connector1 = + CdrClientConfig.Connector( + connectorId = connectorId1, + targetFolder = "${folder.absolutePath}${File.separator}$directory1", + sourceFolder = "${folder.absolutePath}${File.separator}$directory1/source", + contentType = "application/forumdatenaustausch+xml;charset=UTF-8;version=4.5", + mode = CdrClientConfig.Mode.TEST + ) + val connector2 = + CdrClientConfig.Connector( + connectorId = connectorId2, + targetFolder = "${folder.absolutePath}${File.separator}$directory2", + sourceFolder = "${folder.absolutePath}${File.separator}$directory2/source", + contentType = "application/forumdatenaustausch+xml;charset=UTF-8;version=4.5", + mode = CdrClientConfig.Mode.PRODUCTION + ) + File("${folder.absolutePath}${File.separator}$directory1").mkdirs() + File("${folder.absolutePath}${File.separator}$directory2").mkdirs() + File("${folder.absolutePath}${File.separator}$inflightFolder").mkdirs() + every { config.customer } returns listOf(connector1, connector2) + every { config.endpoint } returns endpoint + every { config.localFolder } returns "${folder.absolutePath}${File.separator}$inflightFolder" + every { config.functionKey } returns "1" + mockTracer() + + pullFileHandling = PullFileHandling(config, OkHttpClient.Builder().build(), tracer) + scheduler = Scheduler( + config, + pullFileHandling, + pushFileHandling, + ) + + } + + private fun mockTracer() { + every { tracer.spanBuilder() } returns spanBuilder + every { tracer.currentSpan() } returns null + every { spanBuilder.setNoParent() } returns spanBuilder + every { spanBuilder.name(any()) } returns spanBuilder + every { spanBuilder.start() } returns span + every { tracer.withSpan(any()) } returns spanInScope + every { span.name(any()) } returns span + every { span.start() } returns span + every { span.event(any()) } returns span + every { span.end() } returns Unit + every { span.tag(any(), any()) } returns span + every { span.context() } returns traceContext + every { spanInScope.close() } returns Unit + } + + private fun handleDispatcher(request: RecordedRequest, practOneMaxCount: Int, practTwoMaxCount: Int): MockResponse { + return if (request.method == "GET" && request.headers[CONNECTOR_ID_HEADER] == connectorId1 + ) { + mockResponseDependingOnPath(request) { handleConnectorOne(practOneMaxCount) } + } else if (request.method == "GET" && request.headers[CONNECTOR_ID_HEADER] == connectorId2 + ) { + mockResponseDependingOnPath(request) { handleConnectorTwo(practTwoMaxCount) } + } else if (request.method == "DELETE") { + MockResponse().setResponseCode(HttpStatus.OK.value()) + } else { + MockResponse().setResponseCode(HttpStatus.INTERNAL_SERVER_ERROR.value()) + .setBody("I'm sorry. My responses are limited. You must ask the right questions.") + } + } + + private fun mockResponseDependingOnPath(request: RecordedRequest, handleMethod: () -> MockResponse): MockResponse { + return with(request.path!!) { + when { + contains("limit=1") -> handleMethod() + else -> MockResponse().setResponseCode(HttpStatus.NOT_FOUND.value()) + } + } + } + + private fun handleConnectorOne(maxCount: Int): MockResponse { + return if (counterOne < maxCount) { + counterOne++ + MockResponse().setResponseCode(HttpStatus.OK.value()) + .setHeader(PULL_RESULT_ID_HEADER, UUID.randomUUID().toString()) + .setBody(String(ClassPathResource("messages/dummy.txt").inputStream.readAllBytes(), StandardCharsets.UTF_8)) + } else { + MockResponse().setResponseCode(HttpStatus.NO_CONTENT.value()) + } + } + + private fun handleConnectorTwo(maxCount: Int): MockResponse { + return if (counterTwo < maxCount) { + counterTwo++ + MockResponse().setResponseCode(HttpStatus.OK.value()) + .setHeader(PULL_RESULT_ID_HEADER, UUID.randomUUID().toString()) + .setBody(String(ClassPathResource("messages/dummy.txt").inputStream.readAllBytes(), StandardCharsets.UTF_8)) + } else { + MockResponse().setResponseCode(HttpStatus.NO_CONTENT.value()) + } + } + + @AfterEach + fun tearDown() { + folder.delete() + cdrServiceMock.shutdown() + counterOne = 0 + counterTwo = 0 + } + + @Test + fun `test sync of multiple files to folder for two connectors`() = runTest { + val practOneMaxCount = 75 + val practTwoMaxCount = 50 + cdrServiceMock.dispatcher = object : Dispatcher() { + override fun dispatch(request: RecordedRequest): MockResponse { + return handleDispatcher(request, practOneMaxCount, practTwoMaxCount) + } + } + + scheduler.syncFilesToClientFolders() + + + Assertions.assertEquals(practTwoMaxCount * 2 + practOneMaxCount * 2 + 2, cdrServiceMock.requestCount) + + val listFiles = folder.listFiles() + Assertions.assertNotNull(listFiles) + listFiles!! + listFiles.let { Assertions.assertEquals(3, it.size) } + listFiles.filter { !it.endsWith(inflightFolder) }.forEach { Assertions.assertTrue(it.list().size > 5) } + listFiles.filter { it.endsWith(directory1) }[0].list().let { + if (it != null) { + Assertions.assertEquals(counterOne, it.size) + } else { + Assertions.fail("No file list for folder $directory1 found") + } + } + listFiles.filter { it.endsWith(directory2) }[0].list().let { + if (it != null) { + Assertions.assertEquals(counterTwo, it.size) + } else { + Assertions.fail("No file list for folder $directory2 found") + } + } + listFiles.filter { it.endsWith(inflightFolder) }[0].list().let { + if (it != null) { + Assertions.assertEquals(0, it.size) + } else { + Assertions.fail("No file list for folder $inflightFolder found") + } + } + } + + @OptIn(ExperimentalCoroutinesApi::class) + @Test + fun `test sync of multiple files to folder for one connector`() = runTest { + val practOneMaxCount = 10 + val practTwoMaxCount = 0 + cdrServiceMock.dispatcher = object : Dispatcher() { + override fun dispatch(request: RecordedRequest): MockResponse { + return handleDispatcher(request, practOneMaxCount, practTwoMaxCount) + } + } + + scheduler.syncFilesToClientFolders() + advanceUntilIdle() + + Assertions.assertEquals(practTwoMaxCount * 2 + practOneMaxCount * 2 + 2, cdrServiceMock.requestCount) + val listFiles = folder.listFiles() + Assertions.assertNotNull(listFiles) + listFiles!! + listFiles.let { Assertions.assertEquals(3, it.size) } + listFiles.filter { it.endsWith(directory1) }[0].list().let { + if (it != null) { + Assertions.assertEquals(counterOne, it.size) + } else { + Assertions.fail("No file list for folder $directory1 found") + } + } + listFiles.filter { it.endsWith(directory2) }[0].list().let { + if (it != null) { + Assertions.assertEquals(counterTwo, it.size) + } else { + Assertions.fail("No file list for folder $directory2 found") + } + } + listFiles.filter { it.endsWith(inflightFolder) }[0].list().let { + if (it != null) { + Assertions.assertEquals(0, it.size) + } else { + Assertions.fail("No file list for folder $inflightFolder found") + } + } + } + +} diff --git a/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/config/CdrClientConfigTest.kt b/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/config/CdrClientConfigTest.kt new file mode 100644 index 0000000..fe958ed --- /dev/null +++ b/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/config/CdrClientConfigTest.kt @@ -0,0 +1,243 @@ +package com.swisscom.health.des.cdr.clientvm.config + +import org.junit.jupiter.api.Assertions.assertFalse +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.assertDoesNotThrow +import org.junit.jupiter.api.assertThrows +import org.junit.jupiter.params.ParameterizedTest +import org.junit.jupiter.params.provider.MethodSource +import java.time.Duration + +class CdrClientConfigTest { + + private lateinit var cdrClientConfig: CdrClientConfig + + @Test + fun `test bluesky configuration`() { + cdrClientConfig = createCdrClientConfig( + listOf( + CdrClientConfig.Connector( + connectorId = "connectorId", + targetFolder = "targetFolder", + sourceFolder = "sourceFolder", + contentType = "contentType", + mode = CdrClientConfig.Mode.TEST + ), + CdrClientConfig.Connector( + connectorId = "connectorId", + targetFolder = "targetFolder1", + sourceFolder = "sourceFolder1", + contentType = "contentType", + mode = CdrClientConfig.Mode.PRODUCTION + ), + CdrClientConfig.Connector( + connectorId = "connectorId2", + targetFolder = "targetFolder", + sourceFolder = "sourceFolder2", + contentType = "contentType", + mode = CdrClientConfig.Mode.TEST + ), + CdrClientConfig.Connector( + connectorId = "connectorId3", + targetFolder = "targetFolder", + sourceFolder = "sourceFolder3", + contentType = "contentType", + mode = CdrClientConfig.Mode.PRODUCTION + ), + CdrClientConfig.Connector( + connectorId = "connectorId4", + targetFolder = "targetFolder4", + sourceFolder = "sourceFolder4", + contentType = "contentType", + mode = CdrClientConfig.Mode.TEST + ) + ) + ) + + assertDoesNotThrow { cdrClientConfig.checkAndReport() } + assertFalse(cdrClientConfig.toString().contains(functionKey)) + } + + @Test + fun `test fail because no customer is configured`() { + cdrClientConfig = createCdrClientConfig(emptyList()) + + assertThrows { cdrClientConfig.checkAndReport() } + } + + @ParameterizedTest + @MethodSource("provideSameFolderConnectors") + fun `test fail because same folder is used`(customers: List) { + cdrClientConfig = createCdrClientConfig(customers) + + assertThrows { cdrClientConfig.checkAndReport() } + } + + @ParameterizedTest + @MethodSource("provideSameModeConnectors") + fun `test fail because same mode is used multiple times for the same connector id`(customers: List) { + cdrClientConfig = createCdrClientConfig(customers) + + assertThrows { cdrClientConfig.checkAndReport() } + } + + + private fun createCdrClientConfig(customers: List): CdrClientConfig { + return CdrClientConfig( + functionKey = functionKey, + scheduleDelay = "scheduleDelay", + localFolder = "localFolder", + endpoint = CdrClientConfig.Endpoint( + scheme = "http", + host = "localhost", + port = 8080, + basePath = "/api" + ), + customer = customers, + pullThreadPoolSize = 1, + pushThreadPoolSize = 1, + retryDelay = arrayOf(Duration.ofSeconds(1)) + ) + } + + companion object { + const val functionKey = "functionKey123" + + @JvmStatic + @Suppress("LongMethod") + fun provideSameFolderConnectors() = listOf( + listOf( + CdrClientConfig.Connector( + connectorId = "connectorId", + targetFolder = "targetFolder", + sourceFolder = "sourceFolder", + contentType = "contentType", + mode = CdrClientConfig.Mode.TEST + ), + CdrClientConfig.Connector( + connectorId = "connectorId", + targetFolder = "targetFolder", + sourceFolder = "sourceFolder", + contentType = "contentType", + mode = CdrClientConfig.Mode.PRODUCTION + ) + ), + listOf( + CdrClientConfig.Connector( + connectorId = "connectorId2", + targetFolder = "targetFolder2", + sourceFolder = "targetFolder2", + contentType = "contentType", + mode = CdrClientConfig.Mode.TEST + ), + CdrClientConfig.Connector( + connectorId = "connectorId3", + targetFolder = "targetFolder3", + sourceFolder = "sourceFolder3", + contentType = "contentType", + mode = CdrClientConfig.Mode.PRODUCTION + ) + ), + listOf( + CdrClientConfig.Connector( + connectorId = "connectorId2", + targetFolder = "targetFolder", + sourceFolder = "sourceFolder", + contentType = "contentType", + mode = CdrClientConfig.Mode.TEST + ), + CdrClientConfig.Connector( + connectorId = "connectorId3", + targetFolder = "sourceFolder", + sourceFolder = "targetFolder2", + contentType = "contentType", + mode = CdrClientConfig.Mode.PRODUCTION + ) + ), + listOf( + CdrClientConfig.Connector( + connectorId = "connectorId2", + targetFolder = "targetFolder", + sourceFolder = "sourceFolder", + contentType = "contentType", + mode = CdrClientConfig.Mode.TEST + ), + CdrClientConfig.Connector( + connectorId = "connectorId3", + targetFolder = "sourceFolder2", + sourceFolder = "targetFolder", + contentType = "contentType", + mode = CdrClientConfig.Mode.PRODUCTION + ) + ) + ) + + @JvmStatic + @Suppress("LongMethod") + fun provideSameModeConnectors() = listOf( + listOf( + CdrClientConfig.Connector( + connectorId = "connectorId", + targetFolder = "targetFolder", + sourceFolder = "sourceFolder", + contentType = "contentType", + mode = CdrClientConfig.Mode.TEST + ), + CdrClientConfig.Connector( + connectorId = "connectorId", + targetFolder = "targetFolder2", + sourceFolder = "sourceFolder2", + contentType = "contentType", + mode = CdrClientConfig.Mode.TEST + ) + ), + listOf( + CdrClientConfig.Connector( + connectorId = "connectorId2", + targetFolder = "targetFolder2", + sourceFolder = "sourceFolder2", + contentType = "contentType", + mode = CdrClientConfig.Mode.PRODUCTION + ), + CdrClientConfig.Connector( + connectorId = "connectorId2", + targetFolder = "targetFolder", + sourceFolder = "sourceFolder", + contentType = "contentType", + mode = CdrClientConfig.Mode.PRODUCTION + ) + ), + listOf( + CdrClientConfig.Connector( + connectorId = "connectorId2", + targetFolder = "targetFolder2", + sourceFolder = "sourceFolder2", + contentType = "contentType", + mode = CdrClientConfig.Mode.PRODUCTION + ), + CdrClientConfig.Connector( + connectorId = "connectorId2", + targetFolder = "targetFolder", + sourceFolder = "sourceFolder", + contentType = "contentType", + mode = CdrClientConfig.Mode.PRODUCTION + ), + CdrClientConfig.Connector( + connectorId = "connectorId2", + targetFolder = "targetFolder3", + sourceFolder = "sourceFolder3", + contentType = "contentType", + mode = CdrClientConfig.Mode.TEST + ), + CdrClientConfig.Connector( + connectorId = "connectorId2", + targetFolder = "targetFolder4", + sourceFolder = "sourceFolder4", + contentType = "contentType", + mode = CdrClientConfig.Mode.PRODUCTION + ) + ) + ) + } + +} diff --git a/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/handler/FileHandlingBaseTest.kt b/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/handler/FileHandlingBaseTest.kt new file mode 100644 index 0000000..7e1cc4b --- /dev/null +++ b/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/handler/FileHandlingBaseTest.kt @@ -0,0 +1,27 @@ +package com.swisscom.health.des.cdr.clientvm.handler + +import io.github.oshai.kotlinlogging.KotlinLogging +import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.Test +import java.nio.file.Files +import kotlin.io.path.deleteIfExists + +class FileHandlingBaseTest { + + @Test + fun `test non writable folder`() { + val createTempDirectory = Files.createTempDirectory("nonWritableTest") + Assertions.assertTrue(pathIsDirectoryAndWritable(createTempDirectory, "test", KotlinLogging.logger {})) + createTempDirectory.toFile().setWritable(false) + Assertions.assertFalse(pathIsDirectoryAndWritable(createTempDirectory, "test", KotlinLogging.logger {})) + createTempDirectory.toFile().setWritable(true) + Assertions.assertTrue(createTempDirectory.deleteIfExists()) + } + + @Test + fun `test non directory`() { + val createTempFile = Files.createTempFile("nonDirectoryTest", "test") + Assertions.assertFalse(pathIsDirectoryAndWritable(createTempFile, "test", KotlinLogging.logger {})) + Assertions.assertTrue(createTempFile.deleteIfExists()) + } +} diff --git a/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/handler/PullFileHandlingTest.kt b/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/handler/PullFileHandlingTest.kt new file mode 100644 index 0000000..db2ec89 --- /dev/null +++ b/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/handler/PullFileHandlingTest.kt @@ -0,0 +1,316 @@ +package com.swisscom.health.des.cdr.clientvm.handler + +import com.swisscom.health.des.cdr.clientvm.config.CdrClientConfig +import io.micrometer.tracing.Span +import io.micrometer.tracing.TraceContext +import io.micrometer.tracing.Tracer +import io.mockk.every +import io.mockk.impl.annotations.MockK +import io.mockk.junit5.MockKExtension +import kotlinx.coroutines.runBlocking +import okhttp3.OkHttpClient +import okhttp3.mockwebserver.MockResponse +import okhttp3.mockwebserver.MockWebServer +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertNotNull +import org.junit.jupiter.api.Assertions.assertTrue +import org.junit.jupiter.api.Assertions.fail +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.extension.ExtendWith +import org.junit.jupiter.api.io.TempDir +import org.springframework.core.io.ClassPathResource +import org.springframework.http.HttpStatus +import java.io.File +import java.nio.charset.StandardCharsets +import java.util.UUID + +@ExtendWith(MockKExtension::class) +internal class PullFileHandlingTest { + @MockK + private lateinit var config: CdrClientConfig + + @MockK + private lateinit var tracer: Tracer + + @MockK + private lateinit var spanBuilder: Span.Builder + + @MockK + private lateinit var span: Span + + @MockK + private lateinit var spanInScope: Tracer.SpanInScope + + @MockK + private lateinit var traceContext: TraceContext + + @TempDir + private lateinit var folder: File + + private lateinit var cdrServiceMock: MockWebServer + + private lateinit var pullFileHandling: PullFileHandling + private val inflightFolder = "inflight" + private val targetDirectory = "customer" + private val sourceDirectory = "source" + private lateinit var endpoint: CdrClientConfig.Endpoint + + @BeforeEach + fun setup() { + folder.mkdirs() + cdrServiceMock = MockWebServer() + cdrServiceMock.start() + mockTracer() + + endpoint = CdrClientConfig.Endpoint( + host = cdrServiceMock.hostName, + basePath = "documents", + scheme = "http", + port = cdrServiceMock.port, + ) + + File("${folder.absolutePath}${File.separator}$targetDirectory").mkdirs() + File("${folder.absolutePath}${File.separator}$inflightFolder").mkdirs() + every { config.endpoint } returns endpoint + every { config.localFolder } returns "${folder.absolutePath}${File.separator}$inflightFolder" + every { config.functionKey } returns "1" + + pullFileHandling = PullFileHandling(config, OkHttpClient.Builder().build(), tracer) + } + + @AfterEach + fun tearDown() { + folder.delete() + cdrServiceMock.shutdown() + } + + @Test + fun `test sync of single file to folder`() { + enqueueFileResponseWithReportResponse() + enqueueEmptyResponse() + + runBlocking { + pullFileHandling.pullSyncConnector(createConnector("1-2-3-4")) + } + + assertEquals(3, cdrServiceMock.requestCount, "more requests where done than expected") + val listFiles = folder.listFiles() + assertNotNull(listFiles) + listFiles!! + assertEquals(2, listFiles.size) + + listFiles.filter { it.endsWith(targetDirectory) }[0].list().let { + if (it != null) { + assertEquals(1, it.size) + assertTrue(it[0].endsWith(".xml"), "File extension is not .xml") + } else { + fail("No file list for folder $targetDirectory found") + } + } + listFiles.filter { it.endsWith(inflightFolder) }[0].list().let { + if (it != null) { + assertEquals(0, it.size) + } else { + fail("A file was found in folder $inflightFolder, which shouldn't be there") + } + } + } + + @Test + fun `test sync of single file no header present`() { + enqueueFileResponseNoHeader() + + runBlocking { + pullFileHandling.pullSyncConnector(createConnector("1-2-3-4")) + } + + assertEquals(1, cdrServiceMock.requestCount, "more requests where done than expected") + val listFiles = folder.listFiles() + assertNotNull(listFiles) + listFiles!! + assertEquals(2, listFiles.size) + + listFiles.filter { it.endsWith(targetDirectory) }[0].list().let { + if (it != null) { + assertEquals(0, it.size) + } else { + fail("A file was found in folder $targetDirectory, which shouldn't be there") + } + } + listFiles.filter { it.endsWith(inflightFolder) }[0].list().let { + if (it != null) { + assertEquals(0, it.size) + } else { + fail("A file was found in folder $inflightFolder, which shouldn't be there") + } + } + } + + @Test + fun `test sync of single file to folder with failed report for success`() { + enqueueFileResponse() + enqueueExceptionResponse() + enqueueEmptyResponse() + + runBlocking { + pullFileHandling.pullSyncConnector(createConnector("1-2-3-4")) + } + + assertEquals(2, cdrServiceMock.requestCount, "more requests where done than expected") + val listFiles = folder.listFiles() + assertNotNull(listFiles) + listFiles!! + assertEquals(2, listFiles.size) + + listFiles.filter { it.endsWith(targetDirectory) }[0].list().let { + if (it != null) { + assertEquals(0, it.size) + } else { + fail("No file list for folder $targetDirectory found") + } + } + listFiles.filter { it.endsWith(inflightFolder) }[0].list().let { + if (it != null) { + assertEquals(1, it.size) + } else { + fail("No file list for folder $inflightFolder found") + } + } + } + + @Test + fun `test sync of multiple files to folder`() { + enqueueFileResponseWithReportResponse() + enqueueFileResponseWithReportResponse() + enqueueFileResponseWithReportResponse() + enqueueFileResponseWithReportResponse() + enqueueFileResponseWithReportResponse() + enqueueEmptyResponse() + + runBlocking { + pullFileHandling.pullSyncConnector(createConnector("1-2-3-4")) + } + + + assertEquals(11, cdrServiceMock.requestCount, "more requests where done than expected") + val listFiles = folder.listFiles() + assertNotNull(listFiles) + listFiles!! + assertEquals(2, listFiles.size) + + listFiles.filter { it.endsWith(targetDirectory) }[0].list().let { + if (it != null) { + assertEquals(5, it.size) + } else { + fail("No file list for folder $targetDirectory found") + } + } + listFiles.filter { it.endsWith(inflightFolder) }[0].list().let { + if (it != null) { + assertEquals(0, it.size) + } else { + fail("No file list for folder $inflightFolder found") + } + } + } + + @Test + fun `test sync of multiple files with an exception to folder`() { + enqueueFileResponseWithReportResponse() + enqueueFileResponseWithReportResponse() + enqueueFileResponseWithReportResponse() + enqueueExceptionResponse() + enqueueFileResponseWithReportResponse() + enqueueEmptyResponse() + + runBlocking { + pullFileHandling.pullSyncConnector(createConnector("1-2-3-4")) + } + + assertEquals(7, cdrServiceMock.requestCount, "more requests where done than expected") + val listFiles = folder.listFiles() + assertNotNull(listFiles) + listFiles!! + assertEquals(2, listFiles.size) + + listFiles.filter { it.endsWith(targetDirectory) }[0].list().let { + if (it != null) { + assertEquals(3, it.size) + } else { + fail("No file list for folder $targetDirectory found") + } + } + listFiles.filter { it.endsWith(inflightFolder) }[0].list().let { + if (it != null) { + assertEquals(0, it.size) + } else { + fail("No file list for folder $inflightFolder found") + } + } + } + + private fun createConnector( + connectorId: String, + targetFolder: String = "${folder.absolutePath}${File.separator}$targetDirectory", + sourceFolder: String = "${folder.absolutePath}${File.separator}$sourceDirectory" + ): CdrClientConfig.Connector = + CdrClientConfig.Connector( + connectorId = connectorId, + targetFolder = targetFolder, + sourceFolder = sourceFolder, + contentType = "application/forumdatenaustausch+xml;charset=UTF-8;version=4.5", + mode = CdrClientConfig.Mode.PRODUCTION + ) + + private fun enqueueFileResponseWithReportResponse() { + enqueueFileResponse() + enqueueReportResponse() + } + + private fun enqueueFileResponse() { + val pullRequestId = UUID.randomUUID().toString() + val mockResponse = MockResponse().setResponseCode(HttpStatus.OK.value()) + .setHeader(PULL_RESULT_ID_HEADER, pullRequestId) + .setBody(String(ClassPathResource("messages/dummy.txt").inputStream.readAllBytes(), StandardCharsets.UTF_8)) + cdrServiceMock.enqueue(mockResponse) + } + + private fun enqueueFileResponseNoHeader() { + val mockResponse = MockResponse().setResponseCode(HttpStatus.OK.value()) + .setBody(String(ClassPathResource("messages/dummy.txt").inputStream.readAllBytes(), StandardCharsets.UTF_8)) + cdrServiceMock.enqueue(mockResponse) + } + + private fun enqueueReportResponse() { + cdrServiceMock.enqueue(MockResponse().setResponseCode(HttpStatus.OK.value())) + } + + private fun enqueueEmptyResponse() { + cdrServiceMock.enqueue(MockResponse().setResponseCode(HttpStatus.NO_CONTENT.value())) + } + + private fun enqueueExceptionResponse() { + cdrServiceMock.enqueue(MockResponse().setResponseCode(HttpStatus.INTERNAL_SERVER_ERROR.value())) + } + + private fun mockTracer() { + every { tracer.spanBuilder() } returns spanBuilder + every { tracer.currentSpan() } returns null + every { spanBuilder.setNoParent() } returns spanBuilder + every { spanBuilder.name(any()) } returns spanBuilder + every { spanBuilder.start() } returns span + every { tracer.withSpan(any()) } returns spanInScope + every { span.name(any()) } returns span + every { span.start() } returns span + every { span.event(any()) } returns span + every { span.end() } returns Unit + every { span.tag(any(), any()) } returns span + every { span.context() } returns traceContext + every { spanInScope.close() } returns Unit + } + +} + + diff --git a/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/handler/PushFileHandlingTest.kt b/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/handler/PushFileHandlingTest.kt new file mode 100644 index 0000000..0e7af5d --- /dev/null +++ b/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/handler/PushFileHandlingTest.kt @@ -0,0 +1,203 @@ +package com.swisscom.health.des.cdr.clientvm.handler + +import com.swisscom.health.des.cdr.clientvm.config.CdrClientConfig +import io.micrometer.tracing.Span +import io.micrometer.tracing.TraceContext +import io.micrometer.tracing.Tracer +import io.mockk.every +import io.mockk.impl.annotations.MockK +import io.mockk.junit5.MockKExtension +import kotlinx.coroutines.runBlocking +import okhttp3.OkHttpClient +import okhttp3.mockwebserver.MockResponse +import okhttp3.mockwebserver.MockWebServer +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.fail +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.extension.ExtendWith +import org.junit.jupiter.api.io.TempDir +import org.springframework.http.HttpHeaders +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType +import java.io.File +import java.io.FileOutputStream +import java.time.Duration + +@ExtendWith(MockKExtension::class) +internal class PushFileHandlingTest { + @MockK + private lateinit var config: CdrClientConfig + + @MockK + private lateinit var tracer: Tracer + + @MockK + private lateinit var spanBuilder: Span.Builder + + @MockK + private lateinit var span: Span + + @MockK + private lateinit var spanInScope: Tracer.SpanInScope + + @MockK + private lateinit var traceContext: TraceContext + + @TempDir + private lateinit var folder: File + + private lateinit var cdrServiceMock: MockWebServer + + private lateinit var pushFileHandling: PushFileHandling + private val inflightFolder = "inflight" + private val targetDirectory = "customer" + private val sourceDirectory = "source" + private lateinit var endpoint: CdrClientConfig.Endpoint + + @BeforeEach + fun setup() { + folder.mkdirs() + cdrServiceMock = MockWebServer() + cdrServiceMock.start() + mockTracer() + + endpoint = CdrClientConfig.Endpoint( + host = cdrServiceMock.hostName, + basePath = "documents", + scheme = "http", + port = cdrServiceMock.port, + ) + + File("${folder.absolutePath}${File.separator}$sourceDirectory").mkdirs() + File("${folder.absolutePath}${File.separator}$inflightFolder").mkdirs() + every { config.endpoint } returns endpoint + every { config.localFolder } returns "${folder.absolutePath}${File.separator}$inflightFolder" + every { config.functionKey } returns "1" + val duration = Duration.ofMillis(100) + every { config.retryDelay } returns arrayOf(duration, duration, duration) + + pushFileHandling = PushFileHandling(config, OkHttpClient.Builder().build(), tracer) + } + + @AfterEach + fun tearDown() { + folder.delete() + cdrServiceMock.shutdown() + } + + @Test + fun `test successfully write two files to API`() { + FileOutputStream("${folder.absolutePath}${File.separator}$sourceDirectory/dummy.xml").use { it.write("Hello".toByteArray()) } + FileOutputStream("${folder.absolutePath}${File.separator}$sourceDirectory/dummy-2.xml").use { it.write("Hello 2".toByteArray()) } + + val mockResponse = MockResponse().setResponseCode(HttpStatus.OK.value()) + .setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) + .setResponseCode(HttpStatus.OK.value()) + .setBody("{\"message\": \"Upload successful\"}") + cdrServiceMock.enqueue(mockResponse) + cdrServiceMock.enqueue(mockResponse) + + runBlocking { + pushFileHandling.pushSyncConnector(createConnector("2345")) + } + + assertEquals(2, cdrServiceMock.requestCount) + assertFolder(0) + } + + @Test + fun `test ignore non xml files`() { + FileOutputStream("${folder.absolutePath}${File.separator}$sourceDirectory/dummy.txt").use { it.write("Hello".toByteArray()) } + FileOutputStream("${folder.absolutePath}${File.separator}$sourceDirectory/dummy-2.error").use { it.write("Hello 2".toByteArray()) } + FileOutputStream("${folder.absolutePath}${File.separator}$sourceDirectory/dummy-2.log").use { it.write("Hello 2".toByteArray()) } + + runBlocking { + pushFileHandling.pushSyncConnector(createConnector("2345")) + } + + assertEquals(0, cdrServiceMock.requestCount) + assertFolder(3) + } + + @Test + fun `test successfully write two files to API fail with third`() { + FileOutputStream("${folder.absolutePath}${File.separator}$sourceDirectory/dummy.xml").use { it.write("Hello".toByteArray()) } + FileOutputStream("${folder.absolutePath}${File.separator}$sourceDirectory/dummy-2.xml").use { it.write("Hello 2".toByteArray()) } + FileOutputStream("${folder.absolutePath}${File.separator}$sourceDirectory/dummy-3.xml").use { it.write("Hello 3".toByteArray()) } + + val mockResponse = MockResponse().setResponseCode(HttpStatus.OK.value()) + .setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) + .setBody("{\"message\": \"Upload successful\"}") + cdrServiceMock.enqueue(mockResponse) + cdrServiceMock.enqueue(mockResponse) + cdrServiceMock.enqueue(MockResponse().setResponseCode(HttpStatus.INTERNAL_SERVER_ERROR.value()).setBody("{\"message\": \"Exception\"}")) + cdrServiceMock.enqueue(MockResponse().setResponseCode(HttpStatus.INTERNAL_SERVER_ERROR.value()).setBody("{\"message\": \"Exception\"}")) + cdrServiceMock.enqueue(MockResponse().setResponseCode(HttpStatus.INTERNAL_SERVER_ERROR.value()).setBody("{\"message\": \"Exception\"}")) + cdrServiceMock.enqueue(MockResponse().setResponseCode(HttpStatus.BAD_REQUEST.value()).setBody("{\"message\": \"Exception\"}")) + + runBlocking { + pushFileHandling.pushSyncConnector(createConnector("2345")) + } + + assertEquals(6, cdrServiceMock.requestCount) + assertFolder(2) + } + + @Test + fun `test successfully write two files to API fail with third do not retry`() { + FileOutputStream("${folder.absolutePath}${File.separator}$sourceDirectory/dummy.xml").use { it.write("Hello".toByteArray()) } + FileOutputStream("${folder.absolutePath}${File.separator}$sourceDirectory/dummy-2.xml").use { it.write("Hello 2".toByteArray()) } + FileOutputStream("${folder.absolutePath}${File.separator}$sourceDirectory/dummy-3.xml").use { it.write("Hello 3".toByteArray()) } + + val mockResponse = MockResponse().setResponseCode(HttpStatus.OK.value()) + .setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) + .setBody("{\"message\": \"Upload successful\"}") + cdrServiceMock.enqueue(mockResponse) + cdrServiceMock.enqueue(mockResponse) + cdrServiceMock.enqueue(MockResponse().setResponseCode(HttpStatus.BAD_REQUEST.value()).setBody("{\"message\": \"Exception\"}")) + + runBlocking { + pushFileHandling.pushSyncConnector(createConnector("2345")) + } + + assertEquals(3, cdrServiceMock.requestCount) + assertFolder(2) + } + + private fun createConnector( + connectorId: String, + targetFolder: String = "${folder.absolutePath}${File.separator}$targetDirectory", + sourceFolder: String = "${folder.absolutePath}${File.separator}$sourceDirectory" + ): CdrClientConfig.Connector = + CdrClientConfig.Connector( + connectorId = connectorId, + targetFolder = targetFolder, + sourceFolder = sourceFolder, + contentType = "application/forumdatenaustausch+xml;charset=UTF-8;version=4.5", + mode = CdrClientConfig.Mode.TEST + ) + + private fun assertFolder(expectedSize: Int) { + val listFiles = folder.listFiles()!! + listFiles.filter { it.endsWith(sourceDirectory) }[0].list()?.let { assertEquals(expectedSize, it.size) } + ?: fail("No file list for folder $sourceDirectory found") + } + + private fun mockTracer() { + every { tracer.spanBuilder() } returns spanBuilder + every { tracer.currentSpan() } returns null + every { spanBuilder.setNoParent() } returns spanBuilder + every { spanBuilder.name(any()) } returns spanBuilder + every { spanBuilder.start() } returns span + every { tracer.withSpan(any()) } returns spanInScope + every { span.name(any()) } returns span + every { span.start() } returns span + every { span.event(any()) } returns span + every { span.end() } returns Unit + every { span.tag(any(), any()) } returns span + every { span.context() } returns traceContext + every { spanInScope.close() } returns Unit + } +} diff --git a/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/scheduling/SchedulerTest.kt b/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/scheduling/SchedulerTest.kt new file mode 100644 index 0000000..feda11a --- /dev/null +++ b/src/test/kotlin/com/swisscom/health/des/cdr/clientvm/scheduling/SchedulerTest.kt @@ -0,0 +1,146 @@ +package com.swisscom.health.des.cdr.clientvm.scheduling + +import com.swisscom.health.des.cdr.clientvm.config.CdrClientConfig +import com.swisscom.health.des.cdr.clientvm.handler.PullFileHandling +import com.swisscom.health.des.cdr.clientvm.handler.PushFileHandling +import io.micrometer.tracing.Span +import io.micrometer.tracing.TraceContext +import io.micrometer.tracing.Tracer +import io.mockk.coEvery +import io.mockk.coVerify +import io.mockk.every +import io.mockk.impl.annotations.MockK +import io.mockk.junit5.MockKExtension +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runTest +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.extension.ExtendWith +import org.junit.jupiter.api.io.TempDir +import java.io.File + +@ExtendWith(MockKExtension::class) +internal class SchedulerTest { + + @TempDir + private lateinit var folder: File + + @MockK + private lateinit var config: CdrClientConfig + + @MockK + private lateinit var tracer: Tracer + + @MockK + private lateinit var spanBuilder: Span.Builder + + @MockK + private lateinit var span: Span + + @MockK + private lateinit var spanInScope: Tracer.SpanInScope + + @MockK + private lateinit var traceContext: TraceContext + + @MockK + private lateinit var pullFileHandling: PullFileHandling + + @MockK + private lateinit var pushFileHandling: PushFileHandling + + private val inflightFolder = "inflight" + private val targetDirectory = "customer" + private val sourceDirectory = "source" + private lateinit var scheduler: Scheduler + + @BeforeEach + fun setup() { + folder.mkdirs() + File("${folder.absolutePath}${File.separator}$targetDirectory").mkdirs() + File("${folder.absolutePath}${File.separator}$inflightFolder").mkdirs() + File("${folder.absolutePath}${File.separator}$sourceDirectory").mkdirs() + val connector = + CdrClientConfig.Connector( + connectorId = "1234", + targetFolder = "${folder.absolutePath}${File.separator}$targetDirectory", + sourceFolder = "${folder.absolutePath}${File.separator}$sourceDirectory", + contentType = "application/forumdatenaustausch+xml;charset=UTF-8;version=4.5", + mode = CdrClientConfig.Mode.TEST + ) + every { config.customer } returns listOf(connector) + every { config.localFolder } returns "${folder.absolutePath}${File.separator}$inflightFolder" + mockTracer() + + scheduler = Scheduler( + config, + pullFileHandling, + pushFileHandling, + ) + } + + @AfterEach + fun tearDown() { + folder.delete() + } + + private fun mockTracer() { + every { tracer.spanBuilder() } returns spanBuilder + every { spanBuilder.setNoParent() } returns spanBuilder + every { spanBuilder.name(any()) } returns spanBuilder + every { spanBuilder.start() } returns span + every { tracer.withSpan(any()) } returns spanInScope + every { span.name(any()) } returns span + every { span.start() } returns span + every { span.event(any()) } returns span + every { span.end() } returns Unit + every { span.tag(any(), any()) } returns span + every { span.context() } returns traceContext + every { spanInScope.close() } returns Unit + every { traceContext.traceId() } returns "1" + } + + @OptIn(ExperimentalCoroutinesApi::class) + @Test + fun `test sync pull of single file to folder`() = runTest { + coEvery { pullFileHandling.pullSyncConnector(any()) } returns Unit + + scheduler.syncFilesToClientFolders() + + coVerify(exactly = 1) { pullFileHandling.pullSyncConnector(any()) } + } + + @OptIn(ExperimentalCoroutinesApi::class) + @Test + // Test for coverage only, as there is only a log output in the error case + fun `test sync push of single file to folder throws exception`() = runTest { + coEvery { pullFileHandling.pullSyncConnector(any()) } throws IllegalArgumentException("Exception") + + scheduler.syncFilesToClientFolders() + + coVerify(exactly = 1) { pullFileHandling.pullSyncConnector(any()) } + } + + @OptIn(ExperimentalCoroutinesApi::class) + @Test + fun `test sync push of single file to folder`() = runTest { + coEvery { pushFileHandling.pushSyncConnector(any()) } returns Unit + + scheduler.syncFilesToApi() + + coVerify(exactly = 1) { pushFileHandling.pushSyncConnector(any()) } + } + + @OptIn(ExperimentalCoroutinesApi::class) + @Test + // Test for coverage only, as there is only a log output in the error case + fun `test sync pull of single file to folder throws exception`() = runTest { + coEvery { pushFileHandling.pushSyncConnector(any()) } throws IllegalArgumentException("Exception") + + scheduler.syncFilesToApi() + + coVerify(exactly = 1) { pushFileHandling.pushSyncConnector(any()) } + } + +} diff --git a/src/test/resources/application-test.yaml b/src/test/resources/application-test.yaml new file mode 100644 index 0000000..df8409d --- /dev/null +++ b/src/test/resources/application-test.yaml @@ -0,0 +1,21 @@ +client: + functionKey: none + local-folder: local + schedule-delay: PT1M + max-retries: 3 + default-delay-ms: 100 + retry-delay-seconds: + - 1 + - 1 + - 1 + endpoint: + scheme: http + port: 80 + host: localhost + base-path: documents + customer: + - connector-id: 1 + content-type: application/forumdatenaustausch+xml;charset=UTF-8;version=4.5 + target-folder: dummy + source-folder: source + mode: test diff --git a/src/test/resources/messages/dummy.txt b/src/test/resources/messages/dummy.txt new file mode 100644 index 0000000..fa6abeb --- /dev/null +++ b/src/test/resources/messages/dummy.txt @@ -0,0 +1 @@ +Dummy response file From e19781c29863cb7935e0675ff539f73b862b6346 Mon Sep 17 00:00:00 2001 From: Lesrac Date: Mon, 17 Jun 2024 11:44:15 +0200 Subject: [PATCH 2/7] develop branch workflow --- .github/workflows/gradle.yml | 56 ++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .github/workflows/gradle.yml diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..73d16cf --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,56 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. +# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle + +name: Java CI with Gradle + +on: + push: + branches: [ "develop" ] + pull_request: + branches: [ "develop" ] + +jobs: + build: + + runs-on: ubuntu-latest + permissions: + contents: read + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies. + # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + + - name: Build with Gradle Wrapper + run: ./gradlew clean build + + dependency-submission: + + runs-on: ubuntu-latest + permissions: + contents: write + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + # Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies. + # See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md + - name: Generate and submit dependency graph + uses: gradle/actions/dependency-submission@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 From 29a425692f01aed7aa05781a12082f276daf3c60 Mon Sep 17 00:00:00 2001 From: Lesrac Date: Mon, 17 Jun 2024 15:33:39 +0200 Subject: [PATCH 3/7] Create codeql.yml --- .github/workflows/codeql.yml | 87 ++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000..eadeb24 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,87 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ "develop" ] + pull_request: + branches: [ "develop" ] + schedule: + - cron: '16 5 * * 3' + +jobs: + analyze: + name: Analyze (${{ matrix.language }}) + # Runner size impacts CodeQL analysis time. To learn more, please see: + # - https://gh.io/recommended-hardware-resources-for-running-codeql + # - https://gh.io/supported-runners-and-hardware-resources + # - https://gh.io/using-larger-runners (GitHub.com only) + # Consider using larger runners or machines with greater resources for possible analysis time improvements. + runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} + permissions: + # required for all workflows + security-events: write + + # required to fetch internal or private CodeQL packs + packages: read + + # only required for workflows in private repositories + actions: read + contents: read + + strategy: + fail-fast: false + matrix: + include: + - language: java-kotlin + build-mode: manual + # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' + # Use `c-cpp` to analyze code written in C, C++ or both + # Use 'java-kotlin' to analyze code written in Java, Kotlin or both + # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both + # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, + # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. + # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how + # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + # If the analyze step fails for one of the languages you are analyzing with + # "We were unable to automatically build your code", modify the matrix above + # to set the build mode to "manual" for that language. Then modify this step + # to build your code. + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + - if: matrix.build-mode == 'manual' + shell: bash + run: ./gradlew clean build + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" From d5bda98286c09add9bd3e1101a1cbd340ad39cf5 Mon Sep 17 00:00:00 2001 From: Daniel Frick - taafrda7 Date: Mon, 17 Jun 2024 15:37:51 +0200 Subject: [PATCH 4/7] codeql add JDK and setup gradle --- .github/workflows/codeql.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index eadeb24..f8ac316 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -57,6 +57,16 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies. + # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL From fe16f8f6419a786fd5394dd18e69e08a20cac046 Mon Sep 17 00:00:00 2001 From: Ralf Steppacher Date: Mon, 17 Jun 2024 16:57:37 +0200 Subject: [PATCH 5/7] #28781 use actual problem json in wiremock responses --- build.gradle.kts | 8 ++++++++ docker-compose/wiremock/mappings/get_files_2345.json | 5 +++-- docker-compose/wiremock/mappings/get_files_666.json | 5 +++-- docker-compose/wiremock/mappings/push_files_1.json | 2 +- docker-compose/wiremock/mappings/push_files_5.json | 2 +- docker-compose/wiremock/mappings/push_files_666.json | 2 +- gradle.properties | 10 +++++----- 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7183e09..e384aea 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -28,6 +28,14 @@ plugins { // KAPT is end of life, but KSP is not supported yet: https://github.com/spring-projects/spring-boot/issues/28046 kotlin("kapt") `maven-publish` + idea +} + +idea { + module { + isDownloadJavadoc = true + isDownloadSources = true + } } application { diff --git a/docker-compose/wiremock/mappings/get_files_2345.json b/docker-compose/wiremock/mappings/get_files_2345.json index daf0c61..f2f9ad8 100644 --- a/docker-compose/wiremock/mappings/get_files_2345.json +++ b/docker-compose/wiremock/mappings/get_files_2345.json @@ -43,8 +43,9 @@ "response": { "status": 500, "headers": { - "Content-Type": "*/*" - } + "Content-Type": "application/problem+json; charset=utf-8" + }, + "body": "{\"type\":\"about:blank\",\"title\":\"Internal Server Error\",\"status\":500,\"detail\":\"This will alternate with OK responses\"}" } } ] diff --git a/docker-compose/wiremock/mappings/get_files_666.json b/docker-compose/wiremock/mappings/get_files_666.json index aa16b77..322b06e 100644 --- a/docker-compose/wiremock/mappings/get_files_666.json +++ b/docker-compose/wiremock/mappings/get_files_666.json @@ -22,8 +22,9 @@ "response": { "status": 500, "headers": { - "Content-Type": "*/*" - } + "Content-Type": "application/problem+json; charset=utf-8" + }, + "body": "{\"type\":\"about:blank\",\"title\":\"Internal Server Error\",\"status\":500,\"detail\":\"This will be repeated endlessly\"}" } } ] diff --git a/docker-compose/wiremock/mappings/push_files_1.json b/docker-compose/wiremock/mappings/push_files_1.json index 22b5d1e..9a6577e 100644 --- a/docker-compose/wiremock/mappings/push_files_1.json +++ b/docker-compose/wiremock/mappings/push_files_1.json @@ -20,7 +20,7 @@ "headers": { "Content-Type": "application/problem+json; charset=utf-8" }, - "body": "{\"message\": \"Invalid input.\"}" + "body": "{\"type\":\"about:blank\",\"title\":\"Bad Request\",\"status\":400,\"detail\":\"Invalid input.\"}" } }, { diff --git a/docker-compose/wiremock/mappings/push_files_5.json b/docker-compose/wiremock/mappings/push_files_5.json index 57f3934..54b8dd0 100644 --- a/docker-compose/wiremock/mappings/push_files_5.json +++ b/docker-compose/wiremock/mappings/push_files_5.json @@ -15,7 +15,7 @@ "headers": { "Content-Type": "application/problem+json; charset=utf-8" }, - "body": "{\"message\": \"This will be repeated endlessly.\"}" + "body": "{\"type\":\"about:blank\",\"title\":\"Internal Server Error\",\"status\":500,\"detail\":\"This will be repeated endlessly\"}" } } ] diff --git a/docker-compose/wiremock/mappings/push_files_666.json b/docker-compose/wiremock/mappings/push_files_666.json index 0bfa30c..ccd53be 100644 --- a/docker-compose/wiremock/mappings/push_files_666.json +++ b/docker-compose/wiremock/mappings/push_files_666.json @@ -15,7 +15,7 @@ "headers": { "Content-Type": "application/problem+json; charset=utf-8" }, - "body": "{\"message\": \"The user is not authorized.\"}" + "body": "{\"type\":\"about:blank\",\"title\":\"Forbidden\",\"status\":403,\"detail\":\"The user is not authorized.\"}" } } ] diff --git a/gradle.properties b/gradle.properties index 4ff6fea..adab95a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,8 +12,8 @@ kotlinxSerializationVersion=1.6.3 # Plugins ############ detektVersion=1.23.6 -springBootVersion=3.2.4 -springDependencyManagementVersion=1.1.4 +springBootVersion=3.3.0 +springDependencyManagementVersion=1.1.5 ############ # Dependencies ############ @@ -21,6 +21,6 @@ detektKotlinVersion=1.9.23 jacocoVersion=0.8.12 kotlinLoggingVersion=6.0.9 logstashEncoderVersion=7.4 -micrometerTracingVersion=1.3.0 -mockkVersion=1.13.10 -springCloudVersion=2023.0.1 +micrometerTracingVersion=1.3.1 +mockkVersion=1.13.11 +springCloudVersion=2023.0.2 From 30fac330a1564080132a9e08325f2c80c9f5b21f Mon Sep 17 00:00:00 2001 From: Daniel Frick - taafrda7 Date: Wed, 26 Jun 2024 13:50:12 +0200 Subject: [PATCH 6/7] publish release and develop changes. Updates logback configuration --- .github/CODEOWNERS | 2 + .github/workflows/publish.yml | 35 +++++++ README.md | 14 +++ build.gradle.kts | 30 +++++- src/main/resources/logback-spring.xml | 129 ++++++++++++-------------- 5 files changed, 137 insertions(+), 73 deletions(-) create mode 100644 .github/CODEOWNERS create mode 100644 .github/workflows/publish.yml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..f5b4c9c --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,2 @@ +# Only the specified owner can approve changes to workflow files +/.github/workflows/ @swisscom/swisscom-health diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..84d5c05 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,35 @@ +name: Publish release + +on: + push: + branches: + - develop + release: + types: [created] + +jobs: + publish-release: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - name: Checkout latest code + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 17 + + # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies. + # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + + - name: Build and publish with Gradle Wrapper + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: ./gradlew clean build publishVersion diff --git a/README.md b/README.md index 0f4643a..f3907bb 100644 --- a/README.md +++ b/README.md @@ -57,3 +57,17 @@ client: source-folder: /tmp/source/8000000000000 mode: test ``` + +## Running the Jar +If the provided jar should be run directly, the following command can be used: +```java -jar cdr-client.jar``` +The jar can be found in build/libs. + +Following environment variables need to be present (and correctly configured) so that the application can start successfully: +``` +SPRING_CONFIG_ADDITIONAL_LOCATION={{ cdr_client_dir }}/config/application-customer.yaml" +LOGGING_FILE_NAME={{ cdr_client_dir }}/logs/cdr-client.log" +``` +The LOGGING_FILE_NAME is just so that the log file is not auto created where the jar is run from. + +See [Application Plugin](#application-plugin) regarding the content of the application-customer.yaml diff --git a/build.gradle.kts b/build.gradle.kts index e384aea..19f9ed0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,9 @@ import io.gitlab.arturbosch.detekt.Detekt import org.springframework.boot.gradle.tasks.bundling.BootJar +import java.net.URI group = "com.swisscom.health.des.cdr" -version = "2.1.2-SNAPSHOT" +version = "3.0.0-SNAPSHOT" java.sourceCompatibility = JavaVersion.VERSION_17 val jvmVersion: String by project @@ -184,3 +185,30 @@ project.afterEvaluate { } } } + +tasks.register("publishVersion") { + group = "publishing" + description = "Publishes boot jar" + dependsOn(tasks.withType().matching { + it.repository == publishing.repositories["GitHubPackages"] && it.publication == publishing.publications["bootJava"] + }) +} + + +publishing { + publications { + create("bootJava") { + artifact(tasks.named("bootJar")) + } + } + repositories { + maven { + name = "GitHubPackages" + url = URI("https://maven.pkg.github.com/swisscom/cdr-client") + credentials { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } + } + } +} diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 5ab0818..79abafd 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -1,81 +1,66 @@ - + - - + + - - - - %highlight(%d{"yyyy-MM-dd'T'HH:mm:ss.SSSXXX", UTC}) | %highlight(${LOG_LEVEL_PATTERN:-%5p}) | %highlight(%magenta(${PID:- })) | %highlight(%yellow(%X{traceId:-None})) | %highlight([%15.15t]) | %highlight(%cyan(%-40.40logger{39})) | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%ex} - - - - - - - + + ${LOGGING_FILE_NAME:-./cdr-client.log} + true - - - ${LOGGING_FILE_NAME:-./cdr-client.log} - true + + ${LOGGING_FILE_NAME:-./cdr-client.log}.%d{yyyy-MM-dd}.%i.log + ${LOGGING_LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-100MB} + ${LOGGING_LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-2} + - - ${LOGGING_FILE_NAME:-./cdr-client.log}.%d{yyyy-MM-dd}.%i.log - ${LOGGING_LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-100MB} - ${LOGGING_LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-2} - - - - %d{"yyyy-MM-dd'T'HH:mm:ss.SSSXXX", UTC} | ${%level:-%5p} | ${PID:- } | %X{traceId:-None} | [%15.15t] | %-40.40logger{39} | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%ex} - - - - - - - - timestamp - UTC - - - logger - - - level - - - thread - - - mdc - - - - - - stackTrace - - - 200 - 14000 - true - - - - - exceptionClass - - - - - - - - - + + %d{"yyyy-MM-dd'T'HH:mm:ss.SSSXXX", UTC} | ${%level:-%5p} | ${PID:- } | %X{traceId:-None} | [%15.15t] | %-40.40logger{39} | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%ex} + + + + + + + timestamp + UTC + + + logger + + + level + + + thread + + + mdc + + + + + + stackTrace + + + 200 + 14000 + true + + + + + exceptionClass + + + + + + + + From 119a3a170be89891c6fcd20528d57acd7c864ade Mon Sep 17 00:00:00 2001 From: Daniel Frick - taafrda7 Date: Mon, 1 Jul 2024 08:49:43 +0200 Subject: [PATCH 7/7] set release version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 19f9ed0..2fb8c52 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar import java.net.URI group = "com.swisscom.health.des.cdr" -version = "3.0.0-SNAPSHOT" +version = "3.0.0" java.sourceCompatibility = JavaVersion.VERSION_17 val jvmVersion: String by project