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/OrganizationResource.java | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java b/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
index 63df387..27e956c 100644
--- a/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
@@ -33,9 +33,9 @@
import net.curisit.securis.security.Securable;
import net.curisit.securis.utils.TokenHelper;
-import org.jboss.resteasy.spi.ResteasyProviderFactory;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.jboss.resteasy.spi.ResteasyProviderFactory;
import com.google.inject.persist.Transactional;
@@ -53,7 +53,8 @@
@Inject
private Provider<EntityManager> emProvider;
- public OrganizationResource() {}
+ public OrganizationResource() {
+ }
/**
*
@@ -61,7 +62,9 @@
*/
@GET
@Path("/")
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
@Securable
public Response index(@Context BasicSecurityContext bsc) {
LOG.info("Getting organizations list ");
@@ -88,7 +91,9 @@
*/
@GET
@Path("/{orgid}")
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
@Securable
public Response get(@PathParam("orgid") String orgid, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
LOG.info("Getting organization data for id: {}: ", orgid);
@@ -120,7 +125,9 @@
@POST
@Path("/")
@Consumes(MediaType.APPLICATION_JSON)
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
@Transactional
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
@@ -136,7 +143,7 @@
List<User> users = null;
List<String> usersIds = org.getUsersIds();
- if (usersIds != null && usersIds.size() > 0) {
+ if (usersIds != null && !usersIds.isEmpty()) {
users = new ArrayList<>();
for (String username : usersIds) {
User user = em.find(User.class, username);
@@ -171,7 +178,7 @@
private void setOrgUsers(Organization org, List<String> usersIds, EntityManager em) throws SeCurisException {
List<User> users = null;
- if (usersIds != null && usersIds.size() > 0) {
+ if (usersIds != null && !usersIds.isEmpty()) {
users = new ArrayList<>();
for (String username : usersIds) {
User user = em.find(User.class, username);
@@ -191,7 +198,9 @@
@Path("/{orgid}")
@Transactional
@Consumes(MediaType.APPLICATION_JSON)
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
public Response modify(Organization org, @PathParam("orgid") String orgid, @HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
@@ -208,16 +217,13 @@
} catch (SeCurisException e) {
return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, e.getMessage()).build();
}
- if (org.getParentOrganization() != null) {
- if (isCyclicalRelationship(currentOrg.getId(), org.getParentOrganization())) {
- LOG.error("Organization parent generate a cyclical relationship, parent id {}, current id: {}", org.getParentOrgId(),
- currentOrg.getId());
- return Response
- .status(Status.FORBIDDEN)
- .header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER,
- "Cyclical relationships are not allowed, please change the parent organization, current Parent: "
- + org.getParentOrganization().getName()).build();
- }
+ if (org.getParentOrganization() != null && (isCyclicalRelationship(currentOrg.getId(), org.getParentOrganization()))) {
+ LOG.error("Organization parent generate a cyclical relationship, parent id {}, current id: {}", org.getParentOrgId(), currentOrg.getId());
+ return Response
+ .status(Status.FORBIDDEN)
+ .header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER,
+ "Cyclical relationships are not allowed, please change the parent organization, current Parent: "
+ + org.getParentOrganization().getName()).build();
}
try {
@@ -237,7 +243,9 @@
@DELETE
@Path("/{orgid}")
@Transactional
- @Produces({ MediaType.APPLICATION_JSON })
+ @Produces({
+ MediaType.APPLICATION_JSON
+ })
@Securable
@RolesAllowed(BasicSecurityContext.ROL_ADMIN)
public Response delete(@PathParam("orgid") String orgid, @Context HttpServletRequest request) {
@@ -249,7 +257,7 @@
return Response.status(Status.NOT_FOUND).header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Organization was not found, ID: " + orgid)
.build();
}
- if (org.getChildOrganizations() != null && org.getChildOrganizations().size() > 0) {
+ if (org.getChildOrganizations() != null && !org.getChildOrganizations().isEmpty()) {
LOG.error("Organization has children and can not be deleted, ID: " + orgid);
return Response.status(Status.FORBIDDEN)
.header(DefaultExceptionHandler.ERROR_MESSAGE_HEADER, "Organization has children and can not be deleted, ID: " + orgid).build();
--
Gitblit v1.3.2