feat: close minioClient properly

InseeFr · Feb 9, 2024 · 4c697e4 · 4c697e4
1 parent 01bc923
commit 4c697e4
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/arc-utils/src/main/java/fr/insee/arc/utils/minio/S3Template.java b/arc-utils/src/main/java/fr/insee/arc/utils/minio/S3Template.java
@@ -16,6 +16,7 @@
 import io.minio.errors.InvalidResponseException;
 import io.minio.errors.ServerException;
 import io.minio.errors.XmlParserException;
+import okhttp3.OkHttpClient;
 
 public class S3Template {
 
@@ -34,6 +35,8 @@ public S3Template(String s3ApiUri, String bucket, String accessKey, String secre
 
 	private MinioClient minioClient;
 
+	private OkHttpClient httpClient;
+
 
 	public MinioClient getMinioClient() {
 		if (this.minioClient == null) {
@@ -48,9 +51,8 @@ public MinioClient getMinioClient() {
 	}
 
 	private void buildMinioClient() throws KeyManagementException, NoSuchAlgorithmException {
-
-
-		this.minioClient = MinioClient.builder().endpoint(s3ApiUri).credentials(accessKey, secretKey).build();
+		httpClient = new OkHttpClient().newBuilder().build();
+		this.minioClient = MinioClient.builder().endpoint(s3ApiUri).credentials(accessKey, secretKey).httpClient(httpClient).build();
 		this.minioClient.ignoreCertCheck();
 	}
 
@@ -73,5 +75,10 @@ public void createDirectory(String path) throws ArcException {
 		}
 	}
 
+	public void closeMinioClient()
+	{
+		httpClient.dispatcher().executorService().shutdown();
+		this.minioClient=null;
+	}
 
 }