From d8e0eb4409cfcb10d68b6aed1c094278d60db49c Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Wed, 8 Dec 2021 22:03:29 +0100 Subject: [PATCH] STY: formatting --- src/main/java/org/caosdb/server/CaosDBServer.java | 2 +- src/main/java/org/caosdb/server/jobs/Job.java | 1 - .../java/org/caosdb/server/jobs/core/CheckPropValid.java | 9 +++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/caosdb/server/CaosDBServer.java b/src/main/java/org/caosdb/server/CaosDBServer.java index a7aa4f8d..091d4173 100644 --- a/src/main/java/org/caosdb/server/CaosDBServer.java +++ b/src/main/java/org/caosdb/server/CaosDBServer.java @@ -326,7 +326,7 @@ public class CaosDBServer extends Application { // ChecksumUpdater ChecksumUpdater.start(); - + ThreadContext.remove(); } } else { diff --git a/src/main/java/org/caosdb/server/jobs/Job.java b/src/main/java/org/caosdb/server/jobs/Job.java index 14d1185c..9bca9eb2 100644 --- a/src/main/java/org/caosdb/server/jobs/Job.java +++ b/src/main/java/org/caosdb/server/jobs/Job.java @@ -27,7 +27,6 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Set; -import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.AuthorizationException; import org.apache.shiro.authz.Permission; import org.apache.shiro.subject.Subject; diff --git a/src/main/java/org/caosdb/server/jobs/core/CheckPropValid.java b/src/main/java/org/caosdb/server/jobs/core/CheckPropValid.java index 7d9dbc91..112692c8 100644 --- a/src/main/java/org/caosdb/server/jobs/core/CheckPropValid.java +++ b/src/main/java/org/caosdb/server/jobs/core/CheckPropValid.java @@ -23,8 +23,9 @@ package org.caosdb.server.jobs.core; import static org.caosdb.server.utils.ServerMessages.ENTITY_DOES_NOT_EXIST; -import org.apache.shiro.authz.AuthorizationException; + import com.google.common.base.Objects; +import org.apache.shiro.authz.AuthorizationException; import org.caosdb.server.database.exceptions.EntityDoesNotExistException; import org.caosdb.server.database.exceptions.EntityWasNotUniqueException; import org.caosdb.server.entity.EntityInterface; @@ -126,12 +127,12 @@ public class CheckPropValid extends EntityJob { } catch (final Message m) { property.addError(m); } catch (AuthorizationException e) { - property.addError( ServerMessages.AUTHORIZATION_ERROR); + property.addError(ServerMessages.AUTHORIZATION_ERROR); property.addInfo(e.getMessage()); } catch (final EntityDoesNotExistException e) { - property.addError( ENTITY_DOES_NOT_EXIST); + property.addError(ENTITY_DOES_NOT_EXIST); } catch (final EntityWasNotUniqueException e) { - property.addError( ServerMessages.ENTITY_NAME_DUPLICATES); + property.addError(ServerMessages.ENTITY_NAME_DUPLICATES); } } -- GitLab