diff --git a/core/src/main/java/com/apobates/forum/core/entity/Album.java b/core/src/main/java/com/apobates/forum/core/entity/Album.java index 0d950056982f7e7a806f887223e6ffed601e3f84..bc5940a6921f02e7721c70abcba346be2389db94 100644 --- a/core/src/main/java/com/apobates/forum/core/entity/Album.java +++ b/core/src/main/java/com/apobates/forum/core/entity/Album.java @@ -48,9 +48,7 @@ public class Album implements Serializable { private boolean status; @OneToMany(mappedBy = "album", cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE}) private List pictures=new ArrayList<>(); - //所属的版块 - //@Transient - //private Board board; + //empty constructor for JPA instantiation public Album() {super();} public Album(String title, int volumesId, long boardId, long topicId, long memberId, String memberNickname, List pictures) { @@ -200,12 +198,4 @@ public class Album implements Serializable { } return Optional.of(album); } - /* - @Transient - public Topic getTopic() { - Topic topic = Topic.empty(getVolumesId(), getBoardId()); - topic.setTitle(getTitle()); - topic.setId(getTopicId()); - return topic; - }*/ } \ No newline at end of file diff --git a/core/src/main/java/com/apobates/forum/core/entity/Board.java b/core/src/main/java/com/apobates/forum/core/entity/Board.java index e4e127302c5711975651900b2530831e218a30d4..48fa4598803d0573cb83c86173630dd7041c7523 100644 --- a/core/src/main/java/com/apobates/forum/core/entity/Board.java +++ b/core/src/main/java/com/apobates/forum/core/entity/Board.java @@ -50,16 +50,7 @@ public class Board implements Serializable, Comparable { private boolean origin; // 配合原生一起使用的目录名 private String directoryNames; - //版主容器 - //@Transient - //private List moderatores;//策略模式需要 - //@Transient - //private BoardConfig configure; //策略模式需要 - //@Transient - //private BoardStats stats; - //@Transient - //private BoardGroup volumes; - + //empty constructor for JPA instantiation public Board() { super(); diff --git a/core/src/main/java/com/apobates/forum/core/entity/BoardCarouselIndex.java b/core/src/main/java/com/apobates/forum/core/entity/BoardCarouselIndex.java index 37d48c493e960b27711eb9b059cc58eb7ae2c3c8..46df5ff8091a8e3eef8bc790bf1207cbed368b25 100644 --- a/core/src/main/java/com/apobates/forum/core/entity/BoardCarouselIndex.java +++ b/core/src/main/java/com/apobates/forum/core/entity/BoardCarouselIndex.java @@ -29,10 +29,6 @@ public class BoardCarouselIndex implements Serializable { private LocalDateTime entryDateTime; //到期的日期 private LocalDateTime expireDateTime; - //@Transient - //private Board board; - //@Transient - //private BoardGroup volumes; public int getCarouselId() { return carouselId; diff --git a/core/src/main/java/com/apobates/forum/core/entity/BoardConfig.java b/core/src/main/java/com/apobates/forum/core/entity/BoardConfig.java index b87b501dc4ce8495f350804b485164c81ee2f70a..18c8564b7a77b786b017adfb04bb74247580e3d8 100644 --- a/core/src/main/java/com/apobates/forum/core/entity/BoardConfig.java +++ b/core/src/main/java/com/apobates/forum/core/entity/BoardConfig.java @@ -66,8 +66,6 @@ public class BoardConfig implements Serializable { // ip地址过滤,true(1)过滤,false(0)不过滤 @Column(columnDefinition="tinyint(1) default 0") private boolean ipFilter; - // 启用AdditionalStrategy扩展策略,false全部AdditionalStrategy扩展策略不可用 - //private boolean supply; // empty constructor for JPA instantiation public BoardConfig() { diff --git a/core/src/main/java/com/apobates/forum/core/entity/BoardGroup.java b/core/src/main/java/com/apobates/forum/core/entity/BoardGroup.java index 2103748b47c2357f3c078c3b9041e0a645fb6742..defc9a5992e5bd7c24b42cd82a27229118d68292 100644 --- a/core/src/main/java/com/apobates/forum/core/entity/BoardGroup.java +++ b/core/src/main/java/com/apobates/forum/core/entity/BoardGroup.java @@ -44,9 +44,6 @@ public class BoardGroup implements Serializable, Comparable { private boolean origin; // 配合原生一起使用的目录名 private String directoryNames; - //组下的版块 - //@Transient - //private TreeSet boardes = new TreeSet<>(); // empty constructor for JPA instantiation public BoardGroup() { diff --git a/core/src/main/java/com/apobates/forum/core/entity/BoardModeratorRoleHistory.java b/core/src/main/java/com/apobates/forum/core/entity/BoardModeratorRoleHistory.java index 9d8d419819d119cea88a6a67edf2d8d843eca484..15bf4b1eab0773cddabe552f7d494098bbd84d96 100644 --- a/core/src/main/java/com/apobates/forum/core/entity/BoardModeratorRoleHistory.java +++ b/core/src/main/java/com/apobates/forum/core/entity/BoardModeratorRoleHistory.java @@ -47,6 +47,7 @@ public class BoardModeratorRoleHistory implements Serializable { // 状态,false(0)禁用,true(1)可用 @Column(columnDefinition="tinyint(1) default 0") private boolean status; + //empty constructor for JPA instantiation public BoardModeratorRoleHistory() { } diff --git a/core/src/main/java/com/apobates/forum/core/entity/BoardStats.java b/core/src/main/java/com/apobates/forum/core/entity/BoardStats.java index 5bbdce8b961392a84fb8418fecb6d7aa345db20c..d2a52fb0ae2411b181117e296c6a23e7b60fb6f4 100644 --- a/core/src/main/java/com/apobates/forum/core/entity/BoardStats.java +++ b/core/src/main/java/com/apobates/forum/core/entity/BoardStats.java @@ -44,6 +44,7 @@ public class BoardStats implements Serializable { //今天的话题数|数据库中不存在 @Transient private long todayTopices = 0L; + //empty constructor for JPA instantiation public BoardStats() { super(); diff --git a/core/src/main/java/com/apobates/forum/core/entity/Posts.java b/core/src/main/java/com/apobates/forum/core/entity/Posts.java index 025276e36fbb4dd7a936f4b2b9c3403e1f370d99..77bac04cf441e967e90825cbba88c0aa740c6ae9 100644 --- a/core/src/main/java/com/apobates/forum/core/entity/Posts.java +++ b/core/src/main/java/com/apobates/forum/core/entity/Posts.java @@ -53,16 +53,7 @@ public class Posts implements Serializable { private LocalDateTime modifyDateTime; private long modifyMemberId; private String modifyMemberNickname; - //@Transient - //private Topic topic; - //@Transient - //private Board board; //策略需要+版主+配置文件 - //@Transient - //private BoardGroup volumes; - //@Transient - //private Member member; - //@Transient - //private PostsDescriptor descriptor; + //empty constructor for JPA instantiation public Posts() {super();} //话题的第一条回复 @@ -260,16 +251,4 @@ public class Posts implements Serializable { p.setContent(content); return p; } - /* - @Transient - public Topic getLazyTopic() { - if (getTopic() != null) { - return getTopic(); - } - Topic t = new Topic(); - t.setId(getTopicId()); - t.setBoardId(getBoardId()); - t.setVolumesId(getVolumesId()); - return t; - }*/ } \ No newline at end of file diff --git a/core/src/main/java/com/apobates/forum/core/entity/Topic.java b/core/src/main/java/com/apobates/forum/core/entity/Topic.java index 96310b854ffa2cba5a998d0cc9cbaa36c2ef1b8d..c0895cfc5f1c29b034b791c6f268084167d2fdad 100644 --- a/core/src/main/java/com/apobates/forum/core/entity/Topic.java +++ b/core/src/main/java/com/apobates/forum/core/entity/Topic.java @@ -77,21 +77,6 @@ public class Topic implements Serializable, Comparable { //是否匿名,true是,false不是 @Column(columnDefinition="tinyint(1) default 0") private boolean anony; - //@Transient - //private Set tages = new HashSet<>(); - //@Transient - //private TopicConfig configure; //策略模式需要(board+版主+配置文件) - //@Transient - //private TopicStats stats; - //@Transient - //private Posts content; - //所属的版块 - //@Transient - //private Board board; - //@Transient - //private BoardGroup volumes; - //@Transient - //private Album album; //empty constructor for JPA instantiation public Topic() { diff --git a/core/src/main/java/com/apobates/forum/core/entity/TopicCarousel.java b/core/src/main/java/com/apobates/forum/core/entity/TopicCarousel.java index 5b73106228677bb8ab3ae136e8d7ca1d81b11ce8..5fc99bdd140bf47537e081b6cc62e2ca6b3fdb1d 100644 --- a/core/src/main/java/com/apobates/forum/core/entity/TopicCarousel.java +++ b/core/src/main/java/com/apobates/forum/core/entity/TopicCarousel.java @@ -29,9 +29,6 @@ public class TopicCarousel implements Serializable{ private String summary; //true可用,false禁用 private boolean status; - //幻灯片集合 - //@Transient - //private Set slides = new TreeSet<>(); //empty constructor for JPA instantiation public TopicCarousel() { diff --git a/core/src/main/java/com/apobates/forum/core/entity/TopicConfig.java b/core/src/main/java/com/apobates/forum/core/entity/TopicConfig.java index a1c012172b5d34f598666e810dc9f61d17aa32cb..801b54703f21dc03d32d3f98e1f3216171714436 100644 --- a/core/src/main/java/com/apobates/forum/core/entity/TopicConfig.java +++ b/core/src/main/java/com/apobates/forum/core/entity/TopicConfig.java @@ -74,6 +74,7 @@ public class TopicConfig implements Serializable { //b.3回复的时间上限|超过N天不允许再回复了[不是话题的作者能决定] // 同一会员不间断的回贴的数量 private int writeMinInterrupt = 3; + // empty constructor for JPA instantiation public TopicConfig() { super(); diff --git a/core/src/main/java/com/apobates/forum/core/entity/TopicStats.java b/core/src/main/java/com/apobates/forum/core/entity/TopicStats.java index 7ac1a36851df794bd07934096f91af09740821b0..27e72df3ef8cd504687e5cc64af1ac83df4283d7 100644 --- a/core/src/main/java/com/apobates/forum/core/entity/TopicStats.java +++ b/core/src/main/java/com/apobates/forum/core/entity/TopicStats.java @@ -41,6 +41,7 @@ public class TopicStats implements Serializable { private LocalDateTime updateDate; //最近回复的回复ID private long recentPostsId; + //empty constructor for JPA instantiation public TopicStats() { super(); diff --git a/core/src/main/java/com/apobates/forum/core/entity/TopicTag.java b/core/src/main/java/com/apobates/forum/core/entity/TopicTag.java index 2db1012cff22a7f7f7ad4fab498e99f9689a851b..9555f0885fb0ffe83aa93cb1fd02b60d71064dc0 100644 --- a/core/src/main/java/com/apobates/forum/core/entity/TopicTag.java +++ b/core/src/main/java/com/apobates/forum/core/entity/TopicTag.java @@ -31,11 +31,11 @@ public class TopicTag implements Serializable { //是否删除(1=true可用, 0=false删除) @Column(columnDefinition="tinyint(1) default 0") private boolean status; + //empty constructor for JPA instantiation public TopicTag() { super(); } - public TopicTag(String names, int rates, long topicId) { super(); this.names = names; diff --git a/core/src/main/java/com/apobates/forum/core/entity/proxy/BoardCarouselIndexReplica.java b/core/src/main/java/com/apobates/forum/core/entity/proxy/BoardCarouselIndexReplica.java index 0c5bf605561548c0d04a9bf6a36efff857a21c7c..986b7c8f2038a1adac8f1f6bb974cf4a2fbde667 100644 --- a/core/src/main/java/com/apobates/forum/core/entity/proxy/BoardCarouselIndexReplica.java +++ b/core/src/main/java/com/apobates/forum/core/entity/proxy/BoardCarouselIndexReplica.java @@ -12,9 +12,7 @@ import java.util.function.Function; * @since 20200614 */ public final class BoardCarouselIndexReplica extends BoardCarouselIndex implements ForumReplicable{ - //@Transient private Board board; - //@Transient private BoardGroup volumes; public static Function copyCarouselIndex = (BoardCarouselIndex bci) -> { return ForumReplicable.replica(bci, BoardCarouselIndexReplica.class).orElseGet(BoardCarouselIndexReplica::new); diff --git a/core/src/main/java/com/apobates/forum/core/entity/proxy/BoardReplica.java b/core/src/main/java/com/apobates/forum/core/entity/proxy/BoardReplica.java index 404f42d9f457be0e7052ea918890a00f5d768685..3ac91744fb6412d43e357dcb55b476c314b1615a 100644 --- a/core/src/main/java/com/apobates/forum/core/entity/proxy/BoardReplica.java +++ b/core/src/main/java/com/apobates/forum/core/entity/proxy/BoardReplica.java @@ -137,16 +137,4 @@ public final class BoardReplica extends Board implements ActiveDirectoryConnecto return br.getConnect(); } - /* - public void setVolumes(Optional boardGroup){ - this.volumes = boardGroup; - }*/ - /* - public void setStats(Optional stats){ - this.stats = stats; - }*/ - /* - public void setConfigure(Optional config){ - this.configure = config; - }*/ } \ No newline at end of file diff --git a/core/src/main/java/com/apobates/forum/core/entity/proxy/TopicReplica.java b/core/src/main/java/com/apobates/forum/core/entity/proxy/TopicReplica.java index d3763cbd52e189599343f34383c7ee9d7f2d6b1e..de1ed0c8981a2ba1b743690b735357fe39f79805 100644 --- a/core/src/main/java/com/apobates/forum/core/entity/proxy/TopicReplica.java +++ b/core/src/main/java/com/apobates/forum/core/entity/proxy/TopicReplica.java @@ -229,7 +229,10 @@ public final class TopicReplica extends Topic implements ActiveDirectoryConnecto private String getAnonyMemberName(){ return String.format("Anony#%d", Commons.ipHashcode(super.getIpAddr())); } - //输出事件需要的Topic实例 + /** + * 输出事件需要的Topic实例 + * @return + */ public Topic toEventPayload(){ Topic et = new Topic(); et.setId(this.getId()); @@ -241,35 +244,4 @@ public final class TopicReplica extends Topic implements ActiveDirectoryConnecto et.setEntryDateTime(this.getEntryDateTime()); return et; } - /* - public static TopicReplica copy(Topic topic){ - Objects.requireNonNull(topic); - try{ - TopicReplica destIns = new TopicReplica(); - Commons.copyProperties(destIns, topic); - return destIns; - }catch(IllegalAccessException | InvocationTargetException e){ - if(logger.isDebugEnabled()){ - logger.debug("实例副本构造过程出现异常", e); - } - } - return null; - //return new TopicReplica().replica(topic); - }*/ - /* - public void setContent(Optional posts){ - this.content = posts; - }*/ - /* - public void setAuthor(Optional author) { - this.author = author; - }*/ - /* - public void setStats(Optional stats){ - this.stats = stats; - }*/ - /* - public void setConfigure(Optional config){ - this.configure = config; - }*/ } \ No newline at end of file diff --git a/letterbox/src/main/java/com/apobates/forum/letterbox/entity/ForumLetter.java b/letterbox/src/main/java/com/apobates/forum/letterbox/entity/ForumLetter.java index abb49b34fa614efe29702c7dfa665207eb1828c9..0e689f1cb54ed08aaec0c25fd5ee13dc9b2d45fe 100644 --- a/letterbox/src/main/java/com/apobates/forum/letterbox/entity/ForumLetter.java +++ b/letterbox/src/main/java/com/apobates/forum/letterbox/entity/ForumLetter.java @@ -46,11 +46,6 @@ public class ForumLetter implements Serializable { //是否需要回应(只有私信需要其它类型都不需要) @Column(columnDefinition="tinyint(1) default 0") private boolean responsive; - //@Transient - //private Set receivers = new HashSet<>(); - //Inbox的状态{readable|reply|usable} - //@Transient - //private ForumLetterStatus status; //empty constructor for JPA instantiation public ForumLetter() { diff --git a/letterbox/src/main/java/com/apobates/forum/letterbox/entity/Inbox.java b/letterbox/src/main/java/com/apobates/forum/letterbox/entity/Inbox.java index 31c0f422e9633bdbda28aab258b88e764f581363..fa304239095f651398ea9979d89a711e84afee54 100644 --- a/letterbox/src/main/java/com/apobates/forum/letterbox/entity/Inbox.java +++ b/letterbox/src/main/java/com/apobates/forum/letterbox/entity/Inbox.java @@ -37,6 +37,7 @@ public class Inbox implements Serializable { private boolean usable; //信件ID private long letter; + //empty constructor for JPA instantiation public Inbox() { } diff --git a/letterbox/src/main/java/com/apobates/forum/letterbox/entity/Outbox.java b/letterbox/src/main/java/com/apobates/forum/letterbox/entity/Outbox.java index f491cc7accf0ba22b49791d90b9a3591e256df2d..b69847888d9392f0a522dd58afcd598e5a396903 100644 --- a/letterbox/src/main/java/com/apobates/forum/letterbox/entity/Outbox.java +++ b/letterbox/src/main/java/com/apobates/forum/letterbox/entity/Outbox.java @@ -32,6 +32,7 @@ public class Outbox implements Serializable { private boolean status; //信件ID private long letter; + //empty constructor for JPA instantiation public Outbox() { } diff --git a/letterbox/src/main/java/com/apobates/forum/letterbox/entity/proxy/ForumLetterReplica.java b/letterbox/src/main/java/com/apobates/forum/letterbox/entity/proxy/ForumLetterReplica.java index a01bcdfc97a4e92b07c19b258deab58e96d0bf51..9ea905525686134a90f20c26126e56a7ce2560f0 100644 --- a/letterbox/src/main/java/com/apobates/forum/letterbox/entity/proxy/ForumLetterReplica.java +++ b/letterbox/src/main/java/com/apobates/forum/letterbox/entity/proxy/ForumLetterReplica.java @@ -51,6 +51,10 @@ public final class ForumLetterReplica extends ForumLetter implements ForumReplic return getReceivers().stream().map(ForumLetterReceiver::getMemberNickname).collect(Collectors.joining(",")); } + /** + * 输出事件需要的ForumLetter实例 + * @return + */ public ForumLetter toEventPayload(){ ForumLetter fl = new ForumLetter(); fl.setId(this.getId()); diff --git a/member/src/main/java/com/apobates/forum/member/entity/ForumScoreRole.java b/member/src/main/java/com/apobates/forum/member/entity/ForumScoreRole.java index 10ca900597b4e57ba83a2d95c67a6c47b8f407e1..515116631242f285be1e99f4ababe85114109d5f 100644 --- a/member/src/main/java/com/apobates/forum/member/entity/ForumScoreRole.java +++ b/member/src/main/java/com/apobates/forum/member/entity/ForumScoreRole.java @@ -40,6 +40,7 @@ public class ForumScoreRole implements Serializable { //是否可用,false(0)禁用,true(1)可用 @Column(columnDefinition="tinyint(1) default 0") private boolean status; + //empty constructor for JPA instantiation public ForumScoreRole() { } diff --git a/member/src/main/java/com/apobates/forum/member/entity/Member.java b/member/src/main/java/com/apobates/forum/member/entity/Member.java index 7d0a2aab4ac62d6f0ad272683ffaa8a3d79cc5b0..6a38798ad151eff9b7a1412a60c460a398b98de0 100644 --- a/member/src/main/java/com/apobates/forum/member/entity/Member.java +++ b/member/src/main/java/com/apobates/forum/member/entity/Member.java @@ -70,8 +70,7 @@ public class Member implements Serializable { private String tdparty; public final static String GUEST_AVATAR = "avtar://local/empty.png"; public final static String GUEST_NAMES = "Guest"; - //@Transient - //private MemberProfileBean profile; //策略需要的 + //empty constructor for JPA instantiation public Member() { } diff --git a/member/src/main/java/com/apobates/forum/member/entity/MemberNamesProtect.java b/member/src/main/java/com/apobates/forum/member/entity/MemberNamesProtect.java index 597a8d68bd2afdf13e840942b10ab7412169a9bb..7ddd2a68fd88a032cf527d6e9b29fa813927a426 100644 --- a/member/src/main/java/com/apobates/forum/member/entity/MemberNamesProtect.java +++ b/member/src/main/java/com/apobates/forum/member/entity/MemberNamesProtect.java @@ -30,6 +30,7 @@ public class MemberNamesProtect implements Serializable { //是否可用,false(0)禁用,true(1)可用 @Column(columnDefinition="tinyint(1) default 0") private boolean status; + //empty constructor for JPA instantiation public MemberNamesProtect() { } diff --git a/member/src/main/java/com/apobates/forum/member/entity/MemberOnline.java b/member/src/main/java/com/apobates/forum/member/entity/MemberOnline.java index 7e61c5308aa2fdf312b93c3b5a5f1d4e00a0ef63..b923904a9048f1e8d94245a9c2a29b75455279ee 100644 --- a/member/src/main/java/com/apobates/forum/member/entity/MemberOnline.java +++ b/member/src/main/java/com/apobates/forum/member/entity/MemberOnline.java @@ -46,6 +46,7 @@ public class MemberOnline implements Serializable { * 最近活跃日期 */ private LocalDateTime activeDateTime; + //empty constructor for JPA instantiation public MemberOnline() { } diff --git a/member/src/main/java/com/apobates/forum/member/entity/MemberPenalizeRecords.java b/member/src/main/java/com/apobates/forum/member/entity/MemberPenalizeRecords.java index 65a106ef46e89b043f00659c286177d25002fc52..5700c5c74738f098471234b99d998b18f1eb6e7a 100644 --- a/member/src/main/java/com/apobates/forum/member/entity/MemberPenalizeRecords.java +++ b/member/src/main/java/com/apobates/forum/member/entity/MemberPenalizeRecords.java @@ -65,6 +65,7 @@ public class MemberPenalizeRecords implements Serializable{ // 是否有效,true(1)有效,false(0)无效 @Column(columnDefinition="tinyint(1) default 0") private boolean status; + //empty constructor for JPA instantiation public MemberPenalizeRecords() { } diff --git a/member/src/main/java/com/apobates/forum/member/entity/MemberVipExchangeRecords.java b/member/src/main/java/com/apobates/forum/member/entity/MemberVipExchangeRecords.java index 025fa49483b3ae7df19d240268efc55d41cde8be..8f18b62ffb75b540bd44358d2b22345708e30752 100644 --- a/member/src/main/java/com/apobates/forum/member/entity/MemberVipExchangeRecords.java +++ b/member/src/main/java/com/apobates/forum/member/entity/MemberVipExchangeRecords.java @@ -46,6 +46,7 @@ public class MemberVipExchangeRecords implements Serializable{ private boolean status; // 交易流水号 private String serial; + //empty constructor for JPA instantiation public MemberVipExchangeRecords() { }