Skip to content

Commit 8e035d6

Browse files
rashtaorashtao
committed
made RawData marker Interface
1 parent b608c9f commit 8e035d6

File tree

4 files changed

+31
-40
lines changed

4 files changed

+31
-40
lines changed

‎core/src/main/java/com/arangodb/util/RawBytes.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* The driver's {@link InternalSerde} supports serializing and deserializing to and from
2020
* {@code RawBytes}.
2121
*/
22-
public final class RawBytes implements RawData<byte[]> {
22+
public final class RawBytes implements RawData {
2323
private final byte[] value;
2424

2525
private RawBytes(final byte[] value) {
@@ -30,7 +30,6 @@ public static RawBytes of(final byte[] value) {
3030
return new RawBytes(value);
3131
}
3232

33-
@Override
3433
public byte[] get() {
3534
return value;
3635
}

‎core/src/main/java/com/arangodb/util/RawData.java‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
package com.arangodb.util;
22

33
/**
4-
* Wrapper for raw data, current implementations are:
5-
* - {@link RawBytes}
6-
* - {@link RawJson}
4+
* Marker interface for raw data, implementations are:
5+
* <ul>
6+
* <li>{@link RawBytes}</li>
7+
* <li>{@link RawJson}</li>
8+
* </ul>
79
*/
8-
public interface RawData<T> {
9-
static RawJson of(final String value) {
10-
return RawJson.of(value);
11-
}
12-
13-
static RawBytes of(final byte[] value) {
14-
return RawBytes.of(value);
15-
}
16-
17-
T get();
10+
public interface RawData {
1811
}

‎core/src/main/java/com/arangodb/util/RawJson.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* The driver's {@link InternalSerde} supports serializing and deserializing to and from
1414
* {@code RawJson}.
1515
*/
16-
public final class RawJson implements RawData<String> {
16+
public final class RawJson implements RawData {
1717
private final String value;
1818

1919
private RawJson(final String value) {
@@ -24,7 +24,6 @@ public static RawJson of(final String value) {
2424
return new RawJson(value);
2525
}
2626

27-
@Override
2827
public String get() {
2928
return value;
3029
}

‎driver/src/test/java/com/arangodb/ArangoCollectionTest.java‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1857,7 +1857,7 @@ void insertDocumentsJson(ArangoCollection collection) {
18571857
@ParameterizedTest(name = "{index}")
18581858
@MethodSource("cols")
18591859
void insertDocumentsRawData(ArangoCollection collection) {
1860-
final RawData values = RawData.of("[{},{},{}]");
1860+
final RawData values = RawJson.of("[{},{},{}]");
18611861
final MultiDocumentEntity<?> docs = collection.insertDocuments(values);
18621862
assertThat(docs).isNotNull();
18631863
assertThat(docs.getDocuments()).isNotNull();
@@ -1869,7 +1869,7 @@ void insertDocumentsRawData(ArangoCollection collection) {
18691869
@ParameterizedTest(name = "{index}")
18701870
@MethodSource("cols")
18711871
void insertDocumentsRawDataReturnNew(ArangoCollection collection) {
1872-
final RawData values = RawData.of("[{\"aaa\":33},{\"aaa\":33},{\"aaa\":33}]");
1872+
final RawData values = RawJson.of("[{\"aaa\":33},{\"aaa\":33},{\"aaa\":33}]");
18731873
final MultiDocumentEntity<DocumentCreateEntity<RawData>> docs =
18741874
collection.insertDocuments(values, new DocumentCreateOptions().returnNew(true));
18751875
assertThat(docs).isNotNull();
@@ -2178,7 +2178,7 @@ void importDocumentsJson(ArangoCollection collection) throws JsonProcessingExcep
21782178
final String values = mapper.writeValueAsString(Arrays.asList(Collections.singletonMap("_key", rnd()),
21792179
Collections.singletonMap("_key", rnd())));
21802180

2181-
final DocumentImportEntity docs = collection.importDocuments(RawData.of(values));
2181+
final DocumentImportEntity docs = collection.importDocuments(RawJson.of(values));
21822182
assertThat(docs).isNotNull();
21832183
assertThat(docs.getCreated()).isEqualTo(2);
21842184
assertThat(docs.getEmpty()).isZero();
@@ -2197,7 +2197,7 @@ void importDocumentsJsonDuplicateDefaultError(ArangoCollection collection) throw
21972197
final String values = mapper.writeValueAsString(Arrays.asList(Collections.singletonMap("_key", k1),
21982198
Collections.singletonMap("_key", k2), Collections.singletonMap("_key", k2)));
21992199

2200-
final DocumentImportEntity docs = collection.importDocuments(RawData.of(values));
2200+
final DocumentImportEntity docs = collection.importDocuments(RawJson.of(values));
22012201
assertThat(docs).isNotNull();
22022202
assertThat(docs.getCreated()).isEqualTo(2);
22032203
assertThat(docs.getEmpty()).isZero();
@@ -2216,7 +2216,7 @@ void importDocumentsJsonDuplicateError(ArangoCollection collection) throws JsonP
22162216
final String values = mapper.writeValueAsString(Arrays.asList(Collections.singletonMap("_key", k1),
22172217
Collections.singletonMap("_key", k2), Collections.singletonMap("_key", k2)));
22182218

2219-
final DocumentImportEntity docs = collection.importDocuments(RawData.of(values),
2219+
final DocumentImportEntity docs = collection.importDocuments(RawJson.of(values),
22202220
new DocumentImportOptions().onDuplicate(OnDuplicate.error));
22212221
assertThat(docs).isNotNull();
22222222
assertThat(docs.getCreated()).isEqualTo(2);
@@ -2235,7 +2235,7 @@ void importDocumentsJsonDuplicateIgnore(ArangoCollection collection) throws Json
22352235

22362236
final String values = mapper.writeValueAsString(Arrays.asList(Collections.singletonMap("_key", k1),
22372237
Collections.singletonMap("_key", k2), Collections.singletonMap("_key", k2)));
2238-
final DocumentImportEntity docs = collection.importDocuments(RawData.of(values),
2238+
final DocumentImportEntity docs = collection.importDocuments(RawJson.of(values),
22392239
new DocumentImportOptions().onDuplicate(OnDuplicate.ignore));
22402240
assertThat(docs).isNotNull();
22412241
assertThat(docs.getCreated()).isEqualTo(2);
@@ -2255,7 +2255,7 @@ void importDocumentsJsonDuplicateReplace(ArangoCollection collection) throws Jso
22552255
final String values = mapper.writeValueAsString(Arrays.asList(Collections.singletonMap("_key", k1),
22562256
Collections.singletonMap("_key", k2), Collections.singletonMap("_key", k2)));
22572257

2258-
final DocumentImportEntity docs = collection.importDocuments(RawData.of(values),
2258+
final DocumentImportEntity docs = collection.importDocuments(RawJson.of(values),
22592259
new DocumentImportOptions().onDuplicate(OnDuplicate.replace));
22602260
assertThat(docs).isNotNull();
22612261
assertThat(docs.getCreated()).isEqualTo(2);
@@ -2275,7 +2275,7 @@ void importDocumentsJsonDuplicateUpdate(ArangoCollection collection) throws Json
22752275
final String values = mapper.writeValueAsString(Arrays.asList(Collections.singletonMap("_key", k1),
22762276
Collections.singletonMap("_key", k2), Collections.singletonMap("_key", k2)));
22772277

2278-
final DocumentImportEntity docs = collection.importDocuments(RawData.of(values),
2278+
final DocumentImportEntity docs = collection.importDocuments(RawJson.of(values),
22792279
new DocumentImportOptions().onDuplicate(OnDuplicate.update));
22802280
assertThat(docs).isNotNull();
22812281
assertThat(docs.getCreated()).isEqualTo(2);
@@ -2290,7 +2290,7 @@ void importDocumentsJsonDuplicateUpdate(ArangoCollection collection) throws Json
22902290
@MethodSource("cols")
22912291
void importDocumentsJsonCompleteFail(ArangoCollection collection) {
22922292
final String values = "[{\"_key\":\"1\"},{\"_key\":\"2\"},{\"_key\":\"2\"}]";
2293-
Throwable thrown = catchThrowable(() -> collection.importDocuments(RawData.of(values),
2293+
Throwable thrown = catchThrowable(() -> collection.importDocuments(RawJson.of(values),
22942294
new DocumentImportOptions().complete(true)));
22952295
assertThat(thrown).isInstanceOf(ArangoDBException.class);
22962296
ArangoDBException e = (ArangoDBException) thrown;
@@ -2306,7 +2306,7 @@ void importDocumentsJsonDetails(ArangoCollection collection) throws JsonProcessi
23062306
final String values = mapper.writeValueAsString(Arrays.asList(Collections.singletonMap("_key", k1),
23072307
Collections.singletonMap("_key", k2), Collections.singletonMap("_key", k2)));
23082308

2309-
final DocumentImportEntity docs = collection.importDocuments(RawData.of(values),
2309+
final DocumentImportEntity docs = collection.importDocuments(RawJson.of(values),
23102310
new DocumentImportOptions().details(true));
23112311
assertThat(docs).isNotNull();
23122312
assertThat(docs.getCreated()).isEqualTo(2);
@@ -2326,7 +2326,7 @@ void importDocumentsJsonOverwriteFalse(ArangoCollection collection) throws JsonP
23262326

23272327
final String values = mapper.writeValueAsString(Arrays.asList(Collections.singletonMap("_key", rnd()),
23282328
Collections.singletonMap("_key", rnd())));
2329-
collection.importDocuments(RawData.of(values), new DocumentImportOptions().overwrite(false));
2329+
collection.importDocuments(RawJson.of(values), new DocumentImportOptions().overwrite(false));
23302330
assertThat(collection.count().getCount()).isEqualTo(initialCount + 2L);
23312331
}
23322332

@@ -2337,7 +2337,7 @@ void importDocumentsJsonOverwriteTrue(ArangoCollection collection) throws JsonPr
23372337

23382338
final String values = mapper.writeValueAsString(Arrays.asList(Collections.singletonMap("_key", rnd()),
23392339
Collections.singletonMap("_key", rnd())));
2340-
collection.importDocuments(RawData.of(values), new DocumentImportOptions().overwrite(true));
2340+
collection.importDocuments(RawJson.of(values), new DocumentImportOptions().overwrite(true));
23412341
assertThat(collection.count().getCount()).isEqualTo(2L);
23422342
}
23432343

@@ -2352,7 +2352,7 @@ void importDocumentsJsonFromToPrefix(ArangoCollection edgeCollection) throws Jso
23522352
final String values = mapper.writeValueAsString(Arrays.asList(new MapBuilder().put("_key", k1).put("_from",
23532353
"from").put("_to", "to").get(), new MapBuilder().put("_key", k2).put("_from", "from").put("_to", "to").get()));
23542354

2355-
final DocumentImportEntity importResult = edgeCollection.importDocuments(RawData.of(values),
2355+
final DocumentImportEntity importResult = edgeCollection.importDocuments(RawJson.of(values),
23562356
new DocumentImportOptions().fromPrefix("foo").toPrefix("bar"));
23572357
assertThat(importResult).isNotNull();
23582358
assertThat(importResult.getCreated()).isEqualTo(2);
@@ -2394,9 +2394,9 @@ void deleteDocumentsByKey(ArangoCollection collection) {
23942394
@ParameterizedTest(name = "{index}")
23952395
@MethodSource("cols")
23962396
void deleteDocumentsRawDataByKeyReturnOld(ArangoCollection collection) {
2397-
final RawData values = RawData.of("[{\"_key\":\"1\"},{\"_key\":\"2\"}]");
2397+
final RawData values = RawJson.of("[{\"_key\":\"1\"},{\"_key\":\"2\"}]");
23982398
collection.insertDocuments(values);
2399-
final RawData keys = RawData.of("[\"1\",\"2\"]");
2399+
final RawData keys = RawJson.of("[\"1\",\"2\"]");
24002400
MultiDocumentEntity<DocumentDeleteEntity<RawData>> deleteResult = collection.deleteDocuments(keys,
24012401
new DocumentDeleteOptions().returnOld(true));
24022402
assertThat(deleteResult).isNotNull();
@@ -2622,10 +2622,10 @@ void updateDocumentsJson(ArangoCollection collection) {
26222622
@ParameterizedTest(name = "{index}")
26232623
@MethodSource("cols")
26242624
void updateDocumentsRawData(ArangoCollection collection) {
2625-
final RawData values = RawData.of("[{\"_key\":\"1\"}, {\"_key\":\"2\"}]");
2625+
final RawData values = RawJson.of("[{\"_key\":\"1\"}, {\"_key\":\"2\"}]");
26262626
collection.insertDocuments(values);
26272627

2628-
final RawData updatedValues = RawData.of("[{\"_key\":\"1\", \"foo\":\"bar\"}, {\"_key\":\"2\", " +
2628+
final RawData updatedValues = RawJson.of("[{\"_key\":\"1\", \"foo\":\"bar\"}, {\"_key\":\"2\", " +
26292629
"\"foo\":\"bar\"}]");
26302630
final MultiDocumentEntity<?> updateResult = collection.updateDocuments(updatedValues);
26312631
assertThat(updateResult.getDocuments()).hasSize(2);
@@ -2635,10 +2635,10 @@ void updateDocumentsRawData(ArangoCollection collection) {
26352635
@ParameterizedTest(name = "{index}")
26362636
@MethodSource("cols")
26372637
void updateDocumentsRawDataReturnNew(ArangoCollection collection) {
2638-
final RawData values = RawData.of("[{\"_key\":\"1\"}, {\"_key\":\"2\"}]");
2638+
final RawData values = RawJson.of("[{\"_key\":\"1\"}, {\"_key\":\"2\"}]");
26392639
collection.insertDocuments(values);
26402640

2641-
final RawData updatedValues = RawData.of("[{\"_key\":\"1\", \"foo\":\"bar\"}, {\"_key\":\"2\", " +
2641+
final RawData updatedValues = RawJson.of("[{\"_key\":\"1\", \"foo\":\"bar\"}, {\"_key\":\"2\", " +
26422642
"\"foo\":\"bar\"}]");
26432643
MultiDocumentEntity<DocumentUpdateEntity<RawData>> updateResult =
26442644
collection.updateDocuments(updatedValues, new DocumentUpdateOptions().returnNew(true));
@@ -2741,10 +2741,10 @@ void replaceDocumentsJson(ArangoCollection collection) {
27412741
@ParameterizedTest(name = "{index}")
27422742
@MethodSource("cols")
27432743
void replaceDocumentsRawData(ArangoCollection collection) {
2744-
final RawData values = RawData.of("[{\"_key\":\"1\"}, {\"_key\":\"2\"}]");
2744+
final RawData values = RawJson.of("[{\"_key\":\"1\"}, {\"_key\":\"2\"}]");
27452745
collection.insertDocuments(values);
27462746

2747-
final RawData updatedValues = RawData.of("[{\"_key\":\"1\", \"foo\":\"bar\"}, {\"_key\":\"2\", " +
2747+
final RawData updatedValues = RawJson.of("[{\"_key\":\"1\", \"foo\":\"bar\"}, {\"_key\":\"2\", " +
27482748
"\"foo\":\"bar\"}]");
27492749
final MultiDocumentEntity<?> updateResult = collection.replaceDocuments(updatedValues);
27502750
assertThat(updateResult.getDocuments()).hasSize(2);
@@ -2754,10 +2754,10 @@ void replaceDocumentsRawData(ArangoCollection collection) {
27542754
@ParameterizedTest(name = "{index}")
27552755
@MethodSource("cols")
27562756
void replaceDocumentsRawDataReturnNew(ArangoCollection collection) {
2757-
final RawData values = RawData.of("[{\"_key\":\"1\"}, {\"_key\":\"2\"}]");
2757+
final RawData values = RawJson.of("[{\"_key\":\"1\"}, {\"_key\":\"2\"}]");
27582758
collection.insertDocuments(values);
27592759

2760-
final RawData updatedValues = RawData.of("[{\"_key\":\"1\", \"foo\":\"bar\"}, {\"_key\":\"2\", " +
2760+
final RawData updatedValues = RawJson.of("[{\"_key\":\"1\", \"foo\":\"bar\"}, {\"_key\":\"2\", " +
27612761
"\"foo\":\"bar\"}]");
27622762
MultiDocumentEntity<DocumentUpdateEntity<RawData>> updateResult =
27632763
collection.replaceDocuments(updatedValues, new DocumentReplaceOptions().returnNew(true));

0 commit comments

Comments
 (0)