logging updates
diff --git a/src/main/java/de/ids_mannheim/korap/handlers/BatchBuilder.java b/src/main/java/de/ids_mannheim/korap/handlers/BatchBuilder.java
index b7ee677..e55cae1 100644
--- a/src/main/java/de/ids_mannheim/korap/handlers/BatchBuilder.java
+++ b/src/main/java/de/ids_mannheim/korap/handlers/BatchBuilder.java
@@ -1,7 +1,7 @@
package de.ids_mannheim.korap.handlers;
-import de.ids_mannheim.korap.utils.KustvaktLogger;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.JdbcOperations;
import org.springframework.jdbc.core.RowMapper;
@@ -21,7 +21,7 @@
private static final int SMALL_MEDIUM_BATCH = 6;
private static final int MEDIUM_BATCH = 8;
private static final int LARGE_BATCH = 12;
- private Logger log = KustvaktLogger.getLogger(BatchBuilder.class);
+ private Logger log = LoggerFactory.getLogger(BatchBuilder.class);
private JdbcOperations operations;
diff --git a/src/main/java/de/ids_mannheim/korap/handlers/CollectionDao.java b/src/main/java/de/ids_mannheim/korap/handlers/CollectionDao.java
index 69255f9..d6d57bf 100644
--- a/src/main/java/de/ids_mannheim/korap/handlers/CollectionDao.java
+++ b/src/main/java/de/ids_mannheim/korap/handlers/CollectionDao.java
@@ -7,8 +7,8 @@
import de.ids_mannheim.korap.resources.KustvaktResource;
import de.ids_mannheim.korap.resources.VirtualCollection;
import de.ids_mannheim.korap.user.User;
-import de.ids_mannheim.korap.utils.KustvaktLogger;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -26,7 +26,7 @@
public class CollectionDao
implements ResourceOperationIface<VirtualCollection> {
- private static Logger log = KustvaktLogger.getLogger(CollectionDao.class);
+ private static Logger log = LoggerFactory.getLogger(CollectionDao.class);
private BatchBuilder batchBuilder;
protected final NamedParameterJdbcTemplate jdbcTemplate;
diff --git a/src/main/java/de/ids_mannheim/korap/handlers/EntityDao.java b/src/main/java/de/ids_mannheim/korap/handlers/EntityDao.java
index 10082b2..067abda 100644
--- a/src/main/java/de/ids_mannheim/korap/handlers/EntityDao.java
+++ b/src/main/java/de/ids_mannheim/korap/handlers/EntityDao.java
@@ -10,9 +10,9 @@
import de.ids_mannheim.korap.interfaces.db.PersistenceClient;
import de.ids_mannheim.korap.user.*;
import de.ids_mannheim.korap.utils.BooleanUtils;
-import de.ids_mannheim.korap.utils.KustvaktLogger;
import de.ids_mannheim.korap.utils.TimeUtils;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.RowMapper;
@@ -36,7 +36,7 @@
*/
public class EntityDao implements EntityHandlerIface {
- private static Logger jlog = KustvaktLogger.getLogger(EntityDao.class);
+ private static Logger jlog = LoggerFactory.getLogger(EntityDao.class);
private NamedParameterJdbcTemplate jdbcTemplate;
public EntityDao(PersistenceClient client) {
diff --git a/src/main/java/de/ids_mannheim/korap/handlers/OAuthDb.java b/src/main/java/de/ids_mannheim/korap/handlers/OAuthDb.java
index b593bce..9b10f96 100644
--- a/src/main/java/de/ids_mannheim/korap/handlers/OAuthDb.java
+++ b/src/main/java/de/ids_mannheim/korap/handlers/OAuthDb.java
@@ -9,7 +9,6 @@
import de.ids_mannheim.korap.user.TokenContext;
import de.ids_mannheim.korap.user.User;
import de.ids_mannheim.korap.utils.BooleanUtils;
-import de.ids_mannheim.korap.utils.KustvaktLogger;
import de.ids_mannheim.korap.utils.TimeUtils;
import edu.emory.mathcs.backport.java.util.Collections;
import org.slf4j.Logger;
@@ -30,8 +29,7 @@
*/
public class OAuthDb {
- private static final Logger errorLogger = LoggerFactory
- .getLogger(KustvaktLogger.ERROR_LOG);
+ private static final Logger jlog = LoggerFactory.getLogger(OAuthDb.class);
private NamedParameterJdbcTemplate jdbcTemplate;
public OAuthDb(PersistenceClient client) {
@@ -62,8 +60,7 @@
}
});
}catch (EmptyResultDataAccessException ex) {
- errorLogger.error("'{}' client found", clientid,
- ex.fillInStackTrace());
+ jlog.error("'{}' client found", clientid, ex.fillInStackTrace());
return null;
}
}
@@ -76,8 +73,7 @@
try {
return this.jdbcTemplate.update(sql, s) == 1;
}catch (DataAccessException e) {
- errorLogger
- .error("token could not be revoked", e.fillInStackTrace());
+ jlog.error("token could not be revoked", e.fillInStackTrace());
return false;
}
}
@@ -95,9 +91,8 @@
try {
this.jdbcTemplate.update(tokens, source);
}catch (DataAccessException e) {
- errorLogger
- .error("authorization could not be revoked for user '{}'",
- user.getUsername());
+ jlog.error("authorization could not be revoked for user '{}'",
+ user.getUsername());
return false;
}
//fixme: if int row not updated, false!!
@@ -123,9 +118,8 @@
return this.jdbcTemplate.update(sql, s) == 1;
}catch (DataAccessException e) {
e.printStackTrace();
- errorLogger
- .error("token '{}' could not be added for user '{}'", token,
- userid);
+ jlog.error("token '{}' could not be added for user '{}'", token,
+ userid);
return false;
}
}
@@ -141,10 +135,10 @@
try {
return this.jdbcTemplate.queryForObject(sql, s, String.class);
}catch (EmptyResultDataAccessException ex) {
- errorLogger.error("no token found for user '{}'", userid);
+ jlog.error("no token found for user '{}'", userid);
return null;
}catch (DataAccessException ex) {
- errorLogger.error("token retrieval failed for user '{}'", userid);
+ jlog.error("token retrieval failed for user '{}'", userid);
return null;
}
}
@@ -178,7 +172,7 @@
}
});
}catch (DataAccessException e) {
- errorLogger.error("Data access error", e);
+ jlog.error("Data access error", e);
return Collections.emptyList();
}
@@ -213,11 +207,11 @@
});
return context;
}catch (EmptyResultDataAccessException ee) {
- errorLogger.error("no context found for token '{}'", token);
+ jlog.error("no context found for token '{}'", token);
revokeToken(token);
throw new KustvaktException(StatusCodes.EXPIRED, "token", token);
}catch (DataAccessException e) {
- errorLogger.error("token context retrieval failed for '{}'", token);
+ jlog.error("token context retrieval failed for '{}'", token);
throw new KustvaktException(StatusCodes.ILLEGAL_ARGUMENT,
"invalid token", token);
}
@@ -238,8 +232,7 @@
this.jdbcTemplate.update(sql, p);
}catch (DataAccessException e) {
e.printStackTrace();
- errorLogger
- .error("removing client '{}' failed", info.getClient_id());
+ jlog.error("removing client '{}' failed", info.getClient_id());
throw new dbException(new KustvaktException(user.getId(),
StatusCodes.ILLEGAL_ARGUMENT, "arguments given not valid",
info.toJSON()), StatusCodes.CLIENT_REMOVAL_FAILURE,
@@ -264,8 +257,7 @@
this.jdbcTemplate.update(sql, p);
}catch (DataAccessException e) {
e.printStackTrace();
- errorLogger.error("registering client '{}' failed",
- info.getClient_id());
+ jlog.error("registering client '{}' failed", info.getClient_id());
throw new dbException(new KustvaktException(user.getId(),
StatusCodes.ILLEGAL_ARGUMENT, "arguments given not valid",
info.toJSON()), StatusCodes.CLIENT_REGISTRATION_FAILURE,
diff --git a/src/main/java/de/ids_mannheim/korap/handlers/ResourceDao.java b/src/main/java/de/ids_mannheim/korap/handlers/ResourceDao.java
index 53c89fc..0aeeaac 100644
--- a/src/main/java/de/ids_mannheim/korap/handlers/ResourceDao.java
+++ b/src/main/java/de/ids_mannheim/korap/handlers/ResourceDao.java
@@ -9,9 +9,9 @@
import de.ids_mannheim.korap.resources.ResourceFactory;
import de.ids_mannheim.korap.user.Attributes;
import de.ids_mannheim.korap.user.User;
-import de.ids_mannheim.korap.utils.KustvaktLogger;
import de.ids_mannheim.korap.utils.SqlBuilder;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.IncorrectResultSizeDataAccessException;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
@@ -30,7 +30,7 @@
public class ResourceDao<T extends KustvaktResource>
implements ResourceOperationIface<T> {
- private static Logger log = KustvaktLogger.getLogger(ResourceDao.class);
+ private static Logger log = LoggerFactory.getLogger(ResourceDao.class);
protected final NamedParameterJdbcTemplate jdbcTemplate;
public ResourceDao(PersistenceClient client) {