From 11d86f394f51a2dea92c5c848dadf00b6cf34cd3 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Sat, 17 Feb 2024 23:29:22 +0100
Subject: [PATCH] STY: formatting
---
.../MySQL/MySQLInsertSparseEntity.java | 23 -------------------
.../grpc/EntityTransactionServiceImpl.java | 1 -
.../server/transaction/Transaction.java | 4 ++--
3 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLInsertSparseEntity.java b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLInsertSparseEntity.java
index 130aae77..b752abd0 100644
--- a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLInsertSparseEntity.java
+++ b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLInsertSparseEntity.java
@@ -24,11 +24,7 @@ package org.caosdb.server.database.backend.implementation.MySQL;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLIntegrityConstraintViolationException;
-<<<<<<< HEAD
import org.caosdb.server.database.DatabaseUtils;
-=======
-import java.sql.Types;
->>>>>>> f-filesystem-cleanup
import org.caosdb.server.database.access.Access;
import org.caosdb.server.database.backend.interfaces.InsertSparseEntityImpl;
import org.caosdb.server.database.exceptions.IntegrityException;
@@ -41,12 +37,7 @@ public class MySQLInsertSparseEntity extends MySQLTransaction implements InsertS
super(access);
}
-<<<<<<< HEAD
- public static final String STMT_INSERT_SPARSE_ENTITY = "call insertEntity(?,?,?,?)";
-=======
public static final String STMT_INSERT_SPARSE_ENTITY = "call insertEntity(?,?,?,?,?)";
- public static final String STMT_INSERT_FILE_PROPERTIES = "call setFileProperties(?,?,?,?)";
->>>>>>> f-filesystem-cleanup
@Override
public void execute(final SparseEntity entity) {
@@ -67,20 +58,6 @@ public class MySQLInsertSparseEntity extends MySQLTransaction implements InsertS
}
}
-<<<<<<< HEAD
-=======
- if (entity.filePath != null) {
- insertFilePropsStmt.setString(1, entity.id);
- insertFilePropsStmt.setString(2, entity.filePath);
- insertFilePropsStmt.setLong(3, entity.fileSize);
- if (entity.fileHash != null) {
- insertFilePropsStmt.setString(4, entity.fileHash.toString());
- } else {
- insertFilePropsStmt.setNull(4, Types.VARCHAR);
- }
- insertFilePropsStmt.execute();
- }
->>>>>>> f-filesystem-cleanup
} catch (final SQLIntegrityConstraintViolationException exc) {
throw new IntegrityException(exc);
} catch (final TransactionException exc) {
diff --git a/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java b/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java
index bdfa6a5c..adcb4baa 100644
--- a/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java
+++ b/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java
@@ -147,7 +147,6 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
} else {
entity.setFlag(RegisterFileDownload.FLAG, RegisterFileDownload.FALSE);
}
- }
container.add(entity);
}
}
diff --git a/src/main/java/org/caosdb/server/transaction/Transaction.java b/src/main/java/org/caosdb/server/transaction/Transaction.java
index 1b7e3b79..bd73da6b 100644
--- a/src/main/java/org/caosdb/server/transaction/Transaction.java
+++ b/src/main/java/org/caosdb/server/transaction/Transaction.java
@@ -51,10 +51,10 @@ import org.caosdb.server.permissions.EntityACL;
import org.caosdb.server.utils.AbstractObservable;
import org.caosdb.server.utils.Info;
import org.caosdb.server.utils.Observer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.caosdb.server.utils.UseCacheResource;
import org.caosdb.server.utils.UseCacheResourceDelegate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The NoOpCache is used when the caching is diabled (globally or for the current transaction.
--
GitLab