findAll() throws DataAccessException {
- return this.em.createQuery("SELECT vet FROM Vet vet").getResultList();
- }
-
- @Override
- public void save(Vet vet) throws DataAccessException {
- if (vet.getId() == null) {
- this.em.persist(vet);
- } else {
- this.em.merge(vet);
- }
- }
-
- @Override
- public void delete(Vet vet) throws DataAccessException {
- this.em.remove(this.em.contains(vet) ? vet : this.em.merge(vet));
- }
-
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java
deleted file mode 100644
index 79d03258..00000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2002-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.jpa;
-
-import java.util.Collection;
-import java.util.List;
-
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
-import jakarta.persistence.Query;
-
-import org.springframework.context.annotation.Profile;
-import org.springframework.dao.DataAccessException;
-import org.springframework.samples.petclinic.model.Visit;
-import org.springframework.samples.petclinic.repository.VisitRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * JPA implementation of the ClinicService interface using EntityManager.
- *
- * The mappings are defined in "orm.xml" located in the META-INF directory.
- *
- * @author Mike Keith
- * @author Rod Johnson
- * @author Sam Brannen
- * @author Michael Isvy
- * @author Vitaliy Fedoriv
- */
-@Repository
-@Profile("jpa")
-public class JpaVisitRepositoryImpl implements VisitRepository {
-
- @PersistenceContext
- private EntityManager em;
-
-
- @Override
- public void save(Visit visit) {
- if (visit.getId() == null) {
- this.em.persist(visit);
- } else {
- this.em.merge(visit);
- }
- }
-
-
- @Override
- @SuppressWarnings("unchecked")
- public List findByPetId(Integer petId) {
- Query query = this.em.createQuery("SELECT v FROM Visit v where v.pet.id= :id");
- query.setParameter("id", petId);
- return query.getResultList();
- }
-
- @Override
- public Visit findById(int id) throws DataAccessException {
- return this.em.find(Visit.class, id);
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public Collection findAll() throws DataAccessException {
- return this.em.createQuery("SELECT v FROM Visit v").getResultList();
- }
-
- @Override
- public void delete(Visit visit) throws DataAccessException {
- this.em.remove(this.em.contains(visit) ? visit : this.em.merge(visit));
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jpa/package-info.java b/src/main/java/org/springframework/samples/petclinic/repository/jpa/package-info.java
deleted file mode 100644
index 04fd89ba..00000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/jpa/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * The classes in this package represent the JPA implementation
- * of PetClinic's persistence layer.
- */
-package org.springframework.samples.petclinic.repository.jpa;
-
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/PetRepositoryOverride.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/PetRepositoryOverride.java
deleted file mode 100644
index 78c02b00..00000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/PetRepositoryOverride.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2016-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import org.springframework.context.annotation.Profile;
-import org.springframework.samples.petclinic.model.Pet;
-
-/**
- * @author Vitaliy Fedoriv
- *
- */
-
-@Profile("spring-data-jpa")
-public interface PetRepositoryOverride {
-
- void delete(Pet pet);
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/PetTypeRepositoryOverride.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/PetTypeRepositoryOverride.java
deleted file mode 100644
index a3b19e90..00000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/PetTypeRepositoryOverride.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2016-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import org.springframework.context.annotation.Profile;
-import org.springframework.samples.petclinic.model.PetType;
-
-/**
- * @author Vitaliy Fedoriv
- *
- */
-
-@Profile("spring-data-jpa")
-public interface PetTypeRepositoryOverride {
-
- void delete(PetType petType);
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpecialtyRepositoryOverride.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpecialtyRepositoryOverride.java
deleted file mode 100644
index 656d8efe..00000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpecialtyRepositoryOverride.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2016-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import org.springframework.context.annotation.Profile;
-import org.springframework.samples.petclinic.model.Specialty;
-
-/**
- * @author Vitaliy Fedoriv
- *
- */
-
-@Profile("spring-data-jpa")
-public interface SpecialtyRepositoryOverride {
-
- void delete(Specialty specialty);
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java
deleted file mode 100644
index 78c0093b..00000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import java.util.Collection;
-
-import org.springframework.context.annotation.Profile;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.samples.petclinic.model.Owner;
-import org.springframework.samples.petclinic.repository.OwnerRepository;
-
-/**
- * Spring Data JPA specialization of the {@link OwnerRepository} interface
- *
- * @author Michael Isvy
- * @since 15.1.2013
- */
-
-@Profile("spring-data-jpa")
-public interface SpringDataOwnerRepository extends OwnerRepository, Repository {
-
- @Override
- @Query("SELECT DISTINCT owner FROM Owner owner left join fetch owner.pets WHERE owner.lastName LIKE :lastName%")
- Collection findByLastName(@Param("lastName") String lastName);
-
- @Override
- @Query("SELECT owner FROM Owner owner left join fetch owner.pets WHERE owner.id =:id")
- Owner findById(@Param("id") int id);
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetRepository.java
deleted file mode 100644
index 501d3981..00000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetRepository.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2002-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import java.util.List;
-
-import org.springframework.context.annotation.Profile;
-import org.springframework.dao.DataAccessException;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.Repository;
-import org.springframework.samples.petclinic.model.Pet;
-import org.springframework.samples.petclinic.model.PetType;
-import org.springframework.samples.petclinic.repository.PetRepository;
-
-/**
- * Spring Data JPA specialization of the {@link PetRepository} interface
- *
- * @author Michael Isvy
- * @author Vitaliy Fedoriv
- */
-
-@Profile("spring-data-jpa")
-public interface SpringDataPetRepository extends PetRepository, Repository, PetRepositoryOverride {
-
- @Override
- @Query("SELECT ptype FROM PetType ptype ORDER BY ptype.name")
- List findPetTypes() throws DataAccessException;
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetRepositoryImpl.java
deleted file mode 100644
index 42995052..00000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetRepositoryImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2016-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
-
-import org.springframework.context.annotation.Profile;
-import org.springframework.samples.petclinic.model.Pet;
-
-/**
- * @author Vitaliy Fedoriv
- *
- */
-
-@Profile("spring-data-jpa")
-public class SpringDataPetRepositoryImpl implements PetRepositoryOverride {
-
- @PersistenceContext
- private EntityManager em;
-
- @Override
- public void delete(Pet pet) {
- String petId = pet.getId().toString();
- this.em.createQuery("DELETE FROM Visit visit WHERE pet.id=" + petId).executeUpdate();
- this.em.createQuery("DELETE FROM Pet pet WHERE id=" + petId).executeUpdate();
- if (em.contains(pet)) {
- em.remove(pet);
- }
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetTypeRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetTypeRepository.java
deleted file mode 100644
index 18a69796..00000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetTypeRepository.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2016-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import org.springframework.context.annotation.Profile;
-import org.springframework.data.repository.Repository;
-import org.springframework.samples.petclinic.model.PetType;
-import org.springframework.samples.petclinic.repository.PetTypeRepository;
-
-/**
- * @author Vitaliy Fedoriv
- *
- */
-
-@Profile("spring-data-jpa")
-public interface SpringDataPetTypeRepository extends PetTypeRepository, Repository, PetTypeRepositoryOverride {
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetTypeRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetTypeRepositoryImpl.java
deleted file mode 100644
index 5350c4eb..00000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetTypeRepositoryImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2016-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import org.springframework.context.annotation.Profile;
-import org.springframework.samples.petclinic.model.Pet;
-import org.springframework.samples.petclinic.model.PetType;
-import org.springframework.samples.petclinic.model.Visit;
-
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
-import java.util.List;
-
-/**
- * @author Vitaliy Fedoriv
- *
- */
-
-@Profile("spring-data-jpa")
-public class SpringDataPetTypeRepositoryImpl implements PetTypeRepositoryOverride {
-
- @PersistenceContext
- private EntityManager em;
-
- @SuppressWarnings("unchecked")
- @Override
- public void delete(PetType petType) {
- this.em.remove(this.em.contains(petType) ? petType : this.em.merge(petType));
- Integer petTypeId = petType.getId();
-
- List pets = this.em.createQuery("SELECT pet FROM Pet pet WHERE type.id=" + petTypeId).getResultList();
- for (Pet pet : pets){
- List visits = pet.getVisits();
- for (Visit visit : visits){
- this.em.createQuery("DELETE FROM Visit visit WHERE id=" + visit.getId()).executeUpdate();
- }
- this.em.createQuery("DELETE FROM Pet pet WHERE id=" + pet.getId()).executeUpdate();
- }
- this.em.createQuery("DELETE FROM PetType pettype WHERE id=" + petTypeId).executeUpdate();
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataSpecialtyRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataSpecialtyRepository.java
deleted file mode 100644
index 5ec7364b..00000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataSpecialtyRepository.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2016-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import org.springframework.context.annotation.Profile;
-import org.springframework.data.repository.Repository;
-import org.springframework.samples.petclinic.model.Specialty;
-import org.springframework.samples.petclinic.repository.SpecialtyRepository;
-
-
-/**
- * @author Vitaliy Fedoriv
- *
- */
-
-@Profile("spring-data-jpa")
-public interface SpringDataSpecialtyRepository extends SpecialtyRepository, Repository, SpecialtyRepositoryOverride {
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataSpecialtyRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataSpecialtyRepositoryImpl.java
deleted file mode 100644
index 940625f7..00000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataSpecialtyRepositoryImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2016-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
-
-import org.springframework.context.annotation.Profile;
-import org.springframework.samples.petclinic.model.Specialty;
-
-/**
- * @author Vitaliy Fedoriv
- *
- */
-
-@Profile("spring-data-jpa")
-public class SpringDataSpecialtyRepositoryImpl implements SpecialtyRepositoryOverride {
-
- @PersistenceContext
- private EntityManager em;
-
- @Override
- public void delete(Specialty specialty) {
- this.em.remove(this.em.contains(specialty) ? specialty : this.em.merge(specialty));
- Integer specId = specialty.getId();
- this.em.createNativeQuery("DELETE FROM vet_specialties WHERE specialty_id=" + specId).executeUpdate();
- this.em.createQuery("DELETE FROM Specialty specialty WHERE id=" + specId).executeUpdate();
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataUserRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataUserRepository.java
deleted file mode 100644
index 4219df45..00000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataUserRepository.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import org.springframework.context.annotation.Profile;
-import org.springframework.data.repository.Repository;
-import org.springframework.samples.petclinic.model.User;
-import org.springframework.samples.petclinic.repository.UserRepository;
-
-@Profile("spring-data-jpa")
-public interface SpringDataUserRepository extends UserRepository, Repository {
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVetRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVetRepository.java
deleted file mode 100644
index c52e440b..00000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVetRepository.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import org.springframework.context.annotation.Profile;
-import org.springframework.data.repository.Repository;
-import org.springframework.samples.petclinic.model.Vet;
-import org.springframework.samples.petclinic.repository.VetRepository;
-
-/**
- * Spring Data JPA specialization of the {@link VetRepository} interface
- *
- * @author Michael Isvy
- * @since 15.1.2013
- */
-
-@Profile("spring-data-jpa")
-public interface SpringDataVetRepository extends VetRepository, Repository {
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVisitRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVisitRepository.java
deleted file mode 100644
index 1b3c6c3f..00000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVisitRepository.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2002-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import org.springframework.context.annotation.Profile;
-import org.springframework.data.repository.Repository;
-import org.springframework.samples.petclinic.model.Visit;
-import org.springframework.samples.petclinic.repository.VisitRepository;
-
-/**
- * Spring Data JPA specialization of the {@link VisitRepository} interface
- *
- * @author Michael Isvy
- * @author Vitaliy Fedoriv
- */
-
-@Profile("spring-data-jpa")
-public interface SpringDataVisitRepository extends VisitRepository, Repository, VisitRepositoryOverride {
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVisitRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVisitRepositoryImpl.java
deleted file mode 100644
index 4c2fcc09..00000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVisitRepositoryImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2016-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
-
-import org.springframework.context.annotation.Profile;
-import org.springframework.dao.DataAccessException;
-import org.springframework.samples.petclinic.model.Visit;
-
-/**
- * @author Vitaliy Fedoriv
- *
- */
-
-@Profile("spring-data-jpa")
-public class SpringDataVisitRepositoryImpl implements VisitRepositoryOverride {
-
- @PersistenceContext
- private EntityManager em;
-
- @Override
- public void delete(Visit visit) throws DataAccessException {
- String visitId = visit.getId().toString();
- this.em.createQuery("DELETE FROM Visit visit WHERE id=" + visitId).executeUpdate();
- if (em.contains(visit)) {
- em.remove(visit);
- }
- }
-
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/VisitRepositoryOverride.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/VisitRepositoryOverride.java
deleted file mode 100644
index 7a622f3e..00000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/VisitRepositoryOverride.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2016-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import org.springframework.context.annotation.Profile;
-import org.springframework.samples.petclinic.model.Visit;
-
-/**
- * @author Vitaliy Fedoriv
- *
- */
-
-@Profile("spring-data-jpa")
-public interface VisitRepositoryOverride {
-
- void delete(Visit visit);
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/rest/advice/ExceptionControllerAdvice.java b/src/main/java/org/springframework/samples/petclinic/rest/advice/ExceptionControllerAdvice.java
deleted file mode 100644
index a49745d0..00000000
--- a/src/main/java/org/springframework/samples/petclinic/rest/advice/ExceptionControllerAdvice.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.rest.advice;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.samples.petclinic.rest.controller.BindingErrorsResponse;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.context.request.WebRequest;
-
-import static org.springframework.http.HttpStatus.BAD_REQUEST;
-
-/**
- * @author Vitaliy Fedoriv
- */
-
-@ControllerAdvice
-public class ExceptionControllerAdvice {
-
- @ExceptionHandler(Exception.class)
- public ResponseEntity exception(Exception e) {
- ObjectMapper mapper = new ObjectMapper();
- ErrorInfo errorInfo = new ErrorInfo(e);
- String respJSONstring = "{}";
- try {
- respJSONstring = mapper.writeValueAsString(errorInfo);
- } catch (JsonProcessingException e1) {
- e1.printStackTrace();
- }
- return ResponseEntity.badRequest().body(respJSONstring);
- }
-
- /**
- * Handles exception thrown by Bean Validation on controller methods parameters
- *
- * @param ex The thrown exception
- * @param request the current web request
- * @return an empty response entity
- */
- @ExceptionHandler(MethodArgumentNotValidException.class)
- @ResponseStatus(code = BAD_REQUEST)
- @ResponseBody
- public ResponseEntity handleMethodArgumentNotValidException(MethodArgumentNotValidException ex, WebRequest request) {
- BindingErrorsResponse errors = new BindingErrorsResponse();
- BindingResult bindingResult = ex.getBindingResult();
- HttpHeaders headers = new HttpHeaders();
- if (bindingResult.hasErrors()) {
- errors.addAllErrors(bindingResult);
- headers.add("errors", errors.toJSON());
- }
- return new ResponseEntity<>(headers, HttpStatus.BAD_REQUEST);
- }
-
- private class ErrorInfo {
- public final String className;
- public final String exMessage;
-
- public ErrorInfo(Exception ex) {
- this.className = ex.getClass().getName();
- this.exMessage = ex.getLocalizedMessage();
- }
- }
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/rest/controller/BindingErrorsResponse.java b/src/main/java/org/springframework/samples/petclinic/rest/controller/BindingErrorsResponse.java
deleted file mode 100644
index 0c772847..00000000
--- a/src/main/java/org/springframework/samples/petclinic/rest/controller/BindingErrorsResponse.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.rest.controller;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.FieldError;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-/**
- * @author Vitaliy Fedoriv
- *
- */
-
-public class BindingErrorsResponse {
-
- public BindingErrorsResponse() {
- this(null);
- }
-
- public BindingErrorsResponse(Integer id) {
- this(null, id);
- }
-
- public BindingErrorsResponse(Integer pathId, Integer bodyId) {
- boolean onlyBodyIdSpecified = pathId == null && bodyId != null;
- if (onlyBodyIdSpecified) {
- addBodyIdError(bodyId, "must not be specified");
- }
- boolean bothIdsSpecified = pathId != null && bodyId != null;
- if (bothIdsSpecified && !pathId.equals(bodyId)) {
- addBodyIdError(bodyId, String.format("does not match pathId: %d", pathId));
- }
- }
-
- private void addBodyIdError(Integer bodyId, String message) {
- BindingError error = new BindingError();
- error.setObjectName("body");
- error.setFieldName("id");
- error.setFieldValue(bodyId.toString());
- error.setErrorMessage(message);
- addError(error);
- }
-
- private final List bindingErrors = new ArrayList();
-
- public void addError(BindingError bindingError) {
- this.bindingErrors.add(bindingError);
- }
-
- public void addAllErrors(BindingResult bindingResult) {
- for (FieldError fieldError : bindingResult.getFieldErrors()) {
- BindingError error = new BindingError();
- error.setObjectName(fieldError.getObjectName());
- error.setFieldName(fieldError.getField());
- error.setFieldValue(String.valueOf(fieldError.getRejectedValue()));
- error.setErrorMessage(fieldError.getDefaultMessage());
- addError(error);
- }
- }
-
- public String toJSON() {
- ObjectMapper mapper = new ObjectMapper();
- mapper.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
- String errorsAsJSON = "";
- try {
- errorsAsJSON = mapper.writeValueAsString(bindingErrors);
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- }
- return errorsAsJSON;
- }
-
- @Override
- public String toString() {
- return "BindingErrorsResponse [bindingErrors=" + bindingErrors + "]";
- }
-
- protected static class BindingError {
-
- private String objectName;
- private String fieldName;
- private String fieldValue;
- private String errorMessage;
-
- public BindingError() {
- this.objectName = "";
- this.fieldName = "";
- this.fieldValue = "";
- this.errorMessage = "";
- }
-
- protected void setObjectName(String objectName) {
- this.objectName = objectName;
- }
-
- protected void setFieldName(String fieldName) {
- this.fieldName = fieldName;
- }
-
- protected void setFieldValue(String fieldValue) {
- this.fieldValue = fieldValue;
- }
-
- protected void setErrorMessage(String error_message) {
- this.errorMessage = error_message;
- }
-
- @Override
- public String toString() {
- return "BindingError [objectName=" + objectName + ", fieldName=" + fieldName + ", fieldValue=" + fieldValue
- + ", errorMessage=" + errorMessage + "]";
- }
-
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/rest/controller/OwnerRestController.java b/src/main/java/org/springframework/samples/petclinic/rest/controller/OwnerRestController.java
deleted file mode 100644
index cb2d0bad..00000000
--- a/src/main/java/org/springframework/samples/petclinic/rest/controller/OwnerRestController.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright 2016-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.rest.controller;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.samples.petclinic.mapper.OwnerMapper;
-import org.springframework.samples.petclinic.mapper.PetMapper;
-import org.springframework.samples.petclinic.mapper.VisitMapper;
-import org.springframework.samples.petclinic.model.Owner;
-import org.springframework.samples.petclinic.model.Pet;
-import org.springframework.samples.petclinic.model.PetType;
-import org.springframework.samples.petclinic.model.Visit;
-import org.springframework.samples.petclinic.rest.api.OwnersApi;
-import org.springframework.samples.petclinic.rest.dto.*;
-import org.springframework.samples.petclinic.service.ClinicService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import jakarta.transaction.Transactional;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author Vitaliy Fedoriv
- */
-
-@RestController
-@CrossOrigin(exposedHeaders = "errors, content-type")
-@RequestMapping("/api")
-public class OwnerRestController implements OwnersApi {
-
- private final ClinicService clinicService;
-
- private final OwnerMapper ownerMapper;
-
- private final PetMapper petMapper;
-
- private final VisitMapper visitMapper;
-
- public OwnerRestController(ClinicService clinicService,
- OwnerMapper ownerMapper,
- PetMapper petMapper,
- VisitMapper visitMapper) {
- this.clinicService = clinicService;
- this.ownerMapper = ownerMapper;
- this.petMapper = petMapper;
- this.visitMapper = visitMapper;
- }
-
- @PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
- @Override
- public ResponseEntity> listOwners(String lastName) {
- Collection owners;
- if (lastName != null) {
- owners = this.clinicService.findOwnerByLastName(lastName);
- } else {
- owners = this.clinicService.findAllOwners();
- }
- if (owners.isEmpty()) {
- return new ResponseEntity<>(HttpStatus.NOT_FOUND);
- }
- return new ResponseEntity<>(ownerMapper.toOwnerDtoCollection(owners), HttpStatus.OK);
- }
-
- @PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
- @Override
- public ResponseEntity getOwner(Integer ownerId) {
- Owner owner = this.clinicService.findOwnerById(ownerId);
- if (owner == null) {
- return new ResponseEntity<>(HttpStatus.NOT_FOUND);
- }
- return new ResponseEntity<>(ownerMapper.toOwnerDto(owner), HttpStatus.OK);
- }
-
- @PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
- @Override
- public ResponseEntity addOwner(OwnerFieldsDto ownerFieldsDto) {
- HttpHeaders headers = new HttpHeaders();
- Owner owner = ownerMapper.toOwner(ownerFieldsDto);
- this.clinicService.saveOwner(owner);
- OwnerDto ownerDto = ownerMapper.toOwnerDto(owner);
- headers.setLocation(UriComponentsBuilder.newInstance()
- .path("/api/owners/{id}").buildAndExpand(owner.getId()).toUri());
- return new ResponseEntity<>(ownerDto, headers, HttpStatus.CREATED);
- }
-
- @PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
- @Override
- public ResponseEntity updateOwner(Integer ownerId, OwnerFieldsDto ownerFieldsDto) {
- Owner currentOwner = this.clinicService.findOwnerById(ownerId);
- if (currentOwner == null) {
- return new ResponseEntity<>(HttpStatus.NOT_FOUND);
- }
- currentOwner.setAddress(ownerFieldsDto.getAddress());
- currentOwner.setCity(ownerFieldsDto.getCity());
- currentOwner.setFirstName(ownerFieldsDto.getFirstName());
- currentOwner.setLastName(ownerFieldsDto.getLastName());
- currentOwner.setTelephone(ownerFieldsDto.getTelephone());
- this.clinicService.saveOwner(currentOwner);
- return new ResponseEntity<>(ownerMapper.toOwnerDto(currentOwner), HttpStatus.NO_CONTENT);
- }
-
- @PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
- @Transactional
- @Override
- public ResponseEntity deleteOwner(Integer ownerId) {
- Owner owner = this.clinicService.findOwnerById(ownerId);
- if (owner == null) {
- return new ResponseEntity<>(HttpStatus.NOT_FOUND);
- }
- this.clinicService.deleteOwner(owner);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- }
-
- @PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
- @Override
- public ResponseEntity addPetToOwner(Integer ownerId, PetFieldsDto petFieldsDto) {
- HttpHeaders headers = new HttpHeaders();
- Pet pet = petMapper.toPet(petFieldsDto);
- Owner owner = new Owner();
- owner.setId(ownerId);
- pet.setOwner(owner);
- PetType petType = this.clinicService.findPetTypeByName(pet.getType().getName());
- pet.setType(petType);
- this.clinicService.savePet(pet);
- PetDto petDto = petMapper.toPetDto(pet);
- headers.setLocation(UriComponentsBuilder.newInstance().path("/api/pets/{id}")
- .buildAndExpand(pet.getId()).toUri());
- return new ResponseEntity<>(petDto, headers, HttpStatus.CREATED);
- }
-
- @PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
- @Override
- public ResponseEntity addVisitToOwner(Integer ownerId, Integer petId, VisitFieldsDto visitFieldsDto) {
- HttpHeaders headers = new HttpHeaders();
- Visit visit = visitMapper.toVisit(visitFieldsDto);
- Pet pet = new Pet();
- pet.setId(petId);
- visit.setPet(pet);
- this.clinicService.saveVisit(visit);
- VisitDto visitDto = visitMapper.toVisitDto(visit);
- headers.setLocation(UriComponentsBuilder.newInstance().path("/api/visits/{id}")
- .buildAndExpand(visit.getId()).toUri());
- return new ResponseEntity<>(visitDto, headers, HttpStatus.CREATED);
- }
-
-
- @PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
- @Override
- public ResponseEntity getOwnersPet(Integer ownerId, Integer petId) {
- Owner owner = this.clinicService.findOwnerById(ownerId);
- Pet pet = this.clinicService.findPetById(petId);
- if (owner == null || pet == null) {
- return new ResponseEntity<>(HttpStatus.NOT_FOUND);
- } else {
- if (!pet.getOwner().equals(owner)) {
- return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
- } else {
- return new ResponseEntity<>(petMapper.toPetDto(pet), HttpStatus.OK);
- }
- }
- }
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/rest/controller/PetRestController.java b/src/main/java/org/springframework/samples/petclinic/rest/controller/PetRestController.java
deleted file mode 100644
index c249d3aa..00000000
--- a/src/main/java/org/springframework/samples/petclinic/rest/controller/PetRestController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2016-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.rest.controller;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.samples.petclinic.mapper.PetMapper;
-import org.springframework.samples.petclinic.model.Pet;
-import org.springframework.samples.petclinic.rest.api.PetsApi;
-import org.springframework.samples.petclinic.rest.dto.PetDto;
-import org.springframework.samples.petclinic.service.ClinicService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Vitaliy Fedoriv
- */
-
-@RestController
-@CrossOrigin(exposedHeaders = "errors, content-type")
-@RequestMapping("api")
-public class PetRestController implements PetsApi {
-
- private final ClinicService clinicService;
-
- private final PetMapper petMapper;
-
- public PetRestController(ClinicService clinicService, PetMapper petMapper) {
- this.clinicService = clinicService;
- this.petMapper = petMapper;
- }
-
- @PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
- @Override
- public ResponseEntity getPet(Integer petId) {
- PetDto pet = petMapper.toPetDto(this.clinicService.findPetById(petId));
- if (pet == null) {
- return new ResponseEntity<>(HttpStatus.NOT_FOUND);
- }
- return new ResponseEntity<>(pet, HttpStatus.OK);
- }
-
- @PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
- @Override
- public ResponseEntity> listPets() {
- List pets = new ArrayList<>(petMapper.toPetsDto(this.clinicService.findAllPets()));
- if (pets.isEmpty()) {
- return new ResponseEntity<>(HttpStatus.NOT_FOUND);
- }
- return new ResponseEntity<>(pets, HttpStatus.OK);
- }
-
-
- @PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
- @Override
- public ResponseEntity updatePet(Integer petId, PetDto petDto) {
- Pet currentPet = this.clinicService.findPetById(petId);
- if (currentPet == null) {
- return new ResponseEntity<>(HttpStatus.NOT_FOUND);
- }
- currentPet.setBirthDate(petDto.getBirthDate());
- currentPet.setName(petDto.getName());
- currentPet.setType(petMapper.toPetType(petDto.getType()));
- this.clinicService.savePet(currentPet);
- return new ResponseEntity<>(petMapper.toPetDto(currentPet), HttpStatus.NO_CONTENT);
- }
-
- @PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
- @Override
- public ResponseEntity deletePet(Integer petId) {
- Pet pet = this.clinicService.findPetById(petId);
- if (pet == null) {
- return new ResponseEntity<>(HttpStatus.NOT_FOUND);
- }
- this.clinicService.deletePet(pet);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- }
-
- @PreAuthorize("hasRole(@roles.OWNER_ADMIN)")
- @Override
- public ResponseEntity addPet(PetDto petDto) {
- this.clinicService.savePet(petMapper.toPet(petDto));
- return new ResponseEntity<>(petDto, HttpStatus.OK);
- }
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/rest/controller/PetTypeRestController.java b/src/main/java/org/springframework/samples/petclinic/rest/controller/PetTypeRestController.java
deleted file mode 100644
index 870cd661..00000000
--- a/src/main/java/org/springframework/samples/petclinic/rest/controller/PetTypeRestController.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2016-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.rest.controller;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.samples.petclinic.mapper.PetTypeMapper;
-import org.springframework.samples.petclinic.model.PetType;
-import org.springframework.samples.petclinic.rest.api.PettypesApi;
-import org.springframework.samples.petclinic.rest.dto.PetTypeDto;
-import org.springframework.samples.petclinic.service.ClinicService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import jakarta.transaction.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-@RestController
-@CrossOrigin(exposedHeaders = "errors, content-type")
-@RequestMapping("api")
-public class PetTypeRestController implements PettypesApi {
-
- private final ClinicService clinicService;
- private final PetTypeMapper petTypeMapper;
-
-
- public PetTypeRestController(ClinicService clinicService, PetTypeMapper petTypeMapper) {
- this.clinicService = clinicService;
- this.petTypeMapper = petTypeMapper;
- }
-
- @PreAuthorize("hasAnyRole(@roles.OWNER_ADMIN, @roles.VET_ADMIN)")
- @Override
- public ResponseEntity> listPetTypes() {
- List petTypes = new ArrayList<>(this.clinicService.findAllPetTypes());
- if (petTypes.isEmpty()) {
- return new ResponseEntity<>(HttpStatus.NOT_FOUND);
- }
- return new ResponseEntity<>(petTypeMapper.toPetTypeDtos(petTypes), HttpStatus.OK);
- }
-
- @PreAuthorize("hasAnyRole(@roles.OWNER_ADMIN, @roles.VET_ADMIN)")
- @Override
- public ResponseEntity getPetType(Integer petTypeId) {
- PetType petType = this.clinicService.findPetTypeById(petTypeId);
- if (petType == null) {
- return new ResponseEntity<>(HttpStatus.NOT_FOUND);
- }
- return new ResponseEntity<>(petTypeMapper.toPetTypeDto(petType), HttpStatus.OK);
- }
-
- @PreAuthorize("hasRole(@roles.VET_ADMIN)")
- @Override
- public ResponseEntity addPetType(PetTypeDto petTypeDto) {
- HttpHeaders headers = new HttpHeaders();
- if (Objects.nonNull(petTypeDto.getId()) && !petTypeDto.getId().equals(0)) {
- return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
- } else {
- final PetType type = petTypeMapper.toPetType(petTypeDto);
- this.clinicService.savePetType(type);
- headers.setLocation(UriComponentsBuilder.newInstance().path("/api/pettypes/{id}").buildAndExpand(type.getId()).toUri());
- return new ResponseEntity<>(petTypeMapper.toPetTypeDto(type), headers, HttpStatus.CREATED);
- }
- }
-
- @PreAuthorize("hasRole(@roles.VET_ADMIN)")
- @Override
- public ResponseEntity updatePetType(Integer petTypeId, PetTypeDto petTypeDto) {
- PetType currentPetType = this.clinicService.findPetTypeById(petTypeId);
- if (currentPetType == null) {
- return new ResponseEntity<>(HttpStatus.NOT_FOUND);
- }
- currentPetType.setName(petTypeDto.getName());
- this.clinicService.savePetType(currentPetType);
- return new ResponseEntity<>(petTypeMapper.toPetTypeDto(currentPetType), HttpStatus.NO_CONTENT);
- }
-
- @PreAuthorize("hasRole(@roles.VET_ADMIN)")
- @Transactional
- @Override
- public ResponseEntity deletePetType(Integer petTypeId) {
- PetType petType = this.clinicService.findPetTypeById(petTypeId);
- if (petType == null) {
- return new ResponseEntity<>(HttpStatus.NOT_FOUND);
- }
- this.clinicService.deletePetType(petType);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/rest/controller/RootRestController.java b/src/main/java/org/springframework/samples/petclinic/rest/controller/RootRestController.java
deleted file mode 100644
index 7984f66a..00000000
--- a/src/main/java/org/springframework/samples/petclinic/rest/controller/RootRestController.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2016-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.rest.controller;
-
-import java.io.IOException;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author Vitaliy Fedoriv
- *
- */
-
-@RestController
-@CrossOrigin(exposedHeaders = "errors, content-type")
-@RequestMapping("/")
-public class RootRestController {
-
- @Value("#{servletContext.contextPath}")
- private String servletContextPath;
-
- @RequestMapping(value = "/")
- public void redirectToSwagger(HttpServletResponse response) throws IOException {
- response.sendRedirect(this.servletContextPath + "/swagger-ui/index.html");
- }
-
-}
-
diff --git a/src/main/java/org/springframework/samples/petclinic/rest/controller/SpecialtyRestController.java b/src/main/java/org/springframework/samples/petclinic/rest/controller/SpecialtyRestController.java
deleted file mode 100644
index 0b82e818..00000000
--- a/src/main/java/org/springframework/samples/petclinic/rest/controller/SpecialtyRestController.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2016-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.rest.controller;
-
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.samples.petclinic.mapper.SpecialtyMapper;
-import org.springframework.samples.petclinic.model.Specialty;
-import org.springframework.samples.petclinic.rest.api.SpecialtiesApi;
-import org.springframework.samples.petclinic.rest.dto.SpecialtyDto;
-import org.springframework.samples.petclinic.service.ClinicService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import jakarta.transaction.Transactional;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Vitaliy Fedoriv
- */
-
-@RestController
-@CrossOrigin(exposedHeaders = "errors, content-type")
-@RequestMapping("api")
-public class SpecialtyRestController implements SpecialtiesApi {
-
- private final ClinicService clinicService;
-
- private final SpecialtyMapper specialtyMapper;
-
- public SpecialtyRestController(ClinicService clinicService, SpecialtyMapper specialtyMapper) {
- this.clinicService = clinicService;
- this.specialtyMapper = specialtyMapper;
- }
-
- @PreAuthorize("hasRole(@roles.VET_ADMIN)")
- @Override
- public ResponseEntity> listSpecialties() {
- List
-
- 
+ 
+