Update spotbugs

swissquote · Feb 7, 2024 · 6b4afa3 · 6b4afa3
1 parent de3ecb7
commit 6b4afa3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/core/src/main/java/com/github/swissquote/carnotzet/core/Carnotzet.java b/core/src/main/java/com/github/swissquote/carnotzet/core/Carnotzet.java
@@ -31,6 +31,7 @@
 import com.github.swissquote.carnotzet.core.maven.ResourcesManager;
 import com.google.common.base.Strings;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
@@ -73,6 +74,7 @@ public class Carnotzet {
 	@Getter
 	private final Boolean supportLegacyDnsNames;
 
+	@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
 	public Carnotzet(CarnotzetConfig config) {
 		log.debug("Creating new carnotzet with config [{}]", config);
 		this.config = config;

diff --git a/...src/main/java/com/github/swissquote/carnotzet/core/util/ContainerStartupWrapperUtils.java b/...src/main/java/com/github/swissquote/carnotzet/core/util/ContainerStartupWrapperUtils.java
@@ -22,6 +22,7 @@
 import com.github.swissquote.carnotzet.core.docker.registry.ImageRef;
 import com.github.swissquote.carnotzet.core.runtime.DefaultCommandRunner;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
@@ -147,6 +148,7 @@ public static class StartupWrapper {
 		// Local images may not be available for target runtime environment (ie : cloud)
 		private Boolean ignoreLocalImages = false;
 
+		@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
 		public StartupWrapper(@NonNull CarnotzetModule moduleToWrap) {
 			this.moduleToWrap = moduleToWrap;
 		}

diff --git a/core/src/main/java/com/github/swissquote/carnotzet/core/util/FileSystemCache.java b/core/src/main/java/com/github/swissquote/carnotzet/core/util/FileSystemCache.java
@@ -25,6 +25,7 @@ public class FileSystemCache<T> {
 	private final Class<T> deserializationType;
 	private final ObjectMapper jsonMapper;
 
+	@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
 	public FileSystemCache(Path cachePath, Class<T> deserializationType) {
 		this.cachePath = cachePath;
 		this.deserializationType = deserializationType;

diff --git a/core/src/main/java/com/github/swissquote/carnotzet/core/welcome/WelcomePageGenerator.java b/core/src/main/java/com/github/swissquote/carnotzet/core/welcome/WelcomePageGenerator.java
@@ -13,6 +13,7 @@
 import com.google.common.io.Files;
 import com.google.common.io.Resources;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -24,6 +25,7 @@ public class WelcomePageGenerator {
 	private final String after;
 	private final List<WelcomePagePostProcessor> postProcessors;
 
+	@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
 	public WelcomePageGenerator() {
 
 		try {
@@ -37,6 +39,7 @@ public WelcomePageGenerator() {
 		this.postProcessors = Collections.emptyList();
 	}
 
+	@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
 	public WelcomePageGenerator(List<WelcomePagePostProcessor> postProcessors) {
 		try {
 			this.before = Resources.toString(Thread.currentThread().getContextClassLoader().getResource("welcome/before.html"), Charsets.UTF_8);

diff --git a/...ain/java/com/github/swissquote/carnotzet/runtime/extension/ContainerIpsDumpExtension.java b/...ain/java/com/github/swissquote/carnotzet/runtime/extension/ContainerIpsDumpExtension.java
@@ -1,6 +1,7 @@
 package com.github.swissquote.carnotzet.runtime.extension;
 
 import java.io.File;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Comparator;
@@ -44,9 +45,11 @@ public CarnotzetModule beforeStart(CarnotzetModule module, ContainerOrchestratio
 	@SneakyThrows
 	public CarnotzetModule afterStart(CarnotzetModule module, ContainerOrchestrationRuntime runtime, Carnotzet carnotzet) {
 		log.info("After start");
-		dumpDirectory.toFile().mkdirs();
+		if (!dumpDirectory.toFile().mkdirs()) {
+			log.info("Could not delete [{}]", dumpDirectory);
+		}
 		Container container = runtime.getContainer(module.getServiceId());
-		byte[] ipStrBytes = container.getIp().getBytes();
+		byte[] ipStrBytes = container.getIp().getBytes(StandardCharsets.UTF_8);
 		Files.write(dumpDirectory.resolve(module.getServiceId()), ipStrBytes);
 		return module;
 	}

diff --git a/pom.xml b/pom.xml
@@ -97,7 +97,7 @@
 				<plugin>
 					<groupId>com.github.spotbugs</groupId>
 					<artifactId>spotbugs-maven-plugin</artifactId>
-					<version>4.7.1.1</version>
+					<version>4.8.3.0</version>
 					<configuration>
 						<effort>Max</effort>
 						<threshold>Low</threshold>