diff --git a/WebServices/balance/src/main/java/br/ufrn/imd/balance/domain/Account.java b/WebServices/balance/src/main/java/br/ufrn/imd/balance/domain/Account.java
index f9312bc34b72ebf3e26bfbaa771f8f487a63dc2e..43da51e3a75c1ded59ec1c4f920beab256cc70b5 100644
--- a/WebServices/balance/src/main/java/br/ufrn/imd/balance/domain/Account.java
+++ b/WebServices/balance/src/main/java/br/ufrn/imd/balance/domain/Account.java
@@ -5,10 +5,7 @@ import lombok.*;
import javax.persistence.*;
import java.io.Serializable;
-@AllArgsConstructor
-@NoArgsConstructor
-@Setter
-@Getter
+@Data
@Entity
public class Account implements Serializable {
diff --git a/WebServices/balance/src/main/java/br/ufrn/imd/balance/domain/Client.java b/WebServices/balance/src/main/java/br/ufrn/imd/balance/domain/Client.java
index cc477647a9e61ce74dcae0ef3e840a6a281c9f99..d824b8b862cbc62c57c60b6814503b313bb98585 100644
--- a/WebServices/balance/src/main/java/br/ufrn/imd/balance/domain/Client.java
+++ b/WebServices/balance/src/main/java/br/ufrn/imd/balance/domain/Client.java
@@ -5,10 +5,7 @@ import lombok.*;
import javax.persistence.*;
import java.io.Serializable;
-@AllArgsConstructor
-@NoArgsConstructor
-@Setter
-@Getter
+@Data
@Entity
public class Client implements Serializable {
diff --git a/WebServices/balance/src/main/resources/application.yml b/WebServices/balance/src/main/resources/application.yml
index 596331cd4bf9b626e5339496582f5e1d30d4acf6..920fb9b102878eecba51a5eaa535cec246c296fd 100644
--- a/WebServices/balance/src/main/resources/application.yml
+++ b/WebServices/balance/src/main/resources/application.yml
@@ -18,9 +18,8 @@ spring:
password: postgres
jpa:
show-sql: false
- properties:
- hibernate:
- dialect: org.hibernate.dialect.PostgreSQLDialect
- ddl-auto: update
+ database-platform: org.hibernate.dialect.PostgreSQL9Dialect
+ hibernate:
+ ddl-auto: update
jmx:
enabled: false
\ No newline at end of file
diff --git a/WebServices/balance/target/classes/application.yml b/WebServices/balance/target/classes/application.yml
index 596331cd4bf9b626e5339496582f5e1d30d4acf6..920fb9b102878eecba51a5eaa535cec246c296fd 100644
--- a/WebServices/balance/target/classes/application.yml
+++ b/WebServices/balance/target/classes/application.yml
@@ -18,9 +18,8 @@ spring:
password: postgres
jpa:
show-sql: false
- properties:
- hibernate:
- dialect: org.hibernate.dialect.PostgreSQLDialect
- ddl-auto: update
+ database-platform: org.hibernate.dialect.PostgreSQL9Dialect
+ hibernate:
+ ddl-auto: update
jmx:
enabled: false
\ No newline at end of file
diff --git a/WebServices/balance/target/classes/br/ufrn/imd/balance/BalanceApplication.class b/WebServices/balance/target/classes/br/ufrn/imd/balance/BalanceApplication.class
index bffd26e76cdc4d2045552b96e278834359ee8de3..954080045c0ccad237634742e89490f67f07358f 100644
Binary files a/WebServices/balance/target/classes/br/ufrn/imd/balance/BalanceApplication.class and b/WebServices/balance/target/classes/br/ufrn/imd/balance/BalanceApplication.class differ
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 b15ff45f576939bf2cd27cfb7aed02a32bafd5aa..b48af94711e95246e8a2876a7785419cef6e5794 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/balance/target/classes/br/ufrn/imd/balance/domain/Account.class b/WebServices/balance/target/classes/br/ufrn/imd/balance/domain/Account.class
index e2f70865b12aa4ea035f3721a1c35aa9d9d9cc77..8960d3d1cc7921bbcf85f609a983a16edcac288d 100644
Binary files a/WebServices/balance/target/classes/br/ufrn/imd/balance/domain/Account.class and b/WebServices/balance/target/classes/br/ufrn/imd/balance/domain/Account.class differ
diff --git a/WebServices/balance/target/classes/br/ufrn/imd/balance/domain/Client.class b/WebServices/balance/target/classes/br/ufrn/imd/balance/domain/Client.class
index e032c6c679dddb8a69e3ac2305623337db71fcd2..5d2d7eb7061d501240ec8b81d74abaa20f8b68dc 100644
Binary files a/WebServices/balance/target/classes/br/ufrn/imd/balance/domain/Client.class and b/WebServices/balance/target/classes/br/ufrn/imd/balance/domain/Client.class differ
diff --git a/WebServices/balance/target/classes/br/ufrn/imd/balance/repository/ClientRepository.class b/WebServices/balance/target/classes/br/ufrn/imd/balance/repository/ClientRepository.class
index f128f54efbc02db6a1a6ca5bdd451f668683b795..712598f71b37c3cbba4cc4f301c93fcfe4229165 100644
Binary files a/WebServices/balance/target/classes/br/ufrn/imd/balance/repository/ClientRepository.class and b/WebServices/balance/target/classes/br/ufrn/imd/balance/repository/ClientRepository.class differ
diff --git a/WebServices/balance/target/classes/br/ufrn/imd/balance/service/BalanceService.class b/WebServices/balance/target/classes/br/ufrn/imd/balance/service/BalanceService.class
index 10c822e3aec17ef8ac1fb016ab2bfa02b8003aae..024f7cfd65e02a5b76b37a900ac69cee13c4af8a 100644
Binary files a/WebServices/balance/target/classes/br/ufrn/imd/balance/service/BalanceService.class and b/WebServices/balance/target/classes/br/ufrn/imd/balance/service/BalanceService.class differ
diff --git a/WebServices/client/src/main/java/br/ufrn/imd/client/ClientApplication.java b/WebServices/client/src/main/java/br/ufrn/imd/client/ClientApplication.java
index d22474dcb1ca40453cbcf8023298b40529025ca2..ba7476ac39a85a2bebc4b61461f7e116181844c2 100644
--- a/WebServices/client/src/main/java/br/ufrn/imd/client/ClientApplication.java
+++ b/WebServices/client/src/main/java/br/ufrn/imd/client/ClientApplication.java
@@ -3,12 +3,14 @@ package br.ufrn.imd.client;
import br.ufrn.imd.client.utils.MachineState;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.client.RestTemplate;
@SpringBootApplication
public class ClientApplication {
public static void main(String[] args) {
- SpringApplication.run(ClientApplication.class, args);
MachineState mS = new MachineState();
diff --git a/WebServices/client/src/main/java/br/ufrn/imd/client/config/RestClientConfig.java b/WebServices/client/src/main/java/br/ufrn/imd/client/config/RestClientConfig.java
deleted file mode 100644
index 7a86a8e7022519b24e5b809df30d446666a91cf2..0000000000000000000000000000000000000000
--- a/WebServices/client/src/main/java/br/ufrn/imd/client/config/RestClientConfig.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package br.ufrn.imd.client.config;
-
-import org.springframework.boot.web.client.RestTemplateBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.client.RestTemplate;
-
-@Configuration
-public class RestClientConfig {
-
- @Bean
- public RestTemplate restTemplate(RestTemplateBuilder builder) {
- return builder.build();
- }
-}
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 a6c226db1a88c06df587ee66ddd81238c07fc1d9..26ee287bc239cee1c23201b19dffb8a0a4790b04 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
@@ -8,6 +8,8 @@ import br.ufrn.imd.client.utils.message.WithdrawalMessage;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import java.net.MalformedURLException;
@@ -19,10 +21,10 @@ import java.util.Scanner;
import static ufrn.imd.utils.NameSpace.*;
@Data
+@Component
public class MachineState {
- @Autowired
- private RestTemplate restTemplate;
+ private RestTemplate restTemplate = new RestTemplate();
public static final String INITIAL= "INITIAL";
public static final String READ = "READ";
public static final String DEPOSIT = "DEPOSIT";
@@ -122,7 +124,8 @@ public class MachineState {
}
} else if(state.equals(BALANCE)) {
- ResponseEntity<Account> response = restTemplate.getForEntity(HOST_BALANCE_SERVICE, Account.class);
+ ResponseEntity<Account> response =
+ restTemplate.getForEntity(HOST_BALANCE_SERVICE + "/1", Account.class);
if(response.getStatusCodeValue() == 200) {
System.out.println(
String.format(">>> Your balance is: %.2f", response.getBody().getBalance())
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 c6b21564c0d2aadf51ccbba80225e526a94c794e..8d93bf268a27329d92eb14183dd582db19b203ed 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
@@ -2,13 +2,13 @@ package ufrn.imd.utils;
public class NameSpace {
public final static Integer PORT_AUTHENTICATOR_SERVICE = 1905;
- public final static Integer PORT_WITHDRAWAL_SERVICE = 1906;
- public static final Integer PORT_DEPOSIT_SERVICE = 1907;
- public static final Integer PORT_BALANCE_SERVICE = 1908;
- public static final Integer PORT_TRANSFER_SERVICE = 1909;
- public final static String HOST_AUTHENTICATOR_SERVICE = String.format("rmi://127.0.0.1:%d/%s", PORT_AUTHENTICATOR_SERVICE, "authenticator");
- public final static String HOST_WITHDRAWAL_SERVICE = String.format("rmi://127.0.0.1:%d/%s", PORT_WITHDRAWAL_SERVICE, "withdrawal");
- public static final String HOST_DEPOSIT_SERVICE = String.format("rmi://127.0.0.1:%d/%s", PORT_DEPOSIT_SERVICE, "deposit");
- public static final String HOST_BALANCE_SERVICE = String.format("rmi://127.0.0.1:%d/%s", PORT_BALANCE_SERVICE, "balance");
- public final static String HOST_TRANSFER_SERVICE = String.format("rmi://127.0.0.1:%d/%s", PORT_TRANSFER_SERVICE, "transfer");
+ public final static Integer PORT_WITHDRAWAL_SERVICE = 8080;
+ public static final Integer PORT_DEPOSIT_SERVICE = 8080;
+ 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 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");
}
diff --git a/WebServices/deposit/src/main/resources/application.yml b/WebServices/deposit/src/main/resources/application.yml
index 394daddeddeca6d848e1abc2e1fe8166fb23fdf9..76df8328cb3d8b4f2ba06b63501f8b40c034bd84 100644
--- a/WebServices/deposit/src/main/resources/application.yml
+++ b/WebServices/deposit/src/main/resources/application.yml
@@ -18,9 +18,8 @@ spring:
password: postgres
jpa:
show-sql: false
- properties:
- hibernate:
- dialect: org.hibernate.dialect.PostgreSQLDialect
- ddl-auto: update
+ database-platform: org.hibernate.dialect.PostgreSQL9Dialect
+ hibernate:
+ ddl-auto: update
jmx:
enabled: false
\ No newline at end of file
diff --git a/WebServices/deposit/target/classes/application.yml b/WebServices/deposit/target/classes/application.yml
index 394daddeddeca6d848e1abc2e1fe8166fb23fdf9..76df8328cb3d8b4f2ba06b63501f8b40c034bd84 100644
--- a/WebServices/deposit/target/classes/application.yml
+++ b/WebServices/deposit/target/classes/application.yml
@@ -18,9 +18,8 @@ spring:
password: postgres
jpa:
show-sql: false
- properties:
- hibernate:
- dialect: org.hibernate.dialect.PostgreSQLDialect
- ddl-auto: update
+ database-platform: org.hibernate.dialect.PostgreSQL9Dialect
+ hibernate:
+ ddl-auto: update
jmx:
enabled: false
\ No newline at end of file
diff --git a/WebServices/docker-compose.yml b/WebServices/docker-compose.yml
index c262ff3cdfc53fe70636c1bccfed03d309990e06..93f96fa12f216eb6f0d8fffd229cf0084ea110ef 100644
--- a/WebServices/docker-compose.yml
+++ b/WebServices/docker-compose.yml
@@ -4,7 +4,7 @@ volumes:
postgres-server-volume:
services:
- postgres:
+ postgresServ:
image: postgres:12.9
container_name: postgresServ
ports:
@@ -50,7 +50,7 @@ services:
networks:
- sigsmartcampus2-network
depends_on:
- - postgres
+ - postgresServ
- gateway
balance:
@@ -63,7 +63,7 @@ services:
networks:
- sigsmartcampus2-network
depends_on:
- - postgres
+ - postgresServ
- gateway
deposit:
@@ -76,7 +76,7 @@ services:
networks:
- sigsmartcampus2-network
depends_on:
- - postgres
+ - postgresServ
- gateway
@@ -90,7 +90,7 @@ services:
networks:
- sigsmartcampus2-network
depends_on:
- - postgres
+ - postgresServ
- gateway
diff --git a/WebServices/transfer/src/main/resources/application.yml b/WebServices/transfer/src/main/resources/application.yml
index 3d54e547f23c5029521895984da21ef80e8d45e9..30d93a08178d69ec7c4fd91ff512635465a266b1 100644
--- a/WebServices/transfer/src/main/resources/application.yml
+++ b/WebServices/transfer/src/main/resources/application.yml
@@ -18,9 +18,8 @@ spring:
password: postgres
jpa:
show-sql: false
- properties:
- hibernate:
- dialect: org.hibernate.dialect.PostgreSQLDialect
- ddl-auto: update
+ database-platform: org.hibernate.dialect.PostgreSQL9Dialect
+ hibernate:
+ ddl-auto: update
jmx:
enabled: false
\ No newline at end of file
diff --git a/WebServices/transfer/target/classes/application.yml b/WebServices/transfer/target/classes/application.yml
index 3d54e547f23c5029521895984da21ef80e8d45e9..30d93a08178d69ec7c4fd91ff512635465a266b1 100644
--- a/WebServices/transfer/target/classes/application.yml
+++ b/WebServices/transfer/target/classes/application.yml
@@ -18,9 +18,8 @@ spring:
password: postgres
jpa:
show-sql: false
- properties:
- hibernate:
- dialect: org.hibernate.dialect.PostgreSQLDialect
- ddl-auto: update
+ database-platform: org.hibernate.dialect.PostgreSQL9Dialect
+ hibernate:
+ ddl-auto: update
jmx:
enabled: false
\ No newline at end of file
diff --git a/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/WithdrawalApplication.java b/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/WithdrawalApplication.java
index ba5b3a9dc1033cf3f149ecf42290fd216a4b8c80..0c09c3de4bd4fa07cd42e583d3b259492bcc46cd 100644
--- a/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/WithdrawalApplication.java
+++ b/WebServices/withdrawal/src/main/java/br/ufrn/imd/withdrawal/WithdrawalApplication.java
@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
+
public class WithdrawalApplication {
public static void main(String[] args) {
diff --git a/WebServices/withdrawal/src/main/resources/application.yml b/WebServices/withdrawal/src/main/resources/application.yml
index 02b446970433b39bdb382ea88dc059deb3bcd43f..f873ad3e8d5609ffeab3784d2988b55fb66fe7a0 100644
--- a/WebServices/withdrawal/src/main/resources/application.yml
+++ b/WebServices/withdrawal/src/main/resources/application.yml
@@ -18,9 +18,8 @@ spring:
password: postgres
jpa:
show-sql: false
- properties:
- hibernate:
- dialect: org.hibernate.dialect.PostgreSQLDialect
- ddl-auto: update
+ database-platform: org.hibernate.dialect.PostgreSQL9Dialect
+ hibernate:
+ ddl-auto: create
jmx:
enabled: false
\ No newline at end of file
diff --git a/WebServices/withdrawal/target/classes/application.yml b/WebServices/withdrawal/target/classes/application.yml
index 02b446970433b39bdb382ea88dc059deb3bcd43f..f873ad3e8d5609ffeab3784d2988b55fb66fe7a0 100644
--- a/WebServices/withdrawal/target/classes/application.yml
+++ b/WebServices/withdrawal/target/classes/application.yml
@@ -18,9 +18,8 @@ spring:
password: postgres
jpa:
show-sql: false
- properties:
- hibernate:
- dialect: org.hibernate.dialect.PostgreSQLDialect
- ddl-auto: update
+ database-platform: org.hibernate.dialect.PostgreSQL9Dialect
+ hibernate:
+ ddl-auto: create
jmx:
enabled: false
\ No newline at end of file
diff --git a/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/WithdrawalApplication.class b/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/WithdrawalApplication.class
index 603452df1fdb1d9b21704013c709dd2e2fd6c7a8..8a77e83faf07299900ed08c14b530413e659f15e 100644
Binary files a/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/WithdrawalApplication.class and b/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/WithdrawalApplication.class differ
diff --git a/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/controller/WithdrawalController.class b/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/controller/WithdrawalController.class
index 7490642f25322c94102afc0587ae0754a3d8d1e1..ea0b867d1bfb8e2a439a9605f0ad0b8962c6b618 100644
Binary files a/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/controller/WithdrawalController.class and b/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/controller/WithdrawalController.class differ
diff --git a/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/domain/Account.class b/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/domain/Account.class
index 49719789db7ffb21c4173020f3b813348fcd0c9d..efc81792b6d3adf086960859ca0c809421a9d70b 100644
Binary files a/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/domain/Account.class and b/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/domain/Account.class differ
diff --git a/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/domain/Client.class b/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/domain/Client.class
index 5e2dd34d47c70f5b75f879d4e3181027bc3e5cb5..2625605e6d1bba272ba887022881afbb37aeabce 100644
Binary files a/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/domain/Client.class and b/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/domain/Client.class differ
diff --git a/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/repository/ClientRepository.class b/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/repository/ClientRepository.class
index 47bbb2a46dba1eb8a389a3a169a1073dc11bd96e..cac00542eafbda4dc9b6de42f0e978b7fa504608 100644
Binary files a/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/repository/ClientRepository.class and b/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/repository/ClientRepository.class differ
diff --git a/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/service/WithdrawalService.class b/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/service/WithdrawalService.class
index 8133ad60aa5061c891cf6074a70d8122854e15f9..0a390799acfbdb13134073353582f653bbca73c5 100644
Binary files a/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/service/WithdrawalService.class and b/WebServices/withdrawal/target/classes/br/ufrn/imd/withdrawal/service/WithdrawalService.class differ