commons_db/bridge
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
snoop 2016-11-17 11:14:53 +09:00
commit ac999f6525
6 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/com/loafle/bridge/discoveryhost/entity/DiscoveryHost.java → src/main/java/com/loafle/bridge/discoveryhost/DiscoveryHost.java
View File

@ -1,4 +1,7 @@
package com.loafle.bridge.discoveryhost.entity;
package com.loafle.bridge.discoveryhost;
import com.loafle.bridge.discoveryport.DiscoveryPort;
import com.loafle.bridge.discoveryzone.DiscoveryZone;
import javax.persistence.*;
import java.util.Date;
@ -20,17 +23,17 @@ public class DiscoveryHost {
@Column(name = "MAC_ADDRESS",nullable = false)
private long macAddress;
// @ManyToOne
// @JoinColumn(name = "ZONE_ID", nullable = false)
// private DiscoveryZone zone;
@ManyToOne
@JoinColumn(name = "ZONE_ID", nullable = false)
private DiscoveryZone zone;
// public DiscoveryZone getZone() {
// return zone;
// }
//
// public void setZone(DiscoveryZone zone) {
// this.zone = zone;
// }
public DiscoveryZone getZone() {
return zone;
}
public void setZone(DiscoveryZone zone) {
this.zone = zone;
}
@OneToMany(mappedBy = "host")
private List<PortScanHistory> histories;
@ -43,16 +46,16 @@ public class DiscoveryHost {
this.histories = histories;
}
// @OneToMany(mappedBy = "host")
// private List<DiscoveryPort> ports;
//
// public List<DiscoveryPort> getPorts() {
// return ports;
// }
//
// public void setPorts(List<DiscoveryPort> ports) {
// this.ports = ports;
// }
@OneToMany(mappedBy = "host")
private List<DiscoveryPort> ports;
public List<DiscoveryPort> getPorts() {
return ports;
}
public void setPorts(List<DiscoveryPort> ports) {
this.ports = ports;
}
@Column(name = "CREATE_DATE", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", nullable = false, insertable = false, updatable = false)
private Date createDate;

2
src/main/java/com/loafle/bridge/discoveryhost/controller/DiscoveryHostController.java → src/main/java/com/loafle/bridge/discoveryhost/DiscoveryHostController.java
View File

@ -1,4 +1,4 @@
package com.loafle.bridge.discoveryhost.controller;
package com.loafle.bridge.discoveryhost;
/**
* Created by root on 16. 11. 15.

4
src/main/java/com/loafle/bridge/discoveryhost/repository/DiscoveryHostRepository.java → src/main/java/com/loafle/bridge/discoveryhost/DiscoveryHostRepository.java
View File

@ -1,6 +1,6 @@
package com.loafle.bridge.discoveryhost.repository;
package com.loafle.bridge.discoveryhost;
import com.loafle.bridge.discoveryhost.entity.DiscoveryHost;
import com.loafle.bridge.discoveryhost.DiscoveryHost;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.core.annotation.RepositoryRestResource;

2
src/main/java/com/loafle/bridge/discoveryhost/entity/PortScanHistory.java → src/main/java/com/loafle/bridge/discoveryhost/PortScanHistory.java
View File

@ -1,4 +1,4 @@
package com.loafle.bridge.discoveryhost.entity;
package com.loafle.bridge.discoveryhost;
import com.loafle.bridge.discoveryport.type.DirectionType;
import com.loafle.bridge.discoveryport.type.PortType;

2
src/main/java/com/loafle/bridge/discoveryport/DiscoveryPort.java
View File

@ -1,6 +1,6 @@
package com.loafle.bridge.discoveryport;
import com.loafle.bridge.discoveryhost.entity.DiscoveryHost;
import com.loafle.bridge.discoveryhost.DiscoveryHost;
import com.loafle.bridge.discoveryport.type.PortType;
import com.loafle.bridge.discoveryservice.DiscoveryService;

5
src/test/java/com/loafle/bridge/discoveryhost/repository/DiscoveryHostRepositoryTest.java
View File

@ -1,8 +1,9 @@
package com.loafle.bridge.discoveryhost.repository;
import com.loafle.bridge.Application;
import com.loafle.bridge.discoveryhost.entity.DiscoveryHost;
import com.loafle.bridge.discoveryhost.entity.PortScanHistory;
import com.loafle.bridge.discoveryhost.DiscoveryHost;
import com.loafle.bridge.discoveryhost.DiscoveryHostRepository;
import com.loafle.bridge.discoveryhost.PortScanHistory;
import com.loafle.bridge.discoveryport.type.DirectionType;
import com.loafle.bridge.discoveryport.type.PortType;
import org.apache.log4j.Logger;