Skip to content

Commit 4feed59

Browse files
authored
Cloudbank V2 SpringBoot v3 updates (#751)
* Taking out tracing dependencies for now * log fixes * Taking out tracing dependencies for now * log fixes * sonarcloud clenaup * pom.xml fixes
1 parent 280d3dd commit 4feed59

File tree

10 files changed

+42
-36
lines changed

10 files changed

+42
-36
lines changed

cloudbank-v2/spring-apps-spring3/account/src/main/java/com/example/accounts/ApplicationConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
package com.example.accounts;
55

66
import java.net.URISyntaxException;
7-
import java.util.logging.Logger;
87

98
import org.springframework.beans.factory.annotation.Value;
109
import org.springframework.context.annotation.Bean;
1110
import org.springframework.context.annotation.Configuration;
1211

1312
import io.narayana.lra.client.NarayanaLRAClient;
13+
import lombok.extern.slf4j.Slf4j;
1414

1515
@Configuration
16+
@Slf4j
1617
public class ApplicationConfig {
17-
private static final Logger log = Logger.getLogger(ApplicationConfig.class.getName());
1818

1919
public ApplicationConfig(@Value("${lra.coordinator.url}") String lraCoordinatorUrl) {
2020
log.info(NarayanaLRAClient.LRA_COORDINATOR_URL_KEY + " = " + lraCoordinatorUrl);

cloudbank-v2/spring-apps-spring3/account/src/main/java/com/example/accounts/controller/AccountController.java

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,24 @@
33

44
package com.example.accounts.controller;
55

6+
import java.util.ArrayList;
7+
import java.util.List;
8+
import java.util.Optional;
9+
10+
import org.springframework.http.HttpStatus;
11+
import org.springframework.http.ResponseEntity;
12+
import org.springframework.web.bind.annotation.DeleteMapping;
613
import org.springframework.web.bind.annotation.GetMapping;
14+
import org.springframework.web.bind.annotation.PathVariable;
15+
import org.springframework.web.bind.annotation.PostMapping;
16+
import org.springframework.web.bind.annotation.RequestBody;
717
import org.springframework.web.bind.annotation.RequestMapping;
818
import org.springframework.web.bind.annotation.RestController;
9-
import com.example.accounts.repository.AccountRepository;
10-
import com.example.accounts.repository.JournalRepository;
11-
import java.util.List;
19+
1220
import com.example.accounts.model.Account;
1321
import com.example.accounts.model.Journal;
14-
import org.springframework.web.bind.annotation.PostMapping;
15-
import org.springframework.web.bind.annotation.RequestBody;
16-
import org.springframework.http.HttpStatus;
17-
import org.springframework.http.ResponseEntity;
18-
import org.springframework.web.bind.annotation.PathVariable;
19-
import java.util.ArrayList;
20-
import java.util.Optional;
21-
import org.springframework.web.bind.annotation.DeleteMapping;
22+
import com.example.accounts.repository.AccountRepository;
23+
import com.example.accounts.repository.JournalRepository;
2224

2325
@RestController
2426
@RequestMapping("/api/v1")

cloudbank-v2/spring-apps-spring3/account/src/main/java/com/example/accounts/model/Account.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
package com.example.accounts.model;
55

6-
import jakarta.persistence.Entity;
7-
import jakarta.persistence.Table;
8-
import lombok.Data;
9-
import lombok.NoArgsConstructor;
106
import jakarta.persistence.Column;
7+
import jakarta.persistence.Entity;
118
import jakarta.persistence.GeneratedValue;
129
import jakarta.persistence.GenerationType;
1310
import jakarta.persistence.Id;
11+
import jakarta.persistence.Table;
12+
import lombok.Data;
13+
import lombok.NoArgsConstructor;
1414

1515
@Data
1616
@NoArgsConstructor

cloudbank-v2/spring-apps-spring3/account/src/main/java/com/example/accounts/services/AccountTransferDAO.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
import javax.ws.rs.core.Response;
77

88
import org.eclipse.microprofile.lra.annotation.ParticipantStatus;
9-
import org.slf4j.Logger;
10-
import org.slf4j.LoggerFactory;
119
import org.springframework.stereotype.Component;
1210

1311
import com.example.accounts.model.Account;
1412
import com.example.accounts.model.Journal;
1513
import com.example.accounts.repository.AccountRepository;
1614
import com.example.accounts.repository.JournalRepository;
1715

16+
import lombok.extern.slf4j.Slf4j;
17+
1818
@Component
19+
@Slf4j
1920
public class AccountTransferDAO {
20-
private final Logger log = LoggerFactory.getLogger(this.getClass());
2121

2222
private static AccountTransferDAO singleton;
2323
final AccountRepository accountRepository;

cloudbank-v2/spring-apps-spring3/account/src/main/java/com/example/accounts/services/DepositService.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
package com.example.accounts.services;
55

6-
import java.util.logging.Logger;
7-
86
import static org.eclipse.microprofile.lra.annotation.ws.rs.LRA.LRA_HTTP_CONTEXT_HEADER;
97
import static org.eclipse.microprofile.lra.annotation.ws.rs.LRA.LRA_HTTP_ENDED_CONTEXT_HEADER;
108
import static org.eclipse.microprofile.lra.annotation.ws.rs.LRA.LRA_HTTP_PARENT_CONTEXT_HEADER;
@@ -32,11 +30,14 @@
3230
import com.example.accounts.model.Account;
3331
import com.example.accounts.model.Journal;
3432

33+
import lombok.extern.slf4j.Slf4j;
34+
3535
@RequestScoped
3636
@Path("/deposit")
3737
@Component
38+
@Slf4j
3839
public class DepositService {
39-
private static final Logger log = Logger.getLogger(DepositService.class.getName());
40+
4041
private final static String DEPOSIT = "DEPOSIT";
4142

4243
/**

cloudbank-v2/spring-apps-spring3/account/src/main/java/com/example/accounts/services/WithdrawService.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import static org.eclipse.microprofile.lra.annotation.ws.rs.LRA.LRA_HTTP_ENDED_CONTEXT_HEADER;
88
import static org.eclipse.microprofile.lra.annotation.ws.rs.LRA.LRA_HTTP_PARENT_CONTEXT_HEADER;
99

10-
import java.util.logging.Logger;
11-
1210
import javax.enterprise.context.RequestScoped;
1311
import javax.ws.rs.Consumes;
1412
import javax.ws.rs.GET;
@@ -32,11 +30,14 @@
3230
import com.example.accounts.model.Account;
3331
import com.example.accounts.model.Journal;
3432

33+
import lombok.extern.slf4j.Slf4j;
34+
3535
@RequestScoped
3636
@Path("/withdraw")
3737
@Component
38+
@Slf4j
3839
public class WithdrawService {
39-
private static final Logger log = Logger.getLogger(WithdrawService.class.getName());
40+
4041
public static final String WITHDRAW = "WITHDRAW";
4142

4243
/**

cloudbank-v2/spring-apps-spring3/creditscore/src/main/java/com/example/creditscore/controller/CreditScoreController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
package com.example.creditscore.controller;
55

66
import org.springframework.web.bind.annotation.*;
7-
import org.slf4j.Logger;
8-
import org.slf4j.LoggerFactory;
7+
8+
import lombok.extern.slf4j.Slf4j;
9+
910
import java.security.SecureRandom;
1011
import java.util.HashMap;
1112
import java.util.Map;
1213

1314
@RestController
1415
@RequestMapping("/api/v1")
16+
@Slf4j
1517
public class CreditScoreController {
1618

17-
private final Logger log = LoggerFactory.getLogger(this.getClass());
18-
1919
@GetMapping("/creditscore")
2020
public Map<String, String> getCreditScore() {
2121
log.info("CREDITSCORE: getCreditScore");

cloudbank-v2/spring-apps-spring3/customer/src/main/java/com/example/customer/controller/CustomerController.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55

66
import com.example.customer.model.Customers;
77
import com.example.customer.repository.CustomersRepository;
8-
import org.slf4j.Logger;
9-
import org.slf4j.LoggerFactory;
8+
9+
import lombok.extern.slf4j.Slf4j;
10+
1011
import org.springframework.http.HttpStatus;
1112
import org.springframework.http.ResponseEntity;
1213
import org.springframework.web.bind.annotation.*;
@@ -16,9 +17,9 @@
1617

1718
@RestController
1819
@RequestMapping("/api/v1")
20+
@Slf4j
1921
public class CustomerController {
2022
final CustomersRepository customersRepository;
21-
private final Logger log = LoggerFactory.getLogger(this.getClass());
2223

2324
public CustomerController(CustomersRepository customersRepository) {
2425
this.customersRepository = customersRepository;

cloudbank-v2/spring-apps-spring3/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.springframework.boot</groupId>
1010
<artifactId>spring-boot-starter-parent</artifactId>
11-
<version>3.1.2</version>
11+
<version>3.1.4</version>
1212
<relativePath/> <!-- lookup parent from repository -->
1313
</parent>
1414

cloudbank-v2/spring-apps-spring3/transfer/src/main/java/com/example/transfer/TransferService.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77

88
import java.net.URI;
99
import java.net.URISyntaxException;
10-
import java.util.logging.Logger;
1110

1211
import jakarta.annotation.PostConstruct;
12+
import lombok.extern.slf4j.Slf4j;
13+
1314
import javax.enterprise.context.ApplicationScoped;
1415
import javax.ws.rs.GET;
1516
import javax.ws.rs.HeaderParam;
@@ -30,9 +31,9 @@
3031

3132
@ApplicationScoped
3233
@Path("/")
34+
@Slf4j
3335
public class TransferService {
3436

35-
private static final Logger log = Logger.getLogger(TransferService.class.getSimpleName());
3637
public static final String TRANSFER_ID = "TRANSFER_ID";
3738
private URI withdrawUri;
3839
private URI depositUri;

0 commit comments

Comments
 (0)