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/09/30 08:16:38 UTC
[isis-app-demo] 05/18: renames PetOwner name field to lastName
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 7dade26ea632c058cda13257bcb40c680864fa8e
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Sep 30 06:22:49 2021 +0100
renames PetOwner name field to lastName
---
.../petclinic/modules/pets/dom/petowner/PetOwner_Test.java | 6 ++----
.../petclinic/modules/pets/dom/petowner/PetOwners_Test.java | 8 ++------
.../modules/pets/integtests/tests/PetOwner_IntegTest.java | 8 ++++----
.../java/petclinic/modules/pets/dom/petowner/PetOwner.java | 12 ++++++------
.../java/petclinic/modules/pets/dom/petowner/PetOwners.java | 2 +-
.../petclinic/webapp/integtests/smoke/Smoke_IntegTest.java | 2 +-
6 files changed, 16 insertions(+), 22 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 ee187d3..5cc3830 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
@@ -15,8 +15,6 @@ import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.title.TitleService;
-import petclinic.modules.pets.dom.petowner.PetOwner;
-
@ExtendWith(MockitoExtension.class)
class PetOwner_Test {
@@ -40,13 +38,13 @@ class PetOwner_Test {
@Test
void happy_case() {
// given
- assertThat(object.getName()).isEqualTo("Foo");
+ assertThat(object.getLastName()).isEqualTo("Foo");
// when
object.updateName("Bar");
// then
- assertThat(object.getName()).isEqualTo("Bar");
+ assertThat(object.getLastName()).isEqualTo("Bar");
}
}
diff --git a/module-pets-tests/src/test/java/petclinic/modules/pets/dom/petowner/PetOwners_Test.java b/module-pets-tests/src/test/java/petclinic/modules/pets/dom/petowner/PetOwners_Test.java
index 663b53e..d667bd8 100644
--- a/module-pets-tests/src/test/java/petclinic/modules/pets/dom/petowner/PetOwners_Test.java
+++ b/module-pets-tests/src/test/java/petclinic/modules/pets/dom/petowner/PetOwners_Test.java
@@ -20,10 +20,6 @@ import static org.mockito.Mockito.when;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.persistence.jpa.applib.services.JpaSupportService;
-import petclinic.modules.pets.dom.petowner.PetOwner;
-import petclinic.modules.pets.dom.petowner.PetOwnerRepository;
-import petclinic.modules.pets.dom.petowner.PetOwners;
-
@ExtendWith(MockitoExtension.class)
class PetOwners_Test {
@@ -49,7 +45,7 @@ class PetOwners_Test {
// expect
when(mockRepositoryService.persist(
- argThat((ArgumentMatcher<PetOwner>) simpleObject -> Objects.equals(simpleObject.getName(), someName)))
+ argThat((ArgumentMatcher<PetOwner>) simpleObject -> Objects.equals(simpleObject.getLastName(), someName)))
).then((Answer<PetOwner>) invocation -> invocation.getArgument(0));
// when
@@ -57,7 +53,7 @@ class PetOwners_Test {
// then
assertThat(obj).isNotNull();
- assertThat(obj.getName()).isEqualTo(someName);
+ assertThat(obj.getLastName()).isEqualTo(someName);
}
}
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 195c6de..17ca574 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
@@ -33,10 +33,10 @@ public class PetOwner_IntegTest extends PetsModuleIntegTestAbstract {
@Test
public void accessible() {
// when
- final String name = wrap(petOwner).getName();
+ final String name = wrap(petOwner).getLastName();
// then
- assertThat(name).isEqualTo(petOwner.getName());
+ assertThat(name).isEqualTo(petOwner.getLastName());
}
@Test
@@ -46,7 +46,7 @@ public class PetOwner_IntegTest extends PetsModuleIntegTestAbstract {
assertThrows(DisabledException.class, ()->{
// when
- wrap(petOwner).setName("new name");
+ wrap(petOwner).setLastName("new name");
});
}
@@ -64,7 +64,7 @@ public class PetOwner_IntegTest extends PetsModuleIntegTestAbstract {
transactionService.flushTransaction();
// then
- assertThat(wrap(petOwner).getName()).isEqualTo("new name");
+ assertThat(wrap(petOwner).getLastName()).isEqualTo("new name");
}
@Test
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 dc89b83..91f4d0b 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
@@ -58,7 +58,7 @@ import petclinic.modules.pets.types.Notes;
name = PetOwner.NAMED_QUERY__FIND_BY_NAME_LIKE,
query = "SELECT so " +
"FROM PetOwner so " +
- "WHERE so.name LIKE :name"
+ "WHERE so.lastName LIKE :name"
)
})
@EntityListeners(IsisEntityListener.class)
@@ -84,7 +84,7 @@ public class PetOwner implements Comparable<PetOwner> {
public static PetOwner withName(String name) {
val simpleObject = new PetOwner();
- simpleObject.setName(name);
+ simpleObject.setLastName(name);
return simpleObject;
}
@@ -99,7 +99,7 @@ public class PetOwner implements Comparable<PetOwner> {
@Column(length = Name.MAX_LEN, nullable = false)
@Getter @Setter @ToString.Include
@PropertyLayout(fieldSetId = "name", sequence = "1")
- private String name;
+ private String lastName;
@Notes
@Column(length = Notes.MAX_LEN, nullable = true)
@@ -113,11 +113,11 @@ public class PetOwner implements Comparable<PetOwner> {
@ActionLayout(associateWith = "name", promptStyle = PromptStyle.INLINE)
public PetOwner updateName(
@Name final String name) {
- setName(name);
+ setLastName(name);
return this;
}
public String default0UpdateName() {
- return getName();
+ return getLastName();
}
public String validate0UpdateName(String newName) {
for (char prohibitedCharacter : "&%$!".toCharArray()) {
@@ -142,7 +142,7 @@ public class PetOwner implements Comparable<PetOwner> {
private final static Comparator<PetOwner> comparator =
- Comparator.comparing(PetOwner::getName);
+ Comparator.comparing(PetOwner::getLastName);
@Override
public int compareTo(final PetOwner other) {
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwners.java b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwners.java
index 8d0b165..7290cde 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwners.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwners.java
@@ -84,7 +84,7 @@ public class PetOwners {
jpaSupportService.getEntityManager(PetOwner.class)
.ifSuccess(entityManager -> {
final TypedQuery<PetOwner> q = entityManager.createQuery(
- "SELECT p FROM PetOwner p ORDER BY p.name",
+ "SELECT p FROM PetOwner p ORDER BY p.lastName",
PetOwner.class)
.setMaxResults(1);
q.getResultList();
diff --git a/webapp-tests/src/test/java/petclinic/webapp/integtests/smoke/Smoke_IntegTest.java b/webapp-tests/src/test/java/petclinic/webapp/integtests/smoke/Smoke_IntegTest.java
index 018a5e7..8af6b77 100644
--- a/webapp-tests/src/test/java/petclinic/webapp/integtests/smoke/Smoke_IntegTest.java
+++ b/webapp-tests/src/test/java/petclinic/webapp/integtests/smoke/Smoke_IntegTest.java
@@ -58,7 +58,7 @@ class Smoke_IntegTest extends WebAppIntegTestAbstract {
transactionService.flushTransaction();
// then
- assertThat(wrap(fred).getName()).isEqualTo("Freddy");
+ assertThat(wrap(fred).getLastName()).isEqualTo("Freddy");
// when