From 44116b2d66382dbc52633826791dd29fbdec5bb8 Mon Sep 17 00:00:00 2001
From: zhangtianjiong <hanhanztj@sina.com>
Date: Mon, 13 Jun 2022 14:51:12 +0800
Subject: [PATCH] refactor:rename package name.

Signed-off-by: zhangtianjiong <hanhanztj@sina.com>
---
 java/README.md                                           | 6 +++---
 java/pom.xml                                             | 6 +++---
 .../main/java/io/{chubao => cubefs}/fs/CfsLibrary.java   | 2 +-
 .../src/main/java/io/{chubao => cubefs}/fs/CfsMount.java | 9 +++------
 .../java/io/{chubao => cubefs}/fs/TestCfsClient.java     | 8 +++-----
 5 files changed, 13 insertions(+), 18 deletions(-)
 rename java/src/main/java/io/{chubao => cubefs}/fs/CfsLibrary.java (99%)
 rename java/src/main/java/io/{chubao => cubefs}/fs/CfsMount.java (96%)
 rename java/src/main/java/io/{chubao => cubefs}/fs/TestCfsClient.java (96%)

diff --git a/java/README.md b/java/README.md
index 2a1a3e87e..072c5f7d7 100644
--- a/java/README.md
+++ b/java/README.md
@@ -17,7 +17,7 @@ cd docker
 ## Run the java test program
 
 ```
-java -cp target/libchubaofs-1.0-SNAPSHOT-jar-with-dependencies.jar io.chubao.fs.TestCfsClient ls <dirpath>
-java -cp target/libchubaofs-1.0-SNAPSHOT-jar-with-dependencies.jar io.chubao.fs.TestCfsClient read <filepath>
-java -cp target/libchubaofs-1.0-SNAPSHOT-jar-with-dependencies.jar io.chubao.fs.TestCfsClient write <filepath>
+java -cp target/libcubefs-1.0-SNAPSHOT-jar-with-dependencies.jar io.chubao.fs.TestCfsClient ls <dirpath>
+java -cp target/libcubefs-1.0-SNAPSHOT-jar-with-dependencies.jar io.chubao.fs.TestCfsClient read <filepath>
+java -cp target/libcubefs-1.0-SNAPSHOT-jar-with-dependencies.jar io.chubao.fs.TestCfsClient write <filepath>
 ```
diff --git a/java/pom.xml b/java/pom.xml
index d86aba567..f9acdc62d 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -4,10 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.chubao</groupId>
-    <artifactId>libchubaofs</artifactId>
+    <groupId>io.cubefs</groupId>
+    <artifactId>libcubefs</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <name>libchubaofs</name>
+    <name>libcubefs</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/java/src/main/java/io/chubao/fs/CfsLibrary.java b/java/src/main/java/io/cubefs/fs/CfsLibrary.java
similarity index 99%
rename from java/src/main/java/io/chubao/fs/CfsLibrary.java
rename to java/src/main/java/io/cubefs/fs/CfsLibrary.java
index 4766d881b..13414b260 100644
--- a/java/src/main/java/io/chubao/fs/CfsLibrary.java
+++ b/java/src/main/java/io/cubefs/fs/CfsLibrary.java
@@ -1,4 +1,4 @@
-package io.chubao.fs;
+package io.cubefs.fs;
 
 import com.sun.jna.Library;
 import com.sun.jna.Structure;
diff --git a/java/src/main/java/io/chubao/fs/CfsMount.java b/java/src/main/java/io/cubefs/fs/CfsMount.java
similarity index 96%
rename from java/src/main/java/io/chubao/fs/CfsMount.java
rename to java/src/main/java/io/cubefs/fs/CfsMount.java
index 1c1da3369..d6b71274d 100644
--- a/java/src/main/java/io/chubao/fs/CfsMount.java
+++ b/java/src/main/java/io/cubefs/fs/CfsMount.java
@@ -1,11 +1,8 @@
-package io.chubao.fs;
+package io.cubefs.fs;
 
 import com.sun.jna.Native;
 import com.sun.jna.Pointer;
 
-import io.chubao.fs.CfsLibrary.Dirent;
-import io.chubao.fs.CfsLibrary.DirentArray;
-
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
@@ -110,9 +107,9 @@ public class CfsMount {
      * Note that the memory allocated for Dirent[] must be countinuous. For example,
      * (new Dirent()).toArray(count).
      */
-    public int readdir(int fd, Dirent[] dents, int count) {
+    public int readdir(int fd, CfsLibrary.Dirent[] dents, int count) {
         Pointer arr = dents[0].getPointer();
-        DirentArray.ByValue slice = new DirentArray.ByValue();
+        CfsLibrary.DirentArray.ByValue slice = new CfsLibrary.DirentArray.ByValue();
         slice.data = arr;
         slice.len = (long) count;
         slice.cap = (long) count;
diff --git a/java/src/main/java/io/chubao/fs/TestCfsClient.java b/java/src/main/java/io/cubefs/fs/TestCfsClient.java
similarity index 96%
rename from java/src/main/java/io/chubao/fs/TestCfsClient.java
rename to java/src/main/java/io/cubefs/fs/TestCfsClient.java
index bf58614c4..7062fae0e 100644
--- a/java/src/main/java/io/chubao/fs/TestCfsClient.java
+++ b/java/src/main/java/io/cubefs/fs/TestCfsClient.java
@@ -1,6 +1,4 @@
-package io.chubao.fs;
-
-import io.chubao.fs.CfsLibrary.Dirent;
+package io.cubefs.fs;
 
 import java.io.FileNotFoundException;
 
@@ -102,8 +100,8 @@ public class TestCfsClient {
             }
 
             int total_entry = 0;
-            Dirent dent = new Dirent();
-            Dirent[] dents = (Dirent[]) dent.toArray(2);
+            CfsLibrary.Dirent dent = new CfsLibrary.Dirent();
+            CfsLibrary.Dirent[] dents = (CfsLibrary.Dirent[]) dent.toArray(2);
             for (;;) {
                 int n = mnt.readdir(fd, dents, 2);
                 if (n <= 0) {