Skip to content
Snippets Groups Projects
Verified Commit ac56b774 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

WIP: MAINT: refactor retrieve properties (move backend-logic to backend)

parent ce345f40
No related branches found
No related tags found
2 merge requests!103Release 0.11.0,!99F refactor retrieve/insert properties
Pipeline #39627 passed
......@@ -33,6 +33,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors;
import org.caosdb.server.database.proto.FlatProperty;
import org.caosdb.server.database.proto.ProtoProperty;
import org.caosdb.server.database.proto.SparseEntity;
......@@ -334,7 +335,7 @@ public class DatabaseUtils {
pp.collValues
.stream()
.map((x) -> (Object) ((Entry<Integer, String>) x).getValue())
.toList();
.collect(Collectors.toList());
}
result.add(pp);
}
......
......@@ -28,24 +28,22 @@ import org.caosdb.server.entity.wrapper.Property;
public class Replacement extends Property {
public Property replacement;
public EntityID replacementId;
@Override
public EntityID getId() {
return replacementId;
return replacement.getId();
}
public void setReplacementId(EntityID id) {
replacementId.link(id);
replacement.getId().link(id);
}
public Replacement(Property p) {
super(p);
replacementId = new EntityID();
replacement = new Property(new RetrieveEntity());
replacement.setDomain(p.getDomainEntity());
replacement.setId(replacementId);
replacement.setId(new EntityID());
replacement.setStatementStatus(StatementStatus.REPLACEMENT);
replacement.setValue(new ReferenceValue(p.getId()));
replacement.setPIdx(0);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment