Temporarily disables json ignore on empty values.
This commit is contained in:
parent
3924176ce4
commit
7bac52267a
|
@ -309,10 +309,10 @@ public class DMP implements DataEntity<DMP, UUID> {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public DMP buildFromTuple(List<Tuple> tuple, String base) {
|
public DMP buildFromTuple(List<Tuple> tuple, List<String> fields, String base) {
|
||||||
this.id = tuple.get(0).get(base.isEmpty() ? "id" : base + "." + "id", UUID.class);
|
this.id = tuple.get(0).get(base.isEmpty() ? "id" : base + "." + "id", UUID.class);
|
||||||
this.dataset = tuple.stream().map(x -> new Dataset().buildFromTuple(tuple, base.isEmpty() ? "dataset" : base + "." + "dataset")).collect(Collectors.toSet());
|
this.dataset = tuple.stream().map(x -> new Dataset().buildFromTuple(tuple, fields ,base.isEmpty() ? "dataset" : base + "." + "dataset")).collect(Collectors.toSet());
|
||||||
this.creator = tuple.stream().map(x -> new UserInfo().buildFromTuple(tuple, base.isEmpty() ? "creator" : base + "." + "creator")).collect(Collectors.toList()).get(0);
|
this.creator = tuple.stream().map(x -> new UserInfo().buildFromTuple(tuple, fields , base.isEmpty() ? "creator" : base + "." + "creator")).collect(Collectors.toList()).get(0);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -162,7 +162,7 @@ public class DatasetProfile implements DataEntity<DatasetProfile,UUID>{
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public DatasetProfile buildFromTuple(List<Tuple> tuple, String base) {
|
public DatasetProfile buildFromTuple(List<Tuple> tuple, List<String> fields, String base) {
|
||||||
this.id = UUID.fromString((String) tuple.get(0).get(base.isEmpty() ? base + "." + "id" : "id"));
|
this.id = UUID.fromString((String) tuple.get(0).get(base.isEmpty() ? base + "." + "id" : "id"));
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,9 +21,7 @@ public class JacksonConfiguration {
|
||||||
criteriaSerializerModule.addDeserializer(Criteria.class, new CriteriaSerializer());
|
criteriaSerializerModule.addDeserializer(Criteria.class, new CriteriaSerializer());
|
||||||
modules.add(criteriaSerializerModule);
|
modules.add(criteriaSerializerModule);
|
||||||
|
|
||||||
return new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL)
|
return new ObjectMapper()
|
||||||
.setSerializationInclusion(JsonInclude.Include.NON_ABSENT)
|
|
||||||
.setSerializationInclusion(JsonInclude.Include.NON_EMPTY)
|
|
||||||
.registerModules(modules);
|
.registerModules(modules);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue