#2140 fix - Many changes related with cahce and JPA cycling relationships

rsanchez

2014-12-12 4c13c7324a920f5cca9601154e5224e5d7484fa9

 securis/src/main/java/net/curisit/securis/services/UserResource.java
..
..
@@ -76,6 +76,7 @@
76
76
         LOG.info("Getting users list ");
77
77
 
78
78
         EntityManager em = emProvider.get();
79
+        em.clear();
79
80
         TypedQuery<User> q = em.createNamedQuery("list-users", User.class);
80
81
 
81
82
         List<User> list = q.getResultList();
..
..
@@ -102,6 +103,7 @@
102
103
         }
103
104
 
104
105
         EntityManager em = emProvider.get();
106
+        em.clear();
105
107
         User lt = em.find(User.class, uid);
106
108
         if (lt == null) {
107
109
             LOG.error("User with id {} not found in DB", uid);
..
..
@@ -136,7 +138,8 @@
136
138
         if (user.getPassword() != null && !"".equals(user.getPassword())) {
137
139
             user.setPassword(Utils.sha256(user.getPassword()));
138
140
         } else {
139
-            return Response.status(DefaultExceptionHandler.DEFAULT_APP_ERROR_STATUS_CODE).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "User password is mandatory").build();
141
+            return Response.status(DefaultExceptionHandler.DEFAULT_APP_ERROR_STATUS_CODE)
142
+                    .header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "User password is mandatory").build();
140
143
         }
141
144
         user.setModificationTimestamp(new Date());
142
145
         user.setLastLogin(null);
..
..
@@ -197,7 +200,9 @@
197
200
             currentUser.setPassword(Utils.sha256(user.getPassword()));
198
201
         } else {
199
202
             // Password has not been modified
200
-            //return Response.status(DefaultExceptionHandler.DEFAULT_APP_ERROR_STATUS_CODE).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "User password is mandatory").build();
203
+            // return
204
+            // Response.status(DefaultExceptionHandler.DEFAULT_APP_ERROR_STATUS_CODE).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER,
205
+            // "User password is mandatory").build();
201
206
         }
202
207
 
203
208
         currentUser.setLastLogin(user.getLastLogin());
..
..
@@ -238,7 +243,7 @@
238
243
         LOG.info("user: {}, pass: {}", username, password);
239
244
         LOG.info("is user in role: {} == {} ? ", "advance", request.isUserInRole("advance"));
240
245
         LOG.info("is user in role: {} == {} ? ", "admin", request.isUserInRole("admin"));
241
-        
246
+
242
247
         EntityManager em = emProvider.get();
243
248
         User user = em.find(User.class, username);
244
249
         if (user == null) {
..
..
@@ -246,7 +251,7 @@
246
251
             return Response.status(Status.UNAUTHORIZED).build();
247
252
         }
248
253
         String securedPassword = Utils.sha256(password);
249
-        
254
+
250
255
         if (securedPassword == null || !securedPassword.equals(user.getPassword())) {
251
256
             // TODO: Code to test exception handling
252
257
             return Response.status(Status.UNAUTHORIZED).build();
..
..
@@ -256,7 +261,7 @@
256
261
         try {
257
262
             em.persist(user);
258
263
             em.getTransaction().commit();
259
-        } catch(PersistenceException ex) {
264
+        } catch (PersistenceException ex) {
260
265
             LOG.error("Error updating last login date for user: {}", username);
261
266
             LOG.error(ex);
262
267
             em.getTransaction().rollback();