diff --git a/other/java/client/pom.xml b/other/java/client/pom.xml index db2634b2b..1ea39863f 100644 --- a/other/java/client/pom.xml +++ b/other/java/client/pom.xml @@ -50,6 +50,17 @@ slf4j-api 1.7.25 + + org.apache.httpcomponents + httpmime + 4.5.6 + + + junit + junit + 4.12 + test + diff --git a/other/java/hdfs/src/main/java/seaweed/hdfs/ByteBufferOutputStream.java b/other/java/client/src/main/java/seaweedfs/client/ByteBufferOutputStream.java similarity index 94% rename from other/java/hdfs/src/main/java/seaweed/hdfs/ByteBufferOutputStream.java rename to other/java/client/src/main/java/seaweedfs/client/ByteBufferOutputStream.java index e9ea81f36..efcc265de 100644 --- a/other/java/hdfs/src/main/java/seaweed/hdfs/ByteBufferOutputStream.java +++ b/other/java/client/src/main/java/seaweedfs/client/ByteBufferOutputStream.java @@ -1,4 +1,4 @@ -package seaweed.hdfs; +package seaweedfs.client; import java.io.IOException; import java.io.OutputStream; diff --git a/other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedRead.java b/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java similarity index 98% rename from other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedRead.java rename to other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java index a4a2e9743..a906a689b 100644 --- a/other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedRead.java +++ b/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java @@ -1,4 +1,4 @@ -package seaweed.hdfs; +package seaweedfs.client; import org.apache.http.HttpEntity; import org.apache.http.HttpHeaders; @@ -6,8 +6,6 @@ import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.HttpClientBuilder; -import seaweedfs.client.FilerGrpcClient; -import seaweedfs.client.FilerProto; import java.io.IOException; import java.io.OutputStream; diff --git a/other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedWrite.java b/other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java similarity index 96% rename from other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedWrite.java rename to other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java index ee2131007..a7cede09f 100644 --- a/other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedWrite.java +++ b/other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java @@ -1,4 +1,4 @@ -package seaweed.hdfs; +package seaweedfs.client; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpPost; @@ -6,8 +6,6 @@ import org.apache.http.entity.mime.HttpMultipartMode; import org.apache.http.entity.mime.MultipartEntityBuilder; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; -import seaweedfs.client.FilerGrpcClient; -import seaweedfs.client.FilerProto; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/other/java/hdfs/src/test/java/seaweed/hdfs/SeaweedReadTest.java b/other/java/client/src/test/java/seaweedfs/client/SeaweedReadTest.java similarity index 55% rename from other/java/hdfs/src/test/java/seaweed/hdfs/SeaweedReadTest.java rename to other/java/client/src/test/java/seaweedfs/client/SeaweedReadTest.java index e3ab97910..ccfcdb117 100644 --- a/other/java/hdfs/src/test/java/seaweed/hdfs/SeaweedReadTest.java +++ b/other/java/client/src/test/java/seaweedfs/client/SeaweedReadTest.java @@ -1,13 +1,11 @@ -package seaweed.hdfs; +package seaweedfs.client; +import org.junit.Assert; import org.junit.Test; -import seaweedfs.client.FilerProto; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; - public class SeaweedReadTest { @Test @@ -31,33 +29,33 @@ public class SeaweedReadTest { System.out.println("visible:" + visibleInterval); } - assertEquals(visibleIntervals.size(), 2); + Assert.assertEquals(visibleIntervals.size(), 2); SeaweedRead.VisibleInterval visibleInterval = visibleIntervals.get(0); - assertEquals(visibleInterval.start, 0); - assertEquals(visibleInterval.stop, 100); - assertEquals(visibleInterval.modifiedTime, 1000); - assertEquals(visibleInterval.fileId, "aaa"); + Assert.assertEquals(visibleInterval.start, 0); + Assert.assertEquals(visibleInterval.stop, 100); + Assert.assertEquals(visibleInterval.modifiedTime, 1000); + Assert.assertEquals(visibleInterval.fileId, "aaa"); visibleInterval = visibleIntervals.get(1); - assertEquals(visibleInterval.start, 100); - assertEquals(visibleInterval.stop, 233); - assertEquals(visibleInterval.modifiedTime, 2000); - assertEquals(visibleInterval.fileId, "bbb"); + Assert.assertEquals(visibleInterval.start, 100); + Assert.assertEquals(visibleInterval.stop, 233); + Assert.assertEquals(visibleInterval.modifiedTime, 2000); + Assert.assertEquals(visibleInterval.fileId, "bbb"); List chunkViews = SeaweedRead.viewFromVisibles(visibleIntervals, 0, 233); SeaweedRead.ChunkView chunkView = chunkViews.get(0); - assertEquals(chunkView.offset, 0); - assertEquals(chunkView.size, 100); - assertEquals(chunkView.logicOffset, 0); - assertEquals(chunkView.fileId, "aaa"); + Assert.assertEquals(chunkView.offset, 0); + Assert.assertEquals(chunkView.size, 100); + Assert.assertEquals(chunkView.logicOffset, 0); + Assert.assertEquals(chunkView.fileId, "aaa"); chunkView = chunkViews.get(1); - assertEquals(chunkView.offset, 0); - assertEquals(chunkView.size, 133); - assertEquals(chunkView.logicOffset, 100); - assertEquals(chunkView.fileId, "bbb"); + Assert.assertEquals(chunkView.offset, 0); + Assert.assertEquals(chunkView.size, 133); + Assert.assertEquals(chunkView.logicOffset, 100); + Assert.assertEquals(chunkView.fileId, "bbb"); } diff --git a/other/java/hdfs/pom.xml b/other/java/hdfs/pom.xml index d8d6f8b8c..a0cab8752 100644 --- a/other/java/hdfs/pom.xml +++ b/other/java/hdfs/pom.xml @@ -154,17 +154,6 @@ hadoop-common ${hadoop.version} - - org.apache.httpcomponents - httpmime - 4.5.6 - - - junit - junit - 4.12 - test - diff --git a/other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java b/other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java index ffc109b20..27678e615 100644 --- a/other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java +++ b/other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java @@ -10,6 +10,7 @@ import org.slf4j.LoggerFactory; import seaweedfs.client.FilerClient; import seaweedfs.client.FilerGrpcClient; import seaweedfs.client.FilerProto; +import seaweedfs.client.SeaweedRead; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedInputStream.java b/other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedInputStream.java index c0b296fb9..90c14c772 100644 --- a/other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedInputStream.java +++ b/other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedInputStream.java @@ -10,6 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import seaweedfs.client.FilerGrpcClient; import seaweedfs.client.FilerProto; +import seaweedfs.client.SeaweedRead; import java.io.EOFException; import java.io.IOException; diff --git a/other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedOutputStream.java b/other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedOutputStream.java index 4dee4bf09..4f307ff96 100644 --- a/other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedOutputStream.java +++ b/other/java/hdfs/src/main/java/seaweed/hdfs/SeaweedOutputStream.java @@ -11,6 +11,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import seaweedfs.client.FilerGrpcClient; import seaweedfs.client.FilerProto; +import seaweedfs.client.SeaweedWrite; import java.io.IOException; import java.io.InterruptedIOException;