Skip to content

WIP: Upgrade to Spring Boot 4.0.0-RC1 and refactor imports for consistency #7867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
JohnNiang wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

WIP: Upgrade to Spring Boot 4.0.0-RC1 and refactor imports for consistency #7867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94fe35b
Upgrade to Spring Boot 4.0.0-RC1 and refactor imports for consistency
JohnNiang Oct 25, 2025
6c5f87f
Refactor import statements in HaloErrorConfiguration, ThemeFinderImpl…
JohnNiang Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ dependencies {
api 'org.springframework.boot:spring-boot-starter-webflux'
api 'org.springframework.boot:spring-boot-starter-validation'
api 'org.springframework.boot:spring-boot-starter-data-r2dbc'
api 'org.springframework.boot:spring-boot-integration'
api 'org.springframework.boot:spring-boot-jackson2'
api 'org.springframework.boot:spring-boot-session'
api 'org.springframework.session:spring-session-core'

// Spring Security
Expand Down
12 changes: 9 additions & 3 deletions api/src/main/java/run/halo/app/core/extension/Role.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import static run.halo.app.core.extension.Role.KIND;
import static run.halo.app.core.extension.Role.VERSION;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import java.util.List;
import lombok.Data;
Expand Down Expand Up @@ -102,9 +104,13 @@ public PolicyRule() {
this(null, null, null, null, null);
}

public PolicyRule(String[] apiGroups, String[] resources,
String[] resourceNames,
String[] nonResourceURLs, String[] verbs) {
@JsonCreator
public PolicyRule(
@JsonProperty("apiGroups") String[] apiGroups,
@JsonProperty("resources") String[] resources,
@JsonProperty("resourceNames") String[] resourceNames,
@JsonProperty("nonResourceURLs") String[] nonResourceURLs,
@JsonProperty("verbs") String[] verbs) {
this.apiGroups = nullElseEmpty(apiGroups);
this.resources = nullElseEmpty(resources);
this.resourceNames = nullElseEmpty(resourceNames);
Expand Down
106 changes: 53 additions & 53 deletions api/src/main/java/run/halo/app/extension/JsonExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
package run.halo.app.extension;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.node.LongNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.TextNode;
import java.io.IOException;
import java.time.Instant;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import tools.jackson.core.JacksonException;
import tools.jackson.core.JsonGenerator;
import tools.jackson.core.JsonParser;
import tools.jackson.core.type.TypeReference;
import tools.jackson.databind.DeserializationContext;
import tools.jackson.databind.MapperFeature;
import tools.jackson.databind.SerializationContext;
import tools.jackson.databind.ValueDeserializer;
import tools.jackson.databind.ValueSerializer;
import tools.jackson.databind.annotation.JsonDeserialize;
import tools.jackson.databind.annotation.JsonSerialize;
import tools.jackson.databind.json.JsonMapper;
import tools.jackson.databind.node.LongNode;
import tools.jackson.databind.node.ObjectNode;
import tools.jackson.databind.node.StringNode;

/**
* JsonExtension is representation an extension using ObjectNode. This extension is preparing for
Expand All @@ -30,21 +30,22 @@
@JsonDeserialize(using = JsonExtension.ObjectNodeExtensionDeSerializer.class)
public class JsonExtension implements Extension {

private final ObjectMapper objectMapper;
private static final JsonMapper JSON_MAPPER = JsonMapper.builder()
.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS)
.build();

private final ObjectNode objectNode;

public JsonExtension(ObjectMapper objectMapper) {
this(objectMapper, objectMapper.createObjectNode());
public JsonExtension() {
this(JSON_MAPPER.createObjectNode());
}

public JsonExtension(ObjectMapper objectMapper, ObjectNode objectNode) {
this.objectMapper = objectMapper;
public JsonExtension(ObjectNode objectNode) {
this.objectNode = objectNode;
}

public JsonExtension(ObjectMapper objectMapper, Extension e) {
this(objectMapper, (ObjectNode) objectMapper.valueToTree(e));
public JsonExtension(Extension e) {
this((ObjectNode) JSON_MAPPER.valueToTree(e));
}

@Override
Expand All @@ -59,47 +60,46 @@ public MetadataOperator getMetadata() {
@Override
public String getApiVersion() {
var apiVersionNode = objectNode.get("apiVersion");
return apiVersionNode == null ? null : apiVersionNode.asText();
return apiVersionNode == null ? null : apiVersionNode.asString();
}

@Override
public String getKind() {
return objectNode.get("kind").asText();
return objectNode.get("kind").asString();
}

@Override
public void setApiVersion(String apiVersion) {
objectNode.set("apiVersion", new TextNode(apiVersion));
objectNode.set("apiVersion", new StringNode(apiVersion));
}

@Override
public void setKind(String kind) {
objectNode.set("kind", new TextNode(kind));
objectNode.set("kind", new StringNode(kind));
}

@Override
public void setMetadata(MetadataOperator metadata) {
objectNode.set("metadata", objectMapper.valueToTree(metadata));
objectNode.set("metadata", JSON_MAPPER.valueToTree(metadata));
}

public static class ObjectNodeExtensionSerializer extends JsonSerializer<JsonExtension> {
public static class ObjectNodeExtensionSerializer extends ValueSerializer<JsonExtension> {

@Override
public void serialize(JsonExtension value, JsonGenerator gen,
SerializerProvider serializers) throws IOException {
SerializationContext ctxt) throws JacksonException {
gen.writeTree(value.objectNode);
}
}

public static class ObjectNodeExtensionDeSerializer
extends JsonDeserializer<JsonExtension> {
extends ValueDeserializer<JsonExtension> {

@Override
public JsonExtension deserialize(JsonParser p, DeserializationContext ctxt)
throws IOException {
var mapper = (ObjectMapper) p.getCodec();
var treeNode = mapper.readTree(p);
return new JsonExtension(mapper, (ObjectNode) treeNode);
throws JacksonException {
var treeNode = p.readValueAsTree();
return new JsonExtension((ObjectNode) treeNode);
}
}

Expand All @@ -117,12 +117,12 @@ public ObjectNode getInternal() {
*
* @return object mapper
*/
public ObjectMapper getObjectMapper() {
return objectMapper;
public static JsonMapper getJsonMapper() {
return JSON_MAPPER;
}

public MetadataOperator getMetadataOrCreate() {
var metadataNode = objectMapper.createObjectNode();
var metadataNode = JSON_MAPPER.createObjectNode();
objectNode.set("metadata", metadataNode);
return new ObjectNodeMetadata(metadataNode);
}
Expand Down Expand Up @@ -155,76 +155,76 @@ public ObjectNodeMetadata(ObjectNode objectNode) {
@Override
public String getName() {
var nameNode = objectNode.get("name");
return objectMapper.convertValue(nameNode, String.class);
return JSON_MAPPER.convertValue(nameNode, String.class);
}

@Override
public String getGenerateName() {
var generateNameNode = objectNode.get("generateName");
return objectMapper.convertValue(generateNameNode, String.class);
return JSON_MAPPER.convertValue(generateNameNode, String.class);
}

@Override
public Map<String, String> getLabels() {
var labelsNode = objectNode.get("labels");
return objectMapper.convertValue(labelsNode, new TypeReference<>() {
return JSON_MAPPER.convertValue(labelsNode, new TypeReference<>() {
});
}

@Override
public Map<String, String> getAnnotations() {
var annotationsNode = objectNode.get("annotations");
return objectMapper.convertValue(annotationsNode, new TypeReference<>() {
return JSON_MAPPER.convertValue(annotationsNode, new TypeReference<>() {
});
}

@Override
public Long getVersion() {
JsonNode versionNode = objectNode.get("version");
return objectMapper.convertValue(versionNode, Long.class);
var versionNode = objectNode.get("version");
return JSON_MAPPER.convertValue(versionNode, Long.class);
}

@Override
public Instant getCreationTimestamp() {
return objectMapper.convertValue(objectNode.get("creationTimestamp"), Instant.class);
return JSON_MAPPER.convertValue(objectNode.get("creationTimestamp"), Instant.class);
}

@Override
public Instant getDeletionTimestamp() {
return objectMapper.convertValue(objectNode.get("deletionTimestamp"), Instant.class);
return JSON_MAPPER.convertValue(objectNode.get("deletionTimestamp"), Instant.class);
}

@Override
public Set<String> getFinalizers() {
return objectMapper.convertValue(objectNode.get("finalizers"), new TypeReference<>() {
return JSON_MAPPER.convertValue(objectNode.get("finalizers"), new TypeReference<>() {
});
}

@Override
public void setName(String name) {
if (name != null) {
objectNode.set("name", TextNode.valueOf(name));
objectNode.set("name", StringNode.valueOf(name));
}
}

@Override
public void setGenerateName(String generateName) {
if (generateName != null) {
objectNode.set("generateName", TextNode.valueOf(generateName));
objectNode.set("generateName", StringNode.valueOf(generateName));
}
}

@Override
public void setLabels(Map<String, String> labels) {
if (labels != null) {
objectNode.set("labels", objectMapper.valueToTree(labels));
objectNode.set("labels", JSON_MAPPER.valueToTree(labels));
}
}

@Override
public void setAnnotations(Map<String, String> annotations) {
if (annotations != null) {
objectNode.set("annotations", objectMapper.valueToTree(annotations));
objectNode.set("annotations", JSON_MAPPER.valueToTree(annotations));
}
}

Expand All @@ -238,21 +238,21 @@ public void setVersion(Long version) {
@Override
public void setCreationTimestamp(Instant creationTimestamp) {
if (creationTimestamp != null) {
objectNode.set("creationTimestamp", objectMapper.valueToTree(creationTimestamp));
objectNode.set("creationTimestamp", JSON_MAPPER.valueToTree(creationTimestamp));
}
}

@Override
public void setDeletionTimestamp(Instant deletionTimestamp) {
if (deletionTimestamp != null) {
objectNode.set("deletionTimestamp", objectMapper.valueToTree(deletionTimestamp));
objectNode.set("deletionTimestamp", JSON_MAPPER.valueToTree(deletionTimestamp));
}
}

@Override
public void setFinalizers(Set<String> finalizers) {
if (finalizers != null) {
objectNode.set("finalizers", objectMapper.valueToTree(finalizers));
objectNode.set("finalizers", JSON_MAPPER.valueToTree(finalizers));
}
}

Expand Down
1 change: 1 addition & 0 deletions api/src/main/java/run/halo/app/extension/MetadataOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* @author johnniang
*/
@JsonDeserialize(as = Metadata.class)
@tools.jackson.databind.annotation.JsonDeserialize(as = Metadata.class)
@Schema(implementation = Metadata.class)
public interface MetadataOperator {

Expand Down
Loading
Loading