Skip to content

Commit 9fb18c2

Browse files
authored
spring boot starters 23.4.0 and associated updates for cloudbank sample (#773)
* spring boot starters 23.4.0 Signed-off-by: Mark Nelson <mark.x.nelson@oracle.com>
1 parent 4647b97 commit 9fb18c2

File tree

28 files changed

+4565
-23
lines changed

28 files changed

+4565
-23
lines changed

cloudbank-v3/spring-apps-spring3/account/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<microprofile-lra-api.version>1.0</microprofile-lra-api.version>
2121
<narayana-lra.version>5.13.1.Final</narayana-lra.version>
2222
<jakarta.enterprise.cdi-api.version>4.0.1</jakarta.enterprise.cdi-api.version>
23-
<oracle-springboot-starter.version>3.1.0</oracle-springboot-starter.version>
23+
<oracle-springboot-starter.version>23.4.0</oracle-springboot-starter.version>
2424
<liquibase.version>4.24.0</liquibase.version>
2525
</properties>
2626

cloudbank-v3/spring-apps-spring3/checks/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<name>checks</name>
1515
<description>Check Processing Application</description>
1616
<properties>
17-
<oracle-springboot-starter.version>3.1.0</oracle-springboot-starter.version>
17+
<oracle-springboot-starter.version>23.4.0</oracle-springboot-starter.version>
1818
</properties>
1919
<dependencies>
2020
<dependency>

cloudbank-v3/spring-apps-spring3/customer/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<description>Customer Application</description>
1818

1919
<properties>
20-
<oracle-springboot-starter.version>3.1.0</oracle-springboot-starter.version>
20+
<oracle-springboot-starter.version>23.4.0</oracle-springboot-starter.version>
2121
<liquibase.version>4.24.0</liquibase.version>
2222
</properties>
2323

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import com.example.customer.model.Customers;
1010
import com.example.customer.repository.CustomersRepository;
11-
import lombok.extern.slf4j.Slf4j;
1211
import org.springframework.http.HttpStatus;
1312
import org.springframework.http.ResponseEntity;
1413
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -23,7 +22,6 @@
2322

2423
@RestController
2524
@RequestMapping("/api/v1")
26-
@Slf4j
2725
public class CustomerController {
2826
final CustomersRepository customersRepository;
2927

@@ -34,14 +32,12 @@ public CustomerController(CustomersRepository customersRepository) {
3432
@ResponseStatus(HttpStatus.OK)
3533
@GetMapping("/customer")
3634
public List<Customers> findAll() {
37-
log.info("CUSTOMER: findAll");
3835
return customersRepository.findAll();
3936
}
4037

4138
@ResponseStatus(HttpStatus.OK)
4239
@GetMapping("/customer/name/{customerName}")
4340
public List<Customers> findByCustomerByName(@PathVariable String customerName) {
44-
log.info("CUSTOMER: findByCustomerByName");
4541
return customersRepository.findByCustomerNameIsContaining(customerName);
4642
}
4743

@@ -53,7 +49,6 @@ public List<Customers> findByCustomerByName(@PathVariable String customerName) {
5349
*/
5450
@GetMapping("/customer/{id}")
5551
public ResponseEntity<Customers> getCustomerById(@PathVariable("id") String id) {
56-
log.info("CUSTOMER: getCustomerById");
5752
Optional<Customers> customerData = customersRepository.findById(id);
5853
try {
5954
return customerData.map(customers -> new ResponseEntity<>(customers, HttpStatus.OK))
@@ -70,7 +65,6 @@ public ResponseEntity<Customers> getCustomerById(@PathVariable("id") String id)
7065
*/
7166
@GetMapping("/customer/byemail/{email}")
7267
public List<Customers> getCustomerByEmail(@PathVariable("email") String email) {
73-
log.info("CUSTOMER: getCustomerByEmail");
7468
return customersRepository.findByCustomerEmailIsContaining(email);
7569
}
7670

@@ -81,7 +75,6 @@ public List<Customers> getCustomerByEmail(@PathVariable("email") String email) {
8175
*/
8276
@PostMapping("/customer")
8377
public ResponseEntity<Customers> createCustomer(@RequestBody Customers customer) {
84-
log.info("CUSTOMER: createCustomer");
8578
try {
8679
Customers newCustomer = customersRepository.save(new Customers(
8780
customer.getCustomerId(),
@@ -103,7 +96,6 @@ public ResponseEntity<Customers> createCustomer(@RequestBody Customers customer)
10396
*/
10497
@PutMapping("/customer/{id}")
10598
public ResponseEntity<Customers> updateCustomer(@PathVariable("id") String id, @RequestBody Customers customer) {
106-
log.info("CUSTOMER: updateCustomer");
10799
Optional<Customers> customerData = customersRepository.findById(id);
108100
try {
109101
if (customerData.isPresent()) {
@@ -127,7 +119,6 @@ public ResponseEntity<Customers> updateCustomer(@PathVariable("id") String id, @
127119
*/
128120
@DeleteMapping("/customer/{customerId}")
129121
public ResponseEntity<HttpStatus> deleteCustomer(@PathVariable("customerId") String customerId) {
130-
log.info("CUSTOMER: deleteCustomer");
131122
try {
132123
customersRepository.deleteById(customerId);
133124
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -143,7 +134,6 @@ public ResponseEntity<HttpStatus> deleteCustomer(@PathVariable("customerId") Str
143134
*/
144135
@PostMapping("/customer/applyLoan/{amount}")
145136
public ResponseEntity<HttpStatus> applyForLoan(@PathVariable ("amount") long amount) {
146-
log.info("CUSTOMER: applyForLoan");
147137
try {
148138
// Check Credit Rating
149139
// Amount vs Rating approval?

cloudbank-v3/spring-apps-spring3/customer/src/main/resources/application.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ spring:
1010
ddl-auto: validate
1111
properties:
1212
hibernate:
13-
dialect: org.hibernate.dialect.Oracle12cDialect
13+
dialect: org.hibernate.dialect.OracleDialect
1414
format_sql: true
1515
show-sql: true
1616

1717
liquibase:
1818
change-log: classpath:db/changelog/controller.yaml
1919
url: ${spring.datasource.url}
20-
user: ${spring.datasource.username}
21-
password: ${spring.datasource.password}
20+
user: ${liquibase.datasource.username}
21+
password: ${liquibase.datasource.password}
2222
enabled: ${LIQUIBASE_ENABLED:true}
2323

2424
datasource:
@@ -33,6 +33,7 @@ spring:
3333
initial-pool-size: 15
3434
min-pool-size: 10
3535
max-pool-size: 30
36+
shared: true
3637

3738
eureka:
3839
instance:

cloudbank-v3/spring-apps-spring3/customer/src/main/resources/db/changelog/table.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
-- liquibase formatted sql
22

3-
--changeset gotsysdba:1
3+
--changeset gotsysdbax:1
44
--preconditions onFail:MARK_RAN onerror:MARK_RAN
55
--precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM CUSTOMER.CUSTOMERS WHERE 1=2
66
DROP TABLE CUSTOMER.CUSTOMERS;
77

8-
--changeset gotsysdba:2
8+
--changeset gotsysdbax:2
99
CREATE TABLE CUSTOMER.CUSTOMERS (
1010
CUSTOMER_ID VARCHAR2 (20),
1111
CUSTOMER_NAME VARCHAR2 (40),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<properties>
3434
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3535
<java.version>17</java.version>
36-
<spring.boot.dependencies.version>3.1.3</spring.boot.dependencies.version>
36+
<spring.boot.dependencies.version>3.1.5</spring.boot.dependencies.version>
3737
<spring-cloud.version>2022.0.4</spring-cloud.version>
3838

3939
<!-- Code quality tools -->

cloudbank-v3/spring-apps-spring3/testrunner/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<description>Test Runner Application</description>
1717
<properties>
1818
<java.version>17</java.version>
19-
<oracle-springboot-starter.version>3.1.0</oracle-springboot-starter.version>
19+
<oracle-springboot-starter.version>23.4.0</oracle-springboot-starter.version>
2020
</properties>
2121
<dependencies>
2222

cloudbank-v3/spring-apps-spring3/testrunner/src/main/resources/application.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ spring:
33
name: testrunner
44
zipkin:
55
base-url: ${zipkin.base-url}
6-
7-
oracle:
8-
aq:
6+
datasource:
97
url: ${spring.datasource.url}
108
username: ${spring.datasource.username}
119
password: ${spring.datasource.password}

0 commit comments

Comments
 (0)