You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2025/02/18 11:16:08 UTC
(causeway) branch main updated: CAUSEWAY-3859: Java record refactoring (part 7)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/main by this push:
new aedee768734 CAUSEWAY-3859: Java record refactoring (part 7)
aedee768734 is described below
commit aedee7687340f4fbd41cd36a7cb45378696cca5b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Feb 18 12:16:04 2025 +0100
CAUSEWAY-3859: Java record refactoring (part 7)
---
.../org/apache/causeway/applib/graph/Edge.java | 4 +-
.../apache/causeway/applib/graph/SimpleEdge.java | 16 +-
.../causeway/applib/graph/tree/TreeNode.java | 4 +-
.../mixins/metamodel/Object_logicalTypeName.java | 2 +-
.../mixins/metamodel/Object_objectIdentifier.java | 2 +-
.../applib/mixins/rest/Object_openRestApi.java | 4 +-
.../applib/mixins/system/DomainChangeRecord.java | 2 +-
.../causeway/applib/services/bookmark/Oid.java | 2 +-
.../applib/services/exceprecog/Recognition.java | 65 ++--
.../causeway/applib/services/user/RoleMemento.java | 72 +++--
.../causeway/applib/services/user/UserMemento.java | 345 +++++++++++----------
.../causeway/applib/services/user/UserService.java | 2 +-
.../services/wrapper/control/AsyncControl.java | 4 +-
.../applib/services/xactn/TransactionId.java | 48 ++-
.../services/xactn/TransactionalProcessor.java | 1 -
.../applib/util/schema/InteractionDtoUtils.java | 2 +-
.../applib/services/bookmark/BookmarkTest.java | 20 +-
.../exceprecog/ExceptionRecognizerForTypeTest.java | 4 +-
.../exceprecog/ExceptionRecognizerGeneralTest.java | 4 +-
.../services/user/RoleMemento_value_Test.java | 12 +-
.../applib/services/user/UserMemento_Test.java | 112 +++----
.../services/user/UserMemento_contains_Test.java | 16 +-
.../services/user/UserMemento_value_Test.java | 4 +-
.../wrapper/control/AsyncControl_Test.java | 2 +-
.../causeway/core/metamodel/commons/UtilStr.java | 2 +-
.../object/viewmodel/ViewModelFacetAbstract.java | 2 +-
.../ViewModelFacetForDomainObjectAnnotation.java | 2 +-
.../viewmodel/ViewModelFacetForJavaRecord.java | 2 +-
.../ViewModelFacetForSerializableInterface.java | 2 +-
.../ViewModelFacetForViewModelInterface.java | 2 +-
.../ViewModelFacetForXmlRootElementAnnotation.java | 2 +-
.../core/metamodel/object/ManagedObjects.java | 2 +-
.../core/metamodel/object/ProtoObject.java | 4 +-
.../objectmanager/ObjectLoaderFactory.java | 2 +-
.../metamodel/MetaModelServiceDefault.java | 2 +-
.../objectlifecycle/PropertyChangeRecord.java | 2 +-
.../spec/impl/SpecificationLoaderInternal.java | 2 +-
.../valuesemantics/BookmarkValueSemantics.java | 4 +-
.../dom/JavaObjectWithBasicProgramConventions.java | 4 +-
.../bookmarks/BookmarkServiceDefault.java | 4 +-
.../transaction/TransactionServiceSpring.java | 2 +-
...eptionRecognizerForDataAccessExceptionTest.java | 6 +-
.../security/authentication/logout/LogoutMenu.java | 2 +-
.../manager/AuthenticationManager.java | 10 +-
.../manager/AuthorizationManager.java | 2 +-
.../commandlog/applib/dom/BackgroundService.java | 2 +-
.../integtest/CommandLog_IntegTestAbstract.java | 8 +-
.../integtest/ExecutionLog_IntegTestAbstract.java | 8 +-
.../ExecutionOutbox_IntegTestAbstract.java | 2 +-
.../caffeine/dom/TitleCacheSubscriber.java | 6 +-
.../ApplicationPermissionRepositoryAbstract.java | 4 +-
.../secman/applib/user/dom/ApplicationUser.java | 15 +-
.../integration/authorizor/AuthorizorSecman.java | 8 +-
.../UserMementoRefinerFromApplicationUser.java | 2 +-
...icationConverterOfOAuth2UserPrincipal_Test.java | 17 +-
.../pdfjs/wkt/ui/components/PdfJsViewerPanel.java | 4 +-
.../jdbc/metamodel/JdbcEntityFacet.java | 4 +-
.../metamodel/facets/entity/JdoEntityFacet.java | 6 +-
.../jpa/integration/entity/JpaEntityFacet.java | 4 +-
.../EntityPropertyChangeSubscriberForTesting.java | 4 +-
.../testdomain/interact/CustomContextTest.java | 6 +-
.../shiro/authorization/AuthorizorShiro.java | 4 +-
...AuthenticatorOrAuthorizorTest_authenticate.java | 4 +-
.../simple/authorization/SimpleAuthorizor.java | 2 +-
.../security/simple/SecuritySimpleAuthTest.java | 2 +-
.../applib/ExceptionRecognizerTranslate.java | 4 +-
.../services/userprof/UserProfileUiModel.java | 2 +-
.../userprof/UserProfileUiServiceDefault.java | 4 +-
.../common/query/meta/CommonMetaFetcher.java | 6 +-
.../rich/query/RichPropertyGetBlobBytes.java | 2 +-
.../rich/query/RichPropertyGetClobChars.java | 2 +-
.../simple/query/SimplePropertyLobBytes.java | 2 +-
.../simple/query/SimplePropertyLobChars.java | 2 +-
.../viewer/auth/UserMementoProviderDefault.java | 3 +-
.../client/ActionParameterListBuilder.java | 2 +-
.../domainobjects/DomainObjectReprRenderer.java | 4 +-
.../viewer/resources/UserReprRenderer.java | 2 +-
.../wicket/model/models/BookmarkTreeNode.java | 4 +-
.../viewer/wicket/model/models/UiObjectWkt.java | 2 +-
.../wicket/ui/pages/login/CausewaySignInPanel.java | 2 +-
.../wicket/ui/panels/FormExecutorDefault.java | 2 +-
.../AuthenticatedWebSessionForCauseway.java | 6 +-
82 files changed, 479 insertions(+), 495 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/graph/Edge.java b/api/applib/src/main/java/org/apache/causeway/applib/graph/Edge.java
index c0963ab474d..54812928f8e 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/graph/Edge.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/graph/Edge.java
@@ -26,6 +26,6 @@
* @param <T> type constraint for values contained by this edge's vertices
*/
public interface Edge<T> {
- Vertex<T> getFrom();
- Vertex<T> getTo();
+ Vertex<T> from();
+ Vertex<T> to();
}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/graph/SimpleEdge.java b/api/applib/src/main/java/org/apache/causeway/applib/graph/SimpleEdge.java
index 33616377061..06a84c56b49 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/graph/SimpleEdge.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/graph/SimpleEdge.java
@@ -18,10 +18,7 @@
*/
package org.apache.causeway.applib.graph;
-import jakarta.inject.Named;
-
-import org.apache.causeway.applib.CausewayModuleApplib;
-import org.apache.causeway.applib.annotation.Value;
+import org.apache.causeway.applib.annotation.Programmatic;
/**
* Fundamental building block for graph structures.
@@ -30,12 +27,9 @@
*
* @param <T> type constraint for values contained by this edge's vertices
*/
-@lombok.Value(staticConstructor = "of")
-@Named(CausewayModuleApplib.NAMESPACE + ".graph.SimpleEdge")
-@Value
-public class SimpleEdge<T> implements Edge<T> {
-
- Vertex<T> from;
- Vertex<T> to;
+@Programmatic
+public record SimpleEdge<T>(
+ Vertex<T> from,
+ Vertex<T> to) implements Edge<T> {
}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/graph/tree/TreeNode.java b/api/applib/src/main/java/org/apache/causeway/applib/graph/tree/TreeNode.java
index 0525565d372..3c1bab72471 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/graph/tree/TreeNode.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/graph/tree/TreeNode.java
@@ -148,14 +148,14 @@ public int outgoingCount() {
@Override
public Stream<Edge<T>> streamIncoming() {
return lookupParent()
- .map(parentNode->SimpleEdge.<T>of(parentNode, this))
+ .map(parentNode->new SimpleEdge<T>(parentNode, this))
.map(Stream::<Edge<T>>of)
.orElseGet(Stream::empty);
}
@Override
public Stream<Edge<T>> streamOutgoing() {
return streamChildren()
- .map(to->SimpleEdge.<T>of(this, to));
+ .map(to->new SimpleEdge<T>(this, to));
}
// -- RESOLUTION
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_logicalTypeName.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_logicalTypeName.java
index 617cfee52ba..be69c353ad6 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_logicalTypeName.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_logicalTypeName.java
@@ -72,7 +72,7 @@ public static class PropertyDomainEvent
@MemberSupport public String prop() {
var bookmark = bookmarkService.bookmarkForElseFail(this.holder);
- return bookmark.getLogicalTypeName();
+ return bookmark.logicalTypeName();
}
@MemberSupport public boolean hideProp() {
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_objectIdentifier.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_objectIdentifier.java
index fd4c7e32d06..a52d1b2b5c1 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_objectIdentifier.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/metamodel/Object_objectIdentifier.java
@@ -71,7 +71,7 @@ public static class PropertyDomainEvent
@MemberSupport public String prop() {
var bookmark = bookmarkService.bookmarkForElseFail(this.holder);
- return bookmark.getIdentifier();
+ return bookmark.identifier();
}
@MemberSupport public boolean hideProp() {
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/rest/Object_openRestApi.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/rest/Object_openRestApi.java
index c39b6c094e8..c7ce6c8fbfb 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/rest/Object_openRestApi.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/rest/Object_openRestApi.java
@@ -64,8 +64,8 @@ public static class ActionDomainEvent
@MemberSupport public LocalResourcePath act() {
var bookmark = bookmarkService.bookmarkForElseFail(holder);
- var logicalTypeName = bookmark.getLogicalTypeName();
- var objId = bookmark.getIdentifier();
+ var logicalTypeName = bookmark.logicalTypeName();
+ var objId = bookmark.identifier();
var restfulPathIfAny = restfulPathProvider.getRestfulPath();
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/mixins/system/DomainChangeRecord.java b/api/applib/src/main/java/org/apache/causeway/applib/mixins/system/DomainChangeRecord.java
index 326c7f23323..154ceb82d47 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/mixins/system/DomainChangeRecord.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/mixins/system/DomainChangeRecord.java
@@ -160,7 +160,7 @@ public String toString() {
*/
@TargetLogicalTypeName
default String getTargetLogicalTypeName() {
- return getTarget().getLogicalTypeName();
+ return getTarget().logicalTypeName();
}
@Property(
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Oid.java b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Oid.java
index 4e7266116a4..eb634233c44 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Oid.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/bookmark/Oid.java
@@ -50,7 +50,7 @@ public interface Oid extends Serializable {
/**
* The canonical form of the {@link Bookmark}, that is
- * {@link #getLogicalTypeName() logical-type-name}{@value #SEPARATOR}{@link #getIdentifier() identifier}.
+ * {@link #logicalTypeName() logical-type-name}{@value #SEPARATOR}{@link #identifier() identifier}.
*/
String stringify();
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/exceprecog/Recognition.java b/api/applib/src/main/java/org/apache/causeway/applib/services/exceprecog/Recognition.java
index e477c053865..f02f7f4e00f 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/exceprecog/Recognition.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/exceprecog/Recognition.java
@@ -20,43 +20,22 @@
import java.util.Optional;
+import org.jspecify.annotations.NonNull;
import org.jspecify.annotations.Nullable;
import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.i18n.TranslationService;
-import org.jspecify.annotations.NonNull;
-import lombok.Value;
-
/**
* Represents a user-friendly representation of an exception that has been
* recognised by an available implementation of an {@link ExceptionRecognizer}.
- *
* <p>
* Returned by {@link ExceptionRecognizer#recognize(Throwable)} when the
* exception recognizer has recognised the exception
*
* @since 1.x {@index}
*/
-@Value
-public class Recognition {
-
- /**
- * @return optionally a recognition of the specified type, based on a whether given reason is non-null
- */
- public static Optional<Recognition> of(
- final @Nullable Category category,
- final @Nullable String reason) {
-
- if (reason == null) {
- return Optional.empty();
- }
-
- var nonNullCategory = category != null ? category : Category.OTHER;
- return Optional.of(new Recognition(nonNullCategory, reason));
- // ...
- }
-
+public record Recognition(
/**
* Categorises the exception as per {@link Category}.
*
@@ -75,8 +54,7 @@ public static Optional<Recognition> of(
*
* @see #toMessage(TranslationService)
*/
- @NonNull
- Category category;
+ @NonNull Category category,
/**
* The untranslated user-friendly reason for the exception.
@@ -92,37 +70,48 @@ public static Optional<Recognition> of(
* @see #toMessage(TranslationService)
* @see #toMessageNoCategory(TranslationService)
*/
- @NonNull
- String reason;
+ @NonNull String reason) {
+
+ /**
+ * @return optionally a recognition of the specified type, based on a whether given reason is non-null
+ */
+ public static Optional<Recognition> of(
+ final @Nullable Category category,
+ final @Nullable String reason) {
+
+ if (reason == null) {
+ return Optional.empty();
+ }
+
+ var nonNullCategory = category != null ? category : Category.OTHER;
+ return Optional.of(new Recognition(nonNullCategory, reason));
+ }
/**
- * Translates the {@link #getReason() reason} and prepends with a
- * translation of {@link #getCategory() category}, using the provided
+ * Translates the {@link #reason() reason} and prepends with a
+ * translation of {@link #category() category}, using the provided
* {@link TranslationService}..
*
* @param translationService
*/
public String toMessage(@Nullable TranslationService translationService) {
- var categoryLiteral = translate(getCategory().getFriendlyName(), translationService);
- var reasonLiteral = translate(getReason(), translationService);
+ var categoryLiteral = translate(category().getFriendlyName(), translationService);
+ var reasonLiteral = translate(reason(), translationService);
return String.format("[%s]: %s", categoryLiteral, reasonLiteral);
- // ...
}
/**
- * Translates the {@link #getReason() reason} alone (ignoring the
- * {@link #getCategory() category}, using the provided
+ * Translates the {@link #reason() reason} alone (ignoring the
+ * {@link #category() category}, using the provided
* {@link TranslationService}..
*
* @param translationService
*/
public String toMessageNoCategory(@Nullable TranslationService translationService) {
-
- var reasonLiteral = translate(getReason(), translationService);
- return String.format("%s", reasonLiteral);
- // ...
+ var reasonLiteral = translate(reason(), translationService);
+ return "" + reasonLiteral;
}
private static String translate(
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.java b/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.java
index ad7cc8b7f2e..e2a168d10a4 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.java
@@ -19,9 +19,12 @@
package org.apache.causeway.applib.services.user;
import java.io.Serializable;
+import java.util.Objects;
import jakarta.inject.Named;
+import org.jspecify.annotations.NonNull;
+
import org.springframework.context.event.EventListener;
import org.springframework.core.annotation.Order;
@@ -30,13 +33,10 @@
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.annotation.Programmatic;
import org.apache.causeway.applib.annotation.PropertyLayout;
import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import org.jspecify.annotations.NonNull;
-import lombok.Value;
/**
* Immutable serializable value held by {@link UserMemento}.
@@ -49,15 +49,28 @@
@DomainObjectLayout(
titleUiEvent = RoleMemento.TitleUiEvent.class
)
-@Value
-public class RoleMemento implements Serializable {
+@Builder
+public record RoleMemento(
+ @PropertyLayout(fieldSetId = "identity", sequence = "1")
+ @NonNull String name,
+ @PropertyLayout(fieldSetId = "details", sequence = "1")
+ @NonNull String description
+ ) implements Serializable {
static final String LOGICAL_TYPE_NAME = CausewayModuleApplib.NAMESPACE + ".RoleMemento";
+ public static class UiSubscriber {
+ @Order(PriorityPrecedence.LATE)
+ @EventListener(RoleMemento.TitleUiEvent.class)
+ public void on(final RoleMemento.TitleUiEvent ev) {
+ var roleMemento = ev.getSource();
+ assert roleMemento != null;
+ ev.setTitle(roleMemento.name());
+ }
+ }
+
public static class TitleUiEvent extends CausewayModuleApplib.TitleUiEvent<RoleMemento> {}
- private static final long serialVersionUID = -3876856609238378274L;
-
/**
* Creates a new role with the specified name. Description is left blank.
*/
@@ -68,34 +81,37 @@ public RoleMemento(final String name) {
/**
* Creates a new role with the specified name and description.
*/
- @Builder
+ // canonical constructor
public RoleMemento(
final @NonNull String name,
final String description) {
this.name = name;
this.description = description == null ? "" : description;
}
-
- public static class UiSubscriber {
- @Order(PriorityPrecedence.LATE)
- @EventListener(RoleMemento.TitleUiEvent.class)
- public void on(final RoleMemento.TitleUiEvent ev) {
- var roleMemento = ev.getSource();
- assert roleMemento != null;
- ev.setTitle(roleMemento.getName());
- }
+
+ // -- OBJECT CONTRACT
+
+ @Override
+ public final boolean equals(Object obj) {
+ return (obj instanceof RoleMemento other)
+ ? name.equals(other.name)
+ : false;
}
-
- @PropertyLayout(fieldSetId = "identity", sequence = "1")
- @Getter
- String name;
-
+
+ @Override
+ public final int hashCode() {
+ return Objects.hashCode(name);
+ }
+
+ // -- DEPRECATIONS
+
/**
- * Excluded from {@link #equals(Object) equality} checks.
+ * @deprecated use {@link #name()} instead
*/
- @EqualsAndHashCode.Exclude
- @PropertyLayout(fieldSetId = "details", sequence = "1")
- @Getter
- String description;
+ @Programmatic @Deprecated public String getName() { return name(); }
+ /**
+ * @deprecated use {@link #description()} instead
+ */
+ @Programmatic @Deprecated public String getDescription() { return description(); }
}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java
index 19518c64ce2..de8b77d03d2 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java
@@ -29,9 +29,11 @@
import jakarta.inject.Named;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+
import org.springframework.context.event.EventListener;
import org.springframework.core.annotation.Order;
-import org.jspecify.annotations.Nullable;
import org.apache.causeway.applib.CausewayModuleApplib;
import org.apache.causeway.applib.annotation.Collection;
@@ -52,10 +54,6 @@
import org.apache.causeway.commons.internal.base._Strings;
import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import org.jspecify.annotations.NonNull;
-import lombok.With;
/**
* Immutable serializable value holding details about a user and its roles.
@@ -65,41 +63,110 @@
@Named(UserMemento.LOGICAL_TYPE_NAME)
@DomainObject(nature = Nature.VIEW_MODEL)
@DomainObjectLayout(titleUiEvent = UserMemento.TitleUiEvent.class)
-@lombok.Value @lombok.Builder
-public class UserMemento
-implements Serializable {
+@Builder(builderMethodName = "builderInternal")
+public record UserMemento(
+ /**
+ * The user's login name.
+ */
+ @Property
+ @PropertyLayout(fieldSetId = "identity", sequence = "1", describedAs = "user's login name")
+ @NonNull String name,
+
+ @Property(optionality = Optionality.OPTIONAL)
+ @PropertyLayout(fieldSetId = "details", sequence = "1")
+ @Nullable String realName,
+
+ @Property(optionality = Optionality.OPTIONAL)
+ @PropertyLayout(fieldSetId = "details", sequence = "2")
+ @Nullable URL avatarUrl,
- public static class TitleUiEvent extends CausewayModuleApplib.TitleUiEvent<UserMemento> {}
+ @Property(optionality = Optionality.OPTIONAL)
+ @PropertyLayout(fieldSetId = "regional", sequence = "1")
+ @Nullable Locale languageLocale,
- private void readObject(final ObjectInputStream ois) throws ClassNotFoundException, IOException {
- ois.defaultReadObject();
- }
+ @Property(optionality = Optionality.OPTIONAL)
+ @PropertyLayout(fieldSetId = "regional", sequence = "2")
+ @Nullable Locale numberFormatLocale,
+ @Property(optionality = Optionality.OPTIONAL)
+ @PropertyLayout(fieldSetId = "regional", sequence = "3")
+ @Nullable Locale timeFormatLocale,
+
+ /**
+ * To support external security mechanisms such as keycloak,
+ * where the validity of the session is defined by headers in the request.
+ */
+ @Property
+ @PropertyLayout(fieldSetId = "security", sequence = "1")
+ @NonNull AuthenticationSource authenticationSource,
+
+ @Property
+ @PropertyLayout(fieldSetId = "security", sequence = "3", named = "impersonating")
+ boolean isImpersonating,
+
+ /**
+ * Indicates which tenancy (or tenancies) this user has access to.
+ * <p>
+ * The interpretation of this token is implementation-specific.
+ */
+ @Property(optionality = Optionality.OPTIONAL)
+ @PropertyLayout(fieldSetId = "security", sequence = "2",
+ describedAs = "tenancy (or tenancies) this user has access to")
+ @Nullable String multiTenancyToken,
+
+ /**
+ * A unique code given to this user during authentication.
+ * <p>
+ * This can be used to confirm that the user has been authenticated.
+ * It should return an empty string {@literal ""}
+ * if this is an anonymous (unauthenticated) user.
+ */
+ @Property
+ @PropertyLayout(hidden = Where.EVERYWHERE)
+ @NonNull String authenticationCode,
+
+ /**
+ * The roles associated with this user.
+ */
+ @Collection
+ @CollectionLayout(sequence = "1", describedAs = "roles associated with this user")
+ @NonNull Can<RoleMemento> roles
+
+ ) implements Serializable {
+
+ public enum AuthenticationSource {
+ DEFAULT,
+ /**
+ * Instructs the <code>AuthenticationManager</code>
+ * to <i>not</i> cache this session in its internal map of sessions by validation code,
+ * and therefore to ignore this aspect when considering if an {@link InteractionContext} is valid or not.
+ */
+ EXTERNAL;
+ public boolean isExternal() { return this == EXTERNAL; }
+ }
+
+ public static class TitleUiEvent extends CausewayModuleApplib.TitleUiEvent<UserMemento> {}
public static final String LOGICAL_TYPE_NAME = CausewayModuleApplib.NAMESPACE + ".UserMemento";
/** Also used by the wicket-viewer and its AuthorizeInstantiation(...) annotations;
* the actual value is arbitrary; however, we use namespace style to clarify the origin*/
public static final String AUTHORIZED_USER_ROLE = "org.apache.causeway.security.AUTHORIZED_USER_ROLE";
- private static final long serialVersionUID = 7190090455587885367L;
private static final UserMemento SYSTEM_USER = UserMemento.ofName("__system");
+ private static final String DEFAULT_AUTH_VALID_CODE = "";
// -- FACTORIES
/**
* The framework's internal user with unrestricted privileges.
*/
- public static UserMemento system() {
- return SYSTEM_USER;
- }
+ public static UserMemento system() { return SYSTEM_USER; }
/**
* Creates a new user with the specified name and no roles.
*/
- public static UserMemento ofName(
- final @NonNull String name) {
-
- return builderWithDefaults(name)
+ public static UserMemento ofName(final @NonNull String name) {
+ return builder(name)
.roles(Can.empty())
.build();
}
@@ -110,8 +177,7 @@ public static UserMemento ofName(
public static UserMemento ofNameAndRoles(
final @NonNull String name,
final RoleMemento... roles) {
-
- return builderWithDefaults(name)
+ return builder(name)
.roles(Can.ofArray(roles))
.build();
}
@@ -140,8 +206,7 @@ public static UserMemento ofNameAndRoleNames(
public static UserMemento ofNameAndRoleNames(
final @NonNull String name,
final @NonNull Stream<String> roleNames) {
-
- return builderWithDefaults(name)
+ return builder(name)
.roles(roleNames
.map(RoleMemento::new)
.collect(Can.toCan()))
@@ -161,15 +226,6 @@ public void on(final UserMemento.TitleUiEvent ev) {
// -- PROPERTIES
- /**
- * The user's login name.
- */
- @Property
- @PropertyLayout(fieldSetId = "identity", sequence = "1")
- @Getter
- @NonNull
- String name;
-
@Programmatic
public String nameFormatted() {
return isImpersonating()
@@ -177,130 +233,11 @@ public String nameFormatted() {
: name;
}
- /**
- * Excluded from {@link #equals(Object) equality} checks.
- */
- @EqualsAndHashCode.Exclude
- @Property(optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSetId = "details", sequence = "1")
- @Getter @With(onMethod_ = {@Programmatic})
- @Nullable
- String realName;
-
- /**
- * Excluded from {@link #equals(Object) equality} checks.
- */
- @EqualsAndHashCode.Exclude
- @Property(optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSetId = "details", sequence = "2")
- @Getter @With(onMethod_ = {@Programmatic})
- @Nullable
- URL avatarUrl;
-
- /**
- * Excluded from {@link #equals(Object) equality} checks.
- */
- @EqualsAndHashCode.Exclude
- @Property(optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSetId = "regional", sequence = "1")
- @Getter @With(onMethod_ = {@Programmatic})
- @Nullable
- Locale languageLocale;
-
- /**
- * Excluded from {@link #equals(Object) equality} checks.
- */
- @EqualsAndHashCode.Exclude
- @Property(optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSetId = "regional", sequence = "2")
- @Getter @With(onMethod_ = {@Programmatic})
- @Nullable
- Locale numberFormatLocale;
-
- /**
- * Excluded from {@link #equals(Object) equality} checks.
- */
- @EqualsAndHashCode.Exclude
- @Property(optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSetId = "regional", sequence = "3")
- @Getter @With(onMethod_ = {@Programmatic})
- @Nullable
- Locale timeFormatLocale;
-
- /**
- * To support external security mechanisms such as keycloak,
- * where the validity of the session is defined by headers in the request.
- */
- @Property
- @PropertyLayout(fieldSetId = "security", sequence = "1")
- @Getter @Builder.Default @With(onMethod_ = {@Programmatic})
- @NonNull
- AuthenticationSource authenticationSource = AuthenticationSource.DEFAULT;
-
- public enum AuthenticationSource {
- DEFAULT,
- /**
- * Instructs the <code>AuthenticationManager</code>
- * to <i>not</i> cache this session in its internal map of sessions by validation code,
- * and therefore to ignore this aspect when considering if an {@link InteractionContext} is valid or not.
- */
- EXTERNAL;
-
- public boolean isExternal() {
- return this == EXTERNAL;
- }
- }
-
- @Property(optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSetId = "security", sequence = "3")
- @Getter @Builder.Default @With(onMethod_ = {@Programmatic})
- boolean impersonating = false;
-
- /**
- * Indicates which tenancy (or tenancies) this user has access to.
- *
- * <p>
- * The interpretation of this token is implementation-specific.
- * </p>
- */
- @Property(optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSetId = "security", sequence = "2")
- @Getter @With(onMethod_ = {@Programmatic})
- @Nullable
- String multiTenancyToken;
-
- private static final String DEFAULT_AUTH_VALID_CODE = "";
-
- /**
- * A unique code given to this user during authentication.
- * <p>
- * This can be used to confirm that the user has been authenticated.
- * It should return an empty string {@literal ""}
- * if this is an anonymous (unauthenticated) user.
- */
- @Property
- @PropertyLayout(hidden = Where.EVERYWHERE)
- @Getter @Builder.Default @With(onMethod_ = {@Programmatic})
- @NonNull
- String authenticationCode = DEFAULT_AUTH_VALID_CODE;
-
- /**
- * The roles associated with this user.
- */
- @Collection
- @CollectionLayout(sequence = "1")
- public List<RoleMemento> getRoles() {
- return roles.toList();
- }
-
- @Builder.Default
- private Can<RoleMemento> roles = Can.empty();
-
@Programmatic
public UserMemento withRoleAdded(final String role) {
return asBuilder()
- .roles(roles.add(new RoleMemento(role)))
- .build();
+ .roles(roles.add(new RoleMemento(role)))
+ .build();
}
/**
@@ -318,7 +255,7 @@ public boolean isCurrentUser(final @Nullable String userName) {
@Programmatic
public Stream<String> streamRoleNames() {
return roles.stream()
- .map(RoleMemento::getName);
+ .map(RoleMemento::name);
}
@Programmatic
@@ -327,7 +264,7 @@ public boolean hasRoleName(final @Nullable String roleName) {
}
/**
- * Whether this {@link UserMemento}'s {@link UserMemento#getRoles() roles} contains the {@link SudoService}'s
+ * Whether this {@link UserMemento}'s {@link UserMemento#roles() roles} contains the {@link SudoService}'s
* {@link SudoService#ACCESS_ALL_ROLE ACCESS_ALL_ROLE} role (meaning that security checks are disabled).
*/
@Programmatic
@@ -340,7 +277,7 @@ public boolean hasSudoAccessAllRole() {
@Programmatic
public UserMementoBuilder asBuilder() {
//XXX update whenever new fields are added
- return UserMemento.builder()
+ return UserMemento.builderInternal()
.name(name)
.authenticationCode(authenticationCode)
.authenticationSource(authenticationSource)
@@ -348,7 +285,7 @@ public UserMementoBuilder asBuilder() {
.languageLocale(languageLocale)
.numberFormatLocale(numberFormatLocale)
.timeFormatLocale(timeFormatLocale)
- .impersonating(impersonating)
+ .isImpersonating(isImpersonating)
.realName(realName)
.multiTenancyToken(multiTenancyToken)
.roles(roles);
@@ -369,16 +306,94 @@ public UserLocale asUserLocale() {
: main)
.build();
}
-
- // -- HELPER
-
- private static UserMementoBuilder builderWithDefaults(final String name) {
+
+ public static UserMementoBuilder builder(final String name) {
if (_Strings.isEmpty(name)) {
throw new IllegalArgumentException("Name not specified");
}
- // actually using @Builder.Default on the fields to set builder defaults
- return UserMemento.builder()
- .name(name);
+ return UserMemento.builderInternal()
+ .name(name)
+ .authenticationSource(AuthenticationSource.DEFAULT)
+ .authenticationCode(DEFAULT_AUTH_VALID_CODE)
+ .roles(Can.empty());
+ }
+
+ // -- WITHERS
+
+ @Programmatic public UserMemento withRealName(String realName) {
+ return asBuilder().realName(realName).build();
+ }
+ @Programmatic public UserMemento withAvatarUrl(URL avatarUrl) {
+ return asBuilder().avatarUrl(avatarUrl).build();
+ }
+ @Programmatic public UserMemento withImpersonating(boolean impersonating) {
+ return asBuilder().isImpersonating(impersonating).build();
+ }
+ @Programmatic public UserMemento withAuthenticationCode(String authenticationCode) {
+ return asBuilder().authenticationCode(authenticationCode).build();
+ }
+ @Programmatic public UserMemento withAuthenticationSource(AuthenticationSource authenticationSource) {
+ return asBuilder().authenticationSource(authenticationSource).build();
+ }
+ @Programmatic public UserMemento withMultiTenancyToken(String multiTenancyToken) {
+ return asBuilder().multiTenancyToken(multiTenancyToken).build();
+ }
+ @Programmatic public UserMemento withLanguageLocale(Locale languageLocale) {
+ return asBuilder().languageLocale(languageLocale).build();
+ }
+ @Programmatic public UserMemento withNumberFormatLocale(Locale numberFormatLocale) {
+ return asBuilder().numberFormatLocale(numberFormatLocale).build();
+ }
+ @Programmatic public UserMemento withTimeFormatLocale(Locale timeFormatLocale) {
+ return asBuilder().timeFormatLocale(timeFormatLocale).build();
+ }
+
+ // -- OBJECT CONTRACT
+
+ @Override
+ public final boolean equals(Object obj) {
+ return (obj instanceof UserMemento other)
+ ? isImpersonating == other.isImpersonating
+ && Objects.equals(name, other.name)
+ && Objects.equals(authenticationSource, other.authenticationSource)
+ && Objects.equals(multiTenancyToken, other.multiTenancyToken)
+ && Objects.equals(authenticationCode, other.authenticationCode)
+ && Objects.equals(roles, other.roles)
+ : false;
+ }
+
+ @Override
+ public final int hashCode() {
+ return Objects.hash(isImpersonating, name, authenticationSource, multiTenancyToken, authenticationCode, roles);
+ }
+
+ // -- HELPER
+
+ private void readObject(final ObjectInputStream ois) throws ClassNotFoundException, IOException {
+ ois.defaultReadObject();
}
+
+ // -- DEPRECATIONS
+
+ /** @deprecated use {@link #name()} instead */
+ @Programmatic @Deprecated public String getName() { return name(); }
+ /** @deprecated use {@link #authenticationCode()} instead */
+ @Programmatic @Deprecated public String getAuthenticationCode() { return authenticationCode(); }
+ /** @deprecated use {@link #authenticationSource()} instead */
+ @Programmatic @Deprecated public AuthenticationSource getAuthenticationSource() { return authenticationSource(); }
+ /** @deprecated use {@link #avatarUrl()} instead */
+ @Programmatic @Deprecated public URL getAvatarUrl() { return avatarUrl(); }
+ /** @deprecated use {@link #realName()} instead */
+ @Programmatic @Deprecated public String getRealName() { return realName(); }
+ /** @deprecated use {@link #languageLocale()} instead */
+ @Programmatic @Deprecated public Locale getLanguageLocale() { return languageLocale(); }
+ /** @deprecated use {@link #numberFormatLocale()} instead */
+ @Programmatic @Deprecated public Locale getnumberFormatLocale() { return numberFormatLocale(); }
+ /** @deprecated use {@link #timeFormatLocale()} instead */
+ @Programmatic @Deprecated public Locale getTimeFormatLocale() { return timeFormatLocale(); }
+ /** @deprecated use {@link #multiTenancyToken()} instead */
+ @Programmatic @Deprecated public String getMultiTenancyToken() { return multiTenancyToken(); }
+ /** @deprecated use {@link #roles()} instead */
+ @Programmatic @Deprecated public List<RoleMemento> getRoles() { return roles().toList(); }
}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserService.java
index 660b02e8e4e..8561978d42f 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserService.java
@@ -143,7 +143,7 @@ public UserMemento currentUserElseFail() {
* {@link UserMemento}.
*/
public Optional<String> currentUserName() {
- return currentUser().map(UserMemento::getName);
+ return currentUser().map(UserMemento::name);
}
/**
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl.java b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl.java
index 0413b624e42..4017f5eb6bc 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl.java
@@ -223,9 +223,9 @@ private String logMessage() {
buf.append(" ").append(getMethod().getName()).append(" ");
if(getBookmark() != null) {
buf.append(" on '")
- .append(getBookmark().getLogicalTypeName())
+ .append(getBookmark().logicalTypeName())
.append(":")
- .append(getBookmark().getIdentifier())
+ .append(getBookmark().identifier())
.append("'");
}
}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/xactn/TransactionId.java b/api/applib/src/main/java/org/apache/causeway/applib/services/xactn/TransactionId.java
index e41617023af..c2fcfd2ab2a 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/xactn/TransactionId.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/xactn/TransactionId.java
@@ -22,67 +22,53 @@
import org.apache.causeway.applib.mixins.system.HasInteractionIdAndSequence;
-import lombok.Value;
-
/**
* Value type used to identify a transaction within the context of an
* outer {@link org.apache.causeway.applib.services.iactn.Interaction}.
- *
* <p>
- * The transaction and
- * {@link org.apache.causeway.applib.services.iactn.Interaction} are associated
- * by the {@link #getInteractionId() uniqueId}.
- * </p>
- *
+ * The transaction and
+ * {@link org.apache.causeway.applib.services.iactn.Interaction} are associated
+ * by the {@link #getInteractionId() uniqueId}.
* <p>
- * Obtainable from {@link TransactionService#currentTransactionId()}.
- * </p>
+ * Obtainable from {@link TransactionService#currentTransactionId()}.
*
* @since 2.0 {@index}
*/
-@Value(staticConstructor = "of")
-public class TransactionId implements HasInteractionIdAndSequence {
-
+public record TransactionId(
/**
* The unique identifier of the outer
* {@link org.apache.causeway.applib.services.iactn.Interaction}.
- *
* <p>
- * Together with {@link #getSequence()}, this makes up the
- * implementation of {@link HasInteractionIdAndSequence}
- * </p>
+ * Together with {@link #getSequence()}, this makes up the
+ * implementation of {@link HasInteractionIdAndSequence}
*/
- UUID interactionId;
+ UUID interactionId,
/**
* Identifies the transaction (there could be multiple) within the
* {@link org.apache.causeway.applib.services.iactn.Interaction}.
- *
* <p>
- * Together with {@link #getInteractionId()}, this makes up the
- * implementation of {@link HasInteractionIdAndSequence}
- * </p>
+ * Together with {@link #getInteractionId()}, this makes up the
+ * implementation of {@link HasInteractionIdAndSequence}
*/
- int sequence;
+ int sequence,
/**
* Identifies the persistence context that this {@link TransactionId} was
* created for.
- *
* <p>
* Useful when there are multiple persistence contexts configured.
* There are no constraints to format of this String, it is left for the
- * implementation to ensure that the string is a uniqie identifier to
+ * implementation to ensure that the string is a unique identifier to
* the context.
- * </p>
*/
- String context;
+ String context
+ ) implements HasInteractionIdAndSequence {
// -- EMPTY
private static final TransactionId EMPTY =
- TransactionId
- .of(UUID.fromString("0000-00-00-00-000000"), 0, "");
+ new TransactionId(UUID.fromString("0000-00-00-00-000000"), 0, "");
/**
* Factory method that returns a nominally "empty" transaction
@@ -91,5 +77,9 @@ public class TransactionId implements HasInteractionIdAndSequence {
public static TransactionId empty() {
return EMPTY;
}
+
+ @Override public UUID getInteractionId() { return interactionId; }
+ @Override public int getSequence() { return sequence; }
+
}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/xactn/TransactionalProcessor.java b/api/applib/src/main/java/org/apache/causeway/applib/services/xactn/TransactionalProcessor.java
index 1165090fda4..85cb669c7fc 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/xactn/TransactionalProcessor.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/xactn/TransactionalProcessor.java
@@ -46,7 +46,6 @@ public interface TransactionalProcessor {
* @param def - transaction definition, in particular whether to use existing or start new transaction. Requires only a single {@link org.springframework.transaction.PlatformTransactionManager} to be configured (unless a {@link org.springframework.transaction.support.TransactionTemplate} is provided which wraps a specific {@link org.springframework.transaction.PlatformTransactionManager}.
* @param callable - the work to be performed within the transaction.
* @return {@link Try} of calling given {@code callable}
- * @return {@link Try} of calling given {@code callable}
*/
<T> Try<T> callTransactional(TransactionDefinition def, Callable<T> callable);
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionDtoUtils.java b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionDtoUtils.java
index 158cf4c1ee4..e4631b6dc3e 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/InteractionDtoUtils.java
@@ -233,7 +233,7 @@ private MemberExecutionDto newMemberExecutionDto(
}
static String deriveLogicalMemberId(final Bookmark bookmark, final String memberId) {
- final String logicalTypeName = bookmark.getLogicalTypeName();
+ final String logicalTypeName = bookmark.logicalTypeName();
final int hashAt = memberId.lastIndexOf("#");
final String localMemberId = hashAt >= 0 && hashAt < memberId.length()
? memberId.substring(hashAt + 1)
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/bookmark/BookmarkTest.java b/api/applib/src/test/java/org/apache/causeway/applib/services/bookmark/BookmarkTest.java
index 0b052bfd9df..74e6ae70da6 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/services/bookmark/BookmarkTest.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/services/bookmark/BookmarkTest.java
@@ -29,45 +29,37 @@ class BookmarkTest {
@Test
void shouldParse_whenExactly2Token() {
-
var bookmark = Bookmark.parse("a:b").get();
- assertEquals("a", bookmark.getLogicalTypeName());
- assertEquals("b", bookmark.getIdentifier());
-
+ assertEquals("a", bookmark.logicalTypeName());
+ assertEquals("b", bookmark.identifier());
}
@Test
void shouldNotParse_whenNotAtLeast1TokenOrInvalid() {
-
assertEquals(Optional.empty(), Bookmark.parse(null));
assertEquals(Optional.empty(), Bookmark.parse(""));
//assertEquals(Optional.empty(), Bookmark.parse("a"));
assertEquals(Optional.empty(), Bookmark.parse("a:"));
assertEquals(Optional.empty(), Bookmark.parse(":"));
assertEquals(Optional.empty(), Bookmark.parse(":b"));
-
}
@Test
void shouldParse_when1Token() {
-
var bookmark = Bookmark.parse("a").get();
- assertEquals("a", bookmark.getLogicalTypeName());
+ assertEquals("a", bookmark.logicalTypeName());
assertTrue(bookmark.isEmpty());
- assertEquals(null, bookmark.getIdentifier());
-
+ assertEquals(null, bookmark.identifier());
}
@Test
void shouldParse_whenMoreThan2Token() {
-
var bookmark = Bookmark.parse("a:b:c").get();
- assertEquals("a", bookmark.getLogicalTypeName());
- assertEquals("b:c", bookmark.getIdentifier());
-
+ assertEquals("a", bookmark.logicalTypeName());
+ assertEquals("b:c", bookmark.identifier());
}
}
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java b/api/applib/src/test/java/org/apache/causeway/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java
index 7dd8aae629c..10fcb80441d 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java
@@ -49,7 +49,7 @@ public BarException() {
@Test
public void whenRecognized() {
ersForType = new ExceptionRecognizerForType(FooException.class);
- assertThat(ersForType.recognize(new FooException()).get().getReason(), is("foo"));
+ assertThat(ersForType.recognize(new FooException()).get().reason(), is("foo"));
}
@Test
@@ -61,7 +61,7 @@ public void whenDoesNotRecognize() {
@Test
public void whenRecognizedWithMessageParser() {
ersForType = new ExceptionRecognizerForType(FooException.class, rootCauseMessageFormatter);
- assertThat(ersForType.recognize(new FooException()).get().getReason(), is("pre: foo"));
+ assertThat(ersForType.recognize(new FooException()).get().reason(), is("pre: foo"));
}
}
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java b/api/applib/src/test/java/org/apache/causeway/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java
index 8ed5752acc3..b72f4952507 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java
@@ -43,7 +43,7 @@ public FooException() {
@Test
public void whenRecognized() {
ersGeneral = new ExceptionRecognizerAbstract(ALWAYS_TRUE){};
- assertThat(ersGeneral.recognize(new FooException()).get().getReason(), is("foo"));
+ assertThat(ersGeneral.recognize(new FooException()).get().reason(), is("foo"));
}
@Test
@@ -55,7 +55,7 @@ public void whenDoesNotRecognize() {
@Test
public void whenRecognizedWithMessageParser() {
ersGeneral = new ExceptionRecognizerAbstract(ALWAYS_TRUE, ex->"pre: " + ex.getMessage()){};
- assertThat(ersGeneral.recognize(new FooException()).get().getReason(), is("pre: foo"));
+ assertThat(ersGeneral.recognize(new FooException()).get().reason(), is("pre: foo"));
}
}
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/user/RoleMemento_value_Test.java b/api/applib/src/test/java/org/apache/causeway/applib/services/user/RoleMemento_value_Test.java
index 8583cf9e3c1..8c349f2e0b0 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/services/user/RoleMemento_value_Test.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/services/user/RoleMemento_value_Test.java
@@ -29,18 +29,18 @@ class RoleMemento_value_Test extends ValueTypeContractTestAbstract<RoleMemento>
@Override
protected List<RoleMemento> getObjectsWithSameValue() {
return Arrays.asList(SudoService.ACCESS_ALL_ROLE,
- new RoleMemento(SudoService.ACCESS_ALL_ROLE.getName(), SudoService.ACCESS_ALL_ROLE.getDescription()),
- new RoleMemento(SudoService.ACCESS_ALL_ROLE.getName(), SudoService.ACCESS_ALL_ROLE.getDescription()),
- new RoleMemento(SudoService.ACCESS_ALL_ROLE.getName(), ""),
- new RoleMemento(SudoService.ACCESS_ALL_ROLE.getName())
+ new RoleMemento(SudoService.ACCESS_ALL_ROLE.name(), SudoService.ACCESS_ALL_ROLE.description()),
+ new RoleMemento(SudoService.ACCESS_ALL_ROLE.name(), SudoService.ACCESS_ALL_ROLE.description()),
+ new RoleMemento(SudoService.ACCESS_ALL_ROLE.name(), ""),
+ new RoleMemento(SudoService.ACCESS_ALL_ROLE.name())
);
}
@Override
protected List<RoleMemento> getObjectsWithDifferentValue() {
return Arrays.asList(
- new RoleMemento(SudoService.ACCESS_ALL_ROLE.getName() + "x"),
- new RoleMemento(SudoService.ACCESS_ALL_ROLE.getName() + "y")
+ new RoleMemento(SudoService.ACCESS_ALL_ROLE.name() + "x"),
+ new RoleMemento(SudoService.ACCESS_ALL_ROLE.name() + "y")
);
}
}
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_Test.java b/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_Test.java
index 03f5ef21ee5..cf04b22f7b7 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_Test.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_Test.java
@@ -38,10 +38,10 @@ void name_only() {
var userMemento = UserMemento.ofName("fredflintstone");
// then original unchanged
- Assertions.assertThat(userMemento.getName()).isEqualTo("fredflintstone");
- Assertions.assertThat(userMemento.getRoles().size()).isEqualTo(0);
- Assertions.assertThat(userMemento.getRealName()).isNull();
- Assertions.assertThat(userMemento.getAvatarUrl()).isNull();
+ Assertions.assertThat(userMemento.name()).isEqualTo("fredflintstone");
+ Assertions.assertThat(userMemento.roles().size()).isEqualTo(0);
+ Assertions.assertThat(userMemento.realName()).isNull();
+ Assertions.assertThat(userMemento.avatarUrl()).isNull();
}
@Test
@@ -51,12 +51,12 @@ void name_and_roles() {
var userMemento = UserMemento.ofNameAndRoleNames("fredflintstone", "CAVEMAN", "HUSBAND");
// then
- Assertions.assertThat(userMemento.getName()).isEqualTo("fredflintstone");
- Assertions.assertThat(userMemento.getRoles().size()).isEqualTo(2);
+ Assertions.assertThat(userMemento.name()).isEqualTo("fredflintstone");
+ Assertions.assertThat(userMemento.roles().size()).isEqualTo(2);
Assertions.assertThat(userMemento.streamRoleNames()).anyMatch(x -> x.equals("CAVEMAN"));
Assertions.assertThat(userMemento.streamRoleNames()).anyMatch(x -> x.equals("HUSBAND"));
- Assertions.assertThat(userMemento.getRealName()).isNull();
- Assertions.assertThat(userMemento.getAvatarUrl()).isNull();
+ Assertions.assertThat(userMemento.realName()).isNull();
+ Assertions.assertThat(userMemento.avatarUrl()).isNull();
}
}
@@ -75,18 +75,18 @@ void user_and_roles_preserved_and_real_name_set() {
Assertions.assertThat(userMemento2).isNotSameAs(userMemento);
// then copy correct
- Assertions.assertThat(userMemento2.getName()).isEqualTo("fredflintstone");
- Assertions.assertThat(userMemento2.getRoles().size()).isEqualTo(2);
+ Assertions.assertThat(userMemento2.name()).isEqualTo("fredflintstone");
+ Assertions.assertThat(userMemento2.roles().size()).isEqualTo(2);
Assertions.assertThat(userMemento2.streamRoleNames()).anyMatch(x -> x.equals("CAVEMAN"));
Assertions.assertThat(userMemento2.streamRoleNames()).anyMatch(x -> x.equals("HUSBAND"));
- Assertions.assertThat(userMemento2.getRealName()).isEqualTo("Fred Flintstone");
+ Assertions.assertThat(userMemento2.realName()).isEqualTo("Fred Flintstone");
// then original unchanged
- Assertions.assertThat(userMemento.getName()).isEqualTo("fredflintstone");
- Assertions.assertThat(userMemento.getRoles().size()).isEqualTo(2);
+ Assertions.assertThat(userMemento.name()).isEqualTo("fredflintstone");
+ Assertions.assertThat(userMemento.roles().size()).isEqualTo(2);
Assertions.assertThat(userMemento.streamRoleNames()).anyMatch(x -> x.equals("CAVEMAN"));
Assertions.assertThat(userMemento.streamRoleNames()).anyMatch(x -> x.equals("HUSBAND"));
- Assertions.assertThat(userMemento.getRealName()).isNull();
+ Assertions.assertThat(userMemento.realName()).isNull();
}
@Test
@@ -102,20 +102,20 @@ void user_and_roles_and_avatarUrl_preserved_and_real_name_set() throws Malformed
Assertions.assertThat(userMemento2).isNotSameAs(userMemento);
// then copy correct
- Assertions.assertThat(userMemento2.getName()).isEqualTo("fredflintstone");
- Assertions.assertThat(userMemento2.getRoles().size()).isEqualTo(2);
+ Assertions.assertThat(userMemento2.name()).isEqualTo("fredflintstone");
+ Assertions.assertThat(userMemento2.roles().size()).isEqualTo(2);
Assertions.assertThat(userMemento2.streamRoleNames()).anyMatch(x -> x.equals("CAVEMAN"));
Assertions.assertThat(userMemento2.streamRoleNames()).anyMatch(x -> x.equals("HUSBAND"));
- Assertions.assertThat(userMemento2.getAvatarUrl()).isEqualTo(url("https://upload.wikimedia.org/wikipedia/en/a/ad/Fred_Flintstone.png"));
- Assertions.assertThat(userMemento2.getRealName()).isEqualTo("Fred Flintstone");
+ Assertions.assertThat(userMemento2.avatarUrl()).isEqualTo(url("https://upload.wikimedia.org/wikipedia/en/a/ad/Fred_Flintstone.png"));
+ Assertions.assertThat(userMemento2.realName()).isEqualTo("Fred Flintstone");
// then original unchanged
- Assertions.assertThat(userMemento.getName()).isEqualTo("fredflintstone");
- Assertions.assertThat(userMemento.getRoles().size()).isEqualTo(2);
+ Assertions.assertThat(userMemento.name()).isEqualTo("fredflintstone");
+ Assertions.assertThat(userMemento.roles().size()).isEqualTo(2);
Assertions.assertThat(userMemento.streamRoleNames()).anyMatch(x -> x.equals("CAVEMAN"));
Assertions.assertThat(userMemento.streamRoleNames()).anyMatch(x -> x.equals("HUSBAND"));
- Assertions.assertThat(userMemento.getAvatarUrl()).isEqualTo(url("https://upload.wikimedia.org/wikipedia/en/a/ad/Fred_Flintstone.png"));
- Assertions.assertThat(userMemento.getRealName()).isNull();
+ Assertions.assertThat(userMemento.avatarUrl()).isEqualTo(url("https://upload.wikimedia.org/wikipedia/en/a/ad/Fred_Flintstone.png"));
+ Assertions.assertThat(userMemento.realName()).isNull();
}
}
@@ -135,18 +135,18 @@ void user_and_roles_preserved_and_avatarUrl_set() throws MalformedURLException {
Assertions.assertThat(userMemento2).isNotSameAs(userMemento);
// then copy correct
- Assertions.assertThat(userMemento2.getName()).isEqualTo("fredflintstone");
- Assertions.assertThat(userMemento2.getRoles().size()).isEqualTo(2);
+ Assertions.assertThat(userMemento2.name()).isEqualTo("fredflintstone");
+ Assertions.assertThat(userMemento2.roles().size()).isEqualTo(2);
Assertions.assertThat(userMemento2.streamRoleNames()).anyMatch(x -> x.equals("CAVEMAN"));
Assertions.assertThat(userMemento2.streamRoleNames()).anyMatch(x -> x.equals("HUSBAND"));
- Assertions.assertThat(userMemento2.getAvatarUrl()).isEqualTo(url("https://upload.wikimedia.org/wikipedia/en/a/ad/Fred_Flintstone.png"));
+ Assertions.assertThat(userMemento2.avatarUrl()).isEqualTo(url("https://upload.wikimedia.org/wikipedia/en/a/ad/Fred_Flintstone.png"));
// then original unchanged
- Assertions.assertThat(userMemento.getName()).isEqualTo("fredflintstone");
- Assertions.assertThat(userMemento.getRoles().size()).isEqualTo(2);
+ Assertions.assertThat(userMemento.name()).isEqualTo("fredflintstone");
+ Assertions.assertThat(userMemento.roles().size()).isEqualTo(2);
Assertions.assertThat(userMemento.streamRoleNames()).anyMatch(x -> x.equals("CAVEMAN"));
Assertions.assertThat(userMemento.streamRoleNames()).anyMatch(x -> x.equals("HUSBAND"));
- Assertions.assertThat(userMemento.getAvatarUrl()).isNull();
+ Assertions.assertThat(userMemento.avatarUrl()).isNull();
}
@Test
@@ -162,20 +162,20 @@ void user_and_roles_and_real_name_preserved_and_avatarUrl_set() throws Malformed
Assertions.assertThat(userMemento2).isNotSameAs(userMemento);
// then copy correct
- Assertions.assertThat(userMemento2.getName()).isEqualTo("fredflintstone");
- Assertions.assertThat(userMemento2.getRoles().size()).isEqualTo(2);
+ Assertions.assertThat(userMemento2.name()).isEqualTo("fredflintstone");
+ Assertions.assertThat(userMemento2.roles().size()).isEqualTo(2);
Assertions.assertThat(userMemento2.streamRoleNames()).anyMatch(x -> x.equals("CAVEMAN"));
Assertions.assertThat(userMemento2.streamRoleNames()).anyMatch(x -> x.equals("HUSBAND"));
- Assertions.assertThat(userMemento2.getAvatarUrl()).isEqualTo(url("https://upload.wikimedia.org/wikipedia/en/a/ad/Fred_Flintstone.png"));
- Assertions.assertThat(userMemento2.getRealName()).isEqualTo("Fred Flintstone");
+ Assertions.assertThat(userMemento2.avatarUrl()).isEqualTo(url("https://upload.wikimedia.org/wikipedia/en/a/ad/Fred_Flintstone.png"));
+ Assertions.assertThat(userMemento2.realName()).isEqualTo("Fred Flintstone");
// then original unchanged
- Assertions.assertThat(userMemento.getName()).isEqualTo("fredflintstone");
- Assertions.assertThat(userMemento.getRoles().size()).isEqualTo(2);
+ Assertions.assertThat(userMemento.name()).isEqualTo("fredflintstone");
+ Assertions.assertThat(userMemento.roles().size()).isEqualTo(2);
Assertions.assertThat(userMemento.streamRoleNames()).anyMatch(x -> x.equals("CAVEMAN"));
Assertions.assertThat(userMemento.streamRoleNames()).anyMatch(x -> x.equals("HUSBAND"));
- Assertions.assertThat(userMemento.getRealName()).isEqualTo("Fred Flintstone");
- Assertions.assertThat(userMemento.getAvatarUrl()).isNull();
+ Assertions.assertThat(userMemento.realName()).isEqualTo("Fred Flintstone");
+ Assertions.assertThat(userMemento.avatarUrl()).isNull();
}
}
@@ -195,15 +195,15 @@ void user_and_roles_preserved_and_role_added() throws MalformedURLException {
Assertions.assertThat(userMemento2).isNotSameAs(userMemento);
// then copy correct
- Assertions.assertThat(userMemento2.getName()).isEqualTo("fredflintstone");
- Assertions.assertThat(userMemento2.getRoles().size()).isEqualTo(3);
+ Assertions.assertThat(userMemento2.name()).isEqualTo("fredflintstone");
+ Assertions.assertThat(userMemento2.roles().size()).isEqualTo(3);
Assertions.assertThat(userMemento2.streamRoleNames()).anyMatch(x -> x.equals("CAVEMAN"));
Assertions.assertThat(userMemento2.streamRoleNames()).anyMatch(x -> x.equals("HUSBAND"));
Assertions.assertThat(userMemento2.streamRoleNames()).anyMatch(x -> x.equals("WICKET_ROLE"));
// then original unchanged
- Assertions.assertThat(userMemento.getName()).isEqualTo("fredflintstone");
- Assertions.assertThat(userMemento.getRoles().size()).isEqualTo(2);
+ Assertions.assertThat(userMemento.name()).isEqualTo("fredflintstone");
+ Assertions.assertThat(userMemento.roles().size()).isEqualTo(2);
Assertions.assertThat(userMemento.streamRoleNames()).anyMatch(x -> x.equals("CAVEMAN"));
Assertions.assertThat(userMemento.streamRoleNames()).anyMatch(x -> x.equals("HUSBAND"));
}
@@ -248,10 +248,10 @@ void user_and_roles_preserved_and_impersonating_flag_set() throws MalformedURLEx
Assertions.assertThat(userMemento2).isNotSameAs(userMemento);
// then copy correct
- Assertions.assertThat(userMemento2.getMultiTenancyToken()).isEqualTo("/ITA");
+ Assertions.assertThat(userMemento2.multiTenancyToken()).isEqualTo("/ITA");
// then original unchanged
- Assertions.assertThat(userMemento.getMultiTenancyToken()).isNull();
+ Assertions.assertThat(userMemento.multiTenancyToken()).isNull();
}
}
@@ -271,12 +271,12 @@ void happy_case() throws MalformedURLException {
;
// then
- Assertions.assertThat(userMemento.getName()).isEqualTo("fredflintstone");
- Assertions.assertThat(userMemento.getRoles().size()).isEqualTo(2);
+ Assertions.assertThat(userMemento.name()).isEqualTo("fredflintstone");
+ Assertions.assertThat(userMemento.roles().size()).isEqualTo(2);
Assertions.assertThat(userMemento.streamRoleNames()).anyMatch(x -> x.equals("CAVEMAN"));
Assertions.assertThat(userMemento.streamRoleNames()).anyMatch(x -> x.equals("HUSBAND"));
- Assertions.assertThat(userMemento.getAvatarUrl()).isEqualTo(url("https://upload.wikimedia.org/wikipedia/en/a/ad/Fred_Flintstone.png"));
- Assertions.assertThat(userMemento.getRealName()).isEqualTo("Fred Flintstone");
+ Assertions.assertThat(userMemento.avatarUrl()).isEqualTo(url("https://upload.wikimedia.org/wikipedia/en/a/ad/Fred_Flintstone.png"));
+ Assertions.assertThat(userMemento.realName()).isEqualTo("Fred Flintstone");
Assertions.assertThat(userMemento.isImpersonating()).isFalse();
// and when
@@ -286,24 +286,24 @@ void happy_case() throws MalformedURLException {
Assertions.assertThat(userMemento2).isNotSameAs(userMemento);
// then copy correct
- Assertions.assertThat(userMemento2.getName()).isEqualTo("fredflintstone");
- Assertions.assertThat(userMemento2.getRoles().size()).isEqualTo(2);
+ Assertions.assertThat(userMemento2.name()).isEqualTo("fredflintstone");
+ Assertions.assertThat(userMemento2.roles().size()).isEqualTo(2);
Assertions.assertThat(userMemento2.streamRoleNames()).anyMatch(x -> x.equals("CAVEMAN"));
Assertions.assertThat(userMemento2.streamRoleNames()).anyMatch(x -> x.equals("HUSBAND"));
- Assertions.assertThat(userMemento2.getAvatarUrl()).isEqualTo(url("https://upload.wikimedia.org/wikipedia/en/a/ad/Fred_Flintstone.png"));
- Assertions.assertThat(userMemento2.getRealName()).isEqualTo("Fred Flintstone");
+ Assertions.assertThat(userMemento2.avatarUrl()).isEqualTo(url("https://upload.wikimedia.org/wikipedia/en/a/ad/Fred_Flintstone.png"));
+ Assertions.assertThat(userMemento2.realName()).isEqualTo("Fred Flintstone");
Assertions.assertThat(userMemento2.isImpersonating()).isTrue();
- Assertions.assertThat(userMemento2.getMultiTenancyToken()).isEqualTo("/USA/Bedrock");
+ Assertions.assertThat(userMemento2.multiTenancyToken()).isEqualTo("/USA/Bedrock");
// then original unchanged
- Assertions.assertThat(userMemento.getName()).isEqualTo("fredflintstone");
- Assertions.assertThat(userMemento.getRoles().size()).isEqualTo(2);
+ Assertions.assertThat(userMemento.name()).isEqualTo("fredflintstone");
+ Assertions.assertThat(userMemento.roles().size()).isEqualTo(2);
Assertions.assertThat(userMemento.streamRoleNames()).anyMatch(x -> x.equals("CAVEMAN"));
Assertions.assertThat(userMemento.streamRoleNames()).anyMatch(x -> x.equals("HUSBAND"));
- Assertions.assertThat(userMemento.getAvatarUrl()).isEqualTo(url("https://upload.wikimedia.org/wikipedia/en/a/ad/Fred_Flintstone.png"));
- Assertions.assertThat(userMemento.getRealName()).isEqualTo("Fred Flintstone");
+ Assertions.assertThat(userMemento.avatarUrl()).isEqualTo(url("https://upload.wikimedia.org/wikipedia/en/a/ad/Fred_Flintstone.png"));
+ Assertions.assertThat(userMemento.realName()).isEqualTo("Fred Flintstone");
Assertions.assertThat(userMemento.isImpersonating()).isFalse();
- Assertions.assertThat(userMemento.getMultiTenancyToken()).isEqualTo("/USA/Bedrock");
+ Assertions.assertThat(userMemento.multiTenancyToken()).isEqualTo("/USA/Bedrock");
}
}
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_contains_Test.java b/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_contains_Test.java
index 599aa9cfea5..c317dd172c8 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_contains_Test.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_contains_Test.java
@@ -28,32 +28,28 @@ class UserMemento_contains_Test {
@Test
void when_contains_instance() {
-
// given
- UserMemento userMemento = UserMemento.builder().name("foo").roles(Can.ofSingleton(SudoService.ACCESS_ALL_ROLE)).build();
+ UserMemento userMemento = UserMemento.builder("foo").roles(Can.ofSingleton(SudoService.ACCESS_ALL_ROLE)).build();
// when, then
- Assertions.assertThat(userMemento.getRoles()).contains(SudoService.ACCESS_ALL_ROLE);
-
+ Assertions.assertThat(userMemento.roles().toList()).contains(SudoService.ACCESS_ALL_ROLE);
}
@Test
void when_contains_equivalent() {
-
// given
- UserMemento userMemento = UserMemento.builder().name("foo").roles(Can.ofSingleton(SudoService.ACCESS_ALL_ROLE)).build();
+ UserMemento userMemento = UserMemento.builder("foo").roles(Can.ofSingleton(SudoService.ACCESS_ALL_ROLE)).build();
// when, then
- Assertions.assertThat(userMemento.getRoles()).contains(new RoleMemento(SudoService.ACCESS_ALL_ROLE.getName()));
+ Assertions.assertThat(userMemento.roles().toList()).contains(new RoleMemento(SudoService.ACCESS_ALL_ROLE.name()));
}
@Test
void when_does_not_contain() {
-
// given
- UserMemento userMemento = UserMemento.builder().name("foo").build();
+ UserMemento userMemento = UserMemento.builder("foo").build();
// when, then
- Assertions.assertThat(userMemento.getRoles()).doesNotContain(SudoService.ACCESS_ALL_ROLE);
+ Assertions.assertThat(userMemento.roles().toList()).doesNotContain(SudoService.ACCESS_ALL_ROLE);
}
}
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_value_Test.java b/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_value_Test.java
index dfe8f6a9358..90a20328d8d 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_value_Test.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/services/user/UserMemento_value_Test.java
@@ -32,14 +32,14 @@ class UserMemento_value_Test extends ValueTypeContractTestAbstract<UserMemento>
private UserMemento.UserMementoBuilder baseline() {
return
- UserMemento.builder().name("Joe")
+ UserMemento.builder("Joe")
.authenticationSource(UserMemento.AuthenticationSource.DEFAULT)
.authenticationCode("123")
.multiTenancyToken("/UK")
.roles(Can.of(
RoleMemento.builder().name("role-1").build(),
RoleMemento.builder().name("role-2").build()))
- .impersonating(false)
+ .isImpersonating(false)
;
}
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl_Test.java b/api/applib/src/test/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl_Test.java
index 6c6215b2afc..cad3b32b0c2 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl_Test.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl_Test.java
@@ -75,7 +75,7 @@ public void user() throws Exception {
control.withUser(UserMemento.ofName("fred"));
// then
- Assertions.assertThat(control.getUser().getName()).isEqualTo("fred");
+ Assertions.assertThat(control.getUser().name()).isEqualTo("fred");
}
@Test
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/UtilStr.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/UtilStr.java
index fba20e1fdf1..a8297043f41 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/UtilStr.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/UtilStr.java
@@ -33,7 +33,7 @@ public class UtilStr {
* String representation of bookmark for entities (otherwise empty string is returned).
*/
public static String entityAsStr(Bookmark bookmark, SpecificationLoader specificationLoader) {
- var logicalTypeName = bookmark.getLogicalTypeName();
+ var logicalTypeName = bookmark.logicalTypeName();
var isEntity = specificationLoader
.lookupLogicalType(logicalTypeName)
.flatMap(specificationLoader::specForLogicalType)
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetAbstract.java
index b5c7faf6eca..459b84871f3 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetAbstract.java
@@ -61,7 +61,7 @@ public final ManagedObject instantiate(
final Optional<Bookmark> bookmarkIfAny) {
var bookmark = bookmarkIfAny.orElse(null);
- var isBookmarkAvailable = bookmarkIfAny.map(Bookmark::getIdentifier)
+ var isBookmarkAvailable = bookmarkIfAny.map(Bookmark::identifier)
.map(_Strings::isNotEmpty)
.orElse(false);
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForDomainObjectAnnotation.java
index c6927a061d7..1b52288581d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForDomainObjectAnnotation.java
@@ -174,7 +174,7 @@ private _Mementos.Memento newMemento() {
private _Mementos.Memento parseMemento(final Bookmark bookmark) {
ensureDependenciesInited();
- return _Mementos.parse(codec, serializer, bookmark.getIdentifier());
+ return _Mementos.parse(codec, serializer, bookmark.identifier());
}
}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForJavaRecord.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForJavaRecord.java
index 94f653e5220..607c5d9fbb0 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForJavaRecord.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForJavaRecord.java
@@ -144,7 +144,7 @@ private _Mementos.Memento newMemento() {
private _Mementos.Memento parseMemento(final Bookmark bookmark) {
ensureDependenciesInited();
- return _Mementos.parse(codec, serializer, bookmark.getIdentifier());
+ return _Mementos.parse(codec, serializer, bookmark.identifier());
}
private static Can<ObjectAssociation> recordComponentsAsAssociations(
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForSerializableInterface.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForSerializableInterface.java
index 1dba492f222..6f7321006ba 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForSerializableInterface.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForSerializableInterface.java
@@ -63,7 +63,7 @@ protected ManagedObject createViewmodel(
final @NonNull Bookmark bookmark) {
return ManagedObject.bookmarked(
viewmodelSpec,
- deserialize(viewmodelSpec, bookmark.getIdentifier()),
+ deserialize(viewmodelSpec, bookmark.identifier()),
bookmark);
}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForViewModelInterface.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForViewModelInterface.java
index f13a941ddeb..c06cc5b9113 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForViewModelInterface.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForViewModelInterface.java
@@ -131,7 +131,7 @@ protected ManagedObject createViewmodel(
final @NonNull Bookmark bookmark) {
return ManagedObject.bookmarked(
viewmodelSpec,
- deserialize(viewmodelSpec, bookmark.getIdentifier()),
+ deserialize(viewmodelSpec, bookmark.identifier()),
bookmark);
}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForXmlRootElementAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForXmlRootElementAnnotation.java
index 9fc18d9c37f..066c83b5b1d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForXmlRootElementAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetForXmlRootElementAnnotation.java
@@ -54,7 +54,7 @@ private ViewModelFacetForXmlRootElementAnnotation(
protected ManagedObject createViewmodel(
final @NonNull ObjectSpecification viewmodelSpec,
final @NonNull Bookmark bookmark) {
- final String xmlStr = getUrlEncodingService().decodeToString(bookmark.getIdentifier());
+ final String xmlStr = getUrlEncodingService().decodeToString(bookmark.identifier());
_Debug.onCondition(XrayUi.isXrayEnabled(), ()->{
_Debug.log("[JAXB] de-serializing viewmodel %s\n"
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ManagedObjects.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ManagedObjects.java
index dc6984d4ad4..705eb56f766 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ManagedObjects.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ManagedObjects.java
@@ -225,7 +225,7 @@ public Optional<String> stringify(
final @Nullable ManagedObject managedObject,
final @NonNull String separator) {
return bookmark(managedObject)
- .map(oid->oid.getLogicalTypeName() + separator + oid.getIdentifier());
+ .map(oid->oid.logicalTypeName() + separator + oid.identifier());
}
public String stringifyElseFail(
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ProtoObject.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ProtoObject.java
index 83348571589..c0937b63a18 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ProtoObject.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/object/ProtoObject.java
@@ -44,7 +44,7 @@ public static Optional<ProtoObject> resolve(
return Optional.empty();
}
return specificationLoader
- .specForLogicalTypeName(bookmark.getLogicalTypeName())
+ .specForLogicalTypeName(bookmark.logicalTypeName())
.map(spec->of(spec, bookmark));
}
@@ -52,7 +52,7 @@ public static ProtoObject resolveElseFail(
final @NonNull SpecificationLoader specificationLoader,
final @NonNull Bookmark bookmark) {
return of(specificationLoader
- .specForLogicalTypeNameElseFail(bookmark.getLogicalTypeName()),
+ .specForLogicalTypeNameElseFail(bookmark.logicalTypeName()),
bookmark);
}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectLoaderFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectLoaderFactory.java
index 499576bdc7f..daecfccbf1a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectLoaderFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/objectmanager/ObjectLoaderFactory.java
@@ -67,7 +67,7 @@ public ManagedObject handle(final ProtoObject objectLoadRequest) {
var valueFacet = spec.valueFacetElseFail();
var bookmark = objectLoadRequest.getBookmark();
- var valuePojoIfAny = valueFacet.destring(Format.URL_SAFE, bookmark.getIdentifier());
+ var valuePojoIfAny = valueFacet.destring(Format.URL_SAFE, bookmark.identifier());
return ManagedObject.value(spec, valuePojoIfAny);
}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index f66b5d5ea4d..8d57659f677 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -212,7 +212,7 @@ public BeanSort sortOf(final Bookmark bookmark, final Mode mode) {
.map(ObjectSpecification::getCorrespondingClass)
.orElseThrow(()->_Exceptions
.noSuchElement("Cannot resolve logical type name %s to a java class",
- bookmark.getLogicalTypeName()));
+ bookmark.logicalTypeName()));
break;
}
return sortOf(domainType, mode);
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/objectlifecycle/PropertyChangeRecord.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/objectlifecycle/PropertyChangeRecord.java
index 8d24f6b3bc5..73a274060d7 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/objectlifecycle/PropertyChangeRecord.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/objectlifecycle/PropertyChangeRecord.java
@@ -82,7 +82,7 @@ private PropertyChangeRecord(final @NonNull PropertyChangeRecordId id) {
public String getLogicalMemberIdentifier() {
var target = getBookmark();
var propertyId = getPropertyId();
- return target.getLogicalTypeName() + "#" + propertyId;
+ return target.logicalTypeName() + "#" + propertyId;
}
public PropertyChangeRecord withPreValueSetToCurrentElseUnknown(DeadlockRecognizer deadlockRecognizer) {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/SpecificationLoaderInternal.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/SpecificationLoaderInternal.java
index 37ddf95a576..c3ffbe5eea6 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/SpecificationLoaderInternal.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/SpecificationLoaderInternal.java
@@ -94,7 +94,7 @@ default Optional<ObjectSpecification> specForType(
default Optional<ObjectSpecification> specForBookmark(
final @Nullable Bookmark bookmark) {
return Optional.ofNullable(bookmark)
- .map(Bookmark::getLogicalTypeName)
+ .map(Bookmark::logicalTypeName)
.flatMap(this::specForLogicalTypeName);
}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BookmarkValueSemantics.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BookmarkValueSemantics.java
index c8c580f1f01..6fe9f0d8b57 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BookmarkValueSemantics.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BookmarkValueSemantics.java
@@ -64,11 +64,11 @@ public Void epsilon() {
@Override
public int compare(final Bookmark a, final Bookmark b, final Void epsilon) {
- int c = _Strings.compareNullsFirst(a.getLogicalTypeName(), b.getLogicalTypeName());
+ int c = _Strings.compareNullsFirst(a.logicalTypeName(), b.logicalTypeName());
if(c!=0) {
return c;
}
- c = _Strings.compareNullsFirst(a.getIdentifier(), b.getIdentifier());
+ c = _Strings.compareNullsFirst(a.identifier(), b.identifier());
if(c!=0) {
return c;
}
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/objects/dom/JavaObjectWithBasicProgramConventions.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/objects/dom/JavaObjectWithBasicProgramConventions.java
index f5016d0f3d3..8fe8cbcaefa 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/objects/dom/JavaObjectWithBasicProgramConventions.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/objects/dom/JavaObjectWithBasicProgramConventions.java
@@ -85,7 +85,7 @@ public void setFieldTwo(final JavaReferencedObject object) {
// field two should be hidden for the user
public static boolean hideFieldTwo(final UserMemento user) {
- assertEquals("unit tester", user.getName());
+ assertEquals("unit tester", user.name());
return true;
}
@@ -224,7 +224,7 @@ public void hiddenAction2(final String param1, final String param2) {
}
public static boolean hideHiddenToUser(final UserMemento user) {
- assertEquals("unit tester", user.getName());
+ assertEquals("unit tester", user.name());
return true;
}
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/bookmarks/BookmarkServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
index b1987f51be6..ae0900e0558 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/bookmarks/BookmarkServiceDefault.java
@@ -81,8 +81,8 @@ public Optional<Object> lookup(final @Nullable BookmarkHolder bookmarkHolder) {
public List<Bookmark> bookmarksFor(final Object domainObject) {
return bookmarkFor(domainObject)
.map(bookmark -> {
- Can<LogicalType> logicalTypes = metaModelService.logicalTypeAndAliasesFor(bookmark.getLogicalTypeName());
- String id = bookmark.getIdentifier();
+ Can<LogicalType> logicalTypes = metaModelService.logicalTypeAndAliasesFor(bookmark.logicalTypeName());
+ String id = bookmark.identifier();
return logicalTypes.stream()
.map(x -> Bookmark.forLogicalTypeAndIdentifier(x, id))
.collect(Collectors.toList());
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java
index 8397bc37d95..38da8ccd999 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java
@@ -243,7 +243,7 @@ public Optional<TransactionId> currentTransactionId() {
.map(uuid->{
//XXX get current transaction's persistence context (once we support multiple contexts)
var persistenceContext = "";
- return TransactionId.of(uuid, txCounter.get().intValue(), persistenceContext);
+ return new TransactionId(uuid, txCounter.get().intValue(), persistenceContext);
});
}
diff --git a/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessExceptionTest.java b/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessExceptionTest.java
index 95baefbbaa1..00b2e616e70 100644
--- a/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessExceptionTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/causeway/core/runtimeservices/recognizer/dae/ExceptionRecognizerForDataAccessExceptionTest.java
@@ -72,9 +72,9 @@ void assertCategory(
var recognized = recognizerForDae.recognize(dae).orElse(null);
assertNotNull(recognized);
- assertNotNull(recognized.getReason());
- assertTrue(recognized.getReason().length()>10);
- assertEquals(category, recognized.getCategory());
+ assertNotNull(recognized.reason());
+ assertTrue(recognized.reason().length()>10);
+ assertEquals(category, recognized.category());
}
}
diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authentication/logout/LogoutMenu.java b/core/security/src/main/java/org/apache/causeway/core/security/authentication/logout/LogoutMenu.java
index f85435a830e..c690d527f96 100644
--- a/core/security/src/main/java/org/apache/causeway/core/security/authentication/logout/LogoutMenu.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authentication/logout/LogoutMenu.java
@@ -80,7 +80,7 @@ private Object getRedirect() {
var redirect = interactionProvider.currentInteractionContext()
.map(InteractionContext::getUser)
.map(userMemento->
- userMemento.getAuthenticationSource().isExternal()
+ userMemento.authenticationSource().isExternal()
? "logout"
: "login"
)
diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java b/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java
index d3ca69dc075..49bc7bda2f4 100644
--- a/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java
@@ -122,8 +122,8 @@ public AuthenticationManager(
userMementoRefiners);
userByValidationCode.put(
- userRefined.getAuthenticationCode(),
- userRefined.getName());
+ userRefined.authenticationCode(),
+ userRefined.name());
var interactionContextRefined = interactionContextWithTimeZone
.withUser(userRefined);
@@ -160,13 +160,13 @@ private String getUnusedRandomCode() {
return false;
}
var userMemento = interactionContext.getUser();
- if(userMemento.getAuthenticationSource().isExternal()) {
+ if(userMemento.authenticationSource().isExternal()) {
return true;
}
if(userMemento.isImpersonating()) {
return true;
}
- final String userName = userByValidationCode.get(userMemento.getAuthenticationCode());
+ final String userName = userByValidationCode.get(userMemento.authenticationCode());
return interactionContext.getUser().isCurrentUser(userName);
}
@@ -175,7 +175,7 @@ public void closeSession(final @Nullable UserMemento user) {
authenticator.logout();
}
if(user==null) return;
- userByValidationCode.remove(user.getAuthenticationCode());
+ userByValidationCode.remove(user.authenticationCode());
}
// -- AUTHENTICATORS
diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java b/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java
index 993da31613b..1b620285835 100644
--- a/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java
@@ -141,7 +141,7 @@ private static boolean containsSudoSuperuserRole(
if(session==null || session.getUser()==null) {
return false;
}
- return session.getUser().hasRoleName(SudoService.ACCESS_ALL_ROLE.getName());
+ return session.getUser().hasRoleName(SudoService.ACCESS_ALL_ROLE.name());
}
private boolean isPerspectiveMember(final Identifier identifier) {
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/BackgroundService.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/BackgroundService.java
index 362d5bfe81e..9023f4e604f 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/BackgroundService.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/BackgroundService.java
@@ -134,7 +134,7 @@ public <T> Future<T> submit(final Callable<T> task) {
var timestamp = interactionContext.getClock().nowAsJavaSqlTimestamp();
commandDto.setTimestamp(gregorianCalendarAdapter.marshal(timestamp));
- var username = interactionContext.getUser().getName();
+ var username = interactionContext.getUser().name();
commandDto.setUsername(username);
var periodDto = new PeriodDto();
diff --git a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java
index bb6f842a2fe..06fd7efbf5b 100644
--- a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java
+++ b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java
@@ -268,7 +268,7 @@ void roundtrip_CLE_bookmarks() {
void test_all_the_repository_methods() {
// given
- sudoService.run(InteractionContext.switchUser(UserMemento.builder().name("user-1").build()), () -> {
+ sudoService.run(InteractionContext.switchUser(UserMemento.builder("user-1").build()), () -> {
wrapperFactory.wrapMixin(Counter_bumpUsingMixin.class, counter1).act();
});
interactionService.nextInteraction();
@@ -285,7 +285,7 @@ void test_all_the_repository_methods() {
counter1 = counterRepository.findByName("counter-1");
sudoService.run(
InteractionContext.switchUser(
- UserMemento.builder().name("user-2").build()),
+ UserMemento.builder("user-2").build()),
() -> wrapperFactory.wrapMixin(Counter_bumpUsingMixin.class, counter1).act()
);
interactionService.nextInteraction();
@@ -303,7 +303,7 @@ void test_all_the_repository_methods() {
final UUID[] commandTarget1User1YesterdayIdHolder = new UUID[1];
sudoService.run(
InteractionContext.switchUser(
- UserMemento.builder().name("user-1").build()),
+ UserMemento.builder("user-1").build()),
() -> {
var yesterday = clockService.getClock().nowAsLocalDateTime().minusDays(1);
sudoService.run(
@@ -322,7 +322,7 @@ void test_all_the_repository_methods() {
// given (same user, different target, same day)
counter2 = counterRepository.findByName("counter-2");
- sudoService.run(InteractionContext.switchUser(UserMemento.builder().name("user-1").build()), () -> {
+ sudoService.run(InteractionContext.switchUser(UserMemento.builder("user-1").build()), () -> {
wrapperFactory.wrapMixin(Counter_bumpUsingMixin.class, counter2).act();
});
interactionService.nextInteraction();
diff --git a/extensions/core/executionlog/applib/src/test/java/org/apache/causeway/extensions/executionlog/applib/integtest/ExecutionLog_IntegTestAbstract.java b/extensions/core/executionlog/applib/src/test/java/org/apache/causeway/extensions/executionlog/applib/integtest/ExecutionLog_IntegTestAbstract.java
index deb99b68d1a..c37b0fe8bfb 100644
--- a/extensions/core/executionlog/applib/src/test/java/org/apache/causeway/extensions/executionlog/applib/integtest/ExecutionLog_IntegTestAbstract.java
+++ b/extensions/core/executionlog/applib/src/test/java/org/apache/causeway/extensions/executionlog/applib/integtest/ExecutionLog_IntegTestAbstract.java
@@ -239,7 +239,7 @@ void roundtrip_ELE_bookmarks() {
void test_all_the_repository_methods() {
// given
- sudoService.run(InteractionContext.switchUser(UserMemento.builder().name("user-1").build()), () -> {
+ sudoService.run(InteractionContext.switchUser(UserMemento.builder("user-1").build()), () -> {
wrapperFactory.wrapMixin(Counter_bumpUsingMixin.class, counter1).act();
});
@@ -255,7 +255,7 @@ void test_all_the_repository_methods() {
counter1 = counterRepository.findByName("counter-1");
sudoService.run(
InteractionContext.switchUser(
- UserMemento.builder().name("user-2").build()),
+ UserMemento.builder("user-2").build()),
() -> wrapperFactory.wrapMixin(Counter_bumpUsingMixin.class, counter1).act()
);
interactionService.nextInteraction();
@@ -273,7 +273,7 @@ void test_all_the_repository_methods() {
final UUID[] executionTarget1User1YesterdayIdHolder = new UUID[1];
sudoService.run(
InteractionContext.switchUser(
- UserMemento.builder().name("user-1").build()),
+ UserMemento.builder("user-1").build()),
() -> {
var yesterday = clockService.getClock().nowAsLocalDateTime().minusDays(1);
sudoService.run(
@@ -292,7 +292,7 @@ void test_all_the_repository_methods() {
// given (same user, different target, same day)
counter2 = counterRepository.findByName("counter-2");
- sudoService.run(InteractionContext.switchUser(UserMemento.builder().name("user-1").build()), () -> {
+ sudoService.run(InteractionContext.switchUser(UserMemento.builder("user-1").build()), () -> {
wrapperFactory.wrapMixin(Counter_bumpUsingMixin.class, counter2).act();
});
interactionService.nextInteraction();
diff --git a/extensions/core/executionoutbox/applib/src/test/java/org/apache/causeway/extensions/executionoutbox/applib/integtest/ExecutionOutbox_IntegTestAbstract.java b/extensions/core/executionoutbox/applib/src/test/java/org/apache/causeway/extensions/executionoutbox/applib/integtest/ExecutionOutbox_IntegTestAbstract.java
index f1e2b63a8ae..9c1d8349b9e 100644
--- a/extensions/core/executionoutbox/applib/src/test/java/org/apache/causeway/extensions/executionoutbox/applib/integtest/ExecutionOutbox_IntegTestAbstract.java
+++ b/extensions/core/executionoutbox/applib/src/test/java/org/apache/causeway/extensions/executionoutbox/applib/integtest/ExecutionOutbox_IntegTestAbstract.java
@@ -253,7 +253,7 @@ void roundtrip_EOE_bookmarks() {
void test_all_the_repository_methods() {
// given
- sudoService.run(InteractionContext.switchUser(UserMemento.builder().name("user-1").build()), () -> {
+ sudoService.run(InteractionContext.switchUser(UserMemento.builder("user-1").build()), () -> {
wrapperFactory.wrapMixin(Counter_bumpUsingMixin.class, counter1).act();
});
interactionService.closeInteractionLayers(); // to flush
diff --git a/extensions/core/titlecache/caffeine/src/main/java/org/apache/causeway/extensions/titlecache/caffeine/dom/TitleCacheSubscriber.java b/extensions/core/titlecache/caffeine/src/main/java/org/apache/causeway/extensions/titlecache/caffeine/dom/TitleCacheSubscriber.java
index c900e9f0900..263cdcf3d16 100644
--- a/extensions/core/titlecache/caffeine/src/main/java/org/apache/causeway/extensions/titlecache/caffeine/dom/TitleCacheSubscriber.java
+++ b/extensions/core/titlecache/caffeine/src/main/java/org/apache/causeway/extensions/titlecache/caffeine/dom/TitleCacheSubscriber.java
@@ -105,7 +105,7 @@ public TitleCacheSubscriber(
*/
@Override
public void entityTitleIs(final Bookmark bookmark, final String title) {
- var cache = cacheByLogicalTypeName.get(bookmark.getLogicalTypeName());
+ var cache = cacheByLogicalTypeName.get(bookmark.logicalTypeName());
if(cache == null) {
return;
}
@@ -136,7 +136,7 @@ public void on(final CausewayModuleApplib.TitleUiEvent<?> ev) {
.filter(bookmark -> isCached(bookmark, ev))
.ifPresent(bookmark -> {
var cache = cacheByLogicalTypeName.computeIfAbsent(
- bookmark.getLogicalTypeName(), ltn -> addCache(ev, ltn)
+ bookmark.logicalTypeName(), ltn -> addCache(ev, ltn)
);
var valueWrapper = cache.get(bookmark);
setTitleOnEventFromCacheValue(valueWrapper, ev, bookmark);
@@ -185,7 +185,7 @@ Cache addCache(
}
private Boolean isCached(final Bookmark bookmark, final CausewayModuleApplib.TitleUiEvent<?> ev) {
- return isCached(bookmark.getLogicalTypeName(), ev);
+ return isCached(bookmark.logicalTypeName(), ev);
}
private Boolean isCached(
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionRepositoryAbstract.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionRepositoryAbstract.java
index 0e3ddef8697..70ee4775e22 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionRepositoryAbstract.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermissionRepositoryAbstract.java
@@ -98,8 +98,8 @@ public List<ApplicationPermission> findByUser(final @NonNull ApplicationUser use
}
public List<ApplicationPermission> findByUserMemento(final @NonNull UserMemento userMemento) {
- var roleNames = userMemento.getRoles().stream()
- .map(RoleMemento::getName)
+ var roleNames = userMemento.roles().stream()
+ .map(RoleMemento::name)
.collect(Collectors.toList());
return findByRoleNames(roleNames);
}
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.java
index 2aaacacb6e0..b2f42299a1b 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.java
@@ -621,7 +621,7 @@ class Persistence {
@Programmatic public boolean isForSelf() {
var currentUser = currentUser();
- var currentUserName = currentUser.getName();
+ var currentUserName = currentUser.name();
var forSelf = Objects.equals(getUsername(), currentUserName);
return forSelf;
}
@@ -630,17 +630,14 @@ class Persistence {
var currentUser = currentUser();
var adminRoleName = getAdminRoleName(); // is guarded to not be empty
var adminRoleSuffix = ":" + adminRoleName;
- for (final RoleMemento role : currentUser.getRoles()) {
- final String roleName = role.getName();
- if(adminRoleName.equals(roleName)) {
- return true;
- }
+ for (final RoleMemento role : currentUser.roles()) {
+ final String roleName = role.name();
+ if(adminRoleName.equals(roleName)) return true;
+
// format could also be realmName:roleName, eg. with Shiro
// since we don't know what the realm's name is (depends on its configuration in shiro.ini),
// simply check that the last part matches the role name.
- if(roleName.endsWith(adminRoleSuffix)) {
- return true;
- }
+ if(roleName.endsWith(adminRoleSuffix)) return true;
}
return false;
}
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authorizor/AuthorizorSecman.java b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authorizor/AuthorizorSecman.java
index d6ffd6d7b4b..6e76deee697 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authorizor/AuthorizorSecman.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authorizor/AuthorizorSecman.java
@@ -102,12 +102,12 @@ private boolean grants(
final Identifier identifier,
final ApplicationPermissionMode permissionMode) {
- var userName = authentication.getUser().getName();
+ var userName = authentication.getUser().name();
var permissionSetIfAny = cache.get()
.computeIfAbsent(userName, ()->
- applicationUserRepository
- .findByUsername(userName)
- .map(ApplicationUser::getPermissionSet));
+ applicationUserRepository
+ .findByUsername(userName)
+ .map(ApplicationUser::getPermissionSet));
return permissionSetIfAny
.map(permissionSet->permissionSet.grants(
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/usermementorefiner/UserMementoRefinerFromApplicationUser.java b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/usermementorefiner/UserMementoRefinerFromApplicationUser.java
index 8734d07f7fa..3b8e328545a 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/usermementorefiner/UserMementoRefinerFromApplicationUser.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/usermementorefiner/UserMementoRefinerFromApplicationUser.java
@@ -38,7 +38,7 @@ public class UserMementoRefinerFromApplicationUser implements UserMementoRefiner
@Override
public UserMemento refine(final UserMemento userMemento) {
- var applicationUserIfAny = applicationUserRepositoryProvider.get().findByUsername(userMemento.getName());
+ var applicationUserIfAny = applicationUserRepositoryProvider.get().findByUsername(userMemento.name());
if (applicationUserIfAny.isEmpty()) {
return userMemento;
}
diff --git a/extensions/security/spring-oauth2/src/test/java/org/apache/causeway/security/spring/authconverters/AuthenticationConverterOfOAuth2UserPrincipal_Test.java b/extensions/security/spring-oauth2/src/test/java/org/apache/causeway/security/spring/authconverters/AuthenticationConverterOfOAuth2UserPrincipal_Test.java
index f2d9f65e760..b14a4858931 100644
--- a/extensions/security/spring-oauth2/src/test/java/org/apache/causeway/security/spring/authconverters/AuthenticationConverterOfOAuth2UserPrincipal_Test.java
+++ b/extensions/security/spring-oauth2/src/test/java/org/apache/causeway/security/spring/authconverters/AuthenticationConverterOfOAuth2UserPrincipal_Test.java
@@ -75,8 +75,7 @@ void given_login_attr_exists_then_used() {
// then
Assertions.assertThat(userMemento).isNotNull();
- Assertions.assertThat(userMemento.getName()).isEqualTo("freddy");
-
+ Assertions.assertThat(userMemento.name()).isEqualTo("freddy");
}
@Test
@@ -101,8 +100,7 @@ void given_no_login_attr_exists_then_name_instead_is_used() {
// then
Assertions.assertThat(userMemento).isNotNull();
- Assertions.assertThat(userMemento.getName()).isEqualTo("fred");
-
+ Assertions.assertThat(userMemento.name()).isEqualTo("fred");
}
}
@@ -131,8 +129,7 @@ void given_avatarUrl_attr_exists_and_can_be_parsed_then_used() throws MalformedU
// then
Assertions.assertThat(userMemento).isNotNull();
- Assertions.assertThat(userMemento.getAvatarUrl()).isEqualTo(new java.net.URL("https://upload.wikimedia.org/wikipedia/en/a/ad/Fred_Flintstone.png"));
-
+ Assertions.assertThat(userMemento.avatarUrl()).isEqualTo(new java.net.URL("https://upload.wikimedia.org/wikipedia/en/a/ad/Fred_Flintstone.png"));
}
@Test
@@ -157,7 +154,7 @@ void given_avatarUrl_attr_exists_but_cannot_be_parsed_then_not_used() throws Mal
// then
Assertions.assertThat(userMemento).isNotNull();
- Assertions.assertThat(userMemento.getAvatarUrl()).isNull();
+ Assertions.assertThat(userMemento.avatarUrl()).isNull();
}
@Test
@@ -182,7 +179,7 @@ void given_avatarUrl_attr_does_not_exists_then_none() throws MalformedURLExcepti
// then
Assertions.assertThat(userMemento).isNotNull();
- Assertions.assertThat(userMemento.getAvatarUrl()).isNull();
+ Assertions.assertThat(userMemento.avatarUrl()).isNull();
}
}
@@ -212,7 +209,7 @@ void given_name_attr_exists_then_used() throws MalformedURLException {
// then
Assertions.assertThat(userMemento).isNotNull();
- Assertions.assertThat(userMemento.getRealName()).isEqualTo("Fred Flintstone");
+ Assertions.assertThat(userMemento.realName()).isEqualTo("Fred Flintstone");
}
@Test
@@ -237,7 +234,7 @@ void given_name_attr_does_not_exists_then_none() throws MalformedURLException {
// then
Assertions.assertThat(userMemento).isNotNull();
- Assertions.assertThat(userMemento.getRealName()).isNull();
+ Assertions.assertThat(userMemento.realName()).isNull();
}
}
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java
index a7e708639a9..3d761ece825 100644
--- a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java
+++ b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java
@@ -168,8 +168,8 @@ private PdfJsViewerAdvisor.InstanceKey toInstanceKey(final UserService userServi
var attributeModel = getModel();
var propertyId = attributeModel.getIdentifier();
var bookmark = attributeModel.getParentUiModel().getOwnerBookmark();
- var logicalTypeName = bookmark.getLogicalTypeName();
- var identifier = bookmark.getIdentifier();
+ var logicalTypeName = bookmark.logicalTypeName();
+ var identifier = bookmark.identifier();
return new PdfJsViewerAdvisor.InstanceKey(logicalTypeName, identifier, propertyId, userName);
}
diff --git a/persistence/jdbc/src/main/java/org/apache/causeway/persistence/jdbc/metamodel/JdbcEntityFacet.java b/persistence/jdbc/src/main/java/org/apache/causeway/persistence/jdbc/metamodel/JdbcEntityFacet.java
index 72fd29f9066..3a1907b8e50 100644
--- a/persistence/jdbc/src/main/java/org/apache/causeway/persistence/jdbc/metamodel/JdbcEntityFacet.java
+++ b/persistence/jdbc/src/main/java/org/apache/causeway/persistence/jdbc/metamodel/JdbcEntityFacet.java
@@ -94,7 +94,7 @@ public Optional<String> identifierFor(final @Nullable Object pojo) {
@Override
public Bookmark validateBookmark(final @NonNull Bookmark bookmark) {
- _Assert.assertNotNull(primaryKeyType.destring(bookmark.getIdentifier()));
+ _Assert.assertNotNull(primaryKeyType.destring(bookmark.identifier()));
return bookmark;
}
@@ -102,7 +102,7 @@ public Bookmark validateBookmark(final @NonNull Bookmark bookmark) {
public Optional<Object> fetchByBookmark(final @NonNull Bookmark bookmark) {
log.debug("fetchEntity; bookmark={}", bookmark);
- var primaryKey = primaryKeyType.destring(bookmark.getIdentifier());
+ var primaryKey = primaryKeyType.destring(bookmark.identifier());
var entityPojo = jdbcAggregateTemplate.findById(primaryKey, entityClass);
return Optional.ofNullable(entityPojo);
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
index b848677aa0d..e5e8f5d0418 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/causeway/persistence/jdo/datanucleus/metamodel/facets/entity/JdoEntityFacet.java
@@ -181,7 +181,7 @@ public Optional<String> identifierForDnPrimaryKey(final @Nullable Object primary
@Override
public Bookmark validateBookmark(final @NonNull Bookmark bookmark) {
- _Assert.assertNotNull(primaryKeyTypeForDecoding().destring(bookmark.getIdentifier()));
+ _Assert.assertNotNull(primaryKeyTypeForDecoding().destring(bookmark.identifier()));
return bookmark;
}
@@ -194,7 +194,7 @@ public Optional<Object> fetchByBookmark(final @NonNull Bookmark bookmark) {
try {
var persistenceManager = getPersistenceManager();
- var primaryKey = primaryKeyTypeForDecoding().destring(bookmark.getIdentifier());
+ var primaryKey = primaryKeyTypeForDecoding().destring(bookmark.identifier());
var fetchPlan = persistenceManager.getFetchPlan();
fetchPlan.addGroup(FetchGroup.DEFAULT);
@@ -204,7 +204,7 @@ public Optional<Object> fetchByBookmark(final @NonNull Bookmark bookmark) {
var recognition = exceptionRecognizerService.recognize(e);
if(recognition.isPresent()) {
- if(recognition.get().getCategory() == Category.NOT_FOUND) {
+ if(recognition.get().category() == Category.NOT_FOUND) {
return Optional.empty();
}
}
diff --git a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacet.java b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacet.java
index 7d1ffdb1843..b1c91b5dafe 100644
--- a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacet.java
+++ b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/entity/JpaEntityFacet.java
@@ -98,7 +98,7 @@ public Optional<String> identifierFor(final @Nullable Object pojo) {
@Override
public Bookmark validateBookmark(final @NonNull Bookmark bookmark) {
- _Assert.assertNotNull(primaryKeyType.destring(bookmark.getIdentifier()));
+ _Assert.assertNotNull(primaryKeyType.destring(bookmark.identifier()));
return bookmark;
}
@@ -107,7 +107,7 @@ public Optional<Object> fetchByBookmark(final @NonNull Bookmark bookmark) {
log.debug("fetchEntity; bookmark={}", bookmark);
- var primaryKey = primaryKeyType.destring(bookmark.getIdentifier());
+ var primaryKey = primaryKeyType.destring(bookmark.identifier());
var entityManager = getEntityManager();
var entityPojo = entityManager.find(entityClass, primaryKey);
diff --git a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityPropertyChangeSubscriberForTesting.java b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityPropertyChangeSubscriberForTesting.java
index 5e8a6af4f7b..20e446fb292 100644
--- a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityPropertyChangeSubscriberForTesting.java
+++ b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityPropertyChangeSubscriberForTesting.java
@@ -63,9 +63,9 @@ public void onChanging(final EntityPropertyChange entityPropertyChange) {
PersistenceStack persistenceStack = causewayBeanTypeRegistry.persistenceStack();
var target = entityPropertyChange.getTarget();
- var targetLogicalTypeName = target.getLogicalTypeName();
+ var targetLogicalTypeName = target.logicalTypeName();
var targetLogicalType = specificationLoader.lookupLogicalTypeElseFail(targetLogicalTypeName);
- var targetSimpleName = targetLogicalType.getLogicalTypeSimpleName();
+ var targetSimpleName = targetLogicalType.logicalSimpleName();
var propertyChangeEntry = String.format("%s %s/%s: '%s' -> '%s'",
persistenceStack.titleCase(),
diff --git a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java
index 71e5e379caf..e5226e5188d 100644
--- a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java
+++ b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java
@@ -63,7 +63,7 @@ void shouldRunWithDefaultContext() {
var iaCtx = interactionService.currentInteractionContextElseFail();
assertThat(iaCtx.getUser().hasSudoAccessAllRole()).isFalse();
- assertEquals(Locale.getDefault(), iaCtx.getLocale().getLanguageLocale());
+ assertEquals(Locale.getDefault(), iaCtx.getLocale().languageLocale());
assertTrue(
Duration
.between(LocalDateTime.now(), iaCtx.getClock().nowAsLocalDateTime())
@@ -80,8 +80,8 @@ void shouldRunWithCustomContext() {
var iaCtx = interactionService.currentInteractionContextElseFail();
- assertEquals("sven", iaCtx.getUser().getName());
- assertEquals(Locale.FRANCE.getLanguage(), iaCtx.getLocale().getLanguageLocale().getLanguage());
+ assertEquals("sven", iaCtx.getUser().name());
+ assertEquals(Locale.FRANCE.getLanguage(), iaCtx.getLocale().languageLocale().getLanguage());
assertEquals(
DateTimeFormat.CANONICAL.parseDateTime("2022-07-13 13:02:04 Z").toInstant(),
iaCtx.getClock().nowAsInstant());
diff --git a/retired/shiro/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/AuthorizorShiro.java b/retired/shiro/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/AuthorizorShiro.java
index b4e90b089d0..9f9ded80a03 100644
--- a/retired/shiro/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/AuthorizorShiro.java
+++ b/retired/shiro/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/AuthorizorShiro.java
@@ -54,12 +54,12 @@ public class AuthorizorShiro implements Authorizor {
@Override
public boolean isVisible(final InteractionContext authentication, final Identifier identifier) {
- return isPermitted(authentication.getUser().getName(), identifier, "r");
+ return isPermitted(authentication.getUser().name(), identifier, "r");
}
@Override
public boolean isUsable(final InteractionContext authentication, final Identifier identifier) {
- return isPermitted(authentication.getUser().getName(), identifier, "w");
+ return isPermitted(authentication.getUser().name(), identifier, "w");
}
private boolean isPermitted(final String userName, final Identifier identifier, final String qualifier) {
diff --git a/retired/shiro/security/shiro/src/test/java/org/apache/causeway/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/retired/shiro/security/shiro/src/test/java/org/apache/causeway/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
index e1766099499..49dc76dfc2b 100644
--- a/retired/shiro/security/shiro/src/test/java/org/apache/causeway/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
+++ b/retired/shiro/security/shiro/src/test/java/org/apache/causeway/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
@@ -84,8 +84,8 @@ public void happyCase() throws Exception {
var authentication = authenticator.authenticate(ar, "test code");
assertThat(authentication, is(not(nullValue())));
- assertThat(authentication.getUser().getName(), is("lonestarr"));
- assertThat(authentication.getUser().getAuthenticationCode(), is("test code"));
+ assertThat(authentication.getUser().name(), is("lonestarr"));
+ assertThat(authentication.getUser().authenticationCode(), is("test code"));
Identifier changeAddressIdentifier = Identifier.actionIdentifier(
TypeIdentifierTestFactory.customer(), "changeAddress", String.class, String.class);
diff --git a/security/simple/src/main/java/org/apache/causeway/security/simple/authorization/SimpleAuthorizor.java b/security/simple/src/main/java/org/apache/causeway/security/simple/authorization/SimpleAuthorizor.java
index 53e4fba0a24..61b6b03679e 100644
--- a/security/simple/src/main/java/org/apache/causeway/security/simple/authorization/SimpleAuthorizor.java
+++ b/security/simple/src/main/java/org/apache/causeway/security/simple/authorization/SimpleAuthorizor.java
@@ -64,7 +64,7 @@ public boolean isUsable(final InteractionContext ctx, final Identifier identifie
}
protected List<SimpleRealm.Role> roles(final UserMemento userMemento){
- var roles = realm.lookupUserByName(userMemento.getName())
+ var roles = realm.lookupUserByName(userMemento.name())
.map(SimpleRealm.User::roles)
.orElseGet(List::of);
return roles;
diff --git a/security/simple/src/test/java/org/apache/causeway/security/simple/SecuritySimpleAuthTest.java b/security/simple/src/test/java/org/apache/causeway/security/simple/SecuritySimpleAuthTest.java
index 3a9cc1f3ddb..68d22525e28 100644
--- a/security/simple/src/test/java/org/apache/causeway/security/simple/SecuritySimpleAuthTest.java
+++ b/security/simple/src/test/java/org/apache/causeway/security/simple/SecuritySimpleAuthTest.java
@@ -143,7 +143,7 @@ void authentication(final Scenario scenario) {
// happy case
assertValid(new AuthenticationRequestPassword(scenario.userName(), scenario.plainPass()), interactionContext->{
- assertEquals(scenario.userName(), interactionContext.getUser().getName());
+ assertEquals(scenario.userName(), interactionContext.getUser().name());
});
}
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/ExceptionRecognizerTranslate.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/ExceptionRecognizerTranslate.java
index c26234c2abb..2720e201700 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/ExceptionRecognizerTranslate.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/ExceptionRecognizerTranslate.java
@@ -37,8 +37,8 @@ public void handleTestExecutionException(
.flatMap(recService->recService.recognize(throwable))
.<Throwable>map(recognition->new RecoverableException(
String.format("%s: %s",
- recognition.getCategory().getFriendlyName(),
- recognition.getReason()
+ recognition.category().getFriendlyName(),
+ recognition.reason()
),
throwable))
.orElse(throwable);
diff --git a/viewers/commons/applib/src/main/java/org/apache/causeway/viewer/commons/applib/services/userprof/UserProfileUiModel.java b/viewers/commons/applib/src/main/java/org/apache/causeway/viewer/commons/applib/services/userprof/UserProfileUiModel.java
index 004bc4aa559..465d3bc1b04 100644
--- a/viewers/commons/applib/src/main/java/org/apache/causeway/viewer/commons/applib/services/userprof/UserProfileUiModel.java
+++ b/viewers/commons/applib/src/main/java/org/apache/causeway/viewer/commons/applib/services/userprof/UserProfileUiModel.java
@@ -71,6 +71,6 @@ public Optional<UserMemento> userMemento() {
return Optional.ofNullable(getUserMemento());
}
public Optional<URL> avatarUrl() {
- return userMemento().map(UserMemento::getAvatarUrl);
+ return userMemento().map(UserMemento::avatarUrl);
}
}
diff --git a/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/userprof/UserProfileUiServiceDefault.java b/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/userprof/UserProfileUiServiceDefault.java
index 9e7e4569b7c..a4cb29636f7 100644
--- a/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/userprof/UserProfileUiServiceDefault.java
+++ b/viewers/commons/services/src/main/java/org/apache/causeway/viewer/commons/services/userprof/UserProfileUiServiceDefault.java
@@ -67,9 +67,9 @@ private String userNameFor(final UserMemento user) {
if (user.isImpersonating()) {
return user.nameFormatted();
}
- var realName = user.getRealName();
+ var realName = user.realName();
return _Strings.isNullOrEmpty(realName)
- ? user.getName()
+ ? user.name()
: realName;
}
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/CommonMetaFetcher.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/CommonMetaFetcher.java
index 33f8987c03e..c7b73d9d45b 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/CommonMetaFetcher.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/common/query/meta/CommonMetaFetcher.java
@@ -55,11 +55,11 @@ public CommonMetaFetcher(
}
public String logicalTypeName() {
- return bookmark.getLogicalTypeName();
+ return bookmark.logicalTypeName();
}
public String id() {
- return bookmark.getIdentifier();
+ return bookmark.identifier();
}
public String version() {
@@ -117,7 +117,7 @@ private String resource(String resource) {
.flatMap(Bookmarkable::getBookmark
).map(bookmark -> String.format(
"//%s/object/%s:%s/%s/%s",
- graphqlPath, bookmark.getLogicalTypeName(), bookmark.getIdentifier(), causewayConfiguration.getViewer().getGraphql().getMetaData().getFieldName(), resource))
+ graphqlPath, bookmark.logicalTypeName(), bookmark.identifier(), causewayConfiguration.getViewer().getGraphql().getMetaData().getFieldName(), resource))
.orElse(null);
}
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetBlobBytes.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetBlobBytes.java
index a650a3dc118..f97beee9753 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetBlobBytes.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetBlobBytes.java
@@ -46,7 +46,7 @@ protected Object fetchData(DataFetchingEnvironment environment) {
return bookmarkIfAny.map(x -> {
final ObjectFeature objectFeature = memberInteractor.getObjectMember();
return String.format(
- "//%s/object/%s:%s/%s/blobBytes", graphqlPath, x.getLogicalTypeName(), x.getIdentifier(), objectFeature.asciiId());
+ "//%s/object/%s:%s/%s/blobBytes", graphqlPath, x.logicalTypeName(), x.identifier(), objectFeature.asciiId());
}).orElse(null);
}
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetClobChars.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetClobChars.java
index c22c10bf692..0c22beed1dd 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetClobChars.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetClobChars.java
@@ -46,7 +46,7 @@ protected Object fetchData(DataFetchingEnvironment environment) {
return bookmarkIfAny.map(x -> {
final ObjectFeature objectFeature = holder.getObjectMember();
return String.format(
- "//%s/object/%s:%s/%s/clobChars", graphqlPath, x.getLogicalTypeName(), x.getIdentifier(), objectFeature.asciiId());
+ "//%s/object/%s:%s/%s/clobChars", graphqlPath, x.logicalTypeName(), x.identifier(), objectFeature.asciiId());
}).orElse(null);
}
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobBytes.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobBytes.java
index 887a7f8f68e..60f01e58dce 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobBytes.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobBytes.java
@@ -46,7 +46,7 @@ protected Object fetchData(DataFetchingEnvironment environment) {
return bookmarkIfAny.map(x -> {
final ObjectFeature objectFeature = memberInteractor.getObjectMember();
return String.format(
- "//%s/object/%s:%s/%s/blobBytes", graphqlPath, x.getLogicalTypeName(), x.getIdentifier(), objectFeature.asciiId());
+ "//%s/object/%s:%s/%s/blobBytes", graphqlPath, x.logicalTypeName(), x.identifier(), objectFeature.asciiId());
}).orElse(null);
}
diff --git a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobChars.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobChars.java
index 4134b399fe7..dce5d4c7152 100644
--- a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobChars.java
+++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobChars.java
@@ -46,7 +46,7 @@ protected Object fetchData(DataFetchingEnvironment environment) {
return bookmarkIfAny.map(x -> {
final ObjectFeature objectFeature = memberInteractor.getObjectMember();
return String.format(
- "//%s/object/%s:%s/%s/clobChars", graphqlPath, x.getLogicalTypeName(), x.getIdentifier(), objectFeature.asciiId());
+ "//%s/object/%s:%s/%s/clobChars", graphqlPath, x.logicalTypeName(), x.identifier(), objectFeature.asciiId());
}).orElse(null);
}
diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/auth/UserMementoProviderDefault.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/auth/UserMementoProviderDefault.java
index 8d251d21ec3..755b53419a2 100644
--- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/auth/UserMementoProviderDefault.java
+++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/auth/UserMementoProviderDefault.java
@@ -61,8 +61,7 @@ public UserMemento userMemento(
var fallbackRoles = causewayConfiguration.getViewer().getGraphql().getAuthentication().getFallback().getRoles();
var roles = Can.ofStream(fallbackRoles.stream().map(roleName -> RoleMemento.builder().name(roleName).build()));
- return UserMemento.builder()
- .name(fallbackUsername)
+ return UserMemento.builder(fallbackUsername)
.roles(roles)
.build();
diff --git a/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/ActionParameterListBuilder.java b/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/ActionParameterListBuilder.java
index ce67104d187..d7fd9260d12 100644
--- a/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/ActionParameterListBuilder.java
+++ b/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/ActionParameterListBuilder.java
@@ -171,7 +171,7 @@ private String asAbsoluteHref(Bookmark bookmark) {
}
private String asRelativeHref(Bookmark bookmark) {
- return String.format("objects/%s/%s", bookmark.getLogicalTypeName(), bookmark.getIdentifier());
+ return String.format("objects/%s/%s", bookmark.logicalTypeName(), bookmark.identifier());
}
public <T> ActionParameterListBuilder addActionParameter(
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
index e10e59ebfcf..ff3b8ca2ab3 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
@@ -190,10 +190,10 @@ public JsonRepresentation render() {
representation.mapPutString("serviceId", objectAdapter.getSpecification().logicalTypeName());
} else {
oidIfAny.ifPresent(oid->{
- Optional.ofNullable(oid.getLogicalTypeName())
+ Optional.ofNullable(oid.logicalTypeName())
.ifPresent(domainType->
representation.mapPutString("domainType", domainType));
- representation.mapPutString("instanceId", oid.getIdentifier());
+ representation.mapPutString("instanceId", oid.identifier());
});
}
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/UserReprRenderer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
index c9b433d47c3..6d37cebb0a3 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
@@ -36,7 +36,7 @@ public class UserReprRenderer
@Override
public UserReprRenderer with(final InteractionContext authentication) {
- representation.mapPutString("userName", authentication.getUser().getName());
+ representation.mapPutString("userName", authentication.getUser().name());
final JsonRepresentation roles = JsonRepresentation.newArray();
authentication.getUser().streamRoleNames()
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/BookmarkTreeNode.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/BookmarkTreeNode.java
index e9d09ee553a..9453bdb4a99 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/BookmarkTreeNode.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/BookmarkTreeNode.java
@@ -107,8 +107,8 @@ public int compareTo(final BookmarkTreeNode o2) {
var o1 = this;
// sort by entity type
- var typeName1 = o1.getBookmark().getLogicalTypeName();
- var typeName2 = o2.getBookmark().getLogicalTypeName();
+ var typeName1 = o1.getBookmark().logicalTypeName();
+ var typeName2 = o2.getBookmark().logicalTypeName();
final int typeNameComparison = typeName1.compareTo(typeName2);
if(typeNameComparison != 0) {
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/UiObjectWkt.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/UiObjectWkt.java
index e323c0e9b86..fefef975110 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/UiObjectWkt.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/UiObjectWkt.java
@@ -229,7 +229,7 @@ public UiAttributeWkt getPropertyModel(
.getPojo();
if(ownerPojo==null) {
throw new ObjectNotFoundException(
- bookmarkedObjectModel.getBookmark().getIdentifier());
+ bookmarkedObjectModel.getBookmark().identifier());
}
var propIdentifier = property.getFeatureIdentifier();
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/CausewaySignInPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/CausewaySignInPanel.java
index 573566063a1..0d8bb79d643 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/CausewaySignInPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/CausewaySignInPanel.java
@@ -133,7 +133,7 @@ protected void storeUserTimeZoneToSession(final @NonNull ZoneId zoneId) {
// also propagate user's Locale from current InteractionContext to Wicket's session
var session = AuthenticatedWebSession.get();
((HasAmendableInteractionContext)session).amendInteractionContext(interactionContext->{
- Optional.ofNullable(interactionContext.getUser().getLanguageLocale())
+ Optional.ofNullable(interactionContext.getUser().languageLocale())
.ifPresent(session::setLocale);
return interactionContext.withTimeZone(zoneId);
});
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/FormExecutorDefault.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/FormExecutorDefault.java
index b878033b151..7a83099a33c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -168,7 +168,7 @@ private void raiseErrorMessage(
final @Nullable Form<?> feedbackFormIfAny,
final @NonNull Recognition recognition) {
- var errorMsg = recognition.getCategory().isSuppressCategoryInUI()
+ var errorMsg = recognition.category().isSuppressCategoryInUI()
? recognition.toMessageNoCategory(getTranslationService())
: recognition.toMessage(getTranslationService());
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway.java
index 33a59d668d4..d5ef50865c7 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway.java
@@ -187,7 +187,7 @@ public synchronized void onInvalidate() {
String userName = null;
var authentication = getInteractionContext();
if (authentication != null) {
- userName = authentication.getUser().getName();
+ userName = authentication.getUser().name();
}
super.onInvalidate();
@@ -236,14 +236,14 @@ public AuthenticationManager getAuthenticationManager() {
/**
* This is a no-op if the {@link #getInteractionContext() authentication session}'s
- * {@link UserMemento#getAuthenticationSource() source} is
+ * {@link UserMemento#authenticationSource() source} is
* {@link AuthenticationSource#EXTERNAL external}
* (eg as managed by keycloak).
*/
@Override
public void invalidate() {
if(interactionContext !=null
- && interactionContext.getUser().getAuthenticationSource().isExternal()) {
+ && interactionContext.getUser().authenticationSource().isExternal()) {
return;
}
// otherwise