Merge pull request #266 from DP-3T/merge-master-back

Merge Master back to Develop

Author: martinalig

dpppt-backend-sdk/dpppt-backend-sdk-ws/pom.xml

@@ -32,6 +32,11 @@
 			<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-cloud-connectors</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>ch.ubique.openapi</groupId>
 			<artifactId>doc-annotations</artifactId>
@@ -148,5 +153,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
 </project>

dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/config/WSCloudBaseConfig.java

@@ -10,32 +10,50 @@
 
 package org.dpppt.backend.sdk.ws.config;
 
+import java.util.Map;
 import javax.sql.DataSource;
 import org.dpppt.backend.sdk.ws.security.KeyVault;
 import org.dpppt.backend.sdk.ws.security.KeyVault.PrivateKeyNoSuitableEncodingFoundException;
 import org.dpppt.backend.sdk.ws.security.KeyVault.PublicKeyNoSuitableEncodingFoundException;
 import org.flywaydb.core.Flyway;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.CloudFactory;
+import org.springframework.cloud.service.PooledServiceConnectorConfig.PoolConfig;
+import org.springframework.cloud.service.relational.DataSourceConfig;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
 
 @Configuration
 public abstract class WSCloudBaseConfig extends WSBaseConfig {
 
-  @Autowired @Lazy private DataSource dataSource;
-
   abstract String getPublicKey();
 
   abstract String getPrivateKey();
 
   @Value("${ws.cloud.base.config.publicKey.fromCertificate:true}")
   private boolean publicKeyFromCertificate;
 
+  @Value("${datasource.maximumPoolSize:5}")
+  int dataSourceMaximumPoolSize;
+
+  @Value("${datasource.connectionTimeout:30000}")
+  int dataSourceConnectionTimeout;
+
+  @Value("${datasource.leakDetectionThreshold:0}")
+  int dataSourceLeakDetectionThreshold;
+
+  @Bean
   @Override
   public DataSource dataSource() {
-    return dataSource;
+    PoolConfig poolConfig = new PoolConfig(dataSourceMaximumPoolSize, dataSourceConnectionTimeout);
+    DataSourceConfig dbConfig =
+        new DataSourceConfig(
+            poolConfig,
+            null,
+            null,
+            Map.of("leakDetectionThreshold", dataSourceLeakDetectionThreshold));
+    CloudFactory factory = new CloudFactory();
+    return factory.getCloud().getSingletonServiceConnector(DataSource.class, dbConfig);
   }
 
   @Bean

dpppt-backend-sdk/dpppt-backend-sdk-ws/src/test/java/org/dpppt/backend/sdk/ws/config/TestingCloudDevConfig.java

@@ -40,7 +40,8 @@ String getPublicKey() {
   }
 
   @Bean
-  DataSource hsqlSource() {
+  @Override
+  public DataSource dataSource() {
     return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL).build();
   }