From ac56b7746d683050512ef58288e526f92c056397 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 16 Aug 2023 01:10:28 +0200
Subject: [PATCH] WIP: MAINT: refactor retrieve properties (move backend-logic
to backend)
---
.../backend/implementation/MySQL/DatabaseUtils.java | 3 ++-
.../backend/implementation/MySQL/Replacement.java | 8 +++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/DatabaseUtils.java b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/DatabaseUtils.java
index 0347028b..20d43389 100644
--- a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/DatabaseUtils.java
+++ b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/DatabaseUtils.java
@@ -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);
}
diff --git a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/Replacement.java b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/Replacement.java
index 66bf99c4..fa2fb7cb 100644
--- a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/Replacement.java
+++ b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/Replacement.java
@@ -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);
--
GitLab