From 341defb27388d14693d424d0467a271d1bf8706d Mon Sep 17 00:00:00 2001 From: snoop Date: Fri, 23 Jun 2017 11:50:11 +0900 Subject: [PATCH] fixed DESC -> DESCRIPTION --- .../com/loafle/overflow/meta/MetaCrawler.java | 13 +++---- .../overflow/meta/MetaCrawlerInputItem.java | 32 ++++------------- .../loafle/overflow/meta/MetaInputType.java | 12 +++---- .../overflow/meta/MetaNotification.java | 14 ++++---- .../overflow/meta/MetaProbeTaskType.java | 35 ++++--------------- .../overflow/meta/MetaSensorItemType.java | 12 +++---- 6 files changed, 37 insertions(+), 81 deletions(-) diff --git a/src/main/java/com/loafle/overflow/meta/MetaCrawler.java b/src/main/java/com/loafle/overflow/meta/MetaCrawler.java index f395449..3a02ed1 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaCrawler.java +++ b/src/main/java/com/loafle/overflow/meta/MetaCrawler.java @@ -13,7 +13,7 @@ public class MetaCrawler { private short id; private Date createDate; private String name; - private String desc; + private String description; @Id @GeneratedValue(strategy= GenerationType.IDENTITY) @@ -44,13 +44,14 @@ public class MetaCrawler { this.name = name; } - @Column(name = "DESC", nullable = true, length = 100) - public String getDesc() { - return desc; + @Column(name = "DESCRIPTION", nullable = true, length = 100) + public String getDescription() { + return description; } - public void setDesc(String desc) { - this.desc = desc; + public void setDescription(String description) { + this.description = description; } + } diff --git a/src/main/java/com/loafle/overflow/meta/MetaCrawlerInputItem.java b/src/main/java/com/loafle/overflow/meta/MetaCrawlerInputItem.java index ab88d9a..4dbf35b 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaCrawlerInputItem.java +++ b/src/main/java/com/loafle/overflow/meta/MetaCrawlerInputItem.java @@ -13,7 +13,7 @@ public class MetaCrawlerInputItem { private int id; private MetaInputType metaInputType; private MetaCrawler metaCrawler; - private String desc; + private String description; private String name; private Date createDate; private boolean required; @@ -32,25 +32,6 @@ public class MetaCrawlerInputItem { this.id = id; } -// @Basic -// @Column(name = "TYPE_ID", nullable = false) -// public short getTypeId() { -// return typeId; -// } -// -// public void setTypeId(short typeId) { -// this.typeId = typeId; -// } -// -// @Basic -// @Column(name = "CRAWLER_ID", nullable = false) -// public short getCrawlerId() { -// return crawlerId; -// } -// -// public void setCrawlerId(short crawlerId) { -// this.crawlerId = crawlerId; -// } @ManyToOne @JoinColumn(name = "TYPE_ID", nullable = false) @@ -72,16 +53,15 @@ public class MetaCrawlerInputItem { this.metaCrawler = metaCrawler; } - @Column(name = "DESC", nullable = true, length = 50) - public String getDesc() { - return desc; + @Column(name = "DESCRIPTION", nullable = true, length = 50) + public String getDescription() { + return description; } - public void setDesc(String desc) { - this.desc = desc; + public void setDescription(String description) { + this.description = description; } - @Column(name = "NAME", nullable = true, length = 50) public String getName() { return name; diff --git a/src/main/java/com/loafle/overflow/meta/MetaInputType.java b/src/main/java/com/loafle/overflow/meta/MetaInputType.java index f81a67c..c1a5225 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaInputType.java +++ b/src/main/java/com/loafle/overflow/meta/MetaInputType.java @@ -12,7 +12,7 @@ import java.util.Date; public class MetaInputType { private short id; private String name; - private String desc; + private String description; private Date createDate; @Id @@ -36,13 +36,13 @@ public class MetaInputType { } - @Column(name = "DESC", nullable = true, length = 50) - public String getDesc() { - return desc; + @Column(name = "DESCRIPTION", nullable = true, length = 50) + public String getDescription() { + return description; } - public void setDesc(String desc) { - this.desc = desc; + public void setDescription(String description) { + this.description = description; } @Temporal(TemporalType.TIMESTAMP) diff --git a/src/main/java/com/loafle/overflow/meta/MetaNotification.java b/src/main/java/com/loafle/overflow/meta/MetaNotification.java index 52e6f8a..6d21562 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaNotification.java +++ b/src/main/java/com/loafle/overflow/meta/MetaNotification.java @@ -13,7 +13,7 @@ public class MetaNotification { private long id; private Date createDate; private String name; - private String desc; + private String description; @Id @GeneratedValue(strategy= GenerationType.IDENTITY) @@ -45,14 +45,12 @@ public class MetaNotification { this.name = name; } - - @Column(name = "desc", nullable = true, length = 50) - public String getDesc() { - return desc; + @Column(name = "DESCRIPTION", nullable = true, length = 50) + public String getDescription() { + return description; } - public void setDesc(String desc) { - this.desc = desc; + public void setDescription(String description) { + this.description = description; } - } diff --git a/src/main/java/com/loafle/overflow/meta/MetaProbeTaskType.java b/src/main/java/com/loafle/overflow/meta/MetaProbeTaskType.java index c6fe74f..9aa2004 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaProbeTaskType.java +++ b/src/main/java/com/loafle/overflow/meta/MetaProbeTaskType.java @@ -12,7 +12,7 @@ import java.util.Date; public class MetaProbeTaskType { private short id; private String name; - private String desc; + private String description; private Date createDate; @Id @@ -35,14 +35,13 @@ public class MetaProbeTaskType { this.name = name; } - - @Column(name = "DESC", nullable = false, length = 50) - public String getDesc() { - return desc; + @Column(name = "DESCRIPTION", nullable = false, length = 50) + public String getDescription() { + return description; } - public void setDesc(String desc) { - this.desc = desc; + public void setDescription(String description) { + this.description = description; } @Temporal(TemporalType.TIMESTAMP) @@ -55,27 +54,5 @@ public class MetaProbeTaskType { this.createDate = createDate; } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - MetaProbeTaskType that = (MetaProbeTaskType) o; - - if (id != that.id) return false; - if (name != null ? !name.equals(that.name) : that.name != null) return false; - if (desc != null ? !desc.equals(that.desc) : that.desc != null) return false; - if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false; - - return true; - } - - @Override - public int hashCode() { - int result = (int) id; - result = 31 * result + (name != null ? name.hashCode() : 0); - result = 31 * result + (desc != null ? desc.hashCode() : 0); - result = 31 * result + (createDate != null ? createDate.hashCode() : 0); - return result; - } } diff --git a/src/main/java/com/loafle/overflow/meta/MetaSensorItemType.java b/src/main/java/com/loafle/overflow/meta/MetaSensorItemType.java index 8962da8..6b33660 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaSensorItemType.java +++ b/src/main/java/com/loafle/overflow/meta/MetaSensorItemType.java @@ -12,7 +12,7 @@ import java.util.Date; public class MetaSensorItemType { private short id; private String name; - private String desc; + private String description; private Date createDate; @Id @@ -36,13 +36,13 @@ public class MetaSensorItemType { } - @Column(name = "DESC", nullable = true, length = 50) - public String getDesc() { - return desc; + @Column(name = "DESCRIPTION", nullable = true, length = 50) + public String getDescription() { + return description; } - public void setDesc(String desc) { - this.desc = desc; + public void setDescription(String description) { + this.description = description; } @Temporal(TemporalType.TIMESTAMP)