From 8e333069bc3bf8b547a91f80f7e89324237b7575 Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Mon, 15 Nov 2021 15:27:55 +0100
Subject: [PATCH] MAINT: Removed archaic print(...) methods from entity
classes,
---
caosdb-proto | 2 +-
.../java/org/caosdb/server/entity/Entity.java | 68 -------------------
.../caosdb/server/entity/EntityInterface.java | 4 --
.../caosdb/server/entity/FileProperties.java | 15 ----
.../org/caosdb/server/entity/Message.java | 17 -----
.../container/TransactionContainer.java | 9 ---
.../server/entity/wrapper/EntityWrapper.java | 10 ---
.../caosdb/server/database/InsertTest.java | 11 ---
8 files changed, 1 insertion(+), 135 deletions(-)
diff --git a/caosdb-proto b/caosdb-proto
index 9fa41dce..533c8e73 160000
--- a/caosdb-proto
+++ b/caosdb-proto
@@ -1 +1 @@
-Subproject commit 9fa41dce325d370eb8da60a77e921d4a0618f513
+Subproject commit 533c8e7341d0659e3cc43d834793a7a965703f55
diff --git a/src/main/java/org/caosdb/server/entity/Entity.java b/src/main/java/org/caosdb/server/entity/Entity.java
index 6e61764a..20ef481c 100644
--- a/src/main/java/org/caosdb/server/entity/Entity.java
+++ b/src/main/java/org/caosdb/server/entity/Entity.java
@@ -550,79 +550,11 @@ public class Entity extends AbstractObservable implements EntityInterface {
getToElementStrategy().addToElement(this, element, strategy);
}
- /**
- * Print this entity to the standard outputs. Just for debugging.
- *
- * @throws CaosDBException
- */
- @Override
- public void print() {
- print("");
- }
-
@Override
public Integer getDomain() {
return 0;
}
- @Override
- public void print(final String indent) {
- System.out.println(
- indent
- + "+---| "
- + this.getClass().getSimpleName()
- + " |----------------------------------");
- if (getDomain() != 0) {
- System.out.println(indent + "| Domain: " + Integer.toString(getDomain()));
- }
- if (hasId()) {
- System.out.println(indent + "| ID: " + Integer.toString(getId()));
- }
- if (hasCuid()) {
- System.out.println(indent + "| Cuid: " + getCuid());
- }
- if (hasName()) {
- System.out.println(indent + "| Name: " + getName());
- }
- if (hasDescription()) {
- System.out.println(indent + "| Description: " + getDescription());
- }
- if (hasRole()) {
- System.out.println(indent + "| Role: " + getRole());
- }
- if (hasStatementStatus()) {
- System.out.println(indent + "| Statement: " + getStatementStatus().toString());
- }
- if (hasDatatype()) {
- System.out.println(indent + "| Datatype: " + getDatatype().toString());
- }
- if (hasValue()) {
- System.out.println(indent + "| Value: " + getValue().toString());
- }
- if (hasEntityStatus()) {
- System.out.println(indent + "| Entity: " + getEntityStatus().toString());
- }
- if (hasFileProperties()) {
- getFileProperties().print(indent);
- }
- System.out.println(indent + "+-----------------------------------");
- for (final ToElementable m : getMessages()) {
- if (m instanceof Message) {
- ((Message) m).print(indent + "| ");
- }
- }
- for (final EntityInterface p : getParents()) {
- // p.print(indent + "| ");
- System.out.println(indent + "| Parent: " + p.getName());
- }
- for (final EntityInterface s : getProperties()) {
- s.print(indent + "| ");
- }
- if (indent.equals("")) {
- System.out.println(indent + "+------------------------------------");
- }
- }
-
/** Errors, Warnings and Info messages for this entity. */
private final Set<ToElementable> messages = new HashSet<>();
diff --git a/src/main/java/org/caosdb/server/entity/EntityInterface.java b/src/main/java/org/caosdb/server/entity/EntityInterface.java
index 954bcc47..46726df6 100644
--- a/src/main/java/org/caosdb/server/entity/EntityInterface.java
+++ b/src/main/java/org/caosdb/server/entity/EntityInterface.java
@@ -112,10 +112,6 @@ public interface EntityInterface
public abstract boolean hasDatatype();
- public abstract void print();
-
- public abstract void print(String indent);
-
public abstract FileProperties getFileProperties();
public abstract void setFileProperties(FileProperties fileProperties);
diff --git a/src/main/java/org/caosdb/server/entity/FileProperties.java b/src/main/java/org/caosdb/server/entity/FileProperties.java
index daeec098..eaf4246f 100644
--- a/src/main/java/org/caosdb/server/entity/FileProperties.java
+++ b/src/main/java/org/caosdb/server/entity/FileProperties.java
@@ -103,21 +103,6 @@ public class FileProperties {
this.tmpIdentifier = tmpIdentifier;
}
- public void print(final String indent) {
- if (hasChecksum()) {
- System.out.println(indent + "| Checksum: " + this.checksum);
- }
- if (hasPath()) {
- System.out.println(indent + "| Path: " + "/" + this.path);
- }
- if (hasSize()) {
- System.out.println(indent + "| Size: " + Long.toString(this.size));
- }
- if (getFile() != null) {
- System.out.println(indent + "| File: " + getFile().getAbsolutePath());
- }
- }
-
public FileProperties setFile(final File file) {
this.file = file;
return this;
diff --git a/src/main/java/org/caosdb/server/entity/Message.java b/src/main/java/org/caosdb/server/entity/Message.java
index 7f5c2836..4c89e1ee 100644
--- a/src/main/java/org/caosdb/server/entity/Message.java
+++ b/src/main/java/org/caosdb/server/entity/Message.java
@@ -182,23 +182,6 @@ public class Message extends Exception implements Comparable<Message>, ToElement
parent.addContent(e);
}
- /** Print this entity to the standard outputs. Just for debugging. */
- public final void print() {
- print("");
- }
-
- public final void print(final String indent) {
- System.out.println(indent + "+---| " + this.type + " |------------------------ ");
- System.out.println(indent + "| Code: " + this.code.toString());
- System.out.println(indent + "| Description: " + this.description);
- System.out.println(indent + "| Body: " + this.body);
- System.out.println(indent + "+------------------------------------------------------ ");
- }
-
- public boolean equalsCore(final Message other) {
- return this.code == other.code && this.description == other.description;
- }
-
@Override
public int compareTo(final Message o) {
final int tc = this.type.compareToIgnoreCase(o.type);
diff --git a/src/main/java/org/caosdb/server/entity/container/TransactionContainer.java b/src/main/java/org/caosdb/server/entity/container/TransactionContainer.java
index 18a7837d..7e9a2ba3 100644
--- a/src/main/java/org/caosdb/server/entity/container/TransactionContainer.java
+++ b/src/main/java/org/caosdb/server/entity/container/TransactionContainer.java
@@ -114,15 +114,6 @@ public class TransactionContainer extends Container<EntityInterface>
}
}
- public void print() {
- System.out.println("*******************************************************************");
- System.out.println("*******************************************************************");
- for (final EntityInterface e : this) {
- e.print("*");
- }
- System.out.println("*******************************************************************\n\n");
- }
-
/** The files that have been uploaded. */
private HashMap<String, FileProperties> files = new HashMap<String, FileProperties>();
diff --git a/src/main/java/org/caosdb/server/entity/wrapper/EntityWrapper.java b/src/main/java/org/caosdb/server/entity/wrapper/EntityWrapper.java
index 140bb207..e5115dc2 100644
--- a/src/main/java/org/caosdb/server/entity/wrapper/EntityWrapper.java
+++ b/src/main/java/org/caosdb/server/entity/wrapper/EntityWrapper.java
@@ -290,16 +290,6 @@ public class EntityWrapper implements EntityInterface {
this.entity.addToElement(element);
}
- @Override
- public void print() {
- this.entity.print();
- }
-
- @Override
- public void print(final String indent) {
- this.entity.print(indent);
- }
-
@Override
public FileProperties getFileProperties() {
return this.entity.getFileProperties();
diff --git a/src/test/java/org/caosdb/server/database/InsertTest.java b/src/test/java/org/caosdb/server/database/InsertTest.java
index 7b00cacf..b6b535c7 100644
--- a/src/test/java/org/caosdb/server/database/InsertTest.java
+++ b/src/test/java/org/caosdb/server/database/InsertTest.java
@@ -224,8 +224,6 @@ public class InsertTest {
subp.setStatementStatus(StatementStatus.FIX);
p2.addProperty(subp);
- r.print();
-
final LinkedList<EntityInterface> stage1Inserts = new LinkedList<EntityInterface>();
final LinkedList<EntityInterface> stage2Inserts = new LinkedList<EntityInterface>();
@@ -254,15 +252,6 @@ public class InsertTest {
assertEquals((Integer) 2, stage2Inserts.get(0).getId());
assertEquals("V2", ((SingleValue) stage2Inserts.get(0).getValue()).toDatabaseString());
assertFalse(stage2Inserts.get(0).hasReplacement());
-
- System.out.println("######### stage 1 #########");
- for (EntityInterface e : stage1Inserts) {
- e.print();
- }
- System.out.println("######### stage 2 #########");
- for (EntityInterface e : stage2Inserts) {
- e.print();
- }
}
/**
--
GitLab