From bab5b4b076841b05aec3e1bdd69f8a216c14aa4b Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 28 Jan 2015 17:29:55 +0000
Subject: [PATCH] #2283 fix - Cleaning unused code and log traces
---
/dev/null | 94 -----------------------------------------------
securis/src/main/java/net/curisit/securis/RestServicesApplication.java | 2 -
securis/src/main/java/net/curisit/securis/services/ApiResource.java | 1
securis/src/main/java/net/curisit/securis/ioc/RequestsInterceptor.java | 14 +++----
4 files changed, 7 insertions(+), 104 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/RestServicesApplication.java b/securis/src/main/java/net/curisit/securis/RestServicesApplication.java
index 7c898d0..85fe326 100644
--- a/securis/src/main/java/net/curisit/securis/RestServicesApplication.java
+++ b/securis/src/main/java/net/curisit/securis/RestServicesApplication.java
@@ -7,7 +7,6 @@
import javax.ws.rs.core.Application;
import net.curisit.securis.ioc.RequestsInterceptor;
-import net.curisit.securis.ioc.TransactionsManager;
import net.curisit.securis.services.ApiResource;
import net.curisit.securis.services.ApplicationResource;
import net.curisit.securis.services.BasicServices;
@@ -38,7 +37,6 @@
classes.add(LicenseTypeResource.class);
classes.add(PackResource.class);
classes.add(RequestsInterceptor.class);
- classes.add(TransactionsManager.class);
LOG.info("JAX-RS classes for services: {}", classes);
return classes;
diff --git a/securis/src/main/java/net/curisit/securis/ioc/RequestsInterceptor.java b/securis/src/main/java/net/curisit/securis/ioc/RequestsInterceptor.java
index 29e2278..39f9c7b 100644
--- a/securis/src/main/java/net/curisit/securis/ioc/RequestsInterceptor.java
+++ b/securis/src/main/java/net/curisit/securis/ioc/RequestsInterceptor.java
@@ -55,6 +55,7 @@
@Inject
private EntityManagerProvider emProvider;
+ @Override
public void filter(ContainerRequestContext containerRequestContext) throws IOException {
EntityManager em = emProvider.getEntityManager();
ResteasyProviderFactory.pushContext(EntityManager.class, em);
@@ -63,7 +64,7 @@
.getProperty("org.jboss.resteasy.core.ResourceMethodInvoker");
Method method = methodInvoker.getMethod();
- LOG.info("Stored in context, em: {}, {}?", em, method.toGenericString());
+ LOG.debug("Stored in context, em: {}, {}", em, method.toGenericString());
boolean next = checkSecurableMethods(containerRequestContext, method);
if (next) {
@@ -75,7 +76,7 @@
EntityManager em = ResteasyProviderFactory.getContextData(EntityManager.class);
if (method.isAnnotationPresent(EnsureTransaction.class)) {
- LOG.info("WE need transaction!!!");
+ LOG.debug("Beginning a new transaction");
em.getTransaction().begin();
}
}
@@ -158,17 +159,14 @@
EntityManager em = ResteasyProviderFactory.getContextData(EntityManager.class);
if (em != null && em.getTransaction().isActive()) {
- LOG.info("There is transaction go ahead...");
+ LOG.debug("Transaction is active, ready to finish it");
if (responseContext.getStatus() == Status.OK.getStatusCode()) {
em.getTransaction().commit();
- LOG.info("COMMIT");
+ LOG.debug("COMMIT");
} else {
em.getTransaction().rollback();
- LOG.info("ROLLBACK");
+ LOG.debug("ROLLBACK");
}
- } else {
- LOG.info("There is NO transaction");
-
}
}
diff --git a/securis/src/main/java/net/curisit/securis/ioc/TransactionsManager.java b/securis/src/main/java/net/curisit/securis/ioc/TransactionsManager.java
deleted file mode 100644
index 33c43f0..0000000
--- a/securis/src/main/java/net/curisit/securis/ioc/TransactionsManager.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package net.curisit.securis.ioc;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-
-import javax.annotation.Priority;
-import javax.interceptor.InvocationContext;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.ws.rs.Priorities;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.ext.Provider;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.jboss.resteasy.core.ResourceMethodInvoker;
-import org.jboss.resteasy.spi.ResteasyProviderFactory;
-
-@Provider
-@Priority(Priorities.AUTHENTICATION)
-public class TransactionsManager implements ContainerRequestFilter, ContainerResponseFilter {
-
- private static final Logger LOG = LogManager.getLogger(TransactionsManager.class);
-
- private EntityManagerFactory entityManagerFactory = javax.persistence.Persistence.createEntityManagerFactory("localdb");
-
- private EntityManager getEM() {
- return entityManagerFactory.createEntityManager();
- }
-
- // @Inject
- // private ThreadLocal<EntityManager> threadLocal;
-
- // @AroundInvoke
- public Object invoke(InvocationContext context) throws Exception {
- EntityManager em = getEM();
- if (!em.getTransaction().isActive()) {
- em.getTransaction().begin();
- LOG.info("INIT trans");
- ResteasyProviderFactory.pushContext(EntityManager.class, em);
- Object result = context.proceed();
-
- em.getTransaction().commit();
- LOG.info("COMMIT trans");
- return result;
- }
- LOG.info("No trans");
- Object result = context.proceed();
- return result;
- }
-
- @Override
- public void filter(ContainerRequestContext requestContext) throws IOException {
- ResourceMethodInvoker methodInvoker = (ResourceMethodInvoker) requestContext.getProperty("org.jboss.resteasy.core.ResourceMethodInvoker");
- Method method = methodInvoker.getMethod();
- EntityManager em = getEM();
-
- ResteasyProviderFactory.pushContext(EntityManager.class, em);
-
- if (method.isAnnotationPresent(EnsureTransaction.class)) {
- LOG.info("WE need transaction!!!");
-
- em.getTransaction().begin();
- }
- LOG.info("Sent to context, em: {}, {}?", em, method.toGenericString());
- }
-
- @Override
- public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) throws IOException {
- // TODO Auto-generated method stub
- // ResteasyProviderFactory.pushContext(EntityManager.class, em);
- EntityManager em = (EntityManager) ResteasyProviderFactory.getContextData(EntityManager.class);
- LOG.info("Operating on em: {}", em);
-
- if (em != null && em.getTransaction().isActive()) {
- LOG.info("There is transaction go ahead...");
- if (responseContext.getStatus() == Status.OK.getStatusCode()) {
- em.getTransaction().commit();
- LOG.info("COMMIT");
- } else {
- em.getTransaction().rollback();
- LOG.info("ROLLBACK");
- }
- } else {
- LOG.info("There is NO transaction");
-
- }
- }
-
-}
diff --git a/securis/src/main/java/net/curisit/securis/services/ApiResource.java b/securis/src/main/java/net/curisit/securis/services/ApiResource.java
index e831a91..5106b43 100644
--- a/securis/src/main/java/net/curisit/securis/services/ApiResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/ApiResource.java
@@ -194,6 +194,7 @@
}
SignedLicenseBean signedLic = renewLicense(previousLic, em);
+ LOG.info("Renewed license code: {}, until: {}", signedLic.getLicenseCode(), signedLic.getExpirationDate());
return Response.ok(signedLic).build();
}
--
Gitblit v1.3.2