From c3cda7df4813e7d7990ba882a51ddaf99223c6e3 Mon Sep 17 00:00:00 2001 From: John Niang Date: Tue, 30 Sep 2025 23:58:21 +0800 Subject: [PATCH] Deprecate LocalThumbnail, LocalThumbnailsReconciler, Thumbnail, and ThumbnailReconciler classes for removal in version 2.22.0 --- .../app/core/attachment/AttachmentUtils.java | 41 ------------------- .../attachment/extension/LocalThumbnail.java | 1 + .../core/attachment/extension/Thumbnail.java | 1 + .../reconciler/LocalThumbnailsReconciler.java | 1 + .../reconciler/ThumbnailReconciler.java | 1 + 5 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 application/src/main/java/run/halo/app/core/attachment/AttachmentUtils.java diff --git a/application/src/main/java/run/halo/app/core/attachment/AttachmentUtils.java b/application/src/main/java/run/halo/app/core/attachment/AttachmentUtils.java deleted file mode 100644 index a79e036b7..000000000 --- a/application/src/main/java/run/halo/app/core/attachment/AttachmentUtils.java +++ /dev/null @@ -1,41 +0,0 @@ -package run.halo.app.core.attachment; - -import static run.halo.app.infra.FileCategoryMatcher.IMAGE; - -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URL; -import lombok.experimental.UtilityClass; -import org.springframework.lang.NonNull; -import org.springframework.util.Assert; -import run.halo.app.core.extension.attachment.Attachment; - -@UtilityClass -public class AttachmentUtils { - /** - * Check whether the attachment is an image. - * - * @param attachment Attachment must not be null - * @return true if the attachment is an image, false otherwise - */ - public static boolean isImage(Attachment attachment) { - Assert.notNull(attachment, "Attachment must not be null"); - var mediaType = attachment.getSpec().getMediaType(); - return mediaType != null && IMAGE.match(mediaType); - } - - /** - * Convert URI to URL. - * - * @param uri URI must not be null - * @return URL - * @throws IllegalArgumentException if the URL is malformed - */ - public static URL toUrl(@NonNull URI uri) { - try { - return uri.toURL(); - } catch (MalformedURLException e) { - throw new IllegalArgumentException(e); - } - } -} diff --git a/application/src/main/java/run/halo/app/core/attachment/extension/LocalThumbnail.java b/application/src/main/java/run/halo/app/core/attachment/extension/LocalThumbnail.java index 7cf66c1b1..36662286b 100644 --- a/application/src/main/java/run/halo/app/core/attachment/extension/LocalThumbnail.java +++ b/application/src/main/java/run/halo/app/core/attachment/extension/LocalThumbnail.java @@ -18,6 +18,7 @@ import run.halo.app.extension.GVK; @EqualsAndHashCode(callSuper = true) @GVK(group = "storage.halo.run", version = "v1alpha1", kind = "LocalThumbnail", plural = "localthumbnails", singular = "localthumbnail") +@Deprecated(forRemoval = true, since = "2.22.0") public class LocalThumbnail extends AbstractExtension { public static final String UNIQUE_IMAGE_AND_SIZE_INDEX = "uniqueImageAndSize"; public static final String REQUEST_TO_GENERATE_ANNO = "storage.halo.run/request-to-generate"; diff --git a/application/src/main/java/run/halo/app/core/attachment/extension/Thumbnail.java b/application/src/main/java/run/halo/app/core/attachment/extension/Thumbnail.java index 0228cc99d..3a963724f 100644 --- a/application/src/main/java/run/halo/app/core/attachment/extension/Thumbnail.java +++ b/application/src/main/java/run/halo/app/core/attachment/extension/Thumbnail.java @@ -14,6 +14,7 @@ import run.halo.app.extension.GVK; @EqualsAndHashCode(callSuper = true) @GVK(group = "storage.halo.run", version = "v1alpha1", kind = "Thumbnail", plural = "thumbnails", singular = "thumbnail") +@Deprecated(forRemoval = true, since = "2.22.0") public class Thumbnail extends AbstractExtension { public static final String ID_INDEX = "thumbnail-id"; diff --git a/application/src/main/java/run/halo/app/core/attachment/reconciler/LocalThumbnailsReconciler.java b/application/src/main/java/run/halo/app/core/attachment/reconciler/LocalThumbnailsReconciler.java index 5950adff5..6e7fd7baa 100644 --- a/application/src/main/java/run/halo/app/core/attachment/reconciler/LocalThumbnailsReconciler.java +++ b/application/src/main/java/run/halo/app/core/attachment/reconciler/LocalThumbnailsReconciler.java @@ -21,6 +21,7 @@ import run.halo.app.extension.controller.Reconciler; @Slf4j @Component @RequiredArgsConstructor +@Deprecated(forRemoval = true, since = "2.22.0") class LocalThumbnailsReconciler implements Reconciler { private static final String CLEAN_UP_FINALIZER = "thumbnail-cleaner"; diff --git a/application/src/main/java/run/halo/app/core/attachment/reconciler/ThumbnailReconciler.java b/application/src/main/java/run/halo/app/core/attachment/reconciler/ThumbnailReconciler.java index 8483d88dd..ca0280d48 100644 --- a/application/src/main/java/run/halo/app/core/attachment/reconciler/ThumbnailReconciler.java +++ b/application/src/main/java/run/halo/app/core/attachment/reconciler/ThumbnailReconciler.java @@ -11,6 +11,7 @@ import run.halo.app.extension.controller.Reconciler; @Slf4j @Component +@Deprecated(forRemoval = true, since = "2.22.0") class ThumbnailReconciler implements Reconciler { private final ExtensionClient client;