diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 00000000..9ff78571 --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,55 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +github: + description: EventMesh Dashboard + features: + # Enable issue management + issues: true + # Enable wiki + wiki: true + homepage: https://eventmesh.apache.org/ + labels: + - pubsub + - event-mesh + - admin + - dashboard + - event-driven + - cloud-native + - serverless + - serverless-workflow + - message-bus + enabled_merge_buttons: + squash: true + merge: false + rebase: false + protected_branches: + main: + required_status_checks: + strict: true + required_pull_request_reviews: + dismiss_stale_reviews: true + required_approving_review_count: 1 +notifications: + commits: commits@eventmesh.apache.org + # Send all issue emails (new, closed, comments) to issues@ + issues: issues@eventmesh.apache.org + # Send new/closed PR notifications to dev@ + pullrequests_status: dev@eventmesh.apache.org + # Send individual PR comments/reviews to issues@ + pullrequests_comment: issues@eventmesh.apache.org + jira_options: link label worklog diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dba06dcd..76dd28ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,9 +21,9 @@ name: "Continuous Integration" on: push: - branches: [ '*' ] + branches: [ '**' ] pull_request: - branches: [ '*' ] + branches: [ '**' ] jobs: build: @@ -32,7 +32,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest ] - java: [ 8 ] + java: [ 8, 11 ] language: ['java'] runs-on: ${{ matrix.os }} @@ -40,16 +40,12 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Setup Gradle - uses: gradle/gradle-build-action@v2 - - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v3 with: distribution: 'corretto' java-version: ${{ matrix.java }} + cache: maven - - name: Build - run: ./gradlew clean build bootJar --parallel --daemon - env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + - name: Build with Maven + run: mvn -B package --file pom.xml diff --git a/README.md b/README.md index 5c7eac23..5ddd5f57 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,12 @@ ## 技术架构 +### 环境 + +- JDK 8/11 +- Maven 3.8.1 +- Spring Boot 2.7.x + ### 模块依赖图 ### 模块介绍 diff --git a/eventmesh-dashboard-common/pom.xml b/eventmesh-dashboard-common/pom.xml index 35e0ee65..4247216f 100644 --- a/eventmesh-dashboard-common/pom.xml +++ b/eventmesh-dashboard-common/pom.xml @@ -6,15 +6,15 @@ org.apache.eventmesh.dashboard eventmesh-dashboard - 0.0.1 + 0.0.1-SNAPSHOT org.apache.eventmesh.dashboard.common eventmesh-dashboard-common - 17 - 17 + 8 + 8 UTF-8 diff --git a/eventmesh-dashboard-console/pom.xml b/eventmesh-dashboard-console/pom.xml index 465db413..2042c89c 100644 --- a/eventmesh-dashboard-console/pom.xml +++ b/eventmesh-dashboard-console/pom.xml @@ -6,15 +6,15 @@ org.apache.eventmesh.dashboard eventmesh-dashboard - 0.0.1 + 0.0.1-SNAPSHOT org.apache.eventmesh.dashboard.console eventmesh-dashboard-console - 17 - 17 + 8 + 8 UTF-8 diff --git a/eventmesh-dashboard-core/pom.xml b/eventmesh-dashboard-core/pom.xml index 1f23357b..98ade695 100644 --- a/eventmesh-dashboard-core/pom.xml +++ b/eventmesh-dashboard-core/pom.xml @@ -27,7 +27,7 @@ org.apache.eventmesh.dashboard eventmesh-dashboard - 0.0.1 + 0.0.1-SNAPSHOT org.apache.eventmesh.dashboard.core eventmesh-dashboard-core diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/Main.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/Main.java deleted file mode 100644 index e32e92ab..00000000 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/Main.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.apache.eventmesh.dashboard.core; - -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} \ No newline at end of file diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/AdminProperties.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/AdminProperties.java index efcb74cf..b693d58f 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/AdminProperties.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/AdminProperties.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.config; +package org.apache.eventmesh.dashboard.core.config; -import org.apache.eventmesh.dashboard.constant.ConfigConst; +import org.apache.eventmesh.dashboard.core.constant.ConfigConst; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/BeanTypeConfig.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/BeanTypeConfig.java index 3a169f7c..2176a645 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/BeanTypeConfig.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/BeanTypeConfig.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.config; +package org.apache.eventmesh.dashboard.core.config; -import org.apache.eventmesh.dashboard.constant.ConfigConst; -import org.apache.eventmesh.dashboard.service.ConnectionService; -import org.apache.eventmesh.dashboard.service.SubscriptionService; -import org.apache.eventmesh.dashboard.service.TopicService; -import org.apache.eventmesh.dashboard.service.meta.EtcdConnectionService; -import org.apache.eventmesh.dashboard.service.meta.EtcdSubscriptionService; -import org.apache.eventmesh.dashboard.service.meta.NacosConnectionService; -import org.apache.eventmesh.dashboard.service.meta.NacosSubscriptionService; -import org.apache.eventmesh.dashboard.service.store.RocketmqTopicService; +import org.apache.eventmesh.dashboard.core.constant.ConfigConst; +import org.apache.eventmesh.dashboard.core.service.ConnectionService; +import org.apache.eventmesh.dashboard.core.service.SubscriptionService; +import org.apache.eventmesh.dashboard.core.service.TopicService; +import org.apache.eventmesh.dashboard.core.service.meta.EtcdConnectionService; +import org.apache.eventmesh.dashboard.core.service.meta.EtcdSubscriptionService; +import org.apache.eventmesh.dashboard.core.service.meta.NacosConnectionService; +import org.apache.eventmesh.dashboard.core.service.meta.NacosSubscriptionService; +import org.apache.eventmesh.dashboard.core.service.store.RocketmqTopicService; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/constant/ConfigConst.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/constant/ConfigConst.java index 4932adfd..c58ab18e 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/constant/ConfigConst.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/constant/ConfigConst.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.constant; +package org.apache.eventmesh.dashboard.core.constant; public class ConfigConst { diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/constant/NacosConst.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/constant/NacosConst.java index d0b027e8..a03181db 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/constant/NacosConst.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/constant/NacosConst.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.constant; +package org.apache.eventmesh.dashboard.core.constant; public class NacosConst { diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/ConnectionController.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/ConnectionController.java index b723e66b..34037d1d 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/ConnectionController.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/ConnectionController.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.controller; +package org.apache.eventmesh.dashboard.core.controller; -import org.apache.eventmesh.dashboard.service.ConnectionService; +import org.apache.eventmesh.dashboard.core.service.ConnectionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/MetricsController.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/MetricsController.java index dfe3a463..fbf7dcb9 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/MetricsController.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/MetricsController.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.controller; +package org.apache.eventmesh.dashboard.core.controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/SubscriptionController.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/SubscriptionController.java index 0ae0091b..3b48763a 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/SubscriptionController.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/SubscriptionController.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.controller; +package org.apache.eventmesh.dashboard.core.controller; -import org.apache.eventmesh.dashboard.dto.Result; -import org.apache.eventmesh.dashboard.model.SubscriptionInfo; -import org.apache.eventmesh.dashboard.service.SubscriptionService; +import org.apache.eventmesh.dashboard.core.dto.Result; +import org.apache.eventmesh.dashboard.core.model.SubscriptionInfo; +import org.apache.eventmesh.dashboard.core.service.SubscriptionService; import java.util.List; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/TopicController.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/TopicController.java index 09d848c2..f95ffbbe 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/TopicController.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/TopicController.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.controller; +package org.apache.eventmesh.dashboard.core.controller; -import org.apache.eventmesh.dashboard.dto.CreateTopicRequest; -import org.apache.eventmesh.dashboard.dto.DeleteTopicRequest; -import org.apache.eventmesh.dashboard.dto.Result; -import org.apache.eventmesh.dashboard.model.TopicProperties; -import org.apache.eventmesh.dashboard.service.TopicService; +import org.apache.eventmesh.dashboard.core.dto.CreateTopicRequest; +import org.apache.eventmesh.dashboard.core.dto.DeleteTopicRequest; +import org.apache.eventmesh.dashboard.core.dto.Result; +import org.apache.eventmesh.dashboard.core.model.TopicProperties; +import org.apache.eventmesh.dashboard.core.service.TopicService; import java.util.List; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/CreateTopicRequest.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/CreateTopicRequest.java index 2475a213..4a94be02 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/CreateTopicRequest.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/CreateTopicRequest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.dto; +package org.apache.eventmesh.dashboard.core.dto; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/DeleteTopicRequest.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/DeleteTopicRequest.java index 094a0085..dea2d15e 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/DeleteTopicRequest.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/DeleteTopicRequest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.dto; +package org.apache.eventmesh.dashboard.core.dto; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/Result.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/Result.java index 50b90c1b..b468318e 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/Result.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/Result.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.dto; +package org.apache.eventmesh.dashboard.core.dto; -import static org.apache.eventmesh.dashboard.enums.Status.SUCCESS; +import static org.apache.eventmesh.dashboard.core.enums.Status.SUCCESS; -import org.apache.eventmesh.dashboard.enums.Status; -import org.apache.eventmesh.dashboard.exception.BaseException; +import org.apache.eventmesh.dashboard.core.enums.Status; +import org.apache.eventmesh.dashboard.core.exception.BaseException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/enums/Status.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/enums/Status.java index 958b3bb7..da3cb0bb 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/enums/Status.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/enums/Status.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.enums; +package org.apache.eventmesh.dashboard.core.enums; -import static org.apache.eventmesh.dashboard.constant.ConfigConst.COLON; +import static org.apache.eventmesh.dashboard.core.constant.ConfigConst.COLON; import org.springframework.http.HttpStatus; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/BaseException.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/BaseException.java index 872ac4c0..3258f42d 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/BaseException.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/BaseException.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.exception; +package org.apache.eventmesh.dashboard.core.exception; -import static org.apache.eventmesh.dashboard.constant.ConfigConst.COLON; +import static org.apache.eventmesh.dashboard.core.constant.ConfigConst.COLON; -import org.apache.eventmesh.dashboard.enums.Status; -import org.apache.eventmesh.dashboard.util.ExceptionUtil; +import org.apache.eventmesh.dashboard.core.enums.Status; +import org.apache.eventmesh.dashboard.core.util.ExceptionUtil; import lombok.Getter; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/EventMeshAdminException.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/EventMeshAdminException.java index d298a7e5..93607db7 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/EventMeshAdminException.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/EventMeshAdminException.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.exception; +package org.apache.eventmesh.dashboard.core.exception; -import org.apache.eventmesh.dashboard.enums.Status; +import org.apache.eventmesh.dashboard.core.enums.Status; /** * EventMeshAdmin Application side exception diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/EventMeshException.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/EventMeshException.java index 9a835cd1..aadc45ae 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/EventMeshException.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/EventMeshException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.exception; +package org.apache.eventmesh.dashboard.core.exception; /** * EventMesh Runtime side exception diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/GlobalExceptionHandler.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/GlobalExceptionHandler.java index 51a2deff..2bfba1c6 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/GlobalExceptionHandler.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/GlobalExceptionHandler.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.exception; +package org.apache.eventmesh.dashboard.core.exception; -import org.apache.eventmesh.dashboard.dto.Result; -import org.apache.eventmesh.dashboard.dto.Result.StatusMessage; +import org.apache.eventmesh.dashboard.core.dto.Result; +import org.apache.eventmesh.dashboard.core.dto.Result.StatusMessage; import javax.servlet.http.HttpServletRequest; @@ -29,7 +29,7 @@ import lombok.extern.slf4j.Slf4j; /** - * This class, in conjunction with {@linkplain org.apache.eventmesh.dashboard.enums.Status Status} and {@link BaseException}, + * This class, in conjunction with {@linkplain org.apache.eventmesh.dashboard.core.enums.Status Status} and {@link BaseException}, * collectively implements customized error reporting. */ diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/MetaException.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/MetaException.java index 54db37d1..734251ea 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/MetaException.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/MetaException.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.exception; +package org.apache.eventmesh.dashboard.core.exception; -import org.apache.eventmesh.dashboard.enums.Status; +import org.apache.eventmesh.dashboard.core.enums.Status; /** * Meta side exception with EventMeshAdmin Application diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/ConnectionInfo.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/ConnectionInfo.java index 8b3c61d5..9325b839 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/ConnectionInfo.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/ConnectionInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.model; +package org.apache.eventmesh.dashboard.core.model; public class ConnectionInfo { diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/SubscriptionInfo.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/SubscriptionInfo.java index a7fbfb78..524d9f5b 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/SubscriptionInfo.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/SubscriptionInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.model; +package org.apache.eventmesh.dashboard.core.model; import lombok.Builder; import lombok.Data; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/TopicProperties.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/TopicProperties.java index c0018223..7461bc42 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/TopicProperties.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/model/TopicProperties.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.model; +package org.apache.eventmesh.dashboard.core.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/ConnectionService.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/ConnectionService.java index db004673..106421cf 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/ConnectionService.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/ConnectionService.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.service; +package org.apache.eventmesh.dashboard.core.service; /** * "Connection" refers to the subscription relationship between connectors. diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/Main.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/Main.java index 0927abf9..f538cd86 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/Main.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/Main.java @@ -1,4 +1,4 @@ -package org.apache.eventmesh.dashboard.service; +package org.apache.eventmesh.dashboard.core.service; public class Main { public static void main(String[] args) { diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/SubscriptionService.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/SubscriptionService.java index 01ba3dd9..72b07cc6 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/SubscriptionService.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/SubscriptionService.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.service; +package org.apache.eventmesh.dashboard.core.service; -import org.apache.eventmesh.dashboard.dto.Result; -import org.apache.eventmesh.dashboard.model.SubscriptionInfo; +import org.apache.eventmesh.dashboard.core.dto.Result; +import org.apache.eventmesh.dashboard.core.model.SubscriptionInfo; import java.util.List; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/TopicService.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/TopicService.java index f617a777..980aed35 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/TopicService.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/TopicService.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.service; +package org.apache.eventmesh.dashboard.core.service; -import org.apache.eventmesh.dashboard.model.TopicProperties; +import org.apache.eventmesh.dashboard.core.model.TopicProperties; import java.util.List; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/EtcdConnectionService.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/EtcdConnectionService.java index f55ad705..3bad3a27 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/EtcdConnectionService.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/EtcdConnectionService.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.service.meta; +package org.apache.eventmesh.dashboard.core.service.meta; -import org.apache.eventmesh.dashboard.service.ConnectionService; +import org.apache.eventmesh.dashboard.core.service.ConnectionService; import org.springframework.stereotype.Service; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/EtcdSubscriptionService.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/EtcdSubscriptionService.java index d5c024f7..9b110483 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/EtcdSubscriptionService.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/EtcdSubscriptionService.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.service.meta; +package org.apache.eventmesh.dashboard.core.service.meta; -import org.apache.eventmesh.dashboard.dto.Result; -import org.apache.eventmesh.dashboard.model.SubscriptionInfo; -import org.apache.eventmesh.dashboard.service.SubscriptionService; +import org.apache.eventmesh.dashboard.core.dto.Result; +import org.apache.eventmesh.dashboard.core.model.SubscriptionInfo; +import org.apache.eventmesh.dashboard.core.service.SubscriptionService; import java.util.List; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/NacosConnectionService.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/NacosConnectionService.java index 8e10082f..ef0219a5 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/NacosConnectionService.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/NacosConnectionService.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.service.meta; +package org.apache.eventmesh.dashboard.core.service.meta; -import org.apache.eventmesh.dashboard.config.AdminProperties; -import org.apache.eventmesh.dashboard.service.ConnectionService; +import org.apache.eventmesh.dashboard.core.config.AdminProperties; +import org.apache.eventmesh.dashboard.core.service.ConnectionService; import org.springframework.stereotype.Service; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/NacosSubscriptionService.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/NacosSubscriptionService.java index 09b675c6..3122103d 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/NacosSubscriptionService.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/meta/NacosSubscriptionService.java @@ -15,22 +15,22 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.service.meta; - -import static org.apache.eventmesh.dashboard.enums.Status.NACOS_EMPTY_RESP_ERR; -import static org.apache.eventmesh.dashboard.enums.Status.NACOS_GET_CONFIGS_ERR; -import static org.apache.eventmesh.dashboard.enums.Status.NACOS_LOGIN_EMPTY_RESP_ERR; -import static org.apache.eventmesh.dashboard.enums.Status.NACOS_LOGIN_ERR; -import static org.apache.eventmesh.dashboard.enums.Status.NACOS_SDK_CONFIG_ERR; - -import org.apache.eventmesh.dashboard.config.AdminProperties; -import org.apache.eventmesh.dashboard.constant.ConfigConst; -import org.apache.eventmesh.dashboard.constant.NacosConst; -import org.apache.eventmesh.dashboard.dto.Result; -import org.apache.eventmesh.dashboard.exception.EventMeshAdminException; -import org.apache.eventmesh.dashboard.exception.MetaException; -import org.apache.eventmesh.dashboard.model.SubscriptionInfo; -import org.apache.eventmesh.dashboard.service.SubscriptionService; +package org.apache.eventmesh.dashboard.core.service.meta; + +import static org.apache.eventmesh.dashboard.core.enums.Status.NACOS_EMPTY_RESP_ERR; +import static org.apache.eventmesh.dashboard.core.enums.Status.NACOS_GET_CONFIGS_ERR; +import static org.apache.eventmesh.dashboard.core.enums.Status.NACOS_LOGIN_EMPTY_RESP_ERR; +import static org.apache.eventmesh.dashboard.core.enums.Status.NACOS_LOGIN_ERR; +import static org.apache.eventmesh.dashboard.core.enums.Status.NACOS_SDK_CONFIG_ERR; + +import org.apache.eventmesh.dashboard.core.config.AdminProperties; +import org.apache.eventmesh.dashboard.core.constant.ConfigConst; +import org.apache.eventmesh.dashboard.core.constant.NacosConst; +import org.apache.eventmesh.dashboard.core.dto.Result; +import org.apache.eventmesh.dashboard.core.exception.EventMeshAdminException; +import org.apache.eventmesh.dashboard.core.exception.MetaException; +import org.apache.eventmesh.dashboard.core.model.SubscriptionInfo; +import org.apache.eventmesh.dashboard.core.service.SubscriptionService; import java.util.ArrayList; import java.util.Base64; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/store/RocketmqTopicService.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/store/RocketmqTopicService.java index ca8340c1..bc0b7bf3 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/store/RocketmqTopicService.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/service/store/RocketmqTopicService.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.service.store; +package org.apache.eventmesh.dashboard.core.service.store; -import org.apache.eventmesh.dashboard.config.AdminProperties; -import org.apache.eventmesh.dashboard.model.TopicProperties; -import org.apache.eventmesh.dashboard.service.TopicService; +import org.apache.eventmesh.dashboard.core.config.AdminProperties; +import org.apache.eventmesh.dashboard.core.model.TopicProperties; +import org.apache.eventmesh.dashboard.core.service.TopicService; import java.util.List; diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/util/ExceptionUtil.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/util/ExceptionUtil.java index 1da29567..f1a86358 100644 --- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/util/ExceptionUtil.java +++ b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/util/ExceptionUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.util; +package org.apache.eventmesh.dashboard.core.util; public class ExceptionUtil { diff --git a/eventmesh-dashboard-core/src/test/java/org/apache/eventmesh/dashboard/core/EventMeshDashboardApplicationTest.java b/eventmesh-dashboard-core/src/test/java/org/apache/eventmesh/dashboard/core/EventMeshDashboardApplicationTest.java index cc049831..0007c1df 100644 --- a/eventmesh-dashboard-core/src/test/java/org/apache/eventmesh/dashboard/core/EventMeshDashboardApplicationTest.java +++ b/eventmesh-dashboard-core/src/test/java/org/apache/eventmesh/dashboard/core/EventMeshDashboardApplicationTest.java @@ -1,13 +1,12 @@ package org.apache.eventmesh.dashboard.core; -import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest class EventMeshDashboardApplicationTest { - @Test - void contextLoads() { - } +// @Test +// void contextLoads() { +// } } diff --git a/eventmesh-dashboard-observe/pom.xml b/eventmesh-dashboard-observe/pom.xml index e8c3442b..e0cff61c 100644 --- a/eventmesh-dashboard-observe/pom.xml +++ b/eventmesh-dashboard-observe/pom.xml @@ -6,15 +6,15 @@ org.apache.eventmesh.dashboard eventmesh-dashboard - 0.0.1 + 0.0.1-SNAPSHOT org.apache.eventmesh.dashboard.observe eventmesh-dashboard-observe - 17 - 17 + 8 + 8 UTF-8 diff --git a/eventmesh-dashboard-service/pom.xml b/eventmesh-dashboard-service/pom.xml index 6a599d77..f445adaf 100644 --- a/eventmesh-dashboard-service/pom.xml +++ b/eventmesh-dashboard-service/pom.xml @@ -6,15 +6,15 @@ org.apache.eventmesh.dashboard eventmesh-dashboard - 0.0.1 + 0.0.1-SNAPSHOT org.apache.eventmesh.dashboard.service eventmesh-dashboard-service - 17 - 17 + 8 + 8 UTF-8 diff --git a/pom.xml b/pom.xml index f85cff67..3abf4205 100644 --- a/pom.xml +++ b/pom.xml @@ -34,8 +34,7 @@ org.apache.eventmesh.dashboard eventmesh-dashboard - - 0.0.1 + 0.0.1-SNAPSHOT eventmesh-dashboard eventmesh-dashboard