#2283 fix - Changed EntityManager injection to @Context

rsanchez

2015-01-28 09f0f86d50933ea11eb3315e5728718e23d37dcf

 securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
..
..
@@ -9,7 +9,6 @@
9
9
 import javax.persistence.EntityManager;
10
10
 import javax.persistence.TypedQuery;
11
11
 import javax.servlet.http.HttpServletRequest;
12
-import javax.transaction.Transactional;
13
12
 import javax.ws.rs.Consumes;
14
13
 import javax.ws.rs.DELETE;
15
14
 import javax.ws.rs.GET;
..
..
@@ -29,6 +28,7 @@
29
28
 import net.curisit.securis.SeCurisException;
30
29
 import net.curisit.securis.db.Application;
31
30
 import net.curisit.securis.db.ApplicationMetadata;
31
+import net.curisit.securis.ioc.EnsureTransaction;
32
32
 import net.curisit.securis.security.BasicSecurityContext;
33
33
 import net.curisit.securis.security.Securable;
34
34
 import net.curisit.securis.services.exception.SeCurisServiceException;
..
..
@@ -51,7 +51,7 @@
51
51
     @Inject
52
52
     TokenHelper tokenHelper;
53
53
 
54
-    @Inject
54
+    @Context
55
55
     EntityManager em;
56
56
 
57
57
     private static final Logger LOG = LogManager.getLogger(ApplicationResource.class);
..
..
@@ -131,7 +131,7 @@
131
131
     @Produces({
132
132
         MediaType.APPLICATION_JSON
133
133
     })
134
-    @Transactional
134
+    @EnsureTransaction
135
135
     @Securable
136
136
     @RolesAllowed(BasicSecurityContext.ROL_ADMIN)
137
137
     public Response create(Application app, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
..
..
@@ -156,7 +156,7 @@
156
156
     @PUT
157
157
     @POST
158
158
     @Path("/{appid}")
159
-    @Transactional
159
+    @EnsureTransaction
160
160
     @Consumes(MediaType.APPLICATION_JSON)
161
161
     @Produces({
162
162
         MediaType.APPLICATION_JSON
..
..
@@ -204,7 +204,7 @@
204
204
 
205
205
     @DELETE
206
206
     @Path("/{appid}")
207
-    @Transactional
207
+    @EnsureTransaction
208
208
     @Produces({
209
209
         MediaType.APPLICATION_JSON
210
210
     })