From 3d250cef2b99f42f8b65725eb64d87275e2df17b Mon Sep 17 00:00:00 2001 From: jackdaw Date: Wed, 16 Nov 2016 17:17:41 +0900 Subject: [PATCH] . --- .../java/com/loafle/bridge/discoveryport/DiscoveryPort.java | 2 +- .../loafle/bridge/discoveryport/DiscoveryPortController.java | 2 +- .../discoveryservice/{entity => }/DiscoveryService.java | 2 +- .../{controller => }/DiscoveryServiceController.java | 4 +--- .../{repository => }/DiscoveryServiceRepository.java | 3 +-- .../repository/DiscoveryServiceRepositoryTest.java | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) rename src/main/java/com/loafle/bridge/discoveryservice/{entity => }/DiscoveryService.java (97%) rename src/main/java/com/loafle/bridge/discoveryservice/{controller => }/DiscoveryServiceController.java (76%) rename src/main/java/com/loafle/bridge/discoveryservice/{repository => }/DiscoveryServiceRepository.java (75%) diff --git a/src/main/java/com/loafle/bridge/discoveryport/DiscoveryPort.java b/src/main/java/com/loafle/bridge/discoveryport/DiscoveryPort.java index 3284eb7..02e9a53 100644 --- a/src/main/java/com/loafle/bridge/discoveryport/DiscoveryPort.java +++ b/src/main/java/com/loafle/bridge/discoveryport/DiscoveryPort.java @@ -2,7 +2,7 @@ package com.loafle.bridge.discoveryport; import com.loafle.bridge.discoveryhost.entity.DiscoveryHost; import com.loafle.bridge.discoveryport.type.PortType; -import com.loafle.bridge.discoveryservice.entity.DiscoveryService; +import com.loafle.bridge.discoveryservice.DiscoveryService; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/bridge/discoveryport/DiscoveryPortController.java b/src/main/java/com/loafle/bridge/discoveryport/DiscoveryPortController.java index 7cbff39..9de889d 100644 --- a/src/main/java/com/loafle/bridge/discoveryport/DiscoveryPortController.java +++ b/src/main/java/com/loafle/bridge/discoveryport/DiscoveryPortController.java @@ -1,7 +1,7 @@ package com.loafle.bridge.discoveryport; import com.loafle.bridge.discoveryport.type.PortType; -import com.loafle.bridge.discoveryservice.entity.DiscoveryService; +import com.loafle.bridge.discoveryservice.DiscoveryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/loafle/bridge/discoveryservice/entity/DiscoveryService.java b/src/main/java/com/loafle/bridge/discoveryservice/DiscoveryService.java similarity index 97% rename from src/main/java/com/loafle/bridge/discoveryservice/entity/DiscoveryService.java rename to src/main/java/com/loafle/bridge/discoveryservice/DiscoveryService.java index b7c65ea..a110544 100644 --- a/src/main/java/com/loafle/bridge/discoveryservice/entity/DiscoveryService.java +++ b/src/main/java/com/loafle/bridge/discoveryservice/DiscoveryService.java @@ -1,4 +1,4 @@ -package com.loafle.bridge.discoveryservice.entity; +package com.loafle.bridge.discoveryservice; import com.loafle.bridge.discoveryport.DiscoveryPort; import com.loafle.bridge.discoveryport.type.PortType; diff --git a/src/main/java/com/loafle/bridge/discoveryservice/controller/DiscoveryServiceController.java b/src/main/java/com/loafle/bridge/discoveryservice/DiscoveryServiceController.java similarity index 76% rename from src/main/java/com/loafle/bridge/discoveryservice/controller/DiscoveryServiceController.java rename to src/main/java/com/loafle/bridge/discoveryservice/DiscoveryServiceController.java index ccee053..90b6bac 100644 --- a/src/main/java/com/loafle/bridge/discoveryservice/controller/DiscoveryServiceController.java +++ b/src/main/java/com/loafle/bridge/discoveryservice/DiscoveryServiceController.java @@ -1,7 +1,5 @@ -package com.loafle.bridge.discoveryservice.controller; +package com.loafle.bridge.discoveryservice; -import com.loafle.bridge.discoveryservice.entity.DiscoveryService; -import com.loafle.bridge.discoveryservice.repository.DiscoveryServiceRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/loafle/bridge/discoveryservice/repository/DiscoveryServiceRepository.java b/src/main/java/com/loafle/bridge/discoveryservice/DiscoveryServiceRepository.java similarity index 75% rename from src/main/java/com/loafle/bridge/discoveryservice/repository/DiscoveryServiceRepository.java rename to src/main/java/com/loafle/bridge/discoveryservice/DiscoveryServiceRepository.java index fb1427b..6b1eb2e 100644 --- a/src/main/java/com/loafle/bridge/discoveryservice/repository/DiscoveryServiceRepository.java +++ b/src/main/java/com/loafle/bridge/discoveryservice/DiscoveryServiceRepository.java @@ -1,6 +1,5 @@ -package com.loafle.bridge.discoveryservice.repository; +package com.loafle.bridge.discoveryservice; -import com.loafle.bridge.discoveryservice.entity.DiscoveryService; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.rest.core.annotation.RepositoryRestResource; diff --git a/src/test/java/com/loafle/bridge/discoveryservice/repository/DiscoveryServiceRepositoryTest.java b/src/test/java/com/loafle/bridge/discoveryservice/repository/DiscoveryServiceRepositoryTest.java index e306abb..2c0b404 100644 --- a/src/test/java/com/loafle/bridge/discoveryservice/repository/DiscoveryServiceRepositoryTest.java +++ b/src/test/java/com/loafle/bridge/discoveryservice/repository/DiscoveryServiceRepositoryTest.java @@ -4,7 +4,7 @@ import com.loafle.bridge.Application; 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 com.loafle.bridge.discoveryservice.DiscoveryService; import org.apache.log4j.Logger; import org.junit.After; import org.junit.Before;