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/LicenseResource.java | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
index 46db766..75e3fe2 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
@@ -7,11 +7,9 @@
import java.util.List;
import javax.inject.Inject;
-import javax.inject.Provider;
import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.SynchronizationType;
import javax.persistence.TypedQuery;
+import javax.transaction.Transactional;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
@@ -62,7 +60,6 @@
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.inject.persist.Transactional;
/**
* License resource, this service will provide methods to create, modify and
@@ -85,10 +82,7 @@
private LicenseHelper licenseHelper;
@Inject
- private Provider<EntityManager> emProvider;
-
- @PersistenceContext(unitName = "localdb", synchronization = SynchronizationType.SYNCHRONIZED)
- private EntityManager entityManager;
+ EntityManager em;
@Inject
private LicenseGenerator licenseGenerator;
@@ -106,7 +100,7 @@
public Response index(@QueryParam("packId") Integer packId, @Context BasicSecurityContext bsc) {
LOG.info("Getting licenses list ");
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
em.clear();
if (!bsc.isUserInRole(BasicSecurityContext.ROL_ADMIN)) {
@@ -141,7 +135,7 @@
public Response get(@PathParam("licId") Integer licId, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
LOG.info("Getting organization data for id: {}: ", licId);
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
em.clear();
License lic = getCurrentLicense(licId, bsc, em);
return Response.ok(lic).build();
@@ -161,7 +155,7 @@
@Transactional
public Response download(@PathParam("licId") Integer licId, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
License lic = getCurrentLicense(licId, bsc, em);
if (lic.getLicenseData() == null) {
@@ -198,7 +192,7 @@
})
public Response activate(@PathParam("licId") Integer licId, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
License lic = getCurrentLicense(licId, bsc, em);
if (!License.Status.isActionValid(License.Action.ACTIVATION, lic.getStatus())) {
@@ -247,7 +241,7 @@
public Response send(@PathParam("licId") Integer licId, @DefaultValue("false") @FormParam("add_cc") Boolean addCC,
@Context BasicSecurityContext bsc) throws SeCurisServiceException, SeCurisException {
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
License lic = getCurrentLicense(licId, bsc, em);
Application app = lic.getPack().getLicenseType().getApplication();
File licFile = null;
@@ -303,7 +297,7 @@
public Response cancel(@PathParam("licId") Integer licId, CancellationLicenseActionBean actionData, @Context BasicSecurityContext bsc)
throws SeCurisServiceException {
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
License lic = getCurrentLicense(licId, bsc, em);
if (!License.Status.isActionValid(License.Action.CANCEL, lic.getStatus())) {
@@ -348,7 +342,7 @@
})
@Transactional
public Response create(License lic, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
if (checkIfCodeExists(lic.getCode(), em)) {
throw new SeCurisServiceException(ErrorCodes.INVALID_DATA, "The license code is already used in an existing license");
@@ -476,7 +470,7 @@
public Response modify(License lic, @PathParam("licId") Integer licId, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
LOG.info("Modifying organization with id: {}", licId);
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
License currentLicense = getCurrentLicense(licId, bsc, em);
currentLicense.setComments(lic.getComments());
@@ -522,7 +516,7 @@
})
public Response delete(@PathParam("licId") Integer licId, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
LOG.info("Deleting license with id: {}", licId);
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
License lic = getCurrentLicense(licId, bsc, em);
if (!License.Status.isActionValid(License.Action.DELETE, lic.getStatus())) {
@@ -554,7 +548,7 @@
})
public Response block(@PathParam("licId") Integer licId, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
LOG.info("Blocking license with id: {}", licId);
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
License lic = getCurrentLicense(licId, bsc, em);
if (!License.Status.isActionValid(License.Action.BLOCK, lic.getStatus())) {
@@ -587,7 +581,7 @@
})
public Response unblock(@PathParam("licId") Integer licId, @Context BasicSecurityContext bsc) throws SeCurisServiceException {
LOG.info("Unblocking license with id: {}", licId);
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
License lic = getCurrentLicense(licId, bsc, em);
if (BlockedRequest.isRequestBlocked(lic.getRequestData(), em)) {
--
Gitblit v1.3.2