refactor: refactor jdk dir (#10)

Signed-off-by: ZhangJian He <shoothzj@gmail.com>
protocol-laboratory · Aug 28, 2024 · 2adbe6a · 2adbe6a
1 parent 771c40a
commit 2adbe6a
Show file tree

Hide file tree

Showing 35 changed files with 55 additions and 53 deletions.
diff --git a/...o/github/protocol/bookkeeper/Auditor.java → ...rotocol/bookkeeper/admin/jdk/Auditor.java b/...o/github/protocol/bookkeeper/Auditor.java → ...rotocol/bookkeeper/admin/jdk/Auditor.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 public class Auditor {
     private String auditor;

diff --git a/...hub/protocol/bookkeeper/AutoRecovery.java → ...ol/bookkeeper/admin/jdk/AutoRecovery.java b/...hub/protocol/bookkeeper/AutoRecovery.java → ...ol/bookkeeper/admin/jdk/AutoRecovery.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 public interface AutoRecovery {
 

diff --git a/...protocol/bookkeeper/AutoRecoveryImpl.java → ...ookkeeper/admin/jdk/AutoRecoveryImpl.java b/...protocol/bookkeeper/AutoRecoveryImpl.java → ...ookkeeper/admin/jdk/AutoRecoveryImpl.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 

diff --git a/...otocol/bookkeeper/AutoRecoveryStatus.java → ...kkeeper/admin/jdk/AutoRecoveryStatus.java b/...otocol/bookkeeper/AutoRecoveryStatus.java → ...kkeeper/admin/jdk/AutoRecoveryStatus.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 public class AutoRecoveryStatus {
     private boolean enabled;

diff --git a/...ithub/protocol/bookkeeper/BookieInfo.java → ...ocol/bookkeeper/admin/jdk/BookieInfo.java b/...ithub/protocol/bookkeeper/BookieInfo.java → ...ocol/bookkeeper/admin/jdk/BookieInfo.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 public class BookieInfo {
     private long freeSpace;

diff --git a/...hub/protocol/bookkeeper/BookieStatus.java → ...ol/bookkeeper/admin/jdk/BookieStatus.java b/...hub/protocol/bookkeeper/BookieStatus.java → ...ol/bookkeeper/admin/jdk/BookieStatus.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 public class BookieStatus {
     private boolean running;

diff --git a/...o/github/protocol/bookkeeper/Bookies.java → ...rotocol/bookkeeper/admin/jdk/Bookies.java b/...o/github/protocol/bookkeeper/Bookies.java → ...rotocol/bookkeeper/admin/jdk/Bookies.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...thub/protocol/bookkeeper/BookiesImpl.java → ...col/bookkeeper/admin/jdk/BookiesImpl.java b/...thub/protocol/bookkeeper/BookiesImpl.java → ...col/bookkeeper/admin/jdk/BookiesImpl.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 

diff --git a/.../protocol/bookkeeper/BookkeeperAdmin.java → ...bookkeeper/admin/jdk/BookkeeperAdmin.java b/.../protocol/bookkeeper/BookkeeperAdmin.java → ...bookkeeper/admin/jdk/BookkeeperAdmin.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 public interface BookkeeperAdmin {
     static BookkeeperAdminBuilder builder() {

diff --git a/...ol/bookkeeper/BookkeeperAdminBuilder.java → ...per/admin/jdk/BookkeeperAdminBuilder.java b/...ol/bookkeeper/BookkeeperAdminBuilder.java → ...per/admin/jdk/BookkeeperAdminBuilder.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 public interface BookkeeperAdminBuilder {
     BookkeeperAdmin build();

diff --git a/...ookkeeper/BookkeeperAdminBuilderImpl.java → ...admin/jdk/BookkeeperAdminBuilderImpl.java b/...ookkeeper/BookkeeperAdminBuilderImpl.java → ...admin/jdk/BookkeeperAdminBuilderImpl.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 public class BookkeeperAdminBuilderImpl implements BookkeeperAdminBuilder {
     private final Configuration conf;

diff --git a/.../bookkeeper/BookkeeperAdminException.java → ...r/admin/jdk/BookkeeperAdminException.java b/.../bookkeeper/BookkeeperAdminException.java → ...r/admin/jdk/BookkeeperAdminException.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 public class BookkeeperAdminException extends Exception {
     private static final int DEFAULT_STATUS_CODE = 500;

diff --git a/...tocol/bookkeeper/BookkeeperAdminImpl.java → ...keeper/admin/jdk/BookkeeperAdminImpl.java b/...tocol/bookkeeper/BookkeeperAdminImpl.java → ...keeper/admin/jdk/BookkeeperAdminImpl.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 public class BookkeeperAdminImpl implements BookkeeperAdmin {
     private final BookiesImpl bookies;

diff --git a/...o/github/protocol/bookkeeper/Configs.java → ...rotocol/bookkeeper/admin/jdk/Configs.java b/...o/github/protocol/bookkeeper/Configs.java → ...rotocol/bookkeeper/admin/jdk/Configs.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 
 import java.util.Map;

diff --git a/...thub/protocol/bookkeeper/ConfigsImpl.java → ...col/bookkeeper/admin/jdk/ConfigsImpl.java b/...thub/protocol/bookkeeper/ConfigsImpl.java → ...col/bookkeeper/admin/jdk/ConfigsImpl.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 
 import java.io.IOException;

diff --git a/...ub/protocol/bookkeeper/Configuration.java → ...l/bookkeeper/admin/jdk/Configuration.java b/...ub/protocol/bookkeeper/Configuration.java → ...l/bookkeeper/admin/jdk/Configuration.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/.../github/protocol/bookkeeper/DiskFile.java → ...otocol/bookkeeper/admin/jdk/DiskFile.java b/.../github/protocol/bookkeeper/DiskFile.java → ...otocol/bookkeeper/admin/jdk/DiskFile.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 public class DiskFile {
     private String[] indexFiles;

diff --git a/...l/bookkeeper/GarbageCollectionStatus.java → ...er/admin/jdk/GarbageCollectionStatus.java b/...l/bookkeeper/GarbageCollectionStatus.java → ...er/admin/jdk/GarbageCollectionStatus.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 public class GarbageCollectionStatus {
 

diff --git a/.../protocol/bookkeeper/GcSuspendStatus.java → ...bookkeeper/admin/jdk/GcSuspendStatus.java b/.../protocol/bookkeeper/GcSuspendStatus.java → ...bookkeeper/admin/jdk/GcSuspendStatus.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 public class GcSuspendStatus {
     private boolean isMajorGcSuspended;

diff --git a/...github/protocol/bookkeeper/Heartbeat.java → ...tocol/bookkeeper/admin/jdk/Heartbeat.java b/...github/protocol/bookkeeper/Heartbeat.java → ...tocol/bookkeeper/admin/jdk/Heartbeat.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 public interface Heartbeat {
     void heartbeat() throws BookkeeperAdminException;

diff --git a/...ub/protocol/bookkeeper/HeartbeatImpl.java → ...l/bookkeeper/admin/jdk/HeartbeatImpl.java b/...ub/protocol/bookkeeper/HeartbeatImpl.java → ...l/bookkeeper/admin/jdk/HeartbeatImpl.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 import java.net.http.HttpResponse;
 

diff --git a/.../protocol/bookkeeper/InnerHttpClient.java → ...bookkeeper/admin/jdk/InnerHttpClient.java b/.../protocol/bookkeeper/InnerHttpClient.java → ...bookkeeper/admin/jdk/InnerHttpClient.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 

diff --git a/...b/protocol/bookkeeper/JacksonService.java → .../bookkeeper/admin/jdk/JacksonService.java b/...b/protocol/bookkeeper/JacksonService.java → .../bookkeeper/admin/jdk/JacksonService.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;

diff --git a/...thub/protocol/bookkeeper/LastLogMark.java → ...col/bookkeeper/admin/jdk/LastLogMark.java b/...thub/protocol/bookkeeper/LastLogMark.java → ...col/bookkeeper/admin/jdk/LastLogMark.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 import java.util.Arrays;
 import java.util.Map;

diff --git a/...per/ListUnderReplicatedLedgerReqData.java → ...jdk/ListUnderReplicatedLedgerReqData.java b/...per/ListUnderReplicatedLedgerReqData.java → ...jdk/ListUnderReplicatedLedgerReqData.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 public class ListUnderReplicatedLedgerReqData {
     private String includingBookieId;

diff --git a/...col/bookkeeper/RecoveryBookieReqData.java → ...eper/admin/jdk/RecoveryBookieReqData.java b/...col/bookkeeper/RecoveryBookieReqData.java → ...eper/admin/jdk/RecoveryBookieReqData.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 import java.util.List;
 

diff --git a/...col/bookkeeper/UnderReplicatedLedger.java → ...eper/admin/jdk/UnderReplicatedLedger.java b/...col/bookkeeper/UnderReplicatedLedger.java → ...eper/admin/jdk/UnderReplicatedLedger.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 import java.util.List;
 

diff --git a/.../github/protocol/bookkeeper/UrlConst.java → ...otocol/bookkeeper/admin/jdk/UrlConst.java b/.../github/protocol/bookkeeper/UrlConst.java → ...otocol/bookkeeper/admin/jdk/UrlConst.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 public class UrlConst {
     public static final String HEARTBEAT_URL = "/heartbeat";

diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/package-info.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/admin/jdk/package-info.java
@@ -0,0 +1 @@
+package io.github.protocol.bookkeeper.admin.jdk;
diff --git a/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/package-info.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/package-info.java
diff --git a/...ocol/bookkeeper/AutoRecoveryImplTest.java → ...eeper/admin/jdk/AutoRecoveryImplTest.java b/...ocol/bookkeeper/AutoRecoveryImplTest.java → ...eeper/admin/jdk/AutoRecoveryImplTest.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 import io.github.embedded.bookkeeper.core.EmbeddedBookkeeperServer;
 import org.junit.jupiter.api.AfterAll;

diff --git a/.../protocol/bookkeeper/BookiesImplTest.java → ...bookkeeper/admin/jdk/BookiesImplTest.java b/.../protocol/bookkeeper/BookiesImplTest.java → ...bookkeeper/admin/jdk/BookiesImplTest.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 import io.github.embedded.bookkeeper.core.EmbeddedBookkeeperServer;
 import org.junit.jupiter.api.AfterAll;

diff --git a/.../protocol/bookkeeper/ConfigsImplTest.java → ...bookkeeper/admin/jdk/ConfigsImplTest.java b/.../protocol/bookkeeper/ConfigsImplTest.java → ...bookkeeper/admin/jdk/ConfigsImplTest.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 import io.github.embedded.bookkeeper.core.EmbeddedBookkeeperServer;
 import org.junit.jupiter.api.AfterAll;

diff --git a/...ub/protocol/bookkeeper/HeartbeatTest.java → ...l/bookkeeper/admin/jdk/HeartbeatTest.java b/...ub/protocol/bookkeeper/HeartbeatTest.java → ...l/bookkeeper/admin/jdk/HeartbeatTest.java
@@ -1,4 +1,4 @@
-package io.github.protocol.bookkeeper;
+package io.github.protocol.bookkeeper.admin.jdk;
 
 import io.github.embedded.bookkeeper.core.EmbeddedBookkeeperServer;
 import org.junit.jupiter.api.AfterAll;

diff --git a/pom.xml b/pom.xml
@@ -23,19 +23,21 @@
         <jackson.version>2.17.2</jackson.version>
         <junit.version>5.11.0</junit.version>
         <log4j.version>2.20.0</log4j.version>
-        <!-- plugin -->
-        <compiler-plugin.version>3.10.1</compiler-plugin.version>
-        <checkstyle-plugin.version>3.2.0</checkstyle-plugin.version>
-        <javadoc-plugin.version>3.4.1</javadoc-plugin.version>
         <lombok.version>1.18.34</lombok.version>
         <puppycrawl.version>10.18.0</puppycrawl.version>
-        <release-plugin.version>3.0.0-M6</release-plugin.version>
-        <scm-provider-gitexe.version>2.1.0</scm-provider-gitexe.version>
-        <source-plugin.version>3.2.1</source-plugin.version>
+        <!-- plugin -->
+        <lombok-maven-plugin.version>1.18.20.0</lombok-maven-plugin.version>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+        <maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
+        <maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
+        <maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
+        <maven-release-plugin.version>3.1.1</maven-release-plugin.version>
+        <maven-scm-provider-gitexe.version>2.1.0</maven-scm-provider-gitexe.version>
+        <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
+        <maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
         <spotbugs-maven-plugin.version>4.7.2.0</spotbugs-maven-plugin.version>
         <spotless-maven-plugi.version>2.43.0</spotless-maven-plugi.version>
-        <surefire-plugin.version>3.0.0-M9</surefire-plugin.version>
-        <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
+        <nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
     </properties>
 
     <dependencies>
@@ -75,7 +77,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler-plugin.version}</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <source>${maven.compiler.source}</source>
                     <target>${maven.compiler.target}</target>
@@ -84,7 +86,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>${checkstyle-plugin.version}</version>
+                <version>${maven-checkstyle-plugin.version}</version>
                 <dependencies>
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
@@ -121,7 +123,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire-plugin.version}</version>
+                <version>${maven-surefire-plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <useFile>false</useFile>
@@ -149,7 +151,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>${release-plugin.version}</version>
+                <version>${maven-release-plugin.version}</version>
                 <configuration>
                     <localCheckout>true</localCheckout>
                     <pushChanges>false</pushChanges>
@@ -160,14 +162,14 @@
                     <dependency>
                         <groupId>org.apache.maven.scm</groupId>
                         <artifactId>maven-scm-provider-gitexe</artifactId>
-                        <version>${scm-provider-gitexe.version}</version>
+                        <version>${maven-scm-provider-gitexe.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${javadoc-plugin.version}</version>
+                <version>${maven-javadoc-plugin.version}</version>
                 <configuration>
                     <sourcepath>${src.dir}</sourcepath>
                     <doclint>all,-missing</doclint>
@@ -184,7 +186,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>${source-plugin.version}</version>
+                <version>${maven-source-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -225,7 +227,7 @@
 
     <developers>
         <developer>
-            <name>ShootHzj</name>
+            <name>shootHzj</name>
             <email>shoothzj@gmail.com</email>
         </developer>
     </developers>
@@ -262,7 +264,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <version>${maven-gpg-plugin.version}</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -293,12 +295,12 @@
                     <plugin>
                         <groupId>org.projectlombok</groupId>
                         <artifactId>lombok-maven-plugin</artifactId>
-                        <version>1.18.20.0</version>
+                        <version>${lombok-maven-plugin.version}</version>
                         <dependencies>
                             <dependency>
                                 <groupId>org.projectlombok</groupId>
                                 <artifactId>lombok</artifactId>
-                                <version>1.18.24</version>
+                                <version>${lombok.version}</version>
                             </dependency>
                         </dependencies>
                         <executions>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		package io.github.protocol.bookkeeper.admin.jdk;