remove old attributes (#7) (#14)

Author: mariodavid

modules/core/db/init/hsql/10.create-db.sql

@@ -13,13 +13,10 @@ create table DDCUI_MESSAGE (
     RECEIVER_ID varchar(36) not null,
     SUBJECT varchar(255),
     SHAREABLE varchar(255),
-    ENTITY_REFERENCE_ID varchar(255),
-    ENTITY_REFERENCE_CLASS varchar(255),
-    ENTITY_CAPTION varchar(255),
     TEXT longvarchar,
     READ_ boolean not null,
     RECEIVED_AT timestamp not null,
     --
     primary key (ID)
 )^
--- end DDCUI_MESSAGE
+-- end DDCUI_MESSAGE

modules/core/db/init/hsql/20.create-db.sql

@@ -1,6 +1,6 @@
 -- begin DDCUI_MESSAGE
-alter table DDCUI_MESSAGE add constraint FK_DDCUI_MESSAGE_SENDER foreign key (SENDER_ID) references SEC_USER(ID)^
-alter table DDCUI_MESSAGE add constraint FK_DDCUI_MESSAGE_RECEIVER foreign key (RECEIVER_ID) references SEC_USER(ID)^
-create index IDX_DDCUI_MESSAGE_SENDER on DDCUI_MESSAGE (SENDER_ID)^
-create index IDX_DDCUI_MESSAGE_RECEIVER on DDCUI_MESSAGE (RECEIVER_ID)^
+alter table DDCUI_MESSAGE add constraint FK_DDCUI_MESSAGE_ON_SENDER foreign key (SENDER_ID) references SEC_USER(ID)^
+alter table DDCUI_MESSAGE add constraint FK_DDCUI_MESSAGE_ON_RECEIVER foreign key (RECEIVER_ID) references SEC_USER(ID)^
+create index IDX_DDCUI_MESSAGE_ON_SENDER on DDCUI_MESSAGE (SENDER_ID)^
+create index IDX_DDCUI_MESSAGE_ON_RECEIVER on DDCUI_MESSAGE (RECEIVER_ID)^
 -- end DDCUI_MESSAGE

modules/core/db/update/hsql/18/180713-2-updateMessage.sql

@@ -0,0 +1,3 @@
+alter table DDCUI_MESSAGE alter column ENTITY_CAPTION rename to ENTITY_CAPTION__U98906 ^
+alter table DDCUI_MESSAGE alter column ENTITY_REFERENCE_CLASS rename to ENTITY_REFERENCE_CLASS__U42171 ^
+alter table DDCUI_MESSAGE alter column ENTITY_REFERENCE_ID rename to ENTITY_REFERENCE_ID__U52547 ^

modules/core/db/update/hsql/18/180713-2-updateMessage_DropScript.sql

@@ -0,0 +1,3 @@
+alter table DDCUI_MESSAGE drop column ENTITY_REFERENCE_ID__U52547 cascade ;
+alter table DDCUI_MESSAGE drop column ENTITY_REFERENCE_CLASS__U42171 cascade ;
+alter table DDCUI_MESSAGE drop column ENTITY_CAPTION__U98906 cascade ;

modules/global/src/de/diedavids/cuba/userinbox/entity/Message.java

@@ -12,11 +12,11 @@
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
-import de.diedavids.cuba.entitysoftreference.EntitySoftReferenceDatatype;
+import com.haulmont.cuba.core.entity.Entity;
 
 @Listeners("ddcui_MessageEntityListener")
 @Table(name = "DDCUI_MESSAGE")
-@Entity(name = "ddcui$Message")
+@javax.persistence.Entity(name = "ddcui$Message")
 public class Message extends StandardEntity {
     private static final long serialVersionUID = -631256156050655713L;
 
@@ -38,31 +38,7 @@ public class Message extends StandardEntity {
     @Convert(converter = EntitySoftReferenceConverter.class)
     @MetaProperty(datatype = "EntitySoftReference")
     @Column(name = "SHAREABLE")
-    protected com.haulmont.cuba.core.entity.Entity shareable;
-
-    /**
-     * @deprecated use Message.shareable instead
-     */
-    @Deprecated
-    @SystemLevel
-    @Column(name = "ENTITY_REFERENCE_ID")
-    protected String entityReferenceId;
-
-    /**
-     * @deprecated use Message.shareable instead
-     */
-    @Deprecated
-    @SystemLevel
-    @Column(name = "ENTITY_REFERENCE_CLASS")
-    protected String entityReferenceClass;
-
-    /**
-     * @deprecated use Message.shareable instead
-     */
-    @Deprecated
-    @SystemLevel
-    @Column(name = "ENTITY_CAPTION")
-    protected String entityCaption;
+    protected Entity shareable;
 
 
     @Lob
@@ -78,15 +54,16 @@ public class Message extends StandardEntity {
     @Column(name = "RECEIVED_AT", nullable = false)
     protected Date receivedAt;
 
-    public void setShareable(com.haulmont.cuba.core.entity.Entity shareable) {
-        this.shareable = shareable;
+    public Entity getShareable() {
+        return shareable;
     }
 
-    public com.haulmont.cuba.core.entity.Entity getShareable() {
-        return shareable;
+    public void setShareable(Entity shareable) {
+        this.shareable = shareable;
     }
 
 
+
     public void setReceivedAt(Date receivedAt) {
         this.receivedAt = receivedAt;
     }
@@ -96,14 +73,6 @@ public Date getReceivedAt() {
     }
 
 
-    public void setEntityCaption(String entityCaption) {
-        this.entityCaption = entityCaption;
-    }
-
-    public String getEntityCaption() {
-        return entityCaption;
-    }
-
 
     public void setRead(Boolean read) {
         this.read = read;
@@ -122,22 +91,6 @@ public String getSubject() {
         return subject;
     }
 
-    public void setEntityReferenceId(String entityReferenceId) {
-        this.entityReferenceId = entityReferenceId;
-    }
-
-    public String getEntityReferenceId() {
-        return entityReferenceId;
-    }
-
-    public void setEntityReferenceClass(String entityReferenceClass) {
-        this.entityReferenceClass = entityReferenceClass;
-    }
-
-    public String getEntityReferenceClass() {
-        return entityReferenceClass;
-    }
-
     public void setText(String text) {
         this.text = text;
     }

modules/global/src/de/diedavids/cuba/userinbox/entity/messages.properties

@@ -3,9 +3,6 @@ Message.sender = Sender
 Message = Message
 Message.subject = Subject
 Message.text = Text
-Message.entityReferenceId = Entity reference id
-Message.entityReferenceClass = Entity reference class
 Message.read = Read
-Message.entityCaption = Record
 Message.receivedAt = Received at
 Message.shareable = Record