From 093e6f085687c4bcec4d66032ef96fc2e9dd7c88 Mon Sep 17 00:00:00 2001 From: Daniel Gstoehl Date: Tue, 29 Nov 2022 10:30:27 +0100 Subject: [PATCH 1/4] Update to Java 17 --- ch-covidcertificate-backend-transformation/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ch-covidcertificate-backend-transformation/pom.xml b/ch-covidcertificate-backend-transformation/pom.xml index 3469e5b..b7a16f9 100644 --- a/ch-covidcertificate-backend-transformation/pom.xml +++ b/ch-covidcertificate-backend-transformation/pom.xml @@ -11,7 +11,7 @@ CH Covidcertificate Transformation Backend - 11 + 17 UTF-8 UTF-8 From ebc909eb77c2c3d7a41d08f4dbf93d06bb8e85e4 Mon Sep 17 00:00:00 2001 From: Daniel Gstoehl Date: Tue, 29 Nov 2022 10:39:43 +0100 Subject: [PATCH 2/4] Update workflows for Java 17 --- .github/workflows/build.yml | 4 ++-- .github/workflows/tagged_release.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2039d4f..e895c36 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,10 +12,10 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'zulu' - name: Cache SonarCloud packages uses: actions/cache@v3 diff --git a/.github/workflows/tagged_release.yaml b/.github/workflows/tagged_release.yaml index bac60ac..d781934 100644 --- a/.github/workflows/tagged_release.yaml +++ b/.github/workflows/tagged_release.yaml @@ -13,10 +13,10 @@ jobs: - uses: actions/checkout@v3 - run: | git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/* - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: 11.0.7 + java-version: 17 server-id: github # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file: : distribution: 'zulu' From 046a9d21c542ff8d21e74bfeb1928ae43fbd87fa Mon Sep 17 00:00:00 2001 From: Daniel Gstoehl Date: Wed, 14 Dec 2022 15:49:10 +0000 Subject: [PATCH 3/4] switch from cloud connectors to cfenv --- .../pom.xml | 8 +++---- .../ws/config/WsBaseConfig.java | 4 +--- .../ws/config/WsCloudConfig.java | 22 ++----------------- .../ws/config/WsLocalConfig.java | 4 ++-- .../transformation/ws/config/TestConfig.java | 3 +-- .../pom.xml | 1 - 6 files changed, 10 insertions(+), 32 deletions(-) diff --git a/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/pom.xml b/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/pom.xml index 4a00966..02514ec 100644 --- a/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/pom.xml +++ b/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/pom.xml @@ -40,10 +40,10 @@ micrometer-registry-prometheus - org.springframework.boot - spring-boot-starter-cloud-connectors - ${spring-cloud-connectors-version} - + io.pivotal.cfenv + java-cfenv-boot + 2.4.1 + org.springframework.boot spring-boot-starter-validation diff --git a/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/main/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/WsBaseConfig.java b/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/main/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/WsBaseConfig.java index 36b94a3..144ec27 100644 --- a/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/main/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/WsBaseConfig.java +++ b/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/main/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/WsBaseConfig.java @@ -68,9 +68,7 @@ public abstract class WsBaseConfig { @Value("${ws.rate-limit:10}") private int rateLimit; - public abstract DataSource dataSource(); - - public abstract Flyway flyway(); + public abstract Flyway flyway(DataSource dataSource); public abstract BitClient bitClient( ClientRegistrationRepository clientRegistration, ObjectMapper objectMapper); diff --git a/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/main/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/WsCloudConfig.java b/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/main/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/WsCloudConfig.java index aae384d..0c1bc76 100644 --- a/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/main/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/WsCloudConfig.java +++ b/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/main/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/WsCloudConfig.java @@ -17,9 +17,6 @@ import javax.sql.DataSource; import org.flywaydb.core.Flyway; 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.Profile; @@ -49,25 +46,10 @@ public class WsCloudConfig extends WsBaseConfig { @Bean @Override - public DataSource 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 - @Override - public Flyway flyway() { + public Flyway flyway(DataSource dataSource) { Flyway flyWay = Flyway.configure() - .dataSource(dataSource()) + .dataSource(dataSource) .locations("classpath:/db/migration/pgsql_cluster") .load(); flyWay.migrate(); diff --git a/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/main/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/WsLocalConfig.java b/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/main/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/WsLocalConfig.java index d9d63b9..dbc8db4 100644 --- a/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/main/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/WsLocalConfig.java +++ b/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/main/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/WsLocalConfig.java @@ -74,10 +74,10 @@ public DataSource dataSource() { @Bean @Override - public Flyway flyway() { + public Flyway flyway(DataSource dataSource) { Flyway flyWay = Flyway.configure() - .dataSource(dataSource()) + .dataSource(dataSource) .locations("classpath:/db/migration/pgsql") .load(); flyWay.migrate(); diff --git a/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/test/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/TestConfig.java b/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/test/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/TestConfig.java index 48c9825..1cb757a 100644 --- a/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/test/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/TestConfig.java +++ b/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/test/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/TestConfig.java @@ -28,14 +28,13 @@ public class TestConfig extends WsBaseConfig { @Autowired DataSource dataSource; - @Override public DataSource dataSource() { return dataSource; } @Bean @Override - public Flyway flyway() { + public Flyway flyway(DataSource dataSource) { final var flyway = Flyway.configure() .dataSource(dataSource) diff --git a/ch-covidcertificate-backend-transformation/pom.xml b/ch-covidcertificate-backend-transformation/pom.xml index b7a16f9..20a1d13 100644 --- a/ch-covidcertificate-backend-transformation/pom.xml +++ b/ch-covidcertificate-backend-transformation/pom.xml @@ -18,7 +18,6 @@ 2.7.3 3.1.3 - 2.2.13.RELEASE 1.17.3 4.41.0 From 40ecfb54c045154c6802b0a38d37f0a1bed257e6 Mon Sep 17 00:00:00 2001 From: gstoehld Date: Fri, 16 Dec 2022 10:21:46 +0100 Subject: [PATCH 4/4] Remove some unnecessary config code --- .../backend/transformation/ws/config/TestConfig.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/test/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/TestConfig.java b/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/test/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/TestConfig.java index 1cb757a..b3484a3 100644 --- a/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/test/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/TestConfig.java +++ b/ch-covidcertificate-backend-transformation/ch-covidcertificate-backend-transformation-ws/src/test/java/ch/admin/bag/covidcertificate/backend/transformation/ws/config/TestConfig.java @@ -26,12 +26,6 @@ @Configuration public class TestConfig extends WsBaseConfig { - @Autowired DataSource dataSource; - - public DataSource dataSource() { - return dataSource; - } - @Bean @Override public Flyway flyway(DataSource dataSource) {