From 335786171d499cddd1b3a7823b17f620e133d58a Mon Sep 17 00:00:00 2001 From: Ismail Ismailov Date: Thu, 27 Apr 2023 13:41:39 +0200 Subject: [PATCH] Move model package to infrastructure --- .../{ => infrastructure/persistence}/model/BaseEntity.java | 2 +- .../{ => infrastructure/persistence}/model/NamedEntity.java | 2 +- .../{ => infrastructure/persistence}/model/Person.java | 2 +- .../{ => infrastructure/persistence}/model/package-info.java | 2 +- .../org/springframework/samples/petclinic/owner/Owner.java | 2 +- .../java/org/springframework/samples/petclinic/owner/Pet.java | 2 +- .../org/springframework/samples/petclinic/owner/PetType.java | 2 +- .../org/springframework/samples/petclinic/owner/Visit.java | 2 +- .../org/springframework/samples/petclinic/vet/Specialty.java | 2 +- .../java/org/springframework/samples/petclinic/vet/Vet.java | 2 +- .../samples/petclinic/model/ValidatorTests.java | 1 + .../samples/petclinic/service/EntityUtils.java | 4 ++-- 12 files changed, 13 insertions(+), 12 deletions(-) rename src/main/java/org/springframework/samples/petclinic/{ => infrastructure/persistence}/model/BaseEntity.java (94%) rename src/main/java/org/springframework/samples/petclinic/{ => infrastructure/persistence}/model/NamedEntity.java (93%) rename src/main/java/org/springframework/samples/petclinic/{ => infrastructure/persistence}/model/Person.java (94%) rename src/main/java/org/springframework/samples/petclinic/{ => infrastructure/persistence}/model/package-info.java (89%) diff --git a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java b/src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/model/BaseEntity.java similarity index 94% rename from src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java rename to src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/model/BaseEntity.java index 3038bce3a..91b1b8287 100644 --- a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java +++ b/src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/model/BaseEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.model; +package org.springframework.samples.petclinic.infrastructure.persistence.model; import java.io.Serializable; diff --git a/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java b/src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/model/NamedEntity.java similarity index 93% rename from src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java rename to src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/model/NamedEntity.java index 7c2ccb2d6..d66d3aecf 100644 --- a/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java +++ b/src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/model/NamedEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.model; +package org.springframework.samples.petclinic.infrastructure.persistence.model; import jakarta.persistence.Column; import jakarta.persistence.MappedSuperclass; diff --git a/src/main/java/org/springframework/samples/petclinic/model/Person.java b/src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/model/Person.java similarity index 94% rename from src/main/java/org/springframework/samples/petclinic/model/Person.java rename to src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/model/Person.java index e41b6ba90..ac9b43df6 100644 --- a/src/main/java/org/springframework/samples/petclinic/model/Person.java +++ b/src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/model/Person.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.model; +package org.springframework.samples.petclinic.infrastructure.persistence.model; import jakarta.persistence.Column; import jakarta.persistence.MappedSuperclass; diff --git a/src/main/java/org/springframework/samples/petclinic/model/package-info.java b/src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/model/package-info.java similarity index 89% rename from src/main/java/org/springframework/samples/petclinic/model/package-info.java rename to src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/model/package-info.java index 37d6295e8..7fdf27ac4 100644 --- a/src/main/java/org/springframework/samples/petclinic/model/package-info.java +++ b/src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/model/package-info.java @@ -17,4 +17,4 @@ /** * The classes in this package represent utilities used by the domain. */ -package org.springframework.samples.petclinic.model; +package org.springframework.samples.petclinic.infrastructure.persistence.model; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java b/src/main/java/org/springframework/samples/petclinic/owner/Owner.java index ac556459d..d61f9248b 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/Owner.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; import org.springframework.core.style.ToStringCreator; -import org.springframework.samples.petclinic.model.Person; +import org.springframework.samples.petclinic.infrastructure.persistence.model.Person; import org.springframework.util.Assert; import jakarta.persistence.CascadeType; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Pet.java b/src/main/java/org/springframework/samples/petclinic/owner/Pet.java index 0b0c08ac6..37969b590 100755 --- a/src/main/java/org/springframework/samples/petclinic/owner/Pet.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/Pet.java @@ -21,7 +21,7 @@ import java.util.LinkedHashSet; import java.util.Set; import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.samples.petclinic.model.NamedEntity; +import org.springframework.samples.petclinic.infrastructure.persistence.model.NamedEntity; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetType.java b/src/main/java/org/springframework/samples/petclinic/owner/PetType.java index eeea6a758..6addf1ee7 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/PetType.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/PetType.java @@ -15,7 +15,7 @@ */ package org.springframework.samples.petclinic.owner; -import org.springframework.samples.petclinic.model.NamedEntity; +import org.springframework.samples.petclinic.infrastructure.persistence.model.NamedEntity; import jakarta.persistence.Entity; import jakarta.persistence.Table; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Visit.java b/src/main/java/org/springframework/samples/petclinic/owner/Visit.java index d052a4e8d..9b2746091 100755 --- a/src/main/java/org/springframework/samples/petclinic/owner/Visit.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/Visit.java @@ -18,7 +18,7 @@ package org.springframework.samples.petclinic.owner; import java.time.LocalDate; import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.samples.petclinic.model.BaseEntity; +import org.springframework.samples.petclinic.infrastructure.persistence.model.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java b/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java index b0b6315fc..876fe7ac8 100644 --- a/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java +++ b/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java @@ -15,7 +15,7 @@ */ package org.springframework.samples.petclinic.vet; -import org.springframework.samples.petclinic.model.NamedEntity; +import org.springframework.samples.petclinic.infrastructure.persistence.model.NamedEntity; import jakarta.persistence.Entity; import jakarta.persistence.Table; diff --git a/src/main/java/org/springframework/samples/petclinic/vet/Vet.java b/src/main/java/org/springframework/samples/petclinic/vet/Vet.java index 7a70155c3..093a2a1bb 100644 --- a/src/main/java/org/springframework/samples/petclinic/vet/Vet.java +++ b/src/main/java/org/springframework/samples/petclinic/vet/Vet.java @@ -23,7 +23,7 @@ import java.util.Set; import org.springframework.beans.support.MutableSortDefinition; import org.springframework.beans.support.PropertyComparator; -import org.springframework.samples.petclinic.model.Person; +import org.springframework.samples.petclinic.infrastructure.persistence.model.Person; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java index 683db21f6..9c255c08c 100644 --- a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java +++ b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java @@ -23,6 +23,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.springframework.context.i18n.LocaleContextHolder; +import org.springframework.samples.petclinic.infrastructure.persistence.model.Person; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; import jakarta.validation.ConstraintViolation; diff --git a/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java b/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java index 7b7a5e64a..3f8207b03 100644 --- a/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java +++ b/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java @@ -17,7 +17,7 @@ package org.springframework.samples.petclinic.service; import org.springframework.orm.ObjectRetrievalFailureException; -import org.springframework.samples.petclinic.model.BaseEntity; +import org.springframework.samples.petclinic.infrastructure.persistence.model.BaseEntity; import java.util.Collection; @@ -27,7 +27,7 @@ import java.util.Collection; * * @author Juergen Hoeller * @author Sam Brannen - * @see org.springframework.samples.petclinic.model.BaseEntity + * @see BaseEntity * @since 29.10.2003 */ public abstract class EntityUtils {