Merge remote-tracking branch 'origin/master'

src/main/java/com/loafle/bridge/discoveryport/DiscoveryPort.java

@@ -1,6 +1,7 @@
-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 javax.persistence.*;
 import java.util.Date;
@@ -28,26 +29,26 @@ public class DiscoveryPort {
     private PortType portType;
 
     @Column(nullable = false)
-    private short portNumber;
+    private int portNumber;
 
     @OneToMany(mappedBy = "port")
     private List<ServiceScanHistory> histories;
 
-//    @OneToMany(mappedBy = "port")
+    @OneToMany(mappedBy = "port" ,cascade = CascadeType.ALL)
-//    private List<DiscoveryService> services;
+    private List<DiscoveryService> services;
-//
+
-//    public List<DiscoveryService> getServices() {
+    public List<DiscoveryService> getServices() {
-//        return services;
+        return services;
-//    }
+    }
-//
+
-//    public void setServices(List<DiscoveryService> services) {
+    public void setServices(List<DiscoveryService> services) {
-//        this.services = services;
+        this.services = services;
-//    }
+    }
 
     @Column(columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", nullable = false, insertable = false, updatable = false)
     private Date createDate;
 
-    @Column(columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", nullable = false)
+    @Column(columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", nullable = false, insertable = false)
     private Date updateDate;
 
 
@@ -74,11 +75,11 @@ public class DiscoveryPort {
         this.portType = portType;
     }
 
-    public short getPortNumber() {
+    public int getPortNumber() {
         return portNumber;
     }
 
-    public void setPortNumber(short portNumber) {
+    public void setPortNumber(int portNumber) {
         this.portNumber = portNumber;
     }
 
@@ -99,9 +100,6 @@ public class DiscoveryPort {
     }
 
     public Date getUpdateDate() {
-        if (this.updateDate == null) {
-            this.updateDate = new Date();
-        }
         return updateDate;
     }
 

src/main/java/com/loafle/bridge/discoveryport/DiscoveryPortController.java

@@ -0,0 +1,47 @@
+package com.loafle.bridge.discoveryport;
+
+import com.loafle.bridge.discoveryport.type.PortType;
+import com.loafle.bridge.discoveryservice.entity.DiscoveryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.transaction.Transactional;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by root on 16. 11. 15.
+ */
+
+@RestController
+public class DiscoveryPortController {
+
+    @Autowired
+    DiscoveryPortRepository repository;
+
+    @RequestMapping(value = "/discoveryPort/{id}", method = RequestMethod.GET)
+    public DiscoveryPort get(@PathVariable(value = "id") long id) {
+        return repository.findOne(id);
+    }
+
+    @RequestMapping(value ="/index")
+    @Transactional
+    public void index() {
+        DiscoveryPort p = new DiscoveryPort(PortType.TCP,(short)12786);
+
+        List<DiscoveryService> ss = new ArrayList<>();
+
+        repository.save(p);
+
+        ss.add(new DiscoveryService(p,PortType.TCP,"DNS"));
+        ss.add(new DiscoveryService(p,PortType.TCP,"TEST"));
+        ss.add(new DiscoveryService(p,PortType.TCP,"ABB"));
+
+        p.setServices(ss);
+
+        repository.save(p);
+    }
+}

src/main/java/com/loafle/bridge/discoveryport/DiscoveryPortRepository.java

@@ -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.rest.core.annotation.RepositoryRestResource;
 

src/main/java/com/loafle/bridge/discoveryport/ServiceScanHistory.java

@@ -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 java.util.Date;
@@ -16,10 +16,14 @@ public class ServiceScanHistory {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private long id;
 
+    @Column(columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", nullable = false, insertable = false, updatable = false)
+    private Date createDate;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn
     private DiscoveryPort port;
 
+
     @Column(nullable = false)
     private String serviceName;
 
@@ -27,8 +31,7 @@ public class ServiceScanHistory {
     @Enumerated(EnumType.STRING)
     private DirectionType direction;
 
-    @Column(columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", nullable = false, insertable = false, updatable = false)
+
-    private Date createDate;
 
     @Lob
     @Column(nullable = false)

src/main/java/com/loafle/bridge/discoveryport/controller/DiscoveryPortController.java

@@ -1,25 +0,0 @@
-package com.loafle.bridge.discoveryport.controller;
-
-import com.loafle.bridge.discoveryport.entity.DiscoveryPort;
-import com.loafle.bridge.discoveryport.repository.DiscoveryPortRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Created by root on 16. 11. 15.
- */
-
-@RestController
-public class DiscoveryPortController {
-
-    @Autowired
-    DiscoveryPortRepository repository;
-
-    @RequestMapping(value = "/discoveryPort/{id}", method = RequestMethod.GET)
-    public DiscoveryPort get(@PathVariable(value = "id") long id) {
-        return repository.findOne(id);
-    }
-}

src/main/java/com/loafle/bridge/discoveryport/type/DirectionType.java

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

src/main/java/com/loafle/bridge/discoveryport/type/PortType.java

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

src/main/java/com/loafle/bridge/discoveryservice/entity/DiscoveryService.java

@@ -1,6 +1,7 @@
 package com.loafle.bridge.discoveryservice.entity;
 
-import com.loafle.bridge.discoveryport.constant.PortType;
+import com.loafle.bridge.discoveryport.DiscoveryPort;
+import com.loafle.bridge.discoveryport.type.PortType;
 
 import javax.persistence.*;
 import java.util.Date;
@@ -14,16 +15,16 @@ public class DiscoveryService {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private long id;
 
-//    @ManyToOne
+    @ManyToOne
-//    @JoinColumn(nullable = false)
+    @JoinColumn(nullable = false)
-//    private DiscoveryPort port;
+    private DiscoveryPort port;
-//    public DiscoveryPort getPort() {
+    public DiscoveryPort getPort() {
-//        return port;
+        return port;
-//    }
+    }
-//
+
-//    public void setPort(DiscoveryPort port) {
+    public void setPort(DiscoveryPort port) {
-//        this.port = port;
+        this.port = port;
-//    }
+    }
 
     @Column(nullable = false)
     @Enumerated(EnumType.STRING)
@@ -35,12 +36,13 @@ public class DiscoveryService {
     @Column(columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", nullable = false, insertable = false, updatable = false)
     private Date createDate;
 
-    @Column(columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", nullable = false)
+    @Column(columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", nullable = false ,insertable = false)
     private Date updateDate;
 
     public DiscoveryService() {}
 
-    public DiscoveryService(PortType t, String serviceName) {
+    public DiscoveryService(DiscoveryPort port,PortType t, String serviceName) {
+        this.port = port;
         this.portType = t;
         this.serviceName = serviceName;
     }
@@ -63,9 +65,6 @@ public class DiscoveryService {
     }
 
     public Date getUpdateDate() {
-        if (this.updateDate == null) {
-            this.updateDate = new Date();
-        }
         return updateDate;
     }
 

src/main/resources/database.properties

@@ -1,5 +1,5 @@
 ## DataSource configuration
-spring.datasource.url=jdbc:h2:file:~/data/test
+spring.datasource.url=jdbc:h2:file:~/data/test;DB_CLOSE_ON_EXIT=FALSE
 spring.datasource.username=sa
 spring.datasource.password=qwe123
 spring.datasource.driver-class-name=org.h2.Driver

src/test/java/com/loafle/bridge/discoveryport/repository/DiscoveryPortRepositoryTest.java

@@ -1,10 +1,11 @@
 package com.loafle.bridge.discoveryport.repository;
 
 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.junit.After;
 import org.junit.Before;

src/test/java/com/loafle/bridge/discoveryservice/repository/DiscoveryServiceRepositoryTest.java

@@ -1,7 +1,9 @@
 package com.loafle.bridge.discoveryservice.repository;
 
 import com.loafle.bridge.Application;
-import com.loafle.bridge.discoveryport.constant.PortType;
+import com.loafle.bridge.discoveryport.DiscoveryPort;
+import com.loafle.bridge.discoveryport.DiscoveryPortRepository;
+import com.loafle.bridge.discoveryport.type.PortType;
 import com.loafle.bridge.discoveryservice.entity.DiscoveryService;
 import org.apache.log4j.Logger;
 import org.junit.After;
@@ -12,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import javax.transaction.Transactional;
+import java.util.ArrayList;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
@@ -25,14 +29,28 @@ import static org.junit.Assert.assertEquals;
 public class DiscoveryServiceRepositoryTest {
 
     @Autowired
-    private DiscoveryServiceRepository repo;
+    private DiscoveryPortRepository repo;
+
+
+
     private Logger log = Logger.getLogger(this.getClass());
 
     @Before
+    @Transactional
     public void Before() {
-       repo.save(new DiscoveryService(PortType.TLS,"HTTP"));
+
-        repo.save(new DiscoveryService(PortType.TCP,"WMI"));
+        DiscoveryPort p = new DiscoveryPort(PortType.TCP,(short)12786);
-        repo.save(new DiscoveryService(PortType.UDP,"DNS"));
+
+        List<DiscoveryService> ss = new ArrayList<>();
+
+        ss.add(new DiscoveryService(p,PortType.TCP,"DNS"));
+        ss.add(new DiscoveryService(p,PortType.TCP,"TEST"));
+        ss.add(new DiscoveryService(p,PortType.TCP,"ABB"));
+
+        p.setServices(ss);
+
+        repo.save(p);
+
     }
 
     @After
@@ -41,8 +59,10 @@ public class DiscoveryServiceRepositoryTest {
     }
 
     @Test
+    @Transactional
     public void TestBefore() {
-        List<DiscoveryService> l = repo.findAll();
+        List<DiscoveryPort> ll  = repo.findAll();
-        assertEquals(3, l.size());
+        assertEquals(1,ll.size());
+        assertEquals(3,ll.get(0).getServices().size());
     }
 }