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/db/Organization.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/db/Organization.java b/securis/src/main/java/net/curisit/securis/db/Organization.java
index 518cd1a..4221258 100644
--- a/securis/src/main/java/net/curisit/securis/db/Organization.java
+++ b/securis/src/main/java/net/curisit/securis/db/Organization.java
@@ -21,12 +21,12 @@
import javax.persistence.OneToMany;
import javax.persistence.Table;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
/**
* Entity implementation class for Entity: organization
@@ -36,9 +36,11 @@
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@Entity
@Table(name = "organization")
-@NamedQueries({ @NamedQuery(name = "list-organizations", query = "SELECT o FROM Organization o"),
+@NamedQueries({
+ @NamedQuery(name = "list-organizations", query = "SELECT o FROM Organization o"),
@NamedQuery(name = "list-organizations-by-ids", query = "SELECT o FROM Organization o where id in :list_ids"),
- @NamedQuery(name = "find-children-org", query = "SELECT o FROM Organization o where o.parentOrganization = :parentOrganization") })
+ @NamedQuery(name = "find-children-org", query = "SELECT o FROM Organization o where o.parentOrganization = :parentOrganization")
+})
public class Organization implements Serializable {
@SuppressWarnings("unused")
@@ -61,8 +63,12 @@
// We don't include the users to limit the size of each row a the listing
@ManyToMany(cascade = CascadeType.REMOVE)
@JoinTable(name = "user_organization", //
- joinColumns = { @JoinColumn(name = "organization_id", referencedColumnName = "id") }, //
- inverseJoinColumns = { @JoinColumn(name = "username", referencedColumnName = "username") })
+ joinColumns = {
+ @JoinColumn(name = "organization_id", referencedColumnName = "id")
+ }, //
+ inverseJoinColumns = {
+ @JoinColumn(name = "username", referencedColumnName = "username")
+ })
private List<User> users;
@JsonIgnore
--
Gitblit v1.3.2