diff --git a/pom.xml b/pom.xml
index a630e94..ecd876b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,12 +32,12 @@
dddlib-releases
dddlib release repository
- dav:http://nexus.dddlib.org/content/repositories/releases
+ dav:http://nexus.workplus.io:8081/repository/maven-releases/
dddlib-snapshots
dddlib snapshot repository
- dav:http://nexus.dddlib.org/content/repositories/snapshots
+ dav:http://nexus.workplus.io:8081/repository/maven-snapshots/
diff --git a/src/main/java/gridfs/client/GridFileBucket.java b/src/main/java/gridfs/client/GridBucket.java
similarity index 86%
rename from src/main/java/gridfs/client/GridFileBucket.java
rename to src/main/java/gridfs/client/GridBucket.java
index 86eb30a..7f8fcd1 100644
--- a/src/main/java/gridfs/client/GridFileBucket.java
+++ b/src/main/java/gridfs/client/GridBucket.java
@@ -16,14 +16,14 @@
/**
* @author siuming
*/
-final class GridFileBucket {
+final class GridBucket {
private MongoDatabase database;
private ReadConcern readConcern;
private WriteConcern writeConcern;
private String bucketName;
private int chunkSize;
- GridFileBucket(MongoDatabase database, ReadConcern readConcern, WriteConcern writeConcern, String bucketName, int chunkSize) {
+ GridBucket(MongoDatabase database, ReadConcern readConcern, WriteConcern writeConcern, String bucketName, int chunkSize) {
this.database = database;
this.readConcern = readConcern;
this.writeConcern = writeConcern;
@@ -32,21 +32,21 @@ final class GridFileBucket {
}
GridFile get(ObjectId id) {
- GridFileGet action = new GridFileGet(
+ GridGet action = new GridGet(
getFilesCollection(database, bucketName).withReadConcern(readConcern)
);
return action.exec(id);
}
GridFile get0(String md5) {
- GridFileGet0 action = new GridFileGet0(
+ GridGet0 action = new GridGet0(
getFilesCollection(database, bucketName).withReadConcern(readConcern)
);
return action.exec(md5);
}
void delete(ObjectId id) {
- GridFileDelete action = new GridFileDelete(
+ GridDelete action = new GridDelete(
getFilesCollection(database, bucketName).withReadConcern(readConcern).withWriteConcern(writeConcern),
getChunkCollection(database, bucketName).withReadConcern(readConcern).withWriteConcern(writeConcern)
);
@@ -54,7 +54,7 @@ void delete(ObjectId id) {
}
void delete0(String md5) {
- GridFileDelete0 action = new GridFileDelete0(
+ GridDelete0 action = new GridDelete0(
getFilesCollection(database, bucketName).withReadConcern(readConcern).withWriteConcern(writeConcern),
getChunkCollection(database, bucketName).withReadConcern(readConcern).withWriteConcern(writeConcern)
);
@@ -62,7 +62,7 @@ void delete0(String md5) {
}
byte[] read(ObjectId id) {
- GridFileRead action = new GridFileRead(
+ GridRead action = new GridRead(
getFilesCollection(database, bucketName).withReadConcern(readConcern),
getChunkCollection(database, bucketName).withReadConcern(readConcern)
);
@@ -71,7 +71,7 @@ byte[] read(ObjectId id) {
}
void read0(ObjectId id, OutputStream out) {
- GridFileRead0 action = new GridFileRead0(
+ GridRead0 action = new GridRead0(
getFilesCollection(database, bucketName).withReadConcern(readConcern),
getChunkCollection(database, bucketName).withReadConcern(readConcern)
);
@@ -80,7 +80,7 @@ void read0(ObjectId id, OutputStream out) {
}
byte[] readR(ObjectId id, long offset, long size) {
- GridFileRRead action = new GridFileRRead(
+ GridRRead action = new GridRRead(
getFilesCollection(database, bucketName).withReadConcern(readConcern),
getChunkCollection(database, bucketName).withReadConcern(readConcern)
);
@@ -89,7 +89,7 @@ byte[] readR(ObjectId id, long offset, long size) {
}
void readR0(ObjectId id, long offset, long size, OutputStream out) {
- GridFileRRead0 action = new GridFileRRead0(
+ GridRRead0 action = new GridRRead0(
getFilesCollection(database, bucketName).withReadConcern(readConcern),
getChunkCollection(database, bucketName).withReadConcern(readConcern)
);
@@ -99,7 +99,7 @@ void readR0(ObjectId id, long offset, long size, OutputStream out) {
ObjectId write(String name, String md5, long size, Document metadata, byte[] data) {
ObjectId id = new ObjectId();
- GridFileWrite action = new GridFileWrite(
+ GridWrite action = new GridWrite(
getFilesCollection(database, bucketName).withWriteConcern(writeConcern),
getChunkCollection(database, bucketName).withWriteConcern(writeConcern),
chunkSize
@@ -110,7 +110,7 @@ ObjectId write(String name, String md5, long size, Document metadata, byte[] dat
ObjectId write0(String name, String md5, long size, Document metadata, InputStream data) {
ObjectId id = new ObjectId();
- GridFileWrite0 action = new GridFileWrite0(
+ GridWrite0 action = new GridWrite0(
getFilesCollection(database, bucketName).withWriteConcern(writeConcern),
getChunkCollection(database, bucketName).withWriteConcern(writeConcern),
chunkSize
@@ -120,7 +120,7 @@ ObjectId write0(String name, String md5, long size, Document metadata, InputStre
}
void writeR(ObjectId id, long offset, byte[] data) {
- GridFileRWrite action = new GridFileRWrite(
+ GridRWrite action = new GridRWrite(
getFilesCollection(database, bucketName).withReadConcern(readConcern).withWriteConcern(writeConcern),
getChunkCollection(database, bucketName).withReadConcern(readConcern).withWriteConcern(writeConcern)
);
@@ -128,7 +128,7 @@ void writeR(ObjectId id, long offset, byte[] data) {
}
void writeR0(ObjectId id, long offset, InputStream data) {
- GridFileRWrite0 action = new GridFileRWrite0(
+ GridRWrite0 action = new GridRWrite0(
getFilesCollection(database, bucketName).withReadConcern(readConcern).withWriteConcern(writeConcern),
getChunkCollection(database, bucketName).withReadConcern(readConcern).withWriteConcern(writeConcern)
);
diff --git a/src/main/java/gridfs/client/GridFileDelete.java b/src/main/java/gridfs/client/GridDelete.java
similarity index 80%
rename from src/main/java/gridfs/client/GridFileDelete.java
rename to src/main/java/gridfs/client/GridDelete.java
index e7027fc..33b8124 100644
--- a/src/main/java/gridfs/client/GridFileDelete.java
+++ b/src/main/java/gridfs/client/GridDelete.java
@@ -8,11 +8,11 @@
/**
* @author siuming
*/
-final class GridFileDelete {
+final class GridDelete {
private final MongoCollection filesCollection;
private final MongoCollection chunkCollection;
- GridFileDelete(MongoCollection filesCollection, MongoCollection chunkCollection) {
+ GridDelete(MongoCollection filesCollection, MongoCollection chunkCollection) {
this.filesCollection = filesCollection;
this.chunkCollection = chunkCollection;
}
diff --git a/src/main/java/gridfs/client/GridFileDelete0.java b/src/main/java/gridfs/client/GridDelete0.java
similarity index 82%
rename from src/main/java/gridfs/client/GridFileDelete0.java
rename to src/main/java/gridfs/client/GridDelete0.java
index 66eac38..c148433 100644
--- a/src/main/java/gridfs/client/GridFileDelete0.java
+++ b/src/main/java/gridfs/client/GridDelete0.java
@@ -7,11 +7,11 @@
/**
* @author siuming
*/
-final class GridFileDelete0 {
+final class GridDelete0 {
private final MongoCollection filesCollection;
private final MongoCollection chunkCollection;
- GridFileDelete0(MongoCollection filesCollection, MongoCollection chunkCollection) {
+ GridDelete0(MongoCollection filesCollection, MongoCollection chunkCollection) {
this.filesCollection = filesCollection;
this.chunkCollection = chunkCollection;
}
diff --git a/src/main/java/gridfs/client/GridFsClient.java b/src/main/java/gridfs/client/GridFsClient.java
index abf2bb9..7acbc92 100644
--- a/src/main/java/gridfs/client/GridFsClient.java
+++ b/src/main/java/gridfs/client/GridFsClient.java
@@ -40,19 +40,19 @@ public class GridFsClient implements Closeable {
public CompletableFuture get(ObjectId id) {
return CompletableFuture
- .supplyAsync(() -> new GridFileBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
+ .supplyAsync(() -> new GridBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
.thenApplyAsync(bucket -> bucket.get(id), executorService);
}
public CompletableFuture get(String md5) {
return CompletableFuture
- .supplyAsync(() -> new GridFileBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
+ .supplyAsync(() -> new GridBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
.thenApplyAsync(bucket -> bucket.get0(md5), executorService);
}
public CompletableFuture delete(ObjectId id) {
return CompletableFuture
- .supplyAsync(() -> new GridFileBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
+ .supplyAsync(() -> new GridBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
.thenApplyAsync(bucket -> {
bucket.delete(id);
return null;
@@ -61,7 +61,7 @@ public CompletableFuture delete(ObjectId id) {
public CompletableFuture delete(String md5) {
return CompletableFuture
- .supplyAsync(() -> new GridFileBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
+ .supplyAsync(() -> new GridBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
.thenApplyAsync(bucket -> {
bucket.delete0(md5);
return null;
@@ -70,19 +70,19 @@ public CompletableFuture delete(String md5) {
public CompletableFuture download(ObjectId id) {
return CompletableFuture
- .supplyAsync(() -> new GridFileBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
+ .supplyAsync(() -> new GridBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
.thenApplyAsync(bucket -> bucket.read(id), executorService);
}
public CompletableFuture download(ObjectId id, long offset, long size) {
return CompletableFuture
- .supplyAsync(() -> new GridFileBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
+ .supplyAsync(() -> new GridBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
.thenApplyAsync(bucket -> bucket.readR(id, offset, size), executorService);
}
public CompletableFuture download(ObjectId id, OutputStream out) {
return CompletableFuture
- .supplyAsync(() -> new GridFileBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
+ .supplyAsync(() -> new GridBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
.thenApplyAsync(bucket -> {
bucket.read0(id, out);
return null;
@@ -91,7 +91,7 @@ public CompletableFuture download(ObjectId id, OutputStream out) {
public CompletableFuture download(ObjectId id, long offset, long size, OutputStream out) {
return CompletableFuture
- .supplyAsync(() -> new GridFileBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
+ .supplyAsync(() -> new GridBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
.thenApplyAsync(bucket -> {
bucket.readR0(id, offset, size, out);
return null;
@@ -100,19 +100,19 @@ public CompletableFuture download(ObjectId id, long offset, long size, Out
public CompletableFuture upload(String filename, String md5, long size, Map metadata, byte[] content) {
return CompletableFuture
- .supplyAsync(() -> new GridFileBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
+ .supplyAsync(() -> new GridBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
.thenApplyAsync(bucket -> bucket.write(filename, md5, size, new Document(metadata), content), executorService);
}
public CompletableFuture upload(String filename, String md5, long size, Map metadata, InputStream content) {
return CompletableFuture
- .supplyAsync(() -> new GridFileBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
+ .supplyAsync(() -> new GridBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
.thenApplyAsync(bucket -> bucket.write0(filename, md5, size, new Document(metadata), content), executorService);
}
public CompletableFuture modify(ObjectId id, long offset, byte[] content) {
return CompletableFuture
- .supplyAsync(() -> new GridFileBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
+ .supplyAsync(() -> new GridBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
.thenApplyAsync(bucket -> {
bucket.writeR(id, offset, content);
return null;
@@ -121,7 +121,7 @@ public CompletableFuture modify(ObjectId id, long offset, byte[] content)
public CompletableFuture modify(ObjectId id, long offset, InputStream content) {
return CompletableFuture
- .supplyAsync(() -> new GridFileBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
+ .supplyAsync(() -> new GridBucket(database, readConcern, writeConcern, bucketName, chunkSize), executorService)
.thenApplyAsync(bucket -> {
bucket.writeR0(id, offset, content);
return null;
diff --git a/src/main/java/gridfs/client/GridFsException.java b/src/main/java/gridfs/client/GridFsException.java
index b753e04..af3b89b 100644
--- a/src/main/java/gridfs/client/GridFsException.java
+++ b/src/main/java/gridfs/client/GridFsException.java
@@ -3,7 +3,7 @@
/**
* @author siuming
*/
-public class GridFsException extends RuntimeException{
+public class GridFsException extends RuntimeException {
public GridFsException() {
}
diff --git a/src/main/java/gridfs/client/GridFileGet.java b/src/main/java/gridfs/client/GridGet.java
similarity index 90%
rename from src/main/java/gridfs/client/GridFileGet.java
rename to src/main/java/gridfs/client/GridGet.java
index cf62640..ff3241a 100644
--- a/src/main/java/gridfs/client/GridFileGet.java
+++ b/src/main/java/gridfs/client/GridGet.java
@@ -1,7 +1,6 @@
package gridfs.client;
import com.mongodb.client.MongoCollection;
-import org.bson.BsonDateTime;
import org.bson.Document;
import org.bson.types.ObjectId;
@@ -11,10 +10,10 @@
/**
* @author siuming
*/
-final class GridFileGet {
+final class GridGet {
private final MongoCollection filesCollection;
- GridFileGet(MongoCollection filesCollection) {
+ GridGet(MongoCollection filesCollection) {
this.filesCollection = filesCollection;
}
diff --git a/src/main/java/gridfs/client/GridFileGet0.java b/src/main/java/gridfs/client/GridGet0.java
similarity index 92%
rename from src/main/java/gridfs/client/GridFileGet0.java
rename to src/main/java/gridfs/client/GridGet0.java
index e48e617..b621298 100644
--- a/src/main/java/gridfs/client/GridFileGet0.java
+++ b/src/main/java/gridfs/client/GridGet0.java
@@ -9,10 +9,10 @@
/**
* @author siuming
*/
-final class GridFileGet0 {
+final class GridGet0 {
private final MongoCollection filesCollection;
- GridFileGet0(MongoCollection filesCollection) {
+ GridGet0(MongoCollection filesCollection) {
this.filesCollection = filesCollection;
}
diff --git a/src/main/java/gridfs/client/GridFileRRead.java b/src/main/java/gridfs/client/GridRRead.java
similarity index 95%
rename from src/main/java/gridfs/client/GridFileRRead.java
rename to src/main/java/gridfs/client/GridRRead.java
index 093c240..04afc7c 100644
--- a/src/main/java/gridfs/client/GridFileRRead.java
+++ b/src/main/java/gridfs/client/GridRRead.java
@@ -8,11 +8,11 @@
/**
* @author siuming
*/
-final class GridFileRRead {
+final class GridRRead {
private final MongoCollection filesCollection;
private final MongoCollection chunkCollection;
- GridFileRRead(MongoCollection filesCollection, MongoCollection chunkCollection) {
+ GridRRead(MongoCollection filesCollection, MongoCollection chunkCollection) {
this.filesCollection = filesCollection;
this.chunkCollection = chunkCollection;
}
diff --git a/src/main/java/gridfs/client/GridFileRRead0.java b/src/main/java/gridfs/client/GridRRead0.java
similarity index 95%
rename from src/main/java/gridfs/client/GridFileRRead0.java
rename to src/main/java/gridfs/client/GridRRead0.java
index 9938be1..f632d5e 100644
--- a/src/main/java/gridfs/client/GridFileRRead0.java
+++ b/src/main/java/gridfs/client/GridRRead0.java
@@ -10,11 +10,11 @@
/**
* @author siuming
*/
-final class GridFileRRead0 {
+final class GridRRead0 {
private final MongoCollection filesCollection;
private final MongoCollection chunkCollection;
- GridFileRRead0(MongoCollection filesCollection, MongoCollection chunkCollection) {
+ GridRRead0(MongoCollection filesCollection, MongoCollection chunkCollection) {
this.filesCollection = filesCollection;
this.chunkCollection = chunkCollection;
}
diff --git a/src/main/java/gridfs/client/GridFileRWrite.java b/src/main/java/gridfs/client/GridRWrite.java
similarity index 97%
rename from src/main/java/gridfs/client/GridFileRWrite.java
rename to src/main/java/gridfs/client/GridRWrite.java
index a9b0bd1..1936b41 100644
--- a/src/main/java/gridfs/client/GridFileRWrite.java
+++ b/src/main/java/gridfs/client/GridRWrite.java
@@ -10,12 +10,12 @@
/**
* @author siuming
*/
-final class GridFileRWrite {
+final class GridRWrite {
private final MongoCollection filesCollection;
private final MongoCollection chunkCollection;
- GridFileRWrite(MongoCollection filesCollection, MongoCollection chunkCollection) {
+ GridRWrite(MongoCollection filesCollection, MongoCollection chunkCollection) {
this.filesCollection = filesCollection;
this.chunkCollection = chunkCollection;
}
diff --git a/src/main/java/gridfs/client/GridFileRWrite0.java b/src/main/java/gridfs/client/GridRWrite0.java
similarity index 97%
rename from src/main/java/gridfs/client/GridFileRWrite0.java
rename to src/main/java/gridfs/client/GridRWrite0.java
index 9b25a8b..fa3d04f 100644
--- a/src/main/java/gridfs/client/GridFileRWrite0.java
+++ b/src/main/java/gridfs/client/GridRWrite0.java
@@ -11,12 +11,12 @@
/**
* @author siuming
*/
-final class GridFileRWrite0 {
+final class GridRWrite0 {
private final MongoCollection filesCollection;
private final MongoCollection chunkCollection;
- GridFileRWrite0(MongoCollection filesCollection, MongoCollection chunkCollection) {
+ GridRWrite0(MongoCollection filesCollection, MongoCollection chunkCollection) {
this.filesCollection = filesCollection;
this.chunkCollection = chunkCollection;
}
diff --git a/src/main/java/gridfs/client/GridFileRead.java b/src/main/java/gridfs/client/GridRead.java
similarity index 93%
rename from src/main/java/gridfs/client/GridFileRead.java
rename to src/main/java/gridfs/client/GridRead.java
index fe4a6e6..f7b8080 100644
--- a/src/main/java/gridfs/client/GridFileRead.java
+++ b/src/main/java/gridfs/client/GridRead.java
@@ -8,11 +8,11 @@
/**
* @author siuming
*/
-final class GridFileRead {
+final class GridRead {
private final MongoCollection filesCollection;
private final MongoCollection chunkCollection;
- GridFileRead(MongoCollection filesCollection, MongoCollection chunkCollection) {
+ GridRead(MongoCollection filesCollection, MongoCollection chunkCollection) {
this.filesCollection = filesCollection;
this.chunkCollection = chunkCollection;
}
diff --git a/src/main/java/gridfs/client/GridFileRead0.java b/src/main/java/gridfs/client/GridRead0.java
similarity index 93%
rename from src/main/java/gridfs/client/GridFileRead0.java
rename to src/main/java/gridfs/client/GridRead0.java
index f1d2456..86604e8 100644
--- a/src/main/java/gridfs/client/GridFileRead0.java
+++ b/src/main/java/gridfs/client/GridRead0.java
@@ -10,12 +10,12 @@
/**
* @author siuming
*/
-final class GridFileRead0 {
+final class GridRead0 {
private final MongoCollection filesCollection;
private final MongoCollection chunkCollection;
- GridFileRead0(MongoCollection filesCollection, MongoCollection chunkCollection) {
+ GridRead0(MongoCollection filesCollection, MongoCollection chunkCollection) {
this.filesCollection = filesCollection;
this.chunkCollection = chunkCollection;
}
diff --git a/src/main/java/gridfs/client/GridFileWrite.java b/src/main/java/gridfs/client/GridWrite.java
similarity index 93%
rename from src/main/java/gridfs/client/GridFileWrite.java
rename to src/main/java/gridfs/client/GridWrite.java
index fb98ee6..fb266ba 100644
--- a/src/main/java/gridfs/client/GridFileWrite.java
+++ b/src/main/java/gridfs/client/GridWrite.java
@@ -9,13 +9,13 @@
/**
* @author siuming
*/
-final class GridFileWrite {
+final class GridWrite {
private final MongoCollection filesCollection;
private final MongoCollection chunkCollection;
private final int chunkSize;
- GridFileWrite(MongoCollection filesCollection, MongoCollection chunkCollection, int chunkSize) {
+ GridWrite(MongoCollection filesCollection, MongoCollection chunkCollection, int chunkSize) {
this.filesCollection = filesCollection;
this.chunkCollection = chunkCollection;
this.chunkSize = chunkSize;
diff --git a/src/main/java/gridfs/client/GridFileWrite0.java b/src/main/java/gridfs/client/GridWrite0.java
similarity index 94%
rename from src/main/java/gridfs/client/GridFileWrite0.java
rename to src/main/java/gridfs/client/GridWrite0.java
index e36085e..cf0d0bc 100644
--- a/src/main/java/gridfs/client/GridFileWrite0.java
+++ b/src/main/java/gridfs/client/GridWrite0.java
@@ -11,12 +11,12 @@
/**
* @author siuming
*/
-final class GridFileWrite0 {
+final class GridWrite0 {
private final MongoCollection filesCollection;
private final MongoCollection chunkCollection;
private final int chunkSize;
- GridFileWrite0(MongoCollection filesCollection, MongoCollection chunkCollection, int chunkSize) {
+ GridWrite0(MongoCollection filesCollection, MongoCollection chunkCollection, int chunkSize) {
this.filesCollection = filesCollection;
this.chunkCollection = chunkCollection;
this.chunkSize = chunkSize;