This commit is contained in:
jackdaw 2016-11-16 15:24:52 +09:00
parent e14f86dd16
commit c782dcd20c
9 changed files with 22 additions and 24 deletions

View File

@ -1,6 +1,6 @@
package com.loafle.bridge.discoveryport.entity; package com.loafle.bridge.discoveryport;
import com.loafle.bridge.discoveryport.constant.PortType; import com.loafle.bridge.discoveryport.type.PortType;
import com.loafle.bridge.discoveryservice.entity.DiscoveryService; import com.loafle.bridge.discoveryservice.entity.DiscoveryService;
import javax.persistence.*; import javax.persistence.*;
@ -29,7 +29,7 @@ public class DiscoveryPort {
private PortType portType; private PortType portType;
@Column(nullable = false) @Column(nullable = false)
private short portNumber; private int portNumber;
@OneToMany(mappedBy = "port") @OneToMany(mappedBy = "port")
private List<ServiceScanHistory> histories; private List<ServiceScanHistory> histories;
@ -75,11 +75,11 @@ public class DiscoveryPort {
this.portType = portType; this.portType = portType;
} }
public short getPortNumber() { public int getPortNumber() {
return portNumber; return portNumber;
} }
public void setPortNumber(short portNumber) { public void setPortNumber(int portNumber) {
this.portNumber = portNumber; this.portNumber = portNumber;
} }

View File

@ -1,8 +1,6 @@
package com.loafle.bridge.discoveryport.controller; package com.loafle.bridge.discoveryport;
import com.loafle.bridge.discoveryport.constant.PortType; import com.loafle.bridge.discoveryport.type.PortType;
import com.loafle.bridge.discoveryport.entity.DiscoveryPort;
import com.loafle.bridge.discoveryport.repository.DiscoveryPortRepository;
import com.loafle.bridge.discoveryservice.entity.DiscoveryService; import com.loafle.bridge.discoveryservice.entity.DiscoveryService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;

View File

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

View File

@ -1,6 +1,6 @@
package com.loafle.bridge.discoveryport.entity; package com.loafle.bridge.discoveryport;
import com.loafle.bridge.discoveryport.constant.DirectionType; import com.loafle.bridge.discoveryport.type.DirectionType;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;

View File

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

View File

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

View File

@ -1,7 +1,7 @@
package com.loafle.bridge.discoveryservice.entity; package com.loafle.bridge.discoveryservice.entity;
import com.loafle.bridge.discoveryport.constant.PortType; import com.loafle.bridge.discoveryport.DiscoveryPort;
import com.loafle.bridge.discoveryport.entity.DiscoveryPort; import com.loafle.bridge.discoveryport.type.PortType;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;

View File

@ -1,10 +1,11 @@
package com.loafle.bridge.discoveryport.repository; package com.loafle.bridge.discoveryport.repository;
import com.loafle.bridge.Application; import com.loafle.bridge.Application;
import com.loafle.bridge.discoveryport.constant.DirectionType; import com.loafle.bridge.discoveryport.DiscoveryPort;
import com.loafle.bridge.discoveryport.constant.PortType; import com.loafle.bridge.discoveryport.DiscoveryPortRepository;
import com.loafle.bridge.discoveryport.entity.DiscoveryPort; import com.loafle.bridge.discoveryport.ServiceScanHistory;
import com.loafle.bridge.discoveryport.entity.ServiceScanHistory; import com.loafle.bridge.discoveryport.type.DirectionType;
import com.loafle.bridge.discoveryport.type.PortType;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;

View File

@ -1,9 +1,9 @@
package com.loafle.bridge.discoveryservice.repository; package com.loafle.bridge.discoveryservice.repository;
import com.loafle.bridge.Application; import com.loafle.bridge.Application;
import com.loafle.bridge.discoveryport.constant.PortType; import com.loafle.bridge.discoveryport.DiscoveryPort;
import com.loafle.bridge.discoveryport.entity.DiscoveryPort; import com.loafle.bridge.discoveryport.DiscoveryPortRepository;
import com.loafle.bridge.discoveryport.repository.DiscoveryPortRepository; import com.loafle.bridge.discoveryport.type.PortType;
import com.loafle.bridge.discoveryservice.entity.DiscoveryService; import com.loafle.bridge.discoveryservice.entity.DiscoveryService;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.junit.After; import org.junit.After;