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:46 UTC
[isis-app-demo] 13/18: renames @Name 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 d3a442b3b7d06a5f21d9cada813f8311bc5219be
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Sep 30 07:06:02 2021 +0100
renames @Name to @LastName
---
.../main/java/petclinic/modules/pets/dom/petowner/PetOwner.java | 8 ++++----
.../main/java/petclinic/modules/pets/dom/petowner/PetOwners.java | 8 ++++----
.../petclinic/modules/pets/types/{Name.java => LastName.java} | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
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 1720a90..5bc5b7c 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
@@ -42,7 +42,7 @@ import lombok.Setter;
import lombok.ToString;
import lombok.val;
-import petclinic.modules.pets.types.Name;
+import petclinic.modules.pets.types.LastName;
import petclinic.modules.pets.types.Notes;
@@ -95,8 +95,8 @@ public class PetOwner implements Comparable<PetOwner> {
@Title
- @Name
- @Column(length = Name.MAX_LEN, nullable = false)
+ @LastName
+ @Column(length = LastName.MAX_LEN, nullable = false)
@Getter @Setter @ToString.Include
@PropertyLayout(fieldSetId = "name", sequence = "1")
private String lastName;
@@ -112,7 +112,7 @@ public class PetOwner implements Comparable<PetOwner> {
@Action(semantics = IDEMPOTENT, commandPublishing = Publishing.ENABLED, executionPublishing = Publishing.ENABLED)
@ActionLayout(associateWith = "lastName", promptStyle = PromptStyle.INLINE)
public PetOwner updateName(
- @Name final String name) {
+ @LastName final String name) {
setLastName(name);
return this;
}
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 2054788..80d3c7b 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
@@ -21,7 +21,7 @@ import org.apache.isis.persistence.jpa.applib.services.JpaSupportService;
import lombok.RequiredArgsConstructor;
-import petclinic.modules.pets.types.Name;
+import petclinic.modules.pets.types.LastName;
@DomainService(
nature = NatureOfService.VIEW,
@@ -39,7 +39,7 @@ public class PetOwners {
@Action(semantics = SemanticsOf.NON_IDEMPOTENT)
@ActionLayout(promptStyle = PromptStyle.DIALOG_SIDEBAR)
public PetOwner create(
- @Name final String name) {
+ @LastName final String name) {
return repositoryService.persist(PetOwner.withName(name));
}
@@ -47,7 +47,7 @@ public class PetOwners {
@Action(semantics = SemanticsOf.NON_IDEMPOTENT)
@ActionLayout(promptStyle = PromptStyle.DIALOG_SIDEBAR)
public List<PetOwner> findByLastNameLike(
- @Name final String lastName) {
+ @LastName final String lastName) {
return repositoryService.allMatches(
Query.named(PetOwner.class, PetOwner.NAMED_QUERY__FIND_BY_LAST_NAME_LIKE)
.withParameter("lastName", "%" + lastName + "%"));
@@ -57,7 +57,7 @@ public class PetOwners {
@Action(semantics = SemanticsOf.SAFE)
@ActionLayout(bookmarking = BookmarkPolicy.AS_ROOT, promptStyle = PromptStyle.DIALOG_SIDEBAR)
public List<PetOwner> findByLastName(
- @Name final String lastName
+ @LastName final String lastName
) {
return petOwnerRepository.findByLastNameContaining(lastName);
}
diff --git a/module-pets/src/main/java/petclinic/modules/pets/types/Name.java b/module-pets/src/main/java/petclinic/modules/pets/types/LastName.java
similarity index 78%
rename from module-pets/src/main/java/petclinic/modules/pets/types/Name.java
rename to module-pets/src/main/java/petclinic/modules/pets/types/LastName.java
index 9af83f0..0c85796 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/types/Name.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/types/LastName.java
@@ -9,12 +9,12 @@ import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.Property;
-@Property(maxLength = Name.MAX_LEN)
-@Parameter(maxLength = Name.MAX_LEN)
-@ParameterLayout(named = "Name")
+@Property(maxLength = LastName.MAX_LEN)
+@Parameter(maxLength = LastName.MAX_LEN)
+@ParameterLayout(named = "Last Name")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
-public @interface Name {
+public @interface LastName {
int MAX_LEN = 40;
}