From 09f0f86d50933ea11eb3315e5728718e23d37dcf Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 28 Jan 2015 11:34:27 +0000
Subject: [PATCH] #2283 fix - Changed EntityManager injection to @Context
---
securis/src/main/java/net/curisit/securis/services/ApiResource.java | 14 +++++++-------
1 files changed, 7 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 f725ad6..e831a91 100644
--- a/securis/src/main/java/net/curisit/securis/services/ApiResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/ApiResource.java
@@ -6,7 +6,6 @@
import javax.inject.Inject;
import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
@@ -30,6 +29,7 @@
import net.curisit.securis.db.LicenseStatus;
import net.curisit.securis.db.Pack;
import net.curisit.securis.db.User;
+import net.curisit.securis.ioc.EnsureTransaction;
import net.curisit.securis.security.BasicSecurityContext;
import net.curisit.securis.security.Securable;
import net.curisit.securis.services.exception.SeCurisServiceException;
@@ -61,7 +61,7 @@
@Inject
private LicenseHelper licenseHelper;
- @Inject
+ @Context
EntityManager em;
@Inject
@@ -118,7 +118,7 @@
@Produces({
MediaType.APPLICATION_JSON
})
- @Transactional
+ @EnsureTransaction
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);
@@ -144,7 +144,7 @@
@Produces({
MediaType.APPLICATION_JSON
})
- @Transactional
+ @EnsureTransaction
@SuppressWarnings("unchecked")
public Response createFromRequestFile(MultipartFormDataInput mpfdi,
@HeaderParam(LicenseManager.HEADER_LICENSE_NAME_OR_REFERENCE) String nameOrReference,
@@ -178,7 +178,7 @@
@Produces({
MediaType.APPLICATION_JSON
})
- @Transactional
+ @EnsureTransaction
public Response renewFromPreviousLicense(LicenseBean previousLic, @Context BasicSecurityContext bsc) throws IOException, SeCurisServiceException,
SeCurisException {
LOG.info("Renew license: {}", previousLic);
@@ -216,7 +216,7 @@
@Produces({
MediaType.APPLICATION_JSON
})
- @Transactional
+ @EnsureTransaction
public Response validate(LicenseBean currentLic, @Context BasicSecurityContext bsc) throws IOException, SeCurisServiceException, SeCurisException {
LOG.info("Validate license: {}", currentLic);
@@ -252,7 +252,7 @@
@Produces({
MediaType.APPLICATION_JSON
})
- @Transactional
+ @EnsureTransaction
@SuppressWarnings("unchecked")
public Response renewFromLicenseFile(MultipartFormDataInput mpfdi, @Context BasicSecurityContext bsc) throws IOException,
SeCurisServiceException, SeCurisException {
--
Gitblit v1.3.2