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:
geek 2016-11-18 11:31:36 +09:00
commit 8d9efcade6
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ public class DiscoveryPort {
private long id; private long id;
@ManyToOne @ManyToOne
@JoinColumn @JoinColumn(nullable = false)
@JsonIgnore @JsonIgnore
private DiscoveryHost host; private DiscoveryHost host;
public DiscoveryHost getHost() { public DiscoveryHost getHost() {

6
src/main/java/com/loafle/bridge/discoveryport/ServiceScanHistory.java
View File

@ -21,8 +21,8 @@ public class ServiceScanHistory {
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date createDate; private Date createDate;
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne
@JoinColumn @JoinColumn(nullable = false)
@JsonIgnore @JsonIgnore
private DiscoveryPort port; private DiscoveryPort port;
@ -34,8 +34,6 @@ public class ServiceScanHistory {
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
private DirectionType direction; private DirectionType direction;
@Lob @Lob
@Column(nullable = false) @Column(nullable = false)
private byte[] packet; private byte[] packet;