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

STY: formatting

parent f0bbb674
Branches
No related tags found
1 merge request!75Draft: ENH: file system: core
......@@ -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) {
......
......@@ -147,7 +147,6 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
} else {
entity.setFlag(RegisterFileDownload.FLAG, RegisterFileDownload.FALSE);
}
}
container.add(entity);
}
}
......
......@@ -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.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment