EIS-5488: Upgrading Spring boot version to 3.5.0

Author: tavv94

symphony-bdk-bom/build.gradle

@@ -16,7 +16,7 @@ repositories {
 
 dependencies {
     // import Spring Boot's BOM
-    api platform('org.springframework.boot:spring-boot-dependencies:3.3.12')
+    api platform('org.springframework.boot:spring-boot-dependencies:3.5.3')
     // import Jackson's BOM
     api platform('com.fasterxml.jackson:jackson-bom:2.18.2')
     // import Jersey's BOM
@@ -70,13 +70,14 @@ dependencies {
         api 'com.github.jknack:handlebars:4.3.1'
         api 'org.reflections:reflections:0.10.2'
 
-        api 'org.junit.jupiter:junit-jupiter:5.10.1'
-        api 'org.junit.jupiter:junit-jupiter-api:5.10.1'
-        api 'org.junit.jupiter:junit-jupiter-engine:5.10.1'
+        api "org.junit.jupiter:junit-jupiter:5.10.1"
+        api "org.junit.jupiter:junit-jupiter-api:5.10.1"
+        api "org.junit.jupiter:junit-jupiter-engine:5.10.1"
+        api "org.junit.platform:junit-platform-launcher:1.10.1"
         api 'com.tngtech.archunit:archunit-junit5:1.2.1'
         api 'org.mock-server:mockserver-netty:5.15.0'
-        api 'org.mockito:mockito-core:5.8.0'
-        api 'org.mockito:mockito-junit-jupiter:5.8.0'
+        api "org.mockito:mockito-core:5.11.0"
+        api "org.mockito:mockito-junit-jupiter:5.11.0"
         api 'org.assertj:assertj-core:3.24.2'
 
         api 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0'

symphony-bdk-config/build.gradle

@@ -24,4 +24,5 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter'
     testImplementation 'ch.qos.logback:logback-classic'
     testImplementation 'org.assertj:assertj-core'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }

symphony-bdk-config/src/main/java/com/symphony/bdk/core/config/BdkConfigParser.java

@@ -46,10 +46,15 @@ public JsonNode parse(InputStream inputStream) throws BdkConfigException {
   }
 
   public JsonNode parseJsonNode(InputStream inputStream) throws BdkConfigException {
-    String content = new BufferedReader(
-        new InputStreamReader(inputStream, StandardCharsets.UTF_8))
-        .lines()
-        .collect(Collectors.joining("\n"));
+    String content = "";
+    try (
+        InputStreamReader isr = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
+        BufferedReader reader = new BufferedReader(isr)
+    ) {
+        content = reader.lines().collect(Collectors.joining("\n"));
+    } catch (IOException e) {
+        log.debug("Error while reading file content");
+    }
     try {
       return JSON_MAPPER.readTree(content);
     } catch (IOException e) {

symphony-bdk-config/src/test/java/com/symphony/bdk/core/config/BdkConfigLoaderTest.java

@@ -16,6 +16,7 @@
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.FileOutputStream;
+import java.io.OutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -178,8 +179,12 @@ void testLoadConfigFromSymphonyDirectory() throws Exception {
     final String tmpConfigFileName = UUID.randomUUID().toString() + "-config.yaml";
     final Path tmpConfigPath = Paths.get(System.getProperty("user.home"), ".symphony", tmpConfigFileName);
     FileUtils.forceMkdirParent(tmpConfigPath.toFile());
-    final InputStream configInputStream = this.getClass().getResourceAsStream("/config/config.yaml");
-    IOUtils.copy(configInputStream, new FileOutputStream(tmpConfigPath.toFile()));
+    try (
+      InputStream configInputStream = this.getClass().getResourceAsStream("/config/config.yaml");
+      OutputStream out = new FileOutputStream(tmpConfigPath.toFile())
+    ) {
+        IOUtils.copy(configInputStream, out);
+    }
 
     final BdkConfig config = BdkConfigLoader.loadFromSymphonyDir(tmpConfigFileName);
     assertThat(config).isNotNull();

symphony-bdk-core/build.gradle

@@ -72,6 +72,7 @@ dependencies {
     testImplementation 'org.mockito:mockito-core'
     testImplementation 'org.mockito:mockito-junit-jupiter'
     testImplementation 'org.assertj:assertj-core'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 // OpenAPI code generation

symphony-bdk-core/src/main/java/com/symphony/bdk/core/auth/AuthenticatorFactory.java

@@ -36,8 +36,9 @@
 /**
  * Factory class that provides new instances for the main authenticators :
  * <ul>
- *   <li>{@link BotAuthenticator} : to authenticate the main Bot service account</li>
- *   <li>{@link OboAuthenticator} : to perform on-behalf-of authentication</li>
+ * <li>{@link BotAuthenticator} : to authenticate the main Bot service
+ * account</li>
+ * <li>{@link OboAuthenticator} : to perform on-behalf-of authentication</li>
  * </ul>
  */
 @Slf4j
@@ -64,8 +65,7 @@ public AuthenticatorFactory(@Nonnull BdkConfig bdkConfig, @Nonnull ApiClientFact
    *
    * @return a new {@link BotAuthenticator} instance.
    */
-  public @Nonnull
-  BotAuthenticator getBotAuthenticator() throws AuthInitializationException {
+  public @Nonnull BotAuthenticator getBotAuthenticator() throws AuthInitializationException {
     if (this.config.getBot().isBothCertificateAndRsaConfigured()) {
       throw new AuthInitializationException(
           "Both of certificate and rsa authentication are configured. Only one of them should be provided.");
@@ -82,8 +82,7 @@ BotAuthenticator getBotAuthenticator() throws AuthInitializationException {
           this.apiClientFactory.getLoginClient(),
           this.apiClientFactory.getSessionAuthClient(),
           this.apiClientFactory.getKeyAuthClient(),
-          new AgentVersionService(new SignalsApi(this.apiClientFactory.getAgentClient()))
-      );
+          new AgentVersionService(new SignalsApi(this.apiClientFactory.getAgentClient())));
     }
     if (this.config.getBot().isRsaAuthenticationConfigured()) {
       if (!this.config.getBot().isRsaConfigurationValid()) {
@@ -97,8 +96,7 @@ BotAuthenticator getBotAuthenticator() throws AuthInitializationException {
           this.loadPrivateKeyFromAuthenticationConfig(this.config.getBot()),
           this.apiClientFactory.getLoginClient(),
           this.apiClientFactory.getRelayClient(),
-          new AgentVersionService(new SignalsApi(this.apiClientFactory.getAgentClient()))
-      );
+          new AgentVersionService(new SignalsApi(this.apiClientFactory.getAgentClient())));
     }
     throw new AuthInitializationException("Neither RSA private key nor certificate is configured.");
   }
@@ -108,8 +106,7 @@ BotAuthenticator getBotAuthenticator() throws AuthInitializationException {
    *
    * @return a new {@link OboAuthenticator} instance.
    */
-  public @Nonnull
-  OboAuthenticator getOboAuthenticator() throws AuthInitializationException {
+  public @Nonnull OboAuthenticator getOboAuthenticator() throws AuthInitializationException {
     if (this.config.getApp().isBothCertificateAndRsaConfigured()) {
       throw new AuthInitializationException(
           "Both of certificate and rsa authentication are configured. Only one of them should be provided.");
@@ -122,8 +119,7 @@ OboAuthenticator getOboAuthenticator() throws AuthInitializationException {
       return new OboAuthenticatorCertImpl(
           this.config.getRetry(),
           this.config.getApp().getAppId(),
-          this.apiClientFactory.getExtAppSessionAuthClient()
-      );
+          this.apiClientFactory.getExtAppSessionAuthClient());
     }
     if (this.config.getApp().isRsaAuthenticationConfigured()) {
       if (!this.config.getApp().isRsaConfigurationValid()) {
@@ -134,8 +130,7 @@ OboAuthenticator getOboAuthenticator() throws AuthInitializationException {
           this.config.getRetry(),
           this.config.getApp().getAppId(),
           this.loadPrivateKeyFromAuthenticationConfig(this.config.getApp()),
-          this.apiClientFactory.getLoginClient()
-      );
+          this.apiClientFactory.getLoginClient());
     }
     throw new AuthInitializationException("Neither RSA private key nor certificate is configured.");
   }
@@ -145,8 +140,7 @@ OboAuthenticator getOboAuthenticator() throws AuthInitializationException {
    *
    * @return a new {@link ExtensionAppAuthenticator} instance.
    */
-  public @Nonnull
-  ExtensionAppAuthenticator getExtensionAppAuthenticator() throws AuthInitializationException {
+  public @Nonnull ExtensionAppAuthenticator getExtensionAppAuthenticator() throws AuthInitializationException {
     if (this.config.getApp().isBothCertificateAndRsaConfigured()) {
       throw new AuthInitializationException(
           "Both of certificate and rsa authentication are configured. Only one of them should be provided.");
@@ -173,8 +167,7 @@ ExtensionAppAuthenticator getExtensionAppAuthenticator() throws AuthInitializati
           this.loadPrivateKeyFromAuthenticationConfig(this.config.getApp()),
           this.apiClientFactory.getLoginClient(),
           this.apiClientFactory.getPodClient(),
-          extensionAppTokensRepository
-      );
+          extensionAppTokensRepository);
     }
     throw new AuthInitializationException("Neither RSA private key nor certificate is configured.");
   }
@@ -225,10 +218,13 @@ private static String loadPrivateKey(String privateKeyPath) throws IOException,
         throw new AuthInitializationException(
             "Unable to find RSA private key as classpath resource from: " + privateKeyPath);
       }
+      try (InputStream resourceStream = is) {
+        return IOUtils.toString(resourceStream, StandardCharsets.UTF_8);
+      }
     } else {
-      is = new FileInputStream(privateKeyPath);
+      try (InputStream fileStream = new FileInputStream(privateKeyPath)) {
+        return IOUtils.toString(fileStream, StandardCharsets.UTF_8);
+      }
     }
-
-    return IOUtils.toString(is, StandardCharsets.UTF_8);
   }
 }

symphony-bdk-core/src/test/java/com/symphony/bdk/core/auth/AuthenticatorFactoryTest.java

@@ -28,6 +28,8 @@
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.UUID;
 import java.util.function.Supplier;
@@ -387,6 +389,8 @@ private BdkConfig createRsaConfigDeprecatedPath(Supplier<String> privateKeyPathS
 
   @SneakyThrows
   private static void writeContentToPath(String content, Path path) {
-    IOUtils.write(content, new FileOutputStream(path.toFile()), "utf-8");
+    try (OutputStream out = new FileOutputStream(path.toFile())) {
+      IOUtils.write(content, out, StandardCharsets.UTF_8);
+    }
   }
 }