From 50b2cc4f63479b16a525a92320196a3cf8df013f Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Sun, 30 Jul 2023 14:47:07 +0200 Subject: [PATCH] Moved plenty files over to Kotlin --- .run/MainApplication.run.xml | 10 +- .../main/kotlin/twomartens.kotlin.gradle.kts | 7 + gradle/libs.versions.toml | 8 +- module-server/server.gradle.kts | 7 + .../configuration/ClockConfiguration.java | 20 - .../InterceptorConfiguration.java | 22 - .../RestTemplateConfiguration.java | 34 -- .../controller/ExceptionController.java | 37 -- .../controller/VersionHtmlController.java | 89 --- .../exception/HttpStatusException.java | 20 - .../BufferingClientHttpResponseWrapper.java | 82 --- .../interceptor/HeaderInterceptor.java | 87 --- .../interceptor/HeaderInterceptorRest.java | 68 --- .../interceptor/LoggingInterceptorRest.java | 419 -------------- .../wahlrecht/mapper/v1/CandidateMapper.java | 26 - .../mapper/v1/ConstituencyMapper.java | 26 - .../mapper/v1/ElectedCandidateMapper.java | 17 - .../mapper/v1/ElectedCandidatesMapper.java | 28 - .../wahlrecht/mapper/v1/ElectedMapper.java | 17 - .../mapper/v1/ElectedResultMapper.java | 42 -- .../wahlrecht/mapper/v1/ElectionMapper.java | 26 - .../mapper/v1/ElectionResultMapper.java | 52 -- .../mapper/v1/NominationIdMapper.java | 14 - .../wahlrecht/mapper/v1/NominationMapper.java | 51 -- .../mapper/v1/PartyInElectionMapper.java | 21 - .../wahlrecht/mapper/v1/SeatResultMapper.java | 17 - .../mapper/v1/VotingResultMapper.java | 36 -- .../mapper/v1/VotingThresholdMapper.java | 17 - .../wahlrecht/model/db/Nomination.java | 48 -- .../wahlrecht/model/dto/ErrorMessage.java | 24 - .../wahlrecht/model/dto/v1/Candidate.java | 5 - .../wahlrecht/model/dto/v1/Constituency.java | 9 - .../wahlrecht/model/dto/v1/Elected.java | 8 - .../model/dto/v1/ElectedCandidate.java | 4 - .../model/dto/v1/ElectedCandidates.java | 10 - .../wahlrecht/model/dto/v1/ElectedResult.java | 12 - .../wahlrecht/model/dto/v1/Election.java | 10 - .../model/dto/v1/ElectionResult.java | 9 - .../wahlrecht/model/dto/v1/Nomination.java | 22 - .../wahlrecht/model/dto/v1/NominationId.java | 5 - .../model/dto/v1/PartyInElection.java | 28 - .../wahlrecht/model/dto/v1/SeatResult.java | 11 - .../wahlrecht/model/dto/v1/VotingResult.java | 9 - .../model/dto/v1/VotingThreshold.java | 15 - .../model/internal/ElectedCandidates.java | 12 - .../model/internal/ElectedResult.java | 19 - .../wahlrecht/model/internal/Election.java | 10 - .../wahlrecht/model/internal/Nomination.java | 55 -- .../model/internal/NominationId.java | 5 - .../wahlrecht/model/internal/SeatResult.java | 17 - .../model/internal/VotingResult.java | 36 -- .../model/internal/VotingThreshold.java | 15 - .../actuator/RestHealthIndicator.java | 7 +- .../RestTemplateTimeoutProperties.java | 34 -- .../wahlrecht/property/ServiceProperties.java | 21 - .../property/StatusProbeProperties.java | 28 - .../repository/NominationRepository.java | 5 +- .../wahlrecht/service/CalculationService.java | 323 ----------- .../wahlrecht/service/NominationService.java | 74 --- .../configuration/ClockConfiguration.kt | 15 + .../configuration/InterceptorConfiguration.kt | 20 + .../configuration/PropertyConfiguration.kt | 12 + .../RestTemplateConfiguration.kt | 37 ++ .../controller/ExceptionController.kt | 36 ++ .../controller/VersionHtmlController.kt | 79 +++ .../exception/HttpStatusException.kt | 6 + .../BufferingClientHttpResponseWrapper.kt | 45 ++ .../interceptor/HeaderInterceptor.kt | 85 +++ .../interceptor/HeaderInterceptorRest.kt | 89 +++ .../interceptor/LoggingInterceptorRest.kt | 431 +++++++++++++++ .../wahlrecht/mapper/v1/CandidateMapper.kt | 24 + .../wahlrecht/mapper/v1/ConstituencyMapper.kt | 22 + .../mapper/v1/ElectedCandidateMapper.kt | 18 + .../mapper/v1/ElectedCandidatesMapper.kt | 29 + .../wahlrecht/mapper/v1/ElectedMapper.kt | 18 + .../mapper/v1/ElectedResultMapper.kt | 36 ++ .../wahlrecht/mapper/v1/ElectionMapper.kt | 24 + .../mapper/v1/ElectionResultMapper.kt | 48 ++ .../wahlrecht/mapper/v1/NominationIdMapper.kt | 16 + .../wahlrecht/mapper/v1/NominationMapper.kt | 52 ++ .../mapper/v1/PartyInElectionMapper.kt | 18 + .../wahlrecht/mapper/v1/SeatResultMapper.kt | 18 + .../wahlrecht/mapper/v1/VotingResultMapper.kt | 40 ++ .../mapper/v1/VotingThresholdMapper.kt | 18 + .../wahlrecht/model/db/Nomination.kt | 33 ++ .../wahlrecht/model/dto/ErrorMessage.kt | 3 + .../wahlrecht/model/dto/v1/Candidate.kt | 3 + .../wahlrecht/model/dto/v1/Constituency.kt | 7 + .../wahlrecht/model/dto/v1/Elected.kt | 8 + .../model/dto/v1/ElectedCandidate.kt | 3 + .../model/dto/v1/ElectedCandidates.kt | 5 + .../wahlrecht/model/dto/v1/ElectedResult.kt | 4 + .../wahlrecht/model/dto/v1/Election.kt | 6 + .../wahlrecht/model/dto/v1/ElectionResult.kt | 4 + .../wahlrecht/model/dto/v1/Nomination.kt | 7 + .../wahlrecht/model/dto/v1/NominationId.kt | 3 + .../wahlrecht/model/dto/v1/PartyInElection.kt | 5 + .../wahlrecht/model/dto/v1/SeatResult.kt | 4 + .../wahlrecht/model/dto/v1/VotingResult.kt | 6 + .../wahlrecht/model/dto/v1/VotingThreshold.kt | 7 + .../model/internal/ElectedCandidates.kt | 5 + .../wahlrecht/model/internal/ElectedResult.kt | 10 + .../wahlrecht/model/internal/Election.kt | 7 + .../wahlrecht/model/internal/Nomination.kt | 41 ++ .../wahlrecht/model/internal/NominationId.kt | 3 + .../wahlrecht/model/internal/SeatResult.kt | 8 + .../wahlrecht/model/internal/VotingResult.kt | 11 + .../model/internal/VotingThreshold.kt | 7 + .../property/RestTemplateTimeoutProperties.kt | 15 + .../wahlrecht/property/ServiceProperties.kt | 12 + .../property/StatusProbeProperties.kt | 19 + .../security/SpringPolicyEnforcer.kt | 6 +- .../security/SpringPolicyEnforcerFilter.kt | 7 +- .../wahlrecht/service/CalculationService.kt | 321 +++++++++++ .../wahlrecht/service/NominationService.kt | 69 +++ .../service/CalculationServiceTest.java | 418 -------------- .../service/CalculationServiceTest.kt | 512 ++++++++++++++++++ 117 files changed, 2423 insertions(+), 2582 deletions(-) delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/configuration/ClockConfiguration.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/configuration/InterceptorConfiguration.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/configuration/RestTemplateConfiguration.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/controller/ExceptionController.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/controller/VersionHtmlController.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/exception/HttpStatusException.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/interceptor/BufferingClientHttpResponseWrapper.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/interceptor/HeaderInterceptor.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/interceptor/HeaderInterceptorRest.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/interceptor/LoggingInterceptorRest.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/mapper/v1/CandidateMapper.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/mapper/v1/ConstituencyMapper.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/mapper/v1/ElectedCandidateMapper.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/mapper/v1/ElectedCandidatesMapper.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/mapper/v1/ElectedMapper.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/mapper/v1/ElectedResultMapper.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/mapper/v1/ElectionMapper.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/mapper/v1/ElectionResultMapper.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/mapper/v1/NominationIdMapper.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/mapper/v1/NominationMapper.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/mapper/v1/PartyInElectionMapper.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/mapper/v1/SeatResultMapper.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/mapper/v1/VotingResultMapper.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/mapper/v1/VotingThresholdMapper.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/db/Nomination.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/dto/ErrorMessage.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/dto/v1/Candidate.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/dto/v1/Constituency.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/dto/v1/Elected.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/dto/v1/ElectedCandidate.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/dto/v1/ElectedCandidates.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/dto/v1/ElectedResult.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/dto/v1/Election.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/dto/v1/ElectionResult.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/dto/v1/Nomination.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/dto/v1/NominationId.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/dto/v1/PartyInElection.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/dto/v1/SeatResult.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/dto/v1/VotingResult.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/dto/v1/VotingThreshold.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/internal/ElectedCandidates.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/internal/ElectedResult.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/internal/Election.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/internal/Nomination.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/internal/NominationId.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/internal/SeatResult.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/internal/VotingResult.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/model/internal/VotingThreshold.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/property/RestTemplateTimeoutProperties.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/property/ServiceProperties.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/property/StatusProbeProperties.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/service/CalculationService.java delete mode 100644 module-server/src/main/java/de/twomartens/wahlrecht/service/NominationService.java create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/configuration/ClockConfiguration.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/configuration/InterceptorConfiguration.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/configuration/PropertyConfiguration.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/configuration/RestTemplateConfiguration.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/controller/ExceptionController.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/controller/VersionHtmlController.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/exception/HttpStatusException.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/interceptor/BufferingClientHttpResponseWrapper.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/interceptor/HeaderInterceptor.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/interceptor/HeaderInterceptorRest.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/interceptor/LoggingInterceptorRest.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/mapper/v1/CandidateMapper.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/mapper/v1/ConstituencyMapper.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/mapper/v1/ElectedCandidateMapper.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/mapper/v1/ElectedCandidatesMapper.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/mapper/v1/ElectedMapper.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/mapper/v1/ElectedResultMapper.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/mapper/v1/ElectionMapper.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/mapper/v1/ElectionResultMapper.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/mapper/v1/NominationIdMapper.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/mapper/v1/NominationMapper.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/mapper/v1/PartyInElectionMapper.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/mapper/v1/SeatResultMapper.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/mapper/v1/VotingResultMapper.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/mapper/v1/VotingThresholdMapper.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/db/Nomination.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/ErrorMessage.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/Candidate.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/Constituency.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/Elected.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/ElectedCandidate.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/ElectedCandidates.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/ElectedResult.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/Election.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/ElectionResult.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/Nomination.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/NominationId.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/PartyInElection.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/SeatResult.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/VotingResult.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/dto/v1/VotingThreshold.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/internal/ElectedCandidates.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/internal/ElectedResult.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/internal/Election.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/internal/Nomination.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/internal/NominationId.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/internal/SeatResult.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/internal/VotingResult.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/model/internal/VotingThreshold.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/property/RestTemplateTimeoutProperties.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/property/ServiceProperties.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/property/StatusProbeProperties.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/service/CalculationService.kt create mode 100644 module-server/src/main/kotlin/de/twomartens/wahlrecht/service/NominationService.kt delete mode 100644 module-server/src/test/java/de/twomartens/wahlrecht/service/CalculationServiceTest.java create mode 100644 module-server/src/test/kotlin/de/twomartens/wahlrecht/service/CalculationServiceTest.kt diff --git a/.run/MainApplication.run.xml b/.run/MainApplication.run.xml index 90799fe..c3644b8 100644 --- a/.run/MainApplication.run.xml +++ b/.run/MainApplication.run.xml @@ -1,13 +1,7 @@ - -