This is an automated email from the ASF dual-hosted git repository. mikexue pushed a commit to branch eventmesh-function in repository https://gitbox.apache.org/repos/asf/eventmesh.git
commit 0ea1c680df69a3da04bce6adf302b5343df6e1e5 Author: xwm1992 <[email protected]> AuthorDate: Wed May 29 18:01:23 2024 +0800 fix admin server ci check error --- .../apache/eventmesh/admin/server/Admin.java | 2 +- .../apache/eventmesh/admin/server/AdminServer.java | 4 +- .../admin/server/AdminServerProperties.java | 2 +- .../admin/server/AdminServerRuntimeException.java | 2 +- .../eventmesh/admin/server/ComponentLifeCycle.java | 2 +- .../eventmesh/admin/server/ExampleAdminServer.java | 4 +- .../server/constatns/AdminServerConstants.java | 2 +- .../admin/server/web/AdminGrpcServer.java | 8 +-- .../eventmesh/admin/server/web/BaseServer.java | 2 +- .../eventmesh/admin/server/web/GrpcServer.java | 5 +- .../eventmesh/admin/server/web/HttpServer.java | 2 +- .../apache/eventmesh/admin/server/web/Request.java | 2 +- .../eventmesh/admin/server/web/Response.java | 2 +- .../admin/server/web/ServerController.java | 2 +- .../admin/server/web/db/DBThreadPool.java | 2 +- .../server/web/db/entity/EventMeshDataSource.java | 6 +- .../server/web/db/entity/EventMeshJobDetail.java | 6 +- .../server/web/db/entity/EventMeshJobInfo.java | 6 +- .../web/db/entity/EventMeshMysqlPosition.java | 6 +- .../entity/EventMeshPositionReporterHistory.java | 6 +- .../web/db/entity/EventMeshRuntimeHeartbeat.java | 6 +- .../web/db/entity/EventMeshRuntimeHistory.java | 6 +- .../web/db/mapper/EventMeshDataSourceMapper.java | 7 +- .../web/db/mapper/EventMeshJobInfoMapper.java | 14 ++-- .../db/mapper/EventMeshMysqlPositionMapper.java | 6 +- .../EventMeshPositionReporterHistoryMapper.java | 7 +- .../db/mapper/EventMeshRuntimeHeartbeatMapper.java | 14 ++-- .../db/mapper/EventMeshRuntimeHistoryMapper.java | 7 +- .../web/db/service/EventMeshDataSourceService.java | 5 +- .../web/db/service/EventMeshJobInfoService.java | 5 +- .../db/service/EventMeshMysqlPositionService.java | 5 +- .../EventMeshPositionReporterHistoryService.java | 5 +- .../service/EventMeshRuntimeHeartbeatService.java | 5 +- .../db/service/EventMeshRuntimeHistoryService.java | 6 +- .../impl/EventMeshDataSourceServiceImpl.java | 79 +++++++++++----------- .../service/impl/EventMeshJobInfoServiceImpl.java | 9 ++- .../impl/EventMeshMysqlPositionServiceImpl.java | 9 ++- ...ventMeshPositionReporterHistoryServiceImpl.java | 9 ++- .../impl/EventMeshRuntimeHeartbeatServiceImpl.java | 9 ++- .../impl/EventMeshRuntimeHistoryServiceImpl.java | 9 ++- .../server/web/handler/BaseRequestHandler.java | 2 +- .../server/web/handler/RequestHandlerFactory.java | 2 +- .../web/handler/impl/FetchJobRequestHandler.java | 10 +-- .../web/handler/impl/FetchPositionHandler.java | 10 +-- .../web/handler/impl/ReportHeartBeatHandler.java | 10 +-- .../web/handler/impl/ReportPositionHandler.java | 12 ++-- .../EventMeshRuntimeHeartbeatBizService.java | 11 ++- .../service/job/EventMeshJobInfoBizService.java | 19 +++--- .../position/EventMeshPositionBizService.java | 4 +- .../service/position/IFetchPositionHandler.java | 2 +- .../service/position/IReportPositionHandler.java | 2 +- .../web/service/position/PositionHandler.java | 2 +- .../service/position/PositionHandlerFactory.java | 2 +- .../position/impl/MysqlPositionHandler.java | 12 ++-- .../src/main/resources/META-INF/spring.factories | 2 +- .../resources/mapper/EventMeshDataSourceMapper.xml | 4 +- .../resources/mapper/EventMeshJobInfoMapper.xml | 4 +- .../mapper/EventMeshMysqlPositionMapper.xml | 4 +- .../EventMeshPositionReporterHistoryMapper.xml | 4 +- .../mapper/EventMeshRuntimeHeartbeatMapper.xml | 4 +- .../mapper/EventMeshRuntimeHistoryMapper.xml | 4 +- .../apache/eventmesh/common/remote/JobState.java | 8 +-- .../connector/canal/dialect/MysqlDialect.java | 2 - 63 files changed, 213 insertions(+), 218 deletions(-) diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/Admin.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/Admin.java similarity index 96% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/Admin.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/Admin.java index fe3bfcbe1..5d2f74606 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/Admin.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/Admin.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server; +package org.apache.eventmesh.admin.server; import org.apache.eventmesh.common.remote.Task; import org.apache.eventmesh.common.remote.request.ReportHeartBeatRequest; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServer.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/AdminServer.java similarity index 96% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServer.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/AdminServer.java index afd4d7707..c1432ad5d 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServer.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/AdminServer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server; +package org.apache.eventmesh.admin.server; import lombok.extern.slf4j.Slf4j; @@ -108,6 +108,8 @@ public class AdminServer implements Admin, ApplicationListener<ApplicationReadyE try { Thread.sleep(3000); } catch (InterruptedException ignore) { + log.warn("interrupted when sleep"); + Thread.currentThread().interrupt(); } registryService.shutdown(); } diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServerProperties.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/AdminServerProperties.java similarity index 96% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServerProperties.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/AdminServerProperties.java index affc0d928..45c7fb4c6 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServerProperties.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/AdminServerProperties.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server; +package org.apache.eventmesh.admin.server; import lombok.Getter; import lombok.Setter; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServerRuntimeException.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/AdminServerRuntimeException.java similarity index 96% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServerRuntimeException.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/AdminServerRuntimeException.java index 1bf8d1f58..5a68baba1 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServerRuntimeException.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/AdminServerRuntimeException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server; +package org.apache.eventmesh.admin.server; import lombok.Getter; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/ComponentLifeCycle.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/ComponentLifeCycle.java similarity index 95% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/ComponentLifeCycle.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/ComponentLifeCycle.java index d467f5ac4..0d0af0c89 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/ComponentLifeCycle.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/ComponentLifeCycle.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server; +package org.apache.eventmesh.admin.server; public interface ComponentLifeCycle { diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/ExampleAdminServer.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/ExampleAdminServer.java similarity index 92% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/ExampleAdminServer.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/ExampleAdminServer.java index c3b91a58e..7b788e613 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/ExampleAdminServer.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/ExampleAdminServer.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server; +package org.apache.eventmesh.admin.server; -import com.apache.eventmesh.admin.server.constatns.AdminServerConstants; +import org.apache.eventmesh.admin.server.constatns.AdminServerConstants; import org.apache.eventmesh.common.config.ConfigService; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/constatns/AdminServerConstants.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/constatns/AdminServerConstants.java similarity index 95% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/constatns/AdminServerConstants.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/constatns/AdminServerConstants.java index 1e77d4d15..44afaca1c 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/constatns/AdminServerConstants.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/constatns/AdminServerConstants.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.constatns; +package org.apache.eventmesh.admin.server.constatns; public class AdminServerConstants { public static final String CONF_ENV = "configurationPath"; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/AdminGrpcServer.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/AdminGrpcServer.java similarity index 94% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/AdminGrpcServer.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/AdminGrpcServer.java index 85ae9e733..85bf61b67 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/AdminGrpcServer.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/AdminGrpcServer.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web; +package org.apache.eventmesh.admin.server.web; -import com.apache.eventmesh.admin.server.AdminServerRuntimeException; -import com.apache.eventmesh.admin.server.web.handler.BaseRequestHandler; -import com.apache.eventmesh.admin.server.web.handler.RequestHandlerFactory; +import org.apache.eventmesh.admin.server.AdminServerRuntimeException; +import org.apache.eventmesh.admin.server.web.handler.BaseRequestHandler; +import org.apache.eventmesh.admin.server.web.handler.RequestHandlerFactory; import io.grpc.stub.ServerCallStreamObserver; import io.grpc.stub.StreamObserver; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/BaseServer.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/BaseServer.java similarity index 97% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/BaseServer.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/BaseServer.java index d93881e18..3091a29ff 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/BaseServer.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/BaseServer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web; +package org.apache.eventmesh.admin.server.web; import com.apache.eventmesh.admin.server.ComponentLifeCycle; import lombok.extern.slf4j.Slf4j; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/GrpcServer.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/GrpcServer.java similarity index 95% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/GrpcServer.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/GrpcServer.java index b1055f6ee..828e168d7 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/GrpcServer.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/GrpcServer.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web; +package org.apache.eventmesh.admin.server.web; + +import org.apache.eventmesh.admin.server.AdminServerProperties; -import com.apache.eventmesh.admin.server.AdminServerProperties; import io.grpc.Server; import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder; import lombok.extern.slf4j.Slf4j; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/HttpServer.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/HttpServer.java similarity index 95% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/HttpServer.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/HttpServer.java index 9231fd937..3f91115bd 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/HttpServer.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/HttpServer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web; +package org.apache.eventmesh.admin.server.web; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/Request.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/Request.java similarity index 95% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/Request.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/Request.java index 14be1b441..9484e986f 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/Request.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/Request.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web; +package org.apache.eventmesh.admin.server.web; public class Request<T> { private String uid; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/Response.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/Response.java similarity index 96% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/Response.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/Response.java index c244e8cf4..d58312146 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/Response.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/Response.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web; +package org.apache.eventmesh.admin.server.web; public class Response<T> { diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/ServerController.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/ServerController.java similarity index 95% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/ServerController.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/ServerController.java index 02b5a70c3..5623cbad3 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/ServerController.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/ServerController.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web; +package org.apache.eventmesh.admin.server.web; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/DBThreadPool.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/DBThreadPool.java similarity index 97% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/DBThreadPool.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/DBThreadPool.java index e8b82a883..a03e45109 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/DBThreadPool.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/DBThreadPool.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db; +package org.apache.eventmesh.admin.server.web.db; import lombok.extern.slf4j.Slf4j; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshDataSource.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshDataSource.java similarity index 96% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshDataSource.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshDataSource.java index 292ec4e4f..b7b7201c8 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshDataSource.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshDataSource.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.entity; +package org.apache.eventmesh.admin.server.web.db.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import lombok.Data; + /** * @TableName event_mesh_data_source */ diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshJobDetail.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshJobDetail.java similarity index 96% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshJobDetail.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshJobDetail.java index 803e89c32..b4a836e8b 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshJobDetail.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshJobDetail.java @@ -15,9 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.entity; - -import lombok.Data; +package org.apache.eventmesh.admin.server.web.db.entity; import org.apache.eventmesh.common.remote.JobState; import org.apache.eventmesh.common.remote.job.JobTransportType; @@ -25,6 +23,8 @@ import org.apache.eventmesh.common.remote.offset.RecordPosition; import java.util.Map; +import lombok.Data; + @Data public class EventMeshJobDetail { diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshJobInfo.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshJobInfo.java similarity index 96% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshJobInfo.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshJobInfo.java index cee300dd2..fcf06b6f2 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshJobInfo.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshJobInfo.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.entity; +package org.apache.eventmesh.admin.server.web.db.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import lombok.Data; + /** * @TableName event_mesh_job_info */ diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshMysqlPosition.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshMysqlPosition.java similarity index 96% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshMysqlPosition.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshMysqlPosition.java index 991a12abb..2f6f0f6af 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshMysqlPosition.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshMysqlPosition.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.entity; +package org.apache.eventmesh.admin.server.web.db.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import lombok.Data; + /** * @TableName event_mesh_mysql_position */ diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshPositionReporterHistory.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshPositionReporterHistory.java similarity index 96% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshPositionReporterHistory.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshPositionReporterHistory.java index 555cb93df..e76ea5df0 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshPositionReporterHistory.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshPositionReporterHistory.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.entity; +package org.apache.eventmesh.admin.server.web.db.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import lombok.Data; + /** * @TableName event_mesh_position_reporter_history */ diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshRuntimeHeartbeat.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshRuntimeHeartbeat.java similarity index 96% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshRuntimeHeartbeat.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshRuntimeHeartbeat.java index 011eb65af..410f13a47 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshRuntimeHeartbeat.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshRuntimeHeartbeat.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.entity; +package org.apache.eventmesh.admin.server.web.db.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import lombok.Data; + /** * @TableName event_mesh_runtime_heartbeat */ diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshRuntimeHistory.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshRuntimeHistory.java similarity index 96% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshRuntimeHistory.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshRuntimeHistory.java index 9f053b6f2..e36073da3 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshRuntimeHistory.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/entity/EventMeshRuntimeHistory.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.entity; +package org.apache.eventmesh.admin.server.web.db.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import lombok.Data; + /** * @TableName event_mesh_runtime_history */ diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshDataSourceMapper.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshDataSourceMapper.java similarity index 86% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshDataSourceMapper.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshDataSourceMapper.java index 8f4d8ddd6..6eac90357 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshDataSourceMapper.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshDataSourceMapper.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.mapper; +package org.apache.eventmesh.admin.server.web.db.mapper; + +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshDataSource; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshDataSource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -26,7 +27,7 @@ import org.apache.ibatis.annotations.Mapper; * @author sodafang * @description 针对表【event_mesh_data_source】的数据库操作Mapper * @createDate 2024-05-09 15:52:49 - * @Entity com.apache.eventmesh.admin.server.web.db.entity.EventMeshDataSource + * @Entity entity.db.web.server.admin.eventmesh.apache.org.EventMeshDataSource */ @Mapper public interface EventMeshDataSourceMapper extends BaseMapper<EventMeshDataSource> { diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshJobInfoMapper.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshJobInfoMapper.java similarity index 75% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshJobInfoMapper.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshJobInfoMapper.java index ecac0cfbe..929b2e8de 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshJobInfoMapper.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshJobInfoMapper.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.mapper; +package org.apache.eventmesh.admin.server.web.db.mapper; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshJobInfo; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshJobInfo; import org.apache.ibatis.annotations.Mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + /** - * @author sodafang - * @description 针对表【event_mesh_job_info】的数据库操作Mapper - * @createDate 2024-05-09 15:51:45 - * @Entity com.apache.eventmesh.admin.server.web.db.entity.EventMeshJobInfo + * for table【event_mesh_job_info】db operation + * 2024-05-09 15:51:45 + * entity.db.web.server.admin.eventmesh.apache.org.EventMeshJobInfo */ @Mapper public interface EventMeshJobInfoMapper extends BaseMapper<EventMeshJobInfo> { diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshMysqlPositionMapper.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshMysqlPositionMapper.java similarity index 86% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshMysqlPositionMapper.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshMysqlPositionMapper.java index fcfd2297a..28b20db7d 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshMysqlPositionMapper.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshMysqlPositionMapper.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.mapper; +package org.apache.eventmesh.admin.server.web.db.mapper; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshMysqlPosition; +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshMysqlPosition; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -26,7 +26,7 @@ import org.apache.ibatis.annotations.Mapper; * @author sodafang * @description 针对表【event_mesh_mysql_position】的数据库操作Mapper * @createDate 2024-05-14 17:15:03 - * @Entity com.apache.eventmesh.admin.server.web.db.entity.EventMeshMysqlPosition + * @Entity entity.db.web.server.admin.eventmesh.apache.org.EventMeshMysqlPosition */ @Mapper public interface EventMeshMysqlPositionMapper extends BaseMapper<EventMeshMysqlPosition> { diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshPositionReporterHistoryMapper.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshPositionReporterHistoryMapper.java similarity index 87% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshPositionReporterHistoryMapper.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshPositionReporterHistoryMapper.java index a15237a61..df0d21b55 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshPositionReporterHistoryMapper.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshPositionReporterHistoryMapper.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.mapper; +package org.apache.eventmesh.admin.server.web.db.mapper; + +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshPositionReporterHistory; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshPositionReporterHistory; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -26,7 +27,7 @@ import org.apache.ibatis.annotations.Mapper; * @author sodafang * @description 针对表【event_mesh_position_reporter_history(记录position上报者变更时，老记录)】的数据库操作Mapper * @createDate 2024-05-14 17:15:03 - * @Entity com.apache.eventmesh.admin.server.web.db.entity.EventMeshPositionReporterHistory + * @Entity entity.db.web.server.admin.eventmesh.apache.org.EventMeshPositionReporterHistory */ @Mapper public interface EventMeshPositionReporterHistoryMapper extends BaseMapper<EventMeshPositionReporterHistory> { diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshRuntimeHeartbeatMapper.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshRuntimeHeartbeatMapper.java similarity index 75% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshRuntimeHeartbeatMapper.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshRuntimeHeartbeatMapper.java index 24af0b9aa..063dd102b 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshRuntimeHeartbeatMapper.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshRuntimeHeartbeatMapper.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.mapper; +package org.apache.eventmesh.admin.server.web.db.mapper; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHeartbeat; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHeartbeat; import org.apache.ibatis.annotations.Mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + /** - * @author sodafang - * @description 针对表【event_mesh_runtime_heartbeat】的数据库操作Mapper - * @createDate 2024-05-14 17:15:03 - * @Entity com.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHeartbeat + * for table【event_mesh_runtime_heartbeat】db operation + * 2024-05-14 17:15:03 + * entity.db.web.server.admin.eventmesh.apache.org.EventMeshRuntimeHeartbeat */ @Mapper public interface EventMeshRuntimeHeartbeatMapper extends BaseMapper<EventMeshRuntimeHeartbeat> { diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshRuntimeHistoryMapper.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshRuntimeHistoryMapper.java similarity index 86% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshRuntimeHistoryMapper.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshRuntimeHistoryMapper.java index 957e5e7e1..5f3724733 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshRuntimeHistoryMapper.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/mapper/EventMeshRuntimeHistoryMapper.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.mapper; +package org.apache.eventmesh.admin.server.web.db.mapper; + +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHistory; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHistory; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -26,7 +27,7 @@ import org.apache.ibatis.annotations.Mapper; * @author sodafang * @description 针对表【event_mesh_runtime_history(记录runtime上运行任务的变更)】的数据库操作Mapper * @createDate 2024-05-14 17:15:03 - * @Entity com.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHistory + * @Entity entity.db.web.server.admin.eventmesh.apache.org.EventMeshRuntimeHistory */ @Mapper public interface EventMeshRuntimeHistoryMapper extends BaseMapper<EventMeshRuntimeHistory> { diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshDataSourceService.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshDataSourceService.java similarity index 89% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshDataSourceService.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshDataSourceService.java index fed9f17f0..4e301c244 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshDataSourceService.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshDataSourceService.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.service; +package org.apache.eventmesh.admin.server.web.db.service; + +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshDataSource; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshDataSource; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshJobInfoService.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshJobInfoService.java similarity index 89% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshJobInfoService.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshJobInfoService.java index 5c70979f6..c44a1cf7a 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshJobInfoService.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshJobInfoService.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.service; +package org.apache.eventmesh.admin.server.web.db.service; + +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshJobInfo; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshJobInfo; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshMysqlPositionService.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshMysqlPositionService.java similarity index 90% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshMysqlPositionService.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshMysqlPositionService.java index 5985c3ce1..a0fea9b32 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshMysqlPositionService.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshMysqlPositionService.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.service; +package org.apache.eventmesh.admin.server.web.db.service; + +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshMysqlPosition; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshMysqlPosition; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshPositionReporterHistoryService.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshPositionReporterHistoryService.java similarity index 90% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshPositionReporterHistoryService.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshPositionReporterHistoryService.java index 9b27130d5..2b5068350 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshPositionReporterHistoryService.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshPositionReporterHistoryService.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.service; +package org.apache.eventmesh.admin.server.web.db.service; + +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshPositionReporterHistory; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshPositionReporterHistory; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshRuntimeHeartbeatService.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshRuntimeHeartbeatService.java similarity index 90% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshRuntimeHeartbeatService.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshRuntimeHeartbeatService.java index 7d6c6c457..af90cbb3b 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshRuntimeHeartbeatService.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshRuntimeHeartbeatService.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.service; +package org.apache.eventmesh.admin.server.web.db.service; + +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHeartbeat; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHeartbeat; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshRuntimeHistoryService.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshRuntimeHistoryService.java similarity index 88% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshRuntimeHistoryService.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshRuntimeHistoryService.java index d0dab8a7c..e9f18c31f 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/EventMeshRuntimeHistoryService.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/EventMeshRuntimeHistoryService.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.service; +package org.apache.eventmesh.admin.server.web.db.service; + +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHistory; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHistory; import com.baomidou.mybatisplus.extension.service.IService; /** - * @author sodafang * @description 针对表【event_mesh_runtime_history(记录runtime上运行任务的变更)】的数据库操作Service * @createDate 2024-05-14 17:15:03 */ diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshDataSourceServiceImpl.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshDataSourceServiceImpl.java similarity index 80% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshDataSourceServiceImpl.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshDataSourceServiceImpl.java index b56be3a2b..aa074122d 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshDataSourceServiceImpl.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshDataSourceServiceImpl.java @@ -1,40 +1,39 @@ -/* - * 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. - */ - -package com.apache.eventmesh.admin.server.web.db.service.impl; - -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshDataSource; -import com.apache.eventmesh.admin.server.web.db.mapper.EventMeshDataSourceMapper; -import com.apache.eventmesh.admin.server.web.db.service.EventMeshDataSourceService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import org.springframework.stereotype.Service; - -/** - * @author sodafang - * @description 针对表【event_mesh_data_source】的数据库操作Service实现 - * @createDate 2024-05-09 15:52:49 - */ -@Service -public class EventMeshDataSourceServiceImpl extends ServiceImpl<EventMeshDataSourceMapper, EventMeshDataSource> - implements EventMeshDataSourceService { - -} - - - - +/* + * 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. + */ + +package org.apache.eventmesh.admin.server.web.db.service.impl; + +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshDataSource; +import org.apache.eventmesh.admin.server.web.db.mapper.EventMeshDataSourceMapper; +import org.apache.eventmesh.admin.server.web.db.service.EventMeshDataSourceService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import org.springframework.stereotype.Service; + +/** + * @description 针对表【event_mesh_data_source】的数据库操作Service实现 + * @createDate 2024-05-09 15:52:49 + */ +@Service +public class EventMeshDataSourceServiceImpl extends ServiceImpl<EventMeshDataSourceMapper, EventMeshDataSource> + implements EventMeshDataSourceService { + +} + + + + diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshJobInfoServiceImpl.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshJobInfoServiceImpl.java similarity index 82% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshJobInfoServiceImpl.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshJobInfoServiceImpl.java index e4afe2da8..1878c0e60 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshJobInfoServiceImpl.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshJobInfoServiceImpl.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.service.impl; +package org.apache.eventmesh.admin.server.web.db.service.impl; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshJobInfo; -import com.apache.eventmesh.admin.server.web.db.mapper.EventMeshJobInfoMapper; -import com.apache.eventmesh.admin.server.web.db.service.EventMeshJobInfoService; +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshJobInfo; +import org.apache.eventmesh.admin.server.web.db.mapper.EventMeshJobInfoMapper; +import org.apache.eventmesh.admin.server.web.db.service.EventMeshJobInfoService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; @@ -27,7 +27,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; /** - * @author sodafang * @description 针对表【event_mesh_job_info】的数据库操作Service实现 * @createDate 2024-05-09 15:51:45 */ diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshMysqlPositionServiceImpl.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshMysqlPositionServiceImpl.java similarity index 82% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshMysqlPositionServiceImpl.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshMysqlPositionServiceImpl.java index e4c257c8b..55a8ac1dc 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshMysqlPositionServiceImpl.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshMysqlPositionServiceImpl.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.service.impl; +package org.apache.eventmesh.admin.server.web.db.service.impl; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshMysqlPosition; -import com.apache.eventmesh.admin.server.web.db.mapper.EventMeshMysqlPositionMapper; -import com.apache.eventmesh.admin.server.web.db.service.EventMeshMysqlPositionService; +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshMysqlPosition; +import org.apache.eventmesh.admin.server.web.db.mapper.EventMeshMysqlPositionMapper; +import org.apache.eventmesh.admin.server.web.db.service.EventMeshMysqlPositionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; @@ -27,7 +27,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; /** - * @author sodafang * @description 针对表【event_mesh_mysql_position】的数据库操作Service实现 * @createDate 2024-05-14 17:15:03 */ diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshPositionReporterHistoryServiceImpl.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshPositionReporterHistoryServiceImpl.java similarity index 83% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshPositionReporterHistoryServiceImpl.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshPositionReporterHistoryServiceImpl.java index 5fe66447b..895dcbbde 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshPositionReporterHistoryServiceImpl.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshPositionReporterHistoryServiceImpl.java @@ -15,17 +15,16 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.service.impl; +package org.apache.eventmesh.admin.server.web.db.service.impl; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshPositionReporterHistory; -import com.apache.eventmesh.admin.server.web.db.mapper.EventMeshPositionReporterHistoryMapper; -import com.apache.eventmesh.admin.server.web.db.service.EventMeshPositionReporterHistoryService; +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshPositionReporterHistory; +import org.apache.eventmesh.admin.server.web.db.mapper.EventMeshPositionReporterHistoryMapper; +import org.apache.eventmesh.admin.server.web.db.service.EventMeshPositionReporterHistoryService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** - * @author sodafang * @description 针对表【event_mesh_position_reporter_history(记录position上报者变更时，老记录)】的数据库操作Service实现 * @createDate 2024-05-14 17:15:03 */ diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshRuntimeHeartbeatServiceImpl.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshRuntimeHeartbeatServiceImpl.java similarity index 83% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshRuntimeHeartbeatServiceImpl.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshRuntimeHeartbeatServiceImpl.java index 1a1c4c1f1..cc3fb1889 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshRuntimeHeartbeatServiceImpl.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshRuntimeHeartbeatServiceImpl.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.service.impl; +package org.apache.eventmesh.admin.server.web.db.service.impl; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHeartbeat; -import com.apache.eventmesh.admin.server.web.db.mapper.EventMeshRuntimeHeartbeatMapper; -import com.apache.eventmesh.admin.server.web.db.service.EventMeshRuntimeHeartbeatService; +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHeartbeat; +import org.apache.eventmesh.admin.server.web.db.mapper.EventMeshRuntimeHeartbeatMapper; +import org.apache.eventmesh.admin.server.web.db.service.EventMeshRuntimeHeartbeatService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; @@ -27,7 +27,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; /** - * @author sodafang * @description 针对表【event_mesh_runtime_heartbeat】的数据库操作Service实现 * @createDate 2024-05-14 17:15:03 */ diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshRuntimeHistoryServiceImpl.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshRuntimeHistoryServiceImpl.java similarity index 82% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshRuntimeHistoryServiceImpl.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshRuntimeHistoryServiceImpl.java index 8d1c16973..275f12215 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/service/impl/EventMeshRuntimeHistoryServiceImpl.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/EventMeshRuntimeHistoryServiceImpl.java @@ -15,17 +15,16 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.db.service.impl; +package org.apache.eventmesh.admin.server.web.db.service.impl; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHistory; -import com.apache.eventmesh.admin.server.web.db.mapper.EventMeshRuntimeHistoryMapper; -import com.apache.eventmesh.admin.server.web.db.service.EventMeshRuntimeHistoryService; +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHistory; +import org.apache.eventmesh.admin.server.web.db.mapper.EventMeshRuntimeHistoryMapper; +import org.apache.eventmesh.admin.server.web.db.service.EventMeshRuntimeHistoryService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; /** - * @author sodafang * @description 针对表【event_mesh_runtime_history(记录runtime上运行任务的变更)】的数据库操作Service实现 * @createDate 2024-05-14 17:15:03 */ diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/BaseRequestHandler.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/BaseRequestHandler.java similarity index 95% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/BaseRequestHandler.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/BaseRequestHandler.java index 6e57b0c80..7f08f388c 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/BaseRequestHandler.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/BaseRequestHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.handler; +package org.apache.eventmesh.admin.server.web.handler; import org.apache.eventmesh.common.protocol.grpc.adminserver.Metadata; import org.apache.eventmesh.common.remote.request.BaseRemoteRequest; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/RequestHandlerFactory.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/RequestHandlerFactory.java similarity index 97% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/RequestHandlerFactory.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/RequestHandlerFactory.java index 66dec6d5b..85f80ea4d 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/RequestHandlerFactory.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/RequestHandlerFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.handler; +package org.apache.eventmesh.admin.server.web.handler; import org.apache.eventmesh.common.remote.request.BaseRemoteRequest; import org.apache.eventmesh.common.remote.response.BaseRemoteResponse; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/impl/FetchJobRequestHandler.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/impl/FetchJobRequestHandler.java similarity index 90% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/impl/FetchJobRequestHandler.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/impl/FetchJobRequestHandler.java index 7998869eb..b108aff4a 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/impl/FetchJobRequestHandler.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/impl/FetchJobRequestHandler.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.handler.impl; +package org.apache.eventmesh.admin.server.web.handler.impl; -import com.apache.eventmesh.admin.server.AdminServerRuntimeException; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshJobDetail; -import com.apache.eventmesh.admin.server.web.handler.BaseRequestHandler; -import com.apache.eventmesh.admin.server.web.service.job.EventMeshJobInfoBizService; +import org.apache.eventmesh.admin.server.AdminServerRuntimeException; +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshJobDetail; +import org.apache.eventmesh.admin.server.web.handler.BaseRequestHandler; +import org.apache.eventmesh.admin.server.web.service.job.EventMeshJobInfoBizService; import lombok.extern.slf4j.Slf4j; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/impl/FetchPositionHandler.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/impl/FetchPositionHandler.java similarity index 87% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/impl/FetchPositionHandler.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/impl/FetchPositionHandler.java index 46ce39cbd..e1390852e 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/impl/FetchPositionHandler.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/impl/FetchPositionHandler.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.handler.impl; +package org.apache.eventmesh.admin.server.web.handler.impl; -import com.apache.eventmesh.admin.server.AdminServerRuntimeException; -import com.apache.eventmesh.admin.server.web.db.DBThreadPool; -import com.apache.eventmesh.admin.server.web.handler.BaseRequestHandler; -import com.apache.eventmesh.admin.server.web.service.position.EventMeshPositionBizService; +import org.apache.eventmesh.admin.server.AdminServerRuntimeException; +import org.apache.eventmesh.admin.server.web.db.DBThreadPool; +import org.apache.eventmesh.admin.server.web.handler.BaseRequestHandler; +import org.apache.eventmesh.admin.server.web.service.position.EventMeshPositionBizService; import lombok.extern.slf4j.Slf4j; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/impl/ReportHeartBeatHandler.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/impl/ReportHeartBeatHandler.java similarity index 89% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/impl/ReportHeartBeatHandler.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/impl/ReportHeartBeatHandler.java index 02c409c40..9e3607823 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/impl/ReportHeartBeatHandler.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/impl/ReportHeartBeatHandler.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.handler.impl; +package org.apache.eventmesh.admin.server.web.handler.impl; -import com.apache.eventmesh.admin.server.web.db.DBThreadPool; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHeartbeat; -import com.apache.eventmesh.admin.server.web.handler.BaseRequestHandler; -import com.apache.eventmesh.admin.server.web.service.heatbeat.EventMeshRuntimeHeartbeatBizService; +import org.apache.eventmesh.admin.server.web.db.DBThreadPool; +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHeartbeat; +import org.apache.eventmesh.admin.server.web.handler.BaseRequestHandler; +import org.apache.eventmesh.admin.server.web.service.heatbeat.EventMeshRuntimeHeartbeatBizService; import lombok.extern.slf4j.Slf4j; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/impl/ReportPositionHandler.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/impl/ReportPositionHandler.java similarity index 91% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/impl/ReportPositionHandler.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/impl/ReportPositionHandler.java index d3b243419..9c4f9464c 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/handler/impl/ReportPositionHandler.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/impl/ReportPositionHandler.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.handler.impl; +package org.apache.eventmesh.admin.server.web.handler.impl; -import com.apache.eventmesh.admin.server.AdminServerRuntimeException; -import com.apache.eventmesh.admin.server.web.db.DBThreadPool; -import com.apache.eventmesh.admin.server.web.handler.BaseRequestHandler; -import com.apache.eventmesh.admin.server.web.service.job.EventMeshJobInfoBizService; -import com.apache.eventmesh.admin.server.web.service.position.EventMeshPositionBizService; +import org.apache.eventmesh.admin.server.AdminServerRuntimeException; +import org.apache.eventmesh.admin.server.web.db.DBThreadPool; +import org.apache.eventmesh.admin.server.web.handler.BaseRequestHandler; +import org.apache.eventmesh.admin.server.web.service.job.EventMeshJobInfoBizService; +import org.apache.eventmesh.admin.server.web.service.position.EventMeshPositionBizService; import lombok.extern.slf4j.Slf4j; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/heatbeat/EventMeshRuntimeHeartbeatBizService.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/heatbeat/EventMeshRuntimeHeartbeatBizService.java similarity index 89% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/heatbeat/EventMeshRuntimeHeartbeatBizService.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/heatbeat/EventMeshRuntimeHeartbeatBizService.java index 9cff31eb9..70f0343c3 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/heatbeat/EventMeshRuntimeHeartbeatBizService.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/heatbeat/EventMeshRuntimeHeartbeatBizService.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.service.heatbeat; +package org.apache.eventmesh.admin.server.web.service.heatbeat; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHeartbeat; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHistory; -import com.apache.eventmesh.admin.server.web.db.service.EventMeshRuntimeHeartbeatService; -import com.apache.eventmesh.admin.server.web.db.service.EventMeshRuntimeHistoryService; +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHeartbeat; +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHistory; +import org.apache.eventmesh.admin.server.web.db.service.EventMeshRuntimeHeartbeatService; +import org.apache.eventmesh.admin.server.web.db.service.EventMeshRuntimeHistoryService; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; @@ -29,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** - * @author sodafang * @description 针对表【event_mesh_runtime_heartbeat】的数据库操作Service实现 * @createDate 2024-05-14 17:15:03 */ diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/job/EventMeshJobInfoBizService.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/job/EventMeshJobInfoBizService.java similarity index 90% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/job/EventMeshJobInfoBizService.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/job/EventMeshJobInfoBizService.java index 1c20f3565..2c616d5df 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/job/EventMeshJobInfoBizService.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/job/EventMeshJobInfoBizService.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.service.job; - -import com.apache.eventmesh.admin.server.AdminServerRuntimeException; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshDataSource; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshJobDetail; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshJobInfo; -import com.apache.eventmesh.admin.server.web.db.service.EventMeshDataSourceService; -import com.apache.eventmesh.admin.server.web.db.service.EventMeshJobInfoService; -import com.apache.eventmesh.admin.server.web.service.position.EventMeshPositionBizService; +package org.apache.eventmesh.admin.server.web.service.job; + +import org.apache.eventmesh.admin.server.AdminServerRuntimeException; +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshDataSource; +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshJobDetail; +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshJobInfo; +import org.apache.eventmesh.admin.server.web.db.service.EventMeshDataSourceService; +import org.apache.eventmesh.admin.server.web.db.service.EventMeshJobInfoService; +import org.apache.eventmesh.admin.server.web.service.position.EventMeshPositionBizService; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.fasterxml.jackson.core.type.TypeReference; @@ -45,7 +45,6 @@ import org.springframework.stereotype.Service; import java.util.Map; /** - * @author sodafang * @description 针对表【event_mesh_job_info】的数据库操作Service实现 * @createDate 2024-05-09 15:51:45 */ diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/EventMeshPositionBizService.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/EventMeshPositionBizService.java similarity index 96% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/EventMeshPositionBizService.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/EventMeshPositionBizService.java index feaeb4ba9..2b19d207f 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/EventMeshPositionBizService.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/EventMeshPositionBizService.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.service.position; +package org.apache.eventmesh.admin.server.web.service.position; -import com.apache.eventmesh.admin.server.AdminServerRuntimeException; +import org.apache.eventmesh.admin.server.AdminServerRuntimeException; import lombok.extern.slf4j.Slf4j; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/IFetchPositionHandler.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/IFetchPositionHandler.java similarity index 94% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/IFetchPositionHandler.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/IFetchPositionHandler.java index a99b8c12d..2582327b0 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/IFetchPositionHandler.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/IFetchPositionHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.service.position; +package org.apache.eventmesh.admin.server.web.service.position; import org.apache.eventmesh.common.protocol.grpc.adminserver.Metadata; import org.apache.eventmesh.common.remote.offset.RecordPosition; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/IReportPositionHandler.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/IReportPositionHandler.java similarity index 94% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/IReportPositionHandler.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/IReportPositionHandler.java index 31252573b..138bc0c73 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/IReportPositionHandler.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/IReportPositionHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.service.position; +package org.apache.eventmesh.admin.server.web.service.position; import org.apache.eventmesh.common.protocol.grpc.adminserver.Metadata; import org.apache.eventmesh.common.remote.request.ReportPositionRequest; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/PositionHandler.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/PositionHandler.java similarity index 94% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/PositionHandler.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/PositionHandler.java index 619f9d3f8..921b0b2e5 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/PositionHandler.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/PositionHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.service.position; +package org.apache.eventmesh.admin.server.web.service.position; import org.apache.eventmesh.common.remote.job.DataSourceType; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/PositionHandlerFactory.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/PositionHandlerFactory.java similarity index 96% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/PositionHandlerFactory.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/PositionHandlerFactory.java index 09218cfa2..4c33e161e 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/PositionHandlerFactory.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/PositionHandlerFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.service.position; +package org.apache.eventmesh.admin.server.web.service.position; import lombok.extern.slf4j.Slf4j; diff --git a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/impl/MysqlPositionHandler.java b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/impl/MysqlPositionHandler.java similarity index 95% rename from eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/impl/MysqlPositionHandler.java rename to eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/impl/MysqlPositionHandler.java index d3c1bc9d0..ccf20e512 100644 --- a/eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/service/position/impl/MysqlPositionHandler.java +++ b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/service/position/impl/MysqlPositionHandler.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.apache.eventmesh.admin.server.web.service.position.impl; +package org.apache.eventmesh.admin.server.web.service.position.impl; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshMysqlPosition; -import com.apache.eventmesh.admin.server.web.db.entity.EventMeshPositionReporterHistory; -import com.apache.eventmesh.admin.server.web.db.service.EventMeshMysqlPositionService; -import com.apache.eventmesh.admin.server.web.db.service.EventMeshPositionReporterHistoryService; -import com.apache.eventmesh.admin.server.web.service.position.PositionHandler; +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshMysqlPosition; +import org.apache.eventmesh.admin.server.web.db.entity.EventMeshPositionReporterHistory; +import org.apache.eventmesh.admin.server.web.db.service.EventMeshMysqlPositionService; +import org.apache.eventmesh.admin.server.web.db.service.EventMeshPositionReporterHistoryService; +import org.apache.eventmesh.admin.server.web.service.position.PositionHandler; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; diff --git a/eventmesh-admin-server/src/main/resources/META-INF/spring.factories b/eventmesh-admin-server/src/main/resources/META-INF/spring.factories index e0bf3faae..0d9e9bae6 100644 --- a/eventmesh-admin-server/src/main/resources/META-INF/spring.factories +++ b/eventmesh-admin-server/src/main/resources/META-INF/spring.factories @@ -16,4 +16,4 @@ # org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.apache.eventmesh.admin.server.AdminServerProperties \ No newline at end of file + org.apache.eventmesh.admin.server.AdminServerProperties \ No newline at end of file diff --git a/eventmesh-admin-server/src/main/resources/mapper/EventMeshDataSourceMapper.xml b/eventmesh-admin-server/src/main/resources/mapper/EventMeshDataSourceMapper.xml index abc494366..dee497c84 100644 --- a/eventmesh-admin-server/src/main/resources/mapper/EventMeshDataSourceMapper.xml +++ b/eventmesh-admin-server/src/main/resources/mapper/EventMeshDataSourceMapper.xml @@ -18,9 +18,9 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd";> -<mapper namespace="com.apache.eventmesh.admin.server.web.db.mapper.EventMeshDataSourceMapper"> +<mapper namespace="org.apache.eventmesh.admin.server.web.db.mapper.EventMeshDataSourceMapper"> - <resultMap id="BaseResultMap" type="com.apache.eventmesh.admin.server.web.db.entity.EventMeshDataSource"> + <resultMap id="BaseResultMap" type="org.apache.eventmesh.admin.server.web.db.entity.EventMeshDataSource"> <id property="id" column="id" jdbcType="INTEGER"/> <result property="dataType" column="dataType" jdbcType="INTEGER"/> <result property="description" column="description" jdbcType="VARCHAR"/> diff --git a/eventmesh-admin-server/src/main/resources/mapper/EventMeshJobInfoMapper.xml b/eventmesh-admin-server/src/main/resources/mapper/EventMeshJobInfoMapper.xml index f45f40b26..e758a276a 100644 --- a/eventmesh-admin-server/src/main/resources/mapper/EventMeshJobInfoMapper.xml +++ b/eventmesh-admin-server/src/main/resources/mapper/EventMeshJobInfoMapper.xml @@ -18,9 +18,9 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd";> -<mapper namespace="com.apache.eventmesh.admin.server.web.db.mapper.EventMeshJobInfoMapper"> +<mapper namespace="org.apache.eventmesh.admin.server.web.db.mapper.EventMeshJobInfoMapper"> - <resultMap id="BaseResultMap" type="com.apache.eventmesh.admin.server.web.db.entity.EventMeshJobInfo"> + <resultMap id="BaseResultMap" type="org.apache.eventmesh.admin.server.web.db.entity.EventMeshJobInfo"> <id property="jobID" column="jobID" jdbcType="INTEGER"/> <result property="name" column="name" jdbcType="VARCHAR"/> <result property="transportType" column="transportType" jdbcType="INTEGER"/> diff --git a/eventmesh-admin-server/src/main/resources/mapper/EventMeshMysqlPositionMapper.xml b/eventmesh-admin-server/src/main/resources/mapper/EventMeshMysqlPositionMapper.xml index 1fd602929..bc3a3292a 100644 --- a/eventmesh-admin-server/src/main/resources/mapper/EventMeshMysqlPositionMapper.xml +++ b/eventmesh-admin-server/src/main/resources/mapper/EventMeshMysqlPositionMapper.xml @@ -18,9 +18,9 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd";> -<mapper namespace="com.apache.eventmesh.admin.server.web.db.mapper.EventMeshMysqlPositionMapper"> +<mapper namespace="org.apache.eventmesh.admin.server.web.db.mapper.EventMeshMysqlPositionMapper"> - <resultMap id="BaseResultMap" type="com.apache.eventmesh.admin.server.web.db.entity.EventMeshMysqlPosition"> + <resultMap id="BaseResultMap" type="org.apache.eventmesh.admin.server.web.db.entity.EventMeshMysqlPosition"> <id property="id" column="id" jdbcType="INTEGER"/> <result property="jobID" column="jobID" jdbcType="INTEGER"/> <result property="address" column="address" jdbcType="VARCHAR"/> diff --git a/eventmesh-admin-server/src/main/resources/mapper/EventMeshPositionReporterHistoryMapper.xml b/eventmesh-admin-server/src/main/resources/mapper/EventMeshPositionReporterHistoryMapper.xml index c22ef8961..2ee22e1ad 100644 --- a/eventmesh-admin-server/src/main/resources/mapper/EventMeshPositionReporterHistoryMapper.xml +++ b/eventmesh-admin-server/src/main/resources/mapper/EventMeshPositionReporterHistoryMapper.xml @@ -18,9 +18,9 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd";> -<mapper namespace="com.apache.eventmesh.admin.server.web.db.mapper.EventMeshPositionReporterHistoryMapper"> +<mapper namespace="org.apache.eventmesh.admin.server.web.db.mapper.EventMeshPositionReporterHistoryMapper"> - <resultMap id="BaseResultMap" type="com.apache.eventmesh.admin.server.web.db.entity.EventMeshPositionReporterHistory"> + <resultMap id="BaseResultMap" type="org.apache.eventmesh.admin.server.web.db.entity.EventMeshPositionReporterHistory"> <id property="id" column="id" jdbcType="BIGINT"/> <result property="job" column="job" jdbcType="INTEGER"/> <result property="record" column="record" jdbcType="VARCHAR"/> diff --git a/eventmesh-admin-server/src/main/resources/mapper/EventMeshRuntimeHeartbeatMapper.xml b/eventmesh-admin-server/src/main/resources/mapper/EventMeshRuntimeHeartbeatMapper.xml index 810063e4d..b811c5950 100644 --- a/eventmesh-admin-server/src/main/resources/mapper/EventMeshRuntimeHeartbeatMapper.xml +++ b/eventmesh-admin-server/src/main/resources/mapper/EventMeshRuntimeHeartbeatMapper.xml @@ -18,9 +18,9 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd";> -<mapper namespace="com.apache.eventmesh.admin.server.web.db.mapper.EventMeshRuntimeHeartbeatMapper"> +<mapper namespace="org.apache.eventmesh.admin.server.web.db.mapper.EventMeshRuntimeHeartbeatMapper"> - <resultMap id="BaseResultMap" type="com.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHeartbeat"> + <resultMap id="BaseResultMap" type="org.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHeartbeat"> <id property="id" column="id" jdbcType="BIGINT"/> <result property="adminAddr" column="adminAddr" jdbcType="VARCHAR"/> <result property="runtimeAddr" column="runtimeAddr" jdbcType="VARCHAR"/> diff --git a/eventmesh-admin-server/src/main/resources/mapper/EventMeshRuntimeHistoryMapper.xml b/eventmesh-admin-server/src/main/resources/mapper/EventMeshRuntimeHistoryMapper.xml index 188b44ff8..d9e17bc85 100644 --- a/eventmesh-admin-server/src/main/resources/mapper/EventMeshRuntimeHistoryMapper.xml +++ b/eventmesh-admin-server/src/main/resources/mapper/EventMeshRuntimeHistoryMapper.xml @@ -18,9 +18,9 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd";> -<mapper namespace="com.apache.eventmesh.admin.server.web.db.mapper.EventMeshRuntimeHistoryMapper"> +<mapper namespace="org.apache.eventmesh.admin.server.web.db.mapper.EventMeshRuntimeHistoryMapper"> - <resultMap id="BaseResultMap" type="com.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHistory"> + <resultMap id="BaseResultMap" type="org.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHistory"> <result property="id" column="id" jdbcType="BIGINT"/> <result property="job" column="job" jdbcType="INTEGER"/> <result property="address" column="address" jdbcType="VARCHAR"/> diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/remote/JobState.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/remote/JobState.java index 1b3517a90..7b0ae5074 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/remote/JobState.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/remote/JobState.java @@ -18,13 +18,7 @@ package org.apache.eventmesh.common.remote; public enum JobState { - INIT, - STARTED, - RUNNING, - PAUSE, - COMPLETE, - DELETE, - FAIL; + INIT, STARTED, RUNNING, PAUSE, COMPLETE, DELETE, FAIL; private static final JobState[] STATES = JobState.values(); public static JobState fromIndex(Integer index) { diff --git a/eventmesh-connectors/eventmesh-connector-canal/src/main/java/org/apache/eventmesh/connector/canal/dialect/MysqlDialect.java b/eventmesh-connectors/eventmesh-connector-canal/src/main/java/org/apache/eventmesh/connector/canal/dialect/MysqlDialect.java index 448714c07..c518bcd97 100644 --- a/eventmesh-connectors/eventmesh-connector-canal/src/main/java/org/apache/eventmesh/connector/canal/dialect/MysqlDialect.java +++ b/eventmesh-connectors/eventmesh-connector-canal/src/main/java/org/apache/eventmesh/connector/canal/dialect/MysqlDialect.java @@ -30,8 +30,6 @@ import org.springframework.jdbc.support.lob.LobHandler; /** * 基于mysql的一些特殊处理定义 * - * @author jianghang 2011-10-27 下午01:46:57 - * @version 4.0.0 */ public class MysqlDialect extends AbstractDbDialect { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
