From c1981d5d76de2031f0c2fc15fe0df8c43ebdf617 Mon Sep 17 00:00:00 2001
From: alig <alig@ubique.ch>
Date: Wed, 26 Aug 2020 17:17:50 +0200
Subject: [PATCH] Rename properties for additional filters.

---
 .../dpppt/backend/sdk/ws/config/WSBaseConfig.java   | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/config/WSBaseConfig.java b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/config/WSBaseConfig.java
index f2fa7475..ebdb4d83 100644
--- a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/config/WSBaseConfig.java
+++ b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/config/WSBaseConfig.java
@@ -138,11 +138,6 @@ public abstract class WSBaseConfig implements SchedulingConfigurer, WebMvcConfig
 	String keyIdentifier;
 	@Value("${ws.app.gaen.algorithm:1.2.840.10045.4.3.2}")
 	String gaenAlgorithm;
-	@Value("${ws.app.gaen.ioslegacy: true}")
-	boolean iosLegacy;
-	@Value("${ws.app.gaen.androidBug: true}")
-	boolean androidBug;
-
 
 	@Autowired(required = false)
 	ValidateRequest requestValidator;
@@ -209,9 +204,9 @@ public InsertManager insertManager() {
 		return manager;
 	}
 	@ConditionalOnProperty(
-    value="ws.app.gaen.androidBug", 
+    value="ws.app.gaen.insertfilter.android0rpfilter", 
     havingValue = "true", 
-	matchIfMissing = true)
+	matchIfMissing = false)
 	@Bean public OldAndroid0RPFilter oldAndroid0RPFilter(InsertManager manager){
 		var androidFilter = new OldAndroid0RPFilter();
 		manager.addFilter(androidFilter);
@@ -219,9 +214,9 @@ public InsertManager insertManager() {
 	}
 	
 	@ConditionalOnProperty(
-    value="ws.app.gaen.ioslegacy", 
+    value="ws.app.gaen.insertfilter.iosrplt144filter", 
     havingValue = "true", 
-	matchIfMissing = true)
+	matchIfMissing = false)
 	@Bean public IOSLegacyProblemRPLT144Filter iosLegacyProblemRPLT144(InsertManager manager){
 		var iosFilter = new IOSLegacyProblemRPLT144Filter();
 		manager.addFilter(iosFilter);