This commit is contained in:
crusader 2018-05-24 17:54:25 +09:00
parent 4879a204c6
commit 964ca725df
78 changed files with 294 additions and 336 deletions

View File

@ -5,24 +5,24 @@ package com.loafle.overflow.core.model;
*/
public class PageParams {
private int pageNo;
private int countPerPage;
private Integer pageNo;
private Integer countPerPage;
private String sortCol;
private String sortDirection;
public int getPageNo() {
public Integer getPageNo() {
return pageNo;
}
public void setPageNo(int pageNo) {
public void setPageNo(Integer pageNo) {
this.pageNo = pageNo;
}
public int getCountPerPage() {
public Integer getCountPerPage() {
return countPerPage;
}
public void setCountPerPage(int countPerPage) {
public void setCountPerPage(Integer countPerPage) {
this.countPerPage = countPerPage;
}

View File

@ -8,18 +8,18 @@ import java.util.Date;
@Entity
@Table(name = "API_KEY", schema = "public")
public class ApiKey {
private long id;
private Long id;
private String apiKey;
private Date createDate;
private Domain domain;
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -14,7 +14,7 @@ import java.util.Date;
@Entity
@Table(name = "AUTH_CRAWLER", schema = "public")
public class AuthCrawler {
private long id;
private Long id;
private MetaCrawler crawler;
private Target target;
private String authJson;
@ -22,11 +22,11 @@ public class AuthCrawler {
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -4,52 +4,52 @@ package com.loafle.overflow.model.discovery;
* DiscoveryPort
*/
public class DiscoverPort {
private int firstScanRange;
private int lastScanRange;
private int[] excludePorts;
private Integer firstScanRange;
private Integer lastScanRange;
private Integer[] excludePorts;
private boolean includeTCP;
private boolean includeUDP;
private Boolean includeTCP;
private Boolean includeUDP;
private DiscoverService discoverService;
public int getFirstScanRange() {
public Integer getFirstScanRange() {
return firstScanRange;
}
public void setFirstScanRange(int firstScanRange) {
public void setFirstScanRange(Integer firstScanRange) {
this.firstScanRange = firstScanRange;
}
public int getLastScanRange() {
public Integer getLastScanRange() {
return lastScanRange;
}
public void setLastScanRange(int lastScanRange) {
public void setLastScanRange(Integer lastScanRange) {
this.lastScanRange = lastScanRange;
}
public int[] getExcludePorts() {
public Integer[] getExcludePorts() {
return excludePorts;
}
public void setExcludePorts(int[] excludePorts) {
public void setExcludePorts(Integer[] excludePorts) {
this.excludePorts = excludePorts;
}
public boolean isIncludeTCP() {
public Boolean isIncludeTCP() {
return includeTCP;
}
public void setIncludeTCP(boolean includeTCP) {
public void setIncludeTCP(Boolean includeTCP) {
this.includeTCP = includeTCP;
}
public boolean isIncludeUDP() {
public Boolean isIncludeUDP() {
return includeUDP;
}
public void setIncludeUDP(boolean includeUDP) {
public void setIncludeUDP(Boolean includeUDP) {
this.includeUDP = includeUDP;
}

View File

@ -9,7 +9,7 @@ import java.util.List;
*/
public class Host {
private long id;
private Long id;
private String ipv4;
private String ipv6;
private String mac;
@ -23,11 +23,11 @@ public class Host {
private List<Port> portList;
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -10,23 +10,23 @@ import java.util.List;
*/
public class Port {
private long id;
private Long id;
private PortType portType;
private int portNumber;
private Integer portNumber;
private Date discoveredDate;
private Host host;
private boolean target;
private Boolean target;
private List<Service> serviceList;
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}
@ -38,11 +38,11 @@ public class Port {
this.portType = portType;
}
public int getPortNumber() {
public Integer getPortNumber() {
return portNumber;
}
public void setPortNumber(int portNumber) {
public void setPortNumber(Integer portNumber) {
this.portNumber = portNumber;
}
@ -62,11 +62,11 @@ public class Port {
this.host = host;
}
public boolean isTarget() {
public Boolean isTarget() {
return target;
}
public void setTarget(boolean target) {
public void setTarget(Boolean target) {
this.target = target;
}

View File

@ -10,7 +10,7 @@ import com.loafle.overflow.core.type.CryptoType;
*/
public class Service {
private long id;
private Long id;
private CryptoType cryptoType;
private String serviceName;
@ -18,13 +18,13 @@ public class Service {
private Port port;
private boolean target;
private Boolean target;
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}
@ -60,11 +60,11 @@ public class Service {
this.port = port;
}
public boolean isTarget() {
public Boolean isTarget() {
return target;
}
public void setTarget(boolean target) {
public void setTarget(Boolean target) {
this.target = target;
}
}

View File

@ -6,7 +6,7 @@ import java.util.Date;
* Created by snoop on 17. 10. 31.
*/
public class Zone {
private long id;
private Long id;
private String network;
private String ipv4;
private String ipv6;
@ -15,11 +15,11 @@ public class Zone {
private Date discoveredDate;
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -9,23 +9,23 @@ import java.util.Date;
@Entity
@Table(name = "DOMAIN", schema = "public")
public class Domain {
private long id;
private Long id;
private String name;
private Date createDate;
public Domain() {
}
public Domain(long id) {
public Domain(Long id) {
this.id = id;
}
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -11,18 +11,18 @@ import java.sql.Timestamp;
@Entity
@Table(name = "DOMAIN_MEMBER", schema = "public")
public class DomainMember {
private long id;
private Long id;
private Timestamp createDate;
private Member member;
private Domain domain;
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -12,7 +12,7 @@ import java.util.Date;
@Entity
@Table(name = "EMAIL_AUTH", schema = "public")
public class EmailAuth {
private long id;
private Long id;
private String emailAuthKey;
private Date createDate;
private Date authConfirmDate;
@ -21,11 +21,11 @@ public class EmailAuth {
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -14,7 +14,7 @@ import java.util.Date;
@Entity
@Table(name = "HISTORY", schema = "public")
public class History {
private long id;
private Long id;
private Date createDate;
private MetaHistoryType type;
private String message;
@ -27,11 +27,11 @@ public class History {
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -16,9 +16,9 @@ import java.util.Date;
@Inheritance(strategy = InheritanceType.JOINED)
@DiscriminatorColumn(name = "INFRA_TYPE", discriminatorType = DiscriminatorType.INTEGER)
public abstract class Infra {
private long id;
private Long id;
private MetaInfraType infraType;
// private long childId;
// private Long childId;
private Date createDate;
private Probe probe;
private Target target;
@ -30,9 +30,9 @@ public abstract class Infra {
// private InfraOS infraOS;
/*
private long id;
private Long id;
private MetaInfraType infraType;
private long childId;
private Long childId;
private Date createDate;
private Probe probeId;
private Target targetId;
@ -89,11 +89,11 @@ public abstract class Infra {
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}
@ -109,11 +109,11 @@ public abstract class Infra {
// @Basic
// @Column(name = "CHILD_ID", nullable = false)
// public long getChildId() {
// public Long getChildId() {
// return childId;
// }
//
// public void setChildId(long childId) {
// public void setChildId(Long childId) {
// this.childId = childId;
// }
@ -147,7 +147,7 @@ public abstract class Infra {
this.target = target;
}
// public static Infra CreateInfraByType(long id, Class c) {
// public static Infra CreateInfraByType(Long id, Class c) {
//
// Infra infra = new Infra();
//// infra.setChildId(id);

View File

@ -10,7 +10,7 @@ import java.util.Date;
@Table(name = "INFRA_HOST", schema = "public")
@DiscriminatorValue("2")
public class InfraHost extends Infra {
// private long id;
// private Long id;
private InfraOS os;
private String ipv4;
private String ipv6;
@ -19,11 +19,11 @@ public class InfraHost extends Infra {
// @Id
// @GeneratedValue(strategy= GenerationType.IDENTITY)
// public long getId() {
// public Long getId() {
// return id;
// }
//
// public void setId(long id) {
// public void setId(Long id) {
// this.id = id;
// }

View File

@ -10,24 +10,24 @@ import java.util.Date;
@Table(name = "INFRA_MACHINE", schema = "public")
@DiscriminatorValue("1")
public class InfraMachine extends Infra {
// private long id;
// private Long id;
private String meta;
private Date createDate;
/*
private long id;
private Long id;
private String meta;
private Date createDate;
*/
// @Id
// @GeneratedValue(strategy= GenerationType.IDENTITY)
// public long getId() {
// public Long getId() {
// return id;
// }
//
// public void setId(long id) {
// public void setId(Long id) {
// this.id = id;
// }

View File

@ -13,7 +13,7 @@ import java.util.Date;
@Table(name = "INFRA_OS", schema = "public")
@DiscriminatorValue("3")
public class InfraOS extends Infra {
// private long id;
// private Long id;
private InfraMachine machine;
private String meta;
private Date createDate;
@ -21,11 +21,11 @@ public class InfraOS extends Infra {
// @Id
// @GeneratedValue(strategy= GenerationType.IDENTITY)
// public long getId() {
// public Long getId() {
// return id;
// }
//
// public void setId(long id) {
// public void setId(Long id) {
// this.id = id;
// }

View File

@ -10,18 +10,18 @@ import java.util.Date;
@Table(name = "INFRA_OS_APPLICATION", schema = "public")
@DiscriminatorValue("4")
public class InfraOSApplication extends Infra {
// private long id;
// private Long id;
private InfraOS os;
private String name;
private Date createDate;
// @Id
// @GeneratedValue(strategy= GenerationType.IDENTITY)
// public long getId() {
// public Long getId() {
// return id;
// }
//
// public void setId(long id) {
// public void setId(Long id) {
// this.id = id;
// }

View File

@ -10,18 +10,18 @@ import java.util.Date;
@Table(name = "INFRA_OS_DAEMON", schema = "public")
@DiscriminatorValue("5")
public class InfraOSDaemon extends Infra {
// private long id;
// private Long id;
private InfraOS os;
private String name;
private Date createDate;
// @Id
// @GeneratedValue(strategy= GenerationType.IDENTITY)
// public long getId() {
// public Long getId() {
// return id;
// }
//
// public void setId(long id) {
// public void setId(Long id) {
// this.id = id;
// }

View File

@ -13,21 +13,21 @@ import java.util.Date;
@Table(name = "INFRA_OS_PORT", schema = "public")
@DiscriminatorValue("6")
public class InfraOSPort extends Infra {
// private long id;
// private Long id;
private InfraOS os;
private Date createDate;
private Integer port;
private String portType;
private MetaInfraVendor vendor;
private boolean tlsType;
private Boolean tlsType;
//
// @Id
// @GeneratedValue(strategy= GenerationType.IDENTITY)
// public long getId() {
// public Long getId() {
// return id;
// }
//
// public void setId(long id) {
// public void setId(Long id) {
// this.id = id;
// }
@ -83,11 +83,11 @@ public class InfraOSPort extends Infra {
@Basic
@Column(name = "TLS_TYPE", nullable = true)
public boolean isTlsType() {
public Boolean isTlsType() {
return tlsType;
}
public void setTlsType(boolean tlsType) {
public void setTlsType(Boolean tlsType) {
this.tlsType = tlsType;
}

View File

@ -13,21 +13,21 @@ import java.util.Date;
@Table(name = "INFRA_SERVICE", schema = "public")
@DiscriminatorValue("7")
public class InfraService extends Infra{
// private long id;
// private Long id;
private InfraHost host;
private String portType;
private Integer port;
private MetaInfraVendor vendor;
private Date createDate;
private boolean tlsType;
private Boolean tlsType;
// @Id
// @GeneratedValue(strategy= GenerationType.IDENTITY)
// public long getId() {
// public Long getId() {
// return id;
// }
//
// public void setId(long id) {
// public void setId(Long id) {
// this.id = id;
// }
@ -83,11 +83,11 @@ public class InfraService extends Infra{
@Basic
@Column(name = "TLS_TYPE", nullable = true)
public boolean isTlsType() {
public Boolean isTlsType() {
return tlsType;
}
public void setTlsType(boolean tlsType) {
public void setTlsType(Boolean tlsType) {
this.tlsType = tlsType;
}
}

View File

@ -11,7 +11,7 @@ import java.util.Date;
@Entity
@Table(name = "MEMBER", schema = "public")
public class Member {
private long id;
private Long id;
private String email;
private transient String pw;
private String name;
@ -19,23 +19,23 @@ public class Member {
private String companyName;
private Date createDate;
private MetaMemberStatus status;
private int signinFailCount;
private boolean totpType;
private Integer signinFailCount;
private Boolean totpType;
public Member() {
}
public Member(long id) {
public Member(Long id) {
this.id = id;
}
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}
@ -110,21 +110,21 @@ public class Member {
}
@Column(name = "SIGNIN_FAIL_COUNT", nullable = true, columnDefinition = "int default 0")
public int getSigninFailCount(){
public Integer getSigninFailCount(){
return this.signinFailCount;
}
public void setSigninFailCount(int failCount) {
public void setSigninFailCount(Integer failCount) {
this.signinFailCount = failCount;
}
@Basic
@Column(name = "TOTP_TYPE", nullable = false, columnDefinition = "boolean default false")
public boolean isTotpType() {
@Column(name = "TOTP_TYPE", nullable = false, columnDefinition = "Boolean default false")
public Boolean isTotpType() {
return totpType;
}
public void setTotpType(boolean totpType) {
public void setTotpType(Boolean totpType) {
this.totpType = totpType;
}
}

View File

@ -10,7 +10,7 @@ import java.util.Date;
@Entity
@Table(name = "MEMBER_TOTP", schema = "public")
public class MemberTotp {
private long id;
private Long id;
private Member member;
private String secretCode;
private Date createDate;
@ -20,17 +20,17 @@ public class MemberTotp {
public MemberTotp() {
}
public MemberTotp(long id) {
public MemberTotp(Long id) {
this.id = id;
}
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -9,17 +9,17 @@ import java.util.Date;
@Entity
@Table(name = "META_CRAWLER", schema = "public")
public class MetaCrawler {
private short id;
private Short id;
private Date createDate;
private String name;
private String description;
@Id
public short getId() {
public Short getId() {
return id;
}
public void setId(short id) {
public void setId(Short id) {
this.id = id;
}

View File

@ -9,24 +9,24 @@ import java.util.Date;
@Entity
@Table(name = "META_CRAWLER_INPUT_ITEM", schema = "public")
public class MetaCrawlerInputItem {
private int id;
private Integer id;
private MetaInputType inputType;
private MetaCrawler crawler;
private String description;
private String name;
private Date createDate;
private boolean required;
private Boolean required;
private String defaultValue;
private String pattern;
private String keyName;
private String keyValue;
@Id
public int getId() {
public Integer getId() {
return id;
}
public void setId(int id) {
public void setId(Integer id) {
this.id = id;
}
@ -80,11 +80,11 @@ public class MetaCrawlerInputItem {
}
@Column(name = "REQUIRED", nullable = false)
public boolean isRequired() {
public Boolean isRequired() {
return required;
}
public void setRequired(boolean required) {
public void setRequired(Boolean required) {
this.required = required;
}
@ -128,7 +128,7 @@ public class MetaCrawlerInputItem {
}
// @Override
// public boolean equals(Object o) {
// public Boolean equals(Object o) {
// if (this == o) return true;
// if (o == null || getClass() != o.getClass()) return false;
//

View File

@ -7,22 +7,22 @@ import java.util.Date;
@Table(name = "META_EMAIL_STATUS", schema = "public")
public class MetaEmailStatus {
private int id;
private Integer id;
private String name;
private Date createDate;
public MetaEmailStatus(){}
public MetaEmailStatus(int id) {
public MetaEmailStatus(Integer id) {
this.id = id;
}
@Id
public int getId() {
public Integer getId() {
return id;
}
public void setId(int id) {
public void setId(Integer id) {
this.id = id;
}

View File

@ -9,7 +9,7 @@ import java.util.Date;
@Entity
@Table(name = "META_HISTORY_TYPE", schema = "public")
public class MetaHistoryType {
private int id;
private Integer id;
private String name;
private Date createDate;
@ -17,16 +17,16 @@ public class MetaHistoryType {
}
public MetaHistoryType(int id) {
public MetaHistoryType(Integer id) {
this.id = id;
}
@Id
public int getId() {
public Integer getId() {
return id;
}
public void setId(int id) {
public void setId(Integer id) {
this.id = id;
}

View File

@ -9,16 +9,16 @@ import java.util.Date;
@Entity
@Table(name = "META_INFRA_TYPE", schema = "public")
public class MetaInfraType {
private int id;
private Integer id;
private String name;
private Date createDate;
@Id
public int getId() {
public Integer getId() {
return id;
}
public void setId(int id) {
public void setId(Integer id) {
this.id = id;
}

View File

@ -9,17 +9,17 @@ import java.util.Date;
@Entity
@Table(name = "META_INFRA_VENDOR", schema = "public")
public class MetaInfraVendor {
private int id;
private Integer id;
private String name;
private Date createDate;
private MetaInfraType infraType;
@Id
public int getId() {
public Integer getId() {
return id;
}
public void setId(int id) {
public void setId(Integer id) {
this.id = id;
}

View File

@ -9,17 +9,17 @@ import java.util.Date;
@Entity
@Table(name = "META_INPUT_TYPE", schema = "public")
public class MetaInputType {
private short id;
private Short id;
private String name;
private String description;
private Date createDate;
@Id
public short getId() {
public Short getId() {
return id;
}
public void setId(short id) {
public void setId(Short id) {
this.id = id;
}

View File

@ -11,23 +11,23 @@ import javax.persistence.Table;
@Entity
@Table(name = "META_MEMBER_STATUS", schema = "public")
public class MetaMemberStatus {
private short id;
private Short id;
private String name;
public MetaMemberStatus() {
}
public MetaMemberStatus(short id) {
public MetaMemberStatus(Short id) {
this.id = id;
}
@Id
public short getId() {
public Short getId() {
return id;
}
public void setId(short id) {
public void setId(Short id) {
this.id = id;
}

View File

@ -11,23 +11,23 @@ import javax.persistence.Table;
@Entity
@Table(name = "META_NOAUTH_PROBE_STATUS", schema = "public")
public class MetaNoAuthProbeStatus {
private short id;
private Short id;
private String name;
public MetaNoAuthProbeStatus() {
}
public MetaNoAuthProbeStatus(short id) {
public MetaNoAuthProbeStatus(Short id) {
this.id = id;
}
@Id
public short getId() {
public Short getId() {
return id;
}
public void setId(short id) {
public void setId(Short id) {
this.id = id;
}

View File

@ -9,17 +9,17 @@ import java.util.Date;
@Entity
@Table(name = "META_NOTIFICATION", schema = "public")
public class MetaNotification {
private long id;
private Long id;
private Date createDate;
private String name;
private String description;
@Id
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -9,16 +9,16 @@ import java.util.Date;
@Entity
@Table(name = "META_PROBE_ARCHITECTURE", schema = "public")
public class MetaProbeArchitecture {
private short id;
private Short id;
private String architecture;
private Date createDate;
@Id
public short getId() {
public Short getId() {
return id;
}
public void setId(short id) {
public void setId(Short id) {
this.id = id;
}

View File

@ -9,16 +9,16 @@ import java.util.Date;
@Entity
@Table(name = "META_PROBE_OS", schema = "public")
public class MetaProbeOs {
private short id;
private Short id;
private String name;
private Date createDate;
@Id
public short getId() {
public Short getId() {
return id;
}
public void setId(short id) {
public void setId(Short id) {
this.id = id;
}

View File

@ -9,7 +9,7 @@ import java.util.Date;
@Entity
@Table(name = "META_PROBE_PACKAGE", schema = "public")
public class MetaProbePackage {
private long id;
private Long id;
private MetaProbeVersion version;
private MetaProbeOs os;
private MetaProbeArchitecture architecture;
@ -17,11 +17,11 @@ public class MetaProbePackage {
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -11,23 +11,23 @@ import javax.persistence.Table;
@Entity
@Table(name = "META_PROBE_STATUS", schema = "public")
public class MetaProbeStatus {
private short id;
private Short id;
private String name;
public MetaProbeStatus() {
}
public MetaProbeStatus(short id) {
public MetaProbeStatus(Short id) {
this.id = id;
}
@Id
public short getId() {
public Short getId() {
return id;
}
public void setId(short id) {
public void setId(Short id) {
this.id = id;
}

View File

@ -9,17 +9,17 @@ import java.util.Date;
@Entity
@Table(name = "META_PROBE_TASK_TYPE", schema = "public")
public class MetaProbeTaskType {
private short id;
private Short id;
private String name;
private String description;
private Date createDate;
@Id
public short getId() {
public Short getId() {
return id;
}
public void setId(short id) {
public void setId(Short id) {
this.id = id;
}

View File

@ -9,17 +9,17 @@ import java.util.Date;
@Entity
@Table(name = "META_PROBE_VERSION", schema = "public")
public class MetaProbeVersion {
private short id;
private Short id;
private String version;
private Date createDate;
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public short getId() {
public Short getId() {
return id;
}
public void setId(short id) {
public void setId(Short id) {
this.id = id;
}

View File

@ -11,29 +11,29 @@ import java.util.Date;
@Table(name = "META_SENSOR_DISPLAY_ITEM", schema = "public")
public class MetaSensorDisplayItem {
private long id;
private Long id;
private String key;
private String displayName;
private String description;
private MetaCrawler crawler;
private MetaSensorItemUnit unit;
private Date createDate;
private boolean isDefault;
private Boolean isDefault;
private MetaSensorItemType itemType;
public MetaSensorDisplayItem() {
}
public MetaSensorDisplayItem(long id) {
public MetaSensorDisplayItem(Long id) {
this.id = id;
}
@Id
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}
@ -97,12 +97,12 @@ public class MetaSensorDisplayItem {
@Basic
@Column(name="IS_DEFAULT", nullable = false, columnDefinition = "boolean default false")
public boolean getDefault() {
@Column(name="IS_DEFAULT", nullable = false, columnDefinition = "Boolean default false")
public Boolean getDefault() {
return isDefault;
}
public void setDefault(boolean aDefault) {
public void setDefault(Boolean aDefault) {
isDefault = aDefault;
}

View File

@ -9,17 +9,17 @@ import javax.persistence.*;
@Table(name = "META_SENSOR_DISPLAY_MAPPING", schema = "public")
public class MetaSensorDisplayMapping {
private long id;
private Long id;
private MetaSensorDisplayItem displayItem;
private MetaSensorItemKey itemKey;
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -9,17 +9,17 @@ import java.util.Date;
@Entity
@Table(name = "META_SENSOR_ITEM", schema = "public")
public class MetaSensorItem {
private int id;
private Integer id;
private String key;
private String name;
private Date createDate;
@Id
public int getId() {
public Integer getId() {
return id;
}
public void setId(int id) {
public void setId(Integer id) {
this.id = id;
}

View File

@ -9,7 +9,7 @@ import java.util.Date;
@Entity
@Table(name = "META_SENSOR_ITEM_KEY", schema = "public")
public class MetaSensorItemKey {
private long id;
private Long id;
private MetaSensorItem item;
private String key;
private String froms;
@ -20,11 +20,11 @@ public class MetaSensorItemKey {
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -9,7 +9,7 @@ import java.util.Date;
@Entity
@Table(name = "META_SENSOR_ITEM_TYPE", schema = "public")
public class MetaSensorItemType {
private short id;
private Short id;
private String name;
private String description;
private Date createDate;
@ -17,16 +17,16 @@ public class MetaSensorItemType {
public MetaSensorItemType() {
}
public MetaSensorItemType(short id) {
public MetaSensorItemType(Short id) {
this.id = id;
}
@Id
public short getId() {
public Short getId() {
return id;
}
public void setId(short id) {
public void setId(Short id) {
this.id = id;
}

View File

@ -9,17 +9,17 @@ import java.util.Date;
@Entity
@Table(name = "META_SENSOR_ITEM_UNIT", schema = "public")
public class MetaSensorItemUnit {
private short id;
private Short id;
private String unit;
private Date createDate;
private String mark;
@Id
public short getId() {
public Short getId() {
return id;
}
public void setId(short id) {
public void setId(Short id) {
this.id = id;
}

View File

@ -11,23 +11,23 @@ import javax.persistence.Table;
@Entity
@Table(name = "META_SENSOR_STATUS", schema = "public")
public class MetaSensorStatus {
private short id;
private Short id;
private String name;
public MetaSensorStatus() {
}
public MetaSensorStatus(short id) {
public MetaSensorStatus(Short id) {
this.id = id;
}
@Id
public short getId() {
public Short getId() {
return id;
}
public void setId(short id) {
public void setId(Short id) {
this.id = id;
}

View File

@ -9,17 +9,17 @@ import java.util.Date;
@Entity
@Table(name = "META_VENDOR_CRAWLER", schema = "public")
public class MetaVendorCrawler {
private int id;
private Integer id;
private MetaCrawler crawler;
private MetaInfraVendor infraVendor;
private Date createDate;
@Id
public int getId() {
public Integer getId() {
return id;
}
public void setId(int id) {
public void setId(Integer id) {
this.id = id;
}

View File

@ -9,21 +9,21 @@ import java.util.Date;
@Entity
@Table(name = "META_VENDOR_CRAWLER_SENSOR_ITEM", schema = "public")
public class MetaVendorCrawlerSensorItem {
private long id;
private Long id;
private String interval;
private String warnCondition;
private Date createDate;
private MetaSensorItem sensorItem;
private MetaInfraVendor vendor;
private short crawlerId;
private Short crawlerId;
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}
@ -80,11 +80,11 @@ public class MetaVendorCrawlerSensorItem {
@Basic
@Column(name = "CRAWLER_ID", nullable = false)
public short getCrawlerId() {
public Short getCrawlerId() {
return crawlerId;
}
public void setCrawlerId(short crawlerId) {
public void setCrawlerId(Short crawlerId) {
this.crawlerId = crawlerId;
}

View File

@ -31,13 +31,13 @@ public enum MetaCrawlerEnum {
UNKNOWN_CRAWLER((short)24);
private short value;
private Short value;
private MetaCrawlerEnum(short value) {
private MetaCrawlerEnum(Short value) {
this.value = value;
}
public short getValue() {
public Short getValue() {
return this.value;
}

View File

@ -14,7 +14,7 @@ import java.util.Date;
@Entity
@Table(name = "NOAUTH_PROBE", schema = "public")
public class NoAuthProbe {
private long id;
private Long id;
private String description;
private MetaNoAuthProbeStatus status;
private String tempProbeKey;
@ -27,11 +27,11 @@ public class NoAuthProbe {
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -11,7 +11,7 @@ import java.util.Date;
@Entity
@Table(name = "NOTIFICATION", schema = "public")
public class Notification {
private long id;
private Long id;
private Date createDate;
private String title;
private String message;
@ -21,11 +21,11 @@ public class Notification {
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -15,7 +15,7 @@ import java.util.Date;
@Table(name = "PROBE", schema = "public")
public class Probe {
private long id;
private Long id;
private MetaProbeStatus status;
private String description;
private Date createDate;
@ -26,7 +26,7 @@ public class Probe {
private String cidr;
private Date authorizeDate;
private Member authorizeMember;
private int targetCount;
private Integer targetCount;
private Date connectDate;
private String connectAddress;
@ -34,17 +34,17 @@ public class Probe {
}
public Probe(long id) {
public Probe(Long id) {
this.id = id;
}
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}
@ -144,11 +144,11 @@ public class Probe {
}
@Column(name = "TARGET_COUNT", nullable = false)
public int getTargetCount() {
public Integer getTargetCount() {
return targetCount;
}
public void setTargetCount(int targetCount) {
public void setTargetCount(Integer targetCount) {
this.targetCount = targetCount;
}

View File

@ -12,17 +12,17 @@ import javax.persistence.*;
@Table(name = "PROBE_HOST", schema = "public")
public class ProbeHost {
private long id;
private Long id;
private Probe probe;
private InfraHost host;
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -12,7 +12,7 @@ import java.util.Date;
@Entity
@Table(name = "PROBE_TASK", schema = "public")
public class ProbeTask {
private long id;
private Long id;
private MetaProbeTaskType taskType;
private Probe probe;
private String data;
@ -24,11 +24,11 @@ public class ProbeTask {
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -17,14 +17,14 @@ import java.util.List;
@Entity
@Table(name = "SENSOR", schema = "public")
public class Sensor {
private long id;
private Long id;
private Date createDate;
private String description;
private MetaSensorStatus status;
private Target target;
private MetaCrawler crawler;
private String crawlerInputItems;
private short itemCount = 0;
private Short itemCount = 0;
private String displayName;
// Transient property
@ -32,11 +32,11 @@ public class Sensor {
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}
@ -100,11 +100,11 @@ public class Sensor {
}
@Column(name = "ITEM_COUNT", nullable = false)
public short getItemCount() {
public Short getItemCount() {
return itemCount;
}
public void setItemCount(short itemCount) {
public void setItemCount(Short itemCount) {
this.itemCount = itemCount;
}

View File

@ -13,18 +13,18 @@ import java.util.Date;
@Entity
@Table(name = "SENSOR_ITEM", schema = "public")
public class SensorItem {
private long id;
private Long id;
private Sensor sensor;
private MetaSensorDisplayItem item;
private Date createDate;
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -11,17 +11,17 @@ import javax.persistence.*;
@Entity
@Table(name = "SENSOR_ITEM_DEPENDENCY", schema = "public")
public class SensorItemDependency {
private long id;
private Long id;
private MetaSensorDisplayItem displayItem;
private MetaSensorItemKey sensorItem;
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -7,7 +7,7 @@ import com.loafle.overflow.core.type.PortType;
*/
public class Connection {
private String ip;
private int port;
private Integer port;
private PortType portType;
private boolean ssl;
@ -19,11 +19,11 @@ public class Connection {
this.ip = ip;
}
public int getPort() {
public Integer getPort() {
return port;
}
public void setPort(int port) {
public void setPort(Integer port) {
this.port = port;
}

View File

@ -6,18 +6,18 @@ import java.util.List;
* SensorConfig
*/
public class SensorConfig {
private long id;
private Long id;
private String configID;
private Target target;
private Schedule schedule;
private Crawler crawler;
private List<Item> items;
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}

View File

@ -14,11 +14,11 @@ import java.util.List;
@Table(name = "TARGET", schema = "public")
public class Target {
private long id;
private Long id;
private Date createDate;
private String displayName;
private String description;
private int sensorCount;
private Integer sensorCount;
// Transient property
private List<Sensor> sensors;
@ -26,11 +26,11 @@ public class Target {
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
public Long getId() {
return id;
}
public void setId(long id) {
public void setId(Long id) {
this.id = id;
}
@ -64,11 +64,11 @@ public class Target {
@Column(name = "SENSOR_COUNT", nullable = false)
public int getSensorCount() {
public Integer getSensorCount() {
return sensorCount;
}
public void setSensorCount(int sensorCount) {
public void setSensorCount(Integer sensorCount) {
this.sensorCount = sensorCount;
}

View File

@ -1,35 +0,0 @@
package com.loafle.overflow.model.websocket;
import javax.persistence.*;
import java.util.Date;
/**
* Created by root on 17. 6. 22.
*/
@Entity
@Table(name = "UI_WEBSOCKET", schema = "public")
public class UiWebsocket {
private long id;
private Date createDate;
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
@Basic
@Column(name = "CREATE_DATE", nullable = true)
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
}

View File

@ -3,7 +3,6 @@ package com.loafle.overflow.service.central.apikey;
import com.loafle.overflow.core.annotation.WebappAPI;
import com.loafle.overflow.core.exception.OverflowException;
import com.loafle.overflow.model.apikey.ApiKey;
import com.loafle.overflow.model.domain.Domain;
/**
* Created by geek on 17. 11. 7.
@ -12,7 +11,7 @@ public interface ApiKeyService {
@WebappAPI
ApiKey regist(ApiKey apiKey) throws OverflowException;
@WebappAPI
ApiKey readByDomain(Domain domain) throws OverflowException;
ApiKey readByDomainID(Long domainID) throws OverflowException;
boolean check(String apiKey) throws OverflowException;
@WebappAPI
ApiKey readByApiKey(String apiKey) throws OverflowException;

View File

@ -13,7 +13,7 @@ public interface AuthCrawlerService {
@WebappAPI
AuthCrawler regist(AuthCrawler authCrawler) throws OverflowException;
@WebappAPI
boolean checkAuthCrawler(long infraId, MetaCrawler crawler, String authJson) throws OverflowException;
boolean checkAuthCrawler(Long infraId, MetaCrawler crawler, String authJson) throws OverflowException;
@WebappAPI
AuthCrawler readAuth(MetaCrawler metaCrawler, Target target) throws OverflowException;
}

View File

@ -15,11 +15,11 @@ public interface DomainMemberService {
@WebappAPI
void regist(DomainMember domainMember) throws OverflowException;
@WebappAPI
Domain readDomainByMemberID(long id) throws OverflowException;
Domain readDomainByMemberID(Long memberID) throws OverflowException;
@WebappAPI
DomainMember readByMemberEmail(String email) throws OverflowException;
@WebappAPI
List<Member> readAllMemberByDomain(Domain domain) throws OverflowException;
@WebappAPI
List<Member> readAllMemberByDomainID(final long domainID) throws OverflowException;
List<Member> readAllMemberByDomainID(final Long domainID) throws OverflowException;
}

View File

@ -14,11 +14,11 @@ public interface HistoryService {
History regist(History history);
@WebappAPI
Page<History> readAllByProbeAndType(Probe probe, MetaHistoryType type, PageParams pageParams);
Page<History> readAllByProbeIDAndType(Long probeID, MetaHistoryType type, PageParams pageParams);
@WebappAPI
Page<History> readAllByProbe(Probe probe, PageParams pageParams);
Page<History> readAllByProbeID(Long probeID, PageParams pageParams);
@WebappAPI
Page<History> readAllByDomain(Domain domain, PageParams pageParams);
Page<History> readAllByDomainID(Long domainID, PageParams pageParams);
@WebappAPI
Page<History> readAllByDomainAndType(Domain domain, MetaHistoryType type, PageParams pageParams);
Page<History> readAllByDomainIDAndType(Long domainID, MetaHistoryType type, PageParams pageParams);
}

View File

@ -9,6 +9,6 @@ import com.loafle.overflow.model.infra.InfraHost;
public interface InfraHostService {
InfraHost regist(InfraHost infraHost) throws OverflowException;
InfraHost read(long id) throws OverflowException;
InfraHost read(Long id) throws OverflowException;
InfraHost readByIp(String ip) throws OverflowException;
}

View File

@ -8,5 +8,5 @@ import com.loafle.overflow.model.infra.InfraMachine;
*/
public interface InfraMachineService {
InfraMachine regist(InfraMachine infraMachine) throws OverflowException;
InfraMachine read(long id) throws OverflowException;
InfraMachine read(Long id) throws OverflowException;
}

View File

@ -9,5 +9,5 @@ import com.loafle.overflow.model.infra.InfraOSApplication;
public interface InfraOSApplicationService {
InfraOSApplication regist(InfraOSApplication infraOSApplication) throws OverflowException;
InfraOSApplication read(long id) throws OverflowException;
InfraOSApplication read(Long id) throws OverflowException;
}

View File

@ -9,5 +9,5 @@ import com.loafle.overflow.model.infra.InfraOSDaemon;
public interface InfraOSDaemonService {
InfraOSDaemon regist(InfraOSDaemon infraOSDaemon) throws OverflowException;
InfraOSDaemon read(long id) throws OverflowException;
InfraOSDaemon read(Long id) throws OverflowException;
}

View File

@ -9,6 +9,6 @@ import com.loafle.overflow.model.infra.InfraOSPort;
public interface InfraOSPortService {
InfraOSPort regist(InfraOSPort infraOSPort) throws OverflowException;
InfraOSPort read(long id) throws OverflowException;
InfraOSPort readByPort(long osId, int portNumber, String portType) throws OverflowException;
InfraOSPort read(Long id) throws OverflowException;
InfraOSPort readByPort(Long osId, int portNumber, String portType) throws OverflowException;
}

View File

@ -9,5 +9,5 @@ import com.loafle.overflow.model.infra.InfraOS;
public interface InfraOSService {
InfraOS regist(InfraOS infraOS) throws OverflowException;
InfraOS read(long id) throws OverflowException;
InfraOS read(Long id) throws OverflowException;
}

View File

@ -17,10 +17,10 @@ import org.springframework.data.domain.Page;
public interface InfraService {
Infra regist(Infra infra) throws OverflowException;
Infra read(long id) throws OverflowException;
Page<Infra> readAllByProbe(Probe probe, PageParams pageParams) throws OverflowException;
Page<Infra> readAllByDomain(Domain domain, PageParams pageParams) throws OverflowException;
List<Target> readAllTargetByDomain(Domain domain) throws OverflowException;
Infra read(Long id) throws OverflowException;
Page<Infra> readAllByProbeID(Long probeID, PageParams pageParams) throws OverflowException;
Page<Infra> readAllByDomainID(Long domainID, PageParams pageParams) throws OverflowException;
List<Target> readAllTargetByDomainID(Long domainID) throws OverflowException;
List<Target> readAllTargetByProbeList(List<Probe> probeList) throws OverflowException;
Infra readByTarget(Target target) throws OverflowException;
Infra readByTargetID(Long targetID) throws OverflowException;
}

View File

@ -25,7 +25,7 @@ public interface MemberService {
@WebappAPI
Member forgotPassword(String signinId, String newPw) throws OverflowException;
@WebappAPI
Member read(long memberId) throws OverflowException;
Member read(Long memberId) throws OverflowException;
@WebappAPI
void withdrawal(Member member) throws OverflowException;
@WebappAPI
@ -35,5 +35,5 @@ public interface MemberService {
@WebappAPI
List<Member> readAllByDomain(Domain domain) throws OverflowException;
@WebappAPI
List<Member> readAllByDomainID(final long domainID) throws OverflowException;
List<Member> readAllByDomainID(final Long domainID) throws OverflowException;
}

View File

@ -15,9 +15,9 @@ public interface MemberTotpService {
@WebappAPI
MemberTotp modify(MemberTotp totp) throws OverflowException;
@WebappAPI
void remove(long id) throws OverflowException;
void remove(Long id) throws OverflowException;
@WebappAPI
MemberTotp read(long id) throws OverflowException;
MemberTotp read(Long id) throws OverflowException;
@WebappAPI
boolean checkCodeForMember(Member member, String code) throws OverflowException;
@WebappAPI

View File

@ -22,10 +22,10 @@ public interface NoAuthProbeService {
void onDisconnect(String tempKey) throws OverflowException;
@WebappAPI
List<NoAuthProbe> readAllByDomain(long id) throws OverflowException;
List<NoAuthProbe> readAllByDomainID(Long id) throws OverflowException;
@WebappAPI
List<NoAuthProbe> acceptNoAuthProbe(long id) throws OverflowException;
List<NoAuthProbe> acceptNoAuthProbe(Long id) throws OverflowException;
@WebappAPI
List<NoAuthProbe> denyNoauthProbe(long id) throws OverflowException;
List<NoAuthProbe> denyNoauthProbe(Long id) throws OverflowException;
}

View File

@ -3,16 +3,14 @@ package com.loafle.overflow.service.central.probe;
import java.util.List;
import com.loafle.overflow.core.exception.OverflowException;
import com.loafle.overflow.model.domain.Domain;
import com.loafle.overflow.model.probe.Probe;
import com.loafle.overflow.model.probe.ProbeHost;
/**
* Created by snoop on 17. 8. 21.
*/
public interface ProbeHostService {
ProbeHost read(long id) throws OverflowException;
ProbeHost readByProbe(Probe probe) throws OverflowException;
ProbeHost read(Long id) throws OverflowException;
ProbeHost readByProbeID(Long probeID) throws OverflowException;
ProbeHost regist(ProbeHost probeHost) throws OverflowException;
List<ProbeHost> readAllByDomain(Domain domain) throws OverflowException;
List<ProbeHost> readAllByDomainID(Long domain) throws OverflowException;
}

View File

@ -3,7 +3,6 @@ package com.loafle.overflow.service.central.probe;
import com.loafle.overflow.core.annotation.ProbeAPI;
import com.loafle.overflow.core.annotation.WebappAPI;
import com.loafle.overflow.core.exception.OverflowException;
import com.loafle.overflow.model.domain.Domain;
import com.loafle.overflow.model.probe.Probe;
import java.util.List;
@ -18,11 +17,11 @@ public interface ProbeService {
List<Probe> regist(List<Probe> probes) throws OverflowException;
@WebappAPI
List<Probe> readAllByDomain(Domain domain) throws OverflowException;
List<Probe> readAllByDomainID(Long id) throws OverflowException;
@WebappAPI
Probe read(long id) throws OverflowException;
Probe read(Long id) throws OverflowException;
@WebappAPI
Probe modifyDisplayName(long probeId, String displayName) throws OverflowException;
Probe modifyDisplayName(Long probeId, String displayName) throws OverflowException;
@ProbeAPI //?
Probe readByProbeKey(String probeKey) throws OverflowException;

View File

@ -2,7 +2,6 @@ package com.loafle.overflow.service.central.probe;
import com.loafle.overflow.core.annotation.ProbeAPI;
import com.loafle.overflow.core.exception.OverflowException;
import com.loafle.overflow.model.probe.Probe;
import com.loafle.overflow.model.probe.ProbeTask;
import java.util.List;
@ -14,5 +13,5 @@ public interface ProbeTaskService {
@ProbeAPI
ProbeTask regist(ProbeTask probeTask) throws OverflowException;
@ProbeAPI
List<ProbeTask> readAllByProbe(Probe probe) throws OverflowException;
List<ProbeTask> readAllByProbeID(Long probeID) throws OverflowException;
}

View File

@ -3,10 +3,8 @@ package com.loafle.overflow.service.central.sensor;
import com.loafle.overflow.core.annotation.WebappAPI;
import com.loafle.overflow.core.exception.OverflowException;
import com.loafle.overflow.core.model.PageParams;
import com.loafle.overflow.model.domain.Domain;
import com.loafle.overflow.model.sensor.Sensor;
import com.loafle.overflow.model.sensor.SensorItem;
import com.loafle.overflow.model.target.Target;
import org.springframework.data.domain.Page;
import java.util.List;
@ -20,20 +18,20 @@ public interface SensorService {
@WebappAPI
Sensor read(String id) throws OverflowException;
@WebappAPI
void remove(Sensor sensor) throws OverflowException;
void remove(String id) throws OverflowException;
@WebappAPI
Sensor start(Sensor sensor) throws OverflowException;
Sensor start(String id) throws OverflowException;
@WebappAPI
Sensor stop(Sensor sensor) throws OverflowException;
Sensor stop(String id) throws OverflowException;
@WebappAPI
Sensor registSensorConfig(Sensor sensor, List<SensorItem> sensorItemList, String etcJson) throws OverflowException;
@WebappAPI
String generateSensorConfig(Sensor sensor) throws OverflowException;
@WebappAPI
Page<Sensor> readAllByDomain(Domain domain, PageParams pageParams) throws OverflowException;
Page<Sensor> readAllByDomainID(long domainID, PageParams pageParams) throws OverflowException;
@WebappAPI
Page<Sensor> readAllByInfra(long infraId, PageParams pageParams) throws OverflowException;
Page<Sensor> readAllByInfraID(long infraID, PageParams pageParams) throws OverflowException;
@WebappAPI
Page<Sensor> readAllByTarget(Target target, PageParams pageParams) throws OverflowException;
Page<Sensor> readAllByTargetID(long targetID, PageParams pageParams) throws OverflowException;
}