From da889d489da5d7fa8c71d9f21f24b1dc2e29d8e1 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 28 Jan 2015 08:53:21 +0000
Subject: [PATCH] #0 refactoring - Removing Google Guice by CDI standard
---
securis/src/main/java/net/curisit/securis/services/ApplicationResource.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
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 db7bf67..a2c17cd 100644
--- a/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
@@ -6,10 +6,10 @@
import javax.annotation.security.RolesAllowed;
import javax.inject.Inject;
-import javax.inject.Provider;
import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
import javax.servlet.http.HttpServletRequest;
+import javax.transaction.Transactional;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
@@ -39,8 +39,6 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import com.google.inject.persist.Transactional;
-
/**
* Application resource, this service will provide methods to create, modify and
* delete applications
@@ -54,7 +52,7 @@
TokenHelper tokenHelper;
@Inject
- Provider<EntityManager> emProvider;
+ EntityManager em;
private static final Logger LOG = LogManager.getLogger(ApplicationResource.class);
@@ -74,7 +72,7 @@
public Response index() {
LOG.info("Getting applications list ");
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
em.clear();
TypedQuery<Application> q = em.createNamedQuery("list-applications", Application.class);
List<Application> list = q.getResultList();
@@ -100,7 +98,7 @@
return Response.status(Status.NOT_FOUND).build();
}
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
em.clear();
Application app = null;
@@ -138,7 +136,7 @@
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
public Response create(Application app, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
LOG.info("Creating new application");
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
app.setCreationTimestamp(new Date());
em.persist(app);
LOG.info("App ID: {}", app.getId());
@@ -167,7 +165,7 @@
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
public Response modify(Application app, @PathParam("appid") String appid, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
LOG.info("Modifying application with id: {}", appid);
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
Application currentapp = em.find(Application.class, Integer.parseInt(appid));
if (currentapp == null) {
LOG.error("Application with id {} not found in DB", appid);
@@ -214,7 +212,7 @@
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
public Response delete(@PathParam("appid") String appid, @Context HttpServletRequest request) {
LOG.info("Deleting app with id: {}", appid);
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
Application app = em.find(Application.class, Integer.parseInt(appid));
if (app == null) {
LOG.error("Application with id {} can not be deleted, It was not found in DB", appid);
--
Gitblit v1.3.2