diff --git a/pom.xml b/pom.xml index d67fd52b..cd6d9db4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ eu.interop.federationgateway efgs-federation-gateway - 1.0.11 + 1.0.12 ${packaging.format} efgs-federation-gateway @@ -25,15 +25,15 @@ UTF-8 UTF-8 - 6.5.0 - 2.5.7 - 2020.0.3 + 6.5.2 + 2.6.2 + 2021.0.0 5.3.9 - 5.5.2 - 1.18.20 + 5.5.4 + 1.18.22 4.4.3 1.5.10 - 3.17.3 + 3.19.2 1.4 5.7.2 1.4.2.Final @@ -41,8 +41,7 @@ 1.69 1.0.1.RELEASE 5.0.0-alpha.2 - 4.27.0 - 2.17.0 + 4.30.0 3.1.2 3.9.0.2155 @@ -296,17 +295,6 @@ shedlock-spring ${shedlock.version} - - org.apache.logging.log4j - log4j-api - ${log4j.version} - - - org.apache.logging.log4j - log4j-to-slf4j - ${log4j.version} - - diff --git a/src/main/java/eu/interop/federationgateway/FederationGatewayApplication.java b/src/main/java/eu/interop/federationgateway/FederationGatewayApplication.java index 4725159b..adfcb63c 100644 --- a/src/main/java/eu/interop/federationgateway/FederationGatewayApplication.java +++ b/src/main/java/eu/interop/federationgateway/FederationGatewayApplication.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/batchsigning/BatchSignatureUtils.java b/src/main/java/eu/interop/federationgateway/batchsigning/BatchSignatureUtils.java index 3a938ed6..df82002b 100644 --- a/src/main/java/eu/interop/federationgateway/batchsigning/BatchSignatureUtils.java +++ b/src/main/java/eu/interop/federationgateway/batchsigning/BatchSignatureUtils.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/batchsigning/BatchSignatureVerifier.java b/src/main/java/eu/interop/federationgateway/batchsigning/BatchSignatureVerifier.java index f5eea254..66c99d42 100644 --- a/src/main/java/eu/interop/federationgateway/batchsigning/BatchSignatureVerifier.java +++ b/src/main/java/eu/interop/federationgateway/batchsigning/BatchSignatureVerifier.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/config/EfgsKeyStore.java b/src/main/java/eu/interop/federationgateway/config/EfgsKeyStore.java index 6c438f40..6295e42a 100644 --- a/src/main/java/eu/interop/federationgateway/config/EfgsKeyStore.java +++ b/src/main/java/eu/interop/federationgateway/config/EfgsKeyStore.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/config/EfgsProperties.java b/src/main/java/eu/interop/federationgateway/config/EfgsProperties.java index 3f11c584..0d64de26 100644 --- a/src/main/java/eu/interop/federationgateway/config/EfgsProperties.java +++ b/src/main/java/eu/interop/federationgateway/config/EfgsProperties.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/config/EfgsPropertiesValidator.java b/src/main/java/eu/interop/federationgateway/config/EfgsPropertiesValidator.java index 7f1d7d99..724b4507 100644 --- a/src/main/java/eu/interop/federationgateway/config/EfgsPropertiesValidator.java +++ b/src/main/java/eu/interop/federationgateway/config/EfgsPropertiesValidator.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/config/ErrorHandler.java b/src/main/java/eu/interop/federationgateway/config/ErrorHandler.java index 6baaa34f..dabb4dd8 100644 --- a/src/main/java/eu/interop/federationgateway/config/ErrorHandler.java +++ b/src/main/java/eu/interop/federationgateway/config/ErrorHandler.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/config/MdcCleanupInterceptor.java b/src/main/java/eu/interop/federationgateway/config/MdcCleanupInterceptor.java index 1ee7d9c2..97197f0d 100644 --- a/src/main/java/eu/interop/federationgateway/config/MdcCleanupInterceptor.java +++ b/src/main/java/eu/interop/federationgateway/config/MdcCleanupInterceptor.java @@ -1,8 +1,8 @@ /*- * ---license-start - * EU Digital Green Certificate Gateway Service / dgc-gateway + * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/config/OpenApiConfig.java b/src/main/java/eu/interop/federationgateway/config/OpenApiConfig.java index 030bec64..dd6931c5 100644 --- a/src/main/java/eu/interop/federationgateway/config/OpenApiConfig.java +++ b/src/main/java/eu/interop/federationgateway/config/OpenApiConfig.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/config/ProtobufConverter.java b/src/main/java/eu/interop/federationgateway/config/ProtobufConverter.java index f9ebd67a..f1c7c8d0 100644 --- a/src/main/java/eu/interop/federationgateway/config/ProtobufConverter.java +++ b/src/main/java/eu/interop/federationgateway/config/ProtobufConverter.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,6 @@ import java.io.IOException; import java.util.Base64; import org.springframework.http.HttpStatus; -import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.server.ResponseStatusException; public class ProtobufConverter extends JsonFormat { diff --git a/src/main/java/eu/interop/federationgateway/config/ProtobufHttpMessageConverter.java b/src/main/java/eu/interop/federationgateway/config/ProtobufHttpMessageConverter.java index 268377b9..60e6cd86 100644 --- a/src/main/java/eu/interop/federationgateway/config/ProtobufHttpMessageConverter.java +++ b/src/main/java/eu/interop/federationgateway/config/ProtobufHttpMessageConverter.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/config/SchedulerConfig.java b/src/main/java/eu/interop/federationgateway/config/SchedulerConfig.java index 4cb114f9..a2941b85 100644 --- a/src/main/java/eu/interop/federationgateway/config/SchedulerConfig.java +++ b/src/main/java/eu/interop/federationgateway/config/SchedulerConfig.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/config/ShedLockConfig.java b/src/main/java/eu/interop/federationgateway/config/ShedLockConfig.java index 4a62e4f4..b24fb7fe 100644 --- a/src/main/java/eu/interop/federationgateway/config/ShedLockConfig.java +++ b/src/main/java/eu/interop/federationgateway/config/ShedLockConfig.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/config/WebClientConfig.java b/src/main/java/eu/interop/federationgateway/config/WebClientConfig.java index d7b6faf7..9792410e 100644 --- a/src/main/java/eu/interop/federationgateway/config/WebClientConfig.java +++ b/src/main/java/eu/interop/federationgateway/config/WebClientConfig.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/config/WebMvcConfig.java b/src/main/java/eu/interop/federationgateway/config/WebMvcConfig.java index bdc27dd1..2c2f996f 100644 --- a/src/main/java/eu/interop/federationgateway/config/WebMvcConfig.java +++ b/src/main/java/eu/interop/federationgateway/config/WebMvcConfig.java @@ -1,8 +1,8 @@ /*- * ---license-start - * EU Digital Green Certificate Gateway Service / dgc-gateway + * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/controller/AuditController.java b/src/main/java/eu/interop/federationgateway/controller/AuditController.java index f6848007..9092f124 100644 --- a/src/main/java/eu/interop/federationgateway/controller/AuditController.java +++ b/src/main/java/eu/interop/federationgateway/controller/AuditController.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/controller/CallbackAdminController.java b/src/main/java/eu/interop/federationgateway/controller/CallbackAdminController.java index 5f40ccf4..35461237 100644 --- a/src/main/java/eu/interop/federationgateway/controller/CallbackAdminController.java +++ b/src/main/java/eu/interop/federationgateway/controller/CallbackAdminController.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/controller/DiagnosisKeyController.java b/src/main/java/eu/interop/federationgateway/controller/DiagnosisKeyController.java index cae82958..c156eff6 100644 --- a/src/main/java/eu/interop/federationgateway/controller/DiagnosisKeyController.java +++ b/src/main/java/eu/interop/federationgateway/controller/DiagnosisKeyController.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/controller/DownloadController.java b/src/main/java/eu/interop/federationgateway/controller/DownloadController.java index 65729a83..f075fdbb 100644 --- a/src/main/java/eu/interop/federationgateway/controller/DownloadController.java +++ b/src/main/java/eu/interop/federationgateway/controller/DownloadController.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/controller/UploadController.java b/src/main/java/eu/interop/federationgateway/controller/UploadController.java index 2de60c11..887d618a 100644 --- a/src/main/java/eu/interop/federationgateway/controller/UploadController.java +++ b/src/main/java/eu/interop/federationgateway/controller/UploadController.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionByteArrayConverter.java b/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionByteArrayConverter.java index 5fcf419a..39e1438a 100644 --- a/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionByteArrayConverter.java +++ b/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionByteArrayConverter.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionIntConverter.java b/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionIntConverter.java index d3e3709d..0fb0ac58 100644 --- a/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionIntConverter.java +++ b/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionIntConverter.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionReportTypeConverter.java b/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionReportTypeConverter.java index 8208d396..4bbaba06 100644 --- a/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionReportTypeConverter.java +++ b/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionReportTypeConverter.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionService.java b/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionService.java index 03fee5a1..c22a8e04 100644 --- a/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionService.java +++ b/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionService.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionStringConverter.java b/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionStringConverter.java index b83927e6..ffa052b2 100644 --- a/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionStringConverter.java +++ b/src/main/java/eu/interop/federationgateway/dbencryption/DbEncryptionStringConverter.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/entity/CallbackSubscriptionEntity.java b/src/main/java/eu/interop/federationgateway/entity/CallbackSubscriptionEntity.java index 40815b0c..d01d4785 100644 --- a/src/main/java/eu/interop/federationgateway/entity/CallbackSubscriptionEntity.java +++ b/src/main/java/eu/interop/federationgateway/entity/CallbackSubscriptionEntity.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/entity/CallbackTaskEntity.java b/src/main/java/eu/interop/federationgateway/entity/CallbackTaskEntity.java index 5fbbfe99..1b5058e0 100644 --- a/src/main/java/eu/interop/federationgateway/entity/CallbackTaskEntity.java +++ b/src/main/java/eu/interop/federationgateway/entity/CallbackTaskEntity.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/entity/CertificateEntity.java b/src/main/java/eu/interop/federationgateway/entity/CertificateEntity.java index a45160fb..f3a8820b 100644 --- a/src/main/java/eu/interop/federationgateway/entity/CertificateEntity.java +++ b/src/main/java/eu/interop/federationgateway/entity/CertificateEntity.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/entity/DiagnosisKeyBatchEntity.java b/src/main/java/eu/interop/federationgateway/entity/DiagnosisKeyBatchEntity.java index 10dabbfc..81d5a62a 100644 --- a/src/main/java/eu/interop/federationgateway/entity/DiagnosisKeyBatchEntity.java +++ b/src/main/java/eu/interop/federationgateway/entity/DiagnosisKeyBatchEntity.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/entity/DiagnosisKeyEntity.java b/src/main/java/eu/interop/federationgateway/entity/DiagnosisKeyEntity.java index ff48d352..bd4f8dfd 100644 --- a/src/main/java/eu/interop/federationgateway/entity/DiagnosisKeyEntity.java +++ b/src/main/java/eu/interop/federationgateway/entity/DiagnosisKeyEntity.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/entity/DiagnosisKeyPayload.java b/src/main/java/eu/interop/federationgateway/entity/DiagnosisKeyPayload.java index 3b1132c0..d74eee9d 100644 --- a/src/main/java/eu/interop/federationgateway/entity/DiagnosisKeyPayload.java +++ b/src/main/java/eu/interop/federationgateway/entity/DiagnosisKeyPayload.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/entity/FormatInformation.java b/src/main/java/eu/interop/federationgateway/entity/FormatInformation.java index 58d12ee4..bb62dc39 100644 --- a/src/main/java/eu/interop/federationgateway/entity/FormatInformation.java +++ b/src/main/java/eu/interop/federationgateway/entity/FormatInformation.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/entity/UploaderInformation.java b/src/main/java/eu/interop/federationgateway/entity/UploaderInformation.java index 4df6b722..c97fd38c 100644 --- a/src/main/java/eu/interop/federationgateway/entity/UploaderInformation.java +++ b/src/main/java/eu/interop/federationgateway/entity/UploaderInformation.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/filter/CertificateAuthentificationFilter.java b/src/main/java/eu/interop/federationgateway/filter/CertificateAuthentificationFilter.java index 95273c75..3bf54df7 100644 --- a/src/main/java/eu/interop/federationgateway/filter/CertificateAuthentificationFilter.java +++ b/src/main/java/eu/interop/federationgateway/filter/CertificateAuthentificationFilter.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/filter/CertificateAuthentificationRequired.java b/src/main/java/eu/interop/federationgateway/filter/CertificateAuthentificationRequired.java index 90fbc53e..24a3c78f 100644 --- a/src/main/java/eu/interop/federationgateway/filter/CertificateAuthentificationRequired.java +++ b/src/main/java/eu/interop/federationgateway/filter/CertificateAuthentificationRequired.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/filter/FilterConfig.java b/src/main/java/eu/interop/federationgateway/filter/FilterConfig.java new file mode 100644 index 00000000..b2d654b1 --- /dev/null +++ b/src/main/java/eu/interop/federationgateway/filter/FilterConfig.java @@ -0,0 +1,39 @@ +/*- + * ---license-start + * EU-Federation-Gateway-Service / efgs-federation-gateway + * --- + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors + * --- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ---license-end + */ + +package eu.interop.federationgateway.filter; + +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.filter.ServletRequestPathFilter; + +@Configuration +public class FilterConfig { + + /** + * Add {@link ServletRequestPathFilter} to enable PathParsing which is + * required by {@link CertificateAuthentificationFilter}. + */ + @Bean + FilterRegistrationBean servletRequestPathFilter() { + return new FilterRegistrationBean<>(new ServletRequestPathFilter()); + } +} diff --git a/src/main/java/eu/interop/federationgateway/mapper/CallbackMapper.java b/src/main/java/eu/interop/federationgateway/mapper/CallbackMapper.java index ebbbfdc5..cd0c19f8 100644 --- a/src/main/java/eu/interop/federationgateway/mapper/CallbackMapper.java +++ b/src/main/java/eu/interop/federationgateway/mapper/CallbackMapper.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/mapper/DiagnosisKeyMapper.java b/src/main/java/eu/interop/federationgateway/mapper/DiagnosisKeyMapper.java index 9dab5ca8..18abe09a 100644 --- a/src/main/java/eu/interop/federationgateway/mapper/DiagnosisKeyMapper.java +++ b/src/main/java/eu/interop/federationgateway/mapper/DiagnosisKeyMapper.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/model/AuditEntry.java b/src/main/java/eu/interop/federationgateway/model/AuditEntry.java index ed6d1ba5..9affd209 100644 --- a/src/main/java/eu/interop/federationgateway/model/AuditEntry.java +++ b/src/main/java/eu/interop/federationgateway/model/AuditEntry.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/model/Callback.java b/src/main/java/eu/interop/federationgateway/model/Callback.java index 293e6a19..bacd4ff7 100644 --- a/src/main/java/eu/interop/federationgateway/model/Callback.java +++ b/src/main/java/eu/interop/federationgateway/model/Callback.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/mtls/EfgsCallbackTrustManager.java b/src/main/java/eu/interop/federationgateway/mtls/EfgsCallbackTrustManager.java index 5b5b02ef..febecefa 100644 --- a/src/main/java/eu/interop/federationgateway/mtls/EfgsCallbackTrustManager.java +++ b/src/main/java/eu/interop/federationgateway/mtls/EfgsCallbackTrustManager.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/mtls/ForceCertUsageX509KeyManager.java b/src/main/java/eu/interop/federationgateway/mtls/ForceCertUsageX509KeyManager.java index 6b651561..a60869b2 100644 --- a/src/main/java/eu/interop/federationgateway/mtls/ForceCertUsageX509KeyManager.java +++ b/src/main/java/eu/interop/federationgateway/mtls/ForceCertUsageX509KeyManager.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/repository/CallbackSubscriptionRepository.java b/src/main/java/eu/interop/federationgateway/repository/CallbackSubscriptionRepository.java index 0ac8ab6a..1b8eeb0c 100644 --- a/src/main/java/eu/interop/federationgateway/repository/CallbackSubscriptionRepository.java +++ b/src/main/java/eu/interop/federationgateway/repository/CallbackSubscriptionRepository.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/repository/CallbackTaskRepository.java b/src/main/java/eu/interop/federationgateway/repository/CallbackTaskRepository.java index 043bb8bd..1e1aa118 100644 --- a/src/main/java/eu/interop/federationgateway/repository/CallbackTaskRepository.java +++ b/src/main/java/eu/interop/federationgateway/repository/CallbackTaskRepository.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/repository/CertificateRepository.java b/src/main/java/eu/interop/federationgateway/repository/CertificateRepository.java index 9c339b7e..8de9e3db 100644 --- a/src/main/java/eu/interop/federationgateway/repository/CertificateRepository.java +++ b/src/main/java/eu/interop/federationgateway/repository/CertificateRepository.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/repository/DiagnosisKeyBatchRepository.java b/src/main/java/eu/interop/federationgateway/repository/DiagnosisKeyBatchRepository.java index 40e44fa2..cef67eb2 100644 --- a/src/main/java/eu/interop/federationgateway/repository/DiagnosisKeyBatchRepository.java +++ b/src/main/java/eu/interop/federationgateway/repository/DiagnosisKeyBatchRepository.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/repository/DiagnosisKeyEntityRepository.java b/src/main/java/eu/interop/federationgateway/repository/DiagnosisKeyEntityRepository.java index fe827cf7..52c83451 100644 --- a/src/main/java/eu/interop/federationgateway/repository/DiagnosisKeyEntityRepository.java +++ b/src/main/java/eu/interop/federationgateway/repository/DiagnosisKeyEntityRepository.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/service/CallbackService.java b/src/main/java/eu/interop/federationgateway/service/CallbackService.java index 1eafdbb2..83dfd529 100644 --- a/src/main/java/eu/interop/federationgateway/service/CallbackService.java +++ b/src/main/java/eu/interop/federationgateway/service/CallbackService.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/service/CallbackTaskCleanupService.java b/src/main/java/eu/interop/federationgateway/service/CallbackTaskCleanupService.java index 35fc2cec..5b4ca80d 100644 --- a/src/main/java/eu/interop/federationgateway/service/CallbackTaskCleanupService.java +++ b/src/main/java/eu/interop/federationgateway/service/CallbackTaskCleanupService.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/service/CallbackTaskExecutorService.java b/src/main/java/eu/interop/federationgateway/service/CallbackTaskExecutorService.java index 92a7d96b..33dcdc22 100644 --- a/src/main/java/eu/interop/federationgateway/service/CallbackTaskExecutorService.java +++ b/src/main/java/eu/interop/federationgateway/service/CallbackTaskExecutorService.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/service/CertificateService.java b/src/main/java/eu/interop/federationgateway/service/CertificateService.java index 7b4225af..081f1134 100644 --- a/src/main/java/eu/interop/federationgateway/service/CertificateService.java +++ b/src/main/java/eu/interop/federationgateway/service/CertificateService.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,6 @@ import java.security.KeyStore; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; -import java.security.PublicKey; import java.security.Signature; import java.security.SignatureException; import java.security.cert.CertificateException; diff --git a/src/main/java/eu/interop/federationgateway/service/DiagnosisKeyBatchService.java b/src/main/java/eu/interop/federationgateway/service/DiagnosisKeyBatchService.java index f4454699..052a92bc 100644 --- a/src/main/java/eu/interop/federationgateway/service/DiagnosisKeyBatchService.java +++ b/src/main/java/eu/interop/federationgateway/service/DiagnosisKeyBatchService.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/service/DiagnosisKeyCleanupService.java b/src/main/java/eu/interop/federationgateway/service/DiagnosisKeyCleanupService.java index c63dbe11..2b6734b8 100644 --- a/src/main/java/eu/interop/federationgateway/service/DiagnosisKeyCleanupService.java +++ b/src/main/java/eu/interop/federationgateway/service/DiagnosisKeyCleanupService.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/service/DiagnosisKeyEntityService.java b/src/main/java/eu/interop/federationgateway/service/DiagnosisKeyEntityService.java index 06171068..65b7d44c 100644 --- a/src/main/java/eu/interop/federationgateway/service/DiagnosisKeyEntityService.java +++ b/src/main/java/eu/interop/federationgateway/service/DiagnosisKeyEntityService.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/service/TransactionalCallbackTaskExecutorService.java b/src/main/java/eu/interop/federationgateway/service/TransactionalCallbackTaskExecutorService.java index f0ef8ec0..29bb2762 100644 --- a/src/main/java/eu/interop/federationgateway/service/TransactionalCallbackTaskExecutorService.java +++ b/src/main/java/eu/interop/federationgateway/service/TransactionalCallbackTaskExecutorService.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/service/TransactionalDiagnosisKeyBatchService.java b/src/main/java/eu/interop/federationgateway/service/TransactionalDiagnosisKeyBatchService.java index ab312411..18b6b60f 100644 --- a/src/main/java/eu/interop/federationgateway/service/TransactionalDiagnosisKeyBatchService.java +++ b/src/main/java/eu/interop/federationgateway/service/TransactionalDiagnosisKeyBatchService.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/utils/CertificateUtils.java b/src/main/java/eu/interop/federationgateway/utils/CertificateUtils.java index 330b4fa4..455fd641 100644 --- a/src/main/java/eu/interop/federationgateway/utils/CertificateUtils.java +++ b/src/main/java/eu/interop/federationgateway/utils/CertificateUtils.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/utils/EfgsMdc.java b/src/main/java/eu/interop/federationgateway/utils/EfgsMdc.java index 1d4c3a9f..dc55eecd 100644 --- a/src/main/java/eu/interop/federationgateway/utils/EfgsMdc.java +++ b/src/main/java/eu/interop/federationgateway/utils/EfgsMdc.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/utils/SemVerUtils.java b/src/main/java/eu/interop/federationgateway/utils/SemVerUtils.java index 857f4753..e41652c8 100644 --- a/src/main/java/eu/interop/federationgateway/utils/SemVerUtils.java +++ b/src/main/java/eu/interop/federationgateway/utils/SemVerUtils.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/validator/DiagnosisKeyBatchConstraint.java b/src/main/java/eu/interop/federationgateway/validator/DiagnosisKeyBatchConstraint.java index 850db975..ecf2cce0 100644 --- a/src/main/java/eu/interop/federationgateway/validator/DiagnosisKeyBatchConstraint.java +++ b/src/main/java/eu/interop/federationgateway/validator/DiagnosisKeyBatchConstraint.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/eu/interop/federationgateway/validator/DiagnosisKeyBatchValidator.java b/src/main/java/eu/interop/federationgateway/validator/DiagnosisKeyBatchValidator.java index d6d71026..24bcc646 100644 --- a/src/main/java/eu/interop/federationgateway/validator/DiagnosisKeyBatchValidator.java +++ b/src/main/java/eu/interop/federationgateway/validator/DiagnosisKeyBatchValidator.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/TestData.java b/src/test/java/eu/interop/federationgateway/TestData.java index eab57d14..bca1c4c8 100644 --- a/src/test/java/eu/interop/federationgateway/TestData.java +++ b/src/test/java/eu/interop/federationgateway/TestData.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/batchsigning/BatchSignatureUtilsTest.java b/src/test/java/eu/interop/federationgateway/batchsigning/BatchSignatureUtilsTest.java index 7db08f16..161ea232 100644 --- a/src/test/java/eu/interop/federationgateway/batchsigning/BatchSignatureUtilsTest.java +++ b/src/test/java/eu/interop/federationgateway/batchsigning/BatchSignatureUtilsTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,6 @@ import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import java.util.List; diff --git a/src/test/java/eu/interop/federationgateway/batchsigning/BatchSignatureVerifierTest.java b/src/test/java/eu/interop/federationgateway/batchsigning/BatchSignatureVerifierTest.java index 633bde3d..2cd3d27d 100644 --- a/src/test/java/eu/interop/federationgateway/batchsigning/BatchSignatureVerifierTest.java +++ b/src/test/java/eu/interop/federationgateway/batchsigning/BatchSignatureVerifierTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,6 @@ import java.security.SignatureException; import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; -import java.security.cert.CertificateParsingException; import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/eu/interop/federationgateway/batchsigning/SignatureGenerator.java b/src/test/java/eu/interop/federationgateway/batchsigning/SignatureGenerator.java index 4553fe31..db2bfab3 100644 --- a/src/test/java/eu/interop/federationgateway/batchsigning/SignatureGenerator.java +++ b/src/test/java/eu/interop/federationgateway/batchsigning/SignatureGenerator.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/controller/AuditControllerTest.java b/src/test/java/eu/interop/federationgateway/controller/AuditControllerTest.java index 7f5fbda6..5a295a89 100644 --- a/src/test/java/eu/interop/federationgateway/controller/AuditControllerTest.java +++ b/src/test/java/eu/interop/federationgateway/controller/AuditControllerTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,6 @@ import eu.interop.federationgateway.batchsigning.SignatureGenerator; import eu.interop.federationgateway.config.EfgsProperties; import eu.interop.federationgateway.config.ProtobufConverter; -import eu.interop.federationgateway.filter.CertificateAuthentificationFilter; import eu.interop.federationgateway.model.AuditEntry; import eu.interop.federationgateway.model.EfgsProto; import eu.interop.federationgateway.repository.CertificateRepository; @@ -59,35 +58,39 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; @Slf4j @SpringBootTest @ContextConfiguration(classes = EfgsTestKeyStore.class) +@AutoConfigureMockMvc public class AuditControllerTest { private final ObjectMapper mapper = new ObjectMapper(); - @Autowired - private WebApplicationContext context; + @Autowired private EfgsProperties properties; + @Autowired private DiagnosisKeyEntityRepository diagnosisKeyEntityRepository; + @Autowired private CertificateRepository certificateRepository; - @Autowired - private CertificateAuthentificationFilter certFilter; + @Autowired private DiagnosisKeyBatchService diagnosisKeyBatchService; + @Autowired private DiagnosisKeyBatchRepository diagnosisKeyBatchRepository; + + @Autowired private MockMvc mockMvc; + private SignatureGenerator signatureGenerator; @BeforeEach @@ -97,11 +100,6 @@ public void setup() throws NoSuchAlgorithmException, CertificateException, IOExc diagnosisKeyBatchRepository.deleteAll(); diagnosisKeyEntityRepository.deleteAll(); - - mockMvc = MockMvcBuilders - .webAppContextSetup(context) - .addFilter(certFilter) - .build(); } @Test diff --git a/src/test/java/eu/interop/federationgateway/controller/CallbackAdminControllerTest.java b/src/test/java/eu/interop/federationgateway/controller/CallbackAdminControllerTest.java index 38027b79..4dd79e6f 100644 --- a/src/test/java/eu/interop/federationgateway/controller/CallbackAdminControllerTest.java +++ b/src/test/java/eu/interop/federationgateway/controller/CallbackAdminControllerTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,6 @@ import eu.interop.federationgateway.config.EfgsProperties; import eu.interop.federationgateway.entity.CallbackSubscriptionEntity; import eu.interop.federationgateway.entity.CertificateEntity; -import eu.interop.federationgateway.filter.CertificateAuthentificationFilter; import eu.interop.federationgateway.model.Callback; import eu.interop.federationgateway.repository.CallbackSubscriptionRepository; import eu.interop.federationgateway.repository.CertificateRepository; @@ -57,35 +56,30 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; @Slf4j @SpringBootTest @ContextConfiguration(classes = EfgsTestKeyStore.class) +@AutoConfigureMockMvc public class CallbackAdminControllerTest { - @Autowired - private WebApplicationContext context; - @Autowired private EfgsProperties properties; @Autowired private CertificateRepository certificateRepository; - @Autowired - private CertificateAuthentificationFilter certFilter; - @Autowired private CallbackService callbackService; @Autowired private CallbackSubscriptionRepository callbackSubscriptionRepository; + @Autowired private MockMvc mockMvc; private CertificateEntity callbackCert; @@ -125,11 +119,6 @@ public void setup() throws NoSuchAlgorithmException, CertificateException, IOExc null, null )); - - mockMvc = MockMvcBuilders - .webAppContextSetup(context) - .addFilter(certFilter) - .build(); } @AfterEach diff --git a/src/test/java/eu/interop/federationgateway/controller/DiagnosisKeyControllerTest.java b/src/test/java/eu/interop/federationgateway/controller/DiagnosisKeyControllerTest.java index 2b78c880..c2cc816f 100644 --- a/src/test/java/eu/interop/federationgateway/controller/DiagnosisKeyControllerTest.java +++ b/src/test/java/eu/interop/federationgateway/controller/DiagnosisKeyControllerTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,14 +23,12 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.options; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import com.fasterxml.jackson.databind.ObjectMapper; -import eu.interop.federationgateway.config.EfgsProperties; -import eu.interop.federationgateway.repository.DiagnosisKeyEntityRepository; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -40,15 +38,13 @@ @Slf4j @SpringBootTest +@AutoConfigureMockMvc public class DiagnosisKeyControllerTest { - private final ObjectMapper mapper = new ObjectMapper(); @Autowired private WebApplicationContext context; + @Autowired - private EfgsProperties properties; - @Autowired - private DiagnosisKeyEntityRepository diagnosisKeyEntityRepository; private MockMvc mockMvc; @BeforeEach @@ -61,8 +57,8 @@ public void setup() { @Test public void testOptionsReturnEndpointInformation() throws Exception { mockMvc.perform(options("/diagnosiskeys") - .accept("application/json; version=1.0") - ) + .accept("application/json; version=1.0") + ) .andExpect(status().isOk()) .andExpect(mvcResult -> { String allowHeader = mvcResult.getResponse().getHeader(HttpHeaders.ALLOW); diff --git a/src/test/java/eu/interop/federationgateway/controller/DownloadControllerTest.java b/src/test/java/eu/interop/federationgateway/controller/DownloadControllerTest.java index 1fd68613..8c563465 100644 --- a/src/test/java/eu/interop/federationgateway/controller/DownloadControllerTest.java +++ b/src/test/java/eu/interop/federationgateway/controller/DownloadControllerTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,6 @@ import eu.interop.federationgateway.config.ProtobufConverter; import eu.interop.federationgateway.entity.DiagnosisKeyBatchEntity; import eu.interop.federationgateway.entity.DiagnosisKeyEntity; -import eu.interop.federationgateway.filter.CertificateAuthentificationFilter; import eu.interop.federationgateway.model.EfgsProto; import eu.interop.federationgateway.repository.CertificateRepository; import eu.interop.federationgateway.repository.DiagnosisKeyBatchRepository; @@ -56,20 +55,17 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; @Slf4j @SpringBootTest @ContextConfiguration(classes = EfgsTestKeyStore.class) +@AutoConfigureMockMvc public class DownloadControllerTest { - @Autowired - private WebApplicationContext context; - @Autowired private EfgsProperties properties; @@ -79,12 +75,10 @@ public class DownloadControllerTest { @Autowired private DiagnosisKeyBatchRepository diagnosisKeyBatchRepository; - @Autowired - private CertificateAuthentificationFilter certFilter; - @Autowired private CertificateRepository certificateRepository; + @Autowired private MockMvc mockMvc; private static String getDateString(ZonedDateTime timestamp) { @@ -98,11 +92,6 @@ public void setup() throws CertificateException, NoSuchAlgorithmException, IOExc diagnosisKeyEntityRepository.deleteAll(); diagnosisKeyBatchRepository.deleteAll(); - - mockMvc = MockMvcBuilders - .webAppContextSetup(context) - .addFilter(certFilter) - .build(); } @Test diff --git a/src/test/java/eu/interop/federationgateway/controller/UploadControllerTest.java b/src/test/java/eu/interop/federationgateway/controller/UploadControllerTest.java index 7571f2e3..d44fad1c 100644 --- a/src/test/java/eu/interop/federationgateway/controller/UploadControllerTest.java +++ b/src/test/java/eu/interop/federationgateway/controller/UploadControllerTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,6 @@ import eu.interop.federationgateway.config.EfgsProperties; import eu.interop.federationgateway.config.ProtobufConverter; import eu.interop.federationgateway.entity.CertificateEntity; -import eu.interop.federationgateway.filter.CertificateAuthentificationFilter; import eu.interop.federationgateway.model.EfgsProto; import eu.interop.federationgateway.repository.CertificateRepository; import eu.interop.federationgateway.repository.DiagnosisKeyEntityRepository; @@ -57,29 +56,23 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.json.JsonParser; import org.springframework.boot.json.JsonParserFactory; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; @Slf4j @SpringBootTest @ContextConfiguration(classes = EfgsTestKeyStore.class) +@AutoConfigureMockMvc public class UploadControllerTest { - @Autowired - private WebApplicationContext context; - @Autowired private EfgsProperties properties; @Autowired private DiagnosisKeyEntityRepository diagnosisKeyEntityRepository; - @Autowired - private CertificateAuthentificationFilter certFilter; - @Autowired private CertificateRepository certificateRepository; @@ -88,6 +81,7 @@ public class UploadControllerTest { private SignatureGenerator signatureGenerator; + @Autowired private MockMvc mockMvc; private static final List VISITED_COUNTRIES = Arrays.asList( @@ -102,10 +96,6 @@ public void setup() throws NoSuchAlgorithmException, CertificateException, IOExc signatureGenerator = new SignatureGenerator(certificateRepository); diagnosisKeyEntityRepository.deleteAll(); - mockMvc = MockMvcBuilders - .webAppContextSetup(context) - .addFilter(certFilter) - .build(); } @Test diff --git a/src/test/java/eu/interop/federationgateway/dbencryption/DbEncryptionTest.java b/src/test/java/eu/interop/federationgateway/dbencryption/DbEncryptionTest.java index 87aba582..a356d3e8 100644 --- a/src/test/java/eu/interop/federationgateway/dbencryption/DbEncryptionTest.java +++ b/src/test/java/eu/interop/federationgateway/dbencryption/DbEncryptionTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/filter/CertAuthFilterTest.java b/src/test/java/eu/interop/federationgateway/filter/CertAuthFilterTest.java index 6c94670b..aaf77b9e 100644 --- a/src/test/java/eu/interop/federationgateway/filter/CertAuthFilterTest.java +++ b/src/test/java/eu/interop/federationgateway/filter/CertAuthFilterTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,20 +45,17 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; @Slf4j @SpringBootTest @ContextConfiguration(classes = EfgsTestKeyStore.class) +@AutoConfigureMockMvc public class CertAuthFilterTest { - @Autowired - private WebApplicationContext context; - @Autowired private EfgsProperties properties; @@ -68,12 +65,10 @@ public class CertAuthFilterTest { @Autowired private DiagnosisKeyBatchRepository diagnosisKeyBatchRepository; - @Autowired - private CertificateAuthentificationFilter certFilter; - @Autowired private CertificateRepository certificateRepository; + @Autowired private MockMvc mockMvc; @BeforeEach @@ -82,11 +77,6 @@ public void setup() throws CertificateException, NoSuchAlgorithmException, IOExc diagnosisKeyEntityRepository.deleteAll(); diagnosisKeyBatchRepository.deleteAll(); - - mockMvc = MockMvcBuilders - .webAppContextSetup(context) - .addFilter(certFilter) - .build(); } @Test diff --git a/src/test/java/eu/interop/federationgateway/mapper/DiagnosiskeyMapperTest.java b/src/test/java/eu/interop/federationgateway/mapper/DiagnosiskeyMapperTest.java index d9e78aa8..8f0edd01 100644 --- a/src/test/java/eu/interop/federationgateway/mapper/DiagnosiskeyMapperTest.java +++ b/src/test/java/eu/interop/federationgateway/mapper/DiagnosiskeyMapperTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/mtls/EfgsCallbackTrustManagerTest.java b/src/test/java/eu/interop/federationgateway/mtls/EfgsCallbackTrustManagerTest.java index 1418b601..af8638cb 100644 --- a/src/test/java/eu/interop/federationgateway/mtls/EfgsCallbackTrustManagerTest.java +++ b/src/test/java/eu/interop/federationgateway/mtls/EfgsCallbackTrustManagerTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/repository/CallbackTaskRepositoryTest.java b/src/test/java/eu/interop/federationgateway/repository/CallbackTaskRepositoryTest.java index 81d7d3d0..a00bec2a 100644 --- a/src/test/java/eu/interop/federationgateway/repository/CallbackTaskRepositoryTest.java +++ b/src/test/java/eu/interop/federationgateway/repository/CallbackTaskRepositoryTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/repository/DiagnosisKeyBatchRepositoryTest.java b/src/test/java/eu/interop/federationgateway/repository/DiagnosisKeyBatchRepositoryTest.java index 76a8ea60..aae54fb4 100644 --- a/src/test/java/eu/interop/federationgateway/repository/DiagnosisKeyBatchRepositoryTest.java +++ b/src/test/java/eu/interop/federationgateway/repository/DiagnosisKeyBatchRepositoryTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/repository/DiagnosisKeyEntityRepositoryTest.java b/src/test/java/eu/interop/federationgateway/repository/DiagnosisKeyEntityRepositoryTest.java index ef37ffdd..c87876e7 100644 --- a/src/test/java/eu/interop/federationgateway/repository/DiagnosisKeyEntityRepositoryTest.java +++ b/src/test/java/eu/interop/federationgateway/repository/DiagnosisKeyEntityRepositoryTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/service/CallbackServiceTest.java b/src/test/java/eu/interop/federationgateway/service/CallbackServiceTest.java index d5d844e4..39aa2d9e 100644 --- a/src/test/java/eu/interop/federationgateway/service/CallbackServiceTest.java +++ b/src/test/java/eu/interop/federationgateway/service/CallbackServiceTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/service/CallbackTaskCleanupServiceTest.java b/src/test/java/eu/interop/federationgateway/service/CallbackTaskCleanupServiceTest.java index c4bcbb23..554b7faa 100644 --- a/src/test/java/eu/interop/federationgateway/service/CallbackTaskCleanupServiceTest.java +++ b/src/test/java/eu/interop/federationgateway/service/CallbackTaskCleanupServiceTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/service/CallbackTaskExecutorServiceTest.java b/src/test/java/eu/interop/federationgateway/service/CallbackTaskExecutorServiceTest.java index 3a123d5d..3db85774 100644 --- a/src/test/java/eu/interop/federationgateway/service/CallbackTaskExecutorServiceTest.java +++ b/src/test/java/eu/interop/federationgateway/service/CallbackTaskExecutorServiceTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/service/CertificateServiceTest.java b/src/test/java/eu/interop/federationgateway/service/CertificateServiceTest.java index 241fcdc4..047f1781 100644 --- a/src/test/java/eu/interop/federationgateway/service/CertificateServiceTest.java +++ b/src/test/java/eu/interop/federationgateway/service/CertificateServiceTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/service/DiagnosisKeyBatchServiceTest.java b/src/test/java/eu/interop/federationgateway/service/DiagnosisKeyBatchServiceTest.java index cd46f35b..38459a1a 100644 --- a/src/test/java/eu/interop/federationgateway/service/DiagnosisKeyBatchServiceTest.java +++ b/src/test/java/eu/interop/federationgateway/service/DiagnosisKeyBatchServiceTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/service/DiagnosisKeyCleanupServiceTest.java b/src/test/java/eu/interop/federationgateway/service/DiagnosisKeyCleanupServiceTest.java index e7b0c142..0701601a 100644 --- a/src/test/java/eu/interop/federationgateway/service/DiagnosisKeyCleanupServiceTest.java +++ b/src/test/java/eu/interop/federationgateway/service/DiagnosisKeyCleanupServiceTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/service/DiagnosisKeyEntityServiceTest.java b/src/test/java/eu/interop/federationgateway/service/DiagnosisKeyEntityServiceTest.java index 5a8beaa6..392fc050 100644 --- a/src/test/java/eu/interop/federationgateway/service/DiagnosisKeyEntityServiceTest.java +++ b/src/test/java/eu/interop/federationgateway/service/DiagnosisKeyEntityServiceTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/testconfig/EfgsTestKeyStore.java b/src/test/java/eu/interop/federationgateway/testconfig/EfgsTestKeyStore.java index d839ee83..99055a87 100644 --- a/src/test/java/eu/interop/federationgateway/testconfig/EfgsTestKeyStore.java +++ b/src/test/java/eu/interop/federationgateway/testconfig/EfgsTestKeyStore.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/testdata/TestDataGenerator.java b/src/test/java/eu/interop/federationgateway/testdata/TestDataGenerator.java index d28f681a..860a9baf 100644 --- a/src/test/java/eu/interop/federationgateway/testdata/TestDataGenerator.java +++ b/src/test/java/eu/interop/federationgateway/testdata/TestDataGenerator.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/utils/SemVerUtilsTest.java b/src/test/java/eu/interop/federationgateway/utils/SemVerUtilsTest.java index e3e575e0..6df14424 100644 --- a/src/test/java/eu/interop/federationgateway/utils/SemVerUtilsTest.java +++ b/src/test/java/eu/interop/federationgateway/utils/SemVerUtilsTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/eu/interop/federationgateway/validator/DiagnosisKeyBatchValidatorTest.java b/src/test/java/eu/interop/federationgateway/validator/DiagnosisKeyBatchValidatorTest.java index dd6adb49..e8ada215 100644 --- a/src/test/java/eu/interop/federationgateway/validator/DiagnosisKeyBatchValidatorTest.java +++ b/src/test/java/eu/interop/federationgateway/validator/DiagnosisKeyBatchValidatorTest.java @@ -2,7 +2,7 @@ * ---license-start * EU-Federation-Gateway-Service / efgs-federation-gateway * --- - * Copyright (C) 2020 - 2021 T-Systems International GmbH and all other contributors + * Copyright (C) 2020 - 2022 T-Systems International GmbH and all other contributors * --- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.