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/PackResource.java |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/securis/src/main/java/net/curisit/securis/services/PackResource.java b/securis/src/main/java/net/curisit/securis/services/PackResource.java
index fa4291a..45c5bd9 100644
--- a/securis/src/main/java/net/curisit/securis/services/PackResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/PackResource.java
@@ -5,7 +5,6 @@
 import java.util.List;
 
 import javax.annotation.security.RolesAllowed;
-import javax.crypto.SealedObject;
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.persistence.EntityManager;
@@ -34,8 +33,8 @@
 import net.curisit.securis.security.Securable;
 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;
 
@@ -56,7 +55,8 @@
     @Inject
     Provider<EntityManager> emProvider;
 
-    public PackResource() {}
+    public PackResource() {
+    }
 
     /**
      * 
@@ -65,7 +65,9 @@
     @GET
     @Path("/")
     @Securable
-    @Produces({ MediaType.APPLICATION_JSON })
+    @Produces({
+        MediaType.APPLICATION_JSON
+    })
     public Response index(@Context BasicSecurityContext bsc) {
         LOG.info("Getting packs list ");
 
@@ -100,7 +102,9 @@
     @GET
     @Path("/{packId}")
     @Securable
-    @Produces({ MediaType.APPLICATION_JSON })
+    @Produces({
+        MediaType.APPLICATION_JSON
+    })
     public Response get(@PathParam("packId") Integer packId, @Context BasicSecurityContext bsc) {
         LOG.info("Getting pack data for id: {}: ", packId);
         if (packId == null || "".equals(packId)) {
@@ -114,10 +118,9 @@
             LOG.error("Pack with id {} not found in DB", packId);
             return Response.status(Status.NOT_FOUND).build();
         }
-        if (bsc.isUserInRole(BasicSecurityContext.ROL_ADVANCE)) {
-            if (bsc.getOrganizationsIds() == null || !bsc.getOrganizationsIds().contains(pack.getOrgId())) {
-                return generateErrorUnathorizedAccess(pack, bsc.getUserPrincipal());
-            }
+        if (bsc.isUserInRole(BasicSecurityContext.ROL_ADVANCE)
+                && (bsc.getOrganizationsIds() == null || !bsc.getOrganizationsIds().contains(pack.getOrgId()))) {
+            return generateErrorUnathorizedAccess(pack, bsc.getUserPrincipal());
         }
         return Response.ok(pack).build();
     }
@@ -127,7 +130,9 @@
     @Securable
     @RolesAllowed(BasicSecurityContext.ROL_ADMIN)
     @Consumes(MediaType.APPLICATION_JSON)
-    @Produces({ MediaType.APPLICATION_JSON })
+    @Produces({
+        MediaType.APPLICATION_JSON
+    })
     @Transactional
     public Response create(Pack pack, @Context BasicSecurityContext bsc) {
         LOG.info("Creating new pack");
@@ -173,7 +178,9 @@
     @Securable
     @RolesAllowed(BasicSecurityContext.ROL_ADMIN)
     @Consumes(MediaType.APPLICATION_JSON)
-    @Produces({ MediaType.APPLICATION_JSON })
+    @Produces({
+        MediaType.APPLICATION_JSON
+    })
     public Response modify(Pack pack, @PathParam("packId") Integer packId) {
         LOG.info("Modifying pack with id: {}", packId);
         EntityManager em = emProvider.get();
@@ -218,7 +225,9 @@
     @Securable
     @RolesAllowed(BasicSecurityContext.ROL_ADMIN)
     @Transactional
-    @Produces({ MediaType.APPLICATION_JSON })
+    @Produces({
+        MediaType.APPLICATION_JSON
+    })
     public Response delete(@PathParam("packId") String packId) {
         LOG.info("Deleting pack with id: {}", packId);
         EntityManager em = emProvider.get();

--
Gitblit v1.3.2