From fa896fbf35d08979b52b577df3e03c3076d43d1b Mon Sep 17 00:00:00 2001
From: dnokov <dnokov1997@gmail.com>
Date: Thu, 23 Nov 2023 00:13:18 +0200
Subject: [PATCH] Sync-ing naming of findSpecialtiesByName method across
repo/service layers
---
.../samples/petclinic/repository/SpecialtyRepository.java | 2 +-
.../petclinic/repository/jdbc/JdbcSpecialtyRepositoryImpl.java | 3 +--
.../petclinic/repository/jpa/JpaSpecialtyRepositoryImpl.java | 2 +-
.../samples/petclinic/service/ClinicServiceImpl.java | 2 +-
.../service/clinicService/AbstractClinicServiceTests.java | 3 ++-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/SpecialtyRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/SpecialtyRepository.java
index 7c1f207e..f81f304a 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/SpecialtyRepository.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/SpecialtyRepository.java
@@ -32,7 +32,7 @@ public interface SpecialtyRepository {
Specialty findById(int id) throws DataAccessException;
- List<Specialty> findByNameIn(Set<String> names);
+ List<Specialty> findSpecialtiesByName(Set<String> names);
Collection<Specialty> findAll() throws DataAccessException;
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcSpecialtyRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcSpecialtyRepositoryImpl.java
index 256f34d1..be4dbeaf 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcSpecialtyRepositoryImpl.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcSpecialtyRepositoryImpl.java
@@ -20,7 +20,6 @@ import java.util.*;
import javax.sql.DataSource;
-import io.micrometer.core.instrument.binder.db.MetricsDSLContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Profile;
import org.springframework.dao.DataAccessException;
@@ -72,7 +71,7 @@ public class JdbcSpecialtyRepositoryImpl implements SpecialtyRepository {
}
@Override
- public List<Specialty> findByNameIn(Set<String> names) {
+ public List<Specialty> findSpecialtiesByName(Set<String> names) {
List<Specialty> specialties;
try{
String sql = "SELECT id, name FROM specialties WHERE specialties.name IN (:names)";
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaSpecialtyRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaSpecialtyRepositoryImpl.java
index afeeed91..80a0e5ae 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaSpecialtyRepositoryImpl.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaSpecialtyRepositoryImpl.java
@@ -47,7 +47,7 @@ public class JpaSpecialtyRepositoryImpl implements SpecialtyRepository {
}
@Override
- public List<Specialty> findByNameIn(Set<String> names) {
+ public List<Specialty> findSpecialtiesByName(Set<String> names) {
final String jpql = "SELECT s FROM Specialty s WHERE s.name IN :names";
return em.createQuery(jpql, Specialty.class)
.setParameter("names", names)
diff --git a/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java b/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java
index a1145e4e..0d38c134 100644
--- a/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java
+++ b/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java
@@ -289,7 +289,7 @@ public class ClinicServiceImpl implements ClinicService {
public List<Specialty> findSpecialtiesByName(Set<String> names){
List<Specialty> specialties = new ArrayList<>();
try {
- specialties = specialtyRepository.findByNameIn(names);
+ specialties = specialtyRepository.findSpecialtiesByName(names);
} catch (ObjectRetrievalFailureException|EmptyResultDataAccessException e) {
// just ignore not found exceptions for Jdbc/Jpa realization
return specialties;
diff --git a/src/test/java/org/springframework/samples/petclinic/service/clinicService/AbstractClinicServiceTests.java b/src/test/java/org/springframework/samples/petclinic/service/clinicService/AbstractClinicServiceTests.java
index cdc081d9..b35cd0dc 100644
--- a/src/test/java/org/springframework/samples/petclinic/service/clinicService/AbstractClinicServiceTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/service/clinicService/AbstractClinicServiceTests.java
@@ -475,7 +475,7 @@ abstract class AbstractClinicServiceTests {
@Test
@Transactional
- void shouldFindSpecialtyByName() {
+ void shouldFindSpecialtiesByName() {
Specialty specialty1 = new Specialty();
specialty1.setName("radiology");
specialty1.setId(1);
@@ -501,6 +501,7 @@ abstract class AbstractClinicServiceTests {
}
@Test
+ @Transactional
void shouldFindPetTypeByName(){
PetType petType = this.clinicService.findPetTypeByName("cat");
assertThat(petType.getId()).isEqualTo(1);
--
GitLab