From 1e92a9ac91d241d5bb74d88698c1032f6cc38366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Thu, 11 Dec 2025 18:11:49 +0000 Subject: [PATCH] Deprecate all S3 interfaces, implementations and services --- src/main/java/loci/common/S3Handle.java | 3 +++ src/main/java/loci/common/services/S3ClientService.java | 3 +++ .../java/loci/common/services/S3ClientServiceException.java | 3 +++ src/main/java/loci/common/services/S3ClientServiceImpl.java | 3 +++ src/main/java/loci/common/services/S3ClientStat.java | 3 +++ src/main/java/loci/common/services/services.properties | 2 ++ src/test/java/loci/common/utests/S3ClientServiceTest.java | 3 +++ src/test/java/loci/common/utests/S3HandleTest.java | 3 +++ 8 files changed, 23 insertions(+) diff --git a/src/main/java/loci/common/S3Handle.java b/src/main/java/loci/common/S3Handle.java index 6a323c69..2b1bfde7 100644 --- a/src/main/java/loci/common/S3Handle.java +++ b/src/main/java/loci/common/S3Handle.java @@ -54,12 +54,15 @@ /** * Provides random access to S3 buckets using the IRandomAccess interface. * Instances of S3Handle are read-only. + * @deprecated The S3 implementations and services will be removed from + * the ome-common library in version 7.0.0 * * @see IRandomAccess * @see StreamHandle * @see java.net.URLConnection * */ +@Deprecated public class S3Handle extends StreamHandle { /** diff --git a/src/main/java/loci/common/services/S3ClientService.java b/src/main/java/loci/common/services/S3ClientService.java index 55e046e0..c0169b98 100644 --- a/src/main/java/loci/common/services/S3ClientService.java +++ b/src/main/java/loci/common/services/S3ClientService.java @@ -37,7 +37,10 @@ /** * An S3 client + * @deprecated The S3 implementations and services will be removed from + * the ome-common library in version 7.0.0 */ +@Deprecated public interface S3ClientService extends Service { /** diff --git a/src/main/java/loci/common/services/S3ClientServiceException.java b/src/main/java/loci/common/services/S3ClientServiceException.java index 2c2d4a80..9cab4d5e 100644 --- a/src/main/java/loci/common/services/S3ClientServiceException.java +++ b/src/main/java/loci/common/services/S3ClientServiceException.java @@ -34,7 +34,10 @@ /** * Exception thrown when internal error specific to the S3 client is raised + * @deprecated The S3 implementations and services will be removed from + * the ome-common library in version 7.0.0 */ +@Deprecated public class S3ClientServiceException extends ServiceException { /** diff --git a/src/main/java/loci/common/services/S3ClientServiceImpl.java b/src/main/java/loci/common/services/S3ClientServiceImpl.java index 3b12b04c..629bc5a6 100644 --- a/src/main/java/loci/common/services/S3ClientServiceImpl.java +++ b/src/main/java/loci/common/services/S3ClientServiceImpl.java @@ -43,7 +43,10 @@ /** * An S3 client + * @deprecated The S3 implementations and services will be removed from + * the ome-common library in version 7.0.0 */ +@Deprecated public class S3ClientServiceImpl extends AbstractService implements S3ClientService { /** diff --git a/src/main/java/loci/common/services/S3ClientStat.java b/src/main/java/loci/common/services/S3ClientStat.java index feceb1b4..0ed276d6 100644 --- a/src/main/java/loci/common/services/S3ClientStat.java +++ b/src/main/java/loci/common/services/S3ClientStat.java @@ -34,7 +34,10 @@ /** * Object stat (attributes) information + * @deprecated The S3 implementations and services will be removed from + * the ome-common library in version 7.0.0 */ +@Deprecated public class S3ClientStat { /** * Create stat object storing length of object diff --git a/src/main/java/loci/common/services/services.properties b/src/main/java/loci/common/services/services.properties index 8576e41e..9168c95c 100644 --- a/src/main/java/loci/common/services/services.properties +++ b/src/main/java/loci/common/services/services.properties @@ -54,6 +54,8 @@ loci.formats.services.JPEGTurboService=loci.formats.services.JPEGTurboServiceImp loci.formats.services.EXIFService=loci.formats.services.EXIFServiceImpl loci.formats.services.JPEGXRService=loci.formats.services.JPEGXRServiceImpl # Minio S3 client service +# Deprecated: the S3 implementations and services will be removed from +# the ome-common library in version 7.0.0 loci.common.services.S3ClientService=loci.common.services.S3ClientServiceImpl # OME Codecs JAI Image I/O service ome.codecs.services.JAIIIOService=ome.codecs.services.JAIIIOServiceImpl diff --git a/src/test/java/loci/common/utests/S3ClientServiceTest.java b/src/test/java/loci/common/utests/S3ClientServiceTest.java index fa0bb657..d186f076 100644 --- a/src/test/java/loci/common/utests/S3ClientServiceTest.java +++ b/src/test/java/loci/common/utests/S3ClientServiceTest.java @@ -58,9 +58,12 @@ /** * Unit tests for the loci.common.service.S3ClientServiceImpl class. + * @deprecated The S3 implementations and services will be removed from + * the ome-common library in version 7.0.0 * * @see loci.common.URLHandle */ +@Deprecated @Test(groups="readTests") public class S3ClientServiceTest { diff --git a/src/test/java/loci/common/utests/S3HandleTest.java b/src/test/java/loci/common/utests/S3HandleTest.java index fc49416f..cf913e55 100644 --- a/src/test/java/loci/common/utests/S3HandleTest.java +++ b/src/test/java/loci/common/utests/S3HandleTest.java @@ -51,9 +51,12 @@ /** * Unit tests for the loci.common.S3Handle class. + * @deprecated The S3 implementations and services will be removed from + * the ome-common library in version 7.0.0 * * @see loci.common.URLHandle */ +@Deprecated @Test(groups="readTests") public class S3HandleTest {