You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/10/05 13:53:09 UTC
[isis-app-demo] 01/07: moves Pet entity and supporting files into
its own package.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git
commit e35689ff79b4f1cb6181b1ba311adefe6b7870fd
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 5 13:51:49 2021 +0100
moves Pet entity and supporting files into its own package.
---
.../modules/pets/dom/{petowner => pet}/Pet-budgerigar.png | Bin
.../modules/pets/dom/{petowner => pet}/Pet-cat.png | Bin
.../modules/pets/dom/{petowner => pet}/Pet-dog.png | Bin
.../modules/pets/dom/{petowner => pet}/Pet-hamster.png | Bin
.../petclinic/modules/pets/dom/{petowner => pet}/Pet.java | 4 ++--
.../modules/pets/dom/{petowner => pet}/Pet.layout.xml | 0
.../petclinic/modules/pets/dom/{petowner => pet}/Pet.png | Bin
.../modules/pets/dom/{petowner => pet}/PetRepository.java | 4 +++-
.../modules/pets/dom/{petowner => pet}/PetSpecies.java | 2 +-
.../modules/pets/dom/petowner/PetOwner_addPet.java | 3 +++
.../petclinic/modules/pets/dom/petowner/PetOwner_pets.java | 3 +++
.../modules/pets/dom/petowner/PetOwner_removePet.java | 3 ++-
.../java/petclinic/modules/pets/fixture/PetBuilder.java | 6 +++---
.../java/petclinic/modules/pets/fixture/Pet_persona.java | 6 +++---
14 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/Pet-budgerigar.png b/module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet-budgerigar.png
similarity index 100%
rename from module-pets/src/main/java/petclinic/modules/pets/dom/petowner/Pet-budgerigar.png
rename to module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet-budgerigar.png
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/Pet-cat.png b/module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet-cat.png
similarity index 100%
rename from module-pets/src/main/java/petclinic/modules/pets/dom/petowner/Pet-cat.png
rename to module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet-cat.png
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/Pet-dog.png b/module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet-dog.png
similarity index 100%
rename from module-pets/src/main/java/petclinic/modules/pets/dom/petowner/Pet-dog.png
rename to module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet-dog.png
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/Pet-hamster.png b/module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet-hamster.png
similarity index 100%
rename from module-pets/src/main/java/petclinic/modules/pets/dom/petowner/Pet-hamster.png
rename to module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet-hamster.png
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/Pet.java b/module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet.java
similarity index 97%
rename from module-pets/src/main/java/petclinic/modules/pets/dom/petowner/Pet.java
rename to module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet.java
index 4fcc55a..32aeb9b 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/Pet.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet.java
@@ -1,8 +1,7 @@
-package petclinic.modules.pets.dom.petowner;
+package petclinic.modules.pets.dom.pet;
import java.util.Comparator;
-import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EntityListeners;
@@ -32,6 +31,7 @@ import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
+import petclinic.modules.pets.dom.petowner.PetOwner;
import petclinic.modules.pets.types.FirstName;
import petclinic.modules.pets.types.Notes;
import petclinic.modules.pets.types.PetName;
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/Pet.layout.xml b/module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet.layout.xml
similarity index 100%
rename from module-pets/src/main/java/petclinic/modules/pets/dom/petowner/Pet.layout.xml
rename to module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet.layout.xml
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/Pet.png b/module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet.png
similarity index 100%
rename from module-pets/src/main/java/petclinic/modules/pets/dom/petowner/Pet.png
rename to module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet.png
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetRepository.java b/module-pets/src/main/java/petclinic/modules/pets/dom/pet/PetRepository.java
similarity index 75%
rename from module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetRepository.java
rename to module-pets/src/main/java/petclinic/modules/pets/dom/pet/PetRepository.java
index 807263e..42194ad 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetRepository.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/pet/PetRepository.java
@@ -1,10 +1,12 @@
-package petclinic.modules.pets.dom.petowner;
+package petclinic.modules.pets.dom.pet;
import java.util.List;
import java.util.Optional;
import org.springframework.data.repository.Repository;
+import petclinic.modules.pets.dom.petowner.PetOwner;
+
public interface PetRepository extends Repository<Pet, Long> {
List<Pet> findByPetOwner(PetOwner petOwner);
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetSpecies.java b/module-pets/src/main/java/petclinic/modules/pets/dom/pet/PetSpecies.java
similarity index 62%
rename from module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetSpecies.java
rename to module-pets/src/main/java/petclinic/modules/pets/dom/pet/PetSpecies.java
index bbcfa3e..3600f84 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetSpecies.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/pet/PetSpecies.java
@@ -1,4 +1,4 @@
-package petclinic.modules.pets.dom.petowner;
+package petclinic.modules.pets.dom.pet;
public enum PetSpecies {
Dog,
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_addPet.java b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_addPet.java
index 10e00db..8ce2526 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_addPet.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_addPet.java
@@ -10,6 +10,9 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import lombok.RequiredArgsConstructor;
+import petclinic.modules.pets.dom.pet.Pet;
+import petclinic.modules.pets.dom.pet.PetRepository;
+import petclinic.modules.pets.dom.pet.PetSpecies;
import petclinic.modules.pets.types.PetName;
@Action(
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_pets.java b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_pets.java
index ef24446..cc31b58 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_pets.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_pets.java
@@ -9,6 +9,9 @@ import org.apache.isis.applib.annotation.CollectionLayout;
import lombok.RequiredArgsConstructor;
+import petclinic.modules.pets.dom.pet.Pet;
+import petclinic.modules.pets.dom.pet.PetRepository;
+
@Collection
@CollectionLayout(defaultView = "table")
@RequiredArgsConstructor
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_removePet.java b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_removePet.java
index bba2eac..2c62c74 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_removePet.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_removePet.java
@@ -1,7 +1,6 @@
package petclinic.modules.pets.dom.petowner;
import java.util.List;
-import java.util.Optional;
import java.util.stream.Collectors;
import javax.inject.Inject;
@@ -14,6 +13,8 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import lombok.RequiredArgsConstructor;
+import petclinic.modules.pets.dom.pet.Pet;
+import petclinic.modules.pets.dom.pet.PetRepository;
import petclinic.modules.pets.types.PetName;
@Action(
diff --git a/module-pets/src/main/java/petclinic/modules/pets/fixture/PetBuilder.java b/module-pets/src/main/java/petclinic/modules/pets/fixture/PetBuilder.java
index 55a67d0..358d96c 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/fixture/PetBuilder.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/fixture/PetBuilder.java
@@ -8,11 +8,11 @@ import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
-import petclinic.modules.pets.dom.petowner.Pet;
+import petclinic.modules.pets.dom.pet.Pet;
import petclinic.modules.pets.dom.petowner.PetOwner;
import petclinic.modules.pets.dom.petowner.PetOwner_addPet;
-import petclinic.modules.pets.dom.petowner.PetRepository;
-import petclinic.modules.pets.dom.petowner.PetSpecies;
+import petclinic.modules.pets.dom.pet.PetRepository;
+import petclinic.modules.pets.dom.pet.PetSpecies;
@Accessors(chain = true)
public class PetBuilder extends BuilderScriptWithResult<Pet> {
diff --git a/module-pets/src/main/java/petclinic/modules/pets/fixture/Pet_persona.java b/module-pets/src/main/java/petclinic/modules/pets/fixture/Pet_persona.java
index 588ab49..670286e 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/fixture/Pet_persona.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/fixture/Pet_persona.java
@@ -8,10 +8,10 @@ import org.apache.isis.testing.fixtures.applib.setup.PersonaEnumPersistAll;
import lombok.AllArgsConstructor;
import lombok.Getter;
-import petclinic.modules.pets.dom.petowner.Pet;
+import petclinic.modules.pets.dom.pet.Pet;
import petclinic.modules.pets.dom.petowner.PetOwner;
-import petclinic.modules.pets.dom.petowner.PetRepository;
-import petclinic.modules.pets.dom.petowner.PetSpecies;
+import petclinic.modules.pets.dom.pet.PetRepository;
+import petclinic.modules.pets.dom.pet.PetSpecies;
@AllArgsConstructor
public enum Pet_persona