renamed id classes.

Evolveum · Mar 24, 2014 · 8f2b1a1 · 8f2b1a1
1 parent 9dd80fd
commit 8f2b1a1
Show file tree

Hide file tree

Showing 25 changed files with 48 additions and 123 deletions.
diff --git a/...repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtClob.java b/...repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtClob.java
@@ -16,7 +16,7 @@
 
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
-import com.evolveum.midpoint.repo.sql.data.common.id.RAClobId;
+import com.evolveum.midpoint.repo.sql.data.common.id.RAExtClobId;
 import com.evolveum.midpoint.repo.sql.data.common.type.RAssignmentExtensionType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -29,7 +29,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAClobId.class)
+@IdClass(RAExtClobId.class)
 @Table(name = "m_assignment_ext_clob")
 public class RAExtClob implements RAExtValue {
 

diff --git a/...repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtDate.java b/...repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtDate.java
@@ -16,7 +16,7 @@
 
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
-import com.evolveum.midpoint.repo.sql.data.common.id.RADateId;
+import com.evolveum.midpoint.repo.sql.data.common.id.RAExtDateId;
 import com.evolveum.midpoint.repo.sql.data.common.type.RAssignmentExtensionType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.hibernate.annotations.ForeignKey;
@@ -29,7 +29,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RADateId.class)
+@IdClass(RAExtDateId.class)
 @Table(name = "m_assignment_ext_date")
 @org.hibernate.annotations.Table(appliesTo = "m_assignment_ext_date",
         indexes = {@Index(name = "iAExtensionDate", columnNames = {"extensionType", "dateValue", "eName", "eType"})})

diff --git a/...repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtLong.java b/...repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtLong.java
@@ -16,7 +16,7 @@
 
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
-import com.evolveum.midpoint.repo.sql.data.common.id.RALongId;
+import com.evolveum.midpoint.repo.sql.data.common.id.RAExtLongId;
 import com.evolveum.midpoint.repo.sql.data.common.type.RAssignmentExtensionType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.hibernate.annotations.ForeignKey;
@@ -28,7 +28,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RALongId.class)
+@IdClass(RAExtLongId.class)
 @Table(name = "m_assignment_ext_long")
 @org.hibernate.annotations.Table(appliesTo = "m_assignment_ext_long",
         indexes = {@Index(name = "iAExtensionLong", columnNames = {"extensionType", "longValue", "eName", "eType"})})

diff --git a/...ql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtPolyString.java b/...ql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtPolyString.java
@@ -17,7 +17,7 @@
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
 import com.evolveum.midpoint.prism.polystring.PolyString;
-import com.evolveum.midpoint.repo.sql.data.common.id.RAPolyStringId;
+import com.evolveum.midpoint.repo.sql.data.common.id.RAExtPolyStringId;
 import com.evolveum.midpoint.repo.sql.data.common.type.RAssignmentExtensionType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.hibernate.annotations.ForeignKey;
@@ -29,7 +29,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAPolyStringId.class)
+@IdClass(RAExtPolyStringId.class)
 @Table(name = "m_assignment_ext_poly")
 @org.hibernate.annotations.Table(appliesTo = "m_assignment_ext_poly",
         indexes = {@Index(name = "iAExtensionPolyString", columnNames = {"extensionType", "orig", "eName", "eType"})})

diff --git a/...sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtReference.java b/...sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtReference.java
@@ -17,7 +17,7 @@
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
 import com.evolveum.midpoint.prism.PrismReferenceValue;
-import com.evolveum.midpoint.repo.sql.data.common.id.RAReferenceId;
+import com.evolveum.midpoint.repo.sql.data.common.id.RAExtReferenceId;
 import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
 import com.evolveum.midpoint.repo.sql.data.common.type.RAssignmentExtensionType;
 import com.evolveum.midpoint.repo.sql.util.ClassMapper;
@@ -31,7 +31,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAReferenceId.class)
+@IdClass(RAExtReferenceId.class)
 @Table(name = "m_assignment_ext_reference")
 @org.hibernate.annotations.Table(appliesTo = "m_assignment_ext_reference",
         indexes = {@Index(name = "iAExtensionReference", columnNames = {"extensionType", "targetoid", "eName", "eType"})})

diff --git a/...po-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtString.java b/...po-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtString.java
@@ -16,7 +16,7 @@
 
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
-import com.evolveum.midpoint.repo.sql.data.common.id.RAStringId;
+import com.evolveum.midpoint.repo.sql.data.common.id.RAExtStringId;
 import com.evolveum.midpoint.repo.sql.data.common.type.RAssignmentExtensionType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.hibernate.annotations.ForeignKey;
@@ -28,7 +28,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAStringId.class)
+@IdClass(RAExtStringId.class)
 @Table(name = "m_assignment_ext_string")
 @org.hibernate.annotations.Table(appliesTo = "m_assignment_ext_string",
         indexes = {@Index(name = "iAExtensionString", columnNames = {"extensionType", "stringValue", "eName", "eType"})})

diff --git a/...repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtClob.java b/...repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtClob.java
@@ -17,7 +17,7 @@
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
 import com.evolveum.midpoint.repo.sql.data.common.RObject;
-import com.evolveum.midpoint.repo.sql.data.common.id.RAnyClobId;
+import com.evolveum.midpoint.repo.sql.data.common.id.ROExtClobId;
 import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -30,7 +30,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAnyClobId.class)
+@IdClass(ROExtClobId.class)
 @Table(name = "m_object_ext_clob")
 public class ROExtClob implements ROExtValue {
 

diff --git a/...repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtDate.java b/...repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtDate.java
@@ -17,7 +17,7 @@
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
 import com.evolveum.midpoint.repo.sql.data.common.RObject;
-import com.evolveum.midpoint.repo.sql.data.common.id.RAnyDateId;
+import com.evolveum.midpoint.repo.sql.data.common.id.ROExtDateId;
 import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.hibernate.annotations.ForeignKey;
@@ -30,7 +30,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAnyDateId.class)
+@IdClass(ROExtDateId.class)
 @Table(name = "m_object_ext_date")
 @org.hibernate.annotations.Table(appliesTo = "m_object_ext_date",
         indexes = {@Index(name = "iExtensionDate", columnNames = {"ownerType", "dateValue", "eName", "eType"})})

diff --git a/...repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtLong.java b/...repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtLong.java
@@ -17,7 +17,7 @@
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
 import com.evolveum.midpoint.repo.sql.data.common.RObject;
-import com.evolveum.midpoint.repo.sql.data.common.id.RAnyLongId;
+import com.evolveum.midpoint.repo.sql.data.common.id.ROExtLongId;
 import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.hibernate.annotations.ForeignKey;
@@ -29,7 +29,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAnyLongId.class)
+@IdClass(ROExtLongId.class)
 @Table(name = "m_object_ext_long")
 @org.hibernate.annotations.Table(appliesTo = "m_object_ext_long",
         indexes = {@Index(name = "iExtensionLong", columnNames = {"ownerType", "longValue", "eName", "eType"})})

diff --git a/...ql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtPolyString.java b/...ql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtPolyString.java
@@ -18,7 +18,7 @@
 
 import com.evolveum.midpoint.prism.polystring.PolyString;
 import com.evolveum.midpoint.repo.sql.data.common.RObject;
-import com.evolveum.midpoint.repo.sql.data.common.id.RAnyPolyStringId;
+import com.evolveum.midpoint.repo.sql.data.common.id.ROExtPolyStringId;
 import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.hibernate.annotations.ForeignKey;
@@ -30,7 +30,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAnyPolyStringId.class)
+@IdClass(ROExtPolyStringId.class)
 @Table(name = "m_object_ext_poly")
 @org.hibernate.annotations.Table(appliesTo = "m_object_ext_poly",
         indexes = {@Index(name = "iExtensionPolyString", columnNames = {"ownerType", "orig", "eName", "eType"})})

diff --git a/...sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtReference.java b/...sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtReference.java
@@ -18,7 +18,7 @@
 
 import com.evolveum.midpoint.prism.PrismReferenceValue;
 import com.evolveum.midpoint.repo.sql.data.common.RObject;
-import com.evolveum.midpoint.repo.sql.data.common.id.RAnyReferenceId;
+import com.evolveum.midpoint.repo.sql.data.common.id.ROExtReferenceId;
 import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
 import com.evolveum.midpoint.repo.sql.util.ClassMapper;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
@@ -31,7 +31,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAnyReferenceId.class)
+@IdClass(ROExtReferenceId.class)
 @Table(name = "m_object_ext_reference")
 @org.hibernate.annotations.Table(appliesTo = "m_object_ext_reference",
         indexes = {@Index(name = "iExtensionReference", columnNames = {"ownerType", "targetoid", "eName", "eType"})})

diff --git a/...po-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtString.java b/...po-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtString.java
@@ -17,7 +17,7 @@
 package com.evolveum.midpoint.repo.sql.data.common.any;
 
 import com.evolveum.midpoint.repo.sql.data.common.RObject;
-import com.evolveum.midpoint.repo.sql.data.common.id.RAnyStringId;
+import com.evolveum.midpoint.repo.sql.data.common.id.ROExtStringId;
 import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
 import com.evolveum.midpoint.repo.sql.util.RUtil;
 import org.hibernate.annotations.ForeignKey;
@@ -29,7 +29,7 @@
  * @author lazyman
  */
 @Entity
-@IdClass(RAnyStringId.class)
+@IdClass(ROExtStringId.class)
 @Table(name = "m_object_ext_string")
 @org.hibernate.annotations.Table(appliesTo = "m_object_ext_string",
         indexes = {@Index(name = "iExtensionString", columnNames = {"ownerType", "stringValue", "eName", "eType"})})

diff --git a/...int/repo/sql/data/common/id/RAClobId.java → .../repo/sql/data/common/id/RAExtClobId.java b/...int/repo/sql/data/common/id/RAClobId.java → .../repo/sql/data/common/id/RAExtClobId.java
@@ -16,14 +16,12 @@
 
 package com.evolveum.midpoint.repo.sql.data.common.id;
 
-import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
-
 import java.io.Serializable;
 
 /**
  * @author lazyman
  */
-public class RAClobId implements Serializable {
+public class RAExtClobId implements Serializable {
 
     private String ownerOid;
     private Short ownerId;
@@ -76,7 +74,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RAClobId raClobId = (RAClobId) o;
+        RAExtClobId raClobId = (RAExtClobId) o;
 
         if (checksum != null ? !checksum.equals(raClobId.checksum) : raClobId.checksum != null) return false;
         if (name != null ? !name.equals(raClobId.name) : raClobId.name != null) return false;

diff --git a/...int/repo/sql/data/common/id/RADateId.java → .../repo/sql/data/common/id/RAExtDateId.java b/...int/repo/sql/data/common/id/RADateId.java → .../repo/sql/data/common/id/RAExtDateId.java
@@ -16,15 +16,13 @@
 
 package com.evolveum.midpoint.repo.sql.data.common.id;
 
-import com.evolveum.midpoint.repo.sql.data.common.other.RObjectType;
-
 import java.io.Serializable;
 import java.sql.Timestamp;
 
 /**
  * @author lazyman
  */
-public class RADateId implements Serializable {
+public class RAExtDateId implements Serializable {
 
     private String ownerOid;
     private Short ownerId;
@@ -77,7 +75,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RADateId raDateId = (RADateId) o;
+        RAExtDateId raDateId = (RAExtDateId) o;
 
         if (name != null ? !name.equals(raDateId.name) : raDateId.name != null) return false;
         if (ownerId != null ? !ownerId.equals(raDateId.ownerId) : raDateId.ownerId != null) return false;

diff --git a/...int/repo/sql/data/common/id/RALongId.java → .../repo/sql/data/common/id/RAExtLongId.java b/...int/repo/sql/data/common/id/RALongId.java → .../repo/sql/data/common/id/RAExtLongId.java
@@ -21,7 +21,7 @@
 /**
  * @author lazyman
  */
-public class RALongId implements Serializable {
+public class RAExtLongId implements Serializable {
 
     private String ownerOid;
     private Short ownerId;
@@ -74,7 +74,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RALongId raLongId = (RALongId) o;
+        RAExtLongId raLongId = (RAExtLongId) o;
 
         if (name != null ? !name.equals(raLongId.name) : raLongId.name != null) return false;
         if (ownerId != null ? !ownerId.equals(raLongId.ownerId) : raLongId.ownerId != null) return false;

diff --git a/...po/sql/data/common/id/RAPolyStringId.java → ...sql/data/common/id/RAExtPolyStringId.java b/...po/sql/data/common/id/RAPolyStringId.java → ...sql/data/common/id/RAExtPolyStringId.java
@@ -21,7 +21,7 @@
 /**
  * @author lazyman
  */
-public class RAPolyStringId implements Serializable {
+public class RAExtPolyStringId implements Serializable {
 
     private String ownerOid;
     private Short ownerId;
@@ -74,7 +74,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RAPolyStringId that = (RAPolyStringId) o;
+        RAExtPolyStringId that = (RAExtPolyStringId) o;
 
         if (name != null ? !name.equals(that.name) : that.name != null) return false;
         if (ownerId != null ? !ownerId.equals(that.ownerId) : that.ownerId != null) return false;

diff --git a/...epo/sql/data/common/id/RAReferenceId.java → .../sql/data/common/id/RAExtReferenceId.java b/...epo/sql/data/common/id/RAReferenceId.java → .../sql/data/common/id/RAExtReferenceId.java
@@ -21,7 +21,7 @@
 /**
  * @author lazyman
  */
-public class RAReferenceId implements Serializable {
+public class RAExtReferenceId implements Serializable {
 
     private String ownerOid;
     private Short ownerId;
@@ -74,7 +74,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RAReferenceId that = (RAReferenceId) o;
+        RAExtReferenceId that = (RAExtReferenceId) o;
 
         if (name != null ? !name.equals(that.name) : that.name != null) return false;
         if (ownerId != null ? !ownerId.equals(that.ownerId) : that.ownerId != null) return false;

diff --git a/...t/repo/sql/data/common/id/RAStringId.java → ...epo/sql/data/common/id/RAExtStringId.java b/...t/repo/sql/data/common/id/RAStringId.java → ...epo/sql/data/common/id/RAExtStringId.java
@@ -21,7 +21,7 @@
 /**
  * @author lazyman
  */
-public class RAStringId implements Serializable {
+public class RAExtStringId implements Serializable {
 
     private String ownerOid;
     private Short ownerId;
@@ -74,7 +74,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        RAStringId that = (RAStringId) o;
+        RAExtStringId that = (RAExtStringId) o;
 
         if (name != null ? !name.equals(that.name) : that.name != null) return false;
         if (ownerId != null ? !ownerId.equals(that.ownerId) : that.ownerId != null) return false;