Merge pull request #22 from BLasan/remove-eureka
Removed Eureka Client Side Load Balancing
diff --git a/api/src/main/java/org/apache/fineract/cn/customer/api/v1/client/CustomerDocumentsManager.java b/api/src/main/java/org/apache/fineract/cn/customer/api/v1/client/CustomerDocumentsManager.java
index 7d4064b..2cb007d 100644
--- a/api/src/main/java/org/apache/fineract/cn/customer/api/v1/client/CustomerDocumentsManager.java
+++ b/api/src/main/java/org/apache/fineract/cn/customer/api/v1/client/CustomerDocumentsManager.java
@@ -36,7 +36,7 @@
/**
* @author Myrle Krantz
*/
-@FeignClient(name="customer-v1", path="/customer/v1", configuration= CustomerFeignClientConfig.class)
+@FeignClient(path="/customer/v1", url="http://${kubernetes.customer.service.name}:${kubernetes.customer.server.port}", configuration= CustomerFeignClientConfig.class)
public interface CustomerDocumentsManager {
@RequestMapping(
diff --git a/api/src/main/java/org/apache/fineract/cn/customer/api/v1/client/CustomerManager.java b/api/src/main/java/org/apache/fineract/cn/customer/api/v1/client/CustomerManager.java
index f6f60a2..83c16cd 100644
--- a/api/src/main/java/org/apache/fineract/cn/customer/api/v1/client/CustomerManager.java
+++ b/api/src/main/java/org/apache/fineract/cn/customer/api/v1/client/CustomerManager.java
@@ -44,7 +44,7 @@
import org.springframework.web.multipart.MultipartFile;
@SuppressWarnings("unused")
-@FeignClient(name="customer-v1", path="/customer/v1", configuration= CustomerFeignClientConfig.class)
+@FeignClient(path="/customer/v1", url="http://${kubernetes.customer.service.name}:${kubernetes.customer.server.port}", configuration= CustomerFeignClientConfig.class)
public interface CustomerManager {
@RequestMapping(
diff --git a/api/src/main/java/org/apache/fineract/cn/customer/catalog/api/v1/client/CatalogManager.java b/api/src/main/java/org/apache/fineract/cn/customer/catalog/api/v1/client/CatalogManager.java
index c3c8c7d..496888d 100644
--- a/api/src/main/java/org/apache/fineract/cn/customer/catalog/api/v1/client/CatalogManager.java
+++ b/api/src/main/java/org/apache/fineract/cn/customer/catalog/api/v1/client/CatalogManager.java
@@ -33,7 +33,7 @@
import org.springframework.web.bind.annotation.RequestMethod;
@SuppressWarnings("unused")
-@FeignClient(name="customer-v1", path="/customer/v1", configuration=CustomFeignClientsConfiguration.class)
+@FeignClient(path="/customer/v1", url = "http://${kubernetes.customer.service.name}:${kubernetes.customer.server.port}",configuration=CustomFeignClientsConfiguration.class)
public interface CatalogManager {
@RequestMapping(
diff --git a/component-test/src/main/java/org/apache/fineract/cn/customer/AbstractCustomerTest.java b/component-test/src/main/java/org/apache/fineract/cn/customer/AbstractCustomerTest.java
index 7978533..48b11fe 100644
--- a/component-test/src/main/java/org/apache/fineract/cn/customer/AbstractCustomerTest.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/customer/AbstractCustomerTest.java
@@ -58,7 +58,6 @@
@Configuration
@EnableEventRecording
@EnableFeignClients(basePackages = {"org.apache.fineract.cn.customer.api.v1.client"})
- @RibbonClient(name = APP_NAME)
@ComponentScan(
basePackages = {
"org.apache.fineract.cn.customer.listener"
diff --git a/component-test/src/main/java/org/apache/fineract/cn/customer/catalog/TestCatalog.java b/component-test/src/main/java/org/apache/fineract/cn/customer/catalog/TestCatalog.java
index 21fdfa4..a9ee026 100644
--- a/component-test/src/main/java/org/apache/fineract/cn/customer/catalog/TestCatalog.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/customer/catalog/TestCatalog.java
@@ -71,7 +71,6 @@
@EnableEventRecording
@EnableFeignClients(basePackages = {"org.apache.fineract.cn.customer.api.v1.client",
"org.apache.fineract.cn.customer.catalog.api.v1.client"})
- @RibbonClient(name = APP_NAME)
@ComponentScan(
basePackages = {
"org.apache.fineract.cn.customer.listener",
diff --git a/service/build.gradle b/service/build.gradle
index 4f5a50c..7a7b582 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -44,7 +44,7 @@
dependencies {
compile(
[group: 'org.springframework.cloud', name: 'spring-cloud-starter-config'],
- [group: 'org.springframework.cloud', name: 'spring-cloud-starter-eureka'],
+ [group: 'org.springframework.boot', name: 'spring-boot-starter-web'],
[group: 'org.springframework.boot', name: 'spring-boot-starter-jetty'],
[group: 'org.apache.fineract.cn.customer', name: 'api', version: project.version],
[group: 'org.apache.fineract.cn.anubis', name: 'library', version: versions.frameworkanubis],
diff --git a/service/src/main/java/org/apache/fineract/cn/customer/catalog/rest/config/CatalogRestConfiguration.java b/service/src/main/java/org/apache/fineract/cn/customer/catalog/rest/config/CatalogRestConfiguration.java
index dae3fdc..de8f58e 100644
--- a/service/src/main/java/org/apache/fineract/cn/customer/catalog/rest/config/CatalogRestConfiguration.java
+++ b/service/src/main/java/org/apache/fineract/cn/customer/catalog/rest/config/CatalogRestConfiguration.java
@@ -34,7 +34,6 @@
@Configuration
@EnableAutoConfiguration
-@EnableDiscoveryClient
@EnableAsync
@EnableTenantContext
@EnableCassandra
diff --git a/service/src/main/java/org/apache/fineract/cn/customer/rest/config/CustomerRestConfiguration.java b/service/src/main/java/org/apache/fineract/cn/customer/rest/config/CustomerRestConfiguration.java
index 4b87b26..fcd6480 100644
--- a/service/src/main/java/org/apache/fineract/cn/customer/rest/config/CustomerRestConfiguration.java
+++ b/service/src/main/java/org/apache/fineract/cn/customer/rest/config/CustomerRestConfiguration.java
@@ -45,7 +45,6 @@
@Configuration
@EnableAutoConfiguration
-@EnableDiscoveryClient
@EnableAsync
@EnableTenantContext
@EnableCassandra
diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml
index 42308b8..92ab9ec 100644
--- a/service/src/main/resources/application.yml
+++ b/service/src/main/resources/application.yml
@@ -18,18 +18,11 @@
#
spring:
- cloud:
- discovery:
- enabled: false
- config:
- enabled: false
-
-eureka:
- client:
- serviceUrl:
- defaultZone: http://localhost:8761/eureka/
- instance:
- homePageUrl: "http://${eureka.hostname}:2024/customer/v1/"
+ cloud:
+ discovery:
+ enabled: false
+ config:
+ enabled: false
server:
port: 2024
@@ -76,3 +69,19 @@
config:
bypassNotNull: true
+
+kubernetes:
+ customer:
+ service:
+ name: customer-service
+ server:
+ port: 2024
+ deposit:
+ service:
+ name: deposit-service
+ server:
+ port: 2027
+
+ribbon:
+ eureka:
+ enabled: false
\ No newline at end of file
