You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ma...@apache.org on 2022/05/27 17:04:01 UTC
[fineract-cn-deposit-account-management] branch develop updated: Remove eureka & client side loadbalancing
This is an automated email from the ASF dual-hosted git repository.
manojvm pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-deposit-account-management.git
The following commit(s) were added to refs/heads/develop by this push:
new 584597d Remove eureka & client side loadbalancing
new 9f75796 Merge pull request #31 from BLasan/remove-eureka
584597d is described below
commit 584597d53e22f0dd596512b2c78cd5840f4ba9cc
Author: BLasan <be...@gmail.com>
AuthorDate: Fri May 27 22:16:12 2022 +0530
Remove eureka & client side loadbalancing
---
.../api/v1/client/DepositAccountManager.java | 2 +-
.../AbstractDepositAccountManagementTest.java | 1 -
service/build.gradle | 2 +-
.../DepositAccountManagementConfiguration.java | 1 -
.../command/handler/ProductInstanceAggregate.java | 1 +
.../internal/service/helper/AccountingService.java | 2 ++
service/src/main/resources/application.yml | 33 ++++++++++++++++------
7 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/api/src/main/java/org/apache/fineract/cn/deposit/api/v1/client/DepositAccountManager.java b/api/src/main/java/org/apache/fineract/cn/deposit/api/v1/client/DepositAccountManager.java
index cdee071..fc372e4 100644
--- a/api/src/main/java/org/apache/fineract/cn/deposit/api/v1/client/DepositAccountManager.java
+++ b/api/src/main/java/org/apache/fineract/cn/deposit/api/v1/client/DepositAccountManager.java
@@ -47,7 +47,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@SuppressWarnings("unused")
-@FeignClient(value = "deposit-v1", path = "/deposit/v1", configuration = CustomFeignClientsConfiguration.class)
+@FeignClient(path = "/deposit/v1", url = "http://${kubernetes.deposit.service.name}:{kubernetes.deposit.server.port}", configuration = CustomFeignClientsConfiguration.class)
public interface DepositAccountManager {
@RequestMapping(
diff --git a/component-test/src/main/java/org/apache/fineract/cn/deposit/AbstractDepositAccountManagementTest.java b/component-test/src/main/java/org/apache/fineract/cn/deposit/AbstractDepositAccountManagementTest.java
index 5076d2d..bd20c92 100644
--- a/component-test/src/main/java/org/apache/fineract/cn/deposit/AbstractDepositAccountManagementTest.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/deposit/AbstractDepositAccountManagementTest.java
@@ -112,7 +112,6 @@ public abstract class AbstractDepositAccountManagementTest extends SuiteTestEnvi
@Configuration
@EnableEventRecording
@EnableFeignClients(basePackages = {"org.apache.fineract.cn.deposit.api.v1"})
- @RibbonClient(name = APP_NAME)
@Import({DepositAccountManagementConfiguration.class})
@ComponentScan("org.apache.fineract.cn.deposit.listener")
public static class TestConfiguration {
diff --git a/service/build.gradle b/service/build.gradle
index 64d471b..cc9dbed 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -46,7 +46,7 @@ bootRepackage {
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.deposit-account-management', 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/deposit/service/DepositAccountManagementConfiguration.java b/service/src/main/java/org/apache/fineract/cn/deposit/service/DepositAccountManagementConfiguration.java
index 2f5a083..f0be209 100644
--- a/service/src/main/java/org/apache/fineract/cn/deposit/service/DepositAccountManagementConfiguration.java
+++ b/service/src/main/java/org/apache/fineract/cn/deposit/service/DepositAccountManagementConfiguration.java
@@ -42,7 +42,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
@SuppressWarnings("WeakerAccess")
@Configuration
@EnableAutoConfiguration
-@EnableDiscoveryClient
@EnableAsync
@EnableTenantContext
@EnableCassandra
diff --git a/service/src/main/java/org/apache/fineract/cn/deposit/service/internal/command/handler/ProductInstanceAggregate.java b/service/src/main/java/org/apache/fineract/cn/deposit/service/internal/command/handler/ProductInstanceAggregate.java
index 15b7aae..3e85a1c 100644
--- a/service/src/main/java/org/apache/fineract/cn/deposit/service/internal/command/handler/ProductInstanceAggregate.java
+++ b/service/src/main/java/org/apache/fineract/cn/deposit/service/internal/command/handler/ProductInstanceAggregate.java
@@ -104,6 +104,7 @@ public class ProductInstanceAggregate {
productDefinitionEntity.getName(), productInstanceEntity.getCustomerIdentifier(),
accountNumber, productInstance.getAlternativeAccountNumber(),
productInstance.getBalance());
+ this.logger.info("Account Created Successfully for the Product !!!!!!!!!!!");
});
productInstanceEntity.setCreatedBy(UserContextHolder.checkedGetUser());
diff --git a/service/src/main/java/org/apache/fineract/cn/deposit/service/internal/service/helper/AccountingService.java b/service/src/main/java/org/apache/fineract/cn/deposit/service/internal/service/helper/AccountingService.java
index 4c514d2..080583a 100644
--- a/service/src/main/java/org/apache/fineract/cn/deposit/service/internal/service/helper/AccountingService.java
+++ b/service/src/main/java/org/apache/fineract/cn/deposit/service/internal/service/helper/AccountingService.java
@@ -58,6 +58,7 @@ public class AccountingService {
final Double balance) {
try {
final Ledger ledger = this.ledgerManager.findLedger(equityLedger);
+ this.logger.info("Account Found Successfully !!!!!!!!!!!!!!");
final Account account = new Account();
account.setIdentifier(accountNumber);
account.setType(ledger.getType());
@@ -68,6 +69,7 @@ public class AccountingService {
account.setAlternativeAccountNumber(alternativeAccountNumber);
this.ledgerManager.createAccount(account);
+ this.logger.info("Account Created Successfully !!!!!!!!!!!!!!");
} catch (final LedgerNotFoundException lnfex) {
throw ServiceException.notFound("Ledger {0} not found.", equityLedger);
}
diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml
index 94b23ec..962918c 100644
--- a/service/src/main/resources/application.yml
+++ b/service/src/main/resources/application.yml
@@ -27,14 +27,6 @@ spring:
serialization:
write_dates_as_timestamps: false
-eureka:
- client:
- serviceUrl:
- defaultZone: http://localhost:8761/eureka/
- instance:
- homePageUrl: "http://${eureka.hostname}:2027/deposit/v1/"
-
-
server:
port: 2027
contextPath: /deposit/v1
@@ -80,4 +72,29 @@ config:
tokenExpiryInSeconds: 172800
txnMaxRetry : 5
+kubernetes:
+ deposit:
+ service:
+ name: deposit-service
+ server:
+ port: 2027
+ accounting:
+ service:
+ name: accounting-service
+ server:
+ port: 2025
+ rhythm:
+ service:
+ name: rhythm-service
+ server:
+ port: 2022
+
+ribbon:
+ eureka:
+ enabled: false
+
+
+
+
+