Chore: Update Dependencies, Update Copyright File Header (#31)

* Update Dependencies

* Update Copyright File Header

* Checkstyle

src/main/java/app/coronawarn/logupload/LogUploadApplication.java

@@ -1,7 +1,7 @@
 /*
  * Corona-Warn-App / cwa-log-upload
  *
- * (C) 2021, T-Systems International GmbH
+ * (C) 2021 - 2022, T-Systems International GmbH
  *
  * Deutsche Telekom AG and all other contributors /
  * copyright owners license this file to you under the Apache

src/main/java/app/coronawarn/logupload/LogUploadHttpFilter.java

@@ -1,7 +1,7 @@
 /*
  * Corona-Warn-App / cwa-verification
  *
- * (C) 2021, T-Systems International GmbH
+ * (C) 2021 - 2022, T-Systems International GmbH
  *
  * Deutsche Telekom AG, SAP AG and all other contributors /
  * copyright owners license this file to you under the Apache

src/main/java/app/coronawarn/logupload/client/ElsVerifyClient.java

@@ -1,3 +1,24 @@
+/*
+ * Corona-Warn-App / cwa-log-upload
+ *
+ * (C) 2021 - 2022, T-Systems International GmbH
+ *
+ * Deutsche Telekom AG and all other contributors /
+ * copyright owners license this file to you 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.
+ */
+
 package app.coronawarn.logupload.client;
 
 import org.springframework.cloud.openfeign.FeignClient;

src/main/java/app/coronawarn/logupload/client/ElsVerifyClientConfig.java

@@ -1,3 +1,24 @@
+/*
+ * Corona-Warn-App / cwa-log-upload
+ *
+ * (C) 2021 - 2022, T-Systems International GmbH
+ *
+ * Deutsche Telekom AG and all other contributors /
+ * copyright owners license this file to you 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.
+ */
+
 package app.coronawarn.logupload.client;
 
 import app.coronawarn.logupload.config.ElsVerifyConfig;

src/main/java/app/coronawarn/logupload/client/ElsVerifyClientRequest.java

@@ -1,3 +1,24 @@
+/*
+ * Corona-Warn-App / cwa-log-upload
+ *
+ * (C) 2021 - 2022, T-Systems International GmbH
+ *
+ * Deutsche Telekom AG and all other contributors /
+ * copyright owners license this file to you 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.
+ */
+
 package app.coronawarn.logupload.client;
 
 import lombok.AllArgsConstructor;

src/main/java/app/coronawarn/logupload/client/ElsVerifyClientResponse.java

@@ -1,3 +1,24 @@
+/*
+ * Corona-Warn-App / cwa-log-upload
+ *
+ * (C) 2021 - 2022, T-Systems International GmbH
+ *
+ * Deutsche Telekom AG and all other contributors /
+ * copyright owners license this file to you 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.
+ */
+
 package app.coronawarn.logupload.client;
 
 import lombok.AllArgsConstructor;

src/main/java/app/coronawarn/logupload/config/ElsVerifyConfig.java

@@ -1,7 +1,7 @@
 /*
  * Corona-Warn-App / cwa-log-upload
  *
- * (C) 2021, T-Systems International GmbH
+ * (C) 2021 - 2022, T-Systems International GmbH
  *
  * Deutsche Telekom AG and all other contributors /
  * copyright owners license this file to you under the Apache

src/main/java/app/coronawarn/logupload/config/KeycloakConfigResolverConfig.java

@@ -0,0 +1,36 @@
+/*
+ * Corona-Warn-App / cwa-log-upload
+ *
+ * (C) 2021 - 2022, T-Systems International GmbH
+ *
+ * Deutsche Telekom AG and all other contributors /
+ * copyright owners license this file to you 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.
+ */
+
+package app.coronawarn.logupload.config;
+
+import org.keycloak.adapters.springboot.KeycloakSpringBootConfigResolver;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class KeycloakConfigResolverConfig {
+
+    @Bean
+    public KeycloakSpringBootConfigResolver keycloakConfigResolver() {
+        return new KeycloakSpringBootConfigResolver();
+    }
+
+}

src/main/java/app/coronawarn/logupload/config/LogUploadConfig.java

@@ -1,7 +1,7 @@
 /*
  * Corona-Warn-App / cwa-log-upload
  *
- * (C) 2021, T-Systems International GmbH
+ * (C) 2021 - 2022, T-Systems International GmbH
  *
  * Deutsche Telekom AG and all other contributors /
  * copyright owners license this file to you under the Apache

src/main/java/app/coronawarn/logupload/config/LogUploadS3Config.java

@@ -1,7 +1,7 @@
 /*
  * Corona-Warn-App / cwa-log-upload
  *
- * (C) 2021, T-Systems International GmbH
+ * (C) 2021 - 2022, T-Systems International GmbH
  *
  * Deutsche Telekom AG and all other contributors /
  * copyright owners license this file to you under the Apache

src/main/java/app/coronawarn/logupload/config/S3StorageClient.java

@@ -1,7 +1,7 @@
 /*
  * Corona-Warn-App / cwa-log-upload
  *
- * (C) 2021, T-Systems International GmbH
+ * (C) 2021 - 2022, T-Systems International GmbH
  *
  * Deutsche Telekom AG and all other contributors /
  * copyright owners license this file to you under the Apache

src/main/java/app/coronawarn/logupload/SecurityConfig.java → src/main/java/app/coronawarn/logupload/config/SecurityConfig.java

@@ -1,7 +1,7 @@
 /*
  * Corona-Warn-App / cwa-log-upload
  *
- * (C) 2021, T-Systems International GmbH
+ * (C) 2021 - 2022, T-Systems International GmbH
  *
  * Deutsche Telekom AG and all other contributors /
  * copyright owners license this file to you under the Apache
@@ -19,8 +19,9 @@
  * under the License.
  */
 
-package app.coronawarn.logupload;
+package app.coronawarn.logupload.config;
 
+import app.coronawarn.logupload.LogUploadHttpFilter;
 import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.servlet.http.HttpServletRequest;
@@ -78,11 +79,6 @@ public void configureGlobal(AuthenticationManagerBuilder auth) {
         auth.authenticationProvider(keycloakAuthenticationProvider);
     }
 
-    @Bean
-    public KeycloakSpringBootConfigResolver keycloakConfigResolver() {
-        return new KeycloakSpringBootConfigResolver();
-    }
-
     @Bean
     @Override
     protected SessionAuthenticationStrategy sessionAuthenticationStrategy() {

src/main/java/app/coronawarn/logupload/controller/LogDownloadApiController.java

@@ -1,7 +1,7 @@
 /*
  * Corona-Warn-App / cwa-log-upload
  *
- * (C) 2021, T-Systems International GmbH
+ * (C) 2021 - 2022, T-Systems International GmbH
  *
  * Deutsche Telekom AG and all other contributors /
  * copyright owners license this file to you under the Apache

src/main/java/app/coronawarn/logupload/controller/LogUploadApiController.java

@@ -1,7 +1,7 @@
 /*
  * Corona-Warn-App / cwa-log-upload
  *
- * (C) 2021, T-Systems International GmbH
+ * (C) 2021 - 2022, T-Systems International GmbH
  *
  * Deutsche Telekom AG and all other contributors /
  * copyright owners license this file to you under the Apache

src/main/java/app/coronawarn/logupload/controller/LogUploadErrorController.java

@@ -1,7 +1,7 @@
 /*
  * Corona-Warn-App / cwa-log-upload
  *
- * (C) 2021, T-Systems International GmbH
+ * (C) 2021 - 2022, T-Systems International GmbH
  *
  * Deutsche Telekom AG and all other contributors /
  * copyright owners license this file to you under the Apache

src/main/java/app/coronawarn/logupload/controller/LogUploadPortalController.java

@@ -1,7 +1,7 @@
 /*
  * Corona-Warn-App / cwa-log-upload
  *
- * (C) 2021, T-Systems International GmbH
+ * (C) 2021 - 2022, T-Systems International GmbH
  *
  * Deutsche Telekom AG and all other contributors /
  * copyright owners license this file to you under the Apache

src/main/java/app/coronawarn/logupload/exception/LogUploadException.java

@@ -1,7 +1,7 @@
 /*
  * Corona-Warn-App / cwa-verification
  *
- * (C) 2021, T-Systems International GmbH
+ * (C) 2021 - 2022, T-Systems International GmbH
  *
  * Deutsche Telekom AG, SAP AG and all other contributors /
  * copyright owners license this file to you under the Apache

src/main/java/app/coronawarn/logupload/model/LogEntity.java

@@ -1,7 +1,7 @@
 /*
  * Corona-Warn-App / cwa-verification
  *
- * (C) 2021, T-Systems International GmbH
+ * (C) 2021 - 2022, T-Systems International GmbH
  *
  * Deutsche Telekom AG, SAP AG and all other contributors /
  * copyright owners license this file to you under the Apache

src/main/java/app/coronawarn/logupload/model/LogUploadResponse.java

@@ -1,7 +1,7 @@
 /*
  * Corona-Warn-App / cwa-verification
  *
- * (C) 2021, T-Systems International GmbH
+ * (C) 2021 - 2022, T-Systems International GmbH
  *
  * Deutsche Telekom AG, SAP AG and all other contributors /
  * copyright owners license this file to you under the Apache

src/main/java/app/coronawarn/logupload/repository/LogRepository.java

@@ -1,7 +1,7 @@
 /*
  * Corona-Warn-App / cwa-verification
  *
- * (C) 2021, T-Systems International GmbH
+ * (C) 2021 - 2022, T-Systems International GmbH
  *
  * Deutsche Telekom AG, SAP AG and all other contributors /
  * copyright owners license this file to you under the Apache

src/main/java/app/coronawarn/logupload/service/FileStorageService.java

@@ -1,7 +1,7 @@
 /*
  * Corona-Warn-App / cwa-verification
  *
- * (C) 2021, T-Systems International GmbH
+ * (C) 2021 - 2022, T-Systems International GmbH
  *
  * Deutsche Telekom AG, SAP AG and all other contributors /
  * copyright owners license this file to you under the Apache

src/main/java/app/coronawarn/logupload/service/LogCleanupService.java

@@ -1,3 +1,24 @@
+/*
+ * Corona-Warn-App / cwa-log-upload
+ *
+ * (C) 2021 - 2022, T-Systems International GmbH
+ *
+ * Deutsche Telekom AG and all other contributors /
+ * copyright owners license this file to you 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.
+ */
+
 package app.coronawarn.logupload.service;
 
 import app.coronawarn.logupload.config.LogUploadConfig;

src/main/java/app/coronawarn/logupload/service/LogService.java

@@ -1,3 +1,24 @@
+/*
+ * Corona-Warn-App / cwa-log-upload
+ *
+ * (C) 2021 - 2022, T-Systems International GmbH
+ *
+ * Deutsche Telekom AG and all other contributors /
+ * copyright owners license this file to you 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.
+ */
+
 package app.coronawarn.logupload.service;
 
 import app.coronawarn.logupload.model.LogEntity;

src/main/java/app/coronawarn/logupload/service/OtpService.java

@@ -1,3 +1,24 @@
+/*
+ * Corona-Warn-App / cwa-log-upload
+ *
+ * (C) 2021 - 2022, T-Systems International GmbH
+ *
+ * Deutsche Telekom AG and all other contributors /
+ * copyright owners license this file to you 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.
+ */
+
 package app.coronawarn.logupload.service;
 
 import app.coronawarn.logupload.client.ElsVerifyClient;