BAEL-19967: Migrate spring-aop module to the com.baeldung package

spring-aop/src/main/java/com/baeldung/Application.java

@@ -0,0 +1,13 @@
+package com.baeldung;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+}

spring-aop/src/main/java/com/baeldung/ExampleAspect.java

@@ -0,0 +1,25 @@
+package com.baeldung;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.stereotype.Component;
+
+@Aspect
+@Component
+public class ExampleAspect {
+
+    @Around("@annotation(com.baeldung.LogExecutionTime)")
+    public Object logExecutionTime(ProceedingJoinPoint joinPoint) throws Throwable {
+        final long start = System.currentTimeMillis();
+
+        final Object proceed = joinPoint.proceed();
+
+        final long executionTime = System.currentTimeMillis() - start;
+
+        System.out.println(joinPoint.getSignature() + " executed in " + executionTime + "ms");
+
+        return proceed;
+    }
+
+}

spring-aop/src/main/java/com/baeldung/LogExecutionTime.java

@@ -0,0 +1,11 @@
+package com.baeldung;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface LogExecutionTime {
+}

spring-aop/src/main/java/com/baeldung/Service.java

@@ -0,0 +1,12 @@
+package com.baeldung;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class Service {
+
+    @LogExecutionTime
+    public void serve() throws InterruptedException {
+        Thread.sleep(2000);
+    }
+}

spring-aop/src/main/java/com/baeldung/aspectj/Account.java

@@ -0,0 +1,13 @@
+package com.baeldung.aspectj;
+
+public class Account {
+    int balance = 20;
+
+    public boolean withdraw(int amount) {
+        if (balance < amount) {
+            return false;
+        }
+        balance = balance - amount;
+        return true;
+    }
+}

spring-aop/src/main/java/com/baeldung/aspectj/AccountAspect.aj

@@ -0,0 +1,29 @@
+package com.baeldung.aspectj;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public aspect AccountAspect {
+    private static final Logger logger = LoggerFactory.getLogger(AccountAspect.class);
+    final int MIN_BALANCE = 10;
+
+    pointcut callWithDraw(int amount, Account account):
+             call(boolean com.baeldung.aspectj.Account.withdraw(int)) && args(amount) && target(account);
+
+    before(int amount, Account account) : callWithDraw(amount, account) {
+        logger.info(" Balance before withdrawal: {}", account.balance);
+        logger.info(" Withdraw ammout: {}", amount);
+    }
+
+    boolean around(int amount, Account account) : callWithDraw(amount, account) {
+        if (account.balance < amount) {
+            logger.info("Withdrawal Rejected!");
+            return false;
+        }
+        return proceed(amount, account);
+    }
+
+    after(int amount, Account balance) : callWithDraw(amount, balance) {
+        logger.info("Balance after withdrawal : {}", balance.balance);
+    }
+}

spring-aop/src/main/java/com/baeldung/aspectj/Secured.java

@@ -0,0 +1,12 @@
+package com.baeldung.aspectj;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Secured {
+    public boolean isLocked() default false; 
+}

spring-aop/src/main/java/com/baeldung/aspectj/SecuredMethod.java

@@ -0,0 +1,23 @@
+package com.baeldung.aspectj;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SecuredMethod {
+    private static final Logger logger = LoggerFactory.getLogger(SecuredMethod.class);
+
+    @Secured(isLocked = true)
+    public void lockedMethod() throws Exception {
+        logger.info("lockedMethod");
+    }
+
+    @Secured(isLocked = false)
+    public void unlockedMethod() {
+        logger.info("unlockedMethod");
+    }
+
+    public static void main(String[] args) throws Exception {
+        SecuredMethod sv = new SecuredMethod();
+        sv.lockedMethod();
+    }
+}

spring-aop/src/main/java/com/baeldung/aspectj/SecuredMethodAspect.java

@@ -0,0 +1,27 @@
+package com.baeldung.aspectj;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Aspect
+public class SecuredMethodAspect {
+    private static final Logger logger = LoggerFactory.getLogger(SecuredMethodAspect.class);
+
+    @Pointcut("@annotation(secured)")
+    public void callAt(Secured secured) {
+    }
+
+    @Around("callAt(secured)")
+    public Object around(ProceedingJoinPoint pjp, Secured secured) throws Throwable {
+        if (secured.isLocked()) {
+            logger.info(pjp.getSignature().toLongString() + " is locked");
+            return null;
+        } else {
+            return pjp.proceed();
+        }
+    }
+}

spring-aop/src/main/java/com/baeldung/logger/AdderAfterAspect.java

@@ -0,0 +1,13 @@
+package com.baeldung.logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AdderAfterAspect {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public void afterAdvice() throws Throwable {
+        logger.info("I'm done calling the method");
+    }
+}

spring-aop/src/main/java/com/baeldung/logger/AdderAfterReturnAspect.java

@@ -0,0 +1,13 @@
+package com.baeldung.logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AdderAfterReturnAspect {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public void afterReturn(final Object returnValue) throws Throwable {
+        logger.info("value return was {}",  returnValue);
+    }
+}

spring-aop/src/main/java/com/baeldung/logger/AdderAfterThrowAspect.java

@@ -0,0 +1,13 @@
+package com.baeldung.logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AdderAfterThrowAspect {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public void afterThrow(final Exception exception) throws Throwable {
+        logger.info("Exception thrown was {}",  exception.getMessage());
+    }
+}

spring-aop/src/main/java/com/baeldung/logger/AdderAroundAspect.java

@@ -0,0 +1,18 @@
+package com.baeldung.logger;
+
+import java.util.Arrays;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AdderAroundAspect {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public Object aroundAdvice(final ProceedingJoinPoint joinPoint) throws Throwable {
+        logger.info("Arguments passed to method are: " + Arrays.toString(joinPoint.getArgs()));
+        final Object result = joinPoint.proceed();
+        logger.info("Result from method is: " + result);
+        return result;
+    }
+}

spring-aop/src/main/java/com/baeldung/logger/AdderBeforeAspect.java

@@ -0,0 +1,13 @@
+package com.baeldung.logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AdderBeforeAspect {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public void beforeAdvice() throws Throwable {
+        logger.info("I would be executed just before method starts");
+    }
+}

spring-aop/src/main/java/com/baeldung/logger/SampleAdder.java

@@ -0,0 +1,12 @@
+package com.baeldung.logger;
+
+public class SampleAdder {
+
+    public int add(int a, int b) {
+        if (a < 0 || b < 0) {
+            throw new IllegalArgumentException("Make sure all the arguments are greater than zero.");
+        }
+        return a + b;
+    }
+
+}

spring-aop/src/main/java/com/baeldung/performancemonitor/AopConfiguration.java

@@ -0,0 +1,59 @@
+package com.baeldung.performancemonitor;
+
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.aop.Advisor;
+import org.springframework.aop.aspectj.AspectJExpressionPointcut;
+import org.springframework.aop.interceptor.PerformanceMonitorInterceptor;
+import org.springframework.aop.support.DefaultPointcutAdvisor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+
+import java.time.LocalDate;
+import java.time.Month;
+
+@Configuration
+@EnableAspectJAutoProxy
+public class AopConfiguration {
+    
+    @Pointcut("execution(public String com.baeldung.performancemonitor.PersonService.getFullName(..))")
+    public void monitor() { }
+    
+    @Pointcut("execution(public int com.baeldung.performancemonitor.PersonService.getAge(..))")
+    public void myMonitor() { }
+    
+    @Bean
+    public PerformanceMonitorInterceptor performanceMonitorInterceptor() {
+        return new PerformanceMonitorInterceptor(true);
+    }
+
+    @Bean
+    public Advisor performanceMonitorAdvisor() {
+        AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
+        pointcut.setExpression("com.baeldung.performancemonitor.AopConfiguration.monitor()");
+        return new DefaultPointcutAdvisor(pointcut, performanceMonitorInterceptor());
+    }
+    
+    @Bean
+    public Person person(){
+        return new Person("John","Smith", LocalDate.of(1980, Month.JANUARY, 12));
+    }
+    
+    @Bean
+    public PersonService personService(){
+        return new PersonService();
+    }
+    
+    @Bean
+    public MyPerformanceMonitorInterceptor myPerformanceMonitorInterceptor() {
+        return new MyPerformanceMonitorInterceptor(true);
+    }
+    
+    @Bean
+    public Advisor myPerformanceMonitorAdvisor() {
+        AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
+        pointcut.setExpression("com.baeldung.performancemonitor.AopConfiguration.myMonitor()");
+        return new DefaultPointcutAdvisor(pointcut, myPerformanceMonitorInterceptor());
+    }
+    
+}

spring-aop/src/main/java/com/baeldung/performancemonitor/MyPerformanceMonitorInterceptor.java

@@ -0,0 +1,39 @@
+package com.baeldung.performancemonitor;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.apache.commons.logging.Log;
+import org.springframework.aop.interceptor.AbstractMonitoringInterceptor;
+
+import java.util.Date;
+
+public class MyPerformanceMonitorInterceptor extends AbstractMonitoringInterceptor {
+    
+    public MyPerformanceMonitorInterceptor() {
+    }
+
+    public MyPerformanceMonitorInterceptor(boolean useDynamicLogger) {
+            setUseDynamicLogger(useDynamicLogger);
+    }
+
+    @Override
+    protected Object invokeUnderTrace(MethodInvocation invocation, Log log) throws Throwable {
+        
+        String name = createInvocationTraceName(invocation);
+        long start = System.currentTimeMillis();
+        log.info("Method "+name+" execution started at:"+new Date());
+        try {
+            return invocation.proceed();
+        }
+        finally {
+            long end = System.currentTimeMillis();
+            long time = end - start;
+            log.info("Method "+name+" execution lasted:"+time+" ms");
+            log.info("Method "+name+" execution ended at:"+new Date());
+            
+            if (time > 10){
+                log.warn("Method execution longer than 10 ms!");
+            }
+            
+        }
+    }
+}

spring-aop/src/main/java/com/baeldung/performancemonitor/PerfomanceApp.java

@@ -0,0 +1,16 @@
+package com.baeldung.performancemonitor;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+public class PerfomanceApp {
+    public static void main(String[] args) {
+
+        ApplicationContext context = new AnnotationConfigApplicationContext(AopConfiguration.class);
+        Person person = (Person) context.getBean("person");
+        PersonService personService = (PersonService) context.getBean("personService");
+        
+        System.out.println("Name is:"+personService.getFullName(person));
+        System.out.println("Age is:"+personService.getAge(person));
+    }
+}

spring-aop/src/main/java/com/baeldung/performancemonitor/Person.java

@@ -0,0 +1,42 @@
+package com.baeldung.performancemonitor;
+
+import java.time.LocalDate;
+
+public class Person {
+    private String lastName;
+    private String firstName;
+    private LocalDate dateOfBirth;
+
+    public Person() {
+    }
+
+    public Person(String firstName, String lastName, LocalDate dateOfBirth) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+        this.dateOfBirth = dateOfBirth;
+    }
+
+    public LocalDate getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    public void setDateOfBirth(LocalDate dateOfBirth) {
+        this.dateOfBirth = dateOfBirth;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+}

spring-aop/src/main/java/com/baeldung/performancemonitor/PersonService.java

@@ -0,0 +1,17 @@
+package com.baeldung.performancemonitor;
+
+import java.time.LocalDate;
+import java.time.Period;
+
+public class PersonService {
+
+    public String getFullName(Person person){
+        return person.getLastName()+" "+person.getFirstName();
+    }
+    
+    public int getAge(Person person){
+        Period p = Period.between(person.getDateOfBirth(), LocalDate.now());
+        return p.getYears();
+    }
+    
+}