#0 refactoring - Removing Google Guice by CDI standard

rsanchez

2015-01-28 da889d489da5d7fa8c71d9f21f24b1dc2e29d8e1

 securis/src/main/java/net/curisit/securis/services/ApiResource.java
..
..
@@ -5,8 +5,8 @@
5
5
 import java.util.List;
6
6
 
7
7
 import javax.inject.Inject;
8
-import javax.inject.Provider;
9
8
 import javax.persistence.EntityManager;
9
+import javax.transaction.Transactional;
10
10
 import javax.ws.rs.Consumes;
11
11
 import javax.ws.rs.GET;
12
12
 import javax.ws.rs.HeaderParam;
..
..
@@ -45,8 +45,6 @@
45
45
 import org.apache.logging.log4j.Logger;
46
46
 import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
47
47
 
48
-import com.google.inject.persist.Transactional;
49
-
50
48
 /**
51
49
  * External API to be accessed by third parties
52
50
  * 
..
..
@@ -64,7 +62,7 @@
64
62
     private LicenseHelper licenseHelper;
65
63
 
66
64
     @Inject
67
-    Provider<EntityManager> emProvider;
65
+    EntityManager em;
68
66
 
69
67
     @Inject
70
68
     LicenseGenerator licenseGenerator;
..
..
@@ -124,7 +122,7 @@
124
122
     public Response createFromRequest(RequestBean request, @HeaderParam(LicenseManager.HEADER_LICENSE_NAME_OR_REFERENCE) String nameOrReference,
125
123
             @HeaderParam(LicenseManager.HEADER_LICENSE_EMAIL) String userEmail) throws IOException, SeCurisServiceException, SeCurisException {
126
124
         LOG.info("Request to get license: {}", request);
127
-        SignedLicenseBean lic = createLicense(request, emProvider.get(), false, nameOrReference, userEmail);
125
+        SignedLicenseBean lic = createLicense(request, em, false, nameOrReference, userEmail);
128
126
 
129
127
         return Response.ok(lic).build();
130
128
     }
..
..
@@ -189,7 +187,7 @@
189
187
             throw new SeCurisServiceException(ErrorCodes.LICENSE_NOT_READY_FOR_RENEW, "The license is still valid, not ready for renew");
190
188
         }
191
189
 
192
-        EntityManager em = emProvider.get();
190
+        // EntityManager em = emProvider.get();
193
191
         License lic = License.findLicenseByCode(previousLic.getLicenseCode(), em);
194
192
         if (lic.getStatus() != LicenseStatus.ACTIVE) {
195
193
             throw new SeCurisServiceException(ErrorCodes.LICENSE_NOT_READY_FOR_RENEW, "Only licenses with status 'Active' can be renew");
..
..
@@ -226,7 +224,7 @@
226
224
             throw new SeCurisServiceException(ErrorCodes.LICENSE_IS_EXPIRED, "The license is expired");
227
225
         }
228
226
 
229
-        EntityManager em = emProvider.get();
227
+        // EntityManager em = emProvider.get();
230
228
         try {
231
229
             SignatureHelper.getInstance().validateSignature(currentLic);
232
230
         } catch (SeCurisException ex) {