Merge aspectj -> spring-aop (#1737)

aspectj/README.md

@@ -1,3 +0,0 @@
-### Relevant Articles:
-- [Intro to AspectJ](http://www.baeldung.com/aspectj)
-- [Spring Performance Logging](http://www.baeldung.com/spring-performance-logging)

aspectj/pom.xml

@@ -1,138 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
-    <artifactId>aspectj</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>aspectj</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>${aspectj.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjweaver</artifactId>
-            <version>${aspectj.version}</version>
-        </dependency>
-
-        <!-- utils -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${org.slf4j.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>${logback.version}</version>
-        </dependency>
-
-        <!-- unit test -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>4.3.4.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>4.3.4.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>4.3.4.RELEASE</version>         
-        </dependency>
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
-            <version>3.2.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <version>4.3.4.RELEASE</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>aspectj</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${source.version}</source>
-                    <target>${source.version}</target>
-                </configuration>
-
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>aspectj-maven-plugin</artifactId>
-                <version>1.7</version>
-                <configuration>
-                    <complianceLevel>${source.version}</complianceLevel>
-                    <source>${source.version}</source>
-                    <target>${source.version}</target>
-                    <showWeaveInfo>true</showWeaveInfo>
-                    <verbose>true</verbose>
-                    <Xlint>ignore</Xlint>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                    <!-- Post-compile weaving -->
-                    <!-- <weaveDependencies> <weaveDependency> <groupId>org.agroup</groupId> <artifactId>to-weave</artifactId> </weaveDependency> 
-                        <weaveDependency> <groupId>org.anothergroup</groupId> <artifactId>gen</artifactId> </weaveDependency> </weaveDependencies> -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>compile</goal>
-                            <goal>test-compile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>2.10</version> 
-                <configuration> <argLine>-javaagent:"${settings.localRepository}"/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar</argLine> 
-                <useSystemClassLoader>true</useSystemClassLoader> <forkMode>always</forkMode> </configuration> </plugin> -->
-        </plugins>
-    </build>
-
-    <properties>
-        <source.version>1.8</source.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <aspectj.version>1.8.9</aspectj.version>
-        <org.slf4j.version>1.7.21</org.slf4j.version>
-        <logback.version>1.1.7</logback.version>
-        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
-        <junit.version>4.12</junit.version>
-    </properties>
-
-</project>

pom.xml

@@ -22,7 +22,6 @@
         <module>apache-fop</module>
         <module>apache-poi</module>
         <module>apache-thrift</module>
-        <module>aspectj</module>
         <module>assertj</module>
         <module>autovalue</module>
         <module>axon</module>

spring-aop/README.md

@@ -1,3 +1,5 @@
 ### Relevant articles
 
 - [Implementing a Custom Spring AOP Annotation](http://www.baeldung.com/spring-aop-annotation)
+- [Intro to AspectJ](http://www.baeldung.com/aspectj)
+- [Spring Performance Logging](http://www.baeldung.com/spring-performance-logging)

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

@@ -1,4 +1,4 @@
-package com.baeldung.aspectj;
+package org.baeldung.aspectj;
 
 public class Account {
     int balance = 20;

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

@@ -1,4 +1,4 @@
-package com.baeldung.aspectj;
+package org.baeldung.aspectj;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -1,4 +1,4 @@
-package com.baeldung.aspectj;
+package org.baeldung.aspectj;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

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

@@ -1,4 +1,4 @@
-package com.baeldung.aspectj;
+package org.baeldung.aspectj;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -1,4 +1,4 @@
-package com.baeldung.aspectj;
+package org.baeldung.aspectj;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;

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

@@ -1,7 +1,4 @@
-package com.baeldung.performancemonitor;
-
-import java.time.LocalDate;
-import java.time.Month;
+package org.baeldung.performancemonitor;
 
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.aop.Advisor;
@@ -12,6 +9,9 @@ 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 {

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

@@ -1,11 +1,11 @@
-package com.baeldung.performancemonitor;
-
-import java.util.Date;
+package org.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() {

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

@@ -1,4 +1,4 @@
-package com.baeldung.performancemonitor;
+package org.baeldung.performancemonitor;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;

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

@@ -1,4 +1,4 @@
-package com.baeldung.performancemonitor;
+package org.baeldung.performancemonitor;
 
 import java.time.LocalDate;
 

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

@@ -1,4 +1,4 @@
-package com.baeldung.performancemonitor;
+package org.baeldung.performancemonitor;
 
 import java.time.LocalDate;
 import java.time.Period;

spring-aop/src/main/resources/META-INF/aop.xml

@@ -1,6 +1,6 @@
 <aspectj>
     <aspects>
-        <aspect name="com.baeldung.aspectj.SecuredMethodAspect"/>
+        <aspect name="org.baeldung.aspectj.SecuredMethodAspect"/>
         <weaver options="-verbose -showWeaveInfo">
             <include within="com.baeldung.aspectj.*"/>
         </weaver>

spring-aop/src/test/java/org/baeldung/aspectj/AccountTest.java

@@ -1,11 +1,10 @@
-package com.baeldung.aspectj.test;
-
-import static org.junit.Assert.*;
+package org.baeldung.aspectj;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import com.baeldung.aspectj.Account;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class AccountTest {
     private Account account;

spring-aop/src/test/java/org/baeldung/aspectj/SecuredMethodTest.java

@@ -1,9 +1,7 @@
-package com.baeldung.aspectj.test;
+package org.baeldung.aspectj;
 
 import org.junit.Test;
 
-import com.baeldung.aspectj.SecuredMethod;
-
 public class SecuredMethodTest {
     @Test
     public void testMethod() throws Exception {

spring-boot/src/main/java/org/baeldung/Application.java

@@ -1,11 +1,12 @@
 package org.baeldung;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ApplicationContext;
 
 import com.baeldung.autoconfiguration.MySQLAutoconfiguration;
 
-@org.springframework.boot.autoconfigure.SpringBootApplication(exclude=MySQLAutoconfiguration.class)
+@SpringBootApplication(exclude=MySQLAutoconfiguration.class)
 public class Application {
     private static ApplicationContext applicationContext;
 

spring-boot/src/test/java/org/baeldung/SpringBootApplicationIntegrationTest.java

@@ -1,9 +1,5 @@
 package org.baeldung;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-
 import org.baeldung.domain.Modes;
 import org.junit.Before;
 import org.junit.Test;
@@ -21,12 +17,18 @@ import org.springframework.web.context.WebApplicationContext;
 
 import java.nio.charset.Charset;
 
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = Application.class)
 @WebAppConfiguration
 public class SpringBootApplicationIntegrationTest {
+
     @Autowired
     private WebApplicationContext webApplicationContext;
+
     private MockMvc mockMvc;
 
     @Before