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/ApiResource.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/ApiResource.java b/securis/src/main/java/net/curisit/securis/services/ApiResource.java
index 032ec6f..f725ad6 100644
--- a/securis/src/main/java/net/curisit/securis/services/ApiResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/ApiResource.java
@@ -5,8 +5,8 @@
import java.util.List;
import javax.inject.Inject;
-import javax.inject.Provider;
import javax.persistence.EntityManager;
+import javax.transaction.Transactional;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
@@ -45,8 +45,6 @@
import org.apache.logging.log4j.Logger;
import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
-import com.google.inject.persist.Transactional;
-
/**
* External API to be accessed by third parties
*
@@ -64,7 +62,7 @@
private LicenseHelper licenseHelper;
@Inject
- Provider<EntityManager> emProvider;
+ EntityManager em;
@Inject
LicenseGenerator licenseGenerator;
@@ -124,7 +122,7 @@
public Response createFromRequest(RequestBean request, @HeaderParam(LicenseManager.HEADER_LICENSE_NAME_OR_REFERENCE) String nameOrReference,
@HeaderParam(LicenseManager.HEADER_LICENSE_EMAIL) String userEmail) throws IOException, SeCurisServiceException, SeCurisException {
LOG.info("Request to get license: {}", request);
- SignedLicenseBean lic = createLicense(request, emProvider.get(), false, nameOrReference, userEmail);
+ SignedLicenseBean lic = createLicense(request, em, false, nameOrReference, userEmail);
return Response.ok(lic).build();
}
@@ -189,7 +187,7 @@
throw new SeCurisServiceException(ErrorCodes.LICENSE_NOT_READY_FOR_RENEW, "The license is still valid, not ready for renew");
}
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
License lic = License.findLicenseByCode(previousLic.getLicenseCode(), em);
if (lic.getStatus() != LicenseStatus.ACTIVE) {
throw new SeCurisServiceException(ErrorCodes.LICENSE_NOT_READY_FOR_RENEW, "Only licenses with status 'Active' can be renew");
@@ -226,7 +224,7 @@
throw new SeCurisServiceException(ErrorCodes.LICENSE_IS_EXPIRED, "The license is expired");
}
- EntityManager em = emProvider.get();
+ // EntityManager em = emProvider.get();
try {
SignatureHelper.getInstance().validateSignature(currentLic);
} catch (SeCurisException ex) {
--
Gitblit v1.3.2