diff --git a/WebServices/balance/src/main/java/br/ufrn/imd/balance/controller/BalanceController.java b/WebServices/balance/src/main/java/br/ufrn/imd/balance/controller/BalanceController.java
index bc740b43e4ea5a8c2d4ce780a500c86e9e0e7f2d..c178d8b1ef9fb98e1f355a4cbb6b7873180d2f47 100644
--- a/WebServices/balance/src/main/java/br/ufrn/imd/balance/controller/BalanceController.java
+++ b/WebServices/balance/src/main/java/br/ufrn/imd/balance/controller/BalanceController.java
@@ -4,15 +4,15 @@ package br.ufrn.imd.balance.controller;
import br.ufrn.imd.balance.domain.Client;
import br.ufrn.imd.balance.service.BalanceService;
import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
-@AllArgsConstructor
+@RequiredArgsConstructor
@RestController
@RequestMapping("/banking/client/{id}")
public class BalanceController {
- @Autowired
private final BalanceService service;
@GetMapping
diff --git a/WebServices/balance/target/classes/br/ufrn/imd/balance/controller/BalanceController.class b/WebServices/balance/target/classes/br/ufrn/imd/balance/controller/BalanceController.class
index b48af94711e95246e8a2876a7785419cef6e5794..24a80af1dfab826109ba2bba7513db78db528c1d 100644
Binary files a/WebServices/balance/target/classes/br/ufrn/imd/balance/controller/BalanceController.class and b/WebServices/balance/target/classes/br/ufrn/imd/balance/controller/BalanceController.class differ
diff --git a/WebServices/client/src/main/java/br/ufrn/imd/client/utils/MachineState.java b/WebServices/client/src/main/java/br/ufrn/imd/client/utils/MachineState.java
index ada170d45d80e77b64f547a995e195bbbdc5ee7f..aae40752f235211ad845d765b70b42ceacf726f4 100644
--- a/WebServices/client/src/main/java/br/ufrn/imd/client/utils/MachineState.java
+++ b/WebServices/client/src/main/java/br/ufrn/imd/client/utils/MachineState.java
@@ -110,11 +110,14 @@ public class MachineState {
}
} else if(state.equals(DEPOSIT)) {
String v = sc.nextLine();
- DepositMessage depositMessage = new DepositMessage(this.client, Double.parseDouble(v));
- ResponseEntity<Account> response = restTemplate.postForEntity(HOST_DEPOSIT_SERVICE, depositMessage, Account.class);
+ ResponseEntity<Client> response =
+ restTemplate.getForEntity(
+ HOST_DEPOSIT_SERVICE +
+ String.format("/%d?value=%s", this.client.getId(), v),
+ Client.class);
if(response.getStatusCodeValue() == 200) {
System.out.println(
- String.format(">>> Your balance is: %.2f", response.getBody().getBalance())
+ String.format(">>> Your balance is: %.2f", response.getBody().getAccount().getBalance())
);
}
try {
@@ -140,11 +143,14 @@ public class MachineState {
} else if(state.equals(WITHDRAWAL)) {
String v = sc.nextLine();
- WithdrawalMessage withdrawalMessage = new WithdrawalMessage(this.client, Double.parseDouble(v));
- ResponseEntity<Account> response = restTemplate.postForEntity(HOST_WITHDRAWAL_SERVICE, withdrawalMessage, Account.class);
+ ResponseEntity<Client> response =
+ restTemplate.getForEntity(
+ HOST_WITHDRAWAL_SERVICE +
+ String.format("/%d?value=%s", this.client.getId(), v),
+ Client.class);
if(response.getStatusCodeValue()== 200) {
System.out.println(
- String.format(">>> Your balance is: %.2f", response.getBody().getBalance())
+ String.format(">>> Your balance is: %.2f", response.getBody().getAccount().getBalance())
);
} else if(response.getStatusCodeValue() == 500) {
System.out.println(
@@ -161,13 +167,19 @@ public class MachineState {
System.out.println(">>> Please enter with the value that you want transfer");
String v = sc.nextLine();
- Account account = new Account(null, accountNumber, null, null);
- TransferMessage transferMessage = new TransferMessage(this.client, account, Double.parseDouble(v));
- ResponseEntity<Account> response = restTemplate.postForEntity(HOST_TRANSFER_SERVICE, transferMessage, Account.class);
+ ResponseEntity<Client> response =
+ restTemplate.getForEntity(
+ HOST_TRANSFER_SERVICE +
+ String.format("/%d?value=%s&toAccount=%s",
+ this.client.getId(),
+ v,
+ accountNumber
+ ),
+ Client.class);
if(response.getStatusCodeValue() == 200) {
System.out.println(
- String.format(">>> Your balance is: %.2f", response.getBody().getBalance())
+ String.format(">>> Your balance is: %.2f", response.getBody().getAccount().getBalance())
);
} else if(response.getStatusCodeValue() == 500) {
System.out.println(
diff --git a/WebServices/client/src/main/java/br/ufrn/imd/client/utils/NameSpace.java b/WebServices/client/src/main/java/br/ufrn/imd/client/utils/NameSpace.java
index 8d93bf268a27329d92eb14183dd582db19b203ed..624c024a4df4a6d4d10514ac8fe8fd3c9df9da72 100644
--- a/WebServices/client/src/main/java/br/ufrn/imd/client/utils/NameSpace.java
+++ b/WebServices/client/src/main/java/br/ufrn/imd/client/utils/NameSpace.java
@@ -7,8 +7,8 @@ public class NameSpace {
public static final Integer PORT_BALANCE_SERVICE = 8080;
public static final Integer PORT_TRANSFER_SERVICE = 8080;
public final static String HOST_AUTHENTICATOR_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_AUTHENTICATOR_SERVICE, "authenticator");
- public final static String HOST_WITHDRAWAL_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_WITHDRAWAL_SERVICE, "withdrawal");
- public static final String HOST_DEPOSIT_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_DEPOSIT_SERVICE, "deposit");
+ public final static String HOST_WITHDRAWAL_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_WITHDRAWAL_SERVICE, "/gateway/withdrawal/banking/client");
+ public static final String HOST_DEPOSIT_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_DEPOSIT_SERVICE, "/gateway/deposit/banking/client");
public static final String HOST_BALANCE_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_BALANCE_SERVICE, "/gateway/balance/banking/client");
- public final static String HOST_TRANSFER_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_TRANSFER_SERVICE, "transfer");
+ public final static String HOST_TRANSFER_SERVICE = String.format("http://127.0.0.1:%d/%s", PORT_TRANSFER_SERVICE, "/gateway/transfer/banking/client");
}
diff --git a/WebServices/deposit/src/main/java/br/ufrn/imd/deposit/controller/DepositController.java b/WebServices/deposit/src/main/java/br/ufrn/imd/deposit/controller/DepositController.java
index 1511647355bb22443405b6a6a8e32dcf1b04bc01..104333f637bfd0dc0ba2eac40f9179243810833e 100644
--- a/WebServices/deposit/src/main/java/br/ufrn/imd/deposit/controller/DepositController.java
+++ b/WebServices/deposit/src/main/java/br/ufrn/imd/deposit/controller/DepositController.java
@@ -14,7 +14,7 @@ public class DepositController {
@Autowired
private final DepositService service;
- @PatchMapping
+ @GetMapping
@ResponseStatus(HttpStatus.OK)
public Client deposit(@PathVariable Integer id, @RequestParam(name = "value") Double value) {
return service.deposit(value, new Client(id));
diff --git a/WebServices/transfer/src/main/java/br/ufrn/imd/transfer/controller/TransferController.java b/WebServices/transfer/src/main/java/br/ufrn/imd/transfer/controller/TransferController.java
index 097d7c9684179846ea564b36c126449cf117aa22..a2dd4304d4da7242c5fde6e384525de1caf70140 100644
--- a/WebServices/transfer/src/main/java/br/ufrn/imd/transfer/controller/TransferController.java
+++ b/WebServices/transfer/src/main/java/br/ufrn/imd/transfer/controller/TransferController.java
@@ -15,7 +15,7 @@ public class TransferController {
@Autowired
private final TransferService service;
- @PatchMapping
+ @GetMapping
@ResponseStatus(HttpStatus.OK)
public Client transfer(@PathVariable Integer id, @RequestParam(name = "value") Double value,
@RequestParam(name = "toAccount") String toAccountNumber) {