diff --git a/bookkeeper-admin-jdk/pom.xml b/bookkeeper-admin/pom.xml similarity index 75% rename from bookkeeper-admin-jdk/pom.xml rename to bookkeeper-admin/pom.xml index 55bb2c5..50426c6 100644 --- a/bookkeeper-admin-jdk/pom.xml +++ b/bookkeeper-admin/pom.xml @@ -9,7 +9,7 @@ 0.1.0 - bookkeeper-admin-jdk + bookkeeper-admin @@ -17,6 +17,11 @@ bookkeeper-admin-common ${project.version} + + io.github.openfacade + http-facade + ${http-facade.version} + diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/Auditor.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/Auditor.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/Auditor.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/Auditor.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/AutoRecovery.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/AutoRecovery.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/AutoRecovery.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/AutoRecovery.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/AutoRecoveryImpl.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/AutoRecoveryImpl.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/AutoRecoveryImpl.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/AutoRecoveryImpl.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/AutoRecoveryStatus.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/AutoRecoveryStatus.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/AutoRecoveryStatus.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/AutoRecoveryStatus.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookieInfo.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookieInfo.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookieInfo.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookieInfo.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookieStatus.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookieStatus.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookieStatus.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookieStatus.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/Bookies.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/Bookies.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/Bookies.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/Bookies.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookiesImpl.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookiesImpl.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookiesImpl.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookiesImpl.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdmin.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdmin.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdmin.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdmin.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdminBuilder.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdminBuilder.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdminBuilder.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdminBuilder.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdminBuilderImpl.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdminBuilderImpl.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdminBuilderImpl.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdminBuilderImpl.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdminException.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdminException.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdminException.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdminException.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdminImpl.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdminImpl.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdminImpl.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/BookkeeperAdminImpl.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/Configs.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/Configs.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/Configs.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/Configs.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/ConfigsImpl.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/ConfigsImpl.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/ConfigsImpl.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/ConfigsImpl.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/DiskFile.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/DiskFile.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/DiskFile.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/DiskFile.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/GarbageCollectionStatus.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/GarbageCollectionStatus.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/GarbageCollectionStatus.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/GarbageCollectionStatus.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/GcSuspendStatus.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/GcSuspendStatus.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/GcSuspendStatus.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/GcSuspendStatus.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/Heartbeat.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/Heartbeat.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/Heartbeat.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/Heartbeat.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/HeartbeatImpl.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/HeartbeatImpl.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/HeartbeatImpl.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/HeartbeatImpl.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/InnerHttpClient.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/InnerHttpClient.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/InnerHttpClient.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/InnerHttpClient.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/LastLogMark.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/LastLogMark.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/LastLogMark.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/LastLogMark.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/ListUnderReplicatedLedgerReqData.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/ListUnderReplicatedLedgerReqData.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/ListUnderReplicatedLedgerReqData.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/ListUnderReplicatedLedgerReqData.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/RecoveryBookieReqData.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/RecoveryBookieReqData.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/RecoveryBookieReqData.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/RecoveryBookieReqData.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/UnderReplicatedLedger.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/UnderReplicatedLedger.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/UnderReplicatedLedger.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/UnderReplicatedLedger.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/UrlConst.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/UrlConst.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/UrlConst.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/UrlConst.java diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/package-info.java b/bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/package-info.java similarity index 100% rename from bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/package-info.java rename to bookkeeper-admin/src/main/java/io/github/protocol/bookkeeper/admin/jdk/package-info.java diff --git a/bookkeeper-admin-jdk/src/test/java/io/github/protocol/bookkeeper/admin/jdk/AutoRecoveryImplTest.java b/bookkeeper-admin/src/test/java/io/github/protocol/bookkeeper/admin/jdk/AutoRecoveryImplTest.java similarity index 100% rename from bookkeeper-admin-jdk/src/test/java/io/github/protocol/bookkeeper/admin/jdk/AutoRecoveryImplTest.java rename to bookkeeper-admin/src/test/java/io/github/protocol/bookkeeper/admin/jdk/AutoRecoveryImplTest.java diff --git a/bookkeeper-admin-jdk/src/test/java/io/github/protocol/bookkeeper/admin/jdk/BookiesImplTest.java b/bookkeeper-admin/src/test/java/io/github/protocol/bookkeeper/admin/jdk/BookiesImplTest.java similarity index 100% rename from bookkeeper-admin-jdk/src/test/java/io/github/protocol/bookkeeper/admin/jdk/BookiesImplTest.java rename to bookkeeper-admin/src/test/java/io/github/protocol/bookkeeper/admin/jdk/BookiesImplTest.java diff --git a/bookkeeper-admin-jdk/src/test/java/io/github/protocol/bookkeeper/admin/jdk/ConfigsImplTest.java b/bookkeeper-admin/src/test/java/io/github/protocol/bookkeeper/admin/jdk/ConfigsImplTest.java similarity index 100% rename from bookkeeper-admin-jdk/src/test/java/io/github/protocol/bookkeeper/admin/jdk/ConfigsImplTest.java rename to bookkeeper-admin/src/test/java/io/github/protocol/bookkeeper/admin/jdk/ConfigsImplTest.java diff --git a/bookkeeper-admin-jdk/src/test/java/io/github/protocol/bookkeeper/admin/jdk/HeartbeatTest.java b/bookkeeper-admin/src/test/java/io/github/protocol/bookkeeper/admin/jdk/HeartbeatTest.java similarity index 100% rename from bookkeeper-admin-jdk/src/test/java/io/github/protocol/bookkeeper/admin/jdk/HeartbeatTest.java rename to bookkeeper-admin/src/test/java/io/github/protocol/bookkeeper/admin/jdk/HeartbeatTest.java diff --git a/bookkeeper-admin-jdk/src/test/resources/log4j2.xml b/bookkeeper-admin/src/test/resources/log4j2.xml similarity index 100% rename from bookkeeper-admin-jdk/src/test/resources/log4j2.xml rename to bookkeeper-admin/src/test/resources/log4j2.xml diff --git a/pom.xml b/pom.xml index 3be0b54..472932c 100644 --- a/pom.xml +++ b/pom.xml @@ -10,9 +10,9 @@ pom + bookkeeper-admin bookkeeper-admin-api bookkeeper-admin-common - bookkeeper-admin-jdk bookkeeper-admin-reactive @@ -22,7 +22,9 @@ UTF-8 src/main/java + 13.0 0.0.1 + 0.3.0 2.17.2 5.11.0 2.20.0 @@ -44,7 +46,7 @@ 3.5.0 1.7.0 4.8.6.2 - 2.43.0 + 2.43.0 @@ -65,6 +67,11 @@ lombok ${lombok.version} + + org.jetbrains + annotations + ${annotations.version} + com.fasterxml.jackson.core jackson-databind @@ -190,7 +197,7 @@ com.diffplug.spotless spotless-maven-plugin - ${spotless-maven-plugi.version} + ${spotless-maven-plugin.version}