From 8f0e5d6437d9976cc03a9b908c685c25eaecfb60 Mon Sep 17 00:00:00 2001 From: stvort Date: Wed, 29 May 2024 10:54:27 +0400 Subject: [PATCH] 2024-03 spring-11-jpql updated --- ...dentRepositoryJpa.java => JpaOtusStudentRepository.java} | 4 ++-- .../ormdemo/repositories/JpaOtusStudentRepositoryTest.java} | 6 +++--- ...dentRepositoryJpa.java => JpaOtusStudentRepository.java} | 4 ++-- .../ormdemo/repositories/JpaOtusStudentRepositoryTest.java} | 6 +++--- ...dentRepositoryJpa.java => JpaOtusStudentRepository.java} | 4 ++-- .../ormdemo/repositories/JpaOtusStudentRepositoryTest.java} | 6 +++--- ...dentRepositoryJpa.java => JpaOtusStudentRepository.java} | 2 +- ...sitoryJpaTest.java => JpaOtusStudentRepositoryTest.java} | 6 +++--- ...dentRepositoryJpa.java => JpaOtusStudentRepository.java} | 4 ++-- ...sitoryJpaTest.java => JpaOtusStudentRepositoryTest.java} | 6 +++--- .../ormdemo/repositories/JpaOtusStudentRepository.java} | 4 ++-- ...sitoryJpaTest.java => JpaOtusStudentRepositoryTest.java} | 6 +++--- .../ormdemo/repositories/JpaOtusStudentRepository.java} | 4 ++-- ...sitoryJpaTest.java => JpaOtusStudentRepositoryTest.java} | 6 +++--- ...dentRepositoryJpa.java => JpaOtusStudentRepository.java} | 4 ++-- ...sitoryJpaTest.java => JpaOtusStudentRepositoryTest.java} | 6 +++--- ...ategoryRepositoryJpa.java => JpaCategoryRepository.java} | 4 ++-- ...mployeeRepositoryJpa.java => JpaEmployeeRepository.java} | 4 ++-- ...epositoryJpaTest.java => JpaCategoryRepositoryTest.java} | 6 +++--- ...epositoryJpaTest.java => JpaEmployeeRepositoryTest.java} | 6 +++--- 20 files changed, 49 insertions(+), 49 deletions(-) rename 2024-03/spring-11-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/repositories/{OtusStudentRepositoryJpa.java => JpaOtusStudentRepository.java} (93%) rename 2024-03/spring-11-jpql/jpql-class-work/{jpql-solution-02/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java => jpql-exercise/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java} (97%) rename 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/repositories/{OtusStudentRepositoryJpa.java => JpaOtusStudentRepository.java} (93%) rename 2024-03/spring-11-jpql/jpql-class-work/{jpql-exercise/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java => jpql-solution-01/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java} (97%) rename 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/repositories/{OtusStudentRepositoryJpa.java => JpaOtusStudentRepository.java} (94%) rename 2024-03/spring-11-jpql/jpql-class-work/{jpql-solution-01/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java => jpql-solution-02/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java} (97%) rename 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/repositories/{OtusStudentRepositoryJpa.java => JpaOtusStudentRepository.java} (97%) rename 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-03/src/test/java/ru/otus/example/ormdemo/repositories/{OtusStudentRepositoryJpaTest.java => JpaOtusStudentRepositoryTest.java} (97%) rename 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/repositories/{OtusStudentRepositoryJpa.java => JpaOtusStudentRepository.java} (96%) rename 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-04/src/test/java/ru/otus/example/ormdemo/repositories/{OtusStudentRepositoryJpaTest.java => JpaOtusStudentRepositoryTest.java} (95%) rename 2024-03/spring-11-jpql/jpql-class-work/{jpql-solution-06/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java => jpql-solution-05/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java} (96%) rename 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-05/src/test/java/ru/otus/example/ormdemo/repositories/{OtusStudentRepositoryJpaTest.java => JpaOtusStudentRepositoryTest.java} (95%) rename 2024-03/spring-11-jpql/jpql-class-work/{jpql-solution-05/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java => jpql-solution-06/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java} (96%) rename 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-06/src/test/java/ru/otus/example/ormdemo/repositories/{OtusStudentRepositoryJpaTest.java => JpaOtusStudentRepositoryTest.java} (95%) rename 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/repositories/{OtusStudentRepositoryJpa.java => JpaOtusStudentRepository.java} (96%) rename 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-final/src/test/java/ru/otus/example/ormdemo/repositories/{OtusStudentRepositoryJpaTest.java => JpaOtusStudentRepositoryTest.java} (97%) rename 2024-03/spring-11-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/{CategoryRepositoryJpa.java => JpaCategoryRepository.java} (80%) rename 2024-03/spring-11-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/{EmployeeRepositoryJpa.java => JpaEmployeeRepository.java} (98%) rename 2024-03/spring-11-jpql/jpql-demo/src/test/java/ru/otus/example/jpql_demo/repositories/{CategoryRepositoryJpaTest.java => JpaCategoryRepositoryTest.java} (88%) rename 2024-03/spring-11-jpql/jpql-demo/src/test/java/ru/otus/example/jpql_demo/repositories/{EmployeeRepositoryJpaTest.java => JpaEmployeeRepositoryTest.java} (99%) diff --git a/2024-03/spring-11-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java b/2024-03/spring-11-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java similarity index 93% rename from 2024-03/spring-11-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java rename to 2024-03/spring-11-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java index b2789f0c..f279aa39 100644 --- a/2024-03/spring-11-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java +++ b/2024-03/spring-11-jpql/jpql-class-work/jpql-exercise/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java @@ -17,12 +17,12 @@ import java.util.Optional; // Поэтому, для упрощения, пока вешаем над классом репозитория @Transactional @Repository -public class OtusStudentRepositoryJpa implements OtusStudentRepository { +public class JpaOtusStudentRepository implements OtusStudentRepository { @PersistenceContext private final EntityManager em; - public OtusStudentRepositoryJpa(EntityManager em) { + public JpaOtusStudentRepository(EntityManager em) { this.em = em; } diff --git a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-02/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java b/2024-03/spring-11-jpql/jpql-class-work/jpql-exercise/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java similarity index 97% rename from 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-02/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java rename to 2024-03/spring-11-jpql/jpql-class-work/jpql-exercise/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java index 1762c14a..f41c7dd5 100644 --- a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-02/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java +++ b/2024-03/spring-11-jpql/jpql-class-work/jpql-exercise/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.assertThat; @DisplayName("Репозиторий на основе Jpa для работы со студентами ") @DataJpaTest -@Import(OtusStudentRepositoryJpa.class) -class OtusStudentRepositoryJpaTest { +@Import(JpaOtusStudentRepository.class) +class JpaOtusStudentRepositoryTest { private static final int EXPECTED_NUMBER_OF_STUDENTS = 10; private static final long FIRST_STUDENT_ID = 1L; @@ -35,7 +35,7 @@ class OtusStudentRepositoryJpaTest { private static final String STUDENT_NAME = "Вася"; @Autowired - private OtusStudentRepositoryJpa repositoryJpa; + private JpaOtusStudentRepository repositoryJpa; @Autowired private TestEntityManager em; diff --git a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java similarity index 93% rename from 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java rename to 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java index c9683ed7..8b8b767f 100644 --- a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java +++ b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-01/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java @@ -18,12 +18,12 @@ import java.util.Optional; // Поэтому, для упрощения, пока вешаем над классом репозитория @Transactional @Repository -public class OtusStudentRepositoryJpa implements OtusStudentRepository { +public class JpaOtusStudentRepository implements OtusStudentRepository { @PersistenceContext private final EntityManager em; - public OtusStudentRepositoryJpa(EntityManager em) { + public JpaOtusStudentRepository(EntityManager em) { this.em = em; } diff --git a/2024-03/spring-11-jpql/jpql-class-work/jpql-exercise/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-01/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java similarity index 97% rename from 2024-03/spring-11-jpql/jpql-class-work/jpql-exercise/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java rename to 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-01/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java index 1762c14a..f41c7dd5 100644 --- a/2024-03/spring-11-jpql/jpql-class-work/jpql-exercise/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java +++ b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-01/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.assertThat; @DisplayName("Репозиторий на основе Jpa для работы со студентами ") @DataJpaTest -@Import(OtusStudentRepositoryJpa.class) -class OtusStudentRepositoryJpaTest { +@Import(JpaOtusStudentRepository.class) +class JpaOtusStudentRepositoryTest { private static final int EXPECTED_NUMBER_OF_STUDENTS = 10; private static final long FIRST_STUDENT_ID = 1L; @@ -35,7 +35,7 @@ class OtusStudentRepositoryJpaTest { private static final String STUDENT_NAME = "Вася"; @Autowired - private OtusStudentRepositoryJpa repositoryJpa; + private JpaOtusStudentRepository repositoryJpa; @Autowired private TestEntityManager em; diff --git a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java similarity index 94% rename from 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java rename to 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java index 8c8802e8..182ed8c1 100644 --- a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java +++ b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-02/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java @@ -17,12 +17,12 @@ import java.util.Optional; // Поэтому, для упрощения, пока вешаем над классом репозитория @Transactional @Repository -public class OtusStudentRepositoryJpa implements OtusStudentRepository { +public class JpaOtusStudentRepository implements OtusStudentRepository { @PersistenceContext private final EntityManager em; - public OtusStudentRepositoryJpa(EntityManager em) { + public JpaOtusStudentRepository(EntityManager em) { this.em = em; } diff --git a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-01/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-02/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java similarity index 97% rename from 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-01/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java rename to 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-02/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java index 1762c14a..f41c7dd5 100644 --- a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-01/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java +++ b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-02/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.assertThat; @DisplayName("Репозиторий на основе Jpa для работы со студентами ") @DataJpaTest -@Import(OtusStudentRepositoryJpa.class) -class OtusStudentRepositoryJpaTest { +@Import(JpaOtusStudentRepository.class) +class JpaOtusStudentRepositoryTest { private static final int EXPECTED_NUMBER_OF_STUDENTS = 10; private static final long FIRST_STUDENT_ID = 1L; @@ -35,7 +35,7 @@ class OtusStudentRepositoryJpaTest { private static final String STUDENT_NAME = "Вася"; @Autowired - private OtusStudentRepositoryJpa repositoryJpa; + private JpaOtusStudentRepository repositoryJpa; @Autowired private TestEntityManager em; diff --git a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java similarity index 97% rename from 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java rename to 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java index d3a59e53..df02c2d9 100644 --- a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java +++ b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-03/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java @@ -18,7 +18,7 @@ import java.util.Optional; // Поэтому, для упрощения, пока вешаем над классом репозитория @Transactional @Repository -public class OtusStudentRepositoryJpa implements OtusStudentRepository { +public class JpaOtusStudentRepository implements OtusStudentRepository { @PersistenceContext private EntityManager em; diff --git a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-03/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-03/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java similarity index 97% rename from 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-03/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java rename to 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-03/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java index 719b8020..89482782 100644 --- a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-03/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java +++ b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-03/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.assertThat; @DisplayName("Репозиторий на основе Jpa для работы со студентами ") @DataJpaTest -@Import(OtusStudentRepositoryJpa.class) -class OtusStudentRepositoryJpaTest { +@Import(JpaOtusStudentRepository.class) +class JpaOtusStudentRepositoryTest { private static final int EXPECTED_NUMBER_OF_STUDENTS = 10; private static final long FIRST_STUDENT_ID = 1L; @@ -35,7 +35,7 @@ class OtusStudentRepositoryJpaTest { private static final String STUDENT_NAME = "Вася"; @Autowired - private OtusStudentRepositoryJpa repositoryJpa; + private JpaOtusStudentRepository repositoryJpa; @Autowired private TestEntityManager em; diff --git a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java similarity index 96% rename from 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java rename to 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java index dde15df0..868da17b 100644 --- a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java +++ b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-04/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java @@ -21,12 +21,12 @@ import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphTyp // Поэтому, для упрощения, пока вешаем над классом репозитория @Transactional @Repository -public class OtusStudentRepositoryJpa implements OtusStudentRepository { +public class JpaOtusStudentRepository implements OtusStudentRepository { @PersistenceContext private final EntityManager em; - public OtusStudentRepositoryJpa(EntityManager em) { + public JpaOtusStudentRepository(EntityManager em) { this.em = em; } diff --git a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-04/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-04/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java similarity index 95% rename from 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-04/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java rename to 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-04/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java index ef3e7e4e..c935924c 100644 --- a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-04/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java +++ b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-04/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java @@ -14,8 +14,8 @@ import static org.assertj.core.api.Assertions.assertThat; @DisplayName("Репозиторий на основе Jpa для работы со студентами ") @DataJpaTest -@Import(OtusStudentRepositoryJpa.class) -class OtusStudentRepositoryJpaTest { +@Import(JpaOtusStudentRepository.class) +class JpaOtusStudentRepositoryTest { private static final int EXPECTED_NUMBER_OF_STUDENTS = 10; private static final long FIRST_STUDENT_ID = 1L; @@ -23,7 +23,7 @@ class OtusStudentRepositoryJpaTest { private static final int EXPECTED_QUERIES_COUNT = 21; @Autowired - private OtusStudentRepositoryJpa repositoryJpa; + private JpaOtusStudentRepository repositoryJpa; @Autowired private TestEntityManager em; diff --git a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java similarity index 96% rename from 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java rename to 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java index 0c9b6b28..b76135a6 100644 --- a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java +++ b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java @@ -21,12 +21,12 @@ import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphTyp // Поэтому, для упрощения, пока вешаем над классом репозитория @Transactional @Repository -public class OtusStudentRepositoryJpa implements OtusStudentRepository { +public class JpaOtusStudentRepository implements OtusStudentRepository { @PersistenceContext private final EntityManager em; - public OtusStudentRepositoryJpa(EntityManager em) { + public JpaOtusStudentRepository(EntityManager em) { this.em = em; } diff --git a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-05/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-05/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java similarity index 95% rename from 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-05/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java rename to 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-05/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java index bf2a3dad..557be9da 100644 --- a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-05/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java +++ b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-05/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java @@ -14,8 +14,8 @@ import static org.assertj.core.api.Assertions.assertThat; @DisplayName("Репозиторий на основе Jpa для работы со студентами ") @DataJpaTest -@Import(OtusStudentRepositoryJpa.class) -class OtusStudentRepositoryJpaTest { +@Import(JpaOtusStudentRepository.class) +class JpaOtusStudentRepositoryTest { private static final int EXPECTED_NUMBER_OF_STUDENTS = 10; private static final long FIRST_STUDENT_ID = 1L; @@ -23,7 +23,7 @@ class OtusStudentRepositoryJpaTest { private static final int EXPECTED_QUERIES_COUNT = 11; @Autowired - private OtusStudentRepositoryJpa repositoryJpa; + private JpaOtusStudentRepository repositoryJpa; @Autowired private TestEntityManager em; diff --git a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java similarity index 96% rename from 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java rename to 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java index 0c9b6b28..b76135a6 100644 --- a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-05/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java +++ b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-06/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java @@ -21,12 +21,12 @@ import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphTyp // Поэтому, для упрощения, пока вешаем над классом репозитория @Transactional @Repository -public class OtusStudentRepositoryJpa implements OtusStudentRepository { +public class JpaOtusStudentRepository implements OtusStudentRepository { @PersistenceContext private final EntityManager em; - public OtusStudentRepositoryJpa(EntityManager em) { + public JpaOtusStudentRepository(EntityManager em) { this.em = em; } diff --git a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-06/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-06/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java similarity index 95% rename from 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-06/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java rename to 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-06/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java index d856de06..84ddb33b 100644 --- a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-06/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java +++ b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-06/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java @@ -14,8 +14,8 @@ import static org.assertj.core.api.Assertions.assertThat; @DisplayName("Репозиторий на основе Jpa для работы со студентами ") @DataJpaTest -@Import(OtusStudentRepositoryJpa.class) -class OtusStudentRepositoryJpaTest { +@Import(JpaOtusStudentRepository.class) +class JpaOtusStudentRepositoryTest { private static final int EXPECTED_NUMBER_OF_STUDENTS = 10; private static final long FIRST_STUDENT_ID = 1L; @@ -23,7 +23,7 @@ class OtusStudentRepositoryJpaTest { private static final int EXPECTED_QUERIES_COUNT = 2; @Autowired - private OtusStudentRepositoryJpa repositoryJpa; + private JpaOtusStudentRepository repositoryJpa; @Autowired private TestEntityManager em; diff --git a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java similarity index 96% rename from 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java rename to 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java index bc5a680b..d2ab60e1 100644 --- a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpa.java +++ b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-final/src/main/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepository.java @@ -21,12 +21,12 @@ import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphTyp // Поэтому, для упрощения, пока вешаем над классом репозитория @Transactional @Repository -public class OtusStudentRepositoryJpa implements OtusStudentRepository { +public class JpaOtusStudentRepository implements OtusStudentRepository { @PersistenceContext private final EntityManager em; - public OtusStudentRepositoryJpa(EntityManager em) { + public JpaOtusStudentRepository(EntityManager em) { this.em = em; } diff --git a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-final/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-final/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java similarity index 97% rename from 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-final/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java rename to 2024-03/spring-11-jpql/jpql-class-work/jpql-solution-final/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java index d1a62bd2..8532f7fe 100644 --- a/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-final/src/test/java/ru/otus/example/ormdemo/repositories/OtusStudentRepositoryJpaTest.java +++ b/2024-03/spring-11-jpql/jpql-class-work/jpql-solution-final/src/test/java/ru/otus/example/ormdemo/repositories/JpaOtusStudentRepositoryTest.java @@ -21,8 +21,8 @@ import static org.assertj.core.api.Assertions.assertThat; @DisplayName("Репозиторий на основе Jpa для работы со студентами ") @DataJpaTest -@Import(OtusStudentRepositoryJpa.class) -class OtusStudentRepositoryJpaTest { +@Import(JpaOtusStudentRepository.class) +class JpaOtusStudentRepositoryTest { private static final int EXPECTED_NUMBER_OF_STUDENTS = 10; private static final long FIRST_STUDENT_ID = 1L; @@ -30,7 +30,7 @@ class OtusStudentRepositoryJpaTest { private static final int EXPECTED_QUERIES_COUNT = 3; @Autowired - private OtusStudentRepositoryJpa repositoryJpa; + private JpaOtusStudentRepository repositoryJpa; @Autowired private TestEntityManager em; diff --git a/2024-03/spring-11-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/CategoryRepositoryJpa.java b/2024-03/spring-11-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/JpaCategoryRepository.java similarity index 80% rename from 2024-03/spring-11-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/CategoryRepositoryJpa.java rename to 2024-03/spring-11-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/JpaCategoryRepository.java index 345f9076..5f2b8d21 100644 --- a/2024-03/spring-11-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/CategoryRepositoryJpa.java +++ b/2024-03/spring-11-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/JpaCategoryRepository.java @@ -6,12 +6,12 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; import java.util.List; -public class CategoryRepositoryJpa implements CategoryRepository { +public class JpaCategoryRepository implements CategoryRepository { @PersistenceContext private final EntityManager em; - public CategoryRepositoryJpa(EntityManager em) { + public JpaCategoryRepository(EntityManager em) { this.em = em; } diff --git a/2024-03/spring-11-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/EmployeeRepositoryJpa.java b/2024-03/spring-11-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/JpaEmployeeRepository.java similarity index 98% rename from 2024-03/spring-11-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/EmployeeRepositoryJpa.java rename to 2024-03/spring-11-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/JpaEmployeeRepository.java index 9a2aa05b..918024a3 100644 --- a/2024-03/spring-11-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/EmployeeRepositoryJpa.java +++ b/2024-03/spring-11-jpql/jpql-demo/src/main/java/ru/otus/example/jpql_demo/repositories/JpaEmployeeRepository.java @@ -15,12 +15,12 @@ import java.util.List; import java.util.Optional; @Repository -public class EmployeeRepositoryJpa implements EmployeeRepository { +public class JpaEmployeeRepository implements EmployeeRepository { @PersistenceContext private final EntityManager em; - public EmployeeRepositoryJpa(EntityManager em) { + public JpaEmployeeRepository(EntityManager em) { this.em = em; } diff --git a/2024-03/spring-11-jpql/jpql-demo/src/test/java/ru/otus/example/jpql_demo/repositories/CategoryRepositoryJpaTest.java b/2024-03/spring-11-jpql/jpql-demo/src/test/java/ru/otus/example/jpql_demo/repositories/JpaCategoryRepositoryTest.java similarity index 88% rename from 2024-03/spring-11-jpql/jpql-demo/src/test/java/ru/otus/example/jpql_demo/repositories/CategoryRepositoryJpaTest.java rename to 2024-03/spring-11-jpql/jpql-demo/src/test/java/ru/otus/example/jpql_demo/repositories/JpaCategoryRepositoryTest.java index d05ab11a..7b1f6b27 100644 --- a/2024-03/spring-11-jpql/jpql-demo/src/test/java/ru/otus/example/jpql_demo/repositories/CategoryRepositoryJpaTest.java +++ b/2024-03/spring-11-jpql/jpql-demo/src/test/java/ru/otus/example/jpql_demo/repositories/JpaCategoryRepositoryTest.java @@ -17,12 +17,12 @@ import static org.springframework.util.StringUtils.hasLength; @DisplayName("Репозиторий для Category должен") @DataJpaTest -@Import(CategoryRepositoryJpa.class) +@Import(JpaCategoryRepository.class) @Transactional(propagation = Propagation.NEVER) -class CategoryRepositoryJpaTest { +class JpaCategoryRepositoryTest { @Autowired - private CategoryRepositoryJpa categoryRepository; + private JpaCategoryRepository categoryRepository; @DisplayName("возвращать список всех категорий") @Test diff --git a/2024-03/spring-11-jpql/jpql-demo/src/test/java/ru/otus/example/jpql_demo/repositories/EmployeeRepositoryJpaTest.java b/2024-03/spring-11-jpql/jpql-demo/src/test/java/ru/otus/example/jpql_demo/repositories/JpaEmployeeRepositoryTest.java similarity index 99% rename from 2024-03/spring-11-jpql/jpql-demo/src/test/java/ru/otus/example/jpql_demo/repositories/EmployeeRepositoryJpaTest.java rename to 2024-03/spring-11-jpql/jpql-demo/src/test/java/ru/otus/example/jpql_demo/repositories/JpaEmployeeRepositoryTest.java index 9a5f9750..335b285b 100644 --- a/2024-03/spring-11-jpql/jpql-demo/src/test/java/ru/otus/example/jpql_demo/repositories/EmployeeRepositoryJpaTest.java +++ b/2024-03/spring-11-jpql/jpql-demo/src/test/java/ru/otus/example/jpql_demo/repositories/JpaEmployeeRepositoryTest.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.*; @DisplayName("Репозиторий Employee должен") @DataJpaTest -@Import(EmployeeRepositoryJpa.class) -class EmployeeRepositoryJpaTest { +@Import(JpaEmployeeRepository.class) +class JpaEmployeeRepositoryTest { private static final long FIRST_EMPLOYEE_ID = 1L; private static final long SECOND_EMPLOYEE_ID = 2L; @@ -51,7 +51,7 @@ class EmployeeRepositoryJpaTest { private TestEntityManager em; @Autowired - private EmployeeRepositoryJpa employeeRepository; + private JpaEmployeeRepository employeeRepository; @DisplayName("возвращать список всех сотрудников")