From 079d04d9312508fbb678f3686cea2dd06ce3bc4b Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 11 Sep 2020 22:43:28 +0200
Subject: [PATCH] fix integration tests
---
.../backend/transaction/InsertTransactionHistory.java | 5 +----
src/main/java/org/caosdb/server/transaction/Transaction.java | 3 +--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/caosdb/server/database/backend/transaction/InsertTransactionHistory.java b/src/main/java/org/caosdb/server/database/backend/transaction/InsertTransactionHistory.java
index db7393b0..47db0e7f 100644
--- a/src/main/java/org/caosdb/server/database/backend/transaction/InsertTransactionHistory.java
+++ b/src/main/java/org/caosdb/server/database/backend/transaction/InsertTransactionHistory.java
@@ -33,19 +33,16 @@ import org.caosdb.server.utils.EntityStatus;
public class InsertTransactionHistory extends BackendTransaction {
private final TransactionContainer container;
- private final String transaction;
private final UTCDateTime datetime;
private final String user;
private final String realm;
public InsertTransactionHistory(
final TransactionContainer container,
- final String transaction,
final String realm,
final String user,
final UTCDateTime timestamp) {
this.container = container;
- this.transaction = transaction;
this.user = user;
this.datetime = timestamp;
this.realm = realm;
@@ -60,7 +57,7 @@ public class InsertTransactionHistory extends BackendTransaction {
|| e.getEntityStatus() == EntityStatus.VALID) {
t.execute(
- this.transaction,
+ e.getClass().getSimpleName().replace("Entity", ""),
this.realm,
this.user,
this.datetime.getUTCSeconds(),
diff --git a/src/main/java/org/caosdb/server/transaction/Transaction.java b/src/main/java/org/caosdb/server/transaction/Transaction.java
index 0235b8a2..58db7911 100644
--- a/src/main/java/org/caosdb/server/transaction/Transaction.java
+++ b/src/main/java/org/caosdb/server/transaction/Transaction.java
@@ -231,8 +231,7 @@ public abstract class Transaction<C extends TransactionContainer> extends Abstra
String realm = ((Principal) getTransactor().getPrincipal()).getRealm();
String username = ((Principal) getTransactor().getPrincipal()).getUsername();
execute(
- new InsertTransactionHistory(
- getContainer(), this.getClass().getSimpleName(), realm, username, getTimestamp()),
+ new InsertTransactionHistory(getContainer(), realm, username, getTimestamp()),
getAccess());
}
}
--
GitLab