fixed bug remove super class from domain model

fenglez · Nov 1, 2019 · ce094f2 · ce094f2
1 parent 7745c3a
commit ce094f2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/src/main/java/com/jdon/jivejdon/domain/model/Forum.java b/src/main/java/com/jdon/jivejdon/domain/model/Forum.java
@@ -24,7 +24,6 @@
 import com.jdon.jivejdon.domain.model.property.HotKeys;
 import com.jdon.jivejdon.domain.model.subscription.SubPublisherRoleIF;
 import com.jdon.jivejdon.domain.model.subscription.event.ForumSubscribedNotifyEvent;
-import com.jdon.jivejdon.domain.model.util.ForumModel;
 import com.jdon.jivejdon.spi.pubsub.publish.ThreadEventSourcingRole;
 import com.jdon.jivejdon.spi.pubsub.reconstruction.LazyLoaderRole;
 import com.jdon.jivejdon.util.Constants;
@@ -42,7 +41,7 @@
  */
 @Searchable
 @Model
-public class Forum extends ForumModel {
+public class Forum  {
 
 	/**
 	 *

diff --git a/src/main/java/com/jdon/jivejdon/domain/model/ForumMessage.java b/src/main/java/com/jdon/jivejdon/domain/model/ForumMessage.java
@@ -34,7 +34,6 @@
 import com.jdon.jivejdon.domain.model.property.MessagePropertysVO;
 import com.jdon.jivejdon.domain.model.property.Property;
 import com.jdon.jivejdon.domain.model.reblog.ReBlogVO;
-import com.jdon.jivejdon.domain.model.util.ForumModel;
 import com.jdon.jivejdon.spi.pubsub.publish.MessageEventSourcingRole;
 import com.jdon.jivejdon.spi.pubsub.publish.ShortMPublisherRole;
 import com.jdon.jivejdon.spi.pubsub.reconstruction.LazyLoaderRole;
@@ -58,7 +57,7 @@
  * @author <a href="mailto:[email protected]">banq</a>
  */
 @Model
-public class ForumMessage extends ForumModel implements Cloneable {
+public class ForumMessage implements Cloneable {
     private static final long serialVersionUID = 1L;
     @Inject
     public LazyLoaderRole lazyLoaderRole;
@@ -81,6 +80,7 @@ public class ForumMessage extends ForumModel implements Cloneable {
     private AttachmentsVO attachmentsVO;
     private MessagePropertysVO messagePropertysVO;
     private ReBlogVO reBlogVO;
+    private volatile boolean solid;
 
     protected ForumMessage() {
         this.messageVO = this.messageVOBuilder().subject("").body("").build();
@@ -518,4 +518,12 @@ public void build(long messageId, MessageVO messageVO, Forum
         }
 
     }
+
+    public boolean isSolid() {
+        return solid;
+    }
+
+    private void setSolid(boolean solid) {
+        this.solid = solid;
+    }
 }
diff --git a/src/main/java/com/jdon/jivejdon/domain/model/ForumThread.java b/src/main/java/com/jdon/jivejdon/domain/model/ForumThread.java
@@ -30,7 +30,6 @@
 import com.jdon.jivejdon.domain.model.subscription.event.ThreadSubscribedNotifyEvent;
 import com.jdon.jivejdon.domain.model.thread.ThreadTagsVO;
 import com.jdon.jivejdon.domain.model.thread.ViewCounter;
-import com.jdon.jivejdon.domain.model.util.ForumModel;
 import com.jdon.jivejdon.domain.model.util.OneOneDTO;
 import com.jdon.jivejdon.spi.pubsub.reconstruction.LazyLoaderRole;
 import com.jdon.jivejdon.spi.pubsub.publish.MessageEventSourcingRole;
@@ -53,7 +52,7 @@
  * @author <a href="mailto:[email protected]">banq</a>
  */
 @Model
-public class ForumThread extends ForumModel {
+public class ForumThread {
 	private static final long serialVersionUID = 1L;
 	@Inject
 	public LazyLoaderRole lazyLoaderRole;
@@ -87,6 +86,8 @@ public class ForumThread extends ForumModel {
 
 	private long creationDate2;
 
+	private boolean solid;
+
 
 	/**
 	 * normal can be cached reused
@@ -403,4 +404,11 @@ public synchronized void build(Forum forum, ForumMessage rootMessage, ThreadTags
 		this.setSolid(true);
 	}
 
+	public boolean isSolid() {
+		return solid;
+	}
+
+	private void setSolid(boolean solid) {
+		this.solid = solid;
+	}
 }