Skip to content

Commit c36b5d4

Browse files
author
Mark
committed
extend ImportResultEntity
1 parent 5751d68 commit c36b5d4

File tree

3 files changed

+94
-29
lines changed

3 files changed

+94
-29
lines changed

src/main/java/com/arangodb/ArangoClient.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ private void importDocumentsImpl(String collectionName, List<String> values, Imp
4242
total.setCreated(total.getCreated() + result.getCreated());
4343
total.setErrors(total.getErrors() + result.getErrors());
4444
total.setEmpty(total.getEmpty() + result.getEmpty());
45+
total.setUpdated(total.getUpdated() + result.getUpdated());
46+
total.setIgnored(total.getIgnored() + result.getIgnored());
47+
total.getDetails().addAll(result.getDetails());
4548
}
4649

4750
public ImportResultEntity importRawJsonDocuments(String collectionName, Iterator<String> itr, int bufferCount)

src/main/java/com/arangodb/entity/EntityDeserializers.java

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,12 @@ public class EntityDeserializers {
170170

171171
private static final String MESSAGE = "message";
172172

173+
private static final String CREATED = "created";
174+
private static final String ERRORS = "errors";
175+
private static final String EMPTY = "empty";
176+
private static final String IGNORED = "ignored";
177+
private static final String DETAILS = "details";
178+
173179
private static Logger logger = LoggerFactory.getLogger(EntityDeserializers.class);
174180

175181
private static class ClassHolder {
@@ -1308,6 +1314,7 @@ public UserEntity deserialize(
13081314
}
13091315

13101316
public static class ImportResultEntityDeserializer implements JsonDeserializer<ImportResultEntity> {
1317+
13111318
@Override
13121319
public ImportResultEntity deserialize(
13131320
final JsonElement json,
@@ -1321,16 +1328,31 @@ public ImportResultEntity deserialize(
13211328
final JsonObject obj = json.getAsJsonObject();
13221329
final ImportResultEntity entity = deserializeBaseParameter(obj, new ImportResultEntity());
13231330

1324-
if (obj.has("created")) {
1325-
entity.created = obj.getAsJsonPrimitive("created").getAsInt();
1331+
if (obj.has(CREATED)) {
1332+
entity.setCreated(obj.getAsJsonPrimitive(CREATED).getAsInt());
1333+
}
1334+
1335+
if (obj.has(ERRORS)) {
1336+
entity.setErrors(obj.getAsJsonPrimitive(ERRORS).getAsInt());
1337+
}
1338+
1339+
if (obj.has(EMPTY)) {
1340+
entity.setEmpty(obj.getAsJsonPrimitive(EMPTY).getAsInt());
13261341
}
13271342

1328-
if (obj.has("errors")) {
1329-
entity.errors = obj.getAsJsonPrimitive("errors").getAsInt();
1343+
if (obj.has(UPDATED)) {
1344+
entity.setUpdated(obj.getAsJsonPrimitive(UPDATED).getAsInt());
13301345
}
13311346

1332-
if (obj.has("empty")) {
1333-
entity.empty = obj.getAsJsonPrimitive("empty").getAsInt();
1347+
if (obj.has(IGNORED)) {
1348+
entity.setIgnored(obj.getAsJsonPrimitive(IGNORED).getAsInt());
1349+
}
1350+
1351+
if (obj.has(DETAILS)) {
1352+
final JsonArray asJsonArray = obj.getAsJsonArray(DETAILS);
1353+
for (JsonElement jsonElement : asJsonArray) {
1354+
entity.getDetails().add(jsonElement.getAsString());
1355+
}
13341356
}
13351357

13361358
return entity;

src/main/java/com/arangodb/entity/ImportResultEntity.java

Lines changed: 63 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,73 @@
1616

1717
package com.arangodb.entity;
1818

19+
import java.util.ArrayList;
20+
import java.util.List;
21+
1922
/**
2023
* @author tamtam180 - kirscheless at gmail.com
2124
*
2225
*/
2326
public class ImportResultEntity extends BaseEntity {
2427

25-
int created;
26-
int errors;
27-
int empty;
28-
29-
public int getCreated() {
30-
return created;
31-
}
32-
public int getErrors() {
33-
return errors;
34-
}
35-
public int getEmpty() {
36-
return empty;
37-
}
38-
public void setCreated(int created) {
39-
this.created = created;
40-
}
41-
public void setErrors(int errors) {
42-
this.errors = errors;
43-
}
44-
public void setEmpty(int empty) {
45-
this.empty = empty;
46-
}
47-
28+
private int created;
29+
private int errors;
30+
private int empty;
31+
private int updated;
32+
private int ignored;
33+
private List<String> details;
34+
35+
public ImportResultEntity() {
36+
super();
37+
details = new ArrayList<String>();
38+
}
39+
40+
public int getCreated() {
41+
return created;
42+
}
43+
44+
public void setCreated(int created) {
45+
this.created = created;
46+
}
47+
48+
public int getErrors() {
49+
return errors;
50+
}
51+
52+
public void setErrors(int errors) {
53+
this.errors = errors;
54+
}
55+
56+
public int getEmpty() {
57+
return empty;
58+
}
59+
60+
public void setEmpty(int empty) {
61+
this.empty = empty;
62+
}
63+
64+
public int getUpdated() {
65+
return updated;
66+
}
67+
68+
public void setUpdated(int updated) {
69+
this.updated = updated;
70+
}
71+
72+
public int getIgnored() {
73+
return ignored;
74+
}
75+
76+
public void setIgnored(int ignored) {
77+
this.ignored = ignored;
78+
}
79+
80+
public List<String> getDetails() {
81+
return details;
82+
}
83+
84+
public void setDetails(List<String> details) {
85+
this.details = details;
86+
}
87+
4888
}

0 commit comments

Comments
 (0)