diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..f841c2903 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +console +.github +.git \ No newline at end of file diff --git a/.gitignore b/.gitignore index fd2a99521..1f6cf1bae 100755 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,8 @@ logs/ ### Gradle .gradle -/build/ -/out/ +build/ +out/ !gradle/wrapper/gradle-wrapper.jar bin/ @@ -71,7 +71,7 @@ application-local.yaml application-local.properties ### Zip file for test -!src/test/resources/themes/*.zip -!src/main/resources/themes/*.zip -src/main/resources/console/ -src/main/resources/presets/ +!application/src/test/resources/themes/*.zip +!application/src/main/resources/themes/*.zip +application/src/main/resources/console/ +application/src/main/resources/presets/ diff --git a/Dockerfile b/Dockerfile index 80cfb9b5d..539fd484a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM eclipse-temurin:17-jre as builder WORKDIR application -ARG JAR_FILE=build/libs/halo-*.jar +ARG JAR_FILE=application/build/libs/*.jar COPY ${JAR_FILE} application.jar RUN java -Djarmode=layertools -jar application.jar extract diff --git a/api/build.gradle b/api/build.gradle new file mode 100644 index 000000000..67351ce60 --- /dev/null +++ b/api/build.gradle @@ -0,0 +1,81 @@ +plugins { + id 'java-library' + id 'maven-publish' + id "io.freefair.lombok" version "8.0.0-rc2" +} + +group = 'run.halo.app' +description = 'API of halo project, connecting by other projects.' + +repositories { + mavenCentral() +} + +dependencies { + api platform(project(':platform:application')) + + api 'org.springframework.boot:spring-boot-starter-actuator' + api 'org.springframework.boot:spring-boot-starter-data-jpa' + api 'org.springframework.boot:spring-boot-starter-mail' + api 'org.springframework.boot:spring-boot-starter-thymeleaf' + 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' + + // Spring Security + api 'org.springframework.boot:spring-boot-starter-security' + api 'org.springframework.security:spring-security-oauth2-jose' + api 'org.springframework.security:spring-security-oauth2-client' + api 'org.springframework.security:spring-security-oauth2-resource-server' + + api "org.springdoc:springdoc-openapi-starter-webflux-ui" + api 'org.openapi4j:openapi-schema-validator' + api "net.bytebuddy:byte-buddy" + + // Apache Lucene + api "org.apache.lucene:lucene-core" + api "org.apache.lucene:lucene-queryparser" + api "org.apache.lucene:lucene-highlighter" + api "org.apache.lucene:lucene-backward-codecs" + api 'cn.shenyanchao.ik-analyzer:ik-analyzer' + + api "org.apache.commons:commons-lang3" + api "io.seruco.encoding:base62" + api "org.pf4j:pf4j" + api "com.google.guava:guava" + api "org.jsoup:jsoup" + api "io.github.java-diff-utils:java-diff-utils" + api "org.springframework.integration:spring-integration-core" + api "com.github.java-json-tools:json-patch" + api "org.thymeleaf.extras:thymeleaf-extras-springsecurity6" + + runtimeOnly 'io.r2dbc:r2dbc-h2' + runtimeOnly 'org.postgresql:postgresql' + runtimeOnly 'org.postgresql:r2dbc-postgresql' + runtimeOnly 'org.mariadb:r2dbc-mariadb' + runtimeOnly 'com.github.jasync-sql:jasync-r2dbc-mysql' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.security:spring-security-test' + testImplementation 'io.projectreactor:reactor-test' +} + +java { + withSourcesJar() + withJavadocJar() +} + +tasks.named('test') { + useJUnitPlatform() +} + +publishing { + publications { + library(MavenPublication) { + from components.java + } + } + repositories { + mavenLocal() + } +} \ No newline at end of file diff --git a/src/main/java/run/halo/app/content/comment/CommentSubject.java b/api/src/main/java/run/halo/app/content/comment/CommentSubject.java similarity index 66% rename from src/main/java/run/halo/app/content/comment/CommentSubject.java rename to api/src/main/java/run/halo/app/content/comment/CommentSubject.java index a5d7a31de..cc3a5abcf 100644 --- a/src/main/java/run/halo/app/content/comment/CommentSubject.java +++ b/api/src/main/java/run/halo/app/content/comment/CommentSubject.java @@ -2,7 +2,7 @@ package run.halo.app.content.comment; import org.pf4j.ExtensionPoint; import reactor.core.publisher.Mono; -import run.halo.app.extension.AbstractExtension; +import run.halo.app.extension.Extension; import run.halo.app.extension.Ref; /** @@ -11,7 +11,7 @@ import run.halo.app.extension.Ref; * @author guqing * @since 2.0.0 */ -public interface CommentSubject extends ExtensionPoint { +public interface CommentSubject extends ExtensionPoint { Mono get(String name); diff --git a/src/main/java/run/halo/app/core/extension/AnnotationSetting.java b/api/src/main/java/run/halo/app/core/extension/AnnotationSetting.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/AnnotationSetting.java rename to api/src/main/java/run/halo/app/core/extension/AnnotationSetting.java diff --git a/src/main/java/run/halo/app/core/extension/AuthProvider.java b/api/src/main/java/run/halo/app/core/extension/AuthProvider.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/AuthProvider.java rename to api/src/main/java/run/halo/app/core/extension/AuthProvider.java diff --git a/api/src/main/java/run/halo/app/core/extension/Counter.java b/api/src/main/java/run/halo/app/core/extension/Counter.java new file mode 100644 index 000000000..9e7ed04af --- /dev/null +++ b/api/src/main/java/run/halo/app/core/extension/Counter.java @@ -0,0 +1,41 @@ +package run.halo.app.core.extension; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import run.halo.app.extension.AbstractExtension; +import run.halo.app.extension.GVK; +import run.halo.app.extension.Metadata; + +/** + * A counter for number of requests by extension resource name. + * + * @author guqing + * @since 2.0.0 + */ +@Data +@GVK(group = "metrics.halo.run", version = "v1alpha1", kind = "Counter", plural = "counters", + singular = "counter") +@EqualsAndHashCode(callSuper = true) +public class Counter extends AbstractExtension { + + private Integer visit; + + private Integer upvote; + + private Integer downvote; + + private Integer totalComment; + + private Integer approvedComment; + + public static Counter emptyCounter(String name) { + Counter counter = new Counter(); + counter.setMetadata(new Metadata()); + counter.getMetadata().setName(name); + counter.setUpvote(0); + counter.setTotalComment(0); + counter.setApprovedComment(0); + counter.setVisit(0); + return counter; + } +} diff --git a/src/main/java/run/halo/app/core/extension/Menu.java b/api/src/main/java/run/halo/app/core/extension/Menu.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/Menu.java rename to api/src/main/java/run/halo/app/core/extension/Menu.java diff --git a/src/main/java/run/halo/app/core/extension/MenuItem.java b/api/src/main/java/run/halo/app/core/extension/MenuItem.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/MenuItem.java rename to api/src/main/java/run/halo/app/core/extension/MenuItem.java diff --git a/src/main/java/run/halo/app/core/extension/Plugin.java b/api/src/main/java/run/halo/app/core/extension/Plugin.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/Plugin.java rename to api/src/main/java/run/halo/app/core/extension/Plugin.java diff --git a/src/main/java/run/halo/app/core/extension/ReverseProxy.java b/api/src/main/java/run/halo/app/core/extension/ReverseProxy.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/ReverseProxy.java rename to api/src/main/java/run/halo/app/core/extension/ReverseProxy.java diff --git a/src/main/java/run/halo/app/core/extension/Role.java b/api/src/main/java/run/halo/app/core/extension/Role.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/Role.java rename to api/src/main/java/run/halo/app/core/extension/Role.java diff --git a/src/main/java/run/halo/app/core/extension/RoleBinding.java b/api/src/main/java/run/halo/app/core/extension/RoleBinding.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/RoleBinding.java rename to api/src/main/java/run/halo/app/core/extension/RoleBinding.java diff --git a/src/main/java/run/halo/app/core/extension/Setting.java b/api/src/main/java/run/halo/app/core/extension/Setting.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/Setting.java rename to api/src/main/java/run/halo/app/core/extension/Setting.java diff --git a/src/main/java/run/halo/app/core/extension/Theme.java b/api/src/main/java/run/halo/app/core/extension/Theme.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/Theme.java rename to api/src/main/java/run/halo/app/core/extension/Theme.java diff --git a/src/main/java/run/halo/app/core/extension/User.java b/api/src/main/java/run/halo/app/core/extension/User.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/User.java rename to api/src/main/java/run/halo/app/core/extension/User.java diff --git a/src/main/java/run/halo/app/core/extension/UserConnection.java b/api/src/main/java/run/halo/app/core/extension/UserConnection.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/UserConnection.java rename to api/src/main/java/run/halo/app/core/extension/UserConnection.java diff --git a/src/main/java/run/halo/app/core/extension/attachment/Attachment.java b/api/src/main/java/run/halo/app/core/extension/attachment/Attachment.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/attachment/Attachment.java rename to api/src/main/java/run/halo/app/core/extension/attachment/Attachment.java diff --git a/src/main/java/run/halo/app/core/extension/attachment/Constant.java b/api/src/main/java/run/halo/app/core/extension/attachment/Constant.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/attachment/Constant.java rename to api/src/main/java/run/halo/app/core/extension/attachment/Constant.java diff --git a/src/main/java/run/halo/app/core/extension/attachment/Group.java b/api/src/main/java/run/halo/app/core/extension/attachment/Group.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/attachment/Group.java rename to api/src/main/java/run/halo/app/core/extension/attachment/Group.java diff --git a/src/main/java/run/halo/app/core/extension/attachment/Policy.java b/api/src/main/java/run/halo/app/core/extension/attachment/Policy.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/attachment/Policy.java rename to api/src/main/java/run/halo/app/core/extension/attachment/Policy.java diff --git a/src/main/java/run/halo/app/core/extension/attachment/PolicyTemplate.java b/api/src/main/java/run/halo/app/core/extension/attachment/PolicyTemplate.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/attachment/PolicyTemplate.java rename to api/src/main/java/run/halo/app/core/extension/attachment/PolicyTemplate.java diff --git a/src/main/java/run/halo/app/core/extension/attachment/endpoint/AttachmentHandler.java b/api/src/main/java/run/halo/app/core/extension/attachment/endpoint/AttachmentHandler.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/attachment/endpoint/AttachmentHandler.java rename to api/src/main/java/run/halo/app/core/extension/attachment/endpoint/AttachmentHandler.java diff --git a/src/main/java/run/halo/app/core/extension/content/Category.java b/api/src/main/java/run/halo/app/core/extension/content/Category.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/content/Category.java rename to api/src/main/java/run/halo/app/core/extension/content/Category.java diff --git a/src/main/java/run/halo/app/core/extension/content/Comment.java b/api/src/main/java/run/halo/app/core/extension/content/Comment.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/content/Comment.java rename to api/src/main/java/run/halo/app/core/extension/content/Comment.java diff --git a/src/main/java/run/halo/app/core/extension/content/Constant.java b/api/src/main/java/run/halo/app/core/extension/content/Constant.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/content/Constant.java rename to api/src/main/java/run/halo/app/core/extension/content/Constant.java diff --git a/src/main/java/run/halo/app/core/extension/content/Post.java b/api/src/main/java/run/halo/app/core/extension/content/Post.java similarity index 97% rename from src/main/java/run/halo/app/core/extension/content/Post.java rename to api/src/main/java/run/halo/app/core/extension/content/Post.java index 8982fb654..fbb432edb 100644 --- a/src/main/java/run/halo/app/core/extension/content/Post.java +++ b/api/src/main/java/run/halo/app/core/extension/content/Post.java @@ -13,10 +13,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import run.halo.app.extension.AbstractExtension; -import run.halo.app.extension.ExtensionUtil; import run.halo.app.extension.GVK; import run.halo.app.extension.GroupVersionKind; import run.halo.app.extension.MetadataOperator; +import run.halo.app.extension.MetadataUtil; import run.halo.app.infra.ConditionList; /** @@ -255,11 +255,6 @@ public class Post extends AbstractExtension { return this; } - /** - * Build compact post. - * - * @return a compact post - */ public CompactPost build() { CompactPost compactPost = new CompactPost(); compactPost.setName(name); @@ -271,7 +266,7 @@ public class Post extends AbstractExtension { } public static void changePublishedState(Post post, boolean value) { - Map labels = ExtensionUtil.nullSafeLabels(post); + Map labels = MetadataUtil.nullSafeLabels(post); labels.put(PUBLISHED_LABEL, String.valueOf(value)); } } diff --git a/src/main/java/run/halo/app/core/extension/content/Reply.java b/api/src/main/java/run/halo/app/core/extension/content/Reply.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/content/Reply.java rename to api/src/main/java/run/halo/app/core/extension/content/Reply.java diff --git a/src/main/java/run/halo/app/core/extension/content/SinglePage.java b/api/src/main/java/run/halo/app/core/extension/content/SinglePage.java similarity index 96% rename from src/main/java/run/halo/app/core/extension/content/SinglePage.java rename to api/src/main/java/run/halo/app/core/extension/content/SinglePage.java index 828c48f40..413b241f7 100644 --- a/src/main/java/run/halo/app/core/extension/content/SinglePage.java +++ b/api/src/main/java/run/halo/app/core/extension/content/SinglePage.java @@ -9,9 +9,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import run.halo.app.extension.AbstractExtension; -import run.halo.app.extension.ExtensionUtil; import run.halo.app.extension.GVK; import run.halo.app.extension.GroupVersionKind; +import run.halo.app.extension.MetadataUtil; /** *

Single page extension.

@@ -112,7 +112,7 @@ public class SinglePage extends AbstractExtension { } public static void changePublishedState(SinglePage page, boolean value) { - Map labels = ExtensionUtil.nullSafeLabels(page); + Map labels = MetadataUtil.nullSafeLabels(page); labels.put(PUBLISHED_LABEL, String.valueOf(value)); } } diff --git a/src/main/java/run/halo/app/core/extension/content/Snapshot.java b/api/src/main/java/run/halo/app/core/extension/content/Snapshot.java similarity index 61% rename from src/main/java/run/halo/app/core/extension/content/Snapshot.java rename to api/src/main/java/run/halo/app/core/extension/content/Snapshot.java index e0abb862d..416392702 100644 --- a/src/main/java/run/halo/app/core/extension/content/Snapshot.java +++ b/api/src/main/java/run/halo/app/core/extension/content/Snapshot.java @@ -1,6 +1,5 @@ package run.halo.app.core.extension.content; -import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import java.time.Instant; import java.util.LinkedHashSet; @@ -8,10 +7,7 @@ import java.util.Set; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import org.apache.commons.lang3.StringUtils; import org.springframework.util.Assert; -import run.halo.app.content.ContentWrapper; -import run.halo.app.content.PatchUtils; import run.halo.app.extension.AbstractExtension; import run.halo.app.extension.GVK; import run.halo.app.extension.Ref; @@ -69,27 +65,4 @@ public class Snapshot extends AbstractExtension { contributors.add(name); } - @JsonIgnore - public ContentWrapper applyPatch(Snapshot baseSnapshot) { - Assert.notNull(baseSnapshot, "The baseSnapshot must not be null."); - String baseSnapshotName = baseSnapshot.getMetadata().getName(); - if (StringUtils.equals(getMetadata().getName(), baseSnapshotName)) { - return ContentWrapper.builder() - .snapshotName(this.getMetadata().getName()) - .raw(this.spec.rawPatch) - .content(this.spec.contentPatch) - .rawType(this.spec.rawType) - .build(); - } - String patchedContent = - PatchUtils.applyPatch(baseSnapshot.getSpec().getContentPatch(), this.spec.contentPatch); - String patchedRaw = - PatchUtils.applyPatch(baseSnapshot.getSpec().getRawPatch(), this.spec.rawPatch); - return ContentWrapper.builder() - .snapshotName(this.getMetadata().getName()) - .raw(patchedRaw) - .content(patchedContent) - .rawType(this.spec.rawType) - .build(); - } } diff --git a/src/main/java/run/halo/app/core/extension/content/Tag.java b/api/src/main/java/run/halo/app/core/extension/content/Tag.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/content/Tag.java rename to api/src/main/java/run/halo/app/core/extension/content/Tag.java diff --git a/src/main/java/run/halo/app/core/extension/endpoint/CustomEndpoint.java b/api/src/main/java/run/halo/app/core/extension/endpoint/CustomEndpoint.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/endpoint/CustomEndpoint.java rename to api/src/main/java/run/halo/app/core/extension/endpoint/CustomEndpoint.java diff --git a/src/main/java/run/halo/app/core/extension/endpoint/SortResolver.java b/api/src/main/java/run/halo/app/core/extension/endpoint/SortResolver.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/endpoint/SortResolver.java rename to api/src/main/java/run/halo/app/core/extension/endpoint/SortResolver.java diff --git a/src/main/java/run/halo/app/extension/AbstractExtension.java b/api/src/main/java/run/halo/app/extension/AbstractExtension.java similarity index 100% rename from src/main/java/run/halo/app/extension/AbstractExtension.java rename to api/src/main/java/run/halo/app/extension/AbstractExtension.java diff --git a/src/main/java/run/halo/app/extension/ConfigMap.java b/api/src/main/java/run/halo/app/extension/ConfigMap.java similarity index 100% rename from src/main/java/run/halo/app/extension/ConfigMap.java rename to api/src/main/java/run/halo/app/extension/ConfigMap.java diff --git a/src/main/java/run/halo/app/extension/Extension.java b/api/src/main/java/run/halo/app/extension/Extension.java similarity index 100% rename from src/main/java/run/halo/app/extension/Extension.java rename to api/src/main/java/run/halo/app/extension/Extension.java diff --git a/src/main/java/run/halo/app/extension/ExtensionClient.java b/api/src/main/java/run/halo/app/extension/ExtensionClient.java similarity index 72% rename from src/main/java/run/halo/app/extension/ExtensionClient.java rename to api/src/main/java/run/halo/app/extension/ExtensionClient.java index ff4753fcf..b518d7d0e 100644 --- a/src/main/java/run/halo/app/extension/ExtensionClient.java +++ b/api/src/main/java/run/halo/app/extension/ExtensionClient.java @@ -8,20 +8,21 @@ import java.util.function.Predicate; /** * ExtensionClient is an interface which contains some operations on Extension instead of * ExtensionStore. + *

+ * Please note that this client can only use in non-reactive environment. If you want to + * use Extension client in reactive environment, please use {@link ReactiveExtensionClient} instead. * * @author johnniang - * @apiNote Please note that this client can only use in non-reactive environment. If you want to - * use Extension client in reactive environment, please use {@link ReactiveExtensionClient} instead. */ public interface ExtensionClient { /** * Lists Extensions by Extension type, filter and sorter. * - * @param type is the class type of Extension. - * @param predicate filters the reEnqueue. + * @param type is the class type of Extension. + * @param predicate filters the reEnqueue. * @param comparator sorts the reEnqueue. - * @param is Extension type. + * @param is Extension type. * @return all filtered and sorted Extensions. */ List list(Class type, Predicate predicate, @@ -30,12 +31,12 @@ public interface ExtensionClient { /** * Lists Extensions by Extension type, filter, sorter and page info. * - * @param type is the class type of Extension. - * @param predicate filters the reEnqueue. + * @param type is the class type of Extension. + * @param predicate filters the reEnqueue. * @param comparator sorts the reEnqueue. - * @param page is page number which starts from 0. - * @param size is page size. - * @param is Extension type. + * @param page is page number which starts from 0. + * @param size is page size. + * @param is Extension type. * @return a list of Extensions. */ ListResult list(Class type, Predicate predicate, @@ -46,7 +47,7 @@ public interface ExtensionClient { * * @param type is Extension type. * @param name is Extension name. - * @param is Extension type. + * @param is Extension type. * @return an optional Extension. */ Optional fetch(Class type, String name); @@ -58,8 +59,8 @@ public interface ExtensionClient { * Creates an Extension. * * @param extension is fresh Extension to be created. Please make sure the Extension name does - * not exist. - * @param is Extension type. + * not exist. + * @param is Extension type. */ void create(E extension); @@ -67,8 +68,8 @@ public interface ExtensionClient { * Updates an Extension. * * @param extension is an Extension to be updated. Please make sure the resource version is - * latest. - * @param is Extension type. + * latest. + * @param is Extension type. */ void update(E extension); @@ -76,8 +77,8 @@ public interface ExtensionClient { * Deletes an Extension. * * @param extension is an Extension to be deleted. Please make sure the resource version is - * latest. - * @param is Extension type. + * latest. + * @param is Extension type. */ void delete(E extension); diff --git a/src/main/java/run/halo/app/extension/ExtensionOperator.java b/api/src/main/java/run/halo/app/extension/ExtensionOperator.java similarity index 100% rename from src/main/java/run/halo/app/extension/ExtensionOperator.java rename to api/src/main/java/run/halo/app/extension/ExtensionOperator.java diff --git a/src/main/java/run/halo/app/extension/GVK.java b/api/src/main/java/run/halo/app/extension/GVK.java similarity index 100% rename from src/main/java/run/halo/app/extension/GVK.java rename to api/src/main/java/run/halo/app/extension/GVK.java diff --git a/src/main/java/run/halo/app/extension/GroupKind.java b/api/src/main/java/run/halo/app/extension/GroupKind.java similarity index 100% rename from src/main/java/run/halo/app/extension/GroupKind.java rename to api/src/main/java/run/halo/app/extension/GroupKind.java diff --git a/src/main/java/run/halo/app/extension/GroupVersion.java b/api/src/main/java/run/halo/app/extension/GroupVersion.java similarity index 100% rename from src/main/java/run/halo/app/extension/GroupVersion.java rename to api/src/main/java/run/halo/app/extension/GroupVersion.java diff --git a/src/main/java/run/halo/app/extension/GroupVersionKind.java b/api/src/main/java/run/halo/app/extension/GroupVersionKind.java similarity index 100% rename from src/main/java/run/halo/app/extension/GroupVersionKind.java rename to api/src/main/java/run/halo/app/extension/GroupVersionKind.java diff --git a/src/main/java/run/halo/app/extension/JsonExtension.java b/api/src/main/java/run/halo/app/extension/JsonExtension.java similarity index 100% rename from src/main/java/run/halo/app/extension/JsonExtension.java rename to api/src/main/java/run/halo/app/extension/JsonExtension.java diff --git a/src/main/java/run/halo/app/extension/ListResult.java b/api/src/main/java/run/halo/app/extension/ListResult.java similarity index 91% rename from src/main/java/run/halo/app/extension/ListResult.java rename to api/src/main/java/run/halo/app/extension/ListResult.java index 520235143..5042af6a7 100644 --- a/src/main/java/run/halo/app/extension/ListResult.java +++ b/api/src/main/java/run/halo/app/extension/ListResult.java @@ -1,22 +1,21 @@ package run.halo.app.extension; -import static run.halo.app.infra.utils.GenericClassUtils.generateConcreteClass; - -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.function.Supplier; +import java.util.stream.Stream; import lombok.Data; import net.bytebuddy.ByteBuddy; import net.bytebuddy.description.type.TypeDescription; -import org.springframework.data.util.Streamable; import org.springframework.util.Assert; +import run.halo.app.infra.utils.GenericClassUtils; @Data -public class ListResult implements Streamable { +public class ListResult implements Iterable, Supplier> { @Schema(description = "Page number, starts from 1. If not set or equal to 0, it means no " + "pagination.", required = true) @@ -83,12 +82,6 @@ public class ListResult implements Streamable { return items.iterator(); } - @Override - @JsonIgnore - public boolean isEmpty() { - return Streamable.super.isEmpty(); - } - @Schema(description = "Indicates total pages.", required = true) @JsonProperty("totalPages") public long getTotalPages() { @@ -122,7 +115,7 @@ public class ListResult implements Streamable { * @return generic ListResult class. */ public static Class generateGenericClass(Class type) { - return generateConcreteClass(ListResult.class, type, + return GenericClassUtils.generateConcreteClass(ListResult.class, type, () -> type.getSimpleName() + "List"); } @@ -146,4 +139,9 @@ public class ListResult implements Streamable { } return listSort; } + + @Override + public Stream get() { + return items.stream(); + } } diff --git a/src/main/java/run/halo/app/extension/Metadata.java b/api/src/main/java/run/halo/app/extension/Metadata.java similarity index 100% rename from src/main/java/run/halo/app/extension/Metadata.java rename to api/src/main/java/run/halo/app/extension/Metadata.java diff --git a/src/main/java/run/halo/app/extension/MetadataOperator.java b/api/src/main/java/run/halo/app/extension/MetadataOperator.java similarity index 100% rename from src/main/java/run/halo/app/extension/MetadataOperator.java rename to api/src/main/java/run/halo/app/extension/MetadataOperator.java diff --git a/src/main/java/run/halo/app/extension/ExtensionUtil.java b/api/src/main/java/run/halo/app/extension/MetadataUtil.java similarity index 56% rename from src/main/java/run/halo/app/extension/ExtensionUtil.java rename to api/src/main/java/run/halo/app/extension/MetadataUtil.java index b80ceb7ac..088639662 100644 --- a/src/main/java/run/halo/app/extension/ExtensionUtil.java +++ b/api/src/main/java/run/halo/app/extension/MetadataUtil.java @@ -3,44 +3,9 @@ package run.halo.app.extension; import java.util.HashMap; import java.util.Map; import org.springframework.util.Assert; -import org.springframework.util.StringUtils; -/** - * Extension utilities. - * - * @author johnniang - */ -public final class ExtensionUtil { - - private ExtensionUtil() { - } - - /** - * Builds the name prefix of ExtensionStore. - * - * @param scheme is scheme of an Extension. - * @return name prefix of ExtensionStore. - */ - public static String buildStoreNamePrefix(Scheme scheme) { - // rule of key: /registry/[group]/plural-name/extension-name - StringBuilder builder = new StringBuilder("/registry/"); - if (StringUtils.hasText(scheme.groupVersionKind().group())) { - builder.append(scheme.groupVersionKind().group()).append('/'); - } - builder.append(scheme.plural()); - return builder.toString(); - } - - /** - * Builds full name of ExtensionStore. - * - * @param scheme is scheme of an Extension. - * @param name the exact name of Extension. - * @return full name of ExtensionStore. - */ - public static String buildStoreName(Scheme scheme, String name) { - return buildStoreNamePrefix(scheme) + "/" + name; - } +public enum MetadataUtil { + ; /** * Gets extension metadata labels null safe. diff --git a/src/main/java/run/halo/app/extension/ReactiveExtensionClient.java b/api/src/main/java/run/halo/app/extension/ReactiveExtensionClient.java similarity index 100% rename from src/main/java/run/halo/app/extension/ReactiveExtensionClient.java rename to api/src/main/java/run/halo/app/extension/ReactiveExtensionClient.java diff --git a/src/main/java/run/halo/app/extension/Ref.java b/api/src/main/java/run/halo/app/extension/Ref.java similarity index 100% rename from src/main/java/run/halo/app/extension/Ref.java rename to api/src/main/java/run/halo/app/extension/Ref.java diff --git a/src/main/java/run/halo/app/extension/Scheme.java b/api/src/main/java/run/halo/app/extension/Scheme.java similarity index 100% rename from src/main/java/run/halo/app/extension/Scheme.java rename to api/src/main/java/run/halo/app/extension/Scheme.java diff --git a/src/main/java/run/halo/app/extension/SchemeManager.java b/api/src/main/java/run/halo/app/extension/SchemeManager.java similarity index 100% rename from src/main/java/run/halo/app/extension/SchemeManager.java rename to api/src/main/java/run/halo/app/extension/SchemeManager.java diff --git a/src/main/java/run/halo/app/extension/Unstructured.java b/api/src/main/java/run/halo/app/extension/Unstructured.java similarity index 100% rename from src/main/java/run/halo/app/extension/Unstructured.java rename to api/src/main/java/run/halo/app/extension/Unstructured.java diff --git a/src/main/java/run/halo/app/extension/Watcher.java b/api/src/main/java/run/halo/app/extension/Watcher.java similarity index 100% rename from src/main/java/run/halo/app/extension/Watcher.java rename to api/src/main/java/run/halo/app/extension/Watcher.java diff --git a/src/main/java/run/halo/app/extension/WatcherPredicates.java b/api/src/main/java/run/halo/app/extension/WatcherPredicates.java similarity index 100% rename from src/main/java/run/halo/app/extension/WatcherPredicates.java rename to api/src/main/java/run/halo/app/extension/WatcherPredicates.java diff --git a/src/main/java/run/halo/app/extension/controller/Controller.java b/api/src/main/java/run/halo/app/extension/controller/Controller.java similarity index 100% rename from src/main/java/run/halo/app/extension/controller/Controller.java rename to api/src/main/java/run/halo/app/extension/controller/Controller.java diff --git a/src/main/java/run/halo/app/extension/controller/ControllerBuilder.java b/api/src/main/java/run/halo/app/extension/controller/ControllerBuilder.java similarity index 100% rename from src/main/java/run/halo/app/extension/controller/ControllerBuilder.java rename to api/src/main/java/run/halo/app/extension/controller/ControllerBuilder.java diff --git a/src/main/java/run/halo/app/extension/controller/DefaultController.java b/api/src/main/java/run/halo/app/extension/controller/DefaultController.java similarity index 100% rename from src/main/java/run/halo/app/extension/controller/DefaultController.java rename to api/src/main/java/run/halo/app/extension/controller/DefaultController.java diff --git a/src/main/java/run/halo/app/extension/controller/DefaultQueue.java b/api/src/main/java/run/halo/app/extension/controller/DefaultQueue.java similarity index 100% rename from src/main/java/run/halo/app/extension/controller/DefaultQueue.java rename to api/src/main/java/run/halo/app/extension/controller/DefaultQueue.java diff --git a/src/main/java/run/halo/app/extension/controller/ExtensionWatcher.java b/api/src/main/java/run/halo/app/extension/controller/ExtensionWatcher.java similarity index 100% rename from src/main/java/run/halo/app/extension/controller/ExtensionWatcher.java rename to api/src/main/java/run/halo/app/extension/controller/ExtensionWatcher.java diff --git a/src/main/java/run/halo/app/extension/controller/Reconciler.java b/api/src/main/java/run/halo/app/extension/controller/Reconciler.java similarity index 100% rename from src/main/java/run/halo/app/extension/controller/Reconciler.java rename to api/src/main/java/run/halo/app/extension/controller/Reconciler.java diff --git a/src/main/java/run/halo/app/extension/controller/RequestQueue.java b/api/src/main/java/run/halo/app/extension/controller/RequestQueue.java similarity index 100% rename from src/main/java/run/halo/app/extension/controller/RequestQueue.java rename to api/src/main/java/run/halo/app/extension/controller/RequestQueue.java diff --git a/src/main/java/run/halo/app/extension/controller/RequestSynchronizer.java b/api/src/main/java/run/halo/app/extension/controller/RequestSynchronizer.java similarity index 100% rename from src/main/java/run/halo/app/extension/controller/RequestSynchronizer.java rename to api/src/main/java/run/halo/app/extension/controller/RequestSynchronizer.java diff --git a/src/main/java/run/halo/app/extension/controller/Synchronizer.java b/api/src/main/java/run/halo/app/extension/controller/Synchronizer.java similarity index 100% rename from src/main/java/run/halo/app/extension/controller/Synchronizer.java rename to api/src/main/java/run/halo/app/extension/controller/Synchronizer.java diff --git a/src/main/java/run/halo/app/extension/exception/ExtensionException.java b/api/src/main/java/run/halo/app/extension/exception/ExtensionException.java similarity index 100% rename from src/main/java/run/halo/app/extension/exception/ExtensionException.java rename to api/src/main/java/run/halo/app/extension/exception/ExtensionException.java diff --git a/src/main/java/run/halo/app/extension/exception/SchemeNotFoundException.java b/api/src/main/java/run/halo/app/extension/exception/SchemeNotFoundException.java similarity index 100% rename from src/main/java/run/halo/app/extension/exception/SchemeNotFoundException.java rename to api/src/main/java/run/halo/app/extension/exception/SchemeNotFoundException.java diff --git a/src/main/java/run/halo/app/extension/router/IListRequest.java b/api/src/main/java/run/halo/app/extension/router/IListRequest.java similarity index 100% rename from src/main/java/run/halo/app/extension/router/IListRequest.java rename to api/src/main/java/run/halo/app/extension/router/IListRequest.java diff --git a/src/main/java/run/halo/app/extension/router/QueryParamBuildUtil.java b/api/src/main/java/run/halo/app/extension/router/QueryParamBuildUtil.java similarity index 100% rename from src/main/java/run/halo/app/extension/router/QueryParamBuildUtil.java rename to api/src/main/java/run/halo/app/extension/router/QueryParamBuildUtil.java diff --git a/src/main/java/run/halo/app/infra/Condition.java b/api/src/main/java/run/halo/app/infra/Condition.java similarity index 100% rename from src/main/java/run/halo/app/infra/Condition.java rename to api/src/main/java/run/halo/app/infra/Condition.java diff --git a/src/main/java/run/halo/app/infra/ConditionList.java b/api/src/main/java/run/halo/app/infra/ConditionList.java similarity index 100% rename from src/main/java/run/halo/app/infra/ConditionList.java rename to api/src/main/java/run/halo/app/infra/ConditionList.java diff --git a/src/main/java/run/halo/app/infra/ConditionStatus.java b/api/src/main/java/run/halo/app/infra/ConditionStatus.java similarity index 100% rename from src/main/java/run/halo/app/infra/ConditionStatus.java rename to api/src/main/java/run/halo/app/infra/ConditionStatus.java diff --git a/src/main/java/run/halo/app/infra/ExternalUrlSupplier.java b/api/src/main/java/run/halo/app/infra/ExternalUrlSupplier.java similarity index 100% rename from src/main/java/run/halo/app/infra/ExternalUrlSupplier.java rename to api/src/main/java/run/halo/app/infra/ExternalUrlSupplier.java diff --git a/src/main/java/run/halo/app/infra/SystemSetting.java b/api/src/main/java/run/halo/app/infra/SystemSetting.java similarity index 100% rename from src/main/java/run/halo/app/infra/SystemSetting.java rename to api/src/main/java/run/halo/app/infra/SystemSetting.java diff --git a/src/main/java/run/halo/app/infra/SystemVersionSupplier.java b/api/src/main/java/run/halo/app/infra/SystemVersionSupplier.java similarity index 100% rename from src/main/java/run/halo/app/infra/SystemVersionSupplier.java rename to api/src/main/java/run/halo/app/infra/SystemVersionSupplier.java diff --git a/src/main/java/run/halo/app/infra/utils/GenericClassUtils.java b/api/src/main/java/run/halo/app/infra/utils/GenericClassUtils.java similarity index 89% rename from src/main/java/run/halo/app/infra/utils/GenericClassUtils.java rename to api/src/main/java/run/halo/app/infra/utils/GenericClassUtils.java index d79eac2b8..7cfc2667b 100644 --- a/src/main/java/run/halo/app/infra/utils/GenericClassUtils.java +++ b/api/src/main/java/run/halo/app/infra/utils/GenericClassUtils.java @@ -1,10 +1,9 @@ package run.halo.app.infra.utils; -import static net.bytebuddy.description.type.TypeDescription.Generic.Builder.parameterizedType; - import java.io.IOException; import java.util.function.Supplier; import net.bytebuddy.ByteBuddy; +import net.bytebuddy.description.type.TypeDescription; import reactor.core.Exceptions; public enum GenericClassUtils { @@ -34,7 +33,8 @@ public enum GenericClassUtils { */ public static Class generateConcreteClass(Class rawClass, Class parameterType, Supplier nameGenerator) { - var concreteType = parameterizedType(rawClass, parameterType).build(); + var concreteType = + TypeDescription.Generic.Builder.parameterizedType(rawClass, parameterType).build(); try (var unloaded = new ByteBuddy() .subclass(concreteType) .name(nameGenerator.get()) diff --git a/src/main/java/run/halo/app/infra/utils/JsonParseException.java b/api/src/main/java/run/halo/app/infra/utils/JsonParseException.java similarity index 100% rename from src/main/java/run/halo/app/infra/utils/JsonParseException.java rename to api/src/main/java/run/halo/app/infra/utils/JsonParseException.java diff --git a/src/main/java/run/halo/app/infra/utils/JsonUtils.java b/api/src/main/java/run/halo/app/infra/utils/JsonUtils.java similarity index 100% rename from src/main/java/run/halo/app/infra/utils/JsonUtils.java rename to api/src/main/java/run/halo/app/infra/utils/JsonUtils.java diff --git a/src/main/java/run/halo/app/infra/utils/PathUtils.java b/api/src/main/java/run/halo/app/infra/utils/PathUtils.java similarity index 98% rename from src/main/java/run/halo/app/infra/utils/PathUtils.java rename to api/src/main/java/run/halo/app/infra/utils/PathUtils.java index 4ac3fb3d7..1c08e34dd 100644 --- a/src/main/java/run/halo/app/infra/utils/PathUtils.java +++ b/api/src/main/java/run/halo/app/infra/utils/PathUtils.java @@ -52,10 +52,11 @@ public class PathUtils { /** * Combine paths based on the passed in path segments parameters. + *

+ * This method doesn't work for Windows system currently. * * @param pathSegments Path segments to be combined * @return the combined path - * @apiNote This method doesn't work for Windows system currently. */ public static String combinePath(String... pathSegments) { StringBuilder sb = new StringBuilder(); diff --git a/src/main/java/run/halo/app/plugin/ApiVersion.java b/api/src/main/java/run/halo/app/plugin/ApiVersion.java similarity index 100% rename from src/main/java/run/halo/app/plugin/ApiVersion.java rename to api/src/main/java/run/halo/app/plugin/ApiVersion.java diff --git a/src/main/java/run/halo/app/plugin/BasePlugin.java b/api/src/main/java/run/halo/app/plugin/BasePlugin.java similarity index 89% rename from src/main/java/run/halo/app/plugin/BasePlugin.java rename to api/src/main/java/run/halo/app/plugin/BasePlugin.java index 817aa436d..ed186f24b 100644 --- a/src/main/java/run/halo/app/plugin/BasePlugin.java +++ b/api/src/main/java/run/halo/app/plugin/BasePlugin.java @@ -17,6 +17,7 @@ public class BasePlugin extends Plugin { public BasePlugin(PluginWrapper wrapper) { super(wrapper); + log.info("Initialized plugin {}", wrapper.getPluginId()); } private PluginManager getPluginManager() { diff --git a/api/src/main/java/run/halo/app/plugin/SettingFetcher.java b/api/src/main/java/run/halo/app/plugin/SettingFetcher.java new file mode 100644 index 000000000..5d504477f --- /dev/null +++ b/api/src/main/java/run/halo/app/plugin/SettingFetcher.java @@ -0,0 +1,15 @@ +package run.halo.app.plugin; + +import com.fasterxml.jackson.databind.JsonNode; +import java.util.Map; +import java.util.Optional; + +public interface SettingFetcher { + + Optional fetch(String group, Class clazz); + + JsonNode get(String group); + + Map getValues(); + +} diff --git a/src/main/java/run/halo/app/search/SearchParam.java b/api/src/main/java/run/halo/app/search/SearchParam.java similarity index 100% rename from src/main/java/run/halo/app/search/SearchParam.java rename to api/src/main/java/run/halo/app/search/SearchParam.java diff --git a/src/main/java/run/halo/app/search/SearchResult.java b/api/src/main/java/run/halo/app/search/SearchResult.java similarity index 100% rename from src/main/java/run/halo/app/search/SearchResult.java rename to api/src/main/java/run/halo/app/search/SearchResult.java diff --git a/src/main/java/run/halo/app/search/post/PostDoc.java b/api/src/main/java/run/halo/app/search/post/PostDoc.java similarity index 59% rename from src/main/java/run/halo/app/search/post/PostDoc.java rename to api/src/main/java/run/halo/app/search/post/PostDoc.java index 09a7885e2..45b8f96bc 100644 --- a/src/main/java/run/halo/app/search/post/PostDoc.java +++ b/api/src/main/java/run/halo/app/search/post/PostDoc.java @@ -2,7 +2,6 @@ package run.halo.app.search.post; import java.time.Instant; import org.springframework.util.Assert; -import run.halo.app.theme.finders.vo.PostVo; public record PostDoc(String name, String title, @@ -20,15 +19,4 @@ public record PostDoc(String name, Assert.notNull(publishTimestamp, "PublishTimestamp must not be null"); } - // TODO Move this static method to other place. - public static PostDoc from(PostVo postVo) { - return new PostDoc( - postVo.getMetadata().getName(), - postVo.getSpec().getTitle(), - postVo.getStatus().getExcerpt(), - postVo.getContent().getContent(), - postVo.getSpec().getPublishTime(), - postVo.getStatus().getPermalink() - ); - } } diff --git a/src/main/java/run/halo/app/search/post/PostHit.java b/api/src/main/java/run/halo/app/search/post/PostHit.java similarity index 100% rename from src/main/java/run/halo/app/search/post/PostHit.java rename to api/src/main/java/run/halo/app/search/post/PostHit.java diff --git a/src/main/java/run/halo/app/search/post/PostSearchService.java b/api/src/main/java/run/halo/app/search/post/PostSearchService.java similarity index 100% rename from src/main/java/run/halo/app/search/post/PostSearchService.java rename to api/src/main/java/run/halo/app/search/post/PostSearchService.java diff --git a/src/main/java/run/halo/app/security/AdditionalWebFilter.java b/api/src/main/java/run/halo/app/security/AdditionalWebFilter.java similarity index 100% rename from src/main/java/run/halo/app/security/AdditionalWebFilter.java rename to api/src/main/java/run/halo/app/security/AdditionalWebFilter.java diff --git a/src/main/java/run/halo/app/theme/dialect/CommentWidget.java b/api/src/main/java/run/halo/app/theme/dialect/CommentWidget.java similarity index 100% rename from src/main/java/run/halo/app/theme/dialect/CommentWidget.java rename to api/src/main/java/run/halo/app/theme/dialect/CommentWidget.java diff --git a/src/main/java/run/halo/app/theme/dialect/TemplateHeadProcessor.java b/api/src/main/java/run/halo/app/theme/dialect/TemplateHeadProcessor.java similarity index 100% rename from src/main/java/run/halo/app/theme/dialect/TemplateHeadProcessor.java rename to api/src/main/java/run/halo/app/theme/dialect/TemplateHeadProcessor.java diff --git a/src/test/java/run/halo/app/extension/FakeExtension.java b/api/src/test/java/run/halo/app/extension/FakeExtension.java similarity index 100% rename from src/test/java/run/halo/app/extension/FakeExtension.java rename to api/src/test/java/run/halo/app/extension/FakeExtension.java diff --git a/src/test/java/run/halo/app/extension/controller/ControllerBuilderTest.java b/api/src/test/java/run/halo/app/extension/controller/ControllerBuilderTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/controller/ControllerBuilderTest.java rename to api/src/test/java/run/halo/app/extension/controller/ControllerBuilderTest.java diff --git a/src/test/java/run/halo/app/extension/controller/DefaultControllerTest.java b/api/src/test/java/run/halo/app/extension/controller/DefaultControllerTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/controller/DefaultControllerTest.java rename to api/src/test/java/run/halo/app/extension/controller/DefaultControllerTest.java diff --git a/src/test/java/run/halo/app/extension/controller/DefaultDelayQueueTest.java b/api/src/test/java/run/halo/app/extension/controller/DefaultDelayQueueTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/controller/DefaultDelayQueueTest.java rename to api/src/test/java/run/halo/app/extension/controller/DefaultDelayQueueTest.java diff --git a/src/test/java/run/halo/app/extension/controller/DelayedEntryTest.java b/api/src/test/java/run/halo/app/extension/controller/DelayedEntryTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/controller/DelayedEntryTest.java rename to api/src/test/java/run/halo/app/extension/controller/DelayedEntryTest.java diff --git a/src/test/java/run/halo/app/extension/controller/ExtensionWatcherTest.java b/api/src/test/java/run/halo/app/extension/controller/ExtensionWatcherTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/controller/ExtensionWatcherTest.java rename to api/src/test/java/run/halo/app/extension/controller/ExtensionWatcherTest.java diff --git a/src/test/java/run/halo/app/extension/controller/RequestSynchronizerTest.java b/api/src/test/java/run/halo/app/extension/controller/RequestSynchronizerTest.java similarity index 95% rename from src/test/java/run/halo/app/extension/controller/RequestSynchronizerTest.java rename to api/src/test/java/run/halo/app/extension/controller/RequestSynchronizerTest.java index c427e91a4..53a5258e7 100644 --- a/src/test/java/run/halo/app/extension/controller/RequestSynchronizerTest.java +++ b/api/src/test/java/run/halo/app/extension/controller/RequestSynchronizerTest.java @@ -7,7 +7,6 @@ import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static run.halo.app.extension.FakeExtension.createFake; import java.util.List; import java.util.function.Predicate; @@ -46,7 +45,7 @@ class RequestSynchronizerTest { @Test void shouldStartCorrectlyWhenSyncingAllOnStart() { when(client.list(same(FakeExtension.class), any(), any())).thenReturn( - List.of(createFake("fake-01"), createFake("fake-02"))); + List.of(FakeExtension.createFake("fake-01"), FakeExtension.createFake("fake-02"))); synchronizer.start(); diff --git a/src/test/java/run/halo/app/infra/utils/JsonUtilsTest.java b/api/src/test/java/run/halo/app/infra/utils/JsonUtilsTest.java similarity index 100% rename from src/test/java/run/halo/app/infra/utils/JsonUtilsTest.java rename to api/src/test/java/run/halo/app/infra/utils/JsonUtilsTest.java diff --git a/src/test/java/run/halo/app/infra/utils/PathUtilsTest.java b/api/src/test/java/run/halo/app/infra/utils/PathUtilsTest.java similarity index 100% rename from src/test/java/run/halo/app/infra/utils/PathUtilsTest.java rename to api/src/test/java/run/halo/app/infra/utils/PathUtilsTest.java diff --git a/application/build.gradle b/application/build.gradle new file mode 100644 index 000000000..4ab70a728 --- /dev/null +++ b/application/build.gradle @@ -0,0 +1,98 @@ +plugins { + id 'org.springframework.boot' version '3.0.4' + id 'io.spring.dependency-management' version '1.1.0' + id "com.gorylenko.gradle-git-properties" version "2.3.2" + id "checkstyle" + id 'java' + id 'jacoco' + id "de.undercouch.download" version "5.3.1" + id "io.freefair.lombok" version "8.0.0-rc2" +} + +group = "run.halo.app" +sourceCompatibility = JavaVersion.VERSION_17 + +checkstyle { + toolVersion = "9.3" + showViolations = false + ignoreFailures = false +} + +repositories { + mavenCentral() + + maven { url 'https://repo.spring.io/milestone' } + mavenLocal() +} + + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +springBoot { + buildInfo() +} + +bootJar { + manifest { + attributes "Implementation-Title": "Halo Application", + "Implementation-Version": archiveVersion + } +} + +tasks.named('jar') { + enabled = false +} + +ext { + commonsLang3 = "3.12.0" + base62 = "0.1.3" + pf4j = '3.9.0' + javaDiffUtils = "4.12" + guava = "31.1-jre" + jsoup = '1.15.3' + jsonPatch = "1.13" + springDocOpenAPI = "2.0.2" + lucene = "9.5.0" +} + +dependencies { + implementation project(':api') + + annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" + annotationProcessor "org.springframework:spring-context-indexer" + + developmentOnly 'org.springframework.boot:spring-boot-devtools' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.security:spring-security-test' + testImplementation 'io.projectreactor:reactor-test' +} + +tasks.named('test') { + useJUnitPlatform() + finalizedBy jacocoTestReport +} + +tasks.named('jacocoTestReport') { + reports { + xml.required = true + html.required = false + } +} + +tasks.register('downloadPluginPresets', Download) { + doFirst { + delete 'src/main/resources/presets/plugins' + } + src([ + 'https://github.com/halo-sigs/plugin-comment-widget/releases/download/v1.3.0/plugin-comment-widget-1.3.0.jar', + 'https://github.com/halo-sigs/plugin-search-widget/releases/download/v1.0.0/plugin-search-widget-1.0.0.jar', + 'https://github.com/halo-sigs/plugin-sitemap/releases/download/v1.0.1/plugin-sitemap-1.0.1.jar', + 'https://github.com/halo-sigs/plugin-feed/releases/download/v1.1.0-beta.1/plugin-feed-1.1.0-beta.1.jar' + ]) + dest 'src/main/resources/presets/plugins' +} diff --git a/src/main/java/run/halo/app/Application.java b/application/src/main/java/run/halo/app/Application.java similarity index 100% rename from src/main/java/run/halo/app/Application.java rename to application/src/main/java/run/halo/app/Application.java diff --git a/src/main/java/run/halo/app/actuator/DatabaseInfoContributor.java b/application/src/main/java/run/halo/app/actuator/DatabaseInfoContributor.java similarity index 100% rename from src/main/java/run/halo/app/actuator/DatabaseInfoContributor.java rename to application/src/main/java/run/halo/app/actuator/DatabaseInfoContributor.java diff --git a/src/main/java/run/halo/app/actuator/GlobalInfoEndpoint.java b/application/src/main/java/run/halo/app/actuator/GlobalInfoEndpoint.java similarity index 100% rename from src/main/java/run/halo/app/actuator/GlobalInfoEndpoint.java rename to application/src/main/java/run/halo/app/actuator/GlobalInfoEndpoint.java diff --git a/src/main/java/run/halo/app/config/ExtensionConfiguration.java b/application/src/main/java/run/halo/app/config/ExtensionConfiguration.java similarity index 100% rename from src/main/java/run/halo/app/config/ExtensionConfiguration.java rename to application/src/main/java/run/halo/app/config/ExtensionConfiguration.java diff --git a/src/main/java/run/halo/app/config/HaloAnonymousAuthenticationWebFilter.java b/application/src/main/java/run/halo/app/config/HaloAnonymousAuthenticationWebFilter.java similarity index 100% rename from src/main/java/run/halo/app/config/HaloAnonymousAuthenticationWebFilter.java rename to application/src/main/java/run/halo/app/config/HaloAnonymousAuthenticationWebFilter.java diff --git a/src/main/java/run/halo/app/config/HaloConfiguration.java b/application/src/main/java/run/halo/app/config/HaloConfiguration.java similarity index 100% rename from src/main/java/run/halo/app/config/HaloConfiguration.java rename to application/src/main/java/run/halo/app/config/HaloConfiguration.java diff --git a/src/main/java/run/halo/app/config/SwaggerConfig.java b/application/src/main/java/run/halo/app/config/SwaggerConfig.java similarity index 100% rename from src/main/java/run/halo/app/config/SwaggerConfig.java rename to application/src/main/java/run/halo/app/config/SwaggerConfig.java diff --git a/src/main/java/run/halo/app/config/WebFluxConfig.java b/application/src/main/java/run/halo/app/config/WebFluxConfig.java similarity index 100% rename from src/main/java/run/halo/app/config/WebFluxConfig.java rename to application/src/main/java/run/halo/app/config/WebFluxConfig.java diff --git a/src/main/java/run/halo/app/config/WebServerSecurityConfig.java b/application/src/main/java/run/halo/app/config/WebServerSecurityConfig.java similarity index 100% rename from src/main/java/run/halo/app/config/WebServerSecurityConfig.java rename to application/src/main/java/run/halo/app/config/WebServerSecurityConfig.java diff --git a/src/main/java/run/halo/app/console/ConsoleProxyFilter.java b/application/src/main/java/run/halo/app/console/ConsoleProxyFilter.java similarity index 100% rename from src/main/java/run/halo/app/console/ConsoleProxyFilter.java rename to application/src/main/java/run/halo/app/console/ConsoleProxyFilter.java diff --git a/src/main/java/run/halo/app/console/WebSocketServerWebExchangeMatcher.java b/application/src/main/java/run/halo/app/console/WebSocketServerWebExchangeMatcher.java similarity index 100% rename from src/main/java/run/halo/app/console/WebSocketServerWebExchangeMatcher.java rename to application/src/main/java/run/halo/app/console/WebSocketServerWebExchangeMatcher.java diff --git a/src/main/java/run/halo/app/content/AbstractContentService.java b/application/src/main/java/run/halo/app/content/AbstractContentService.java similarity index 92% rename from src/main/java/run/halo/app/content/AbstractContentService.java rename to application/src/main/java/run/halo/app/content/AbstractContentService.java index e96ece9ba..97b50866a 100644 --- a/src/main/java/run/halo/app/content/AbstractContentService.java +++ b/application/src/main/java/run/halo/app/content/AbstractContentService.java @@ -11,7 +11,7 @@ import org.springframework.security.core.context.SecurityContext; import org.springframework.util.Assert; import reactor.core.publisher.Mono; import run.halo.app.core.extension.content.Snapshot; -import run.halo.app.extension.ExtensionUtil; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.ReactiveExtensionClient; /** @@ -30,17 +30,18 @@ public abstract class AbstractContentService { .doOnNext(this::checkBaseSnapshot) .flatMap(baseSnapshot -> { if (StringUtils.equals(snapshotName, baseSnapshotName)) { - return Mono.just(baseSnapshot.applyPatch(baseSnapshot)); + var contentWrapper = ContentWrapper.patchSnapshot(baseSnapshot, baseSnapshot); + return Mono.just(contentWrapper); } return client.fetch(Snapshot.class, snapshotName) - .map(snapshot -> snapshot.applyPatch(baseSnapshot)); + .map(snapshot -> ContentWrapper.patchSnapshot(snapshot, baseSnapshot)); }); } protected void checkBaseSnapshot(Snapshot snapshot) { Assert.notNull(snapshot, "The snapshot must not be null."); String keepRawAnno = - ExtensionUtil.nullSafeAnnotations(snapshot).get(Snapshot.KEEP_RAW_ANNO); + MetadataUtil.nullSafeAnnotations(snapshot).get(Snapshot.KEEP_RAW_ANNO); if (!org.thymeleaf.util.StringUtils.equals(Boolean.TRUE.toString(), keepRawAnno)) { throw new IllegalArgumentException( String.format("The snapshot [%s] is not a base snapshot.", @@ -104,7 +105,7 @@ public abstract class AbstractContentService { protected Mono restoredContent(String baseSnapshotName, Snapshot headSnapshot) { return client.fetch(Snapshot.class, baseSnapshotName) .doOnNext(this::checkBaseSnapshot) - .map(headSnapshot::applyPatch); + .map(baseSnapshot -> ContentWrapper.patchSnapshot(headSnapshot, baseSnapshot)); } protected Snapshot determineRawAndContentPatch(Snapshot snapshotToUse, Snapshot baseSnapshot, @@ -122,7 +123,7 @@ public abstract class AbstractContentService { snapshotToUse.getMetadata().getName())) { snapshotToUse.getSpec().setRawPatch(contentRequest.raw()); snapshotToUse.getSpec().setContentPatch(contentRequest.content()); - ExtensionUtil.nullSafeAnnotations(snapshotToUse) + MetadataUtil.nullSafeAnnotations(snapshotToUse) .put(Snapshot.KEEP_RAW_ANNO, Boolean.TRUE.toString()); } else { // otherwise diff a patch based on the v1 snapshot diff --git a/src/main/java/run/halo/app/content/ContentRequest.java b/application/src/main/java/run/halo/app/content/ContentRequest.java similarity index 100% rename from src/main/java/run/halo/app/content/ContentRequest.java rename to application/src/main/java/run/halo/app/content/ContentRequest.java diff --git a/application/src/main/java/run/halo/app/content/ContentWrapper.java b/application/src/main/java/run/halo/app/content/ContentWrapper.java new file mode 100644 index 000000000..e29185a56 --- /dev/null +++ b/application/src/main/java/run/halo/app/content/ContentWrapper.java @@ -0,0 +1,43 @@ +package run.halo.app.content; + +import lombok.Builder; +import lombok.Data; +import org.apache.commons.lang3.StringUtils; +import org.springframework.util.Assert; +import run.halo.app.core.extension.content.Snapshot; + +/** + * @author guqing + * @since 2.0.0 + */ +@Data +@Builder +public class ContentWrapper { + private String snapshotName; + private String raw; + private String content; + private String rawType; + + public static ContentWrapper patchSnapshot(Snapshot patchSnapshot, Snapshot baseSnapshot) { + Assert.notNull(baseSnapshot, "The baseSnapshot must not be null."); + String baseSnapshotName = baseSnapshot.getMetadata().getName(); + if (StringUtils.equals(patchSnapshot.getMetadata().getName(), baseSnapshotName)) { + return ContentWrapper.builder() + .snapshotName(patchSnapshot.getMetadata().getName()) + .raw(patchSnapshot.getSpec().getRawPatch()) + .content(patchSnapshot.getSpec().getContentPatch()) + .rawType(patchSnapshot.getSpec().getRawType()) + .build(); + } + String patchedContent = PatchUtils.applyPatch(baseSnapshot.getSpec().getContentPatch(), + patchSnapshot.getSpec().getContentPatch()); + String patchedRaw = PatchUtils.applyPatch(baseSnapshot.getSpec().getRawPatch(), + patchSnapshot.getSpec().getRawPatch()); + return ContentWrapper.builder() + .snapshotName(patchSnapshot.getMetadata().getName()) + .raw(patchedRaw) + .content(patchedContent) + .rawType(patchSnapshot.getSpec().getRawType()) + .build(); + } +} diff --git a/src/main/java/run/halo/app/content/Contributor.java b/application/src/main/java/run/halo/app/content/Contributor.java similarity index 100% rename from src/main/java/run/halo/app/content/Contributor.java rename to application/src/main/java/run/halo/app/content/Contributor.java diff --git a/src/main/java/run/halo/app/content/DefaultIndexer.java b/application/src/main/java/run/halo/app/content/DefaultIndexer.java similarity index 100% rename from src/main/java/run/halo/app/content/DefaultIndexer.java rename to application/src/main/java/run/halo/app/content/DefaultIndexer.java diff --git a/src/main/java/run/halo/app/content/Indexer.java b/application/src/main/java/run/halo/app/content/Indexer.java similarity index 100% rename from src/main/java/run/halo/app/content/Indexer.java rename to application/src/main/java/run/halo/app/content/Indexer.java diff --git a/src/main/java/run/halo/app/content/ListedPost.java b/application/src/main/java/run/halo/app/content/ListedPost.java similarity index 100% rename from src/main/java/run/halo/app/content/ListedPost.java rename to application/src/main/java/run/halo/app/content/ListedPost.java diff --git a/src/main/java/run/halo/app/content/ListedSinglePage.java b/application/src/main/java/run/halo/app/content/ListedSinglePage.java similarity index 100% rename from src/main/java/run/halo/app/content/ListedSinglePage.java rename to application/src/main/java/run/halo/app/content/ListedSinglePage.java diff --git a/src/main/java/run/halo/app/content/PatchUtils.java b/application/src/main/java/run/halo/app/content/PatchUtils.java similarity index 100% rename from src/main/java/run/halo/app/content/PatchUtils.java rename to application/src/main/java/run/halo/app/content/PatchUtils.java diff --git a/src/main/java/run/halo/app/content/PostIndexInformer.java b/application/src/main/java/run/halo/app/content/PostIndexInformer.java similarity index 98% rename from src/main/java/run/halo/app/content/PostIndexInformer.java rename to application/src/main/java/run/halo/app/content/PostIndexInformer.java index de534c803..7d4f1f87f 100644 --- a/src/main/java/run/halo/app/content/PostIndexInformer.java +++ b/application/src/main/java/run/halo/app/content/PostIndexInformer.java @@ -13,9 +13,9 @@ import org.springframework.stereotype.Component; import run.halo.app.core.extension.content.Post; import run.halo.app.extension.Extension; import run.halo.app.extension.ExtensionClient; -import run.halo.app.extension.ExtensionUtil; import run.halo.app.extension.GroupVersionKind; import run.halo.app.extension.Metadata; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.Unstructured; import run.halo.app.extension.Watcher; import run.halo.app.extension.controller.RequestSynchronizer; @@ -62,7 +62,7 @@ public class PostIndexInformer implements ApplicationListener labelIndexFunc() { return post -> { - Map labels = ExtensionUtil.nullSafeLabels(post); + Map labels = MetadataUtil.nullSafeLabels(post); Set indexKeys = new HashSet<>(); for (Map.Entry entry : labels.entrySet()) { indexKeys.add(labelKey(entry.getKey(), entry.getValue())); diff --git a/src/main/java/run/halo/app/content/PostQuery.java b/application/src/main/java/run/halo/app/content/PostQuery.java similarity index 100% rename from src/main/java/run/halo/app/content/PostQuery.java rename to application/src/main/java/run/halo/app/content/PostQuery.java diff --git a/src/main/java/run/halo/app/content/PostRequest.java b/application/src/main/java/run/halo/app/content/PostRequest.java similarity index 100% rename from src/main/java/run/halo/app/content/PostRequest.java rename to application/src/main/java/run/halo/app/content/PostRequest.java diff --git a/src/main/java/run/halo/app/content/PostService.java b/application/src/main/java/run/halo/app/content/PostService.java similarity index 100% rename from src/main/java/run/halo/app/content/PostService.java rename to application/src/main/java/run/halo/app/content/PostService.java diff --git a/src/main/java/run/halo/app/content/PostSorter.java b/application/src/main/java/run/halo/app/content/PostSorter.java similarity index 100% rename from src/main/java/run/halo/app/content/PostSorter.java rename to application/src/main/java/run/halo/app/content/PostSorter.java diff --git a/src/main/java/run/halo/app/content/SinglePageQuery.java b/application/src/main/java/run/halo/app/content/SinglePageQuery.java similarity index 100% rename from src/main/java/run/halo/app/content/SinglePageQuery.java rename to application/src/main/java/run/halo/app/content/SinglePageQuery.java diff --git a/src/main/java/run/halo/app/content/SinglePageRequest.java b/application/src/main/java/run/halo/app/content/SinglePageRequest.java similarity index 100% rename from src/main/java/run/halo/app/content/SinglePageRequest.java rename to application/src/main/java/run/halo/app/content/SinglePageRequest.java diff --git a/src/main/java/run/halo/app/content/SinglePageService.java b/application/src/main/java/run/halo/app/content/SinglePageService.java similarity index 100% rename from src/main/java/run/halo/app/content/SinglePageService.java rename to application/src/main/java/run/halo/app/content/SinglePageService.java diff --git a/src/main/java/run/halo/app/content/SinglePageSorter.java b/application/src/main/java/run/halo/app/content/SinglePageSorter.java similarity index 100% rename from src/main/java/run/halo/app/content/SinglePageSorter.java rename to application/src/main/java/run/halo/app/content/SinglePageSorter.java diff --git a/src/main/java/run/halo/app/content/Stats.java b/application/src/main/java/run/halo/app/content/Stats.java similarity index 100% rename from src/main/java/run/halo/app/content/Stats.java rename to application/src/main/java/run/halo/app/content/Stats.java diff --git a/src/main/java/run/halo/app/content/comment/CommentEmailOwner.java b/application/src/main/java/run/halo/app/content/comment/CommentEmailOwner.java similarity index 100% rename from src/main/java/run/halo/app/content/comment/CommentEmailOwner.java rename to application/src/main/java/run/halo/app/content/comment/CommentEmailOwner.java diff --git a/src/main/java/run/halo/app/content/comment/CommentQuery.java b/application/src/main/java/run/halo/app/content/comment/CommentQuery.java similarity index 100% rename from src/main/java/run/halo/app/content/comment/CommentQuery.java rename to application/src/main/java/run/halo/app/content/comment/CommentQuery.java diff --git a/src/main/java/run/halo/app/content/comment/CommentRequest.java b/application/src/main/java/run/halo/app/content/comment/CommentRequest.java similarity index 100% rename from src/main/java/run/halo/app/content/comment/CommentRequest.java rename to application/src/main/java/run/halo/app/content/comment/CommentRequest.java diff --git a/src/main/java/run/halo/app/content/comment/CommentService.java b/application/src/main/java/run/halo/app/content/comment/CommentService.java similarity index 100% rename from src/main/java/run/halo/app/content/comment/CommentService.java rename to application/src/main/java/run/halo/app/content/comment/CommentService.java diff --git a/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java b/application/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java similarity index 100% rename from src/main/java/run/halo/app/content/comment/CommentServiceImpl.java rename to application/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java diff --git a/src/main/java/run/halo/app/content/comment/CommentSorter.java b/application/src/main/java/run/halo/app/content/comment/CommentSorter.java similarity index 100% rename from src/main/java/run/halo/app/content/comment/CommentSorter.java rename to application/src/main/java/run/halo/app/content/comment/CommentSorter.java diff --git a/src/main/java/run/halo/app/content/comment/CommentStats.java b/application/src/main/java/run/halo/app/content/comment/CommentStats.java similarity index 100% rename from src/main/java/run/halo/app/content/comment/CommentStats.java rename to application/src/main/java/run/halo/app/content/comment/CommentStats.java diff --git a/src/main/java/run/halo/app/content/comment/ListedComment.java b/application/src/main/java/run/halo/app/content/comment/ListedComment.java similarity index 100% rename from src/main/java/run/halo/app/content/comment/ListedComment.java rename to application/src/main/java/run/halo/app/content/comment/ListedComment.java diff --git a/src/main/java/run/halo/app/content/comment/ListedReply.java b/application/src/main/java/run/halo/app/content/comment/ListedReply.java similarity index 100% rename from src/main/java/run/halo/app/content/comment/ListedReply.java rename to application/src/main/java/run/halo/app/content/comment/ListedReply.java diff --git a/src/main/java/run/halo/app/content/comment/OwnerInfo.java b/application/src/main/java/run/halo/app/content/comment/OwnerInfo.java similarity index 100% rename from src/main/java/run/halo/app/content/comment/OwnerInfo.java rename to application/src/main/java/run/halo/app/content/comment/OwnerInfo.java diff --git a/src/main/java/run/halo/app/content/comment/PostCommentSubject.java b/application/src/main/java/run/halo/app/content/comment/PostCommentSubject.java similarity index 100% rename from src/main/java/run/halo/app/content/comment/PostCommentSubject.java rename to application/src/main/java/run/halo/app/content/comment/PostCommentSubject.java diff --git a/src/main/java/run/halo/app/content/comment/ReplyQuery.java b/application/src/main/java/run/halo/app/content/comment/ReplyQuery.java similarity index 100% rename from src/main/java/run/halo/app/content/comment/ReplyQuery.java rename to application/src/main/java/run/halo/app/content/comment/ReplyQuery.java diff --git a/src/main/java/run/halo/app/content/comment/ReplyRequest.java b/application/src/main/java/run/halo/app/content/comment/ReplyRequest.java similarity index 100% rename from src/main/java/run/halo/app/content/comment/ReplyRequest.java rename to application/src/main/java/run/halo/app/content/comment/ReplyRequest.java diff --git a/src/main/java/run/halo/app/content/comment/ReplyService.java b/application/src/main/java/run/halo/app/content/comment/ReplyService.java similarity index 100% rename from src/main/java/run/halo/app/content/comment/ReplyService.java rename to application/src/main/java/run/halo/app/content/comment/ReplyService.java diff --git a/src/main/java/run/halo/app/content/comment/ReplyServiceImpl.java b/application/src/main/java/run/halo/app/content/comment/ReplyServiceImpl.java similarity index 100% rename from src/main/java/run/halo/app/content/comment/ReplyServiceImpl.java rename to application/src/main/java/run/halo/app/content/comment/ReplyServiceImpl.java diff --git a/src/main/java/run/halo/app/content/comment/SinglePageCommentSubject.java b/application/src/main/java/run/halo/app/content/comment/SinglePageCommentSubject.java similarity index 100% rename from src/main/java/run/halo/app/content/comment/SinglePageCommentSubject.java rename to application/src/main/java/run/halo/app/content/comment/SinglePageCommentSubject.java diff --git a/src/main/java/run/halo/app/content/impl/PostServiceImpl.java b/application/src/main/java/run/halo/app/content/impl/PostServiceImpl.java similarity index 100% rename from src/main/java/run/halo/app/content/impl/PostServiceImpl.java rename to application/src/main/java/run/halo/app/content/impl/PostServiceImpl.java diff --git a/src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java b/application/src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java similarity index 100% rename from src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java rename to application/src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java diff --git a/src/main/java/run/halo/app/content/permalinks/CategoryPermalinkPolicy.java b/application/src/main/java/run/halo/app/content/permalinks/CategoryPermalinkPolicy.java similarity index 92% rename from src/main/java/run/halo/app/content/permalinks/CategoryPermalinkPolicy.java rename to application/src/main/java/run/halo/app/content/permalinks/CategoryPermalinkPolicy.java index 8ce95e151..d69ff60e7 100644 --- a/src/main/java/run/halo/app/content/permalinks/CategoryPermalinkPolicy.java +++ b/application/src/main/java/run/halo/app/content/permalinks/CategoryPermalinkPolicy.java @@ -8,7 +8,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import run.halo.app.core.extension.content.Category; import run.halo.app.core.extension.content.Constant; -import run.halo.app.extension.ExtensionUtil; +import run.halo.app.extension.MetadataUtil; import run.halo.app.infra.ExternalUrlSupplier; import run.halo.app.infra.SystemConfigurableEnvironmentFetcher; import run.halo.app.infra.SystemSetting; @@ -29,7 +29,7 @@ public class CategoryPermalinkPolicy implements PermalinkPolicy { @Override public String permalink(Category category) { - Map annotations = ExtensionUtil.nullSafeAnnotations(category); + Map annotations = MetadataUtil.nullSafeAnnotations(category); String permalinkPrefix = annotations.getOrDefault(Constant.PERMALINK_PATTERN_ANNO, DEFAULT_PERMALINK_PREFIX); String slug = encode(category.getSpec().getSlug(), StandardCharsets.UTF_8); diff --git a/src/main/java/run/halo/app/content/permalinks/ExtensionLocator.java b/application/src/main/java/run/halo/app/content/permalinks/ExtensionLocator.java similarity index 100% rename from src/main/java/run/halo/app/content/permalinks/ExtensionLocator.java rename to application/src/main/java/run/halo/app/content/permalinks/ExtensionLocator.java diff --git a/src/main/java/run/halo/app/content/permalinks/PermalinkPolicy.java b/application/src/main/java/run/halo/app/content/permalinks/PermalinkPolicy.java similarity index 100% rename from src/main/java/run/halo/app/content/permalinks/PermalinkPolicy.java rename to application/src/main/java/run/halo/app/content/permalinks/PermalinkPolicy.java diff --git a/src/main/java/run/halo/app/content/permalinks/PostPermalinkPolicy.java b/application/src/main/java/run/halo/app/content/permalinks/PostPermalinkPolicy.java similarity index 95% rename from src/main/java/run/halo/app/content/permalinks/PostPermalinkPolicy.java rename to application/src/main/java/run/halo/app/content/permalinks/PostPermalinkPolicy.java index c4c9e3cdc..f903ddde8 100644 --- a/src/main/java/run/halo/app/content/permalinks/PostPermalinkPolicy.java +++ b/application/src/main/java/run/halo/app/content/permalinks/PostPermalinkPolicy.java @@ -14,7 +14,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import run.halo.app.core.extension.content.Constant; import run.halo.app.core.extension.content.Post; -import run.halo.app.extension.ExtensionUtil; +import run.halo.app.extension.MetadataUtil; import run.halo.app.infra.ExternalUrlSupplier; import run.halo.app.infra.SystemConfigurableEnvironmentFetcher; import run.halo.app.infra.SystemSetting; @@ -36,7 +36,7 @@ public class PostPermalinkPolicy implements PermalinkPolicy { @Override public String permalink(Post post) { - Map annotations = ExtensionUtil.nullSafeAnnotations(post); + Map annotations = MetadataUtil.nullSafeAnnotations(post); String permalinkPattern = annotations.getOrDefault(Constant.PERMALINK_PATTERN_ANNO, DEFAULT_PERMALINK_PATTERN); return createPermalink(post, permalinkPattern); diff --git a/src/main/java/run/halo/app/content/permalinks/TagPermalinkPolicy.java b/application/src/main/java/run/halo/app/content/permalinks/TagPermalinkPolicy.java similarity index 92% rename from src/main/java/run/halo/app/content/permalinks/TagPermalinkPolicy.java rename to application/src/main/java/run/halo/app/content/permalinks/TagPermalinkPolicy.java index bb86ab5c5..a22ebf7bf 100644 --- a/src/main/java/run/halo/app/content/permalinks/TagPermalinkPolicy.java +++ b/application/src/main/java/run/halo/app/content/permalinks/TagPermalinkPolicy.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.util.UriUtils; import run.halo.app.core.extension.content.Constant; import run.halo.app.core.extension.content.Tag; -import run.halo.app.extension.ExtensionUtil; +import run.halo.app.extension.MetadataUtil; import run.halo.app.infra.ExternalUrlSupplier; import run.halo.app.infra.SystemConfigurableEnvironmentFetcher; import run.halo.app.infra.SystemSetting; @@ -27,7 +27,7 @@ public class TagPermalinkPolicy implements PermalinkPolicy { @Override public String permalink(Tag tag) { - Map annotations = ExtensionUtil.nullSafeAnnotations(tag); + Map annotations = MetadataUtil.nullSafeAnnotations(tag); String permalinkPrefix = annotations.getOrDefault(Constant.PERMALINK_PATTERN_ANNO, DEFAULT_PERMALINK_PREFIX); diff --git a/src/main/java/run/halo/app/core/extension/attachment/endpoint/AttachmentEndpoint.java b/application/src/main/java/run/halo/app/core/extension/attachment/endpoint/AttachmentEndpoint.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/attachment/endpoint/AttachmentEndpoint.java rename to application/src/main/java/run/halo/app/core/extension/attachment/endpoint/AttachmentEndpoint.java diff --git a/src/main/java/run/halo/app/core/extension/attachment/endpoint/LocalAttachmentUploadHandler.java b/application/src/main/java/run/halo/app/core/extension/attachment/endpoint/LocalAttachmentUploadHandler.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/attachment/endpoint/LocalAttachmentUploadHandler.java rename to application/src/main/java/run/halo/app/core/extension/attachment/endpoint/LocalAttachmentUploadHandler.java diff --git a/src/main/java/run/halo/app/core/extension/endpoint/AuthProviderEndpoint.java b/application/src/main/java/run/halo/app/core/extension/endpoint/AuthProviderEndpoint.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/endpoint/AuthProviderEndpoint.java rename to application/src/main/java/run/halo/app/core/extension/endpoint/AuthProviderEndpoint.java diff --git a/src/main/java/run/halo/app/core/extension/endpoint/CommentEndpoint.java b/application/src/main/java/run/halo/app/core/extension/endpoint/CommentEndpoint.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/endpoint/CommentEndpoint.java rename to application/src/main/java/run/halo/app/core/extension/endpoint/CommentEndpoint.java diff --git a/src/main/java/run/halo/app/core/extension/endpoint/CustomEndpointsBuilder.java b/application/src/main/java/run/halo/app/core/extension/endpoint/CustomEndpointsBuilder.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/endpoint/CustomEndpointsBuilder.java rename to application/src/main/java/run/halo/app/core/extension/endpoint/CustomEndpointsBuilder.java diff --git a/src/main/java/run/halo/app/core/extension/endpoint/PluginEndpoint.java b/application/src/main/java/run/halo/app/core/extension/endpoint/PluginEndpoint.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/endpoint/PluginEndpoint.java rename to application/src/main/java/run/halo/app/core/extension/endpoint/PluginEndpoint.java diff --git a/src/main/java/run/halo/app/core/extension/endpoint/PostEndpoint.java b/application/src/main/java/run/halo/app/core/extension/endpoint/PostEndpoint.java similarity index 99% rename from src/main/java/run/halo/app/core/extension/endpoint/PostEndpoint.java rename to application/src/main/java/run/halo/app/core/extension/endpoint/PostEndpoint.java index dea7f0637..98af24bba 100644 --- a/src/main/java/run/halo/app/core/extension/endpoint/PostEndpoint.java +++ b/application/src/main/java/run/halo/app/core/extension/endpoint/PostEndpoint.java @@ -32,8 +32,8 @@ import run.halo.app.content.PostService; import run.halo.app.core.extension.content.Post; import run.halo.app.event.post.PostRecycledEvent; import run.halo.app.event.post.PostUnpublishedEvent; -import run.halo.app.extension.ExtensionUtil; import run.halo.app.extension.ListResult; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.ReactiveExtensionClient; import run.halo.app.extension.router.QueryParamBuildUtil; @@ -241,7 +241,7 @@ public class PostEndpoint implements CustomEndpoint { private Mono awaitPostPublished(String postName) { return Mono.defer(() -> client.get(Post.class, postName) .filter(post -> { - var releasedSnapshot = ExtensionUtil.nullSafeAnnotations(post) + var releasedSnapshot = MetadataUtil.nullSafeAnnotations(post) .get(Post.LAST_RELEASED_SNAPSHOT_ANNO); var expectReleaseSnapshot = post.getSpec().getReleaseSnapshot(); return Objects.equals(releasedSnapshot, expectReleaseSnapshot); diff --git a/src/main/java/run/halo/app/core/extension/endpoint/ReplyEndpoint.java b/application/src/main/java/run/halo/app/core/extension/endpoint/ReplyEndpoint.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/endpoint/ReplyEndpoint.java rename to application/src/main/java/run/halo/app/core/extension/endpoint/ReplyEndpoint.java diff --git a/src/main/java/run/halo/app/core/extension/endpoint/SinglePageEndpoint.java b/application/src/main/java/run/halo/app/core/extension/endpoint/SinglePageEndpoint.java similarity index 98% rename from src/main/java/run/halo/app/core/extension/endpoint/SinglePageEndpoint.java rename to application/src/main/java/run/halo/app/core/extension/endpoint/SinglePageEndpoint.java index 6cad62ecf..cd7725d0b 100644 --- a/src/main/java/run/halo/app/core/extension/endpoint/SinglePageEndpoint.java +++ b/application/src/main/java/run/halo/app/core/extension/endpoint/SinglePageEndpoint.java @@ -28,8 +28,8 @@ import run.halo.app.content.SinglePageRequest; import run.halo.app.content.SinglePageService; import run.halo.app.core.extension.content.Post; import run.halo.app.core.extension.content.SinglePage; -import run.halo.app.extension.ExtensionUtil; import run.halo.app.extension.ListResult; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.ReactiveExtensionClient; import run.halo.app.extension.router.QueryParamBuildUtil; @@ -210,7 +210,7 @@ public class SinglePageEndpoint implements CustomEndpoint { return client.fetch(SinglePage.class, name) .map(latest -> { String latestReleasedSnapshotName = - ExtensionUtil.nullSafeAnnotations(latest) + MetadataUtil.nullSafeAnnotations(latest) .get(Post.LAST_RELEASED_SNAPSHOT_ANNO); if (StringUtils.equals(latestReleasedSnapshotName, latest.getSpec().getReleaseSnapshot())) { diff --git a/src/main/java/run/halo/app/core/extension/endpoint/StatsEndpoint.java b/application/src/main/java/run/halo/app/core/extension/endpoint/StatsEndpoint.java similarity index 96% rename from src/main/java/run/halo/app/core/extension/endpoint/StatsEndpoint.java rename to application/src/main/java/run/halo/app/core/extension/endpoint/StatsEndpoint.java index 16507674c..8ea04b4a7 100644 --- a/src/main/java/run/halo/app/core/extension/endpoint/StatsEndpoint.java +++ b/application/src/main/java/run/halo/app/core/extension/endpoint/StatsEndpoint.java @@ -13,7 +13,7 @@ import reactor.core.publisher.Mono; import run.halo.app.core.extension.Counter; import run.halo.app.core.extension.User; import run.halo.app.core.extension.content.Post; -import run.halo.app.extension.ExtensionUtil; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.ReactiveExtensionClient; /** @@ -57,7 +57,7 @@ public class StatsEndpoint implements CustomEndpoint { }) .flatMap(stats -> client.list(User.class, user -> { - var labels = ExtensionUtil.nullSafeLabels(user); + var labels = MetadataUtil.nullSafeLabels(user); return user.getMetadata().getDeletionTimestamp() == null && !parseBoolean(labels.getOrDefault(User.HIDDEN_USER_LABEL, "false")); }, diff --git a/src/main/java/run/halo/app/core/extension/endpoint/TrackerEndpoint.java b/application/src/main/java/run/halo/app/core/extension/endpoint/TrackerEndpoint.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/endpoint/TrackerEndpoint.java rename to application/src/main/java/run/halo/app/core/extension/endpoint/TrackerEndpoint.java diff --git a/src/main/java/run/halo/app/core/extension/endpoint/UserEndpoint.java b/application/src/main/java/run/halo/app/core/extension/endpoint/UserEndpoint.java similarity index 98% rename from src/main/java/run/halo/app/core/extension/endpoint/UserEndpoint.java rename to application/src/main/java/run/halo/app/core/extension/endpoint/UserEndpoint.java index f4954eed5..f2988e650 100644 --- a/src/main/java/run/halo/app/core/extension/endpoint/UserEndpoint.java +++ b/application/src/main/java/run/halo/app/core/extension/endpoint/UserEndpoint.java @@ -48,8 +48,8 @@ import run.halo.app.core.extension.User; import run.halo.app.core.extension.service.RoleService; import run.halo.app.core.extension.service.UserService; import run.halo.app.extension.Comparators; -import run.halo.app.extension.ExtensionUtil; import run.halo.app.extension.ListResult; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.ReactiveExtensionClient; import run.halo.app.extension.router.IListRequest; import run.halo.app.infra.utils.JsonUtils; @@ -214,7 +214,7 @@ public class UserEndpoint implements CustomEndpoint { Set roleNames(User user) { Assert.notNull(user, "User must not be null"); - Map annotations = ExtensionUtil.nullSafeAnnotations(user); + Map annotations = MetadataUtil.nullSafeAnnotations(user); String roleNamesJson = annotations.get(User.ROLE_NAMES_ANNO); if (StringUtils.isBlank(roleNamesJson)) { return Set.of(); @@ -274,7 +274,7 @@ public class UserEndpoint implements CustomEndpoint { .collectList() .flatMapMany(roleNames -> roleService.listDependenciesFlux(Set.copyOf(roleNames))) .map(role -> { - Map annotations = ExtensionUtil.nullSafeAnnotations(role); + Map annotations = MetadataUtil.nullSafeAnnotations(role); String uiPermissionStr = annotations.get(Role.UI_PERMISSIONS_ANNO); if (StringUtils.isBlank(uiPermissionStr)) { return new HashSet(); diff --git a/src/main/java/run/halo/app/core/extension/reconciler/AnnotationSettingReconciler.java b/application/src/main/java/run/halo/app/core/extension/reconciler/AnnotationSettingReconciler.java similarity index 92% rename from src/main/java/run/halo/app/core/extension/reconciler/AnnotationSettingReconciler.java rename to application/src/main/java/run/halo/app/core/extension/reconciler/AnnotationSettingReconciler.java index 5c6d97b54..8b6fce832 100644 --- a/src/main/java/run/halo/app/core/extension/reconciler/AnnotationSettingReconciler.java +++ b/application/src/main/java/run/halo/app/core/extension/reconciler/AnnotationSettingReconciler.java @@ -6,8 +6,8 @@ import org.springframework.stereotype.Component; import org.thymeleaf.util.StringUtils; import run.halo.app.core.extension.AnnotationSetting; import run.halo.app.extension.ExtensionClient; -import run.halo.app.extension.ExtensionUtil; import run.halo.app.extension.GroupKind; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.controller.Controller; import run.halo.app.extension.controller.ControllerBuilder; import run.halo.app.extension.controller.Reconciler; @@ -32,7 +32,7 @@ public class AnnotationSettingReconciler implements Reconciler { - Map labels = ExtensionUtil.nullSafeLabels(annotationSetting); + Map labels = MetadataUtil.nullSafeLabels(annotationSetting); String oldTargetRef = labels.get(AnnotationSetting.TARGET_REF_LABEL); GroupKind targetRef = annotationSetting.getSpec().getTargetRef(); diff --git a/src/main/java/run/halo/app/core/extension/reconciler/CategoryReconciler.java b/application/src/main/java/run/halo/app/core/extension/reconciler/CategoryReconciler.java similarity index 98% rename from src/main/java/run/halo/app/core/extension/reconciler/CategoryReconciler.java rename to application/src/main/java/run/halo/app/core/extension/reconciler/CategoryReconciler.java index 67bdf64fd..85b7a929b 100644 --- a/src/main/java/run/halo/app/core/extension/reconciler/CategoryReconciler.java +++ b/application/src/main/java/run/halo/app/core/extension/reconciler/CategoryReconciler.java @@ -20,7 +20,7 @@ import run.halo.app.core.extension.content.Category; import run.halo.app.core.extension.content.Constant; import run.halo.app.core.extension.content.Post; import run.halo.app.extension.ExtensionClient; -import run.halo.app.extension.ExtensionUtil; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.controller.Controller; import run.halo.app.extension.controller.ControllerBuilder; import run.halo.app.extension.controller.Reconciler; @@ -68,7 +68,7 @@ public class CategoryReconciler implements Reconciler { void reconcileMetadata(String name) { client.fetch(Category.class, name).ifPresent(category -> { - Map annotations = ExtensionUtil.nullSafeAnnotations(category); + Map annotations = MetadataUtil.nullSafeAnnotations(category); String oldPermalinkPattern = annotations.get(Constant.PERMALINK_PATTERN_ANNO); String newPattern = categoryPermalinkPolicy.pattern(); diff --git a/src/main/java/run/halo/app/core/extension/reconciler/CommentReconciler.java b/application/src/main/java/run/halo/app/core/extension/reconciler/CommentReconciler.java similarity index 98% rename from src/main/java/run/halo/app/core/extension/reconciler/CommentReconciler.java rename to application/src/main/java/run/halo/app/core/extension/reconciler/CommentReconciler.java index 8b8d56396..10b713042 100644 --- a/src/main/java/run/halo/app/core/extension/reconciler/CommentReconciler.java +++ b/application/src/main/java/run/halo/app/core/extension/reconciler/CommentReconciler.java @@ -17,8 +17,8 @@ import run.halo.app.core.extension.content.Comment; import run.halo.app.core.extension.content.Constant; import run.halo.app.core.extension.content.Reply; import run.halo.app.extension.ExtensionClient; -import run.halo.app.extension.ExtensionUtil; import run.halo.app.extension.GroupVersionKind; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.Ref; import run.halo.app.extension.SchemeManager; import run.halo.app.extension.controller.Controller; @@ -124,7 +124,7 @@ public class CommentReconciler implements Reconciler { private void updateUnReplyCountIfNecessary(Comment comment) { Instant lastReadTime = comment.getSpec().getLastReadTime(); - Map annotations = ExtensionUtil.nullSafeAnnotations(comment); + Map annotations = MetadataUtil.nullSafeAnnotations(comment); String lastReadTimeAnno = annotations.get(Constant.LAST_READ_TIME_ANNO); if (lastReadTime != null && lastReadTime.toString().equals(lastReadTimeAnno)) { return; diff --git a/src/main/java/run/halo/app/core/extension/reconciler/MenuItemReconciler.java b/application/src/main/java/run/halo/app/core/extension/reconciler/MenuItemReconciler.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/reconciler/MenuItemReconciler.java rename to application/src/main/java/run/halo/app/core/extension/reconciler/MenuItemReconciler.java diff --git a/src/main/java/run/halo/app/core/extension/reconciler/PluginReconciler.java b/application/src/main/java/run/halo/app/core/extension/reconciler/PluginReconciler.java similarity index 99% rename from src/main/java/run/halo/app/core/extension/reconciler/PluginReconciler.java rename to application/src/main/java/run/halo/app/core/extension/reconciler/PluginReconciler.java index 8835fea63..c8cbaad46 100644 --- a/src/main/java/run/halo/app/core/extension/reconciler/PluginReconciler.java +++ b/application/src/main/java/run/halo/app/core/extension/reconciler/PluginReconciler.java @@ -40,9 +40,9 @@ import run.halo.app.core.extension.Setting; import run.halo.app.core.extension.theme.SettingUtils; import run.halo.app.extension.ConfigMap; import run.halo.app.extension.ExtensionClient; -import run.halo.app.extension.ExtensionUtil; import run.halo.app.extension.GroupVersionKind; import run.halo.app.extension.Metadata; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.Unstructured; import run.halo.app.extension.controller.Controller; import run.halo.app.extension.controller.ControllerBuilder; @@ -185,7 +185,7 @@ public class PluginReconciler implements Reconciler { Optional settingOption = lookupPluginSetting(pluginName, settingName) .map(setting -> { // This annotation is added to prevent it from being deleted when stopped. - Map settingAnnotations = ExtensionUtil.nullSafeAnnotations(setting); + Map settingAnnotations = MetadataUtil.nullSafeAnnotations(setting); settingAnnotations.put(DELETE_STAGE, PluginConst.DeleteStage.UNINSTALL.name()); return setting; }) diff --git a/src/main/java/run/halo/app/core/extension/reconciler/PostReconciler.java b/application/src/main/java/run/halo/app/core/extension/reconciler/PostReconciler.java similarity index 98% rename from src/main/java/run/halo/app/core/extension/reconciler/PostReconciler.java rename to application/src/main/java/run/halo/app/core/extension/reconciler/PostReconciler.java index 4985e0798..2ab6177f8 100644 --- a/src/main/java/run/halo/app/core/extension/reconciler/PostReconciler.java +++ b/application/src/main/java/run/halo/app/core/extension/reconciler/PostReconciler.java @@ -23,7 +23,7 @@ import run.halo.app.event.post.PostPublishedEvent; import run.halo.app.event.post.PostUnpublishedEvent; import run.halo.app.extension.ExtensionClient; import run.halo.app.extension.ExtensionOperator; -import run.halo.app.extension.ExtensionUtil; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.Ref; import run.halo.app.extension.controller.Controller; import run.halo.app.extension.controller.ControllerBuilder; @@ -111,7 +111,7 @@ public class PostReconciler implements Reconciler { client.fetch(Post.class, name) .filter(post -> Objects.equals(true, post.getSpec().getPublish())) .ifPresent(post -> { - Map annotations = ExtensionUtil.nullSafeAnnotations(post); + Map annotations = MetadataUtil.nullSafeAnnotations(post); String lastReleasedSnapshot = annotations.get(Post.LAST_RELEASED_SNAPSHOT_ANNO); String releaseSnapshot = post.getSpec().getReleaseSnapshot(); if (StringUtils.isBlank(releaseSnapshot)) { @@ -225,7 +225,7 @@ public class PostReconciler implements Reconciler { Post.PostSpec spec = post.getSpec(); // handle logic delete - Map labels = ExtensionUtil.nullSafeLabels(post); + Map labels = MetadataUtil.nullSafeLabels(post); if (Objects.equals(spec.getDeleted(), true)) { labels.put(Post.DELETED_LABEL, Boolean.TRUE.toString()); } else { @@ -244,7 +244,7 @@ public class PostReconciler implements Reconciler { labels.put(Post.PUBLISHED_LABEL, Boolean.FALSE.toString()); } - Map annotations = ExtensionUtil.nullSafeAnnotations(post); + Map annotations = MetadataUtil.nullSafeAnnotations(post); String newPattern = postPermalinkPolicy.pattern(); annotations.put(Constant.PERMALINK_PATTERN_ANNO, newPattern); diff --git a/src/main/java/run/halo/app/core/extension/reconciler/ReplyReconciler.java b/application/src/main/java/run/halo/app/core/extension/reconciler/ReplyReconciler.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/reconciler/ReplyReconciler.java rename to application/src/main/java/run/halo/app/core/extension/reconciler/ReplyReconciler.java diff --git a/src/main/java/run/halo/app/core/extension/reconciler/ReverseProxyReconciler.java b/application/src/main/java/run/halo/app/core/extension/reconciler/ReverseProxyReconciler.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/reconciler/ReverseProxyReconciler.java rename to application/src/main/java/run/halo/app/core/extension/reconciler/ReverseProxyReconciler.java diff --git a/src/main/java/run/halo/app/core/extension/reconciler/RoleBindingReconciler.java b/application/src/main/java/run/halo/app/core/extension/reconciler/RoleBindingReconciler.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/reconciler/RoleBindingReconciler.java rename to application/src/main/java/run/halo/app/core/extension/reconciler/RoleBindingReconciler.java diff --git a/src/main/java/run/halo/app/core/extension/reconciler/RoleReconciler.java b/application/src/main/java/run/halo/app/core/extension/reconciler/RoleReconciler.java similarity index 93% rename from src/main/java/run/halo/app/core/extension/reconciler/RoleReconciler.java rename to application/src/main/java/run/halo/app/core/extension/reconciler/RoleReconciler.java index 2df8c608a..e3d631139 100644 --- a/src/main/java/run/halo/app/core/extension/reconciler/RoleReconciler.java +++ b/application/src/main/java/run/halo/app/core/extension/reconciler/RoleReconciler.java @@ -7,7 +7,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import run.halo.app.core.extension.Role; import run.halo.app.extension.ExtensionClient; -import run.halo.app.extension.ExtensionUtil; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.controller.Controller; import run.halo.app.extension.controller.ControllerBuilder; import run.halo.app.extension.controller.Reconciler; @@ -33,7 +33,7 @@ public class RoleReconciler implements Reconciler { public Result reconcile(Request request) { client.fetch(Role.class, request.name()) .ifPresent(role -> { - Map annotations = ExtensionUtil.nullSafeAnnotations(role); + Map annotations = MetadataUtil.nullSafeAnnotations(role); // override dependency rules to annotations annotations.put(Role.ROLE_DEPENDENCY_RULES, "[]"); annotations.put(Role.UI_PERMISSIONS_AGGREGATED_ANNO, "[]"); diff --git a/src/main/java/run/halo/app/core/extension/reconciler/SinglePageReconciler.java b/application/src/main/java/run/halo/app/core/extension/reconciler/SinglePageReconciler.java similarity index 98% rename from src/main/java/run/halo/app/core/extension/reconciler/SinglePageReconciler.java rename to application/src/main/java/run/halo/app/core/extension/reconciler/SinglePageReconciler.java index 73f922127..6b75a8f42 100644 --- a/src/main/java/run/halo/app/core/extension/reconciler/SinglePageReconciler.java +++ b/application/src/main/java/run/halo/app/core/extension/reconciler/SinglePageReconciler.java @@ -23,7 +23,7 @@ import run.halo.app.core.extension.content.SinglePage; import run.halo.app.core.extension.content.Snapshot; import run.halo.app.extension.ExtensionClient; import run.halo.app.extension.ExtensionOperator; -import run.halo.app.extension.ExtensionUtil; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.Ref; import run.halo.app.extension.controller.Controller; import run.halo.app.extension.controller.ControllerBuilder; @@ -107,7 +107,7 @@ public class SinglePageReconciler implements Reconciler { client.fetch(SinglePage.class, name) .filter(page -> Objects.equals(true, page.getSpec().getPublish())) .ifPresent(page -> { - Map annotations = ExtensionUtil.nullSafeAnnotations(page); + Map annotations = MetadataUtil.nullSafeAnnotations(page); String lastReleasedSnapshot = annotations.get(Post.LAST_RELEASED_SNAPSHOT_ANNO); String releaseSnapshot = page.getSpec().getReleaseSnapshot(); if (StringUtils.isBlank(releaseSnapshot)) { @@ -263,7 +263,7 @@ public class SinglePageReconciler implements Reconciler { SinglePage.SinglePageSpec spec = singlePage.getSpec(); // handle logic delete - Map labels = ExtensionUtil.nullSafeLabels(singlePage); + Map labels = MetadataUtil.nullSafeLabels(singlePage); if (isDeleted(singlePage)) { labels.put(SinglePage.DELETED_LABEL, Boolean.TRUE.toString()); } else { diff --git a/src/main/java/run/halo/app/core/extension/reconciler/SystemSettingReconciler.java b/application/src/main/java/run/halo/app/core/extension/reconciler/SystemSettingReconciler.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/reconciler/SystemSettingReconciler.java rename to application/src/main/java/run/halo/app/core/extension/reconciler/SystemSettingReconciler.java diff --git a/src/main/java/run/halo/app/core/extension/reconciler/TagReconciler.java b/application/src/main/java/run/halo/app/core/extension/reconciler/TagReconciler.java similarity index 97% rename from src/main/java/run/halo/app/core/extension/reconciler/TagReconciler.java rename to application/src/main/java/run/halo/app/core/extension/reconciler/TagReconciler.java index b4579de1b..887ca0ae0 100644 --- a/src/main/java/run/halo/app/core/extension/reconciler/TagReconciler.java +++ b/application/src/main/java/run/halo/app/core/extension/reconciler/TagReconciler.java @@ -14,7 +14,7 @@ import run.halo.app.core.extension.content.Constant; import run.halo.app.core.extension.content.Post; import run.halo.app.core.extension.content.Tag; import run.halo.app.extension.ExtensionClient; -import run.halo.app.extension.ExtensionUtil; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.controller.Controller; import run.halo.app.extension.controller.ControllerBuilder; import run.halo.app.extension.controller.Reconciler; @@ -64,7 +64,7 @@ public class TagReconciler implements Reconciler { void reconcileMetadata(String name) { client.fetch(Tag.class, name).ifPresent(tag -> { - Map annotations = ExtensionUtil.nullSafeAnnotations(tag); + Map annotations = MetadataUtil.nullSafeAnnotations(tag); String oldPermalinkPattern = annotations.get(Constant.PERMALINK_PATTERN_ANNO); String newPattern = tagPermalinkPolicy.pattern(); diff --git a/src/main/java/run/halo/app/core/extension/reconciler/ThemeReconciler.java b/application/src/main/java/run/halo/app/core/extension/reconciler/ThemeReconciler.java similarity index 98% rename from src/main/java/run/halo/app/core/extension/reconciler/ThemeReconciler.java rename to application/src/main/java/run/halo/app/core/extension/reconciler/ThemeReconciler.java index 692869f32..82e2b8987 100644 --- a/src/main/java/run/halo/app/core/extension/reconciler/ThemeReconciler.java +++ b/application/src/main/java/run/halo/app/core/extension/reconciler/ThemeReconciler.java @@ -20,8 +20,8 @@ import run.halo.app.core.extension.Theme; import run.halo.app.core.extension.theme.SettingUtils; import run.halo.app.extension.ConfigMap; import run.halo.app.extension.ExtensionClient; -import run.halo.app.extension.ExtensionUtil; import run.halo.app.extension.Metadata; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.controller.Controller; import run.halo.app.extension.controller.ControllerBuilder; import run.halo.app.extension.controller.Reconciler; @@ -226,7 +226,7 @@ public class ThemeReconciler implements Reconciler { private List listAnnotationSettingsByThemeName(String themeName) { return client.list(AnnotationSetting.class, annotationSetting -> { - Map labels = ExtensionUtil.nullSafeLabels(annotationSetting); + Map labels = MetadataUtil.nullSafeLabels(annotationSetting); return themeName.equals(labels.get(Theme.THEME_NAME_LABEL)); }, null); } diff --git a/src/main/java/run/halo/app/core/extension/reconciler/UserReconciler.java b/application/src/main/java/run/halo/app/core/extension/reconciler/UserReconciler.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/reconciler/UserReconciler.java rename to application/src/main/java/run/halo/app/core/extension/reconciler/UserReconciler.java diff --git a/src/main/java/run/halo/app/core/extension/reconciler/attachment/AttachmentReconciler.java b/application/src/main/java/run/halo/app/core/extension/reconciler/attachment/AttachmentReconciler.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/reconciler/attachment/AttachmentReconciler.java rename to application/src/main/java/run/halo/app/core/extension/reconciler/attachment/AttachmentReconciler.java diff --git a/src/main/java/run/halo/app/core/extension/service/DefaultRoleBindingService.java b/application/src/main/java/run/halo/app/core/extension/service/DefaultRoleBindingService.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/service/DefaultRoleBindingService.java rename to application/src/main/java/run/halo/app/core/extension/service/DefaultRoleBindingService.java diff --git a/src/main/java/run/halo/app/core/extension/service/DefaultRoleService.java b/application/src/main/java/run/halo/app/core/extension/service/DefaultRoleService.java similarity index 97% rename from src/main/java/run/halo/app/core/extension/service/DefaultRoleService.java rename to application/src/main/java/run/halo/app/core/extension/service/DefaultRoleService.java index 6c5605cee..28ee304a6 100644 --- a/src/main/java/run/halo/app/core/extension/service/DefaultRoleService.java +++ b/application/src/main/java/run/halo/app/core/extension/service/DefaultRoleService.java @@ -20,7 +20,7 @@ import run.halo.app.core.extension.Role; import run.halo.app.core.extension.RoleBinding; import run.halo.app.core.extension.RoleBinding.RoleRef; import run.halo.app.core.extension.RoleBinding.Subject; -import run.halo.app.extension.ExtensionUtil; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.ReactiveExtensionClient; import run.halo.app.infra.utils.JsonUtils; @@ -104,7 +104,7 @@ public class DefaultRoleService implements RoleService { return Flux.empty(); } visited.add(name); - var annotations = ExtensionUtil.nullSafeAnnotations(role); + var annotations = MetadataUtil.nullSafeAnnotations(role); var dependenciesJson = annotations.get(Role.ROLE_DEPENDENCIES_ANNO); var dependencies = stringToList(dependenciesJson); return Flux.fromIterable(dependencies) diff --git a/src/main/java/run/halo/app/core/extension/service/PluginService.java b/application/src/main/java/run/halo/app/core/extension/service/PluginService.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/service/PluginService.java rename to application/src/main/java/run/halo/app/core/extension/service/PluginService.java diff --git a/src/main/java/run/halo/app/core/extension/service/RoleBindingService.java b/application/src/main/java/run/halo/app/core/extension/service/RoleBindingService.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/service/RoleBindingService.java rename to application/src/main/java/run/halo/app/core/extension/service/RoleBindingService.java diff --git a/src/main/java/run/halo/app/core/extension/service/RoleService.java b/application/src/main/java/run/halo/app/core/extension/service/RoleService.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/service/RoleService.java rename to application/src/main/java/run/halo/app/core/extension/service/RoleService.java diff --git a/src/main/java/run/halo/app/core/extension/service/UserService.java b/application/src/main/java/run/halo/app/core/extension/service/UserService.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/service/UserService.java rename to application/src/main/java/run/halo/app/core/extension/service/UserService.java diff --git a/src/main/java/run/halo/app/core/extension/service/UserServiceImpl.java b/application/src/main/java/run/halo/app/core/extension/service/UserServiceImpl.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/service/UserServiceImpl.java rename to application/src/main/java/run/halo/app/core/extension/service/UserServiceImpl.java diff --git a/src/main/java/run/halo/app/core/extension/service/impl/PluginServiceImpl.java b/application/src/main/java/run/halo/app/core/extension/service/impl/PluginServiceImpl.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/service/impl/PluginServiceImpl.java rename to application/src/main/java/run/halo/app/core/extension/service/impl/PluginServiceImpl.java diff --git a/src/main/java/run/halo/app/core/extension/theme/SettingUtils.java b/application/src/main/java/run/halo/app/core/extension/theme/SettingUtils.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/theme/SettingUtils.java rename to application/src/main/java/run/halo/app/core/extension/theme/SettingUtils.java diff --git a/src/main/java/run/halo/app/core/extension/theme/ThemeEndpoint.java b/application/src/main/java/run/halo/app/core/extension/theme/ThemeEndpoint.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/theme/ThemeEndpoint.java rename to application/src/main/java/run/halo/app/core/extension/theme/ThemeEndpoint.java diff --git a/src/main/java/run/halo/app/core/extension/theme/ThemeService.java b/application/src/main/java/run/halo/app/core/extension/theme/ThemeService.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/theme/ThemeService.java rename to application/src/main/java/run/halo/app/core/extension/theme/ThemeService.java diff --git a/src/main/java/run/halo/app/core/extension/theme/ThemeServiceImpl.java b/application/src/main/java/run/halo/app/core/extension/theme/ThemeServiceImpl.java similarity index 99% rename from src/main/java/run/halo/app/core/extension/theme/ThemeServiceImpl.java rename to application/src/main/java/run/halo/app/core/extension/theme/ThemeServiceImpl.java index a7a58c9dc..44c9f1bf6 100644 --- a/src/main/java/run/halo/app/core/extension/theme/ThemeServiceImpl.java +++ b/application/src/main/java/run/halo/app/core/extension/theme/ThemeServiceImpl.java @@ -35,7 +35,7 @@ import run.halo.app.core.extension.AnnotationSetting; import run.halo.app.core.extension.Setting; import run.halo.app.core.extension.Theme; import run.halo.app.extension.ConfigMap; -import run.halo.app.extension.ExtensionUtil; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.ReactiveExtensionClient; import run.halo.app.extension.Unstructured; import run.halo.app.infra.SystemVersionSupplier; @@ -277,7 +277,7 @@ public class ThemeServiceImpl implements ThemeService { private Mono waitForAnnotationSettingsDeleted(String themeName) { return client.list(AnnotationSetting.class, annotationSetting -> { - Map labels = ExtensionUtil.nullSafeLabels(annotationSetting); + Map labels = MetadataUtil.nullSafeLabels(annotationSetting); return StringUtils.equals(themeName, labels.get(Theme.THEME_NAME_LABEL)); }, null) .flatMap(annotationSetting -> client.delete(annotationSetting) diff --git a/src/main/java/run/halo/app/core/extension/theme/ThemeUtils.java b/application/src/main/java/run/halo/app/core/extension/theme/ThemeUtils.java similarity index 100% rename from src/main/java/run/halo/app/core/extension/theme/ThemeUtils.java rename to application/src/main/java/run/halo/app/core/extension/theme/ThemeUtils.java diff --git a/src/main/java/run/halo/app/event/post/DownvotedEvent.java b/application/src/main/java/run/halo/app/event/post/DownvotedEvent.java similarity index 100% rename from src/main/java/run/halo/app/event/post/DownvotedEvent.java rename to application/src/main/java/run/halo/app/event/post/DownvotedEvent.java diff --git a/src/main/java/run/halo/app/event/post/PostEvent.java b/application/src/main/java/run/halo/app/event/post/PostEvent.java similarity index 100% rename from src/main/java/run/halo/app/event/post/PostEvent.java rename to application/src/main/java/run/halo/app/event/post/PostEvent.java diff --git a/src/main/java/run/halo/app/event/post/PostPublishedEvent.java b/application/src/main/java/run/halo/app/event/post/PostPublishedEvent.java similarity index 100% rename from src/main/java/run/halo/app/event/post/PostPublishedEvent.java rename to application/src/main/java/run/halo/app/event/post/PostPublishedEvent.java diff --git a/src/main/java/run/halo/app/event/post/PostRecycledEvent.java b/application/src/main/java/run/halo/app/event/post/PostRecycledEvent.java similarity index 100% rename from src/main/java/run/halo/app/event/post/PostRecycledEvent.java rename to application/src/main/java/run/halo/app/event/post/PostRecycledEvent.java diff --git a/src/main/java/run/halo/app/event/post/PostUnpublishedEvent.java b/application/src/main/java/run/halo/app/event/post/PostUnpublishedEvent.java similarity index 100% rename from src/main/java/run/halo/app/event/post/PostUnpublishedEvent.java rename to application/src/main/java/run/halo/app/event/post/PostUnpublishedEvent.java diff --git a/src/main/java/run/halo/app/event/post/ReplyCreatedEvent.java b/application/src/main/java/run/halo/app/event/post/ReplyCreatedEvent.java similarity index 100% rename from src/main/java/run/halo/app/event/post/ReplyCreatedEvent.java rename to application/src/main/java/run/halo/app/event/post/ReplyCreatedEvent.java diff --git a/src/main/java/run/halo/app/event/post/ReplyDeletedEvent.java b/application/src/main/java/run/halo/app/event/post/ReplyDeletedEvent.java similarity index 100% rename from src/main/java/run/halo/app/event/post/ReplyDeletedEvent.java rename to application/src/main/java/run/halo/app/event/post/ReplyDeletedEvent.java diff --git a/src/main/java/run/halo/app/event/post/ReplyEvent.java b/application/src/main/java/run/halo/app/event/post/ReplyEvent.java similarity index 100% rename from src/main/java/run/halo/app/event/post/ReplyEvent.java rename to application/src/main/java/run/halo/app/event/post/ReplyEvent.java diff --git a/src/main/java/run/halo/app/event/post/UpvotedEvent.java b/application/src/main/java/run/halo/app/event/post/UpvotedEvent.java similarity index 100% rename from src/main/java/run/halo/app/event/post/UpvotedEvent.java rename to application/src/main/java/run/halo/app/event/post/UpvotedEvent.java diff --git a/src/main/java/run/halo/app/event/post/VisitedEvent.java b/application/src/main/java/run/halo/app/event/post/VisitedEvent.java similarity index 100% rename from src/main/java/run/halo/app/event/post/VisitedEvent.java rename to application/src/main/java/run/halo/app/event/post/VisitedEvent.java diff --git a/src/main/java/run/halo/app/event/post/VotedEvent.java b/application/src/main/java/run/halo/app/event/post/VotedEvent.java similarity index 100% rename from src/main/java/run/halo/app/event/post/VotedEvent.java rename to application/src/main/java/run/halo/app/event/post/VotedEvent.java diff --git a/src/main/java/run/halo/app/extension/Comparators.java b/application/src/main/java/run/halo/app/extension/Comparators.java similarity index 100% rename from src/main/java/run/halo/app/extension/Comparators.java rename to application/src/main/java/run/halo/app/extension/Comparators.java diff --git a/src/main/java/run/halo/app/extension/DefaultSchemeManager.java b/application/src/main/java/run/halo/app/extension/DefaultSchemeManager.java similarity index 100% rename from src/main/java/run/halo/app/extension/DefaultSchemeManager.java rename to application/src/main/java/run/halo/app/extension/DefaultSchemeManager.java diff --git a/src/main/java/run/halo/app/extension/DefaultSchemeWatcherManager.java b/application/src/main/java/run/halo/app/extension/DefaultSchemeWatcherManager.java similarity index 100% rename from src/main/java/run/halo/app/extension/DefaultSchemeWatcherManager.java rename to application/src/main/java/run/halo/app/extension/DefaultSchemeWatcherManager.java diff --git a/src/main/java/run/halo/app/extension/DelegateExtensionClient.java b/application/src/main/java/run/halo/app/extension/DelegateExtensionClient.java similarity index 100% rename from src/main/java/run/halo/app/extension/DelegateExtensionClient.java rename to application/src/main/java/run/halo/app/extension/DelegateExtensionClient.java diff --git a/src/main/java/run/halo/app/extension/ExtensionConverter.java b/application/src/main/java/run/halo/app/extension/ExtensionConverter.java similarity index 100% rename from src/main/java/run/halo/app/extension/ExtensionConverter.java rename to application/src/main/java/run/halo/app/extension/ExtensionConverter.java diff --git a/application/src/main/java/run/halo/app/extension/ExtensionUtil.java b/application/src/main/java/run/halo/app/extension/ExtensionUtil.java new file mode 100644 index 000000000..93e35b696 --- /dev/null +++ b/application/src/main/java/run/halo/app/extension/ExtensionUtil.java @@ -0,0 +1,42 @@ +package run.halo.app.extension; + +import org.springframework.util.StringUtils; + +/** + * Extension utilities. + * + * @author johnniang + */ +public final class ExtensionUtil { + + private ExtensionUtil() { + } + + /** + * Builds the name prefix of ExtensionStore. + * + * @param scheme is scheme of an Extension. + * @return name prefix of ExtensionStore. + */ + public static String buildStoreNamePrefix(Scheme scheme) { + // rule of key: /registry/[group]/plural-name/extension-name + StringBuilder builder = new StringBuilder("/registry/"); + if (StringUtils.hasText(scheme.groupVersionKind().group())) { + builder.append(scheme.groupVersionKind().group()).append('/'); + } + builder.append(scheme.plural()); + return builder.toString(); + } + + /** + * Builds full name of ExtensionStore. + * + * @param scheme is scheme of an Extension. + * @param name the exact name of Extension. + * @return full name of ExtensionStore. + */ + public static String buildStoreName(Scheme scheme, String name) { + return buildStoreNamePrefix(scheme) + "/" + name; + } + +} diff --git a/src/main/java/run/halo/app/extension/JSONExtensionConverter.java b/application/src/main/java/run/halo/app/extension/JSONExtensionConverter.java similarity index 100% rename from src/main/java/run/halo/app/extension/JSONExtensionConverter.java rename to application/src/main/java/run/halo/app/extension/JSONExtensionConverter.java diff --git a/src/main/java/run/halo/app/extension/ReactiveExtensionClientImpl.java b/application/src/main/java/run/halo/app/extension/ReactiveExtensionClientImpl.java similarity index 100% rename from src/main/java/run/halo/app/extension/ReactiveExtensionClientImpl.java rename to application/src/main/java/run/halo/app/extension/ReactiveExtensionClientImpl.java diff --git a/src/main/java/run/halo/app/extension/SchemeWatcherManager.java b/application/src/main/java/run/halo/app/extension/SchemeWatcherManager.java similarity index 100% rename from src/main/java/run/halo/app/extension/SchemeWatcherManager.java rename to application/src/main/java/run/halo/app/extension/SchemeWatcherManager.java diff --git a/src/main/java/run/halo/app/extension/controller/ControllerManager.java b/application/src/main/java/run/halo/app/extension/controller/ControllerManager.java similarity index 100% rename from src/main/java/run/halo/app/extension/controller/ControllerManager.java rename to application/src/main/java/run/halo/app/extension/controller/ControllerManager.java diff --git a/src/main/java/run/halo/app/extension/controller/DefaultControllerManager.java b/application/src/main/java/run/halo/app/extension/controller/DefaultControllerManager.java similarity index 100% rename from src/main/java/run/halo/app/extension/controller/DefaultControllerManager.java rename to application/src/main/java/run/halo/app/extension/controller/DefaultControllerManager.java diff --git a/src/main/java/run/halo/app/extension/exception/ExtensionConvertException.java b/application/src/main/java/run/halo/app/extension/exception/ExtensionConvertException.java similarity index 100% rename from src/main/java/run/halo/app/extension/exception/ExtensionConvertException.java rename to application/src/main/java/run/halo/app/extension/exception/ExtensionConvertException.java diff --git a/src/main/java/run/halo/app/extension/exception/ExtensionNotFoundException.java b/application/src/main/java/run/halo/app/extension/exception/ExtensionNotFoundException.java similarity index 100% rename from src/main/java/run/halo/app/extension/exception/ExtensionNotFoundException.java rename to application/src/main/java/run/halo/app/extension/exception/ExtensionNotFoundException.java diff --git a/src/main/java/run/halo/app/extension/exception/SchemaViolationException.java b/application/src/main/java/run/halo/app/extension/exception/SchemaViolationException.java similarity index 100% rename from src/main/java/run/halo/app/extension/exception/SchemaViolationException.java rename to application/src/main/java/run/halo/app/extension/exception/SchemaViolationException.java diff --git a/src/main/java/run/halo/app/extension/gc/GcControllerInitializer.java b/application/src/main/java/run/halo/app/extension/gc/GcControllerInitializer.java similarity index 100% rename from src/main/java/run/halo/app/extension/gc/GcControllerInitializer.java rename to application/src/main/java/run/halo/app/extension/gc/GcControllerInitializer.java diff --git a/src/main/java/run/halo/app/extension/gc/GcReconciler.java b/application/src/main/java/run/halo/app/extension/gc/GcReconciler.java similarity index 100% rename from src/main/java/run/halo/app/extension/gc/GcReconciler.java rename to application/src/main/java/run/halo/app/extension/gc/GcReconciler.java diff --git a/src/main/java/run/halo/app/extension/gc/GcRequest.java b/application/src/main/java/run/halo/app/extension/gc/GcRequest.java similarity index 100% rename from src/main/java/run/halo/app/extension/gc/GcRequest.java rename to application/src/main/java/run/halo/app/extension/gc/GcRequest.java diff --git a/src/main/java/run/halo/app/extension/gc/GcSynchronizer.java b/application/src/main/java/run/halo/app/extension/gc/GcSynchronizer.java similarity index 100% rename from src/main/java/run/halo/app/extension/gc/GcSynchronizer.java rename to application/src/main/java/run/halo/app/extension/gc/GcSynchronizer.java diff --git a/src/main/java/run/halo/app/extension/gc/GcWatcher.java b/application/src/main/java/run/halo/app/extension/gc/GcWatcher.java similarity index 100% rename from src/main/java/run/halo/app/extension/gc/GcWatcher.java rename to application/src/main/java/run/halo/app/extension/gc/GcWatcher.java diff --git a/src/main/java/run/halo/app/extension/router/ExtensionCompositeRouterFunction.java b/application/src/main/java/run/halo/app/extension/router/ExtensionCompositeRouterFunction.java similarity index 100% rename from src/main/java/run/halo/app/extension/router/ExtensionCompositeRouterFunction.java rename to application/src/main/java/run/halo/app/extension/router/ExtensionCompositeRouterFunction.java diff --git a/src/main/java/run/halo/app/extension/router/ExtensionCreateHandler.java b/application/src/main/java/run/halo/app/extension/router/ExtensionCreateHandler.java similarity index 100% rename from src/main/java/run/halo/app/extension/router/ExtensionCreateHandler.java rename to application/src/main/java/run/halo/app/extension/router/ExtensionCreateHandler.java diff --git a/src/main/java/run/halo/app/extension/router/ExtensionDeleteHandler.java b/application/src/main/java/run/halo/app/extension/router/ExtensionDeleteHandler.java similarity index 100% rename from src/main/java/run/halo/app/extension/router/ExtensionDeleteHandler.java rename to application/src/main/java/run/halo/app/extension/router/ExtensionDeleteHandler.java diff --git a/src/main/java/run/halo/app/extension/router/ExtensionGetHandler.java b/application/src/main/java/run/halo/app/extension/router/ExtensionGetHandler.java similarity index 100% rename from src/main/java/run/halo/app/extension/router/ExtensionGetHandler.java rename to application/src/main/java/run/halo/app/extension/router/ExtensionGetHandler.java diff --git a/src/main/java/run/halo/app/extension/router/ExtensionListHandler.java b/application/src/main/java/run/halo/app/extension/router/ExtensionListHandler.java similarity index 100% rename from src/main/java/run/halo/app/extension/router/ExtensionListHandler.java rename to application/src/main/java/run/halo/app/extension/router/ExtensionListHandler.java diff --git a/src/main/java/run/halo/app/extension/router/ExtensionRouterFunctionFactory.java b/application/src/main/java/run/halo/app/extension/router/ExtensionRouterFunctionFactory.java similarity index 98% rename from src/main/java/run/halo/app/extension/router/ExtensionRouterFunctionFactory.java rename to application/src/main/java/run/halo/app/extension/router/ExtensionRouterFunctionFactory.java index 1ee391a18..6cce85da8 100644 --- a/src/main/java/run/halo/app/extension/router/ExtensionRouterFunctionFactory.java +++ b/application/src/main/java/run/halo/app/extension/router/ExtensionRouterFunctionFactory.java @@ -13,6 +13,7 @@ import org.springframework.web.reactive.function.server.ServerResponse; import run.halo.app.extension.ListResult; import run.halo.app.extension.ReactiveExtensionClient; import run.halo.app.extension.Scheme; +import run.halo.app.extension.router.IListRequest.QueryListRequest; public class ExtensionRouterFunctionFactory { @@ -54,7 +55,7 @@ public class ExtensionRouterFunctionFactory { .response(responseBuilder().responseCode("200") .description("Response " + scheme.plural()) .implementation(ListResult.generateGenericClass(scheme))); - QueryParamBuildUtil.buildParametersFromType(builder, ListRequest.class); + QueryParamBuildUtil.buildParametersFromType(builder, QueryListRequest.class); }) .POST(createHandler.pathPattern(), createHandler, builder -> builder.operationId("Create" + gvk) diff --git a/src/main/java/run/halo/app/extension/router/ExtensionUpdateHandler.java b/application/src/main/java/run/halo/app/extension/router/ExtensionUpdateHandler.java similarity index 100% rename from src/main/java/run/halo/app/extension/router/ExtensionUpdateHandler.java rename to application/src/main/java/run/halo/app/extension/router/ExtensionUpdateHandler.java diff --git a/src/main/java/run/halo/app/extension/router/selector/FieldCriteriaPredicateConverter.java b/application/src/main/java/run/halo/app/extension/router/selector/FieldCriteriaPredicateConverter.java similarity index 100% rename from src/main/java/run/halo/app/extension/router/selector/FieldCriteriaPredicateConverter.java rename to application/src/main/java/run/halo/app/extension/router/selector/FieldCriteriaPredicateConverter.java diff --git a/src/main/java/run/halo/app/extension/router/selector/LabelCriteriaPredicateConverter.java b/application/src/main/java/run/halo/app/extension/router/selector/LabelCriteriaPredicateConverter.java similarity index 100% rename from src/main/java/run/halo/app/extension/router/selector/LabelCriteriaPredicateConverter.java rename to application/src/main/java/run/halo/app/extension/router/selector/LabelCriteriaPredicateConverter.java diff --git a/src/main/java/run/halo/app/extension/router/selector/Operator.java b/application/src/main/java/run/halo/app/extension/router/selector/Operator.java similarity index 100% rename from src/main/java/run/halo/app/extension/router/selector/Operator.java rename to application/src/main/java/run/halo/app/extension/router/selector/Operator.java diff --git a/src/main/java/run/halo/app/extension/router/selector/SelectorConverter.java b/application/src/main/java/run/halo/app/extension/router/selector/SelectorConverter.java similarity index 100% rename from src/main/java/run/halo/app/extension/router/selector/SelectorConverter.java rename to application/src/main/java/run/halo/app/extension/router/selector/SelectorConverter.java diff --git a/src/main/java/run/halo/app/extension/router/selector/SelectorCriteria.java b/application/src/main/java/run/halo/app/extension/router/selector/SelectorCriteria.java similarity index 100% rename from src/main/java/run/halo/app/extension/router/selector/SelectorCriteria.java rename to application/src/main/java/run/halo/app/extension/router/selector/SelectorCriteria.java diff --git a/src/main/java/run/halo/app/extension/router/selector/SelectorUtil.java b/application/src/main/java/run/halo/app/extension/router/selector/SelectorUtil.java similarity index 100% rename from src/main/java/run/halo/app/extension/router/selector/SelectorUtil.java rename to application/src/main/java/run/halo/app/extension/router/selector/SelectorUtil.java diff --git a/src/main/java/run/halo/app/extension/store/ExtensionStore.java b/application/src/main/java/run/halo/app/extension/store/ExtensionStore.java similarity index 100% rename from src/main/java/run/halo/app/extension/store/ExtensionStore.java rename to application/src/main/java/run/halo/app/extension/store/ExtensionStore.java diff --git a/src/main/java/run/halo/app/extension/store/ExtensionStoreClient.java b/application/src/main/java/run/halo/app/extension/store/ExtensionStoreClient.java similarity index 100% rename from src/main/java/run/halo/app/extension/store/ExtensionStoreClient.java rename to application/src/main/java/run/halo/app/extension/store/ExtensionStoreClient.java diff --git a/src/main/java/run/halo/app/extension/store/ExtensionStoreClientJPAImpl.java b/application/src/main/java/run/halo/app/extension/store/ExtensionStoreClientJPAImpl.java similarity index 100% rename from src/main/java/run/halo/app/extension/store/ExtensionStoreClientJPAImpl.java rename to application/src/main/java/run/halo/app/extension/store/ExtensionStoreClientJPAImpl.java diff --git a/src/main/java/run/halo/app/extension/store/ExtensionStoreRepository.java b/application/src/main/java/run/halo/app/extension/store/ExtensionStoreRepository.java similarity index 100% rename from src/main/java/run/halo/app/extension/store/ExtensionStoreRepository.java rename to application/src/main/java/run/halo/app/extension/store/ExtensionStoreRepository.java diff --git a/src/main/java/run/halo/app/extension/store/ReactiveExtensionStoreClient.java b/application/src/main/java/run/halo/app/extension/store/ReactiveExtensionStoreClient.java similarity index 100% rename from src/main/java/run/halo/app/extension/store/ReactiveExtensionStoreClient.java rename to application/src/main/java/run/halo/app/extension/store/ReactiveExtensionStoreClient.java diff --git a/src/main/java/run/halo/app/extension/store/ReactiveExtensionStoreClientImpl.java b/application/src/main/java/run/halo/app/extension/store/ReactiveExtensionStoreClientImpl.java similarity index 100% rename from src/main/java/run/halo/app/extension/store/ReactiveExtensionStoreClientImpl.java rename to application/src/main/java/run/halo/app/extension/store/ReactiveExtensionStoreClientImpl.java diff --git a/src/main/java/run/halo/app/infra/AnonymousUserConst.java b/application/src/main/java/run/halo/app/infra/AnonymousUserConst.java similarity index 100% rename from src/main/java/run/halo/app/infra/AnonymousUserConst.java rename to application/src/main/java/run/halo/app/infra/AnonymousUserConst.java diff --git a/src/main/java/run/halo/app/infra/DefaultSystemVersionSupplier.java b/application/src/main/java/run/halo/app/infra/DefaultSystemVersionSupplier.java similarity index 100% rename from src/main/java/run/halo/app/infra/DefaultSystemVersionSupplier.java rename to application/src/main/java/run/halo/app/infra/DefaultSystemVersionSupplier.java diff --git a/src/main/java/run/halo/app/infra/DefaultThemeInitializer.java b/application/src/main/java/run/halo/app/infra/DefaultThemeInitializer.java similarity index 100% rename from src/main/java/run/halo/app/infra/DefaultThemeInitializer.java rename to application/src/main/java/run/halo/app/infra/DefaultThemeInitializer.java diff --git a/src/main/java/run/halo/app/infra/DefaultThemeRootGetter.java b/application/src/main/java/run/halo/app/infra/DefaultThemeRootGetter.java similarity index 100% rename from src/main/java/run/halo/app/infra/DefaultThemeRootGetter.java rename to application/src/main/java/run/halo/app/infra/DefaultThemeRootGetter.java diff --git a/src/main/java/run/halo/app/infra/ExtensionResourceInitializer.java b/application/src/main/java/run/halo/app/infra/ExtensionResourceInitializer.java similarity index 100% rename from src/main/java/run/halo/app/infra/ExtensionResourceInitializer.java rename to application/src/main/java/run/halo/app/infra/ExtensionResourceInitializer.java diff --git a/src/main/java/run/halo/app/infra/HaloPropertiesExternalUrlSupplier.java b/application/src/main/java/run/halo/app/infra/HaloPropertiesExternalUrlSupplier.java similarity index 100% rename from src/main/java/run/halo/app/infra/HaloPropertiesExternalUrlSupplier.java rename to application/src/main/java/run/halo/app/infra/HaloPropertiesExternalUrlSupplier.java diff --git a/src/main/java/run/halo/app/infra/SchemeInitializedEvent.java b/application/src/main/java/run/halo/app/infra/SchemeInitializedEvent.java similarity index 100% rename from src/main/java/run/halo/app/infra/SchemeInitializedEvent.java rename to application/src/main/java/run/halo/app/infra/SchemeInitializedEvent.java diff --git a/src/main/java/run/halo/app/infra/SchemeInitializer.java b/application/src/main/java/run/halo/app/infra/SchemeInitializer.java similarity index 100% rename from src/main/java/run/halo/app/infra/SchemeInitializer.java rename to application/src/main/java/run/halo/app/infra/SchemeInitializer.java diff --git a/src/main/java/run/halo/app/infra/SystemConfigurableEnvironmentFetcher.java b/application/src/main/java/run/halo/app/infra/SystemConfigurableEnvironmentFetcher.java similarity index 100% rename from src/main/java/run/halo/app/infra/SystemConfigurableEnvironmentFetcher.java rename to application/src/main/java/run/halo/app/infra/SystemConfigurableEnvironmentFetcher.java diff --git a/src/main/java/run/halo/app/infra/ThemeRootGetter.java b/application/src/main/java/run/halo/app/infra/ThemeRootGetter.java similarity index 100% rename from src/main/java/run/halo/app/infra/ThemeRootGetter.java rename to application/src/main/java/run/halo/app/infra/ThemeRootGetter.java diff --git a/src/main/java/run/halo/app/infra/exception/AccessDeniedException.java b/application/src/main/java/run/halo/app/infra/exception/AccessDeniedException.java similarity index 100% rename from src/main/java/run/halo/app/infra/exception/AccessDeniedException.java rename to application/src/main/java/run/halo/app/infra/exception/AccessDeniedException.java diff --git a/src/main/java/run/halo/app/infra/exception/AttachmentAlreadyExistsException.java b/application/src/main/java/run/halo/app/infra/exception/AttachmentAlreadyExistsException.java similarity index 100% rename from src/main/java/run/halo/app/infra/exception/AttachmentAlreadyExistsException.java rename to application/src/main/java/run/halo/app/infra/exception/AttachmentAlreadyExistsException.java diff --git a/src/main/java/run/halo/app/infra/exception/DuplicateNameException.java b/application/src/main/java/run/halo/app/infra/exception/DuplicateNameException.java similarity index 100% rename from src/main/java/run/halo/app/infra/exception/DuplicateNameException.java rename to application/src/main/java/run/halo/app/infra/exception/DuplicateNameException.java diff --git a/src/main/java/run/halo/app/infra/exception/NotFoundException.java b/application/src/main/java/run/halo/app/infra/exception/NotFoundException.java similarity index 100% rename from src/main/java/run/halo/app/infra/exception/NotFoundException.java rename to application/src/main/java/run/halo/app/infra/exception/NotFoundException.java diff --git a/src/main/java/run/halo/app/infra/exception/PluginAlreadyExistsException.java b/application/src/main/java/run/halo/app/infra/exception/PluginAlreadyExistsException.java similarity index 100% rename from src/main/java/run/halo/app/infra/exception/PluginAlreadyExistsException.java rename to application/src/main/java/run/halo/app/infra/exception/PluginAlreadyExistsException.java diff --git a/src/main/java/run/halo/app/infra/exception/PluginInstallationException.java b/application/src/main/java/run/halo/app/infra/exception/PluginInstallationException.java similarity index 100% rename from src/main/java/run/halo/app/infra/exception/PluginInstallationException.java rename to application/src/main/java/run/halo/app/infra/exception/PluginInstallationException.java diff --git a/src/main/java/run/halo/app/infra/exception/ThemeInstallationException.java b/application/src/main/java/run/halo/app/infra/exception/ThemeInstallationException.java similarity index 100% rename from src/main/java/run/halo/app/infra/exception/ThemeInstallationException.java rename to application/src/main/java/run/halo/app/infra/exception/ThemeInstallationException.java diff --git a/src/main/java/run/halo/app/infra/exception/ThemeUninstallException.java b/application/src/main/java/run/halo/app/infra/exception/ThemeUninstallException.java similarity index 100% rename from src/main/java/run/halo/app/infra/exception/ThemeUninstallException.java rename to application/src/main/java/run/halo/app/infra/exception/ThemeUninstallException.java diff --git a/src/main/java/run/halo/app/infra/exception/ThemeUpgradeException.java b/application/src/main/java/run/halo/app/infra/exception/ThemeUpgradeException.java similarity index 100% rename from src/main/java/run/halo/app/infra/exception/ThemeUpgradeException.java rename to application/src/main/java/run/halo/app/infra/exception/ThemeUpgradeException.java diff --git a/src/main/java/run/halo/app/infra/exception/UnsatisfiedAttributeValueException.java b/application/src/main/java/run/halo/app/infra/exception/UnsatisfiedAttributeValueException.java similarity index 100% rename from src/main/java/run/halo/app/infra/exception/UnsatisfiedAttributeValueException.java rename to application/src/main/java/run/halo/app/infra/exception/UnsatisfiedAttributeValueException.java diff --git a/src/main/java/run/halo/app/infra/exception/UserNotFoundException.java b/application/src/main/java/run/halo/app/infra/exception/UserNotFoundException.java similarity index 100% rename from src/main/java/run/halo/app/infra/exception/UserNotFoundException.java rename to application/src/main/java/run/halo/app/infra/exception/UserNotFoundException.java diff --git a/src/main/java/run/halo/app/infra/exception/handlers/HaloErrorConfiguration.java b/application/src/main/java/run/halo/app/infra/exception/handlers/HaloErrorConfiguration.java similarity index 100% rename from src/main/java/run/halo/app/infra/exception/handlers/HaloErrorConfiguration.java rename to application/src/main/java/run/halo/app/infra/exception/handlers/HaloErrorConfiguration.java diff --git a/src/main/java/run/halo/app/infra/exception/handlers/HaloErrorWebExceptionHandler.java b/application/src/main/java/run/halo/app/infra/exception/handlers/HaloErrorWebExceptionHandler.java similarity index 100% rename from src/main/java/run/halo/app/infra/exception/handlers/HaloErrorWebExceptionHandler.java rename to application/src/main/java/run/halo/app/infra/exception/handlers/HaloErrorWebExceptionHandler.java diff --git a/src/main/java/run/halo/app/infra/exception/handlers/ProblemDetailErrorAttributes.java b/application/src/main/java/run/halo/app/infra/exception/handlers/ProblemDetailErrorAttributes.java similarity index 100% rename from src/main/java/run/halo/app/infra/exception/handlers/ProblemDetailErrorAttributes.java rename to application/src/main/java/run/halo/app/infra/exception/handlers/ProblemDetailErrorAttributes.java diff --git a/src/main/java/run/halo/app/infra/properties/AttachmentProperties.java b/application/src/main/java/run/halo/app/infra/properties/AttachmentProperties.java similarity index 100% rename from src/main/java/run/halo/app/infra/properties/AttachmentProperties.java rename to application/src/main/java/run/halo/app/infra/properties/AttachmentProperties.java diff --git a/src/main/java/run/halo/app/infra/properties/ConsoleProperties.java b/application/src/main/java/run/halo/app/infra/properties/ConsoleProperties.java similarity index 100% rename from src/main/java/run/halo/app/infra/properties/ConsoleProperties.java rename to application/src/main/java/run/halo/app/infra/properties/ConsoleProperties.java diff --git a/src/main/java/run/halo/app/infra/properties/ExtensionProperties.java b/application/src/main/java/run/halo/app/infra/properties/ExtensionProperties.java similarity index 100% rename from src/main/java/run/halo/app/infra/properties/ExtensionProperties.java rename to application/src/main/java/run/halo/app/infra/properties/ExtensionProperties.java diff --git a/src/main/java/run/halo/app/infra/properties/HaloProperties.java b/application/src/main/java/run/halo/app/infra/properties/HaloProperties.java similarity index 100% rename from src/main/java/run/halo/app/infra/properties/HaloProperties.java rename to application/src/main/java/run/halo/app/infra/properties/HaloProperties.java diff --git a/src/main/java/run/halo/app/infra/properties/JwtProperties.java b/application/src/main/java/run/halo/app/infra/properties/JwtProperties.java similarity index 100% rename from src/main/java/run/halo/app/infra/properties/JwtProperties.java rename to application/src/main/java/run/halo/app/infra/properties/JwtProperties.java diff --git a/src/main/java/run/halo/app/infra/properties/SecurityProperties.java b/application/src/main/java/run/halo/app/infra/properties/SecurityProperties.java similarity index 100% rename from src/main/java/run/halo/app/infra/properties/SecurityProperties.java rename to application/src/main/java/run/halo/app/infra/properties/SecurityProperties.java diff --git a/src/main/java/run/halo/app/infra/properties/ThemeProperties.java b/application/src/main/java/run/halo/app/infra/properties/ThemeProperties.java similarity index 100% rename from src/main/java/run/halo/app/infra/properties/ThemeProperties.java rename to application/src/main/java/run/halo/app/infra/properties/ThemeProperties.java diff --git a/src/main/java/run/halo/app/infra/utils/Base62Utils.java b/application/src/main/java/run/halo/app/infra/utils/Base62Utils.java similarity index 100% rename from src/main/java/run/halo/app/infra/utils/Base62Utils.java rename to application/src/main/java/run/halo/app/infra/utils/Base62Utils.java diff --git a/src/main/java/run/halo/app/infra/utils/DataBufferUtils.java b/application/src/main/java/run/halo/app/infra/utils/DataBufferUtils.java similarity index 100% rename from src/main/java/run/halo/app/infra/utils/DataBufferUtils.java rename to application/src/main/java/run/halo/app/infra/utils/DataBufferUtils.java diff --git a/src/main/java/run/halo/app/infra/utils/FileNameUtils.java b/application/src/main/java/run/halo/app/infra/utils/FileNameUtils.java similarity index 100% rename from src/main/java/run/halo/app/infra/utils/FileNameUtils.java rename to application/src/main/java/run/halo/app/infra/utils/FileNameUtils.java diff --git a/src/main/java/run/halo/app/infra/utils/FileUtils.java b/application/src/main/java/run/halo/app/infra/utils/FileUtils.java similarity index 100% rename from src/main/java/run/halo/app/infra/utils/FileUtils.java rename to application/src/main/java/run/halo/app/infra/utils/FileUtils.java diff --git a/src/main/java/run/halo/app/infra/utils/HaloUtils.java b/application/src/main/java/run/halo/app/infra/utils/HaloUtils.java similarity index 100% rename from src/main/java/run/halo/app/infra/utils/HaloUtils.java rename to application/src/main/java/run/halo/app/infra/utils/HaloUtils.java diff --git a/src/main/java/run/halo/app/infra/utils/IpAddressUtils.java b/application/src/main/java/run/halo/app/infra/utils/IpAddressUtils.java similarity index 100% rename from src/main/java/run/halo/app/infra/utils/IpAddressUtils.java rename to application/src/main/java/run/halo/app/infra/utils/IpAddressUtils.java diff --git a/src/main/java/run/halo/app/infra/utils/VersionUtils.java b/application/src/main/java/run/halo/app/infra/utils/VersionUtils.java similarity index 100% rename from src/main/java/run/halo/app/infra/utils/VersionUtils.java rename to application/src/main/java/run/halo/app/infra/utils/VersionUtils.java diff --git a/src/main/java/run/halo/app/infra/utils/YamlUnstructuredLoader.java b/application/src/main/java/run/halo/app/infra/utils/YamlUnstructuredLoader.java similarity index 100% rename from src/main/java/run/halo/app/infra/utils/YamlUnstructuredLoader.java rename to application/src/main/java/run/halo/app/infra/utils/YamlUnstructuredLoader.java diff --git a/src/main/java/run/halo/app/metrics/CounterService.java b/application/src/main/java/run/halo/app/metrics/CounterService.java similarity index 100% rename from src/main/java/run/halo/app/metrics/CounterService.java rename to application/src/main/java/run/halo/app/metrics/CounterService.java diff --git a/src/main/java/run/halo/app/metrics/CounterServiceImpl.java b/application/src/main/java/run/halo/app/metrics/CounterServiceImpl.java similarity index 100% rename from src/main/java/run/halo/app/metrics/CounterServiceImpl.java rename to application/src/main/java/run/halo/app/metrics/CounterServiceImpl.java diff --git a/src/main/java/run/halo/app/metrics/MeterUtils.java b/application/src/main/java/run/halo/app/metrics/MeterUtils.java similarity index 100% rename from src/main/java/run/halo/app/metrics/MeterUtils.java rename to application/src/main/java/run/halo/app/metrics/MeterUtils.java diff --git a/src/main/java/run/halo/app/metrics/ReplyEventReconciler.java b/application/src/main/java/run/halo/app/metrics/ReplyEventReconciler.java similarity index 100% rename from src/main/java/run/halo/app/metrics/ReplyEventReconciler.java rename to application/src/main/java/run/halo/app/metrics/ReplyEventReconciler.java diff --git a/src/main/java/run/halo/app/metrics/VisitLogWriter.java b/application/src/main/java/run/halo/app/metrics/VisitLogWriter.java similarity index 100% rename from src/main/java/run/halo/app/metrics/VisitLogWriter.java rename to application/src/main/java/run/halo/app/metrics/VisitLogWriter.java diff --git a/src/main/java/run/halo/app/metrics/VisitedEventReconciler.java b/application/src/main/java/run/halo/app/metrics/VisitedEventReconciler.java similarity index 100% rename from src/main/java/run/halo/app/metrics/VisitedEventReconciler.java rename to application/src/main/java/run/halo/app/metrics/VisitedEventReconciler.java diff --git a/src/main/java/run/halo/app/metrics/VotedEventReconciler.java b/application/src/main/java/run/halo/app/metrics/VotedEventReconciler.java similarity index 100% rename from src/main/java/run/halo/app/metrics/VotedEventReconciler.java rename to application/src/main/java/run/halo/app/metrics/VotedEventReconciler.java diff --git a/src/main/java/run/halo/app/plugin/BasePluginFactory.java b/application/src/main/java/run/halo/app/plugin/BasePluginFactory.java similarity index 100% rename from src/main/java/run/halo/app/plugin/BasePluginFactory.java rename to application/src/main/java/run/halo/app/plugin/BasePluginFactory.java diff --git a/src/main/java/run/halo/app/plugin/DefaultDevelopmentPluginRepository.java b/application/src/main/java/run/halo/app/plugin/DefaultDevelopmentPluginRepository.java similarity index 100% rename from src/main/java/run/halo/app/plugin/DefaultDevelopmentPluginRepository.java rename to application/src/main/java/run/halo/app/plugin/DefaultDevelopmentPluginRepository.java diff --git a/src/main/java/run/halo/app/plugin/SettingFetcher.java b/application/src/main/java/run/halo/app/plugin/DefaultSettingFetcher.java similarity index 95% rename from src/main/java/run/halo/app/plugin/SettingFetcher.java rename to application/src/main/java/run/halo/app/plugin/DefaultSettingFetcher.java index 2a02257ee..633f23ff9 100644 --- a/src/main/java/run/halo/app/plugin/SettingFetcher.java +++ b/application/src/main/java/run/halo/app/plugin/DefaultSettingFetcher.java @@ -21,24 +21,26 @@ import run.halo.app.infra.utils.JsonUtils; * @author guqing * @since 2.0.0 */ -public class SettingFetcher { +public class DefaultSettingFetcher implements SettingFetcher { private final ExtensionClient extensionClient; private final String pluginName; - public SettingFetcher(String pluginName, + public DefaultSettingFetcher(String pluginName, ExtensionClient extensionClient) { this.extensionClient = extensionClient; this.pluginName = pluginName; } @NonNull + @Override public Optional fetch(String group, Class clazz) { return Optional.ofNullable(convertValue(getInternal(group), clazz)); } @NonNull + @Override public JsonNode get(String group) { return getInternal(group); } @@ -49,6 +51,7 @@ public class SettingFetcher { * @return a unmodifiable map of values(non-null). */ @NonNull + @Override public Map getValues() { return Map.copyOf(getValuesInternal()); } diff --git a/src/main/java/run/halo/app/plugin/ExtensionComponentsFinder.java b/application/src/main/java/run/halo/app/plugin/ExtensionComponentsFinder.java similarity index 100% rename from src/main/java/run/halo/app/plugin/ExtensionComponentsFinder.java rename to application/src/main/java/run/halo/app/plugin/ExtensionComponentsFinder.java diff --git a/src/main/java/run/halo/app/plugin/ExtensionContextRegistry.java b/application/src/main/java/run/halo/app/plugin/ExtensionContextRegistry.java similarity index 100% rename from src/main/java/run/halo/app/plugin/ExtensionContextRegistry.java rename to application/src/main/java/run/halo/app/plugin/ExtensionContextRegistry.java diff --git a/src/main/java/run/halo/app/plugin/HaloPluginManager.java b/application/src/main/java/run/halo/app/plugin/HaloPluginManager.java similarity index 99% rename from src/main/java/run/halo/app/plugin/HaloPluginManager.java rename to application/src/main/java/run/halo/app/plugin/HaloPluginManager.java index 17481154c..9a5908935 100644 --- a/src/main/java/run/halo/app/plugin/HaloPluginManager.java +++ b/application/src/main/java/run/halo/app/plugin/HaloPluginManager.java @@ -378,7 +378,7 @@ public class HaloPluginManager extends DefaultPluginManager try { pluginApplicationInitializer.contextDestroyed(pluginId); } catch (Exception e) { - log.trace("Plugin application context close failed. ", e); + log.warn("Plugin application context close failed. ", e); } } diff --git a/src/main/java/run/halo/app/plugin/PluginApplicationContext.java b/application/src/main/java/run/halo/app/plugin/PluginApplicationContext.java similarity index 100% rename from src/main/java/run/halo/app/plugin/PluginApplicationContext.java rename to application/src/main/java/run/halo/app/plugin/PluginApplicationContext.java diff --git a/src/main/java/run/halo/app/plugin/PluginApplicationEventBridgeDispatcher.java b/application/src/main/java/run/halo/app/plugin/PluginApplicationEventBridgeDispatcher.java similarity index 100% rename from src/main/java/run/halo/app/plugin/PluginApplicationEventBridgeDispatcher.java rename to application/src/main/java/run/halo/app/plugin/PluginApplicationEventBridgeDispatcher.java diff --git a/src/main/java/run/halo/app/plugin/PluginApplicationInitializer.java b/application/src/main/java/run/halo/app/plugin/PluginApplicationInitializer.java similarity index 98% rename from src/main/java/run/halo/app/plugin/PluginApplicationInitializer.java rename to application/src/main/java/run/halo/app/plugin/PluginApplicationInitializer.java index 21d32ab0f..10b5edc26 100644 --- a/src/main/java/run/halo/app/plugin/PluginApplicationInitializer.java +++ b/application/src/main/java/run/halo/app/plugin/PluginApplicationInitializer.java @@ -113,7 +113,7 @@ public class PluginApplicationInitializer { DefaultListableBeanFactory listableBeanFactory) { ExtensionClient extensionClient = rootApplicationContext.getBean(ExtensionClient.class); - SettingFetcher settingFetcher = new SettingFetcher(pluginName, extensionClient); + SettingFetcher settingFetcher = new DefaultSettingFetcher(pluginName, extensionClient); listableBeanFactory.registerSingleton("settingFetcher", settingFetcher); } diff --git a/src/main/java/run/halo/app/plugin/PluginAutoConfiguration.java b/application/src/main/java/run/halo/app/plugin/PluginAutoConfiguration.java similarity index 100% rename from src/main/java/run/halo/app/plugin/PluginAutoConfiguration.java rename to application/src/main/java/run/halo/app/plugin/PluginAutoConfiguration.java diff --git a/src/main/java/run/halo/app/plugin/PluginBeforeStopSyncListener.java b/application/src/main/java/run/halo/app/plugin/PluginBeforeStopSyncListener.java similarity index 100% rename from src/main/java/run/halo/app/plugin/PluginBeforeStopSyncListener.java rename to application/src/main/java/run/halo/app/plugin/PluginBeforeStopSyncListener.java diff --git a/src/main/java/run/halo/app/plugin/PluginCompositeRouterFunction.java b/application/src/main/java/run/halo/app/plugin/PluginCompositeRouterFunction.java similarity index 100% rename from src/main/java/run/halo/app/plugin/PluginCompositeRouterFunction.java rename to application/src/main/java/run/halo/app/plugin/PluginCompositeRouterFunction.java diff --git a/src/main/java/run/halo/app/plugin/PluginConst.java b/application/src/main/java/run/halo/app/plugin/PluginConst.java similarity index 100% rename from src/main/java/run/halo/app/plugin/PluginConst.java rename to application/src/main/java/run/halo/app/plugin/PluginConst.java diff --git a/src/main/java/run/halo/app/plugin/PluginCreatedEventReconciler.java b/application/src/main/java/run/halo/app/plugin/PluginCreatedEventReconciler.java similarity index 100% rename from src/main/java/run/halo/app/plugin/PluginCreatedEventReconciler.java rename to application/src/main/java/run/halo/app/plugin/PluginCreatedEventReconciler.java diff --git a/src/main/java/run/halo/app/plugin/PluginDevelopmentInitializer.java b/application/src/main/java/run/halo/app/plugin/PluginDevelopmentInitializer.java similarity index 100% rename from src/main/java/run/halo/app/plugin/PluginDevelopmentInitializer.java rename to application/src/main/java/run/halo/app/plugin/PluginDevelopmentInitializer.java diff --git a/src/main/java/run/halo/app/plugin/PluginExtensionLoaderUtils.java b/application/src/main/java/run/halo/app/plugin/PluginExtensionLoaderUtils.java similarity index 100% rename from src/main/java/run/halo/app/plugin/PluginExtensionLoaderUtils.java rename to application/src/main/java/run/halo/app/plugin/PluginExtensionLoaderUtils.java diff --git a/src/main/java/run/halo/app/plugin/PluginNotFoundException.java b/application/src/main/java/run/halo/app/plugin/PluginNotFoundException.java similarity index 100% rename from src/main/java/run/halo/app/plugin/PluginNotFoundException.java rename to application/src/main/java/run/halo/app/plugin/PluginNotFoundException.java diff --git a/src/main/java/run/halo/app/plugin/PluginProperties.java b/application/src/main/java/run/halo/app/plugin/PluginProperties.java similarity index 100% rename from src/main/java/run/halo/app/plugin/PluginProperties.java rename to application/src/main/java/run/halo/app/plugin/PluginProperties.java diff --git a/src/main/java/run/halo/app/plugin/PluginRequestMappingHandlerMapping.java b/application/src/main/java/run/halo/app/plugin/PluginRequestMappingHandlerMapping.java similarity index 100% rename from src/main/java/run/halo/app/plugin/PluginRequestMappingHandlerMapping.java rename to application/src/main/java/run/halo/app/plugin/PluginRequestMappingHandlerMapping.java diff --git a/src/main/java/run/halo/app/plugin/PluginRequestMappingManager.java b/application/src/main/java/run/halo/app/plugin/PluginRequestMappingManager.java similarity index 100% rename from src/main/java/run/halo/app/plugin/PluginRequestMappingManager.java rename to application/src/main/java/run/halo/app/plugin/PluginRequestMappingManager.java diff --git a/src/main/java/run/halo/app/plugin/PluginStartedListener.java b/application/src/main/java/run/halo/app/plugin/PluginStartedListener.java similarity index 100% rename from src/main/java/run/halo/app/plugin/PluginStartedListener.java rename to application/src/main/java/run/halo/app/plugin/PluginStartedListener.java diff --git a/src/main/java/run/halo/app/plugin/PluginStartingError.java b/application/src/main/java/run/halo/app/plugin/PluginStartingError.java similarity index 100% rename from src/main/java/run/halo/app/plugin/PluginStartingError.java rename to application/src/main/java/run/halo/app/plugin/PluginStartingError.java diff --git a/src/main/java/run/halo/app/plugin/PropertyPluginStatusProvider.java b/application/src/main/java/run/halo/app/plugin/PropertyPluginStatusProvider.java similarity index 100% rename from src/main/java/run/halo/app/plugin/PropertyPluginStatusProvider.java rename to application/src/main/java/run/halo/app/plugin/PropertyPluginStatusProvider.java diff --git a/src/main/java/run/halo/app/plugin/SharedApplicationContext.java b/application/src/main/java/run/halo/app/plugin/SharedApplicationContext.java similarity index 100% rename from src/main/java/run/halo/app/plugin/SharedApplicationContext.java rename to application/src/main/java/run/halo/app/plugin/SharedApplicationContext.java diff --git a/src/main/java/run/halo/app/plugin/SharedApplicationContextHolder.java b/application/src/main/java/run/halo/app/plugin/SharedApplicationContextHolder.java similarity index 100% rename from src/main/java/run/halo/app/plugin/SharedApplicationContextHolder.java rename to application/src/main/java/run/halo/app/plugin/SharedApplicationContextHolder.java diff --git a/src/main/java/run/halo/app/plugin/SharedEvent.java b/application/src/main/java/run/halo/app/plugin/SharedEvent.java similarity index 100% rename from src/main/java/run/halo/app/plugin/SharedEvent.java rename to application/src/main/java/run/halo/app/plugin/SharedEvent.java diff --git a/src/main/java/run/halo/app/plugin/SpringComponentsFinder.java b/application/src/main/java/run/halo/app/plugin/SpringComponentsFinder.java similarity index 100% rename from src/main/java/run/halo/app/plugin/SpringComponentsFinder.java rename to application/src/main/java/run/halo/app/plugin/SpringComponentsFinder.java diff --git a/src/main/java/run/halo/app/plugin/SpringExtensionFactory.java b/application/src/main/java/run/halo/app/plugin/SpringExtensionFactory.java similarity index 100% rename from src/main/java/run/halo/app/plugin/SpringExtensionFactory.java rename to application/src/main/java/run/halo/app/plugin/SpringExtensionFactory.java diff --git a/src/main/java/run/halo/app/plugin/YamlPluginDescriptorFinder.java b/application/src/main/java/run/halo/app/plugin/YamlPluginDescriptorFinder.java similarity index 100% rename from src/main/java/run/halo/app/plugin/YamlPluginDescriptorFinder.java rename to application/src/main/java/run/halo/app/plugin/YamlPluginDescriptorFinder.java diff --git a/src/main/java/run/halo/app/plugin/YamlPluginFinder.java b/application/src/main/java/run/halo/app/plugin/YamlPluginFinder.java similarity index 100% rename from src/main/java/run/halo/app/plugin/YamlPluginFinder.java rename to application/src/main/java/run/halo/app/plugin/YamlPluginFinder.java diff --git a/src/main/java/run/halo/app/plugin/event/HaloPluginBeforeStopEvent.java b/application/src/main/java/run/halo/app/plugin/event/HaloPluginBeforeStopEvent.java similarity index 100% rename from src/main/java/run/halo/app/plugin/event/HaloPluginBeforeStopEvent.java rename to application/src/main/java/run/halo/app/plugin/event/HaloPluginBeforeStopEvent.java diff --git a/src/main/java/run/halo/app/plugin/event/HaloPluginLoadedEvent.java b/application/src/main/java/run/halo/app/plugin/event/HaloPluginLoadedEvent.java similarity index 100% rename from src/main/java/run/halo/app/plugin/event/HaloPluginLoadedEvent.java rename to application/src/main/java/run/halo/app/plugin/event/HaloPluginLoadedEvent.java diff --git a/src/main/java/run/halo/app/plugin/event/HaloPluginStartedEvent.java b/application/src/main/java/run/halo/app/plugin/event/HaloPluginStartedEvent.java similarity index 100% rename from src/main/java/run/halo/app/plugin/event/HaloPluginStartedEvent.java rename to application/src/main/java/run/halo/app/plugin/event/HaloPluginStartedEvent.java diff --git a/src/main/java/run/halo/app/plugin/event/HaloPluginStateChangedEvent.java b/application/src/main/java/run/halo/app/plugin/event/HaloPluginStateChangedEvent.java similarity index 100% rename from src/main/java/run/halo/app/plugin/event/HaloPluginStateChangedEvent.java rename to application/src/main/java/run/halo/app/plugin/event/HaloPluginStateChangedEvent.java diff --git a/src/main/java/run/halo/app/plugin/event/HaloPluginStoppedEvent.java b/application/src/main/java/run/halo/app/plugin/event/HaloPluginStoppedEvent.java similarity index 100% rename from src/main/java/run/halo/app/plugin/event/HaloPluginStoppedEvent.java rename to application/src/main/java/run/halo/app/plugin/event/HaloPluginStoppedEvent.java diff --git a/src/main/java/run/halo/app/plugin/event/PluginCreatedEvent.java b/application/src/main/java/run/halo/app/plugin/event/PluginCreatedEvent.java similarity index 100% rename from src/main/java/run/halo/app/plugin/event/PluginCreatedEvent.java rename to application/src/main/java/run/halo/app/plugin/event/PluginCreatedEvent.java diff --git a/src/main/java/run/halo/app/plugin/extensionpoint/DefaultExtensionGetter.java b/application/src/main/java/run/halo/app/plugin/extensionpoint/DefaultExtensionGetter.java similarity index 100% rename from src/main/java/run/halo/app/plugin/extensionpoint/DefaultExtensionGetter.java rename to application/src/main/java/run/halo/app/plugin/extensionpoint/DefaultExtensionGetter.java diff --git a/src/main/java/run/halo/app/plugin/extensionpoint/ExtensionDefinition.java b/application/src/main/java/run/halo/app/plugin/extensionpoint/ExtensionDefinition.java similarity index 100% rename from src/main/java/run/halo/app/plugin/extensionpoint/ExtensionDefinition.java rename to application/src/main/java/run/halo/app/plugin/extensionpoint/ExtensionDefinition.java diff --git a/src/main/java/run/halo/app/plugin/extensionpoint/ExtensionGetter.java b/application/src/main/java/run/halo/app/plugin/extensionpoint/ExtensionGetter.java similarity index 100% rename from src/main/java/run/halo/app/plugin/extensionpoint/ExtensionGetter.java rename to application/src/main/java/run/halo/app/plugin/extensionpoint/ExtensionGetter.java diff --git a/src/main/java/run/halo/app/plugin/extensionpoint/ExtensionPointDefinition.java b/application/src/main/java/run/halo/app/plugin/extensionpoint/ExtensionPointDefinition.java similarity index 100% rename from src/main/java/run/halo/app/plugin/extensionpoint/ExtensionPointDefinition.java rename to application/src/main/java/run/halo/app/plugin/extensionpoint/ExtensionPointDefinition.java diff --git a/src/main/java/run/halo/app/plugin/resources/BundleResourceUtils.java b/application/src/main/java/run/halo/app/plugin/resources/BundleResourceUtils.java similarity index 100% rename from src/main/java/run/halo/app/plugin/resources/BundleResourceUtils.java rename to application/src/main/java/run/halo/app/plugin/resources/BundleResourceUtils.java diff --git a/src/main/java/run/halo/app/plugin/resources/ReverseProxyRouterFunctionFactory.java b/application/src/main/java/run/halo/app/plugin/resources/ReverseProxyRouterFunctionFactory.java similarity index 100% rename from src/main/java/run/halo/app/plugin/resources/ReverseProxyRouterFunctionFactory.java rename to application/src/main/java/run/halo/app/plugin/resources/ReverseProxyRouterFunctionFactory.java diff --git a/src/main/java/run/halo/app/plugin/resources/ReverseProxyRouterFunctionRegistry.java b/application/src/main/java/run/halo/app/plugin/resources/ReverseProxyRouterFunctionRegistry.java similarity index 100% rename from src/main/java/run/halo/app/plugin/resources/ReverseProxyRouterFunctionRegistry.java rename to application/src/main/java/run/halo/app/plugin/resources/ReverseProxyRouterFunctionRegistry.java diff --git a/src/main/java/run/halo/app/search/IndicesEndpoint.java b/application/src/main/java/run/halo/app/search/IndicesEndpoint.java similarity index 100% rename from src/main/java/run/halo/app/search/IndicesEndpoint.java rename to application/src/main/java/run/halo/app/search/IndicesEndpoint.java diff --git a/src/main/java/run/halo/app/search/IndicesInitializer.java b/application/src/main/java/run/halo/app/search/IndicesInitializer.java similarity index 100% rename from src/main/java/run/halo/app/search/IndicesInitializer.java rename to application/src/main/java/run/halo/app/search/IndicesInitializer.java diff --git a/src/main/java/run/halo/app/search/IndicesService.java b/application/src/main/java/run/halo/app/search/IndicesService.java similarity index 100% rename from src/main/java/run/halo/app/search/IndicesService.java rename to application/src/main/java/run/halo/app/search/IndicesService.java diff --git a/src/main/java/run/halo/app/search/IndicesServiceImpl.java b/application/src/main/java/run/halo/app/search/IndicesServiceImpl.java similarity index 95% rename from src/main/java/run/halo/app/search/IndicesServiceImpl.java rename to application/src/main/java/run/halo/app/search/IndicesServiceImpl.java index 6b123ccbf..5e8cf2a84 100644 --- a/src/main/java/run/halo/app/search/IndicesServiceImpl.java +++ b/application/src/main/java/run/halo/app/search/IndicesServiceImpl.java @@ -5,7 +5,6 @@ import reactor.core.Exceptions; import reactor.core.publisher.Mono; import run.halo.app.core.extension.content.Post; import run.halo.app.plugin.extensionpoint.ExtensionGetter; -import run.halo.app.search.post.PostDoc; import run.halo.app.search.post.PostSearchService; import run.halo.app.theme.finders.PostFinder; import run.halo.app.theme.finders.vo.PostVo; @@ -35,7 +34,7 @@ public class IndicesServiceImpl implements IndicesService { }) .defaultIfEmpty(postVo); }) - .map(PostDoc::from) + .map(PostDocUtils::from) .limitRate(100) .buffer(100) .doOnNext(postDocs -> { diff --git a/application/src/main/java/run/halo/app/search/PostDocUtils.java b/application/src/main/java/run/halo/app/search/PostDocUtils.java new file mode 100644 index 000000000..321067be5 --- /dev/null +++ b/application/src/main/java/run/halo/app/search/PostDocUtils.java @@ -0,0 +1,20 @@ +package run.halo.app.search; + +import run.halo.app.search.post.PostDoc; +import run.halo.app.theme.finders.vo.PostVo; + +public enum PostDocUtils { + ; + + // TODO Move this static method to other place. + public static PostDoc from(PostVo postVo) { + return new PostDoc( + postVo.getMetadata().getName(), + postVo.getSpec().getTitle(), + postVo.getStatus().getExcerpt(), + postVo.getContent().getContent(), + postVo.getSpec().getPublishTime(), + postVo.getStatus().getPermalink() + ); + } +} diff --git a/src/main/java/run/halo/app/search/extension/SearchEngine.java b/application/src/main/java/run/halo/app/search/extension/SearchEngine.java similarity index 100% rename from src/main/java/run/halo/app/search/extension/SearchEngine.java rename to application/src/main/java/run/halo/app/search/extension/SearchEngine.java diff --git a/src/main/java/run/halo/app/search/post/LucenePostSearchService.java b/application/src/main/java/run/halo/app/search/post/LucenePostSearchService.java similarity index 100% rename from src/main/java/run/halo/app/search/post/LucenePostSearchService.java rename to application/src/main/java/run/halo/app/search/post/LucenePostSearchService.java diff --git a/src/main/java/run/halo/app/search/post/PostEventReconciler.java b/application/src/main/java/run/halo/app/search/post/PostEventReconciler.java similarity index 98% rename from src/main/java/run/halo/app/search/post/PostEventReconciler.java rename to application/src/main/java/run/halo/app/search/post/PostEventReconciler.java index 793c637f7..6b79c5973 100644 --- a/src/main/java/run/halo/app/search/post/PostEventReconciler.java +++ b/application/src/main/java/run/halo/app/search/post/PostEventReconciler.java @@ -21,6 +21,7 @@ import run.halo.app.extension.controller.DefaultQueue; import run.halo.app.extension.controller.Reconciler; import run.halo.app.extension.controller.RequestQueue; import run.halo.app.plugin.extensionpoint.ExtensionGetter; +import run.halo.app.search.PostDocUtils; import run.halo.app.theme.finders.PostFinder; @Slf4j @@ -97,7 +98,7 @@ public class PostEventReconciler implements Reconciler, SmartLifecycl void addPostDoc(String postName) throws InterruptedException { var latch = new CountDownLatch(1); var disposable = postFinder.getByName(postName) - .map(PostDoc::from) + .map(PostDocUtils::from) .flatMap(postDoc -> extensionGetter.getEnabledExtension(PostSearchService.class) .doOnNext(searchService -> { try { diff --git a/src/main/java/run/halo/app/search/post/PostSearchEndpoint.java b/application/src/main/java/run/halo/app/search/post/PostSearchEndpoint.java similarity index 100% rename from src/main/java/run/halo/app/search/post/PostSearchEndpoint.java rename to application/src/main/java/run/halo/app/search/post/PostSearchEndpoint.java diff --git a/src/main/java/run/halo/app/security/AuthProviderService.java b/application/src/main/java/run/halo/app/security/AuthProviderService.java similarity index 100% rename from src/main/java/run/halo/app/security/AuthProviderService.java rename to application/src/main/java/run/halo/app/security/AuthProviderService.java diff --git a/src/main/java/run/halo/app/security/AuthProviderServiceImpl.java b/application/src/main/java/run/halo/app/security/AuthProviderServiceImpl.java similarity index 100% rename from src/main/java/run/halo/app/security/AuthProviderServiceImpl.java rename to application/src/main/java/run/halo/app/security/AuthProviderServiceImpl.java diff --git a/src/main/java/run/halo/app/security/CorsConfigurer.java b/application/src/main/java/run/halo/app/security/CorsConfigurer.java similarity index 100% rename from src/main/java/run/halo/app/security/CorsConfigurer.java rename to application/src/main/java/run/halo/app/security/CorsConfigurer.java diff --git a/src/main/java/run/halo/app/security/CsrfConfigurer.java b/application/src/main/java/run/halo/app/security/CsrfConfigurer.java similarity index 100% rename from src/main/java/run/halo/app/security/CsrfConfigurer.java rename to application/src/main/java/run/halo/app/security/CsrfConfigurer.java diff --git a/src/main/java/run/halo/app/security/DefaultUserDetailService.java b/application/src/main/java/run/halo/app/security/DefaultUserDetailService.java similarity index 100% rename from src/main/java/run/halo/app/security/DefaultUserDetailService.java rename to application/src/main/java/run/halo/app/security/DefaultUserDetailService.java diff --git a/src/main/java/run/halo/app/security/DynamicMatcherSecurityWebFilterChain.java b/application/src/main/java/run/halo/app/security/DynamicMatcherSecurityWebFilterChain.java similarity index 100% rename from src/main/java/run/halo/app/security/DynamicMatcherSecurityWebFilterChain.java rename to application/src/main/java/run/halo/app/security/DynamicMatcherSecurityWebFilterChain.java diff --git a/src/main/java/run/halo/app/security/ListedAuthProvider.java b/application/src/main/java/run/halo/app/security/ListedAuthProvider.java similarity index 100% rename from src/main/java/run/halo/app/security/ListedAuthProvider.java rename to application/src/main/java/run/halo/app/security/ListedAuthProvider.java diff --git a/src/main/java/run/halo/app/security/SuperAdminInitializer.java b/application/src/main/java/run/halo/app/security/SuperAdminInitializer.java similarity index 100% rename from src/main/java/run/halo/app/security/SuperAdminInitializer.java rename to application/src/main/java/run/halo/app/security/SuperAdminInitializer.java diff --git a/src/main/java/run/halo/app/security/authentication/SecurityConfigurer.java b/application/src/main/java/run/halo/app/security/authentication/SecurityConfigurer.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/SecurityConfigurer.java rename to application/src/main/java/run/halo/app/security/authentication/SecurityConfigurer.java diff --git a/src/main/java/run/halo/app/security/authentication/WebExchangeMatchers.java b/application/src/main/java/run/halo/app/security/authentication/WebExchangeMatchers.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/WebExchangeMatchers.java rename to application/src/main/java/run/halo/app/security/authentication/WebExchangeMatchers.java diff --git a/src/main/java/run/halo/app/security/authentication/jwt/JwtAuthenticationConfigurer.java b/application/src/main/java/run/halo/app/security/authentication/jwt/JwtAuthenticationConfigurer.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/jwt/JwtAuthenticationConfigurer.java rename to application/src/main/java/run/halo/app/security/authentication/jwt/JwtAuthenticationConfigurer.java diff --git a/src/main/java/run/halo/app/security/authentication/jwt/LoginAuthenticationConverter.java b/application/src/main/java/run/halo/app/security/authentication/jwt/LoginAuthenticationConverter.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/jwt/LoginAuthenticationConverter.java rename to application/src/main/java/run/halo/app/security/authentication/jwt/LoginAuthenticationConverter.java diff --git a/src/main/java/run/halo/app/security/authentication/jwt/LoginAuthenticationFailureHandler.java b/application/src/main/java/run/halo/app/security/authentication/jwt/LoginAuthenticationFailureHandler.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/jwt/LoginAuthenticationFailureHandler.java rename to application/src/main/java/run/halo/app/security/authentication/jwt/LoginAuthenticationFailureHandler.java diff --git a/src/main/java/run/halo/app/security/authentication/jwt/LoginAuthenticationManager.java b/application/src/main/java/run/halo/app/security/authentication/jwt/LoginAuthenticationManager.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/jwt/LoginAuthenticationManager.java rename to application/src/main/java/run/halo/app/security/authentication/jwt/LoginAuthenticationManager.java diff --git a/src/main/java/run/halo/app/security/authentication/jwt/LoginAuthenticationSuccessHandler.java b/application/src/main/java/run/halo/app/security/authentication/jwt/LoginAuthenticationSuccessHandler.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/jwt/LoginAuthenticationSuccessHandler.java rename to application/src/main/java/run/halo/app/security/authentication/jwt/LoginAuthenticationSuccessHandler.java diff --git a/src/main/java/run/halo/app/security/authentication/login/CryptoService.java b/application/src/main/java/run/halo/app/security/authentication/login/CryptoService.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/login/CryptoService.java rename to application/src/main/java/run/halo/app/security/authentication/login/CryptoService.java diff --git a/src/main/java/run/halo/app/security/authentication/login/DelegatingLogoutPageGeneratingWebFilter.java b/application/src/main/java/run/halo/app/security/authentication/login/DelegatingLogoutPageGeneratingWebFilter.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/login/DelegatingLogoutPageGeneratingWebFilter.java rename to application/src/main/java/run/halo/app/security/authentication/login/DelegatingLogoutPageGeneratingWebFilter.java diff --git a/src/main/java/run/halo/app/security/authentication/login/InvalidEncryptedMessageException.java b/application/src/main/java/run/halo/app/security/authentication/login/InvalidEncryptedMessageException.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/login/InvalidEncryptedMessageException.java rename to application/src/main/java/run/halo/app/security/authentication/login/InvalidEncryptedMessageException.java diff --git a/src/main/java/run/halo/app/security/authentication/login/LoginAuthenticationConverter.java b/application/src/main/java/run/halo/app/security/authentication/login/LoginAuthenticationConverter.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/login/LoginAuthenticationConverter.java rename to application/src/main/java/run/halo/app/security/authentication/login/LoginAuthenticationConverter.java diff --git a/src/main/java/run/halo/app/security/authentication/login/PublicKeyRouteBuilder.java b/application/src/main/java/run/halo/app/security/authentication/login/PublicKeyRouteBuilder.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/login/PublicKeyRouteBuilder.java rename to application/src/main/java/run/halo/app/security/authentication/login/PublicKeyRouteBuilder.java diff --git a/src/main/java/run/halo/app/security/authentication/login/RsaKeyScheduledGenerator.java b/application/src/main/java/run/halo/app/security/authentication/login/RsaKeyScheduledGenerator.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/login/RsaKeyScheduledGenerator.java rename to application/src/main/java/run/halo/app/security/authentication/login/RsaKeyScheduledGenerator.java diff --git a/src/main/java/run/halo/app/security/authentication/login/UsernamePasswordAuthenticator.java b/application/src/main/java/run/halo/app/security/authentication/login/UsernamePasswordAuthenticator.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/login/UsernamePasswordAuthenticator.java rename to application/src/main/java/run/halo/app/security/authentication/login/UsernamePasswordAuthenticator.java diff --git a/src/main/java/run/halo/app/security/authentication/login/UsernamePasswordLogoutHandler.java b/application/src/main/java/run/halo/app/security/authentication/login/UsernamePasswordLogoutHandler.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/login/UsernamePasswordLogoutHandler.java rename to application/src/main/java/run/halo/app/security/authentication/login/UsernamePasswordLogoutHandler.java diff --git a/src/main/java/run/halo/app/security/authentication/login/impl/RsaKeyService.java b/application/src/main/java/run/halo/app/security/authentication/login/impl/RsaKeyService.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/login/impl/RsaKeyService.java rename to application/src/main/java/run/halo/app/security/authentication/login/impl/RsaKeyService.java diff --git a/src/main/java/run/halo/app/security/authentication/pat/PatAuthenticationConverter.java b/application/src/main/java/run/halo/app/security/authentication/pat/PatAuthenticationConverter.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/pat/PatAuthenticationConverter.java rename to application/src/main/java/run/halo/app/security/authentication/pat/PatAuthenticationConverter.java diff --git a/src/main/java/run/halo/app/security/authentication/pat/PatAuthenticationManager.java b/application/src/main/java/run/halo/app/security/authentication/pat/PatAuthenticationManager.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/pat/PatAuthenticationManager.java rename to application/src/main/java/run/halo/app/security/authentication/pat/PatAuthenticationManager.java diff --git a/src/main/java/run/halo/app/security/authentication/pat/PersonalAccessToken.java b/application/src/main/java/run/halo/app/security/authentication/pat/PersonalAccessToken.java similarity index 100% rename from src/main/java/run/halo/app/security/authentication/pat/PersonalAccessToken.java rename to application/src/main/java/run/halo/app/security/authentication/pat/PersonalAccessToken.java diff --git a/src/main/java/run/halo/app/security/authorization/Attributes.java b/application/src/main/java/run/halo/app/security/authorization/Attributes.java similarity index 100% rename from src/main/java/run/halo/app/security/authorization/Attributes.java rename to application/src/main/java/run/halo/app/security/authorization/Attributes.java diff --git a/src/main/java/run/halo/app/security/authorization/AttributesRecord.java b/application/src/main/java/run/halo/app/security/authorization/AttributesRecord.java similarity index 100% rename from src/main/java/run/halo/app/security/authorization/AttributesRecord.java rename to application/src/main/java/run/halo/app/security/authorization/AttributesRecord.java diff --git a/src/main/java/run/halo/app/security/authorization/AuthorizationRuleResolver.java b/application/src/main/java/run/halo/app/security/authorization/AuthorizationRuleResolver.java similarity index 100% rename from src/main/java/run/halo/app/security/authorization/AuthorizationRuleResolver.java rename to application/src/main/java/run/halo/app/security/authorization/AuthorizationRuleResolver.java diff --git a/src/main/java/run/halo/app/security/authorization/AuthorizingVisitor.java b/application/src/main/java/run/halo/app/security/authorization/AuthorizingVisitor.java similarity index 100% rename from src/main/java/run/halo/app/security/authorization/AuthorizingVisitor.java rename to application/src/main/java/run/halo/app/security/authorization/AuthorizingVisitor.java diff --git a/src/main/java/run/halo/app/security/authorization/DefaultRuleResolver.java b/application/src/main/java/run/halo/app/security/authorization/DefaultRuleResolver.java similarity index 100% rename from src/main/java/run/halo/app/security/authorization/DefaultRuleResolver.java rename to application/src/main/java/run/halo/app/security/authorization/DefaultRuleResolver.java diff --git a/src/main/java/run/halo/app/security/authorization/PolicyRuleList.java b/application/src/main/java/run/halo/app/security/authorization/PolicyRuleList.java similarity index 100% rename from src/main/java/run/halo/app/security/authorization/PolicyRuleList.java rename to application/src/main/java/run/halo/app/security/authorization/PolicyRuleList.java diff --git a/src/main/java/run/halo/app/security/authorization/RbacRequestEvaluation.java b/application/src/main/java/run/halo/app/security/authorization/RbacRequestEvaluation.java similarity index 100% rename from src/main/java/run/halo/app/security/authorization/RbacRequestEvaluation.java rename to application/src/main/java/run/halo/app/security/authorization/RbacRequestEvaluation.java diff --git a/src/main/java/run/halo/app/security/authorization/RequestInfo.java b/application/src/main/java/run/halo/app/security/authorization/RequestInfo.java similarity index 100% rename from src/main/java/run/halo/app/security/authorization/RequestInfo.java rename to application/src/main/java/run/halo/app/security/authorization/RequestInfo.java diff --git a/src/main/java/run/halo/app/security/authorization/RequestInfoAuthorizationManager.java b/application/src/main/java/run/halo/app/security/authorization/RequestInfoAuthorizationManager.java similarity index 100% rename from src/main/java/run/halo/app/security/authorization/RequestInfoAuthorizationManager.java rename to application/src/main/java/run/halo/app/security/authorization/RequestInfoAuthorizationManager.java diff --git a/src/main/java/run/halo/app/security/authorization/RequestInfoFactory.java b/application/src/main/java/run/halo/app/security/authorization/RequestInfoFactory.java similarity index 100% rename from src/main/java/run/halo/app/security/authorization/RequestInfoFactory.java rename to application/src/main/java/run/halo/app/security/authorization/RequestInfoFactory.java diff --git a/src/main/java/run/halo/app/security/authorization/RuleAccumulator.java b/application/src/main/java/run/halo/app/security/authorization/RuleAccumulator.java similarity index 100% rename from src/main/java/run/halo/app/security/authorization/RuleAccumulator.java rename to application/src/main/java/run/halo/app/security/authorization/RuleAccumulator.java diff --git a/src/main/java/run/halo/app/theme/DefaultTemplateEnum.java b/application/src/main/java/run/halo/app/theme/DefaultTemplateEnum.java similarity index 100% rename from src/main/java/run/halo/app/theme/DefaultTemplateEnum.java rename to application/src/main/java/run/halo/app/theme/DefaultTemplateEnum.java diff --git a/src/main/java/run/halo/app/theme/HaloViewResolver.java b/application/src/main/java/run/halo/app/theme/HaloViewResolver.java similarity index 100% rename from src/main/java/run/halo/app/theme/HaloViewResolver.java rename to application/src/main/java/run/halo/app/theme/HaloViewResolver.java diff --git a/src/main/java/run/halo/app/theme/ReactivePropertyAccessor.java b/application/src/main/java/run/halo/app/theme/ReactivePropertyAccessor.java similarity index 100% rename from src/main/java/run/halo/app/theme/ReactivePropertyAccessor.java rename to application/src/main/java/run/halo/app/theme/ReactivePropertyAccessor.java diff --git a/src/main/java/run/halo/app/theme/ReactiveSpelVariableExpressionEvaluator.java b/application/src/main/java/run/halo/app/theme/ReactiveSpelVariableExpressionEvaluator.java similarity index 100% rename from src/main/java/run/halo/app/theme/ReactiveSpelVariableExpressionEvaluator.java rename to application/src/main/java/run/halo/app/theme/ReactiveSpelVariableExpressionEvaluator.java diff --git a/src/main/java/run/halo/app/theme/SiteSettingVariablesAcquirer.java b/application/src/main/java/run/halo/app/theme/SiteSettingVariablesAcquirer.java similarity index 100% rename from src/main/java/run/halo/app/theme/SiteSettingVariablesAcquirer.java rename to application/src/main/java/run/halo/app/theme/SiteSettingVariablesAcquirer.java diff --git a/src/main/java/run/halo/app/theme/TemplateEngineManager.java b/application/src/main/java/run/halo/app/theme/TemplateEngineManager.java similarity index 100% rename from src/main/java/run/halo/app/theme/TemplateEngineManager.java rename to application/src/main/java/run/halo/app/theme/TemplateEngineManager.java diff --git a/src/main/java/run/halo/app/theme/ThemeConfiguration.java b/application/src/main/java/run/halo/app/theme/ThemeConfiguration.java similarity index 100% rename from src/main/java/run/halo/app/theme/ThemeConfiguration.java rename to application/src/main/java/run/halo/app/theme/ThemeConfiguration.java diff --git a/src/main/java/run/halo/app/theme/ThemeContext.java b/application/src/main/java/run/halo/app/theme/ThemeContext.java similarity index 100% rename from src/main/java/run/halo/app/theme/ThemeContext.java rename to application/src/main/java/run/halo/app/theme/ThemeContext.java diff --git a/src/main/java/run/halo/app/theme/ThemeContextBasedVariablesAcquirer.java b/application/src/main/java/run/halo/app/theme/ThemeContextBasedVariablesAcquirer.java similarity index 100% rename from src/main/java/run/halo/app/theme/ThemeContextBasedVariablesAcquirer.java rename to application/src/main/java/run/halo/app/theme/ThemeContextBasedVariablesAcquirer.java diff --git a/src/main/java/run/halo/app/theme/ThemeLinkBuilder.java b/application/src/main/java/run/halo/app/theme/ThemeLinkBuilder.java similarity index 100% rename from src/main/java/run/halo/app/theme/ThemeLinkBuilder.java rename to application/src/main/java/run/halo/app/theme/ThemeLinkBuilder.java diff --git a/src/main/java/run/halo/app/theme/ThemeLocaleContextResolver.java b/application/src/main/java/run/halo/app/theme/ThemeLocaleContextResolver.java similarity index 100% rename from src/main/java/run/halo/app/theme/ThemeLocaleContextResolver.java rename to application/src/main/java/run/halo/app/theme/ThemeLocaleContextResolver.java diff --git a/src/main/java/run/halo/app/theme/ThemePathPolicy.java b/application/src/main/java/run/halo/app/theme/ThemePathPolicy.java similarity index 100% rename from src/main/java/run/halo/app/theme/ThemePathPolicy.java rename to application/src/main/java/run/halo/app/theme/ThemePathPolicy.java diff --git a/src/main/java/run/halo/app/theme/ThemeResolver.java b/application/src/main/java/run/halo/app/theme/ThemeResolver.java similarity index 100% rename from src/main/java/run/halo/app/theme/ThemeResolver.java rename to application/src/main/java/run/halo/app/theme/ThemeResolver.java diff --git a/src/main/java/run/halo/app/theme/ViewContextBasedVariablesAcquirer.java b/application/src/main/java/run/halo/app/theme/ViewContextBasedVariablesAcquirer.java similarity index 100% rename from src/main/java/run/halo/app/theme/ViewContextBasedVariablesAcquirer.java rename to application/src/main/java/run/halo/app/theme/ViewContextBasedVariablesAcquirer.java diff --git a/src/main/java/run/halo/app/theme/dialect/CommentElementTagProcessor.java b/application/src/main/java/run/halo/app/theme/dialect/CommentElementTagProcessor.java similarity index 100% rename from src/main/java/run/halo/app/theme/dialect/CommentElementTagProcessor.java rename to application/src/main/java/run/halo/app/theme/dialect/CommentElementTagProcessor.java diff --git a/src/main/java/run/halo/app/theme/dialect/ContentTemplateHeadProcessor.java b/application/src/main/java/run/halo/app/theme/dialect/ContentTemplateHeadProcessor.java similarity index 100% rename from src/main/java/run/halo/app/theme/dialect/ContentTemplateHeadProcessor.java rename to application/src/main/java/run/halo/app/theme/dialect/ContentTemplateHeadProcessor.java diff --git a/src/main/java/run/halo/app/theme/dialect/DefaultFaviconHeadProcessor.java b/application/src/main/java/run/halo/app/theme/dialect/DefaultFaviconHeadProcessor.java similarity index 100% rename from src/main/java/run/halo/app/theme/dialect/DefaultFaviconHeadProcessor.java rename to application/src/main/java/run/halo/app/theme/dialect/DefaultFaviconHeadProcessor.java diff --git a/src/main/java/run/halo/app/theme/dialect/DefaultLinkExpressionFactory.java b/application/src/main/java/run/halo/app/theme/dialect/DefaultLinkExpressionFactory.java similarity index 100% rename from src/main/java/run/halo/app/theme/dialect/DefaultLinkExpressionFactory.java rename to application/src/main/java/run/halo/app/theme/dialect/DefaultLinkExpressionFactory.java diff --git a/src/main/java/run/halo/app/theme/dialect/GlobalHeadInjectionProcessor.java b/application/src/main/java/run/halo/app/theme/dialect/GlobalHeadInjectionProcessor.java similarity index 100% rename from src/main/java/run/halo/app/theme/dialect/GlobalHeadInjectionProcessor.java rename to application/src/main/java/run/halo/app/theme/dialect/GlobalHeadInjectionProcessor.java diff --git a/src/main/java/run/halo/app/theme/dialect/GlobalSeoProcessor.java b/application/src/main/java/run/halo/app/theme/dialect/GlobalSeoProcessor.java similarity index 100% rename from src/main/java/run/halo/app/theme/dialect/GlobalSeoProcessor.java rename to application/src/main/java/run/halo/app/theme/dialect/GlobalSeoProcessor.java diff --git a/src/main/java/run/halo/app/theme/dialect/HaloExpressionObjectFactory.java b/application/src/main/java/run/halo/app/theme/dialect/HaloExpressionObjectFactory.java similarity index 100% rename from src/main/java/run/halo/app/theme/dialect/HaloExpressionObjectFactory.java rename to application/src/main/java/run/halo/app/theme/dialect/HaloExpressionObjectFactory.java diff --git a/src/main/java/run/halo/app/theme/dialect/HaloProcessorDialect.java b/application/src/main/java/run/halo/app/theme/dialect/HaloProcessorDialect.java similarity index 100% rename from src/main/java/run/halo/app/theme/dialect/HaloProcessorDialect.java rename to application/src/main/java/run/halo/app/theme/dialect/HaloProcessorDialect.java diff --git a/src/main/java/run/halo/app/theme/dialect/HaloSpringSecurityDialect.java b/application/src/main/java/run/halo/app/theme/dialect/HaloSpringSecurityDialect.java similarity index 100% rename from src/main/java/run/halo/app/theme/dialect/HaloSpringSecurityDialect.java rename to application/src/main/java/run/halo/app/theme/dialect/HaloSpringSecurityDialect.java diff --git a/src/main/java/run/halo/app/theme/dialect/HaloTrackerProcessor.java b/application/src/main/java/run/halo/app/theme/dialect/HaloTrackerProcessor.java similarity index 100% rename from src/main/java/run/halo/app/theme/dialect/HaloTrackerProcessor.java rename to application/src/main/java/run/halo/app/theme/dialect/HaloTrackerProcessor.java diff --git a/src/main/java/run/halo/app/theme/dialect/JsonNodePropertyAccessorBoundariesProcessor.java b/application/src/main/java/run/halo/app/theme/dialect/JsonNodePropertyAccessorBoundariesProcessor.java similarity index 100% rename from src/main/java/run/halo/app/theme/dialect/JsonNodePropertyAccessorBoundariesProcessor.java rename to application/src/main/java/run/halo/app/theme/dialect/JsonNodePropertyAccessorBoundariesProcessor.java diff --git a/src/main/java/run/halo/app/theme/dialect/LinkExpressionObjectDialect.java b/application/src/main/java/run/halo/app/theme/dialect/LinkExpressionObjectDialect.java similarity index 100% rename from src/main/java/run/halo/app/theme/dialect/LinkExpressionObjectDialect.java rename to application/src/main/java/run/halo/app/theme/dialect/LinkExpressionObjectDialect.java diff --git a/src/main/java/run/halo/app/theme/dialect/TemplateFooterElementTagProcessor.java b/application/src/main/java/run/halo/app/theme/dialect/TemplateFooterElementTagProcessor.java similarity index 100% rename from src/main/java/run/halo/app/theme/dialect/TemplateFooterElementTagProcessor.java rename to application/src/main/java/run/halo/app/theme/dialect/TemplateFooterElementTagProcessor.java diff --git a/src/main/java/run/halo/app/theme/dialect/TemplateGlobalHeadProcessor.java b/application/src/main/java/run/halo/app/theme/dialect/TemplateGlobalHeadProcessor.java similarity index 100% rename from src/main/java/run/halo/app/theme/dialect/TemplateGlobalHeadProcessor.java rename to application/src/main/java/run/halo/app/theme/dialect/TemplateGlobalHeadProcessor.java diff --git a/src/main/java/run/halo/app/theme/dialect/expression/Annotations.java b/application/src/main/java/run/halo/app/theme/dialect/expression/Annotations.java similarity index 100% rename from src/main/java/run/halo/app/theme/dialect/expression/Annotations.java rename to application/src/main/java/run/halo/app/theme/dialect/expression/Annotations.java diff --git a/src/main/java/run/halo/app/theme/endpoint/CommentFinderEndpoint.java b/application/src/main/java/run/halo/app/theme/endpoint/CommentFinderEndpoint.java similarity index 100% rename from src/main/java/run/halo/app/theme/endpoint/CommentFinderEndpoint.java rename to application/src/main/java/run/halo/app/theme/endpoint/CommentFinderEndpoint.java diff --git a/src/main/java/run/halo/app/theme/engine/DefaultThemeTemplateAvailabilityProvider.java b/application/src/main/java/run/halo/app/theme/engine/DefaultThemeTemplateAvailabilityProvider.java similarity index 100% rename from src/main/java/run/halo/app/theme/engine/DefaultThemeTemplateAvailabilityProvider.java rename to application/src/main/java/run/halo/app/theme/engine/DefaultThemeTemplateAvailabilityProvider.java diff --git a/src/main/java/run/halo/app/theme/engine/HaloTemplateEngine.java b/application/src/main/java/run/halo/app/theme/engine/HaloTemplateEngine.java similarity index 100% rename from src/main/java/run/halo/app/theme/engine/HaloTemplateEngine.java rename to application/src/main/java/run/halo/app/theme/engine/HaloTemplateEngine.java diff --git a/src/main/java/run/halo/app/theme/engine/ThemeTemplateAvailabilityProvider.java b/application/src/main/java/run/halo/app/theme/engine/ThemeTemplateAvailabilityProvider.java similarity index 100% rename from src/main/java/run/halo/app/theme/engine/ThemeTemplateAvailabilityProvider.java rename to application/src/main/java/run/halo/app/theme/engine/ThemeTemplateAvailabilityProvider.java diff --git a/src/main/java/run/halo/app/theme/finders/CategoryFinder.java b/application/src/main/java/run/halo/app/theme/finders/CategoryFinder.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/CategoryFinder.java rename to application/src/main/java/run/halo/app/theme/finders/CategoryFinder.java diff --git a/src/main/java/run/halo/app/theme/finders/CommentFinder.java b/application/src/main/java/run/halo/app/theme/finders/CommentFinder.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/CommentFinder.java rename to application/src/main/java/run/halo/app/theme/finders/CommentFinder.java diff --git a/src/main/java/run/halo/app/theme/finders/ContributorFinder.java b/application/src/main/java/run/halo/app/theme/finders/ContributorFinder.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/ContributorFinder.java rename to application/src/main/java/run/halo/app/theme/finders/ContributorFinder.java diff --git a/src/main/java/run/halo/app/theme/finders/Finder.java b/application/src/main/java/run/halo/app/theme/finders/Finder.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/Finder.java rename to application/src/main/java/run/halo/app/theme/finders/Finder.java diff --git a/src/main/java/run/halo/app/theme/finders/FinderRegistry.java b/application/src/main/java/run/halo/app/theme/finders/FinderRegistry.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/FinderRegistry.java rename to application/src/main/java/run/halo/app/theme/finders/FinderRegistry.java diff --git a/src/main/java/run/halo/app/theme/finders/MenuFinder.java b/application/src/main/java/run/halo/app/theme/finders/MenuFinder.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/MenuFinder.java rename to application/src/main/java/run/halo/app/theme/finders/MenuFinder.java diff --git a/src/main/java/run/halo/app/theme/finders/PluginFinder.java b/application/src/main/java/run/halo/app/theme/finders/PluginFinder.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/PluginFinder.java rename to application/src/main/java/run/halo/app/theme/finders/PluginFinder.java diff --git a/src/main/java/run/halo/app/theme/finders/PostFinder.java b/application/src/main/java/run/halo/app/theme/finders/PostFinder.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/PostFinder.java rename to application/src/main/java/run/halo/app/theme/finders/PostFinder.java diff --git a/src/main/java/run/halo/app/theme/finders/SinglePageFinder.java b/application/src/main/java/run/halo/app/theme/finders/SinglePageFinder.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/SinglePageFinder.java rename to application/src/main/java/run/halo/app/theme/finders/SinglePageFinder.java diff --git a/src/main/java/run/halo/app/theme/finders/SiteStatsFinder.java b/application/src/main/java/run/halo/app/theme/finders/SiteStatsFinder.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/SiteStatsFinder.java rename to application/src/main/java/run/halo/app/theme/finders/SiteStatsFinder.java diff --git a/src/main/java/run/halo/app/theme/finders/TagFinder.java b/application/src/main/java/run/halo/app/theme/finders/TagFinder.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/TagFinder.java rename to application/src/main/java/run/halo/app/theme/finders/TagFinder.java diff --git a/src/main/java/run/halo/app/theme/finders/ThemeFinder.java b/application/src/main/java/run/halo/app/theme/finders/ThemeFinder.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/ThemeFinder.java rename to application/src/main/java/run/halo/app/theme/finders/ThemeFinder.java diff --git a/src/main/java/run/halo/app/theme/finders/impl/CategoryFinderImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/CategoryFinderImpl.java similarity index 98% rename from src/main/java/run/halo/app/theme/finders/impl/CategoryFinderImpl.java rename to application/src/main/java/run/halo/app/theme/finders/impl/CategoryFinderImpl.java index 0af4762e0..07a89f9c2 100644 --- a/src/main/java/run/halo/app/theme/finders/impl/CategoryFinderImpl.java +++ b/application/src/main/java/run/halo/app/theme/finders/impl/CategoryFinderImpl.java @@ -56,7 +56,7 @@ public class CategoryFinderImpl implements CategoryFinder { return client.list(Category.class, null, defaultComparator(), pageNullSafe(page), sizeNullSafe(size)) .map(list -> { - List categoryVos = list.stream() + List categoryVos = list.get() .map(CategoryVo::from) .collect(Collectors.toList()); return new ListResult<>(list.getPage(), list.getSize(), list.getTotal(), diff --git a/src/main/java/run/halo/app/theme/finders/impl/CommentFinderImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/CommentFinderImpl.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/impl/CommentFinderImpl.java rename to application/src/main/java/run/halo/app/theme/finders/impl/CommentFinderImpl.java diff --git a/src/main/java/run/halo/app/theme/finders/impl/ContributorFinderImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/ContributorFinderImpl.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/impl/ContributorFinderImpl.java rename to application/src/main/java/run/halo/app/theme/finders/impl/ContributorFinderImpl.java diff --git a/src/main/java/run/halo/app/theme/finders/impl/MenuFinderImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/MenuFinderImpl.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/impl/MenuFinderImpl.java rename to application/src/main/java/run/halo/app/theme/finders/impl/MenuFinderImpl.java diff --git a/src/main/java/run/halo/app/theme/finders/impl/PluginFinderImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/PluginFinderImpl.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/impl/PluginFinderImpl.java rename to application/src/main/java/run/halo/app/theme/finders/impl/PluginFinderImpl.java diff --git a/src/main/java/run/halo/app/theme/finders/impl/PostFinderImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/PostFinderImpl.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/impl/PostFinderImpl.java rename to application/src/main/java/run/halo/app/theme/finders/impl/PostFinderImpl.java diff --git a/src/main/java/run/halo/app/theme/finders/impl/SinglePageFinderImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/SinglePageFinderImpl.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/impl/SinglePageFinderImpl.java rename to application/src/main/java/run/halo/app/theme/finders/impl/SinglePageFinderImpl.java diff --git a/src/main/java/run/halo/app/theme/finders/impl/SiteStatsFinderImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/SiteStatsFinderImpl.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/impl/SiteStatsFinderImpl.java rename to application/src/main/java/run/halo/app/theme/finders/impl/SiteStatsFinderImpl.java diff --git a/src/main/java/run/halo/app/theme/finders/impl/TagFinderImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/TagFinderImpl.java similarity index 97% rename from src/main/java/run/halo/app/theme/finders/impl/TagFinderImpl.java rename to application/src/main/java/run/halo/app/theme/finders/impl/TagFinderImpl.java index 508180a40..99425bc83 100644 --- a/src/main/java/run/halo/app/theme/finders/impl/TagFinderImpl.java +++ b/application/src/main/java/run/halo/app/theme/finders/impl/TagFinderImpl.java @@ -48,7 +48,7 @@ public class TagFinderImpl implements TagFinder { return client.list(Tag.class, null, DEFAULT_COMPARATOR.reversed(), pageNullSafe(page), sizeNullSafe(size)) .map(list -> { - List tagVos = list.stream() + List tagVos = list.get() .map(TagVo::from) .collect(Collectors.toList()); return new ListResult<>(list.getPage(), list.getSize(), list.getTotal(), tagVos); diff --git a/src/main/java/run/halo/app/theme/finders/impl/ThemeFinderImpl.java b/application/src/main/java/run/halo/app/theme/finders/impl/ThemeFinderImpl.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/impl/ThemeFinderImpl.java rename to application/src/main/java/run/halo/app/theme/finders/impl/ThemeFinderImpl.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/CategoryTreeVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/CategoryTreeVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/CategoryTreeVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/CategoryTreeVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/CategoryVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/CategoryVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/CategoryVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/CategoryVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/CommentStatsVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/CommentStatsVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/CommentStatsVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/CommentStatsVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/CommentVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/CommentVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/CommentVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/CommentVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/ContentVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/ContentVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/ContentVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/ContentVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/ContributorVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/ContributorVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/ContributorVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/ContributorVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/ExtensionVoOperator.java b/application/src/main/java/run/halo/app/theme/finders/vo/ExtensionVoOperator.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/ExtensionVoOperator.java rename to application/src/main/java/run/halo/app/theme/finders/vo/ExtensionVoOperator.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/ListedPostVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/ListedPostVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/ListedPostVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/ListedPostVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/ListedSinglePageVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/ListedSinglePageVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/ListedSinglePageVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/ListedSinglePageVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/MenuItemVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/MenuItemVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/MenuItemVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/MenuItemVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/MenuVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/MenuVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/MenuVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/MenuVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/NavigationPostVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/NavigationPostVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/NavigationPostVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/NavigationPostVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/PostArchiveVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/PostArchiveVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/PostArchiveVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/PostArchiveVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/PostArchiveYearMonthVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/PostArchiveYearMonthVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/PostArchiveYearMonthVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/PostArchiveYearMonthVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/PostVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/PostVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/PostVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/PostVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/ReplyVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/ReplyVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/ReplyVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/ReplyVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/SinglePageVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/SinglePageVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/SinglePageVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/SinglePageVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/SiteSettingVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/SiteSettingVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/SiteSettingVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/SiteSettingVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/SiteStatsVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/SiteStatsVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/SiteStatsVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/SiteStatsVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/StatsVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/StatsVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/StatsVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/StatsVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/TagVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/TagVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/TagVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/TagVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/ThemeVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/ThemeVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/ThemeVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/ThemeVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/UserVo.java b/application/src/main/java/run/halo/app/theme/finders/vo/UserVo.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/UserVo.java rename to application/src/main/java/run/halo/app/theme/finders/vo/UserVo.java diff --git a/src/main/java/run/halo/app/theme/finders/vo/VisualizableTreeNode.java b/application/src/main/java/run/halo/app/theme/finders/vo/VisualizableTreeNode.java similarity index 100% rename from src/main/java/run/halo/app/theme/finders/vo/VisualizableTreeNode.java rename to application/src/main/java/run/halo/app/theme/finders/vo/VisualizableTreeNode.java diff --git a/src/main/java/run/halo/app/theme/message/ThemeMessageResolutionUtils.java b/application/src/main/java/run/halo/app/theme/message/ThemeMessageResolutionUtils.java similarity index 100% rename from src/main/java/run/halo/app/theme/message/ThemeMessageResolutionUtils.java rename to application/src/main/java/run/halo/app/theme/message/ThemeMessageResolutionUtils.java diff --git a/src/main/java/run/halo/app/theme/message/ThemeMessageResolver.java b/application/src/main/java/run/halo/app/theme/message/ThemeMessageResolver.java similarity index 100% rename from src/main/java/run/halo/app/theme/message/ThemeMessageResolver.java rename to application/src/main/java/run/halo/app/theme/message/ThemeMessageResolver.java diff --git a/src/main/java/run/halo/app/theme/router/ExtensionPermalinkPatternUpdater.java b/application/src/main/java/run/halo/app/theme/router/ExtensionPermalinkPatternUpdater.java similarity index 95% rename from src/main/java/run/halo/app/theme/router/ExtensionPermalinkPatternUpdater.java rename to application/src/main/java/run/halo/app/theme/router/ExtensionPermalinkPatternUpdater.java index 06ba27743..369d9be44 100644 --- a/src/main/java/run/halo/app/theme/router/ExtensionPermalinkPatternUpdater.java +++ b/application/src/main/java/run/halo/app/theme/router/ExtensionPermalinkPatternUpdater.java @@ -14,8 +14,8 @@ import run.halo.app.core.extension.content.Tag; import run.halo.app.extension.AbstractExtension; import run.halo.app.extension.Extension; import run.halo.app.extension.ExtensionClient; -import run.halo.app.extension.ExtensionUtil; import run.halo.app.extension.MetadataOperator; +import run.halo.app.extension.MetadataUtil; import run.halo.app.theme.DefaultTemplateEnum; /** @@ -57,7 +57,7 @@ public class ExtensionPermalinkPatternUpdater } private void updateIfPermalinkPatternChanged(AbstractExtension extension, String pattern) { - Map annotations = ExtensionUtil.nullSafeAnnotations(extension); + Map annotations = MetadataUtil.nullSafeAnnotations(extension); String oldPattern = annotations.get(Constant.PERMALINK_PATTERN_ANNO); annotations.put(Constant.PERMALINK_PATTERN_ANNO, pattern); diff --git a/src/main/java/run/halo/app/theme/router/PageUrlUtils.java b/application/src/main/java/run/halo/app/theme/router/PageUrlUtils.java similarity index 100% rename from src/main/java/run/halo/app/theme/router/PageUrlUtils.java rename to application/src/main/java/run/halo/app/theme/router/PageUrlUtils.java diff --git a/src/main/java/run/halo/app/theme/router/PermalinkRuleChangedEvent.java b/application/src/main/java/run/halo/app/theme/router/PermalinkRuleChangedEvent.java similarity index 100% rename from src/main/java/run/halo/app/theme/router/PermalinkRuleChangedEvent.java rename to application/src/main/java/run/halo/app/theme/router/PermalinkRuleChangedEvent.java diff --git a/src/main/java/run/halo/app/theme/router/PermalinkWatch.java b/application/src/main/java/run/halo/app/theme/router/PermalinkWatch.java similarity index 100% rename from src/main/java/run/halo/app/theme/router/PermalinkWatch.java rename to application/src/main/java/run/halo/app/theme/router/PermalinkWatch.java diff --git a/src/main/java/run/halo/app/theme/router/SinglePageRoute.java b/application/src/main/java/run/halo/app/theme/router/SinglePageRoute.java similarity index 100% rename from src/main/java/run/halo/app/theme/router/SinglePageRoute.java rename to application/src/main/java/run/halo/app/theme/router/SinglePageRoute.java diff --git a/src/main/java/run/halo/app/theme/router/ThemeCompositeRouterFunction.java b/application/src/main/java/run/halo/app/theme/router/ThemeCompositeRouterFunction.java similarity index 100% rename from src/main/java/run/halo/app/theme/router/ThemeCompositeRouterFunction.java rename to application/src/main/java/run/halo/app/theme/router/ThemeCompositeRouterFunction.java diff --git a/src/main/java/run/halo/app/theme/router/UrlContextListResult.java b/application/src/main/java/run/halo/app/theme/router/UrlContextListResult.java similarity index 100% rename from src/main/java/run/halo/app/theme/router/UrlContextListResult.java rename to application/src/main/java/run/halo/app/theme/router/UrlContextListResult.java diff --git a/src/main/java/run/halo/app/theme/router/ViewNameResolver.java b/application/src/main/java/run/halo/app/theme/router/ViewNameResolver.java similarity index 100% rename from src/main/java/run/halo/app/theme/router/ViewNameResolver.java rename to application/src/main/java/run/halo/app/theme/router/ViewNameResolver.java diff --git a/src/main/java/run/halo/app/theme/router/factories/ArchiveRouteFactory.java b/application/src/main/java/run/halo/app/theme/router/factories/ArchiveRouteFactory.java similarity index 100% rename from src/main/java/run/halo/app/theme/router/factories/ArchiveRouteFactory.java rename to application/src/main/java/run/halo/app/theme/router/factories/ArchiveRouteFactory.java diff --git a/src/main/java/run/halo/app/theme/router/factories/AuthorPostsRouteFactory.java b/application/src/main/java/run/halo/app/theme/router/factories/AuthorPostsRouteFactory.java similarity index 100% rename from src/main/java/run/halo/app/theme/router/factories/AuthorPostsRouteFactory.java rename to application/src/main/java/run/halo/app/theme/router/factories/AuthorPostsRouteFactory.java diff --git a/src/main/java/run/halo/app/theme/router/factories/CategoriesRouteFactory.java b/application/src/main/java/run/halo/app/theme/router/factories/CategoriesRouteFactory.java similarity index 100% rename from src/main/java/run/halo/app/theme/router/factories/CategoriesRouteFactory.java rename to application/src/main/java/run/halo/app/theme/router/factories/CategoriesRouteFactory.java diff --git a/src/main/java/run/halo/app/theme/router/factories/CategoryPostRouteFactory.java b/application/src/main/java/run/halo/app/theme/router/factories/CategoryPostRouteFactory.java similarity index 100% rename from src/main/java/run/halo/app/theme/router/factories/CategoryPostRouteFactory.java rename to application/src/main/java/run/halo/app/theme/router/factories/CategoryPostRouteFactory.java diff --git a/src/main/java/run/halo/app/theme/router/factories/IndexRouteFactory.java b/application/src/main/java/run/halo/app/theme/router/factories/IndexRouteFactory.java similarity index 100% rename from src/main/java/run/halo/app/theme/router/factories/IndexRouteFactory.java rename to application/src/main/java/run/halo/app/theme/router/factories/IndexRouteFactory.java diff --git a/src/main/java/run/halo/app/theme/router/factories/ModelConst.java b/application/src/main/java/run/halo/app/theme/router/factories/ModelConst.java similarity index 100% rename from src/main/java/run/halo/app/theme/router/factories/ModelConst.java rename to application/src/main/java/run/halo/app/theme/router/factories/ModelConst.java diff --git a/src/main/java/run/halo/app/theme/router/factories/PostRouteFactory.java b/application/src/main/java/run/halo/app/theme/router/factories/PostRouteFactory.java similarity index 98% rename from src/main/java/run/halo/app/theme/router/factories/PostRouteFactory.java rename to application/src/main/java/run/halo/app/theme/router/factories/PostRouteFactory.java index e72573b66..0f400951b 100644 --- a/src/main/java/run/halo/app/theme/router/factories/PostRouteFactory.java +++ b/application/src/main/java/run/halo/app/theme/router/factories/PostRouteFactory.java @@ -29,9 +29,9 @@ import org.springframework.web.reactive.function.server.ServerResponse; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import run.halo.app.core.extension.content.Post; -import run.halo.app.extension.ExtensionUtil; import run.halo.app.extension.GVK; import run.halo.app.extension.GroupVersionKind; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.ReactiveExtensionClient; import run.halo.app.infra.exception.NotFoundException; import run.halo.app.infra.utils.JsonUtils; @@ -119,7 +119,7 @@ public class PostRouteFactory implements RouteFactory { Mono bestMatchPost(PostPatternVariable variable) { return postsByPredicates(variable) .filter(post -> { - Map labels = ExtensionUtil.nullSafeLabels(post); + Map labels = MetadataUtil.nullSafeLabels(post); return matchIfPresent(variable.getName(), post.getMetadata().getName()) && matchIfPresent(variable.getSlug(), post.getSpec().getSlug()) && matchIfPresent(variable.getYear(), labels.get(Post.ARCHIVE_YEAR_LABEL)) diff --git a/src/main/java/run/halo/app/theme/router/factories/RouteFactory.java b/application/src/main/java/run/halo/app/theme/router/factories/RouteFactory.java similarity index 100% rename from src/main/java/run/halo/app/theme/router/factories/RouteFactory.java rename to application/src/main/java/run/halo/app/theme/router/factories/RouteFactory.java diff --git a/src/main/java/run/halo/app/theme/router/factories/TagPostRouteFactory.java b/application/src/main/java/run/halo/app/theme/router/factories/TagPostRouteFactory.java similarity index 100% rename from src/main/java/run/halo/app/theme/router/factories/TagPostRouteFactory.java rename to application/src/main/java/run/halo/app/theme/router/factories/TagPostRouteFactory.java diff --git a/src/main/java/run/halo/app/theme/router/factories/TagsRouteFactory.java b/application/src/main/java/run/halo/app/theme/router/factories/TagsRouteFactory.java similarity index 100% rename from src/main/java/run/halo/app/theme/router/factories/TagsRouteFactory.java rename to application/src/main/java/run/halo/app/theme/router/factories/TagsRouteFactory.java diff --git a/application/src/main/resources/META-INF/spring-devtools.properties b/application/src/main/resources/META-INF/spring-devtools.properties new file mode 100644 index 000000000..53afa9960 --- /dev/null +++ b/application/src/main/resources/META-INF/spring-devtools.properties @@ -0,0 +1,2 @@ +# See https://docs.spring.io/spring-boot/docs/current/reference/html/using.html#using.devtools.restart.customizing-the-classload for more +restart.include.apimodule=/api-[\\w\\d-\\.]+\\.jar diff --git a/src/main/resources/application-dev.yaml b/application/src/main/resources/application-dev.yaml similarity index 100% rename from src/main/resources/application-dev.yaml rename to application/src/main/resources/application-dev.yaml diff --git a/src/main/resources/application-mariadb.yaml b/application/src/main/resources/application-mariadb.yaml similarity index 100% rename from src/main/resources/application-mariadb.yaml rename to application/src/main/resources/application-mariadb.yaml diff --git a/src/main/resources/application-mysql.yaml b/application/src/main/resources/application-mysql.yaml similarity index 100% rename from src/main/resources/application-mysql.yaml rename to application/src/main/resources/application-mysql.yaml diff --git a/src/main/resources/application-postgresql.yaml b/application/src/main/resources/application-postgresql.yaml similarity index 100% rename from src/main/resources/application-postgresql.yaml rename to application/src/main/resources/application-postgresql.yaml diff --git a/src/main/resources/application-win.yaml b/application/src/main/resources/application-win.yaml similarity index 100% rename from src/main/resources/application-win.yaml rename to application/src/main/resources/application-win.yaml diff --git a/src/main/resources/application.yaml b/application/src/main/resources/application.yaml similarity index 100% rename from src/main/resources/application.yaml rename to application/src/main/resources/application.yaml diff --git a/src/main/resources/banner.txt b/application/src/main/resources/banner.txt similarity index 100% rename from src/main/resources/banner.txt rename to application/src/main/resources/banner.txt diff --git a/src/main/resources/config/i18n/messages.properties b/application/src/main/resources/config/i18n/messages.properties similarity index 100% rename from src/main/resources/config/i18n/messages.properties rename to application/src/main/resources/config/i18n/messages.properties diff --git a/src/main/resources/config/i18n/messages_zh.properties b/application/src/main/resources/config/i18n/messages_zh.properties similarity index 100% rename from src/main/resources/config/i18n/messages_zh.properties rename to application/src/main/resources/config/i18n/messages_zh.properties diff --git a/src/main/resources/extensions/attachment-local-policy.yaml b/application/src/main/resources/extensions/attachment-local-policy.yaml similarity index 100% rename from src/main/resources/extensions/attachment-local-policy.yaml rename to application/src/main/resources/extensions/attachment-local-policy.yaml diff --git a/src/main/resources/extensions/authproviders.yaml b/application/src/main/resources/extensions/authproviders.yaml similarity index 100% rename from src/main/resources/extensions/authproviders.yaml rename to application/src/main/resources/extensions/authproviders.yaml diff --git a/src/main/resources/extensions/extension-definitions.yaml b/application/src/main/resources/extensions/extension-definitions.yaml similarity index 100% rename from src/main/resources/extensions/extension-definitions.yaml rename to application/src/main/resources/extensions/extension-definitions.yaml diff --git a/src/main/resources/extensions/extensionpoint-definitions.yaml b/application/src/main/resources/extensions/extensionpoint-definitions.yaml similarity index 100% rename from src/main/resources/extensions/extensionpoint-definitions.yaml rename to application/src/main/resources/extensions/extensionpoint-definitions.yaml diff --git a/src/main/resources/extensions/role-template-anonymous.yaml b/application/src/main/resources/extensions/role-template-anonymous.yaml similarity index 100% rename from src/main/resources/extensions/role-template-anonymous.yaml rename to application/src/main/resources/extensions/role-template-anonymous.yaml diff --git a/src/main/resources/extensions/role-template-attachment.yaml b/application/src/main/resources/extensions/role-template-attachment.yaml similarity index 100% rename from src/main/resources/extensions/role-template-attachment.yaml rename to application/src/main/resources/extensions/role-template-attachment.yaml diff --git a/src/main/resources/extensions/role-template-authenticated.yaml b/application/src/main/resources/extensions/role-template-authenticated.yaml similarity index 100% rename from src/main/resources/extensions/role-template-authenticated.yaml rename to application/src/main/resources/extensions/role-template-authenticated.yaml diff --git a/src/main/resources/extensions/role-template-category.yaml b/application/src/main/resources/extensions/role-template-category.yaml similarity index 100% rename from src/main/resources/extensions/role-template-category.yaml rename to application/src/main/resources/extensions/role-template-category.yaml diff --git a/src/main/resources/extensions/role-template-comment.yaml b/application/src/main/resources/extensions/role-template-comment.yaml similarity index 100% rename from src/main/resources/extensions/role-template-comment.yaml rename to application/src/main/resources/extensions/role-template-comment.yaml diff --git a/src/main/resources/extensions/role-template-configmap.yaml b/application/src/main/resources/extensions/role-template-configmap.yaml similarity index 100% rename from src/main/resources/extensions/role-template-configmap.yaml rename to application/src/main/resources/extensions/role-template-configmap.yaml diff --git a/src/main/resources/extensions/role-template-menu.yaml b/application/src/main/resources/extensions/role-template-menu.yaml similarity index 100% rename from src/main/resources/extensions/role-template-menu.yaml rename to application/src/main/resources/extensions/role-template-menu.yaml diff --git a/src/main/resources/extensions/role-template-permissions.yaml b/application/src/main/resources/extensions/role-template-permissions.yaml similarity index 100% rename from src/main/resources/extensions/role-template-permissions.yaml rename to application/src/main/resources/extensions/role-template-permissions.yaml diff --git a/src/main/resources/extensions/role-template-plugin.yaml b/application/src/main/resources/extensions/role-template-plugin.yaml similarity index 100% rename from src/main/resources/extensions/role-template-plugin.yaml rename to application/src/main/resources/extensions/role-template-plugin.yaml diff --git a/src/main/resources/extensions/role-template-post.yaml b/application/src/main/resources/extensions/role-template-post.yaml similarity index 100% rename from src/main/resources/extensions/role-template-post.yaml rename to application/src/main/resources/extensions/role-template-post.yaml diff --git a/src/main/resources/extensions/role-template-role.yaml b/application/src/main/resources/extensions/role-template-role.yaml similarity index 100% rename from src/main/resources/extensions/role-template-role.yaml rename to application/src/main/resources/extensions/role-template-role.yaml diff --git a/src/main/resources/extensions/role-template-setting.yaml b/application/src/main/resources/extensions/role-template-setting.yaml similarity index 100% rename from src/main/resources/extensions/role-template-setting.yaml rename to application/src/main/resources/extensions/role-template-setting.yaml diff --git a/src/main/resources/extensions/role-template-singlepage.yaml b/application/src/main/resources/extensions/role-template-singlepage.yaml similarity index 100% rename from src/main/resources/extensions/role-template-singlepage.yaml rename to application/src/main/resources/extensions/role-template-singlepage.yaml diff --git a/src/main/resources/extensions/role-template-snaphost.yaml b/application/src/main/resources/extensions/role-template-snaphost.yaml similarity index 100% rename from src/main/resources/extensions/role-template-snaphost.yaml rename to application/src/main/resources/extensions/role-template-snaphost.yaml diff --git a/src/main/resources/extensions/role-template-tag.yaml b/application/src/main/resources/extensions/role-template-tag.yaml similarity index 100% rename from src/main/resources/extensions/role-template-tag.yaml rename to application/src/main/resources/extensions/role-template-tag.yaml diff --git a/src/main/resources/extensions/role-template-theme.yaml b/application/src/main/resources/extensions/role-template-theme.yaml similarity index 100% rename from src/main/resources/extensions/role-template-theme.yaml rename to application/src/main/resources/extensions/role-template-theme.yaml diff --git a/src/main/resources/extensions/role-template-user.yaml b/application/src/main/resources/extensions/role-template-user.yaml similarity index 100% rename from src/main/resources/extensions/role-template-user.yaml rename to application/src/main/resources/extensions/role-template-user.yaml diff --git a/src/main/resources/extensions/searchengine-lucene.yaml b/application/src/main/resources/extensions/searchengine-lucene.yaml similarity index 100% rename from src/main/resources/extensions/searchengine-lucene.yaml rename to application/src/main/resources/extensions/searchengine-lucene.yaml diff --git a/src/main/resources/extensions/system-configurable-configmap.yaml b/application/src/main/resources/extensions/system-configurable-configmap.yaml similarity index 100% rename from src/main/resources/extensions/system-configurable-configmap.yaml rename to application/src/main/resources/extensions/system-configurable-configmap.yaml diff --git a/src/main/resources/extensions/system-default-role.yaml b/application/src/main/resources/extensions/system-default-role.yaml similarity index 100% rename from src/main/resources/extensions/system-default-role.yaml rename to application/src/main/resources/extensions/system-default-role.yaml diff --git a/src/main/resources/extensions/system-setting.yaml b/application/src/main/resources/extensions/system-setting.yaml similarity index 100% rename from src/main/resources/extensions/system-setting.yaml rename to application/src/main/resources/extensions/system-setting.yaml diff --git a/src/main/resources/extensions/user.yaml b/application/src/main/resources/extensions/user.yaml similarity index 100% rename from src/main/resources/extensions/user.yaml rename to application/src/main/resources/extensions/user.yaml diff --git a/src/main/resources/schema-h2.sql b/application/src/main/resources/schema-h2.sql similarity index 100% rename from src/main/resources/schema-h2.sql rename to application/src/main/resources/schema-h2.sql diff --git a/src/main/resources/schema-mysql.sql b/application/src/main/resources/schema-mysql.sql similarity index 100% rename from src/main/resources/schema-mysql.sql rename to application/src/main/resources/schema-mysql.sql diff --git a/src/main/resources/schema-postgresql.sql b/application/src/main/resources/schema-postgresql.sql similarity index 100% rename from src/main/resources/schema-postgresql.sql rename to application/src/main/resources/schema-postgresql.sql diff --git a/src/main/resources/static/halo-tracker.js b/application/src/main/resources/static/halo-tracker.js similarity index 100% rename from src/main/resources/static/halo-tracker.js rename to application/src/main/resources/static/halo-tracker.js diff --git a/src/main/resources/templates/error/error.html b/application/src/main/resources/templates/error/error.html similarity index 100% rename from src/main/resources/templates/error/error.html rename to application/src/main/resources/templates/error/error.html diff --git a/src/main/resources/themes/theme-earth.zip b/application/src/main/resources/themes/theme-earth.zip similarity index 100% rename from src/main/resources/themes/theme-earth.zip rename to application/src/main/resources/themes/theme-earth.zip diff --git a/src/test/java/run/halo/app/ApplicationTests.java b/application/src/test/java/run/halo/app/ApplicationTests.java similarity index 100% rename from src/test/java/run/halo/app/ApplicationTests.java rename to application/src/test/java/run/halo/app/ApplicationTests.java diff --git a/src/test/java/run/halo/app/PathPrefixPredicateTest.java b/application/src/test/java/run/halo/app/PathPrefixPredicateTest.java similarity index 100% rename from src/test/java/run/halo/app/PathPrefixPredicateTest.java rename to application/src/test/java/run/halo/app/PathPrefixPredicateTest.java diff --git a/src/test/java/run/halo/app/config/CorsTest.java b/application/src/test/java/run/halo/app/config/CorsTest.java similarity index 100% rename from src/test/java/run/halo/app/config/CorsTest.java rename to application/src/test/java/run/halo/app/config/CorsTest.java diff --git a/src/test/java/run/halo/app/config/ExtensionConfigurationTest.java b/application/src/test/java/run/halo/app/config/ExtensionConfigurationTest.java similarity index 100% rename from src/test/java/run/halo/app/config/ExtensionConfigurationTest.java rename to application/src/test/java/run/halo/app/config/ExtensionConfigurationTest.java diff --git a/src/test/java/run/halo/app/config/ServerCodecTest.java b/application/src/test/java/run/halo/app/config/ServerCodecTest.java similarity index 100% rename from src/test/java/run/halo/app/config/ServerCodecTest.java rename to application/src/test/java/run/halo/app/config/ServerCodecTest.java diff --git a/src/test/java/run/halo/app/config/WebFluxConfigTest.java b/application/src/test/java/run/halo/app/config/WebFluxConfigTest.java similarity index 100% rename from src/test/java/run/halo/app/config/WebFluxConfigTest.java rename to application/src/test/java/run/halo/app/config/WebFluxConfigTest.java diff --git a/src/test/java/run/halo/app/console/WebSocketServerWebExchangeMatcherTest.java b/application/src/test/java/run/halo/app/console/WebSocketServerWebExchangeMatcherTest.java similarity index 100% rename from src/test/java/run/halo/app/console/WebSocketServerWebExchangeMatcherTest.java rename to application/src/test/java/run/halo/app/console/WebSocketServerWebExchangeMatcherTest.java diff --git a/src/test/java/run/halo/app/content/ContentRequestTest.java b/application/src/test/java/run/halo/app/content/ContentRequestTest.java similarity index 100% rename from src/test/java/run/halo/app/content/ContentRequestTest.java rename to application/src/test/java/run/halo/app/content/ContentRequestTest.java diff --git a/src/test/java/run/halo/app/content/DefaultIndexerTest.java b/application/src/test/java/run/halo/app/content/DefaultIndexerTest.java similarity index 100% rename from src/test/java/run/halo/app/content/DefaultIndexerTest.java rename to application/src/test/java/run/halo/app/content/DefaultIndexerTest.java diff --git a/src/test/java/run/halo/app/content/PostIntegrationTests.java b/application/src/test/java/run/halo/app/content/PostIntegrationTests.java similarity index 100% rename from src/test/java/run/halo/app/content/PostIntegrationTests.java rename to application/src/test/java/run/halo/app/content/PostIntegrationTests.java diff --git a/src/test/java/run/halo/app/content/TestPost.java b/application/src/test/java/run/halo/app/content/TestPost.java similarity index 95% rename from src/test/java/run/halo/app/content/TestPost.java rename to application/src/test/java/run/halo/app/content/TestPost.java index 9bba8bc09..806c7605f 100644 --- a/src/test/java/run/halo/app/content/TestPost.java +++ b/application/src/test/java/run/halo/app/content/TestPost.java @@ -4,9 +4,9 @@ import java.time.Instant; import run.halo.app.core.extension.content.Post; import run.halo.app.core.extension.content.Snapshot; import run.halo.app.extension.AbstractExtension; -import run.halo.app.extension.ExtensionUtil; import run.halo.app.extension.GVK; import run.halo.app.extension.Metadata; +import run.halo.app.extension.MetadataUtil; /** * @author guqing @@ -40,7 +40,7 @@ public class TestPost { metadata.setName("snapshot-A"); metadata.setCreationTimestamp(Instant.now()); snapshot.setMetadata(metadata); - ExtensionUtil.nullSafeAnnotations(snapshot).put(Snapshot.KEEP_RAW_ANNO, "true"); + MetadataUtil.nullSafeAnnotations(snapshot).put(Snapshot.KEEP_RAW_ANNO, "true"); Snapshot.SnapShotSpec spec = new Snapshot.SnapShotSpec(); snapshot.setSpec(spec); diff --git a/src/test/java/run/halo/app/content/comment/CommentEmailOwnerTest.java b/application/src/test/java/run/halo/app/content/comment/CommentEmailOwnerTest.java similarity index 100% rename from src/test/java/run/halo/app/content/comment/CommentEmailOwnerTest.java rename to application/src/test/java/run/halo/app/content/comment/CommentEmailOwnerTest.java diff --git a/src/test/java/run/halo/app/content/comment/CommentQueryTest.java b/application/src/test/java/run/halo/app/content/comment/CommentQueryTest.java similarity index 100% rename from src/test/java/run/halo/app/content/comment/CommentQueryTest.java rename to application/src/test/java/run/halo/app/content/comment/CommentQueryTest.java diff --git a/src/test/java/run/halo/app/content/comment/CommentRequestTest.java b/application/src/test/java/run/halo/app/content/comment/CommentRequestTest.java similarity index 100% rename from src/test/java/run/halo/app/content/comment/CommentRequestTest.java rename to application/src/test/java/run/halo/app/content/comment/CommentRequestTest.java diff --git a/src/test/java/run/halo/app/content/comment/CommentServiceImplTest.java b/application/src/test/java/run/halo/app/content/comment/CommentServiceImplTest.java similarity index 100% rename from src/test/java/run/halo/app/content/comment/CommentServiceImplTest.java rename to application/src/test/java/run/halo/app/content/comment/CommentServiceImplTest.java diff --git a/src/test/java/run/halo/app/content/comment/CommentSorterTest.java b/application/src/test/java/run/halo/app/content/comment/CommentSorterTest.java similarity index 100% rename from src/test/java/run/halo/app/content/comment/CommentSorterTest.java rename to application/src/test/java/run/halo/app/content/comment/CommentSorterTest.java diff --git a/src/test/java/run/halo/app/content/comment/PostCommentSubjectTest.java b/application/src/test/java/run/halo/app/content/comment/PostCommentSubjectTest.java similarity index 100% rename from src/test/java/run/halo/app/content/comment/PostCommentSubjectTest.java rename to application/src/test/java/run/halo/app/content/comment/PostCommentSubjectTest.java diff --git a/src/test/java/run/halo/app/content/comment/ReplyServiceTest.java b/application/src/test/java/run/halo/app/content/comment/ReplyServiceTest.java similarity index 100% rename from src/test/java/run/halo/app/content/comment/ReplyServiceTest.java rename to application/src/test/java/run/halo/app/content/comment/ReplyServiceTest.java diff --git a/src/test/java/run/halo/app/content/comment/SinglePageCommentSubjectTest.java b/application/src/test/java/run/halo/app/content/comment/SinglePageCommentSubjectTest.java similarity index 100% rename from src/test/java/run/halo/app/content/comment/SinglePageCommentSubjectTest.java rename to application/src/test/java/run/halo/app/content/comment/SinglePageCommentSubjectTest.java diff --git a/src/test/java/run/halo/app/content/impl/PostServiceImplTest.java b/application/src/test/java/run/halo/app/content/impl/PostServiceImplTest.java similarity index 100% rename from src/test/java/run/halo/app/content/impl/PostServiceImplTest.java rename to application/src/test/java/run/halo/app/content/impl/PostServiceImplTest.java diff --git a/src/test/java/run/halo/app/content/permalinks/CategoryPermalinkPolicyTest.java b/application/src/test/java/run/halo/app/content/permalinks/CategoryPermalinkPolicyTest.java similarity index 100% rename from src/test/java/run/halo/app/content/permalinks/CategoryPermalinkPolicyTest.java rename to application/src/test/java/run/halo/app/content/permalinks/CategoryPermalinkPolicyTest.java diff --git a/src/test/java/run/halo/app/content/permalinks/PostPermalinkPolicyTest.java b/application/src/test/java/run/halo/app/content/permalinks/PostPermalinkPolicyTest.java similarity index 95% rename from src/test/java/run/halo/app/content/permalinks/PostPermalinkPolicyTest.java rename to application/src/test/java/run/halo/app/content/permalinks/PostPermalinkPolicyTest.java index d3ca4cef9..f1655c695 100644 --- a/src/test/java/run/halo/app/content/permalinks/PostPermalinkPolicyTest.java +++ b/application/src/test/java/run/halo/app/content/permalinks/PostPermalinkPolicyTest.java @@ -20,7 +20,7 @@ import org.springframework.context.ApplicationContext; import run.halo.app.content.TestPost; import run.halo.app.core.extension.content.Constant; import run.halo.app.core.extension.content.Post; -import run.halo.app.extension.ExtensionUtil; +import run.halo.app.extension.MetadataUtil; import run.halo.app.infra.ExternalUrlSupplier; import run.halo.app.infra.SystemConfigurableEnvironmentFetcher; import run.halo.app.infra.utils.PathUtils; @@ -55,7 +55,7 @@ class PostPermalinkPolicyTest { @Test void permalink() { Post post = TestPost.postV1(); - Map annotations = ExtensionUtil.nullSafeAnnotations(post); + Map annotations = MetadataUtil.nullSafeAnnotations(post); annotations.put(Constant.PERMALINK_PATTERN_ANNO, "/{year}/{month}/{day}/{slug}"); post.getMetadata().setName("test-post"); post.getSpec().setSlug("test-post-slug"); @@ -96,7 +96,7 @@ class PostPermalinkPolicyTest { @Test void permalinkWithExternalUrl() { Post post = TestPost.postV1(); - Map annotations = ExtensionUtil.nullSafeAnnotations(post); + Map annotations = MetadataUtil.nullSafeAnnotations(post); annotations.put(Constant.PERMALINK_PATTERN_ANNO, "/{year}/{month}/{day}/{slug}"); post.getMetadata().setName("test-post"); post.getSpec().setSlug("test-post-slug"); diff --git a/src/test/java/run/halo/app/content/permalinks/TagPermalinkPolicyTest.java b/application/src/test/java/run/halo/app/content/permalinks/TagPermalinkPolicyTest.java similarity index 100% rename from src/test/java/run/halo/app/content/permalinks/TagPermalinkPolicyTest.java rename to application/src/test/java/run/halo/app/content/permalinks/TagPermalinkPolicyTest.java diff --git a/src/test/java/run/halo/app/core/extension/PostTest.java b/application/src/test/java/run/halo/app/core/extension/PostTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/PostTest.java rename to application/src/test/java/run/halo/app/core/extension/PostTest.java diff --git a/src/test/java/run/halo/app/core/extension/RoleBindingTest.java b/application/src/test/java/run/halo/app/core/extension/RoleBindingTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/RoleBindingTest.java rename to application/src/test/java/run/halo/app/core/extension/RoleBindingTest.java diff --git a/src/test/java/run/halo/app/core/extension/SettingTest.java b/application/src/test/java/run/halo/app/core/extension/SettingTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/SettingTest.java rename to application/src/test/java/run/halo/app/core/extension/SettingTest.java diff --git a/src/test/java/run/halo/app/core/extension/TestRole.java b/application/src/test/java/run/halo/app/core/extension/TestRole.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/TestRole.java rename to application/src/test/java/run/halo/app/core/extension/TestRole.java diff --git a/src/test/java/run/halo/app/core/extension/ThemeTest.java b/application/src/test/java/run/halo/app/core/extension/ThemeTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/ThemeTest.java rename to application/src/test/java/run/halo/app/core/extension/ThemeTest.java diff --git a/src/test/java/run/halo/app/core/extension/attachment/endpoint/AttachmentEndpointTest.java b/application/src/test/java/run/halo/app/core/extension/attachment/endpoint/AttachmentEndpointTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/attachment/endpoint/AttachmentEndpointTest.java rename to application/src/test/java/run/halo/app/core/extension/attachment/endpoint/AttachmentEndpointTest.java diff --git a/src/test/java/run/halo/app/core/extension/endpoint/PluginEndpointTest.java b/application/src/test/java/run/halo/app/core/extension/endpoint/PluginEndpointTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/endpoint/PluginEndpointTest.java rename to application/src/test/java/run/halo/app/core/extension/endpoint/PluginEndpointTest.java diff --git a/src/test/java/run/halo/app/core/extension/endpoint/PostEndpointTest.java b/application/src/test/java/run/halo/app/core/extension/endpoint/PostEndpointTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/endpoint/PostEndpointTest.java rename to application/src/test/java/run/halo/app/core/extension/endpoint/PostEndpointTest.java diff --git a/src/test/java/run/halo/app/core/extension/endpoint/SinglePageEndpointTest.java b/application/src/test/java/run/halo/app/core/extension/endpoint/SinglePageEndpointTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/endpoint/SinglePageEndpointTest.java rename to application/src/test/java/run/halo/app/core/extension/endpoint/SinglePageEndpointTest.java diff --git a/src/test/java/run/halo/app/core/extension/endpoint/UserEndpointTest.java b/application/src/test/java/run/halo/app/core/extension/endpoint/UserEndpointTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/endpoint/UserEndpointTest.java rename to application/src/test/java/run/halo/app/core/extension/endpoint/UserEndpointTest.java diff --git a/src/test/java/run/halo/app/core/extension/reconciler/CategoryReconcilerTest.java b/application/src/test/java/run/halo/app/core/extension/reconciler/CategoryReconcilerTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/reconciler/CategoryReconcilerTest.java rename to application/src/test/java/run/halo/app/core/extension/reconciler/CategoryReconcilerTest.java diff --git a/src/test/java/run/halo/app/core/extension/reconciler/CommentReconcilerTest.java b/application/src/test/java/run/halo/app/core/extension/reconciler/CommentReconcilerTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/reconciler/CommentReconcilerTest.java rename to application/src/test/java/run/halo/app/core/extension/reconciler/CommentReconcilerTest.java diff --git a/src/test/java/run/halo/app/core/extension/reconciler/MenuItemReconcilerTest.java b/application/src/test/java/run/halo/app/core/extension/reconciler/MenuItemReconcilerTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/reconciler/MenuItemReconcilerTest.java rename to application/src/test/java/run/halo/app/core/extension/reconciler/MenuItemReconcilerTest.java diff --git a/src/test/java/run/halo/app/core/extension/reconciler/PluginReconcilerTest.java b/application/src/test/java/run/halo/app/core/extension/reconciler/PluginReconcilerTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/reconciler/PluginReconcilerTest.java rename to application/src/test/java/run/halo/app/core/extension/reconciler/PluginReconcilerTest.java diff --git a/src/test/java/run/halo/app/core/extension/reconciler/PostReconcilerTest.java b/application/src/test/java/run/halo/app/core/extension/reconciler/PostReconcilerTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/reconciler/PostReconcilerTest.java rename to application/src/test/java/run/halo/app/core/extension/reconciler/PostReconcilerTest.java diff --git a/src/test/java/run/halo/app/core/extension/reconciler/ReverseProxyReconcilerTest.java b/application/src/test/java/run/halo/app/core/extension/reconciler/ReverseProxyReconcilerTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/reconciler/ReverseProxyReconcilerTest.java rename to application/src/test/java/run/halo/app/core/extension/reconciler/ReverseProxyReconcilerTest.java diff --git a/src/test/java/run/halo/app/core/extension/reconciler/RoleBindingReconcilerTest.java b/application/src/test/java/run/halo/app/core/extension/reconciler/RoleBindingReconcilerTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/reconciler/RoleBindingReconcilerTest.java rename to application/src/test/java/run/halo/app/core/extension/reconciler/RoleBindingReconcilerTest.java diff --git a/src/test/java/run/halo/app/core/extension/reconciler/SinglePageReconcilerTest.java b/application/src/test/java/run/halo/app/core/extension/reconciler/SinglePageReconcilerTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/reconciler/SinglePageReconcilerTest.java rename to application/src/test/java/run/halo/app/core/extension/reconciler/SinglePageReconcilerTest.java diff --git a/src/test/java/run/halo/app/core/extension/reconciler/SystemSettingReconcilerTest.java b/application/src/test/java/run/halo/app/core/extension/reconciler/SystemSettingReconcilerTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/reconciler/SystemSettingReconcilerTest.java rename to application/src/test/java/run/halo/app/core/extension/reconciler/SystemSettingReconcilerTest.java diff --git a/src/test/java/run/halo/app/core/extension/reconciler/TagReconcilerTest.java b/application/src/test/java/run/halo/app/core/extension/reconciler/TagReconcilerTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/reconciler/TagReconcilerTest.java rename to application/src/test/java/run/halo/app/core/extension/reconciler/TagReconcilerTest.java diff --git a/src/test/java/run/halo/app/core/extension/reconciler/ThemeReconcilerTest.java b/application/src/test/java/run/halo/app/core/extension/reconciler/ThemeReconcilerTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/reconciler/ThemeReconcilerTest.java rename to application/src/test/java/run/halo/app/core/extension/reconciler/ThemeReconcilerTest.java diff --git a/src/test/java/run/halo/app/core/extension/reconciler/UserReconcilerTest.java b/application/src/test/java/run/halo/app/core/extension/reconciler/UserReconcilerTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/reconciler/UserReconcilerTest.java rename to application/src/test/java/run/halo/app/core/extension/reconciler/UserReconcilerTest.java diff --git a/src/test/java/run/halo/app/core/extension/service/DefaultRoleServiceTest.java b/application/src/test/java/run/halo/app/core/extension/service/DefaultRoleServiceTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/service/DefaultRoleServiceTest.java rename to application/src/test/java/run/halo/app/core/extension/service/DefaultRoleServiceTest.java diff --git a/src/test/java/run/halo/app/core/extension/service/UserServiceImplTest.java b/application/src/test/java/run/halo/app/core/extension/service/UserServiceImplTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/service/UserServiceImplTest.java rename to application/src/test/java/run/halo/app/core/extension/service/UserServiceImplTest.java diff --git a/src/test/java/run/halo/app/core/extension/service/impl/PluginServiceImplTest.java b/application/src/test/java/run/halo/app/core/extension/service/impl/PluginServiceImplTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/service/impl/PluginServiceImplTest.java rename to application/src/test/java/run/halo/app/core/extension/service/impl/PluginServiceImplTest.java diff --git a/src/test/java/run/halo/app/core/extension/theme/SettingUtilsTest.java b/application/src/test/java/run/halo/app/core/extension/theme/SettingUtilsTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/theme/SettingUtilsTest.java rename to application/src/test/java/run/halo/app/core/extension/theme/SettingUtilsTest.java diff --git a/src/test/java/run/halo/app/core/extension/theme/ThemeEndpointTest.java b/application/src/test/java/run/halo/app/core/extension/theme/ThemeEndpointTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/theme/ThemeEndpointTest.java rename to application/src/test/java/run/halo/app/core/extension/theme/ThemeEndpointTest.java diff --git a/src/test/java/run/halo/app/core/extension/theme/ThemeServiceImplTest.java b/application/src/test/java/run/halo/app/core/extension/theme/ThemeServiceImplTest.java similarity index 100% rename from src/test/java/run/halo/app/core/extension/theme/ThemeServiceImplTest.java rename to application/src/test/java/run/halo/app/core/extension/theme/ThemeServiceImplTest.java diff --git a/src/test/java/run/halo/app/extension/AbstractExtensionTest.java b/application/src/test/java/run/halo/app/extension/AbstractExtensionTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/AbstractExtensionTest.java rename to application/src/test/java/run/halo/app/extension/AbstractExtensionTest.java diff --git a/src/test/java/run/halo/app/extension/ComparatorsTest.java b/application/src/test/java/run/halo/app/extension/ComparatorsTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/ComparatorsTest.java rename to application/src/test/java/run/halo/app/extension/ComparatorsTest.java diff --git a/src/test/java/run/halo/app/extension/ConfigMapTest.java b/application/src/test/java/run/halo/app/extension/ConfigMapTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/ConfigMapTest.java rename to application/src/test/java/run/halo/app/extension/ConfigMapTest.java diff --git a/src/test/java/run/halo/app/extension/DefaultSchemeManagerTest.java b/application/src/test/java/run/halo/app/extension/DefaultSchemeManagerTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/DefaultSchemeManagerTest.java rename to application/src/test/java/run/halo/app/extension/DefaultSchemeManagerTest.java diff --git a/src/test/java/run/halo/app/extension/DefaultSchemeWatcherManagerTest.java b/application/src/test/java/run/halo/app/extension/DefaultSchemeWatcherManagerTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/DefaultSchemeWatcherManagerTest.java rename to application/src/test/java/run/halo/app/extension/DefaultSchemeWatcherManagerTest.java diff --git a/src/test/java/run/halo/app/extension/ExtensionOperatorTest.java b/application/src/test/java/run/halo/app/extension/ExtensionOperatorTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/ExtensionOperatorTest.java rename to application/src/test/java/run/halo/app/extension/ExtensionOperatorTest.java diff --git a/src/test/java/run/halo/app/extension/ExtensionUtilTest.java b/application/src/test/java/run/halo/app/extension/ExtensionUtilTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/ExtensionUtilTest.java rename to application/src/test/java/run/halo/app/extension/ExtensionUtilTest.java diff --git a/application/src/test/java/run/halo/app/extension/FakeExtension.java b/application/src/test/java/run/halo/app/extension/FakeExtension.java new file mode 100644 index 000000000..d0e5cb03b --- /dev/null +++ b/application/src/test/java/run/halo/app/extension/FakeExtension.java @@ -0,0 +1,18 @@ +package run.halo.app.extension; + +@GVK(group = "fake.halo.run", + version = "v1alpha1", + kind = "Fake", + plural = "fakes", + singular = "fake") +public class FakeExtension extends AbstractExtension { + + public static FakeExtension createFake(String name) { + var metadata = new Metadata(); + metadata.setName(name); + var fake = new FakeExtension(); + fake.setMetadata(metadata); + return fake; + } + +} diff --git a/src/test/java/run/halo/app/extension/GroupVersionKindTest.java b/application/src/test/java/run/halo/app/extension/GroupVersionKindTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/GroupVersionKindTest.java rename to application/src/test/java/run/halo/app/extension/GroupVersionKindTest.java diff --git a/src/test/java/run/halo/app/extension/GroupVersionTest.java b/application/src/test/java/run/halo/app/extension/GroupVersionTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/GroupVersionTest.java rename to application/src/test/java/run/halo/app/extension/GroupVersionTest.java diff --git a/src/test/java/run/halo/app/extension/JsonExtensionConverterTest.java b/application/src/test/java/run/halo/app/extension/JsonExtensionConverterTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/JsonExtensionConverterTest.java rename to application/src/test/java/run/halo/app/extension/JsonExtensionConverterTest.java diff --git a/src/test/java/run/halo/app/extension/JsonExtensionTest.java b/application/src/test/java/run/halo/app/extension/JsonExtensionTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/JsonExtensionTest.java rename to application/src/test/java/run/halo/app/extension/JsonExtensionTest.java diff --git a/src/test/java/run/halo/app/extension/ListResultTest.java b/application/src/test/java/run/halo/app/extension/ListResultTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/ListResultTest.java rename to application/src/test/java/run/halo/app/extension/ListResultTest.java diff --git a/src/test/java/run/halo/app/extension/MetadataOperatorTest.java b/application/src/test/java/run/halo/app/extension/MetadataOperatorTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/MetadataOperatorTest.java rename to application/src/test/java/run/halo/app/extension/MetadataOperatorTest.java diff --git a/src/test/java/run/halo/app/extension/ReactiveExtensionClientTest.java b/application/src/test/java/run/halo/app/extension/ReactiveExtensionClientTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/ReactiveExtensionClientTest.java rename to application/src/test/java/run/halo/app/extension/ReactiveExtensionClientTest.java diff --git a/src/test/java/run/halo/app/extension/RefTest.java b/application/src/test/java/run/halo/app/extension/RefTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/RefTest.java rename to application/src/test/java/run/halo/app/extension/RefTest.java diff --git a/src/test/java/run/halo/app/extension/SchemeTest.java b/application/src/test/java/run/halo/app/extension/SchemeTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/SchemeTest.java rename to application/src/test/java/run/halo/app/extension/SchemeTest.java diff --git a/src/test/java/run/halo/app/extension/UnstructuredTest.java b/application/src/test/java/run/halo/app/extension/UnstructuredTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/UnstructuredTest.java rename to application/src/test/java/run/halo/app/extension/UnstructuredTest.java diff --git a/src/test/java/run/halo/app/extension/gc/GcReconcilerTest.java b/application/src/test/java/run/halo/app/extension/gc/GcReconcilerTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/gc/GcReconcilerTest.java rename to application/src/test/java/run/halo/app/extension/gc/GcReconcilerTest.java diff --git a/src/test/java/run/halo/app/extension/gc/GcWatcherTest.java b/application/src/test/java/run/halo/app/extension/gc/GcWatcherTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/gc/GcWatcherTest.java rename to application/src/test/java/run/halo/app/extension/gc/GcWatcherTest.java diff --git a/src/test/java/run/halo/app/extension/router/ExtensionCompositeRouterFunctionTest.java b/application/src/test/java/run/halo/app/extension/router/ExtensionCompositeRouterFunctionTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/router/ExtensionCompositeRouterFunctionTest.java rename to application/src/test/java/run/halo/app/extension/router/ExtensionCompositeRouterFunctionTest.java diff --git a/src/test/java/run/halo/app/extension/router/ExtensionCreateHandlerTest.java b/application/src/test/java/run/halo/app/extension/router/ExtensionCreateHandlerTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/router/ExtensionCreateHandlerTest.java rename to application/src/test/java/run/halo/app/extension/router/ExtensionCreateHandlerTest.java diff --git a/src/test/java/run/halo/app/extension/router/ExtensionDeleteHandlerTest.java b/application/src/test/java/run/halo/app/extension/router/ExtensionDeleteHandlerTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/router/ExtensionDeleteHandlerTest.java rename to application/src/test/java/run/halo/app/extension/router/ExtensionDeleteHandlerTest.java diff --git a/src/test/java/run/halo/app/extension/router/ExtensionGetHandlerTest.java b/application/src/test/java/run/halo/app/extension/router/ExtensionGetHandlerTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/router/ExtensionGetHandlerTest.java rename to application/src/test/java/run/halo/app/extension/router/ExtensionGetHandlerTest.java diff --git a/src/test/java/run/halo/app/extension/router/ExtensionListHandlerTest.java b/application/src/test/java/run/halo/app/extension/router/ExtensionListHandlerTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/router/ExtensionListHandlerTest.java rename to application/src/test/java/run/halo/app/extension/router/ExtensionListHandlerTest.java diff --git a/src/test/java/run/halo/app/extension/router/ExtensionRouterFunctionFactoryTest.java b/application/src/test/java/run/halo/app/extension/router/ExtensionRouterFunctionFactoryTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/router/ExtensionRouterFunctionFactoryTest.java rename to application/src/test/java/run/halo/app/extension/router/ExtensionRouterFunctionFactoryTest.java diff --git a/src/test/java/run/halo/app/extension/router/ExtensionUpdateHandlerTest.java b/application/src/test/java/run/halo/app/extension/router/ExtensionUpdateHandlerTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/router/ExtensionUpdateHandlerTest.java rename to application/src/test/java/run/halo/app/extension/router/ExtensionUpdateHandlerTest.java diff --git a/src/test/java/run/halo/app/extension/router/PathPatternGeneratorTest.java b/application/src/test/java/run/halo/app/extension/router/PathPatternGeneratorTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/router/PathPatternGeneratorTest.java rename to application/src/test/java/run/halo/app/extension/router/PathPatternGeneratorTest.java diff --git a/src/test/java/run/halo/app/extension/router/selector/FieldCriteriaPredicateConverterTest.java b/application/src/test/java/run/halo/app/extension/router/selector/FieldCriteriaPredicateConverterTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/router/selector/FieldCriteriaPredicateConverterTest.java rename to application/src/test/java/run/halo/app/extension/router/selector/FieldCriteriaPredicateConverterTest.java diff --git a/src/test/java/run/halo/app/extension/router/selector/LabelCriteriaPredicateConverterTest.java b/application/src/test/java/run/halo/app/extension/router/selector/LabelCriteriaPredicateConverterTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/router/selector/LabelCriteriaPredicateConverterTest.java rename to application/src/test/java/run/halo/app/extension/router/selector/LabelCriteriaPredicateConverterTest.java diff --git a/src/test/java/run/halo/app/extension/router/selector/OperatorTest.java b/application/src/test/java/run/halo/app/extension/router/selector/OperatorTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/router/selector/OperatorTest.java rename to application/src/test/java/run/halo/app/extension/router/selector/OperatorTest.java diff --git a/src/test/java/run/halo/app/extension/router/selector/SelectorConverterTest.java b/application/src/test/java/run/halo/app/extension/router/selector/SelectorConverterTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/router/selector/SelectorConverterTest.java rename to application/src/test/java/run/halo/app/extension/router/selector/SelectorConverterTest.java diff --git a/src/test/java/run/halo/app/extension/router/selector/SelectorUtilTest.java b/application/src/test/java/run/halo/app/extension/router/selector/SelectorUtilTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/router/selector/SelectorUtilTest.java rename to application/src/test/java/run/halo/app/extension/router/selector/SelectorUtilTest.java diff --git a/src/test/java/run/halo/app/extension/store/ExtensionStoreClientJPAImplTest.java b/application/src/test/java/run/halo/app/extension/store/ExtensionStoreClientJPAImplTest.java similarity index 100% rename from src/test/java/run/halo/app/extension/store/ExtensionStoreClientJPAImplTest.java rename to application/src/test/java/run/halo/app/extension/store/ExtensionStoreClientJPAImplTest.java diff --git a/src/test/java/run/halo/app/infra/ConditionListTest.java b/application/src/test/java/run/halo/app/infra/ConditionListTest.java similarity index 100% rename from src/test/java/run/halo/app/infra/ConditionListTest.java rename to application/src/test/java/run/halo/app/infra/ConditionListTest.java diff --git a/src/test/java/run/halo/app/infra/DefaultSystemVersionSupplierTest.java b/application/src/test/java/run/halo/app/infra/DefaultSystemVersionSupplierTest.java similarity index 100% rename from src/test/java/run/halo/app/infra/DefaultSystemVersionSupplierTest.java rename to application/src/test/java/run/halo/app/infra/DefaultSystemVersionSupplierTest.java diff --git a/src/test/java/run/halo/app/infra/ExtensionResourceInitializerTest.java b/application/src/test/java/run/halo/app/infra/ExtensionResourceInitializerTest.java similarity index 100% rename from src/test/java/run/halo/app/infra/ExtensionResourceInitializerTest.java rename to application/src/test/java/run/halo/app/infra/ExtensionResourceInitializerTest.java diff --git a/src/test/java/run/halo/app/infra/HaloPropertiesExternalUrlSupplierTest.java b/application/src/test/java/run/halo/app/infra/HaloPropertiesExternalUrlSupplierTest.java similarity index 100% rename from src/test/java/run/halo/app/infra/HaloPropertiesExternalUrlSupplierTest.java rename to application/src/test/java/run/halo/app/infra/HaloPropertiesExternalUrlSupplierTest.java diff --git a/src/test/java/run/halo/app/infra/SystemConfigurableEnvironmentFetcherTest.java b/application/src/test/java/run/halo/app/infra/SystemConfigurableEnvironmentFetcherTest.java similarity index 100% rename from src/test/java/run/halo/app/infra/SystemConfigurableEnvironmentFetcherTest.java rename to application/src/test/java/run/halo/app/infra/SystemConfigurableEnvironmentFetcherTest.java diff --git a/src/test/java/run/halo/app/infra/SystemSettingTest.java b/application/src/test/java/run/halo/app/infra/SystemSettingTest.java similarity index 100% rename from src/test/java/run/halo/app/infra/SystemSettingTest.java rename to application/src/test/java/run/halo/app/infra/SystemSettingTest.java diff --git a/src/test/java/run/halo/app/infra/exception/handlers/I18nExceptionTest.java b/application/src/test/java/run/halo/app/infra/exception/handlers/I18nExceptionTest.java similarity index 100% rename from src/test/java/run/halo/app/infra/exception/handlers/I18nExceptionTest.java rename to application/src/test/java/run/halo/app/infra/exception/handlers/I18nExceptionTest.java diff --git a/src/test/java/run/halo/app/infra/utils/Base62UtilsTest.java b/application/src/test/java/run/halo/app/infra/utils/Base62UtilsTest.java similarity index 100% rename from src/test/java/run/halo/app/infra/utils/Base62UtilsTest.java rename to application/src/test/java/run/halo/app/infra/utils/Base62UtilsTest.java diff --git a/src/test/java/run/halo/app/infra/utils/FileNameUtilsTest.java b/application/src/test/java/run/halo/app/infra/utils/FileNameUtilsTest.java similarity index 100% rename from src/test/java/run/halo/app/infra/utils/FileNameUtilsTest.java rename to application/src/test/java/run/halo/app/infra/utils/FileNameUtilsTest.java diff --git a/src/test/java/run/halo/app/infra/utils/FileUtilsTest.java b/application/src/test/java/run/halo/app/infra/utils/FileUtilsTest.java similarity index 100% rename from src/test/java/run/halo/app/infra/utils/FileUtilsTest.java rename to application/src/test/java/run/halo/app/infra/utils/FileUtilsTest.java diff --git a/src/test/java/run/halo/app/infra/utils/VersionUtilsTest.java b/application/src/test/java/run/halo/app/infra/utils/VersionUtilsTest.java similarity index 100% rename from src/test/java/run/halo/app/infra/utils/VersionUtilsTest.java rename to application/src/test/java/run/halo/app/infra/utils/VersionUtilsTest.java diff --git a/src/test/java/run/halo/app/infra/utils/YamlUnstructuredLoaderTest.java b/application/src/test/java/run/halo/app/infra/utils/YamlUnstructuredLoaderTest.java similarity index 100% rename from src/test/java/run/halo/app/infra/utils/YamlUnstructuredLoaderTest.java rename to application/src/test/java/run/halo/app/infra/utils/YamlUnstructuredLoaderTest.java diff --git a/src/test/java/run/halo/app/metrics/MeterUtilsTest.java b/application/src/test/java/run/halo/app/metrics/MeterUtilsTest.java similarity index 100% rename from src/test/java/run/halo/app/metrics/MeterUtilsTest.java rename to application/src/test/java/run/halo/app/metrics/MeterUtilsTest.java diff --git a/src/test/java/run/halo/app/metrics/VisitLogWriterTest.java b/application/src/test/java/run/halo/app/metrics/VisitLogWriterTest.java similarity index 100% rename from src/test/java/run/halo/app/metrics/VisitLogWriterTest.java rename to application/src/test/java/run/halo/app/metrics/VisitLogWriterTest.java diff --git a/src/test/java/run/halo/app/plugin/SettingFetcherTest.java b/application/src/test/java/run/halo/app/plugin/DefaultSettingFetcherTest.java similarity index 95% rename from src/test/java/run/halo/app/plugin/SettingFetcherTest.java rename to application/src/test/java/run/halo/app/plugin/DefaultSettingFetcherTest.java index b50f1fed3..52ec91c26 100644 --- a/src/test/java/run/halo/app/plugin/SettingFetcherTest.java +++ b/application/src/test/java/run/halo/app/plugin/DefaultSettingFetcherTest.java @@ -25,22 +25,22 @@ import run.halo.app.extension.Metadata; import run.halo.app.infra.utils.JsonUtils; /** - * Tests for {@link SettingFetcher}. + * Tests for {@link DefaultSettingFetcher}. * * @author guqing * @since 2.0.0 */ @ExtendWith(MockitoExtension.class) -class SettingFetcherTest { +class DefaultSettingFetcherTest { @Mock private ExtensionClient extensionClient; - private SettingFetcher settingFetcher; + private DefaultSettingFetcher settingFetcher; @BeforeEach void setUp() { - settingFetcher = new SettingFetcher("fake", extensionClient); + settingFetcher = new DefaultSettingFetcher("fake", extensionClient); // do not call extensionClient when the settingFetcher first time created verify(extensionClient, times(0)).fetch(eq(ConfigMap.class), any()); verify(extensionClient, times(0)).fetch(eq(Plugin.class), any()); diff --git a/src/test/java/run/halo/app/plugin/PluginCompositeRouterFunctionTest.java b/application/src/test/java/run/halo/app/plugin/PluginCompositeRouterFunctionTest.java similarity index 100% rename from src/test/java/run/halo/app/plugin/PluginCompositeRouterFunctionTest.java rename to application/src/test/java/run/halo/app/plugin/PluginCompositeRouterFunctionTest.java diff --git a/src/test/java/run/halo/app/plugin/PluginRequestMappingHandlerMappingTest.java b/application/src/test/java/run/halo/app/plugin/PluginRequestMappingHandlerMappingTest.java similarity index 100% rename from src/test/java/run/halo/app/plugin/PluginRequestMappingHandlerMappingTest.java rename to application/src/test/java/run/halo/app/plugin/PluginRequestMappingHandlerMappingTest.java diff --git a/src/test/java/run/halo/app/plugin/PluginStartedListenerTest.java b/application/src/test/java/run/halo/app/plugin/PluginStartedListenerTest.java similarity index 100% rename from src/test/java/run/halo/app/plugin/PluginStartedListenerTest.java rename to application/src/test/java/run/halo/app/plugin/PluginStartedListenerTest.java diff --git a/src/test/java/run/halo/app/plugin/SharedApplicationContextHolderTest.java b/application/src/test/java/run/halo/app/plugin/SharedApplicationContextHolderTest.java similarity index 100% rename from src/test/java/run/halo/app/plugin/SharedApplicationContextHolderTest.java rename to application/src/test/java/run/halo/app/plugin/SharedApplicationContextHolderTest.java diff --git a/src/test/java/run/halo/app/plugin/SpringComponentsFinderTest.java b/application/src/test/java/run/halo/app/plugin/SpringComponentsFinderTest.java similarity index 100% rename from src/test/java/run/halo/app/plugin/SpringComponentsFinderTest.java rename to application/src/test/java/run/halo/app/plugin/SpringComponentsFinderTest.java diff --git a/src/test/java/run/halo/app/plugin/YamlPluginDescriptorFinderTest.java b/application/src/test/java/run/halo/app/plugin/YamlPluginDescriptorFinderTest.java similarity index 100% rename from src/test/java/run/halo/app/plugin/YamlPluginDescriptorFinderTest.java rename to application/src/test/java/run/halo/app/plugin/YamlPluginDescriptorFinderTest.java diff --git a/src/test/java/run/halo/app/plugin/YamlPluginFinderTest.java b/application/src/test/java/run/halo/app/plugin/YamlPluginFinderTest.java similarity index 100% rename from src/test/java/run/halo/app/plugin/YamlPluginFinderTest.java rename to application/src/test/java/run/halo/app/plugin/YamlPluginFinderTest.java diff --git a/src/test/java/run/halo/app/plugin/resources/BundleResourceUtilsTest.java b/application/src/test/java/run/halo/app/plugin/resources/BundleResourceUtilsTest.java similarity index 100% rename from src/test/java/run/halo/app/plugin/resources/BundleResourceUtilsTest.java rename to application/src/test/java/run/halo/app/plugin/resources/BundleResourceUtilsTest.java diff --git a/src/test/java/run/halo/app/plugin/resources/ReverseProxyRouterFunctionFactoryTest.java b/application/src/test/java/run/halo/app/plugin/resources/ReverseProxyRouterFunctionFactoryTest.java similarity index 100% rename from src/test/java/run/halo/app/plugin/resources/ReverseProxyRouterFunctionFactoryTest.java rename to application/src/test/java/run/halo/app/plugin/resources/ReverseProxyRouterFunctionFactoryTest.java diff --git a/src/test/java/run/halo/app/plugin/resources/ReverseProxyRouterFunctionRegistryTest.java b/application/src/test/java/run/halo/app/plugin/resources/ReverseProxyRouterFunctionRegistryTest.java similarity index 100% rename from src/test/java/run/halo/app/plugin/resources/ReverseProxyRouterFunctionRegistryTest.java rename to application/src/test/java/run/halo/app/plugin/resources/ReverseProxyRouterFunctionRegistryTest.java diff --git a/src/test/java/run/halo/app/security/AuthProviderServiceImplTest.java b/application/src/test/java/run/halo/app/security/AuthProviderServiceImplTest.java similarity index 100% rename from src/test/java/run/halo/app/security/AuthProviderServiceImplTest.java rename to application/src/test/java/run/halo/app/security/AuthProviderServiceImplTest.java diff --git a/src/test/java/run/halo/app/security/DefaultUserDetailServiceTest.java b/application/src/test/java/run/halo/app/security/DefaultUserDetailServiceTest.java similarity index 100% rename from src/test/java/run/halo/app/security/DefaultUserDetailServiceTest.java rename to application/src/test/java/run/halo/app/security/DefaultUserDetailServiceTest.java diff --git a/src/test/java/run/halo/app/security/LoginUtils.java b/application/src/test/java/run/halo/app/security/LoginUtils.java similarity index 100% rename from src/test/java/run/halo/app/security/LoginUtils.java rename to application/src/test/java/run/halo/app/security/LoginUtils.java diff --git a/src/test/java/run/halo/app/security/ResponseMap.java b/application/src/test/java/run/halo/app/security/ResponseMap.java similarity index 100% rename from src/test/java/run/halo/app/security/ResponseMap.java rename to application/src/test/java/run/halo/app/security/ResponseMap.java diff --git a/src/test/java/run/halo/app/security/SuperAdminInitializerTest.java b/application/src/test/java/run/halo/app/security/SuperAdminInitializerTest.java similarity index 100% rename from src/test/java/run/halo/app/security/SuperAdminInitializerTest.java rename to application/src/test/java/run/halo/app/security/SuperAdminInitializerTest.java diff --git a/src/test/java/run/halo/app/security/authentication/WebExchangeMatchersTest.java b/application/src/test/java/run/halo/app/security/authentication/WebExchangeMatchersTest.java similarity index 100% rename from src/test/java/run/halo/app/security/authentication/WebExchangeMatchersTest.java rename to application/src/test/java/run/halo/app/security/authentication/WebExchangeMatchersTest.java diff --git a/src/test/java/run/halo/app/security/authentication/jwt/JwtAuthenticationTest.java b/application/src/test/java/run/halo/app/security/authentication/jwt/JwtAuthenticationTest.java similarity index 100% rename from src/test/java/run/halo/app/security/authentication/jwt/JwtAuthenticationTest.java rename to application/src/test/java/run/halo/app/security/authentication/jwt/JwtAuthenticationTest.java diff --git a/src/test/java/run/halo/app/security/authentication/jwt/LoginTest.java b/application/src/test/java/run/halo/app/security/authentication/jwt/LoginTest.java similarity index 100% rename from src/test/java/run/halo/app/security/authentication/jwt/LoginTest.java rename to application/src/test/java/run/halo/app/security/authentication/jwt/LoginTest.java diff --git a/src/test/java/run/halo/app/security/authentication/login/LoginAuthenticationConverterTest.java b/application/src/test/java/run/halo/app/security/authentication/login/LoginAuthenticationConverterTest.java similarity index 100% rename from src/test/java/run/halo/app/security/authentication/login/LoginAuthenticationConverterTest.java rename to application/src/test/java/run/halo/app/security/authentication/login/LoginAuthenticationConverterTest.java diff --git a/src/test/java/run/halo/app/security/authentication/login/PublicKeyRouteBuilderTest.java b/application/src/test/java/run/halo/app/security/authentication/login/PublicKeyRouteBuilderTest.java similarity index 100% rename from src/test/java/run/halo/app/security/authentication/login/PublicKeyRouteBuilderTest.java rename to application/src/test/java/run/halo/app/security/authentication/login/PublicKeyRouteBuilderTest.java diff --git a/src/test/java/run/halo/app/security/authentication/login/impl/RsaKeyServiceTest.java b/application/src/test/java/run/halo/app/security/authentication/login/impl/RsaKeyServiceTest.java similarity index 100% rename from src/test/java/run/halo/app/security/authentication/login/impl/RsaKeyServiceTest.java rename to application/src/test/java/run/halo/app/security/authentication/login/impl/RsaKeyServiceTest.java diff --git a/src/test/java/run/halo/app/security/authorization/AuthorizationTest.java b/application/src/test/java/run/halo/app/security/authorization/AuthorizationTest.java similarity index 100% rename from src/test/java/run/halo/app/security/authorization/AuthorizationTest.java rename to application/src/test/java/run/halo/app/security/authorization/AuthorizationTest.java diff --git a/src/test/java/run/halo/app/security/authorization/DefaultRoleBindingServiceTest.java b/application/src/test/java/run/halo/app/security/authorization/DefaultRoleBindingServiceTest.java similarity index 100% rename from src/test/java/run/halo/app/security/authorization/DefaultRoleBindingServiceTest.java rename to application/src/test/java/run/halo/app/security/authorization/DefaultRoleBindingServiceTest.java diff --git a/src/test/java/run/halo/app/security/authorization/PolicyRuleTest.java b/application/src/test/java/run/halo/app/security/authorization/PolicyRuleTest.java similarity index 100% rename from src/test/java/run/halo/app/security/authorization/PolicyRuleTest.java rename to application/src/test/java/run/halo/app/security/authorization/PolicyRuleTest.java diff --git a/src/test/java/run/halo/app/security/authorization/RequestInfoResolverTest.java b/application/src/test/java/run/halo/app/security/authorization/RequestInfoResolverTest.java similarity index 100% rename from src/test/java/run/halo/app/security/authorization/RequestInfoResolverTest.java rename to application/src/test/java/run/halo/app/security/authorization/RequestInfoResolverTest.java diff --git a/src/test/java/run/halo/app/theme/ReactiveFinderExpressionParserTests.java b/application/src/test/java/run/halo/app/theme/ReactiveFinderExpressionParserTests.java similarity index 100% rename from src/test/java/run/halo/app/theme/ReactiveFinderExpressionParserTests.java rename to application/src/test/java/run/halo/app/theme/ReactiveFinderExpressionParserTests.java diff --git a/src/test/java/run/halo/app/theme/SiteSettingVariablesAcquirerTest.java b/application/src/test/java/run/halo/app/theme/SiteSettingVariablesAcquirerTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/SiteSettingVariablesAcquirerTest.java rename to application/src/test/java/run/halo/app/theme/SiteSettingVariablesAcquirerTest.java diff --git a/src/test/java/run/halo/app/theme/ThemeContextTest.java b/application/src/test/java/run/halo/app/theme/ThemeContextTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/ThemeContextTest.java rename to application/src/test/java/run/halo/app/theme/ThemeContextTest.java diff --git a/src/test/java/run/halo/app/theme/ThemeLinkBuilderTest.java b/application/src/test/java/run/halo/app/theme/ThemeLinkBuilderTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/ThemeLinkBuilderTest.java rename to application/src/test/java/run/halo/app/theme/ThemeLinkBuilderTest.java diff --git a/src/test/java/run/halo/app/theme/ThemeLocaleContextResolverTest.java b/application/src/test/java/run/halo/app/theme/ThemeLocaleContextResolverTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/ThemeLocaleContextResolverTest.java rename to application/src/test/java/run/halo/app/theme/ThemeLocaleContextResolverTest.java diff --git a/src/test/java/run/halo/app/theme/dialect/CommentElementTagProcessorTest.java b/application/src/test/java/run/halo/app/theme/dialect/CommentElementTagProcessorTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/dialect/CommentElementTagProcessorTest.java rename to application/src/test/java/run/halo/app/theme/dialect/CommentElementTagProcessorTest.java diff --git a/src/test/java/run/halo/app/theme/dialect/HaloProcessorDialectTest.java b/application/src/test/java/run/halo/app/theme/dialect/HaloProcessorDialectTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/dialect/HaloProcessorDialectTest.java rename to application/src/test/java/run/halo/app/theme/dialect/HaloProcessorDialectTest.java diff --git a/src/test/java/run/halo/app/theme/dialect/LinkExpressionObjectDialectTest.java b/application/src/test/java/run/halo/app/theme/dialect/LinkExpressionObjectDialectTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/dialect/LinkExpressionObjectDialectTest.java rename to application/src/test/java/run/halo/app/theme/dialect/LinkExpressionObjectDialectTest.java diff --git a/src/test/java/run/halo/app/theme/endpoint/CommentFinderEndpointTest.java b/application/src/test/java/run/halo/app/theme/endpoint/CommentFinderEndpointTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/endpoint/CommentFinderEndpointTest.java rename to application/src/test/java/run/halo/app/theme/endpoint/CommentFinderEndpointTest.java diff --git a/src/test/java/run/halo/app/theme/engine/DefaultThemeTemplateAvailabilityProviderTest.java b/application/src/test/java/run/halo/app/theme/engine/DefaultThemeTemplateAvailabilityProviderTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/engine/DefaultThemeTemplateAvailabilityProviderTest.java rename to application/src/test/java/run/halo/app/theme/engine/DefaultThemeTemplateAvailabilityProviderTest.java diff --git a/src/test/java/run/halo/app/theme/finders/FinderRegistryTest.java b/application/src/test/java/run/halo/app/theme/finders/FinderRegistryTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/finders/FinderRegistryTest.java rename to application/src/test/java/run/halo/app/theme/finders/FinderRegistryTest.java diff --git a/src/test/java/run/halo/app/theme/finders/impl/CategoryFinderImplTest.java b/application/src/test/java/run/halo/app/theme/finders/impl/CategoryFinderImplTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/finders/impl/CategoryFinderImplTest.java rename to application/src/test/java/run/halo/app/theme/finders/impl/CategoryFinderImplTest.java diff --git a/src/test/java/run/halo/app/theme/finders/impl/CommentFinderImplTest.java b/application/src/test/java/run/halo/app/theme/finders/impl/CommentFinderImplTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/finders/impl/CommentFinderImplTest.java rename to application/src/test/java/run/halo/app/theme/finders/impl/CommentFinderImplTest.java diff --git a/src/test/java/run/halo/app/theme/finders/impl/MenuFinderImplTest.java b/application/src/test/java/run/halo/app/theme/finders/impl/MenuFinderImplTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/finders/impl/MenuFinderImplTest.java rename to application/src/test/java/run/halo/app/theme/finders/impl/MenuFinderImplTest.java diff --git a/src/test/java/run/halo/app/theme/finders/impl/PluginFinderImplTest.java b/application/src/test/java/run/halo/app/theme/finders/impl/PluginFinderImplTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/finders/impl/PluginFinderImplTest.java rename to application/src/test/java/run/halo/app/theme/finders/impl/PluginFinderImplTest.java diff --git a/src/test/java/run/halo/app/theme/finders/impl/PostFinderImplTest.java b/application/src/test/java/run/halo/app/theme/finders/impl/PostFinderImplTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/finders/impl/PostFinderImplTest.java rename to application/src/test/java/run/halo/app/theme/finders/impl/PostFinderImplTest.java diff --git a/src/test/java/run/halo/app/theme/finders/impl/SinglePageFinderImplTest.java b/application/src/test/java/run/halo/app/theme/finders/impl/SinglePageFinderImplTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/finders/impl/SinglePageFinderImplTest.java rename to application/src/test/java/run/halo/app/theme/finders/impl/SinglePageFinderImplTest.java diff --git a/src/test/java/run/halo/app/theme/finders/impl/TagFinderImplTest.java b/application/src/test/java/run/halo/app/theme/finders/impl/TagFinderImplTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/finders/impl/TagFinderImplTest.java rename to application/src/test/java/run/halo/app/theme/finders/impl/TagFinderImplTest.java diff --git a/src/test/java/run/halo/app/theme/finders/vo/UserVoTest.java b/application/src/test/java/run/halo/app/theme/finders/vo/UserVoTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/finders/vo/UserVoTest.java rename to application/src/test/java/run/halo/app/theme/finders/vo/UserVoTest.java diff --git a/src/test/java/run/halo/app/theme/message/ThemeMessageResolutionUtilsTest.java b/application/src/test/java/run/halo/app/theme/message/ThemeMessageResolutionUtilsTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/message/ThemeMessageResolutionUtilsTest.java rename to application/src/test/java/run/halo/app/theme/message/ThemeMessageResolutionUtilsTest.java diff --git a/src/test/java/run/halo/app/theme/message/ThemeMessageResolverIntegrationTest.java b/application/src/test/java/run/halo/app/theme/message/ThemeMessageResolverIntegrationTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/message/ThemeMessageResolverIntegrationTest.java rename to application/src/test/java/run/halo/app/theme/message/ThemeMessageResolverIntegrationTest.java diff --git a/src/test/java/run/halo/app/theme/router/EmptyView.java b/application/src/test/java/run/halo/app/theme/router/EmptyView.java similarity index 100% rename from src/test/java/run/halo/app/theme/router/EmptyView.java rename to application/src/test/java/run/halo/app/theme/router/EmptyView.java diff --git a/src/test/java/run/halo/app/theme/router/PageUrlUtilsTest.java b/application/src/test/java/run/halo/app/theme/router/PageUrlUtilsTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/router/PageUrlUtilsTest.java rename to application/src/test/java/run/halo/app/theme/router/PageUrlUtilsTest.java diff --git a/src/test/java/run/halo/app/theme/router/SinglePageRouteTest.java b/application/src/test/java/run/halo/app/theme/router/SinglePageRouteTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/router/SinglePageRouteTest.java rename to application/src/test/java/run/halo/app/theme/router/SinglePageRouteTest.java diff --git a/src/test/java/run/halo/app/theme/router/ViewNameResolverTest.java b/application/src/test/java/run/halo/app/theme/router/ViewNameResolverTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/router/ViewNameResolverTest.java rename to application/src/test/java/run/halo/app/theme/router/ViewNameResolverTest.java diff --git a/src/test/java/run/halo/app/theme/router/factories/ArchiveRouteFactoryTest.java b/application/src/test/java/run/halo/app/theme/router/factories/ArchiveRouteFactoryTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/router/factories/ArchiveRouteFactoryTest.java rename to application/src/test/java/run/halo/app/theme/router/factories/ArchiveRouteFactoryTest.java diff --git a/src/test/java/run/halo/app/theme/router/factories/AuthorPostsRouteFactoryTest.java b/application/src/test/java/run/halo/app/theme/router/factories/AuthorPostsRouteFactoryTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/router/factories/AuthorPostsRouteFactoryTest.java rename to application/src/test/java/run/halo/app/theme/router/factories/AuthorPostsRouteFactoryTest.java diff --git a/src/test/java/run/halo/app/theme/router/factories/CategoriesRouteFactoryTest.java b/application/src/test/java/run/halo/app/theme/router/factories/CategoriesRouteFactoryTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/router/factories/CategoriesRouteFactoryTest.java rename to application/src/test/java/run/halo/app/theme/router/factories/CategoriesRouteFactoryTest.java diff --git a/src/test/java/run/halo/app/theme/router/factories/IndexRouteFactoryTest.java b/application/src/test/java/run/halo/app/theme/router/factories/IndexRouteFactoryTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/router/factories/IndexRouteFactoryTest.java rename to application/src/test/java/run/halo/app/theme/router/factories/IndexRouteFactoryTest.java diff --git a/src/test/java/run/halo/app/theme/router/factories/PostRouteFactoryTest.java b/application/src/test/java/run/halo/app/theme/router/factories/PostRouteFactoryTest.java similarity index 96% rename from src/test/java/run/halo/app/theme/router/factories/PostRouteFactoryTest.java rename to application/src/test/java/run/halo/app/theme/router/factories/PostRouteFactoryTest.java index 2f31d6239..ebd9974d8 100644 --- a/src/test/java/run/halo/app/theme/router/factories/PostRouteFactoryTest.java +++ b/application/src/test/java/run/halo/app/theme/router/factories/PostRouteFactoryTest.java @@ -19,8 +19,8 @@ import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; import run.halo.app.content.TestPost; import run.halo.app.core.extension.content.Post; -import run.halo.app.extension.ExtensionUtil; import run.halo.app.extension.GroupVersionKind; +import run.halo.app.extension.MetadataUtil; import run.halo.app.extension.ReactiveExtensionClient; import run.halo.app.theme.DefaultTemplateEnum; import run.halo.app.theme.finders.PostFinder; @@ -52,7 +52,7 @@ class PostRouteFactoryTest extends RouteFactoryTestSuite { @Test void create() { Post post = TestPost.postV1(); - Map labels = ExtensionUtil.nullSafeLabels(post); + Map labels = MetadataUtil.nullSafeLabels(post); labels.put(Post.PUBLISHED_LABEL, "true"); post.getMetadata().setName("fake-name"); post.getSpec().setDeleted(false); diff --git a/src/test/java/run/halo/app/theme/router/factories/RouteFactoryTest.java b/application/src/test/java/run/halo/app/theme/router/factories/RouteFactoryTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/router/factories/RouteFactoryTest.java rename to application/src/test/java/run/halo/app/theme/router/factories/RouteFactoryTest.java diff --git a/src/test/java/run/halo/app/theme/router/factories/RouteFactoryTestSuite.java b/application/src/test/java/run/halo/app/theme/router/factories/RouteFactoryTestSuite.java similarity index 100% rename from src/test/java/run/halo/app/theme/router/factories/RouteFactoryTestSuite.java rename to application/src/test/java/run/halo/app/theme/router/factories/RouteFactoryTestSuite.java diff --git a/src/test/java/run/halo/app/theme/router/factories/TagPostRouteFactoryTest.java b/application/src/test/java/run/halo/app/theme/router/factories/TagPostRouteFactoryTest.java similarity index 100% rename from src/test/java/run/halo/app/theme/router/factories/TagPostRouteFactoryTest.java rename to application/src/test/java/run/halo/app/theme/router/factories/TagPostRouteFactoryTest.java diff --git a/src/test/resources/apiToken.salt b/application/src/test/resources/apiToken.salt similarity index 100% rename from src/test/resources/apiToken.salt rename to application/src/test/resources/apiToken.salt diff --git a/src/test/resources/app.key b/application/src/test/resources/app.key similarity index 100% rename from src/test/resources/app.key rename to application/src/test/resources/app.key diff --git a/src/test/resources/app.pub b/application/src/test/resources/app.pub similarity index 100% rename from src/test/resources/app.pub rename to application/src/test/resources/app.pub diff --git a/src/test/resources/application.yaml b/application/src/test/resources/application.yaml similarity index 100% rename from src/test/resources/application.yaml rename to application/src/test/resources/application.yaml diff --git a/src/test/resources/config/i18n/messages.properties b/application/src/test/resources/config/i18n/messages.properties similarity index 100% rename from src/test/resources/config/i18n/messages.properties rename to application/src/test/resources/config/i18n/messages.properties diff --git a/src/test/resources/config/i18n/messages_zh.properties b/application/src/test/resources/config/i18n/messages_zh.properties similarity index 100% rename from src/test/resources/config/i18n/messages_zh.properties rename to application/src/test/resources/config/i18n/messages_zh.properties diff --git a/src/test/resources/console/index.html b/application/src/test/resources/console/index.html similarity index 100% rename from src/test/resources/console/index.html rename to application/src/test/resources/console/index.html diff --git a/src/test/resources/folder-to-zip/examplefile b/application/src/test/resources/folder-to-zip/examplefile similarity index 100% rename from src/test/resources/folder-to-zip/examplefile rename to application/src/test/resources/folder-to-zip/examplefile diff --git a/src/test/resources/plugin/plugin-0.0.1/extensions/reverseProxy.yaml b/application/src/test/resources/plugin/plugin-0.0.1/extensions/reverseProxy.yaml similarity index 100% rename from src/test/resources/plugin/plugin-0.0.1/extensions/reverseProxy.yaml rename to application/src/test/resources/plugin/plugin-0.0.1/extensions/reverseProxy.yaml diff --git a/src/test/resources/plugin/plugin-0.0.1/extensions/roles.yaml b/application/src/test/resources/plugin/plugin-0.0.1/extensions/roles.yaml similarity index 100% rename from src/test/resources/plugin/plugin-0.0.1/extensions/roles.yaml rename to application/src/test/resources/plugin/plugin-0.0.1/extensions/roles.yaml diff --git a/src/test/resources/plugin/plugin-0.0.1/extensions/test.yml b/application/src/test/resources/plugin/plugin-0.0.1/extensions/test.yml similarity index 100% rename from src/test/resources/plugin/plugin-0.0.1/extensions/test.yml rename to application/src/test/resources/plugin/plugin-0.0.1/extensions/test.yml diff --git a/src/test/resources/plugin/plugin-0.0.1/plugin.yaml b/application/src/test/resources/plugin/plugin-0.0.1/plugin.yaml similarity index 100% rename from src/test/resources/plugin/plugin-0.0.1/plugin.yaml rename to application/src/test/resources/plugin/plugin-0.0.1/plugin.yaml diff --git a/src/test/resources/plugin/plugin-0.0.2/plugin.yaml b/application/src/test/resources/plugin/plugin-0.0.2/plugin.yaml similarity index 100% rename from src/test/resources/plugin/plugin-0.0.2/plugin.yaml rename to application/src/test/resources/plugin/plugin-0.0.2/plugin.yaml diff --git a/src/test/resources/plugin/plugin.yaml b/application/src/test/resources/plugin/plugin.yaml similarity index 100% rename from src/test/resources/plugin/plugin.yaml rename to application/src/test/resources/plugin/plugin.yaml diff --git a/src/test/resources/plugin/test-plugin-components.idx b/application/src/test/resources/plugin/test-plugin-components.idx similarity index 100% rename from src/test/resources/plugin/test-plugin-components.idx rename to application/src/test/resources/plugin/test-plugin-components.idx diff --git a/src/test/resources/presets/plugins/fake-plugin.jar b/application/src/test/resources/presets/plugins/fake-plugin.jar similarity index 100% rename from src/test/resources/presets/plugins/fake-plugin.jar rename to application/src/test/resources/presets/plugins/fake-plugin.jar diff --git a/src/test/resources/themes/default/i18n/default.properties b/application/src/test/resources/themes/default/i18n/default.properties similarity index 100% rename from src/test/resources/themes/default/i18n/default.properties rename to application/src/test/resources/themes/default/i18n/default.properties diff --git a/src/test/resources/themes/default/i18n/en.properties b/application/src/test/resources/themes/default/i18n/en.properties similarity index 100% rename from src/test/resources/themes/default/i18n/en.properties rename to application/src/test/resources/themes/default/i18n/en.properties diff --git a/src/test/resources/themes/default/templates/index.html b/application/src/test/resources/themes/default/templates/index.html similarity index 100% rename from src/test/resources/themes/default/templates/index.html rename to application/src/test/resources/themes/default/templates/index.html diff --git a/src/test/resources/themes/default/templates/timezone.html b/application/src/test/resources/themes/default/templates/timezone.html similarity index 100% rename from src/test/resources/themes/default/templates/timezone.html rename to application/src/test/resources/themes/default/templates/timezone.html diff --git a/src/test/resources/themes/default/theme.yaml b/application/src/test/resources/themes/default/theme.yaml similarity index 100% rename from src/test/resources/themes/default/theme.yaml rename to application/src/test/resources/themes/default/theme.yaml diff --git a/src/test/resources/themes/invalid-missing-manifest/i18n/default.properties b/application/src/test/resources/themes/invalid-missing-manifest/i18n/default.properties similarity index 100% rename from src/test/resources/themes/invalid-missing-manifest/i18n/default.properties rename to application/src/test/resources/themes/invalid-missing-manifest/i18n/default.properties diff --git a/src/test/resources/themes/invalid-missing-manifest/i18n/en.properties b/application/src/test/resources/themes/invalid-missing-manifest/i18n/en.properties similarity index 100% rename from src/test/resources/themes/invalid-missing-manifest/i18n/en.properties rename to application/src/test/resources/themes/invalid-missing-manifest/i18n/en.properties diff --git a/src/test/resources/themes/invalid-missing-manifest/templates/index.html b/application/src/test/resources/themes/invalid-missing-manifest/templates/index.html similarity index 100% rename from src/test/resources/themes/invalid-missing-manifest/templates/index.html rename to application/src/test/resources/themes/invalid-missing-manifest/templates/index.html diff --git a/src/test/resources/themes/invalid-missing-manifest/templates/timezone.html b/application/src/test/resources/themes/invalid-missing-manifest/templates/timezone.html similarity index 100% rename from src/test/resources/themes/invalid-missing-manifest/templates/timezone.html rename to application/src/test/resources/themes/invalid-missing-manifest/templates/timezone.html diff --git a/src/test/resources/themes/other/i18n/default.properties b/application/src/test/resources/themes/other/i18n/default.properties similarity index 100% rename from src/test/resources/themes/other/i18n/default.properties rename to application/src/test/resources/themes/other/i18n/default.properties diff --git a/src/test/resources/themes/other/i18n/en.properties b/application/src/test/resources/themes/other/i18n/en.properties similarity index 100% rename from src/test/resources/themes/other/i18n/en.properties rename to application/src/test/resources/themes/other/i18n/en.properties diff --git a/src/test/resources/themes/other/templates/index.html b/application/src/test/resources/themes/other/templates/index.html similarity index 100% rename from src/test/resources/themes/other/templates/index.html rename to application/src/test/resources/themes/other/templates/index.html diff --git a/src/test/resources/themes/other/theme.yaml b/application/src/test/resources/themes/other/theme.yaml similarity index 100% rename from src/test/resources/themes/other/theme.yaml rename to application/src/test/resources/themes/other/theme.yaml diff --git a/src/test/resources/themes/test-theme.zip b/application/src/test/resources/themes/test-theme.zip similarity index 100% rename from src/test/resources/themes/test-theme.zip rename to application/src/test/resources/themes/test-theme.zip diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 85f477b2b..000000000 --- a/build.gradle +++ /dev/null @@ -1,144 +0,0 @@ -plugins { - id 'org.springframework.boot' version '3.0.4' - id 'io.spring.dependency-management' version '1.1.0' - id "com.gorylenko.gradle-git-properties" version "2.3.2" - id "checkstyle" - id 'java' - id 'jacoco' - id "de.undercouch.download" version "5.3.1" -} - -group = "run.halo.app" -sourceCompatibility = JavaVersion.VERSION_17 - -checkstyle { - toolVersion = "9.3" - showViolations = false - ignoreFailures = false -} - -repositories { - mavenCentral() - - maven { url 'https://repo.spring.io/milestone' } -} - - -configurations { - compileOnly { - extendsFrom annotationProcessor - } -} - -springBoot { - buildInfo() -} - -bootJar { - manifest { - attributes "Implementation-Title": "Halo Application", - "Implementation-Version": archiveVersion - } -} - -ext { - commonsLang3 = "3.12.0" - base62 = "0.1.3" - pf4j = '3.9.0' - javaDiffUtils = "4.12" - guava = "31.1-jre" - jsoup = '1.15.3' - jsonPatch = "1.13" - springDocOpenAPI = "2.0.2" - lucene = "9.5.0" -} - -dependencies { - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.boot:spring-boot-starter-mail' - implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'org.springframework.boot:spring-boot-starter-data-r2dbc' - - // Spring Security - implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.security:spring-security-oauth2-jose' - implementation 'org.springframework.security:spring-security-oauth2-client' - implementation 'org.springframework.security:spring-security-oauth2-resource-server' - - implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$springDocOpenAPI" - implementation 'org.openapi4j:openapi-schema-validator:1.0.7' - implementation "net.bytebuddy:byte-buddy" - - // Apache Lucene - implementation "org.apache.lucene:lucene-core:$lucene" - implementation "org.apache.lucene:lucene-queryparser:$lucene" - implementation "org.apache.lucene:lucene-highlighter:$lucene" - implementation "org.apache.lucene:lucene-backward-codecs:$lucene" - implementation 'cn.shenyanchao.ik-analyzer:ik-analyzer:9.0.0' - - implementation "org.apache.commons:commons-lang3:$commonsLang3" - implementation "io.seruco.encoding:base62:$base62" - implementation "org.pf4j:pf4j:$pf4j" - implementation "com.google.guava:guava:$guava" - implementation "org.jsoup:jsoup:$jsoup" - implementation "io.github.java-diff-utils:java-diff-utils:$javaDiffUtils" - implementation "org.springframework.integration:spring-integration-core" - implementation "com.github.java-json-tools:json-patch:$jsonPatch" - implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity6" - - compileOnly 'org.projectlombok:lombok' - testCompileOnly 'org.projectlombok:lombok' - - annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" - annotationProcessor "org.springframework:spring-context-indexer:6.0.4" - - developmentOnly 'org.springframework.boot:spring-boot-devtools' - - // R2DBC - // Currently, official doesn't support mssql and mariadb yet until drivers are available. - // See https://github.com/spring-projects/spring-data-relational/commit/ee6c2c89b5c433748b22a79cf40dc8e01142caa3 - // for more. - runtimeOnly 'io.r2dbc:r2dbc-h2' - runtimeOnly 'com.github.jasync-sql:jasync-r2dbc-mysql:2.1.23' - runtimeOnly 'org.mariadb:r2dbc-mariadb:1.1.3' - runtimeOnly 'org.postgresql:postgresql' - runtimeOnly 'org.postgresql:r2dbc-postgresql' - - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.security:spring-security-test' - testImplementation 'io.projectreactor:reactor-test' -} - -tasks.named('test') { - useJUnitPlatform() -} - -test { - finalizedBy jacocoTestReport -} - -jacocoTestReport { - reports { - xml.required = true - html.required = false - } -} - -tasks.register('downloadPluginPresets', Download) { - doFirst { - delete 'src/main/resources/presets/plugins' - } - src([ - 'https://github.com/halo-sigs/plugin-comment-widget/releases/download/v1.3.0/plugin-comment-widget-1.3.0.jar', - 'https://github.com/halo-sigs/plugin-search-widget/releases/download/v1.0.0/plugin-search-widget-1.0.0.jar', - 'https://github.com/halo-sigs/plugin-sitemap/releases/download/v1.0.1/plugin-sitemap-1.0.1.jar', - 'https://github.com/halo-sigs/plugin-feed/releases/download/v1.1.0-beta.1/plugin-feed-1.1.0-beta.1.jar' - ]) - dest 'src/main/resources/presets/plugins' -} diff --git a/console/vite.config.ts b/console/vite.config.ts index b990a3dc0..2958380bc 100644 --- a/console/vite.config.ts +++ b/console/vite.config.ts @@ -51,7 +51,7 @@ export default ({ mode }: { mode: string }) => { }, build: { outDir: fileURLToPath( - new URL("../src/main/resources/console", import.meta.url) + new URL("../core/src/main/resources/console", import.meta.url) ), emptyOutDir: true, chunkSizeWarningLimit: 2048, diff --git a/platform/application/build.gradle b/platform/application/build.gradle new file mode 100644 index 000000000..5a5b822c6 --- /dev/null +++ b/platform/application/build.gradle @@ -0,0 +1,71 @@ +import org.springframework.boot.gradle.plugin.SpringBootPlugin + +plugins { + id 'org.springframework.boot' version '3.0.4' apply false + id 'java-platform' + id 'maven-publish' +} + +group = 'run.halo.tools.platform' +description = 'Platform of application.' + +ext { + commonsLang3 = "3.12.0" + base62 = "0.1.3" + pf4j = '3.9.0' + javaDiffUtils = "4.12" + guava = "31.1-jre" + jsoup = '1.15.3' + jsonPatch = "1.13" + springDocOpenAPI = "2.0.4" + lucene = "9.5.0" +} + +javaPlatform { + allowDependencies() +} + +dependencies { + api platform(SpringBootPlugin.BOM_COORDINATES) + + constraints { + api "org.springdoc:springdoc-openapi-starter-webflux-ui:$springDocOpenAPI" + api 'org.openapi4j:openapi-schema-validator:1.0.7' + + // Apache Lucene + api "org.apache.lucene:lucene-core:$lucene" + api "org.apache.lucene:lucene-queryparser:$lucene" + api "org.apache.lucene:lucene-highlighter:$lucene" + api "org.apache.lucene:lucene-backward-codecs:$lucene" + api 'cn.shenyanchao.ik-analyzer:ik-analyzer:9.0.0' + + api "org.apache.commons:commons-lang3:$commonsLang3" + api "io.seruco.encoding:base62:$base62" + api "org.pf4j:pf4j:$pf4j" + api "com.google.guava:guava:$guava" + api "org.jsoup:jsoup:$jsoup" + api "io.github.java-diff-utils:java-diff-utils:$javaDiffUtils" + api "org.springframework.integration:spring-integration-core" + api "com.github.java-json-tools:json-patch:$jsonPatch" + api "org.thymeleaf.extras:thymeleaf-extras-springsecurity6" + + runtime 'io.r2dbc:r2dbc-h2' + runtime 'org.postgresql:postgresql' + runtime 'org.postgresql:r2dbc-postgresql' + runtime 'org.mariadb:r2dbc-mariadb:1.1.3' + runtime 'com.github.jasync-sql:jasync-r2dbc-mysql:2.1.23' + } + +} + +publishing { + publications { + applicationPlatform(MavenPublication) { + from components.javaPlatform + } + } + + repositories { + mavenLocal() + } +} diff --git a/platform/plugin/build.gradle b/platform/plugin/build.gradle new file mode 100644 index 000000000..b98c934f7 --- /dev/null +++ b/platform/plugin/build.gradle @@ -0,0 +1,32 @@ +plugins { + id 'java-platform' + id 'maven-publish' +} + +group = 'run.halo.tools.platform' +description = 'This is the platform that other plugins depend on. ' + + 'We can put the plugin API as a dependency at here.' + +javaPlatform { + allowDependencies() +} + +dependencies { + api platform(project(':platform:application')) + constraints { + api project(':api') + // TODO other plugin API dependencies + // e.g.: api 'halo.run.plugin:links-api:1.1.0' + } +} + +publishing { + publications { + pluginPlatform(MavenPublication) { + from components.javaPlatform + } + } + repositories { + mavenLocal() + } +} diff --git a/settings.gradle b/settings.gradle index da157adfe..a672bc3cb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,3 +6,4 @@ pluginManagement { } rootProject.name = 'halo' +include 'api', 'application', 'platform:application', 'platform:plugin' diff --git a/src/main/java/run/halo/app/content/ContentWrapper.java b/src/main/java/run/halo/app/content/ContentWrapper.java deleted file mode 100644 index df96bc4c1..000000000 --- a/src/main/java/run/halo/app/content/ContentWrapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package run.halo.app.content; - -import lombok.Builder; -import lombok.Data; - -/** - * @author guqing - * @since 2.0.0 - */ -@Data -@Builder -public class ContentWrapper { - private String snapshotName; - private String raw; - private String content; - private String rawType; -} diff --git a/src/main/java/run/halo/app/core/extension/Counter.java b/src/main/java/run/halo/app/core/extension/Counter.java deleted file mode 100644 index 09da576cd..000000000 --- a/src/main/java/run/halo/app/core/extension/Counter.java +++ /dev/null @@ -1,76 +0,0 @@ -package run.halo.app.core.extension; - -import io.micrometer.core.instrument.Meter; -import java.util.Collection; -import lombok.Data; -import lombok.EqualsAndHashCode; -import run.halo.app.extension.AbstractExtension; -import run.halo.app.extension.GVK; -import run.halo.app.extension.Metadata; -import run.halo.app.metrics.MeterUtils; - -/** - * A counter for number of requests by extension resource name. - * - * @author guqing - * @since 2.0.0 - */ -@Data -@GVK(group = "metrics.halo.run", version = "v1alpha1", kind = "Counter", plural = "counters", - singular = "counter") -@EqualsAndHashCode(callSuper = true) -public class Counter extends AbstractExtension { - - private Integer visit; - - private Integer upvote; - - private Integer downvote; - - private Integer totalComment; - - private Integer approvedComment; - - /** - * Populate counter data from {@link Meter}s. - * - * @param meters counter meters - */ - public void populateFrom(Collection meters) { - populateDefaultValue(); - for (Meter meter : meters) { - if (meter instanceof io.micrometer.core.instrument.Counter meterCounter) { - if (MeterUtils.isVisitCounter(meterCounter)) { - this.visit = (int) meterCounter.count(); - } else if (MeterUtils.isUpvoteCounter(meterCounter)) { - this.upvote = (int) meterCounter.count(); - } else if (MeterUtils.isDownvoteCounter(meterCounter)) { - this.downvote = (int) meterCounter.count(); - } else if (MeterUtils.isTotalCommentCounter(meterCounter)) { - this.totalComment = (int) meterCounter.count(); - } else if (MeterUtils.isApprovedCommentCounter(meterCounter)) { - this.approvedComment = (int) meterCounter.count(); - } - } - } - } - - private void populateDefaultValue() { - this.visit = 0; - this.upvote = 0; - this.downvote = 0; - this.totalComment = 0; - this.approvedComment = 0; - } - - public static Counter emptyCounter(String name) { - Counter counter = new Counter(); - counter.setMetadata(new Metadata()); - counter.getMetadata().setName(name); - counter.setUpvote(0); - counter.setTotalComment(0); - counter.setApprovedComment(0); - counter.setVisit(0); - return counter; - } -} diff --git a/src/main/java/run/halo/app/extension/router/ListRequest.java b/src/main/java/run/halo/app/extension/router/ListRequest.java deleted file mode 100644 index 64c630413..000000000 --- a/src/main/java/run/halo/app/extension/router/ListRequest.java +++ /dev/null @@ -1,26 +0,0 @@ -package run.halo.app.extension.router; - -import io.swagger.v3.oas.annotations.media.Schema; -import java.util.List; -import lombok.Data; - -/** - * Use {@link IListRequest.QueryListRequest} instead. - */ -@Data -@Deprecated(forRemoval = true, since = "2.0.0") -public class ListRequest { - - @Schema(description = "The page number. Zero indicates no page.") - private Integer page; - - @Schema(description = "Size of one page. Zero indicates no limit.") - private Integer size; - - @Schema(description = "Label selector for filtering.") - private List labelSelector; - - @Schema(description = "Field selector for filtering.") - private List fieldSelector; - -}