From b467eb65f6c2c1478a8514ea3f0fb20605e8d8ed Mon Sep 17 00:00:00 2001 From: Amit Pandey Date: Tue, 9 Jan 2024 03:52:19 +0530 Subject: [PATCH] [JAVA-29178] Upgrade Spring AOP 2 module to Spring Boot 3 (#15561) --- spring-aop-2/pom.xml | 16 ++++++++++++++-- .../baeldung/method/info/BankAccountService.java | 7 +++++-- .../info/BankAccountServiceIntegrationTest.java | 7 ++++--- .../CompileTimeWeavingIntegrationTest.java | 2 +- .../LoadTimeWeavingIntegrationTest.java | 2 +- .../MathServiceIntegrationTest.java | 2 +- 6 files changed, 26 insertions(+), 10 deletions(-) diff --git a/spring-aop-2/pom.xml b/spring-aop-2/pom.xml index f1257369e0..e17d2c7639 100644 --- a/spring-aop-2/pom.xml +++ b/spring-aop-2/pom.xml @@ -9,9 +9,9 @@ com.baeldung - parent-boot-2 + parent-boot-3 0.0.1-SNAPSHOT - ../parent-boot-2 + ../parent-boot-3 @@ -27,6 +27,16 @@ org.springframework.boot spring-boot-starter-aop + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + org.apache.commons + commons-rng-simple + ${commons-rng-core.version} + org.springframework.boot spring-boot-starter-test @@ -164,6 +174,8 @@ 1.14.0 5.3.27 + com.baeldung.Application + 1.5 \ No newline at end of file diff --git a/spring-aop-2/src/main/java/com/baeldung/method/info/BankAccountService.java b/spring-aop-2/src/main/java/com/baeldung/method/info/BankAccountService.java index 6ebab37d9e..dc5859348a 100644 --- a/spring-aop-2/src/main/java/com/baeldung/method/info/BankAccountService.java +++ b/spring-aop-2/src/main/java/com/baeldung/method/info/BankAccountService.java @@ -1,11 +1,14 @@ package com.baeldung.method.info; -import org.apache.commons.lang3.RandomUtils; +import org.apache.commons.rng.UniformRandomProvider; +import org.apache.commons.rng.simple.RandomSource; import org.springframework.stereotype.Component; @Component public class BankAccountService { + private final UniformRandomProvider rng = RandomSource.XO_RO_SHI_RO_128_PP.create(); + @AccountOperation(operation = "deposit") public void deposit(Account account, Double amount) { account.setBalance(account.getBalance() + amount); @@ -23,7 +26,7 @@ public class BankAccountService { } public double getBalance() { - return RandomUtils.nextDouble(); + return rng.nextDouble(); } } diff --git a/spring-aop-2/src/test/java/com/baeldung/method/info/BankAccountServiceIntegrationTest.java b/spring-aop-2/src/test/java/com/baeldung/method/info/BankAccountServiceIntegrationTest.java index b1ba97654e..b6714b620d 100644 --- a/spring-aop-2/src/test/java/com/baeldung/method/info/BankAccountServiceIntegrationTest.java +++ b/spring-aop-2/src/test/java/com/baeldung/method/info/BankAccountServiceIntegrationTest.java @@ -6,6 +6,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @SpringBootTest @@ -26,20 +27,20 @@ class BankAccountServiceIntegrationTest { @Test void withdraw() { bankAccountService.withdraw(account, 500.0); - assertTrue(account.getBalance() == 1500.0); + assertEquals(1500.0, account.getBalance()); } @Test void withdrawWhenLimitReached() { Assertions.assertThatExceptionOfType(WithdrawLimitException.class) .isThrownBy(() -> bankAccountService.withdraw(account, 600.0)); - assertTrue(account.getBalance() == 2000.0); + assertEquals(2000.0, account.getBalance()); } @Test void deposit() { bankAccountService.deposit(account, 500.0); - assertTrue(account.getBalance() == 2500.0); + assertEquals(2500.0, account.getBalance()); } @Test diff --git a/spring-aop-2/src/test/java/com/baeldung/selfinvocation/CompileTimeWeavingIntegrationTest.java b/spring-aop-2/src/test/java/com/baeldung/selfinvocation/CompileTimeWeavingIntegrationTest.java index d0522f67e5..4c80d79c23 100644 --- a/spring-aop-2/src/test/java/com/baeldung/selfinvocation/CompileTimeWeavingIntegrationTest.java +++ b/spring-aop-2/src/test/java/com/baeldung/selfinvocation/CompileTimeWeavingIntegrationTest.java @@ -3,7 +3,7 @@ package com.baeldung.selfinvocation; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.concurrent.atomic.AtomicInteger; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-aop-2/src/test/java/com/baeldung/selfinvocation/LoadTimeWeavingIntegrationTest.java b/spring-aop-2/src/test/java/com/baeldung/selfinvocation/LoadTimeWeavingIntegrationTest.java index 93c57699d6..4eee83148a 100644 --- a/spring-aop-2/src/test/java/com/baeldung/selfinvocation/LoadTimeWeavingIntegrationTest.java +++ b/spring-aop-2/src/test/java/com/baeldung/selfinvocation/LoadTimeWeavingIntegrationTest.java @@ -1,9 +1,9 @@ package com.baeldung.selfinvocation; +import jakarta.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import javax.annotation.Resource; import java.util.concurrent.atomic.AtomicInteger; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-aop-2/src/test/java/com/baeldung/selfinvocation/MathServiceIntegrationTest.java b/spring-aop-2/src/test/java/com/baeldung/selfinvocation/MathServiceIntegrationTest.java index 24b829fa07..64ec37bc27 100644 --- a/spring-aop-2/src/test/java/com/baeldung/selfinvocation/MathServiceIntegrationTest.java +++ b/spring-aop-2/src/test/java/com/baeldung/selfinvocation/MathServiceIntegrationTest.java @@ -4,7 +4,7 @@ import com.baeldung.Application; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.concurrent.atomic.AtomicInteger; import static org.assertj.core.api.Assertions.assertThat;