Fixed NPE and index problems found in last moment...

Evolveum · Dec 9, 2015 · 2313b7a · 2313b7a
1 parent 2562941
commit 2313b7a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/...impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/TextFormatter.java b/...impl/src/main/java/com/evolveum/midpoint/notifications/impl/formatters/TextFormatter.java
@@ -451,6 +451,9 @@ private String getItemLabel(Item item) {
     }
 
     private List<Item> filterAndOrderItems(List<Item> items, List<ItemPath> hiddenPaths, boolean showOperationalAttributes) {
+        if (items == null) {
+            return new ArrayList<>();
+        }
         List<Item> toBeDisplayed = new ArrayList<Item>(items.size());
         for (Item item : items) {
             if (item.getDefinition() != null) {

diff --git a/...o-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java b/...o-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
@@ -51,7 +51,7 @@
  */
 @Entity
 @Table(name = RAuditEventRecord.TABLE_NAME, indexes = {
-        @Index(name = "iTimestampValue", columnList = RAuditEventRecord.COLUMN_TIMESTAMP)})
+        @Index(name = "iTimestampValue", columnList = RAuditEventRecord.COLUMN_TIMESTAMP)})       // TODO correct index name
 public class RAuditEventRecord implements Serializable {
 
     public static final String TABLE_NAME = "m_audit_event";

diff --git a/...repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java b/...repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
@@ -57,7 +57,7 @@
 @Entity
 @ForeignKey(name = "fk_abstract_role")
 @org.hibernate.annotations.Table(appliesTo = "m_abstract_role",
-        indexes = {@Index(name = "iRequestable", columnNames = "requestable")})
+        indexes = {@Index(name = "iRequestable", columnNames = "requestable")})             // TODO correct index name
 public abstract class RAbstractRole<T extends AbstractRoleType> extends RFocus<T> {
 
     private Set<RExclusion> exclusion;

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
@@ -43,7 +43,7 @@
 @Entity
 @Table(uniqueConstraints = @UniqueConstraint(name="uc_user_name", columnNames = {"name_norm"}))
 @org.hibernate.annotations.Table(appliesTo = "m_user",
-        indexes = {@Index(name = "iFullName", columnNames = "fullName_orig"),
+        indexes = {@Index(name = "iFullName", columnNames = "fullName_orig"),           // TODO correct indices names
                 @Index(name = "iFamilyName", columnNames = "familyName_orig"),
                 @Index(name = "iGivenName", columnNames = "givenName_orig"),
                 @Index(name = "iLocality", columnNames = "locality_orig")})
@@ -141,7 +141,7 @@ public RPolyString getLocalityUser() {
         return localityUser;
     }
 
-    @Index(name = "iEmployeeNumber")
+    @Index(name = "iEmployeeNumber")            // TODO correct index name
     public String getEmployeeNumber() {
         return employeeNumber;
     }

diff --git a/...n/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationCase.java b/...n/java/com/evolveum/midpoint/repo/sql/data/common/container/RAccessCertificationCase.java
@@ -71,8 +71,8 @@
 @Entity
 @IdClass(RContainerId.class)
 @Table(name = "m_acc_cert_case", indexes = {
-        @Index(name = "iObjectRefTargetOid", columnList = "objectRef_targetOid"),
-        @Index(name = "iTargetRefTargetOid", columnList = "targetRef_targetOid")
+        @Index(name = "iCaseObjectRefTargetOid", columnList = "objectRef_targetOid"),
+        @Index(name = "iCaseTargetRefTargetOid", columnList = "targetRef_targetOid")
 })
 public class RAccessCertificationCase implements Container {
 

diff --git a/...-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java b/...-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
@@ -78,6 +78,7 @@
         }
 )
 @IdClass(RContainerId.class)
+// TODO prefix last 4 index names with "iAssignment" (some day)
 @Table(name = "m_assignment", indexes = {
         @Index(name = "iAssignmentAdministrative", columnList = "administrativeStatus"),
         @Index(name = "iAssignmentEffective", columnList = "effectiveStatus"),