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:20 UTC
[isis-app-demo] tag tags/04-10-pets-module-cleanup created (now
8d72315)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to tag tags/04-10-pets-module-cleanup
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git.
at 8d72315 (commit)
This tag includes the following new commits:
new e35689f moves Pet entity and supporting files into its own package.
new a0fb00d moves fixture classes
new 41da588 moves PetOwner mixins for pets
new 415e608 refactors PetOwner delete action to a mixin, and deletes associated Pets
new 8d72315 deletes from Pet entity in the pets module's teardown fixture
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[isis-app-demo] 05/05: deletes from Pet entity in the pets module's
teardown fixture
Posted by da...@apache.org.
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 8d72315c0395bc5239d79cd03f51827e5f389532
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 5 14:31:40 2021 +0100
deletes from Pet entity in the pets module's teardown fixture
---
module-pets/src/main/java/petclinic/modules/pets/PetsModule.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/module-pets/src/main/java/petclinic/modules/pets/PetsModule.java b/module-pets/src/main/java/petclinic/modules/pets/PetsModule.java
index 96f447d..db7a32b 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/PetsModule.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/PetsModule.java
@@ -8,6 +8,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
+import petclinic.modules.pets.dom.pet.Pet;
import petclinic.modules.pets.dom.petowner.PetOwner;
@Configuration
@@ -21,6 +22,7 @@ public class PetsModule implements ModuleWithFixtures {
return new FixtureScript() {
@Override
protected void execute(ExecutionContext executionContext) {
+ repositoryService.removeAll(Pet.class);
repositoryService.removeAll(PetOwner.class);
}
};
[isis-app-demo] 01/05: moves Pet entity and supporting files into
its own package.
Posted by da...@apache.org.
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 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
[isis-app-demo] 04/05: refactors PetOwner delete action to a mixin,
and deletes associated Pets
Posted by da...@apache.org.
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 415e608fe0b4ca470541b77651f3e81eca72a69c
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 5 14:30:32 2021 +0100
refactors PetOwner delete action to a mixin, and deletes associated Pets
Also:
- fixes the "associateWith",
- adds a "name" to the fieldset in layout.xml so that there is a titled panel for the "delete" action's button to appear in.
- deletes a defunct unit test
---
.../modules/pets/dom/petowner/PetOwner_Test.java | 20 -----------
.../modules/pets/dom/petowner/PetOwner.java | 12 -------
.../modules/pets/dom/petowner/PetOwner.layout.xml | 2 +-
.../modules/pets/dom/petowner/PetOwner_delete.java | 40 ++++++++++++++++++++++
4 files changed, 41 insertions(+), 33 deletions(-)
diff --git a/module-pets-tests/src/test/java/petclinic/modules/pets/dom/petowner/PetOwner_Test.java b/module-pets-tests/src/test/java/petclinic/modules/pets/dom/petowner/PetOwner_Test.java
index a153ab0..0ea697a 100644
--- a/module-pets-tests/src/test/java/petclinic/modules/pets/dom/petowner/PetOwner_Test.java
+++ b/module-pets-tests/src/test/java/petclinic/modules/pets/dom/petowner/PetOwner_Test.java
@@ -48,24 +48,4 @@ class PetOwner_Test {
}
}
- @Nested
- class delete {
-
- @Test
- void happy_case() throws Exception {
-
- // given
- assertThat(object).isNotNull();
-
- // expecting
- when(mockTitleService.titleOf(object)).thenReturn("Foo");
-
- // when
- object.delete();
-
- // then
- verify(mockMessageService).informUser("'Foo' deleted");
- verify(mockRepositoryService).removeAndFlush(object);
- }
- }
}
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.java b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.java
index 02a3561..0f16c8e 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.java
@@ -32,7 +32,6 @@ import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import static org.apache.isis.applib.annotation.SemanticsOf.IDEMPOTENT;
-import static org.apache.isis.applib.annotation.SemanticsOf.NON_IDEMPOTENT_ARE_YOU_SURE;
import lombok.AccessLevel;
import lombok.Getter;
@@ -162,17 +161,6 @@ public class PetOwner implements Comparable<PetOwner> {
}
- @Action(semantics = NON_IDEMPOTENT_ARE_YOU_SURE)
- @ActionLayout(
- associateWith = "lastName", position = ActionLayout.Position.PANEL,
- describedAs = "Deletes this object from the persistent datastore")
- public void delete() {
- final String title = titleService.titleOf(this);
- messageService.informUser(String.format("'%s' deleted", title));
- repositoryService.removeAndFlush(this);
- }
-
-
private final static Comparator<PetOwner> comparator =
Comparator.comparing(PetOwner::getLastName);
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.layout.xml b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.layout.xml
index 3dcd362..4217922 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.layout.xml
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.layout.xml
@@ -12,7 +12,7 @@
<bs3:tab name="General">
<bs3:row>
<bs3:col span="12">
- <c:fieldSet id="name"/>
+ <c:fieldSet id="name" name="Name"/>
</bs3:col>
</bs3:row>
</bs3:tab>
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_delete.java b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_delete.java
new file mode 100644
index 0000000..c7bb58a
--- /dev/null
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner_delete.java
@@ -0,0 +1,40 @@
+package petclinic.modules.pets.dom.petowner;
+
+import javax.inject.Inject;
+
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.Publishing;
+import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.applib.services.repository.RepositoryService;
+import org.apache.isis.applib.services.xactn.TransactionService;
+
+import lombok.RequiredArgsConstructor;
+
+import petclinic.modules.pets.dom.pet.PetRepository;
+
+@Action(
+ semantics = SemanticsOf.NON_IDEMPOTENT_ARE_YOU_SURE,
+ commandPublishing = Publishing.ENABLED,
+ executionPublishing = Publishing.ENABLED
+)
+@ActionLayout(
+ associateWith = "name", position = ActionLayout.Position.PANEL,
+ describedAs = "Deletes this object from the persistent datastore")
+@RequiredArgsConstructor
+public class PetOwner_delete {
+
+ private final PetOwner petOwner;
+
+ public void act(
+ ) {
+ petRepository.findByPetOwner(petOwner).forEach(repositoryService::remove);
+ transactionService.flushTransaction();
+ repositoryService.remove(petOwner);
+ return;
+ }
+
+ @Inject PetRepository petRepository;
+ @Inject RepositoryService repositoryService;
+ @Inject TransactionService transactionService;
+}
[isis-app-demo] 03/05: moves PetOwner mixins for pets
Posted by da...@apache.org.
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;
[isis-app-demo] 02/05: moves fixture classes
Posted by da...@apache.org.
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 a0fb00de6ec1c3dd81cc15bcddea831603582f7a
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 5 13:52:47 2021 +0100
moves fixture classes
---
.../petclinic/modules/pets/integtests/tests/PetOwner_IntegTest.java | 3 +--
.../petclinic/modules/pets/integtests/tests/PetOwners_IntegTest.java | 2 +-
.../java/petclinic/modules/pets/fixture/{ => pet}/PetBuilder.java | 3 ++-
.../java/petclinic/modules/pets/fixture/{ => pet}/Pet_persona.java | 3 ++-
.../modules/pets/fixture/{ => petowner}/PetOwnerBuilder.java | 2 +-
.../modules/pets/fixture/{ => petowner}/PetOwner_persona.java | 2 +-
.../petclinic/webapp/application/fixture/scenarios/PetClinicDemo.java | 4 ++--
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwner_IntegTest.java b/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwner_IntegTest.java
index e3a114b..f7285d2 100644
--- a/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwner_IntegTest.java
+++ b/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwner_IntegTest.java
@@ -8,12 +8,11 @@ import org.springframework.transaction.annotation.Transactional;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.HiddenException;
import org.apache.isis.applib.services.wrapper.InvalidException;
import petclinic.modules.pets.dom.petowner.PetOwner;
-import petclinic.modules.pets.fixture.PetOwner_persona;
+import petclinic.modules.pets.fixture.petowner.PetOwner_persona;
import petclinic.modules.pets.integtests.PetsModuleIntegTestAbstract;
@Transactional
diff --git a/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwners_IntegTest.java b/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwners_IntegTest.java
index 8606eb3..be4b927 100644
--- a/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwners_IntegTest.java
+++ b/module-pets-tests/src/test/java/petclinic/modules/pets/integtests/tests/PetOwners_IntegTest.java
@@ -17,7 +17,7 @@ import org.apache.isis.testing.unittestsupport.applib.matchers.ThrowableMatchers
import petclinic.modules.pets.dom.petowner.PetOwner;
import petclinic.modules.pets.dom.petowner.PetOwners;
-import petclinic.modules.pets.fixture.PetOwner_persona;
+import petclinic.modules.pets.fixture.petowner.PetOwner_persona;
import petclinic.modules.pets.integtests.PetsModuleIntegTestAbstract;
@Transactional
diff --git a/module-pets/src/main/java/petclinic/modules/pets/fixture/PetBuilder.java b/module-pets/src/main/java/petclinic/modules/pets/fixture/pet/PetBuilder.java
similarity index 92%
rename from module-pets/src/main/java/petclinic/modules/pets/fixture/PetBuilder.java
rename to module-pets/src/main/java/petclinic/modules/pets/fixture/pet/PetBuilder.java
index 358d96c..d4031c1 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/fixture/PetBuilder.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/fixture/pet/PetBuilder.java
@@ -1,4 +1,4 @@
-package petclinic.modules.pets.fixture;
+package petclinic.modules.pets.fixture.pet;
import javax.inject.Inject;
@@ -13,6 +13,7 @@ import petclinic.modules.pets.dom.petowner.PetOwner;
import petclinic.modules.pets.dom.petowner.PetOwner_addPet;
import petclinic.modules.pets.dom.pet.PetRepository;
import petclinic.modules.pets.dom.pet.PetSpecies;
+import petclinic.modules.pets.fixture.petowner.PetOwner_persona;
@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/Pet_persona.java
similarity index 95%
rename from module-pets/src/main/java/petclinic/modules/pets/fixture/Pet_persona.java
rename to module-pets/src/main/java/petclinic/modules/pets/fixture/pet/Pet_persona.java
index 670286e..23d2b30 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/Pet_persona.java
@@ -1,4 +1,4 @@
-package petclinic.modules.pets.fixture;
+package petclinic.modules.pets.fixture.pet;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.testing.fixtures.applib.personas.PersonaWithBuilderScript;
@@ -12,6 +12,7 @@ import petclinic.modules.pets.dom.pet.Pet;
import petclinic.modules.pets.dom.petowner.PetOwner;
import petclinic.modules.pets.dom.pet.PetRepository;
import petclinic.modules.pets.dom.pet.PetSpecies;
+import petclinic.modules.pets.fixture.petowner.PetOwner_persona;
@AllArgsConstructor
public enum Pet_persona
diff --git a/module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwnerBuilder.java b/module-pets/src/main/java/petclinic/modules/pets/fixture/petowner/PetOwnerBuilder.java
similarity index 94%
rename from module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwnerBuilder.java
rename to module-pets/src/main/java/petclinic/modules/pets/fixture/petowner/PetOwnerBuilder.java
index 4440c66..00bab41 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwnerBuilder.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/fixture/petowner/PetOwnerBuilder.java
@@ -1,4 +1,4 @@
-package petclinic.modules.pets.fixture;
+package petclinic.modules.pets.fixture.petowner;
import javax.inject.Inject;
diff --git a/module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwner_persona.java b/module-pets/src/main/java/petclinic/modules/pets/fixture/petowner/PetOwner_persona.java
similarity index 96%
rename from module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwner_persona.java
rename to module-pets/src/main/java/petclinic/modules/pets/fixture/petowner/PetOwner_persona.java
index 1e10732..ce7cc4c 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/fixture/PetOwner_persona.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/fixture/petowner/PetOwner_persona.java
@@ -1,4 +1,4 @@
-package petclinic.modules.pets.fixture;
+package petclinic.modules.pets.fixture.petowner;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.testing.fixtures.applib.personas.PersonaWithBuilderScript;
diff --git a/webapp/src/main/java/petclinic/webapp/application/fixture/scenarios/PetClinicDemo.java b/webapp/src/main/java/petclinic/webapp/application/fixture/scenarios/PetClinicDemo.java
index f39d62f..78c4889 100644
--- a/webapp/src/main/java/petclinic/webapp/application/fixture/scenarios/PetClinicDemo.java
+++ b/webapp/src/main/java/petclinic/webapp/application/fixture/scenarios/PetClinicDemo.java
@@ -5,8 +5,8 @@ import javax.inject.Inject;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixturesService;
-import petclinic.modules.pets.fixture.PetOwner_persona;
-import petclinic.modules.pets.fixture.Pet_persona;
+import petclinic.modules.pets.fixture.petowner.PetOwner_persona;
+import petclinic.modules.pets.fixture.pet.Pet_persona;
public class PetClinicDemo extends FixtureScript {