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:33:23 UTC
[isis-app-demo] 03/05: moves PetOwner mixins for pets
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to tag tags/04-10-pets-module-cleanup
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git
commit 41da58817e4aae418e340cc76474f416bfeaceb3
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 5 14:01:44 2021 +0100
moves PetOwner mixins for pets
---
.../petclinic/modules/pets/dom/{petowner => pet}/PetOwner_addPet.java | 3 ++-
.../petclinic/modules/pets/dom/{petowner => pet}/PetOwner_pets.java | 3 ++-
.../modules/pets/dom/{petowner => pet}/PetOwner_removePet.java | 3 ++-
.../src/main/java/petclinic/modules/pets/fixture/pet/PetBuilder.java | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
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/pet/PetOwner_addPet.java
similarity index 94%
rename from module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_addPet.java
rename to module-pets/src/main/java/petclinic/modules/pets/dom/pet/PetOwner_addPet.java
index 8ce2526..e59ada1 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/pet/PetOwner_addPet.java
@@ -1,4 +1,4 @@
-package petclinic.modules.pets.dom.petowner;
+package petclinic.modules.pets.dom.pet;
import javax.inject.Inject;
@@ -13,6 +13,7 @@ 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.dom.petowner.PetOwner;
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/pet/PetOwner_pets.java
similarity index 86%
rename from module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_pets.java
rename to module-pets/src/main/java/petclinic/modules/pets/dom/pet/PetOwner_pets.java
index cc31b58..8a955e4 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/pet/PetOwner_pets.java
@@ -1,4 +1,4 @@
-package petclinic.modules.pets.dom.petowner;
+package petclinic.modules.pets.dom.pet;
import java.util.List;
@@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor;
import petclinic.modules.pets.dom.pet.Pet;
import petclinic.modules.pets.dom.pet.PetRepository;
+import petclinic.modules.pets.dom.petowner.PetOwner;
@Collection
@CollectionLayout(defaultView = "table")
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/pet/PetOwner_removePet.java
similarity index 94%
rename from module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_removePet.java
rename to module-pets/src/main/java/petclinic/modules/pets/dom/pet/PetOwner_removePet.java
index 2c62c74..1bc76c4 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/pet/PetOwner_removePet.java
@@ -1,4 +1,4 @@
-package petclinic.modules.pets.dom.petowner;
+package petclinic.modules.pets.dom.pet;
import java.util.List;
import java.util.stream.Collectors;
@@ -15,6 +15,7 @@ import lombok.RequiredArgsConstructor;
import petclinic.modules.pets.dom.pet.Pet;
import petclinic.modules.pets.dom.pet.PetRepository;
+import petclinic.modules.pets.dom.petowner.PetOwner;
import petclinic.modules.pets.types.PetName;
@Action(
diff --git a/module-pets/src/main/java/petclinic/modules/pets/fixture/pet/PetBuilder.java b/module-pets/src/main/java/petclinic/modules/pets/fixture/pet/PetBuilder.java
index d4031c1..6f37cdc 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/fixture/pet/PetBuilder.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/fixture/pet/PetBuilder.java
@@ -10,7 +10,7 @@ import lombok.experimental.Accessors;
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.pet.PetOwner_addPet;
import petclinic.modules.pets.dom.pet.PetRepository;
import petclinic.modules.pets.dom.pet.PetSpecies;
import petclinic.modules.pets.fixture.petowner.PetOwner_persona;