#2283 fix - Cleaning unused code and log traces

rsanchez

2015-01-28 bab5b4b076841b05aec3e1bdd69f8a216c14aa4b

#2283 fix - Cleaning unused code and log traces

 securis/src/main/java/net/curisit/securis/RestServicesApplication.java
..
..
@@ -7,7 +7,6 @@
7
7
 import javax.ws.rs.core.Application;
8
8
 
9
9
 import net.curisit.securis.ioc.RequestsInterceptor;
10
-import net.curisit.securis.ioc.TransactionsManager;
11
10
 import net.curisit.securis.services.ApiResource;
12
11
 import net.curisit.securis.services.ApplicationResource;
13
12
 import net.curisit.securis.services.BasicServices;
..
..
@@ -38,7 +37,6 @@
38
37
         classes.add(LicenseTypeResource.class);
39
38
         classes.add(PackResource.class);
40
39
         classes.add(RequestsInterceptor.class);
41
-        classes.add(TransactionsManager.class);
42
40
 
43
41
         LOG.info("JAX-RS classes for services: {}", classes);
44
42
         return classes;

 securis/src/main/java/net/curisit/securis/ioc/RequestsInterceptor.java
..
..
@@ -55,6 +55,7 @@
55
55
     @Inject
56
56
     private EntityManagerProvider emProvider;
57
57
 
58
+    @Override
58
59
     public void filter(ContainerRequestContext containerRequestContext) throws IOException {
59
60
         EntityManager em = emProvider.getEntityManager();
60
61
         ResteasyProviderFactory.pushContext(EntityManager.class, em);
..
..
@@ -63,7 +64,7 @@
63
64
                 .getProperty("org.jboss.resteasy.core.ResourceMethodInvoker");
64
65
         Method method = methodInvoker.getMethod();
65
66
 
66
-        LOG.info("Stored in context, em: {}, {}?", em, method.toGenericString());
67
+        LOG.debug("Stored in context, em: {}, {}", em, method.toGenericString());
67
68
 
68
69
         boolean next = checkSecurableMethods(containerRequestContext, method);
69
70
         if (next) {
..
..
@@ -75,7 +76,7 @@
75
76
         EntityManager em = ResteasyProviderFactory.getContextData(EntityManager.class);
76
77
 
77
78
         if (method.isAnnotationPresent(EnsureTransaction.class)) {
78
-            LOG.info("WE need transaction!!!");
79
+            LOG.debug("Beginning a new transaction");
79
80
             em.getTransaction().begin();
80
81
         }
81
82
     }
..
..
@@ -158,17 +159,14 @@
158
159
         EntityManager em = ResteasyProviderFactory.getContextData(EntityManager.class);
159
160
 
160
161
         if (em != null && em.getTransaction().isActive()) {
161
-            LOG.info("There is transaction go ahead...");
162
+            LOG.debug("Transaction is active, ready to finish it");
162
163
             if (responseContext.getStatus() == Status.OK.getStatusCode()) {
163
164
                 em.getTransaction().commit();
164
-                LOG.info("COMMIT");
165
+                LOG.debug("COMMIT");
165
166
             } else {
166
167
                 em.getTransaction().rollback();
167
-                LOG.info("ROLLBACK");
168
+                LOG.debug("ROLLBACK");
168
169
             }
169
-        } else {
170
-            LOG.info("There is NO transaction");
171
-
172
170
         }
173
171
     }
174
172
 
 securis/src/main/java/net/curisit/securis/ioc/TransactionsManager.java
deleted file mode 100644
..
..
@@ -1,94 +0,0 @@
1
-package net.curisit.securis.ioc;
2
-
3
-import java.io.IOException;
4
-import java.lang.reflect.Method;
5
-
6
-import javax.annotation.Priority;
7
-import javax.interceptor.InvocationContext;
8
-import javax.persistence.EntityManager;
9
-import javax.persistence.EntityManagerFactory;
10
-import javax.ws.rs.Priorities;
11
-import javax.ws.rs.container.ContainerRequestContext;
12
-import javax.ws.rs.container.ContainerRequestFilter;
13
-import javax.ws.rs.container.ContainerResponseContext;
14
-import javax.ws.rs.container.ContainerResponseFilter;
15
-import javax.ws.rs.core.Response.Status;
16
-import javax.ws.rs.ext.Provider;
17
-
18
-import org.apache.logging.log4j.LogManager;
19
-import org.apache.logging.log4j.Logger;
20
-import org.jboss.resteasy.core.ResourceMethodInvoker;
21
-import org.jboss.resteasy.spi.ResteasyProviderFactory;
22
-
23
-@Provider
24
-@Priority(Priorities.AUTHENTICATION)
25
-public class TransactionsManager implements ContainerRequestFilter, ContainerResponseFilter {
26
-
27
-    private static final Logger LOG = LogManager.getLogger(TransactionsManager.class);
28
-
29
-    private EntityManagerFactory entityManagerFactory = javax.persistence.Persistence.createEntityManagerFactory("localdb");
30
-
31
-    private EntityManager getEM() {
32
-        return entityManagerFactory.createEntityManager();
33
-    }
34
-
35
-    // @Inject
36
-    // private ThreadLocal<EntityManager> threadLocal;
37
-
38
-    // @AroundInvoke
39
-    public Object invoke(InvocationContext context) throws Exception {
40
-        EntityManager em = getEM();
41
-        if (!em.getTransaction().isActive()) {
42
-            em.getTransaction().begin();
43
-            LOG.info("INIT trans");
44
-            ResteasyProviderFactory.pushContext(EntityManager.class, em);
45
-            Object result = context.proceed();
46
-
47
-            em.getTransaction().commit();
48
-            LOG.info("COMMIT trans");
49
-            return result;
50
-        }
51
-        LOG.info("No trans");
52
-        Object result = context.proceed();
53
-        return result;
54
-    }
55
-
56
-    @Override
57
-    public void filter(ContainerRequestContext requestContext) throws IOException {
58
-        ResourceMethodInvoker methodInvoker = (ResourceMethodInvoker) requestContext.getProperty("org.jboss.resteasy.core.ResourceMethodInvoker");
59
-        Method method = methodInvoker.getMethod();
60
-        EntityManager em = getEM();
61
-
62
-        ResteasyProviderFactory.pushContext(EntityManager.class, em);
63
-
64
-        if (method.isAnnotationPresent(EnsureTransaction.class)) {
65
-            LOG.info("WE need transaction!!!");
66
-
67
-            em.getTransaction().begin();
68
-        }
69
-        LOG.info("Sent to context, em: {}, {}?", em, method.toGenericString());
70
-    }
71
-
72
-    @Override
73
-    public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) throws IOException {
74
-        // TODO Auto-generated method stub
75
-        // ResteasyProviderFactory.pushContext(EntityManager.class, em);
76
-        EntityManager em = (EntityManager) ResteasyProviderFactory.getContextData(EntityManager.class);
77
-        LOG.info("Operating on em: {}", em);
78
-
79
-        if (em != null && em.getTransaction().isActive()) {
80
-            LOG.info("There is transaction go ahead...");
81
-            if (responseContext.getStatus() == Status.OK.getStatusCode()) {
82
-                em.getTransaction().commit();
83
-                LOG.info("COMMIT");
84
-            } else {
85
-                em.getTransaction().rollback();
86
-                LOG.info("ROLLBACK");
87
-            }
88
-        } else {
89
-            LOG.info("There is NO transaction");
90
-
91
-        }
92
-    }
93
-
94
-}
 securis/src/main/java/net/curisit/securis/services/ApiResource.java
..
..
@@ -194,6 +194,7 @@
194
194
         }
195
195
 
196
196
         SignedLicenseBean signedLic = renewLicense(previousLic, em);
197
+        LOG.info("Renewed license code: {}, until: {}", signedLic.getLicenseCode(), signedLic.getExpirationDate());
197
198
 
198
199
         return Response.ok(signedLic).build();
199
200
     }