diff --git a/2019-11/spring-03/.gitignore b/2019-11/spring-03/.gitignore new file mode 100644 index 00000000..4ea52072 --- /dev/null +++ b/2019-11/spring-03/.gitignore @@ -0,0 +1,24 @@ +target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/build/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ diff --git a/2019-11/spring-03/pom.xml b/2019-11/spring-03/pom.xml new file mode 100644 index 00000000..a3108dd4 --- /dev/null +++ b/2019-11/spring-03/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + ru.otus + spring-03 + 1.0 + + pom + + + spring-03-exercise + spring-03-solution + + diff --git a/2019-11/spring-03/spring-03-exercise/pom.xml b/2019-11/spring-03/spring-03-exercise/pom.xml new file mode 100644 index 00000000..5a0e5ef3 --- /dev/null +++ b/2019-11/spring-03/spring-03-exercise/pom.xml @@ -0,0 +1,40 @@ + + + 4.0.0 + + ru.otus + spring-03-exercise + 1.0 + + + 11 + 11 + UTF-8 + + + + + org.springframework + spring-context + 5.2.1.RELEASE + + + + org.springframework + spring-aop + 5.2.1.RELEASE + + + org.aspectj + aspectjrt + 1.9.5 + + + org.aspectj + aspectjweaver + 1.9.5 + + + diff --git a/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/Main.java b/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/Main.java new file mode 100644 index 00000000..1e9380b4 --- /dev/null +++ b/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/Main.java @@ -0,0 +1,20 @@ +package ru.otus.spring; + +import org.springframework.context.annotation.*; +import ru.otus.spring.domain.Person; +import ru.otus.spring.service.PersonService; + +@Configuration +@ComponentScan +public class Main { + + public static void main(String[] args) { + AnnotationConfigApplicationContext context = + new AnnotationConfigApplicationContext(Main.class); + + PersonService service = context.getBean(PersonService.class); + + Person ivan = service.getByName("Ivan"); + System.out.println("name: " + ivan.getName() + " age: " + ivan.getAge()); + } +} diff --git a/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/dao/PersonDao.java b/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/dao/PersonDao.java new file mode 100644 index 00000000..d33939bd --- /dev/null +++ b/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/dao/PersonDao.java @@ -0,0 +1,8 @@ +package ru.otus.spring.dao; + +import ru.otus.spring.domain.Person; + +public interface PersonDao { + + Person findByName(String name); +} diff --git a/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java b/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java new file mode 100644 index 00000000..f8e0bb29 --- /dev/null +++ b/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java @@ -0,0 +1,12 @@ +package ru.otus.spring.dao; + +import org.springframework.stereotype.Repository; +import ru.otus.spring.domain.Person; + +@Repository +public class PersonDaoSimple implements PersonDao { + + public Person findByName(String name) { + return new Person(name, 18); + } +} diff --git a/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/domain/Person.java b/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/domain/Person.java new file mode 100644 index 00000000..b19b42c1 --- /dev/null +++ b/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/domain/Person.java @@ -0,0 +1,20 @@ +package ru.otus.spring.domain; + +public class Person { + + private String name; + private int age; + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + + public String getName() { + return name; + } + + public int getAge() { + return age; + } +} diff --git a/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/logging/LoggingAspect.java b/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/logging/LoggingAspect.java new file mode 100644 index 00000000..934f362c --- /dev/null +++ b/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/logging/LoggingAspect.java @@ -0,0 +1,10 @@ +package ru.otus.spring.logging; + +import org.aspectj.lang.JoinPoint; + +public class LoggingAspect { + + public void logBefore(JoinPoint joinPoint) { + System.out.println("Вызов метода : " + joinPoint.getSignature().getName()); + } +} diff --git a/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/service/PersonService.java b/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/service/PersonService.java new file mode 100644 index 00000000..9b83e7de --- /dev/null +++ b/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/service/PersonService.java @@ -0,0 +1,8 @@ +package ru.otus.spring.service; + +import ru.otus.spring.domain.Person; + +public interface PersonService { + + Person getByName(String name); +} diff --git a/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/service/PersonServiceImpl.java b/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/service/PersonServiceImpl.java new file mode 100644 index 00000000..88b311a5 --- /dev/null +++ b/2019-11/spring-03/spring-03-exercise/src/main/java/ru/otus/spring/service/PersonServiceImpl.java @@ -0,0 +1,19 @@ +package ru.otus.spring.service; + +import org.springframework.stereotype.Service; +import ru.otus.spring.dao.PersonDao; +import ru.otus.spring.domain.Person; + +@Service +public class PersonServiceImpl implements PersonService { + + private final PersonDao dao; + + public PersonServiceImpl(PersonDao dao) { + this.dao = dao; + } + + public Person getByName(String name) { + return dao.findByName(name); + } +} diff --git a/2019-11/spring-03/spring-03-solution/pom.xml b/2019-11/spring-03/spring-03-solution/pom.xml new file mode 100644 index 00000000..8132d7c6 --- /dev/null +++ b/2019-11/spring-03/spring-03-solution/pom.xml @@ -0,0 +1,40 @@ + + + 4.0.0 + + ru.otus + spring-03-solution + 1.0 + + + 11 + 11 + UTF-8 + + + + + org.springframework + spring-context + 5.2.1.RELEASE + + + + org.springframework + spring-aop + 5.2.1.RELEASE + + + org.aspectj + aspectjrt + 1.9.5 + + + org.aspectj + aspectjweaver + 1.9.5 + + + diff --git a/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/Main.java b/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/Main.java new file mode 100644 index 00000000..f4db40b0 --- /dev/null +++ b/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/Main.java @@ -0,0 +1,21 @@ +package ru.otus.spring; + +import org.springframework.context.annotation.*; +import ru.otus.spring.domain.Person; +import ru.otus.spring.service.PersonService; + +@EnableAspectJAutoProxy +@Configuration +@ComponentScan +public class Main { + + public static void main(String[] args) { + AnnotationConfigApplicationContext context = + new AnnotationConfigApplicationContext(Main.class); + + PersonService service = context.getBean(PersonService.class); + + Person ivan = service.getByName("Ivan"); + System.out.println("name: " + ivan.getName() + " age: " + ivan.getAge()); + } +} diff --git a/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/dao/PersonDao.java b/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/dao/PersonDao.java new file mode 100644 index 00000000..d33939bd --- /dev/null +++ b/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/dao/PersonDao.java @@ -0,0 +1,8 @@ +package ru.otus.spring.dao; + +import ru.otus.spring.domain.Person; + +public interface PersonDao { + + Person findByName(String name); +} diff --git a/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java b/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java new file mode 100644 index 00000000..f8e0bb29 --- /dev/null +++ b/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/dao/PersonDaoSimple.java @@ -0,0 +1,12 @@ +package ru.otus.spring.dao; + +import org.springframework.stereotype.Repository; +import ru.otus.spring.domain.Person; + +@Repository +public class PersonDaoSimple implements PersonDao { + + public Person findByName(String name) { + return new Person(name, 18); + } +} diff --git a/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/domain/Person.java b/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/domain/Person.java new file mode 100644 index 00000000..b19b42c1 --- /dev/null +++ b/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/domain/Person.java @@ -0,0 +1,20 @@ +package ru.otus.spring.domain; + +public class Person { + + private String name; + private int age; + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + + public String getName() { + return name; + } + + public int getAge() { + return age; + } +} diff --git a/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/logging/LoggingAspect.java b/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/logging/LoggingAspect.java new file mode 100644 index 00000000..572811ab --- /dev/null +++ b/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/logging/LoggingAspect.java @@ -0,0 +1,16 @@ +package ru.otus.spring.logging; + +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.springframework.stereotype.Component; + +@Aspect +@Component +public class LoggingAspect { + + @Before("execution(* ru.otus.spring.dao.PersonDaoSimple.*(..))") + public void logBefore(JoinPoint joinPoint) { + System.out.println("Вызов метода : " + joinPoint.getSignature().getName()); + } +} diff --git a/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/service/PersonService.java b/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/service/PersonService.java new file mode 100644 index 00000000..9b83e7de --- /dev/null +++ b/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/service/PersonService.java @@ -0,0 +1,8 @@ +package ru.otus.spring.service; + +import ru.otus.spring.domain.Person; + +public interface PersonService { + + Person getByName(String name); +} diff --git a/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/service/PersonServiceImpl.java b/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/service/PersonServiceImpl.java new file mode 100644 index 00000000..88b311a5 --- /dev/null +++ b/2019-11/spring-03/spring-03-solution/src/main/java/ru/otus/spring/service/PersonServiceImpl.java @@ -0,0 +1,19 @@ +package ru.otus.spring.service; + +import org.springframework.stereotype.Service; +import ru.otus.spring.dao.PersonDao; +import ru.otus.spring.domain.Person; + +@Service +public class PersonServiceImpl implements PersonService { + + private final PersonDao dao; + + public PersonServiceImpl(PersonDao dao) { + this.dao = dao; + } + + public Person getByName(String name) { + return dao.findByName(name); + } +}