Clean up interops

dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/config/ActuatorSecurity.java

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 package org.dpppt.backend.sdk.interops.config;
 
 import org.dpppt.backend.sdk.interops.config.configbeans.ActuatorSecurityConfig;
@@ -29,7 +39,7 @@ public class ActuatorSecurity extends WebSecurityConfigurerAdapter {
 
   private static final String PROMETHEUS_ROLE = "PROMETHEUS";
 
-  @Value("${ws.monitor.prometheus.user}")
+  @Value("${interops.monitor.prometheus.user}")
   private String user;
 
   @Autowired Environment environment;
@@ -67,7 +77,7 @@ ActuatorSecurityConfig passwordProdAbn() {
   @ConditionalOnMissingBean
   ActuatorSecurityConfig passwordDefault() {
     return new ActuatorSecurityConfig(
-        user, environment.getProperty("ws.monitor.prometheus.password"));
+        user, environment.getProperty("interops.monitor.prometheus.password"));
   }
   // ----------------------------------------------------------------------------------------------------------------------------------
   // endregion

dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/config/WSBaseConfig.java

@@ -37,19 +37,19 @@
 @Configuration
 public abstract class WSBaseConfig implements WebMvcConfigurer {
 
-  @Value("${ws.retentiondays: 14}")
+  @Value("${interops.retentiondays: 14}")
   int retentionDays;
 
-  @Value("${ws.exposedlist.releaseBucketDuration: 7200000}")
+  @Value("${interops.releaseBucketDuration: 7200000}")
   long releaseBucketDuration;
 
-  @Value("${ws.app.gaen.key_size: 16}")
+  @Value("${interops.gaen.key_size: 16}")
   int gaenKeySizeBytes;
 
-  @Value("${ws.app.gaen.timeskew:PT2h}")
+  @Value("${interops.gaen.timeskew:PT2h}")
   Duration timeSkew;
 
-  @Value("${ws.origin.country}")
+  @Value("${interops.origin.country}")
   String originCountry;
 
   @Value("${interops.efgs.dsosfilter.enabled: true}")

dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/config/WSProdConfig.java

@@ -51,12 +51,6 @@ public class WSProdConfig extends WSBaseConfig {
   @Value("${datasource.connectionTimeout}")
   String dataSourceConnectionTimeout;
 
-  @Value("${ws.ecdsa.credentials.privateKey:}")
-  private String privateKey;
-
-  @Value("${ws.ecdsa.credentials.publicKey:}")
-  public String publicKey;
-
   @Bean(destroyMethod = "close")
   public DataSource dataSource() {
     HikariConfig config = new HikariConfig();

dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/config/WSSchedulingBaseConfig.java

@@ -25,7 +25,7 @@ public WSSchedulingBaseConfig(EfgsHubSyncer efgsHubSyncer) {
     this.efgsHubSyncer = efgsHubSyncer;
   }
 
-  @Scheduled(cron = "${ws.interops.efgs.syncCron: 0 0/10 * * * ?}")
+  @Scheduled(cron = "${interops.efgs.syncCron: 0 0/10 * * * ?}")
   public void efgsHubSync() {
     efgsHubSyncer.sync();
   }

dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/config/configbeans/ActuatorSecurityConfig.java

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 package org.dpppt.backend.sdk.interops.config.configbeans;
 
 public class ActuatorSecurityConfig {

dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/insertmanager/InteropsInsertManager.java

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 package org.dpppt.backend.sdk.interops.insertmanager;
 
 import java.util.ArrayList;

dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/insertmanager/insertionfilters/AssertKeyFormat.java

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 package org.dpppt.backend.sdk.interops.insertmanager.insertionfilters;
 
 import java.util.Base64;

dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/insertmanager/insertionfilters/EnforceRetentionPeriod.java

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 package org.dpppt.backend.sdk.interops.insertmanager.insertionfilters;
 
 import java.time.Duration;

dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/insertmanager/insertionfilters/EnforceValidRollingPeriod.java

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 package org.dpppt.backend.sdk.interops.insertmanager.insertionfilters;
 
 import java.util.List;

dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/insertmanager/insertionfilters/InteropsKeyInsertionFilter.java

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 package org.dpppt.backend.sdk.interops.insertmanager.insertionfilters;
 
 import java.util.List;

dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/insertmanager/insertionfilters/RemoveKeysFromFuture.java

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 package org.dpppt.backend.sdk.interops.insertmanager.insertionfilters;
 
 import java.util.List;

dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/insertmanager/insertionmodifier/InteropsKeyInsertionModifier.java

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 package org.dpppt.backend.sdk.interops.insertmanager.insertionmodifier;
 
 import java.util.List;

dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/model/EfgsBatchUploadResponse.java

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 package org.dpppt.backend.sdk.interops.model;
 
 import static java.util.Collections.emptyList;

dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/model/EfgsGatewayConfig.java

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 package org.dpppt.backend.sdk.interops.model;
 
 import java.util.List;

dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/model/GaenKeyBatch.java

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 package org.dpppt.backend.sdk.interops.model;
 
 import java.time.LocalDate;

dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/model/HubConfigs.java

@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 package org.dpppt.backend.sdk.interops.model;
 
 import java.util.List;