From 9d9b1527bc0e4416f50eb4966e8b76ad7fcb193b Mon Sep 17 00:00:00 2001
From: John Niang <johnniang@foxmail.com>
Date: Tue, 23 Jan 2024 13:11:41 +0800
Subject: [PATCH] Upgrade Spring Boot to 3.2.2 (#5232)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#### What type of PR is this?

/kind improvement
/area core

#### What this PR does / why we need it:

See https://github.com/spring-projects/spring-boot/releases/tag/v3.2.2 for more.

#### Does this PR introduce a user-facing change?

```release-note
升级依赖 Spring Boot 至 3.2.2
```
---
 application/build.gradle                                        | 2 +-
 .../main/java/run/halo/app/content/comment/ReplyService.java    | 2 +-
 .../infra/exception/handlers/ProblemDetailErrorAttributes.java  | 1 -
 .../app/theme/finders/impl/CommentPublicQueryServiceImpl.java   | 2 +-
 gradle.properties                                               | 1 -
 platform/application/build.gradle                               | 2 +-
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/application/build.gradle b/application/build.gradle
index 2fefdcf388..1f46efff7d 100644
--- a/application/build.gradle
+++ b/application/build.gradle
@@ -2,7 +2,7 @@ import de.undercouch.gradle.tasks.download.Download
 import org.gradle.crypto.checksum.Checksum
 
 plugins {
-    id 'org.springframework.boot' version '3.2.0'
+    id 'org.springframework.boot' version '3.2.2'
     id 'io.spring.dependency-management' version '1.1.0'
     id "com.gorylenko.gradle-git-properties" version "2.3.2"
     id "checkstyle"
diff --git a/application/src/main/java/run/halo/app/content/comment/ReplyService.java b/application/src/main/java/run/halo/app/content/comment/ReplyService.java
index 56962e8704..2010f229ee 100644
--- a/application/src/main/java/run/halo/app/content/comment/ReplyService.java
+++ b/application/src/main/java/run/halo/app/content/comment/ReplyService.java
@@ -31,7 +31,7 @@ static Comparator<Reply> creationTimeAscComparator() {
             reply -> reply.getMetadata().getCreationTimestamp();
         // ascending order by creation time
         // asc nulls high will be placed at the end
-        return Comparator.comparing(creationTime, Comparators.nullsLow())
+        return Comparator.comparing(creationTime, Comparators.nullsHigh())
             .thenComparing(metadataCreationTime)
             .thenComparing(reply -> reply.getMetadata().getName());
     }
diff --git a/application/src/main/java/run/halo/app/infra/exception/handlers/ProblemDetailErrorAttributes.java b/application/src/main/java/run/halo/app/infra/exception/handlers/ProblemDetailErrorAttributes.java
index c3a401be44..e65c36d435 100644
--- a/application/src/main/java/run/halo/app/infra/exception/handlers/ProblemDetailErrorAttributes.java
+++ b/application/src/main/java/run/halo/app/infra/exception/handlers/ProblemDetailErrorAttributes.java
@@ -40,7 +40,6 @@ public Map<String, Object> getErrorAttributes(ServerRequest request,
     @Override
     public Throwable getError(ServerRequest request) {
         return (Throwable) request.attribute(ERROR_INTERNAL_ATTRIBUTE).stream()
-            .peek(error -> request.attributes().putIfAbsent(ERROR_ATTRIBUTE, error))
             .findFirst()
             .orElseThrow(() -> new IllegalStateException(
                 "Missing exception attribute in ServerWebExchange"));
diff --git a/application/src/main/java/run/halo/app/theme/finders/impl/CommentPublicQueryServiceImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/CommentPublicQueryServiceImpl.java
index 29eb383db0..8336ee93c1 100644
--- a/application/src/main/java/run/halo/app/theme/finders/impl/CommentPublicQueryServiceImpl.java
+++ b/application/src/main/java/run/halo/app/theme/finders/impl/CommentPublicQueryServiceImpl.java
@@ -272,7 +272,7 @@ public int compare(Comment c1, Comment c2) {
 
             var creationTimeComparator = Comparator.<Comment, Instant>comparing(
                 comment -> comment.getSpec().getCreationTime(),
-                Comparators.nullsLow(Comparator.<Instant>reverseOrder()));
+                Comparators.nullsHigh(Comparator.<Instant>reverseOrder()));
 
             var nameComparator = Comparator.<Comment, String>comparing(
                 comment -> comment.getMetadata().getName());
diff --git a/gradle.properties b/gradle.properties
index 910803e42c..c7eda50352 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1 @@
 version=2.12.0-SNAPSHOT
-snakeyaml.version=2.2
diff --git a/platform/application/build.gradle b/platform/application/build.gradle
index 7905d86503..6ee5551e21 100644
--- a/platform/application/build.gradle
+++ b/platform/application/build.gradle
@@ -1,7 +1,7 @@
 import org.springframework.boot.gradle.plugin.SpringBootPlugin
 
 plugins {
-    id 'org.springframework.boot' version '3.2.0' apply false
+    id 'org.springframework.boot' version '3.2.2' apply false
     id 'java-platform'
     id 'halo.publish'
     id 'signing'