From 071a008cf28e733ca3aaafa57e675fd54a5ea33b Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Fri, 19 Sep 2014 09:29:16 +0000
Subject: [PATCH] #396 fix - Fixed more SonarQube issues, new code style applied

---
 securis/src/main/java/net/curisit/securis/services/UserResource.java |   39 ++++++++++++++++++++++++++++-----------
 1 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/securis/src/main/java/net/curisit/securis/services/UserResource.java b/securis/src/main/java/net/curisit/securis/services/UserResource.java
index 4b0c8ac..a832493 100644
--- a/securis/src/main/java/net/curisit/securis/services/UserResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/UserResource.java
@@ -33,8 +33,8 @@
 import net.curisit.securis.db.User;
 import net.curisit.securis.utils.TokenHelper;
 
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.google.inject.persist.Transactional;
 
@@ -54,7 +54,8 @@
 
     private static final Logger LOG = LogManager.getLogger(UserResource.class);
 
-    public UserResource() {}
+    public UserResource() {
+    }
 
     /**
      * 
@@ -62,7 +63,9 @@
      */
     @GET
     @Path("/")
-    @Produces({ MediaType.APPLICATION_JSON })
+    @Produces({
+        MediaType.APPLICATION_JSON
+    })
     public Response index() {
         LOG.info("Getting users list ");
 
@@ -80,7 +83,9 @@
      */
     @GET
     @Path("/{uid}")
-    @Produces({ MediaType.APPLICATION_JSON })
+    @Produces({
+        MediaType.APPLICATION_JSON
+    })
     public Response get(@PathParam("uid") String uid, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
         LOG.info("Getting user data for id: {}: ", uid);
         if (uid == null || "".equals(uid)) {
@@ -100,7 +105,9 @@
     @POST
     @Path("/")
     @Consumes(MediaType.APPLICATION_JSON)
-    @Produces({ MediaType.APPLICATION_JSON })
+    @Produces({
+        MediaType.APPLICATION_JSON
+    })
     @Transactional
     public Response create(User user, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
         LOG.info("Creating new user");
@@ -126,7 +133,7 @@
 
     private void setUserOrg(User user, Set<Integer> orgsIds, EntityManager em) throws SeCurisException {
         Set<Organization> orgs = null;
-        if (orgsIds != null && orgsIds.size() > 0) {
+        if (orgsIds != null && !orgsIds.isEmpty()) {
             orgs = new HashSet<>();
             for (Integer orgId : orgsIds) {
                 Organization o = em.find(Organization.class, orgId);
@@ -147,7 +154,9 @@
     @Path("/{uid}")
     @Transactional
     @Consumes(MediaType.APPLICATION_JSON)
-    @Produces({ MediaType.APPLICATION_JSON })
+    @Produces({
+        MediaType.APPLICATION_JSON
+    })
     public Response modify(User user, @PathParam("uid") String uid, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
         LOG.info("Modifying user with id: {}", uid);
         EntityManager em = emProvider.get();
@@ -178,7 +187,9 @@
     @DELETE
     @Path("/{uid}")
     @Transactional
-    @Produces({ MediaType.APPLICATION_JSON })
+    @Produces({
+        MediaType.APPLICATION_JSON
+    })
     public Response delete(@PathParam("uid") String uid, @Context HttpServletRequest request) {
         LOG.info("Deleting app with id: {}", uid);
         EntityManager em = emProvider.get();
@@ -194,7 +205,9 @@
 
     @POST
     @Path("/login")
-    @Produces({ MediaType.APPLICATION_JSON })
+    @Produces({
+        MediaType.APPLICATION_JSON
+    })
     public Response login(@FormParam("username") String user, @FormParam("password") String password, @Context HttpServletRequest request) {
         LOG.info("index session: " + request.getSession());
         LOG.info("user: {}, pass: {}", user, password);
@@ -218,7 +231,9 @@
      */
     @POST
     @Path("/check")
-    @Produces({ MediaType.APPLICATION_JSON })
+    @Produces({
+        MediaType.APPLICATION_JSON
+    })
     public Response check(@HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token, @QueryParam("token") String token2) {
         if (token == null) {
             token = token2;
@@ -241,7 +256,9 @@
 
     @GET
     @Path("/logout")
-    @Produces({ MediaType.APPLICATION_JSON })
+    @Produces({
+        MediaType.APPLICATION_JSON
+    })
     public Response logout(@Context HttpServletRequest request) {
         request.getSession().invalidate();
         return Response.ok().build();

--
Gitblit v1.3.2