From 43a39932002da177c7029452a666edc0c00e541a Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Thu, 29 Jan 2015 10:48:30 +0000
Subject: [PATCH] #2283 fix - Removed unused log traces
---
securis/.gitignore | 1 +
securis/src/main/java/net/curisit/securis/DefaultExceptionHandler.java | 12 ++++++------
securis/src/main/java/net/curisit/securis/services/ApplicationResource.java | 17 ++---------------
3 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/securis/.gitignore b/securis/.gitignore
index 7075a2f..4f5a167 100644
--- a/securis/.gitignore
+++ b/securis/.gitignore
@@ -2,3 +2,4 @@
/.classpath
/.project
/.settings
+/target/
diff --git a/securis/src/main/java/net/curisit/securis/DefaultExceptionHandler.java b/securis/src/main/java/net/curisit/securis/DefaultExceptionHandler.java
index 9a087cf..cda07eb 100644
--- a/securis/src/main/java/net/curisit/securis/DefaultExceptionHandler.java
+++ b/securis/src/main/java/net/curisit/securis/DefaultExceptionHandler.java
@@ -58,18 +58,18 @@
}
private void releaseEntityManager() {
- if (em != null && em.isOpen()) {
- LOG.debug("CLOSING EM: {}, trans: {}", em, em.isJoinedToTransaction());
- try {
+ try {
+ if (em != null && em.isOpen()) {
+ LOG.debug("CLOSING EM: {}, trans: {}", em, em.isJoinedToTransaction());
if (em.isJoinedToTransaction()) {
em.getTransaction().rollback();
LOG.info("ROLLBACK");
}
em.close();
- } catch (Exception ex) {
- ex.printStackTrace();
- LOG.error("Error closing EM: {}, {}", em, ex);
}
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ LOG.error("Error closing EM: {}, {}", em, ex);
}
}
}
diff --git a/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java b/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
index e103f1a..e9b5551 100644
--- a/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
@@ -27,7 +27,6 @@
import net.curisit.integrity.commons.Utils;
import net.curisit.securis.DefaultExceptionHandler;
-import net.curisit.securis.SeCurisException;
import net.curisit.securis.db.Application;
import net.curisit.securis.db.ApplicationMetadata;
import net.curisit.securis.ioc.EnsureTransaction;
@@ -35,7 +34,6 @@
import net.curisit.securis.security.Securable;
import net.curisit.securis.services.exception.SeCurisServiceException;
import net.curisit.securis.services.exception.SeCurisServiceException.ErrorCodes;
-import net.curisit.securis.utils.JsonUtils;
import net.curisit.securis.utils.TokenHelper;
import org.apache.logging.log4j.LogManager;
@@ -100,7 +98,6 @@
return Response.status(Status.NOT_FOUND).build();
}
- // EntityManager em = emProvider.get();
em.clear();
Application app = null;
@@ -115,15 +112,6 @@
throw new SeCurisServiceException(ErrorCodes.NOT_FOUND, "Application not found with ID: " + appid);
}
- try {
- LOG.info("JSON for APP:\n\n\n");
- LOG.info(JsonUtils.toJSON(app));
- } catch (SeCurisException e) {
- LOG.info("ERROR {}", e);
-
- } catch (Exception e) {
- LOG.info("ERROR??? {}", e);
- }
return Response.ok(app).build();
}
@@ -141,16 +129,15 @@
// EntityManager em = emProvider.get();
app.setCreationTimestamp(new Date());
em.persist(app);
- LOG.info("App ID: {}", app.getId());
+
if (app.getApplicationMetadata() != null) {
for (ApplicationMetadata md : app.getApplicationMetadata()) {
md.setApplication(app);
md.setCreationTimestamp(new Date());
em.persist(md);
- LOG.info("Creating METADATA: '{}' -> {}", md.getKey(), md.getCreationTimestamp());
}
}
- LOG.info("Creating application with date: " + app.getCreationTimestamp());
+ LOG.info("Creating application ({}) with date: {}", app.getId(), app.getCreationTimestamp());
return Response.ok(app).build();
}
--
Gitblit v1.3.2