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 7c1f207e8a2916e1587401450b99d15a9426d8f4..f81f304a13f9b6fdd213c198f70f321ceda1b58a 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 256f34d1bd7f0bd4fd93830f5df83f7b87913599..be4dbeafbba2278d4e5710811107eaa47b63378c 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 afeeed913d1600c749848b67bd5a375a6cca6e91..80a0e5aeb73b1a85726b8c30ff7d6ebc1e2e05eb 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 a1145e4ed72c25aded631cea948a7018d7e7496c..0d38c1349533511c32c3970134be86133def2e92 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 cdc081d946ceccc123467ad14c7b7909adca94d0..b35cd0dcf400c997efd45e45113c43706c004331 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);