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/OrganizationResource.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java b/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
index 25a5b07..10a5f10 100644
--- a/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
@@ -6,11 +6,11 @@
import java.util.Set;
import javax.annotation.security.RolesAllowed;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import javax.enterprise.context.RequestScoped;
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;
@@ -30,14 +30,13 @@
import net.curisit.securis.SeCurisException;
import net.curisit.securis.db.Organization;
import net.curisit.securis.db.User;
+import net.curisit.securis.ioc.MyTrans;
import net.curisit.securis.security.BasicSecurityContext;
import net.curisit.securis.security.Securable;
import net.curisit.securis.utils.TokenHelper;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-
-import com.google.inject.persist.Transactional;
/**
* Organization resource, this service will provide methods to create, modify
@@ -46,12 +45,16 @@
* @author roberto <roberto.sanchez@curisit.net>
*/
@Path("/organization")
+@RequestScoped
public class OrganizationResource {
private static final Logger LOG = LogManager.getLogger(OrganizationResource.class);
- @Inject
- private Provider<EntityManager> emProvider;
+ @Context
+ EntityManager em;
+
+ @Context
+ BasicSecurityContext bsc;
public OrganizationResource() {
}
@@ -66,10 +69,10 @@
MediaType.APPLICATION_JSON
})
@Securable
- public Response index(@Context BasicSecurityContext bsc) {
+ public Response index() {
LOG.info("Getting organizations list ");
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
em.clear();
TypedQuery<Organization> q;
if (bsc.isUserInRole(BasicSecurityContext.ROL_ADMIN)) {
@@ -101,7 +104,7 @@
return Response.status(Status.NOT_FOUND).build();
}
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
em.clear();
Organization org = em.find(Organization.class, Integer.parseInt(orgid));
if (org == null) {
@@ -128,12 +131,12 @@
@Produces({
MediaType.APPLICATION_JSON
})
- @Transactional
+ @MyTrans
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
- public Response create(Organization org, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
+ public Response create(Organization org) {
LOG.info("Creating new organization");
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
try {
this.setParentOrg(org, org.getParentOrgId(), em);
@@ -159,7 +162,6 @@
org.setUsers(users);
org.setCreationTimestamp(new Date());
em.persist(org);
-
return Response.ok(org).build();
}
@@ -205,7 +207,7 @@
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
public Response modify(Organization org, @PathParam("orgid") String orgid, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
LOG.info("Modifying organization with id: {}", orgid);
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
Organization currentOrg = em.find(Organization.class, Integer.parseInt(orgid));
if (currentOrg == null) {
LOG.error("Organization with id {} not found in DB", orgid);
@@ -250,7 +252,7 @@
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
public Response delete(@PathParam("orgid") String orgid, @Context HttpServletRequest request) {
LOG.info("Deleting organization with id: {}", orgid);
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
Organization org = em.find(Organization.class, Integer.parseInt(orgid));
if (org == null) {
LOG.error("Organization with id {} can not be deleted, It was not found in DB", orgid);
--
Gitblit v1.3.2