This commit is contained in:
snoop 2017-06-22 21:18:23 +09:00
parent 24b353c3d3
commit 0a4c589d7d

View File

@ -31,7 +31,7 @@ public class Probe {
this.id = id; this.id = id;
} }
@Basic
@Column(name = "STATUS", nullable = true, length = -1) @Column(name = "STATUS", nullable = true, length = -1)
public String getStatus() { public String getStatus() {
return status; return status;
@ -41,7 +41,7 @@ public class Probe {
this.status = status; this.status = status;
} }
@Basic
@Column(name = "DESCRIPTION", nullable = true, length = 50) @Column(name = "DESCRIPTION", nullable = true, length = 50)
public String getDescription() { public String getDescription() {
return description; return description;
@ -51,7 +51,7 @@ public class Probe {
this.description = description; this.description = description;
} }
@Basic
@Column(name = "CREATE_DATE", nullable = false) @Column(name = "CREATE_DATE", nullable = false)
public Timestamp getCreateDate() { public Timestamp getCreateDate() {
return createDate; return createDate;
@ -61,7 +61,7 @@ public class Probe {
this.createDate = createDate; this.createDate = createDate;
} }
@Basic
@Column(name = "LAST_POLLING_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false) @Column(name = "LAST_POLLING_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false)
public Timestamp getLastPollingDate() { public Timestamp getLastPollingDate() {
return lastPollingDate; return lastPollingDate;
@ -71,7 +71,7 @@ public class Probe {
this.lastPollingDate = lastPollingDate; this.lastPollingDate = lastPollingDate;
} }
@Basic
@Column(name = "NEXT_POLLING_DATE", nullable = true) @Column(name = "NEXT_POLLING_DATE", nullable = true)
public Timestamp getNextPollingDate() { public Timestamp getNextPollingDate() {
return nextPollingDate; return nextPollingDate;
@ -101,7 +101,7 @@ public class Probe {
this.probeKey = probeKey; this.probeKey = probeKey;
} }
@Basic
@Column(name = "ENCRYPTION_KEY", nullable = false, length = 50) @Column(name = "ENCRYPTION_KEY", nullable = false, length = 50)
public String getEncryptionKey() { public String getEncryptionKey() {
return encryptionKey; return encryptionKey;
@ -111,28 +111,28 @@ public class Probe {
this.encryptionKey = encryptionKey; this.encryptionKey = encryptionKey;
} }
@Override // @Override
public boolean equals(Object o) { // public boolean equals(Object o) {
if (this == o) return true; // if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; // if (o == null || getClass() != o.getClass()) return false;
//
Probe tblProbe = (Probe) o; // Probe tblProbe = (Probe) o;
//
if (id != tblProbe.id) return false; // if (id != tblProbe.id) return false;
if (domain != tblProbe.domain) return false; // if (domain != tblProbe.domain) return false;
if (status != null ? !status.equals(tblProbe.status) : tblProbe.status != null) return false; // if (status != null ? !status.equals(tblProbe.status) : tblProbe.status != null) return false;
if (description != null ? !description.equals(tblProbe.description) : tblProbe.description != null) // if (description != null ? !description.equals(tblProbe.description) : tblProbe.description != null)
return false; // return false;
if (createDate != null ? !createDate.equals(tblProbe.createDate) : tblProbe.createDate != null) return false; // if (createDate != null ? !createDate.equals(tblProbe.createDate) : tblProbe.createDate != null) return false;
if (lastPollingDate != null ? !lastPollingDate.equals(tblProbe.lastPollingDate) : tblProbe.lastPollingDate != null) // if (lastPollingDate != null ? !lastPollingDate.equals(tblProbe.lastPollingDate) : tblProbe.lastPollingDate != null)
return false; // return false;
if (nextPollingDate != null ? !nextPollingDate.equals(tblProbe.nextPollingDate) : tblProbe.nextPollingDate != null) // if (nextPollingDate != null ? !nextPollingDate.equals(tblProbe.nextPollingDate) : tblProbe.nextPollingDate != null)
return false; // return false;
if (probeKey != null ? !probeKey.equals(tblProbe.probeKey) : tblProbe.probeKey != null) return false; // if (probeKey != null ? !probeKey.equals(tblProbe.probeKey) : tblProbe.probeKey != null) return false;
if (encryptionKey != null ? !encryptionKey.equals(tblProbe.encryptionKey) : tblProbe.encryptionKey != null) // if (encryptionKey != null ? !encryptionKey.equals(tblProbe.encryptionKey) : tblProbe.encryptionKey != null)
return false; // return false;
//
return true; // return true;
} // }
} }