From 291904e2e21ab647779a818348f19aa580eca88d Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 23 Jan 2020 11:33:06 +0100
Subject: [PATCH] STY: code styling
---
src/main/java/caosdb/server/FileSystem.java | 22 ++++++-------
.../UnixFileSystemGetFileIterator.java | 6 ++--
.../server/jobs/core/InsertFilesInDir.java | 16 +++++-----
.../FileStorageConsistencyCheck.java | 31 ++++++++++---------
4 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/src/main/java/caosdb/server/FileSystem.java b/src/main/java/caosdb/server/FileSystem.java
index a26aee88..79e764b9 100644
--- a/src/main/java/caosdb/server/FileSystem.java
+++ b/src/main/java/caosdb/server/FileSystem.java
@@ -24,17 +24,6 @@
package caosdb.server;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.file.Path;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.regex.Pattern;
-import org.apache.commons.fileupload.FileItemStream;
-import com.google.common.io.Files;
import caosdb.server.database.access.Access;
import caosdb.server.database.backend.transaction.GetFileRecordByPath;
import caosdb.server.database.exceptions.EntityDoesNotExistException;
@@ -45,6 +34,17 @@ import caosdb.server.entity.Message;
import caosdb.server.utils.FileUtils;
import caosdb.server.utils.ServerMessages;
import caosdb.server.utils.Utils;
+import com.google.common.io.Files;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Path;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.regex.Pattern;
+import org.apache.commons.fileupload.FileItemStream;
public class FileSystem {
private static String filesystem = null;
diff --git a/src/main/java/caosdb/server/database/backend/implementation/UnixFileSystem/UnixFileSystemGetFileIterator.java b/src/main/java/caosdb/server/database/backend/implementation/UnixFileSystem/UnixFileSystemGetFileIterator.java
index 78fcac09..5bd6cd56 100644
--- a/src/main/java/caosdb/server/database/backend/implementation/UnixFileSystem/UnixFileSystemGetFileIterator.java
+++ b/src/main/java/caosdb/server/database/backend/implementation/UnixFileSystem/UnixFileSystemGetFileIterator.java
@@ -22,14 +22,14 @@
*/
package caosdb.server.database.backend.implementation.UnixFileSystem;
-import java.io.File;
-import java.util.Arrays;
-import java.util.Iterator;
import caosdb.server.FileSystem;
import caosdb.server.database.access.Access;
import caosdb.server.database.backend.interfaces.GetFileIteratorImpl;
import caosdb.server.database.exceptions.TransactionException;
import caosdb.server.entity.Message;
+import java.io.File;
+import java.util.Arrays;
+import java.util.Iterator;
public class UnixFileSystemGetFileIterator extends UnixFileSystemTransaction
implements GetFileIteratorImpl {
diff --git a/src/main/java/caosdb/server/jobs/core/InsertFilesInDir.java b/src/main/java/caosdb/server/jobs/core/InsertFilesInDir.java
index 7e0517b0..6b3144eb 100644
--- a/src/main/java/caosdb/server/jobs/core/InsertFilesInDir.java
+++ b/src/main/java/caosdb/server/jobs/core/InsertFilesInDir.java
@@ -22,12 +22,6 @@
*/
package caosdb.server.jobs.core;
-import java.io.File;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import caosdb.server.CaosDBException;
import caosdb.server.CaosDBServer;
import caosdb.server.FileSystem;
@@ -48,6 +42,12 @@ import caosdb.server.utils.EntityStatus;
import caosdb.server.utils.FileUtils;
import caosdb.server.utils.Undoable;
import caosdb.server.utils.Utils;
+import java.io.File;
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
@JobAnnotation(
flag = "InsertFilesInDir",
@@ -276,9 +276,7 @@ public class InsertFilesInDir extends FlagJob {
getContainer()
.addMessage(
new Message(
- MessageType.Warning,
- 2,
- "Explicitly excluded file: " + sub.getCanonicalPath()));
+ MessageType.Warning, 2, "Explicitly excluded file: " + sub.getCanonicalPath()));
return false;
}
}
diff --git a/src/main/java/caosdb/server/transaction/FileStorageConsistencyCheck.java b/src/main/java/caosdb/server/transaction/FileStorageConsistencyCheck.java
index 8bf56a20..26cab30e 100644
--- a/src/main/java/caosdb/server/transaction/FileStorageConsistencyCheck.java
+++ b/src/main/java/caosdb/server/transaction/FileStorageConsistencyCheck.java
@@ -22,13 +22,6 @@
*/
package caosdb.server.transaction;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.TimeZone;
-import org.jdom2.Element;
import caosdb.datetime.UTCDateTime;
import caosdb.server.database.DatabaseMonitor;
import caosdb.server.database.access.Access;
@@ -42,6 +35,13 @@ import caosdb.server.database.proto.SparseEntity;
import caosdb.server.entity.Message;
import caosdb.server.entity.xml.ToElementable;
import caosdb.server.utils.SHA512;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.TimeZone;
+import org.jdom2.Element;
public class FileStorageConsistencyCheck extends Thread
implements ToElementable, TransactionInterface {
@@ -91,21 +91,24 @@ public class FileStorageConsistencyCheck extends Thread
final GetFileRecordByPath t = execute(new GetFileRecordByPath(path), this.access);
final int result =
execute(
- new FileConsistencyCheck(
- path, t.getSize(), t.getHash(), t.getLastConsistencyCheck(), new SHA512()),
- this.access)
- .getResult();
-
+ new FileConsistencyCheck(
+ path,
+ t.getSize(),
+ t.getHash(),
+ t.getLastConsistencyCheck(),
+ new SHA512()),
+ this.access)
+ .getResult();
+
if (result != FileConsistencyCheck.OK) {
this.results.put(path, result);
}
-
+
execute(new SetFileCheckedTimestamp(t.getId(), this.ts), this.access);
} catch (EntityDoesNotExistException e) {
this.results.put(path, FileConsistencyCheck.UNKNOWN_FILE);
continue;
}
-
}
// test all remaining file records
--
GitLab