From cb968de154cab22211654df6e79db9da109a9449 Mon Sep 17 00:00:00 2001
From: longjuan <769022681@qq.com>
Date: Tue, 2 Jul 2024 23:27:25 +0800
Subject: [PATCH] fix: apply natural ordering to policy and attachment listings
 (#160)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```release-note
None
```
传递unsorted以支持Halo 2.17版本
---
 src/main/java/run/halo/s3os/S3LinkServiceImpl.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/run/halo/s3os/S3LinkServiceImpl.java b/src/main/java/run/halo/s3os/S3LinkServiceImpl.java
index 552a3ae..cd3cf27 100644
--- a/src/main/java/run/halo/s3os/S3LinkServiceImpl.java
+++ b/src/main/java/run/halo/s3os/S3LinkServiceImpl.java
@@ -3,6 +3,7 @@
 import static run.halo.s3os.S3OsAttachmentHandler.OBJECT_KEY;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -14,6 +15,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.domain.Sort;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
@@ -53,7 +55,7 @@ public class S3LinkServiceImpl implements S3LinkService {
     @Override
     public Flux<Policy> listS3Policies() {
         return client.list(Policy.class, (policy) -> "s3os".equals(
-            policy.getSpec().getTemplateName()), null);
+            policy.getSpec().getTemplateName()), Comparator.naturalOrder());
     }
 
     @Override
@@ -90,7 +92,7 @@ public Mono<S3ListResult> listObjects(String policyName, String continuationToke
                         ListOptions listOptions = new ListOptions();
                         listOptions.setFieldSelector(
                             FieldSelector.of(QueryFactory.equal("spec.policyName", policyName)));
-                        return client.listAll(Attachment.class, listOptions, null)
+                        return client.listAll(Attachment.class, listOptions, Sort.unsorted())
                             .doOnNext(attachment -> {
                                 S3ListResult.ObjectVo objectVo =
                                     objectVos.get(attachment.getMetadata().getAnnotations()
@@ -132,7 +134,7 @@ private Mono<Set<String>> getExistingAttachments(Set<String> objectKeys,
         ListOptions listOptions = new ListOptions();
         listOptions.setFieldSelector(
             FieldSelector.of(QueryFactory.equal("spec.policyName", policyName)));
-        return client.listAll(Attachment.class, listOptions, null)
+        return client.listAll(Attachment.class, listOptions, Sort.unsorted())
             .filter(attachment -> StringUtils.isNotBlank(
                 MetadataUtil.nullSafeAnnotations(attachment).get(S3OsAttachmentHandler.OBJECT_KEY))
                 && objectKeys.contains(