diff --git a/src/main/java/com/loafle/overflow/model/member/Member.java b/src/main/java/com/loafle/overflow/model/member/Member.java index 9e06f48..702d85e 100644 --- a/src/main/java/com/loafle/overflow/model/member/Member.java +++ b/src/main/java/com/loafle/overflow/model/member/Member.java @@ -15,7 +15,7 @@ import java.util.Date; public class Member { private Long id; private String email; - private transient String pw; + private transient String password; private String name; private String phone; private String companyName; @@ -53,13 +53,13 @@ public class Member { @Basic @JsonIgnore - @Column(name = "PW", nullable = true, length = 64) - public String getPw() { - return pw; + @Column(name = "PASSWORD", nullable = true, length = 64) + public String getPassword() { + return password; } - public void setPw(String pw) { - this.pw = pw; + public void setPassword(String password) { + this.password = password; } @Basic diff --git a/src/main/java/com/loafle/overflow/model/meta/MetaPortType.java b/src/main/java/com/loafle/overflow/model/meta/MetaPortType.java index 29ca133..5df37b8 100644 --- a/src/main/java/com/loafle/overflow/model/meta/MetaPortType.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaPortType.java @@ -55,4 +55,25 @@ public class MetaPortType { public void setCreateDate(Date createDate) { this.createDate = createDate; } + + public static enum Enum { + TCP((short) 1), UDP((short) 2),; + + private final Short value; + + /** + * @param value + */ + Enum(final Short value) { + this.value = value; + } + + public Short getValue() { + return this.value; + } + + public MetaPortType to() { + return new MetaPortType(this.value); + } + } } diff --git a/src/main/java/com/loafle/overflow/model/sensorconfig/Connection.java b/src/main/java/com/loafle/overflow/model/sensorconfig/Connection.java index 3f4d849..60990eb 100644 --- a/src/main/java/com/loafle/overflow/model/sensorconfig/Connection.java +++ b/src/main/java/com/loafle/overflow/model/sensorconfig/Connection.java @@ -1,15 +1,18 @@ package com.loafle.overflow.model.sensorconfig; +import com.loafle.overflow.model.meta.MetaCryptoType; +import com.loafle.overflow.model.meta.MetaIPType; import com.loafle.overflow.model.meta.MetaPortType; /** * Connection */ public class Connection { + private MetaIPType metaIPType; private String ip; - private Integer port; private MetaPortType metaPortType; - private boolean ssl; + private Integer port; + private MetaCryptoType metaCryptoType; public String getIp() { return ip; @@ -27,14 +30,6 @@ public class Connection { this.port = port; } - public boolean isSsl() { - return ssl; - } - - public void setSsl(boolean ssl) { - this.ssl = ssl; - } - /** * @return the metaPortType */ @@ -48,4 +43,32 @@ public class Connection { public void setMetaPortType(MetaPortType metaPortType) { this.metaPortType = metaPortType; } + + /** + * @return the metaIPType + */ + public MetaIPType getMetaIPType() { + return metaIPType; + } + + /** + * @param metaIPType the metaIPType to set + */ + public void setMetaIPType(MetaIPType metaIPType) { + this.metaIPType = metaIPType; + } + +/** + * @return the metaCryptoType + */ +public MetaCryptoType getMetaCryptoType() { + return metaCryptoType; +} + +/** + * @param metaCryptoType the metaCryptoType to set + */ +public void setMetaCryptoType(MetaCryptoType metaCryptoType) { + this.metaCryptoType = metaCryptoType; +} }