This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v4
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/v4 by this push:
new 9f01af26387 CAUSEWAY-3892: work on deprecations (1)
9f01af26387 is described below
commit 9f01af26387451c70bee4ed00c34f651fa348c04
Author: Andi Huber <[email protected]>
AuthorDate: Fri Jun 13 08:41:15 2025 +0200
CAUSEWAY-3892: work on deprecations (1)
---
.../org/apache/causeway/applib/Identifier.java | 7 ---
.../org/apache/causeway/applib/graph/Vertex.java | 14 ------
.../apache/causeway/applib/id/HasLogicalType.java | 21 ---------
.../org/apache/causeway/applib/id/LogicalType.java | 40 +---------------
.../apache/causeway/applib/locale/UserLocale.java | 13 ------
.../causeway/applib/services/bookmark/Oid.java | 10 ----
.../causeway/applib/services/health/Health.java | 21 ++-------
.../services/iactnlayer/InteractionLayer.java | 12 -----
.../causeway/applib/services/user/RoleMemento.java | 20 ++------
.../causeway/applib/services/user/UserMemento.java | 53 ++++++----------------
.../applib/util/schema/CommonDtoUtils.java | 12 ++---
.../org/apache/causeway/applib/value/Blob.java | 12 ++---
.../causeway/applib/value/LocalResourcePath.java | 7 +--
.../org/apache/causeway/applib/value/Markup.java | 5 --
.../causeway/applib/value/NamedWithMimeType.java | 19 ++------
.../org/apache/causeway/applib/value/Password.java | 5 --
.../applib/value/semantics/ValueDecomposition.java | 25 +++-------
.../services/metamodel/DomainMemberDefault.java | 2 +-
.../valuesemantics/BlobValueSemantics.java | 25 +---------
.../valuesemantics/ClobValueSemantics.java | 23 +---------
.../valuesemantics/PasswordValueSemantics.java | 2 +-
.../integtest/CommandLog_IntegTestAbstract.java | 2 +-
.../domainobjects/DomainEntityDiagramPage.java | 2 +-
.../domainobjects/DomainEntityDiagramPage2.java | 2 +-
.../excel/applib/service/ExcelServiceDefault.java | 2 +-
.../excel/applib/service/_ExcelServiceHelper.java | 2 +-
...uleDemoToDoItemBulkUpdateManager_IntegTest.java | 2 +-
.../extensions/excel/testing/ExcelFixture.java | 2 +-
.../extensions/excel/testing/ExcelFixture2.java | 2 +-
.../integtest/ExecutionLog_IntegTestAbstract.java | 2 +-
.../ExecutionOutbox_IntegTestAbstract.java | 2 +-
.../applib/user/dom/ApplicationUserRepository.java | 18 ++++----
.../dom/mixins/ApplicationUser_resetPassword.java | 2 +-
.../dom/mixins/ApplicationUser_updatePassword.java | 4 +-
.../pdfjs/wkt/ui/components/PdfJsViewerPanel.java | 16 ++-----
.../PdfJsViewerPanelComponentFactory.java | 2 +-
.../applib/CausewayPasswordConverter.java | 2 +-
.../applib/NoPermissionChecks.java | 16 +++----
.../rich/query/RichPropertyGetBlobMimeType.java | 2 +-
.../domain/rich/query/RichPropertyGetBlobName.java | 2 +-
.../rich/query/RichPropertyGetClobMimeType.java | 2 +-
.../domain/rich/query/RichPropertyGetClobName.java | 2 +-
.../simple/query/SimplePropertyLobMimeType.java | 2 +-
.../domain/simple/query/SimplePropertyLobName.java | 2 +-
.../e2e/special/DepartmentMutating_IntegTest.java | 2 +-
.../e2e/special/DeptHeadMutating_IntegTest.java | 2 +-
.../test/e2e/special/Person_2_IntegTest.java | 2 +-
.../staffmutating/StaffMutating_IntegTest.java | 2 +-
48 files changed, 98 insertions(+), 350 deletions(-)
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/Identifier.java
b/api/applib/src/main/java/org/apache/causeway/applib/Identifier.java
index 772f12e4db3..89dc05dab92 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/Identifier.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/Identifier.java
@@ -299,11 +299,4 @@ private static Can<String> naturalNames(final Can<String>
names) {
return names.map(Identifier::naturalName);
}
- // -- DEPRECATIONS
-
- @Deprecated public String getMemberLogicalName() { return
memberLogicalName; }
- @Deprecated public int getParameterIndex() { return parameterIndex; }
- @Deprecated public Can<String> getMemberParameterClassNames() { return
memberParameterClassNames; }
- @Deprecated public Type getType() { return type; }
-
}
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/graph/Vertex.java
b/api/applib/src/main/java/org/apache/causeway/applib/graph/Vertex.java
index 24be482f28d..8dd782e3eb4 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/graph/Vertex.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/graph/Vertex.java
@@ -35,18 +35,4 @@ public interface Vertex<T> {
Stream<Edge<T>> streamIncoming();
Stream<Edge<T>> streamOutgoing();
-
- // -- DEPRECATIONS
-
- /** @deprecated use {@link #value()} */
- @Deprecated
- default T getValue() { return value();}
-
- /** @deprecated use {@link #incomingCount()} */
- @Deprecated
- default int getIncomingCount() { return incomingCount(); }
-
- /** @deprecated use {@link #outgoingCount()} */
- @Deprecated
- default int getOutgoingCount() { return outgoingCount(); }
}
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/id/HasLogicalType.java
b/api/applib/src/main/java/org/apache/causeway/applib/id/HasLogicalType.java
index a73736ea85f..ddead424c30 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/id/HasLogicalType.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/id/HasLogicalType.java
@@ -35,25 +35,4 @@ public interface HasLogicalType {
* @see LogicalType#className()
*/
default String className() { return logicalType().className(); }
-
- // -- DEPRECATIONS
-
- /**
- * @deprecated use #logicalType()
- */
- @Deprecated
- default LogicalType getLogicalType() { return logicalType(); }
-
- /**
- * @deprecated use #logicalName()
- */
- @Deprecated
- default String getLogicalTypeName() { return logicalTypeName(); }
-
- /**
- * @deprecated use #className()
- */
- @Deprecated
- default String getClassName() { return className(); }
-
}
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java
b/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java
index cc157a82aa3..fae65a39553 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/id/LogicalType.java
@@ -62,11 +62,11 @@ public record LogicalType(
* @see ObjectSpecification
* @see SpecificationLoader
*/
- @org.springframework.lang.NonNull String logicalName,
+ @NonNull String logicalName,
/**
* Type (that is, the {@link Class} this identifier represents).
*/
- @org.springframework.lang.NonNull Class<?> correspondingClass)
+ @NonNull Class<?> correspondingClass)
implements
Comparable<LogicalType>,
Serializable {
@@ -202,40 +202,4 @@ private String requireNonEmpty(final String logicalName) {
return logicalName;
}
- // -- DEPRECATIONS
-
- /**
- * @deprecated use {@link #correspondingClass()}
- */
- @Deprecated public Class<?> getCorrespondingClass() { return
correspondingClass(); }
-
- /**
- * @deprecated use {@link #logicalName()}
- */
- @Deprecated public String getLogicalTypeName() { return logicalName(); }
-
- /**
- * @deprecated use {@link #className()}
- */
- @Deprecated public String getClassName() { return className(); }
-
- /**
- * @deprecated use {@link #logicalSimpleName()}
- */
- @Deprecated public String getLogicalTypeSimpleName() { return
logicalSimpleName(); }
-
- /**
- * @deprecated use {@link #namespace()}
- */
- @Deprecated public String getNamespace() { return namespace(); }
-
- /**
- * @deprecated use {@link #logicalNameFormatted(String, String)}
- */
- @Deprecated public String getLogicalTypeNameFormatted(
- final @NonNull String root,
- final @NonNull String delimiter) {
- return logicalNameFormatted(root, delimiter);
- }
-
}
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/locale/UserLocale.java
b/api/applib/src/main/java/org/apache/causeway/applib/locale/UserLocale.java
index 520c6ce837b..82287fc339f 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/locale/UserLocale.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/locale/UserLocale.java
@@ -51,19 +51,6 @@ public static UserLocale valueOf(final Locale mainLocale) {
.build();
}
- /**
- * use {@link #languageLocale()} instead
- */
- @Deprecated public Locale getLanguageLocale() { return languageLocale; }
- /**
- * use {@link #numberFormatLocale()} instead
- */
- @Deprecated public Locale getNumberFormatLocale() { return
numberFormatLocale; }
- /**
- * use {@link #timeFormatLocale()} instead
- */
- @Deprecated public Locale getTimeFormatLocale() { return timeFormatLocale;
}
-
// -- UTILITY
public UserLocaleBuilder asBuilder() {
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 eb634233c44..9e13b4aaf30 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
@@ -32,21 +32,11 @@ public interface Oid extends Serializable {
* (aka. object-type)
*/
String logicalTypeName();
-
- /**
- * use {@link #logicalTypeName()} instead
- */
- @Deprecated default String getLogicalTypeName() { return
logicalTypeName(); }
/**
* Stringified version of the ID of the domain object instance this Oid is
representing.
*/
String identifier();
-
- /**
- * use {@link #identifier()} instead
- */
- @Deprecated default String getIdentifier() { return identifier(); }
/**
* The canonical form of the {@link Bookmark}, that is
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/services/health/Health.java
b/api/applib/src/main/java/org/apache/causeway/applib/services/health/Health.java
index e5883c61310..c2d771d7df2 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/services/health/Health.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/services/health/Health.java
@@ -33,22 +33,9 @@ public static Health error(String message) {
return new Health(message, null);
}
- public boolean isOk() {
- return message == null
- && cause == null;
+ public boolean isOk() {
+ return message == null
+ && cause == null;
}
-
- /**
- * use {@link #message()} instead
- */
- @Deprecated public String getMessage() { return message(); }
- /**
- * use {@link #cause()} instead
- */
- @Deprecated public Throwable getCause() { return cause(); }
- /**
- * use {@link #isOk()} instead
- */
- @Deprecated public boolean getResult() { return isOk(); }
-
+
}
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/services/iactnlayer/InteractionLayer.java
b/api/applib/src/main/java/org/apache/causeway/applib/services/iactnlayer/InteractionLayer.java
index 14170f78d29..170931239a0 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/services/iactnlayer/InteractionLayer.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/services/iactnlayer/InteractionLayer.java
@@ -50,16 +50,4 @@ public record InteractionLayer(
InteractionContext interactionContext
) {
- /**
- * @deprecated use {@link #interaction()} instead
- */
- @Deprecated
- public Interaction getInteraction() { return interaction; }
-
- /**
- * @deprecated use {@link #interactionContext()} instead
- */
- @Deprecated
- public InteractionContext getInteractionContext() { return
interactionContext; }
-
}
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 e2a168d10a4..3d6345cd388 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
@@ -33,7 +33,6 @@
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;
@@ -68,7 +67,7 @@ public void on(final RoleMemento.TitleUiEvent ev) {
ev.setTitle(roleMemento.name());
}
}
-
+
public static class TitleUiEvent extends
CausewayModuleApplib.TitleUiEvent<RoleMemento> {}
/**
@@ -88,30 +87,19 @@ public RoleMemento(
this.name = name;
this.description = description == null ? "" : description;
}
-
+
// -- OBJECT CONTRACT
-
+
@Override
public final boolean equals(Object obj) {
return (obj instanceof RoleMemento other)
? name.equals(other.name)
: false;
}
-
+
@Override
public final int hashCode() {
return Objects.hashCode(name);
}
-
- // -- DEPRECATIONS
-
- /**
- * @deprecated use {@link #name()} instead
- */
- @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 de8b77d03d2..cfee71008d7 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
@@ -71,11 +71,11 @@ public record UserMemento(
@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,
@@ -99,7 +99,7 @@ public record UserMemento(
@Property
@PropertyLayout(fieldSetId = "security", sequence = "1")
@NonNull AuthenticationSource authenticationSource,
-
+
@Property
@PropertyLayout(fieldSetId = "security", sequence = "3", named =
"impersonating")
boolean isImpersonating,
@@ -110,10 +110,10 @@ public record UserMemento(
* The interpretation of this token is implementation-specific.
*/
@Property(optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSetId = "security", sequence = "2",
+ @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>
@@ -124,14 +124,14 @@ public record UserMemento(
@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 {
@@ -144,7 +144,7 @@ public enum AuthenticationSource {
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";
@@ -306,7 +306,7 @@ public UserLocale asUserLocale() {
: main)
.build();
}
-
+
public static UserMementoBuilder builder(final String name) {
if (_Strings.isEmpty(name)) {
throw new IllegalArgumentException("Name not specified");
@@ -319,7 +319,7 @@ public static UserMementoBuilder builder(final String name)
{
}
// -- WITHERS
-
+
@Programmatic public UserMemento withRealName(String realName) {
return asBuilder().realName(realName).build();
}
@@ -347,9 +347,9 @@ public static UserMementoBuilder builder(final String name)
{
@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)
@@ -361,39 +361,16 @@ public final boolean equals(Object obj) {
&& 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/util/schema/CommonDtoUtils.java
b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommonDtoUtils.java
index 8aca4898d73..7f575a5ac9e 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommonDtoUtils.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommonDtoUtils.java
@@ -400,9 +400,9 @@ public <D extends ValueDto> D recordFundamentalValue(
final Blob blob = (Blob) pojo;
if(blob != null) {
final BlobDto blobDto = new BlobDto();
- blobDto.setName(blob.getName());
- blobDto.setBytes(blob.getBytes());
- blobDto.setMimeType(blob.getMimeType().toString());
+ blobDto.setName(blob.name());
+ blobDto.setBytes(blob.bytes());
+ blobDto.setMimeType(blob.mimeType().toString());
valueDto.setBlob(blobDto);
}
return valueDto;
@@ -411,9 +411,9 @@ public <D extends ValueDto> D recordFundamentalValue(
final Clob clob = (Clob) pojo;
if(clob != null) {
final ClobDto clobDto = new ClobDto();
- clobDto.setName(clob.getName());
- clobDto.setChars(clob.getChars().toString());
- clobDto.setMimeType(clob.getMimeType().toString());
+ clobDto.setName(clob.name());
+ clobDto.setChars(clob.chars().toString());
+ clobDto.setMimeType(clob.mimeType().toString());
valueDto.setClob(clobDto);
}
return valueDto;
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java
b/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java
index 374bd522ab1..64a84dc4a30 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java
@@ -162,12 +162,6 @@ public Blob(final String name, final MimeType mimeType,
final byte[] bytes) {
this.bytes = bytes;
}
- /**
- * @deprecated use {@link #bytes()} instead
- */
- @Deprecated
- public byte[] getBytes() { return bytes(); }
-
// -- UTILITIES
/**
@@ -215,7 +209,7 @@ public void writeTo(final @Nullable File file) {
* @see DataSource
*/
public DataSource asDataSource() {
- return DataSource.ofBytes(_NullSafe.toNonNull(getBytes()));
+ return DataSource.ofBytes(_NullSafe.toNonNull(bytes()));
}
/**
@@ -235,7 +229,7 @@ public Blob zip(final @Nullable String zipEntryNameIfAny) {
var zipEntryName = _Strings.nonEmpty(zipEntryNameIfAny)
.orElseGet(this::name);
var zipBuilder = ZipUtils.zipEntryBuilder();
- zipBuilder.add(zipEntryName, getBytes());
+ zipBuilder.add(zipEntryName, bytes());
return Blob.of(name()+".zip", CommonMimeType.ZIP,
zipBuilder.toBytes());
}
@@ -344,7 +338,7 @@ public String marshal(final Blob blob) throws Exception {
*/
public Optional<BufferedImage> asImage() {
- var bytes = getBytes();
+ var bytes = bytes();
if(bytes == null) {
return Optional.empty();
}
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/value/LocalResourcePath.java
b/api/applib/src/main/java/org/apache/causeway/applib/value/LocalResourcePath.java
index c804ed0385d..2f6e884c454 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/value/LocalResourcePath.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/value/LocalResourcePath.java
@@ -49,7 +49,7 @@
@Value
@XmlJavaTypeAdapter(LocalResourcePath.JaxbToStringAdapter.class) // for JAXB
view model support
public record LocalResourcePath(
- @NonNull String path,
+ @NonNull String path,
@NonNull OpenUrlStrategy openUrlStrategy) implements Serializable {
public static final String LOGICAL_TYPE_NAME =
CausewayModuleApplib.NAMESPACE + ".value.LocalResourcePath";
@@ -72,11 +72,6 @@ public LocalResourcePath(
? openUrlStrategy
: OpenUrlStrategy.NEW_WINDOW; // default
}
-
- /**
- * use {@link #openUrlStrategy()} instead
- */
- @Deprecated public OpenUrlStrategy getOpenUrlStrategy() { return
openUrlStrategy; }
public String getValue() {
return path;
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/value/Markup.java
b/api/applib/src/main/java/org/apache/causeway/applib/value/Markup.java
index a757e6804a6..de346f815e7 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/Markup.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/Markup.java
@@ -55,11 +55,6 @@ public Markup(final String html) {
this.html = html!=null ? html : "";
}
- /**
- * use {@link #html()} instead
- */
- @Deprecated public String asHtml() { return html; }
-
@Override
public String toString() {
return String.format("Markup[length=%d,content=%s]",
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/value/NamedWithMimeType.java
b/api/applib/src/main/java/org/apache/causeway/applib/value/NamedWithMimeType.java
index 5d92c65262a..ba2e373243f 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/value/NamedWithMimeType.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/value/NamedWithMimeType.java
@@ -38,36 +38,27 @@
public sealed interface NamedWithMimeType
extends
Serializable,
- Comparable<NamedWithMimeType>
+ Comparable<NamedWithMimeType>
permits Blob, Clob {
String name();
MimeType mimeType();
-
- /**
- * @deprecated use {@link #name()} instead
- */
- @Deprecated default String getName() { return name(); }
- /**
- * @deprecated use {@link #mimeType()} instead
- */
- @Deprecated default MimeType getMimeType() { return mimeType(); }
@Override
default int compareTo(final NamedWithMimeType o) {
int c = _Strings.compareNullsFirst(
- this.getName(),
+ this.name(),
o!=null
- ? o.getName()
+ ? o.name()
: null);
if(c!=0) {
return c;
}
return _Strings.compareNullsFirst(
- this.getMimeType().getBaseType(),
+ this.mimeType().getBaseType(),
o!=null
- ? o.getMimeType().getBaseType()
+ ? o.mimeType().getBaseType()
: null);
}
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/value/Password.java
b/api/applib/src/main/java/org/apache/causeway/applib/value/Password.java
index 0facb79d17d..26f79e2ef62 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/Password.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/Password.java
@@ -46,11 +46,6 @@ public static Password of(final String password) {
return new Password(password);
}
- /**
- * @deprecated use {@link #password()} instead
- */
- @Deprecated public String getPassword() { return password(); }
-
public boolean checkPassword(final String password) {
return Objects.equals(this.password, password);
}
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueDecomposition.java
b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueDecomposition.java
index 3e5244783c8..4b137477a01 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueDecomposition.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueDecomposition.java
@@ -83,24 +83,13 @@ public String stringify() {
}
public void accept(
- final @NonNull Consumer<ValueWithTypeDto> fundamentalConsumer,
- final @NonNull Consumer<TypedTupleDto> compositeConsumer) {
- if(fundamental!=null) {
- fundamentalConsumer.accept(fundamental);
- } else {
- compositeConsumer.accept(composite);
- }
+ final @NonNull Consumer<ValueWithTypeDto> fundamentalConsumer,
+ final @NonNull Consumer<TypedTupleDto> compositeConsumer) {
+ if(fundamental!=null) {
+ fundamentalConsumer.accept(fundamental);
+ } else {
+ compositeConsumer.accept(composite);
}
-
- // -- DEPRECATIONS
-
- /** @deprecated use {@link #fundamental()} instead */
- @Deprecated public @Nullable ValueWithTypeDto leftIfAny() { return
fundamental(); }
- /** @deprecated use {@link #composite()} instead */
- @Deprecated public @Nullable TypedTupleDto rightIfAny() { return
composite(); }
- /** @deprecated use {@link #fundamentalAsOptional()} instead */
- @Deprecated public Optional<ValueWithTypeDto> left() { return
fundamentalAsOptional(); }
- /** @deprecated use {@link #compositeAsOptional()} instead */
- @Deprecated public Optional<TypedTupleDto> right() { return
compositeAsOptional(); }
+ }
}
\ No newline at end of file
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/DomainMemberDefault.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/DomainMemberDefault.java
index 1527fb94698..20e1e5bfdab 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/DomainMemberDefault.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/metamodel/DomainMemberDefault.java
@@ -112,7 +112,7 @@ public String getLogicalTypeName() {
@Override
public String getNamespace() {
- return spec.logicalType().getNamespace();
+ return spec.logicalType().namespace();
}
@XmlElement @Override
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BlobValueSemantics.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BlobValueSemantics.java
index 61a895c3269..f216a624a6f 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BlobValueSemantics.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BlobValueSemantics.java
@@ -68,35 +68,14 @@ public Blob compose(final ValueDecomposition decomposition)
{
@Override
public String titlePresentation(final ValueSemanticsProvider.Context
context, final Blob value) {
- return renderTitle(value, Blob::getName);
+ return renderTitle(value, Blob::name);
}
@Override
public String htmlPresentation(final ValueSemanticsProvider.Context
context, final Blob value) {
- return renderHtml(value, Blob::getName);
+ return renderHtml(value, Blob::name);
}
- // -- ENCODER DECODER
-
-// public String toEncodedString(final Blob blob) {
-// return blob.getName() + ":" + blob.getMimeType().getBaseType() + ":"
+
-// _Strings.ofBytes(_Bytes.encodeToBase64(Base64.getEncoder(),
blob.getBytes()), StandardCharsets.UTF_8);
-// }
-//
-// public Blob fromEncodedString(final String data) {
-// final int colonIdx = data.indexOf(':');
-// final String name = data.substring(0, colonIdx);
-// final int colon2Idx = data.indexOf(":", colonIdx+1);
-// final String mimeTypeBase = data.substring(colonIdx+1, colon2Idx);
-// final String payload = data.substring(colon2Idx+1);
-// final byte[] bytes = _Bytes.decodeBase64(Base64.getDecoder(),
payload.getBytes(StandardCharsets.UTF_8));
-// try {
-// return new Blob(name, new MimeType(mimeTypeBase), bytes);
-// } catch (MimeTypeParseException e) {
-// throw new RuntimeException(e);
-// }
-// }
-
// -- EXAMPLES
@Override
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ClobValueSemantics.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ClobValueSemantics.java
index 8f5c3b7099d..39ed674bfce 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ClobValueSemantics.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/ClobValueSemantics.java
@@ -71,33 +71,14 @@ public Clob compose(final ValueDecomposition decomposition)
{
@Override
public String titlePresentation(final ValueSemanticsProvider.Context
context, final Clob value) {
- return renderTitle(value, Clob::getName);
+ return renderTitle(value, Clob::name);
}
@Override
public String htmlPresentation(final ValueSemanticsProvider.Context
context, final Clob value) {
- return renderHtml(value, Clob::getName);
+ return renderHtml(value, Clob::name);
}
- // -- ENCODER DECODER
-
-// private String toEncodedString(final Clob clob) {
-// return clob.getName() + ":" + clob.getMimeType().getBaseType() + ":"
+ clob.getChars();
-// }
-//
-// private Clob fromEncodedString(final String data) {
-// final int colonIdx = data.indexOf(':');
-// final String name = data.substring(0, colonIdx);
-// final int colon2Idx = data.indexOf(":", colonIdx+1);
-// final String mimeTypeBase = data.substring(colonIdx+1, colon2Idx);
-// final CharSequence chars = data.substring(colon2Idx+1);
-// try {
-// return new Clob(name, new MimeType(mimeTypeBase), chars);
-// } catch (MimeTypeParseException e) {
-// throw new RuntimeException(e);
-// }
-// }
-
// -- EXAMPLES
@Override
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/PasswordValueSemantics.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/PasswordValueSemantics.java
index 8aca24e08f3..643efb75d25 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/PasswordValueSemantics.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/PasswordValueSemantics.java
@@ -58,7 +58,7 @@ public ValueType getSchemaValueType() {
@Override
public ValueDecomposition decompose(final Password value) {
- return decomposeAsNullable(value, Password::getPassword, ()->null);
+ return decomposeAsNullable(value, Password::password, ()->null);
}
@Override
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 06fd7efbf5b..7862085111a 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
@@ -243,7 +243,7 @@ void roundtrip_CLE_bookmarks() {
// then
assertThat(cleBookmarkIfAny).isPresent();
Bookmark cleBookmark = cleBookmarkIfAny.get();
- String identifier = cleBookmark.getIdentifier();
+ String identifier = cleBookmark.identifier();
if (causewayBeanTypeRegistry.persistenceStack().isJdo()) {
assertThat(identifier).startsWith("u_");
UUID.fromString(identifier.substring("u_".length())); // should
not fail, ie check the format is as we expect
diff --git
a/extensions/core/docgen/help/src/main/java/org/apache/causeway/extensions/docgen/help/topics/domainobjects/DomainEntityDiagramPage.java
b/extensions/core/docgen/help/src/main/java/org/apache/causeway/extensions/docgen/help/topics/domainobjects/DomainEntityDiagramPage.java
index 9b3c8af9683..40635eb3ee2 100644
---
a/extensions/core/docgen/help/src/main/java/org/apache/causeway/extensions/docgen/help/topics/domainobjects/DomainEntityDiagramPage.java
+++
b/extensions/core/docgen/help/src/main/java/org/apache/causeway/extensions/docgen/help/topics/domainobjects/DomainEntityDiagramPage.java
@@ -51,7 +51,7 @@ protected String diagramTitle() {
@Override
protected boolean accept(final BeanSort beanSort, final LogicalType
logicalType) {
if(!beanSort.isEntity()) return false;
- var ns = "" + logicalType.getNamespace();
+ var ns = "" + logicalType.namespace();
return !ns.equals("causeway")
&& !ns.startsWith("causeway.");
}
diff --git
a/extensions/core/docgen/help/src/main/java/org/apache/causeway/extensions/docgen/help/topics/domainobjects/DomainEntityDiagramPage2.java
b/extensions/core/docgen/help/src/main/java/org/apache/causeway/extensions/docgen/help/topics/domainobjects/DomainEntityDiagramPage2.java
index dd56e2710d6..cf489c48767 100644
---
a/extensions/core/docgen/help/src/main/java/org/apache/causeway/extensions/docgen/help/topics/domainobjects/DomainEntityDiagramPage2.java
+++
b/extensions/core/docgen/help/src/main/java/org/apache/causeway/extensions/docgen/help/topics/domainobjects/DomainEntityDiagramPage2.java
@@ -51,7 +51,7 @@ protected String diagramTitle() {
@Override
protected boolean accept(final BeanSort beanSort, final LogicalType
logicalType) {
if(!beanSort.isEntity()) return false;
- var ns = "" + logicalType.getNamespace();
+ var ns = "" + logicalType.namespace();
return !ns.equals("causeway")
&& !ns.startsWith("causeway.");
}
diff --git
a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/ExcelServiceDefault.java
b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/ExcelServiceDefault.java
index 88bca79a298..982003bc19b 100644
---
a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/ExcelServiceDefault.java
+++
b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/ExcelServiceDefault.java
@@ -194,7 +194,7 @@ public List<List<?>> fromExcel(
final WorksheetSpec.Sequencer sequencer) throws
ExcelServiceDefault.Exception {
List<WorksheetSpec> worksheetSpecs = _Lists.newArrayList();
- try (ByteArrayInputStream bais = new
ByteArrayInputStream(excelBlob.getBytes())) {
+ try (ByteArrayInputStream bais = new
ByteArrayInputStream(excelBlob.bytes())) {
try (final Workbook wb =
org.apache.poi.ss.usermodel.WorkbookFactory.create(bais)) {
final int numberOfSheets = wb.getNumberOfSheets();
for (int i = 0; i < numberOfSheets; i++) {
diff --git
a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/_ExcelServiceHelper.java
b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/_ExcelServiceHelper.java
index fceb71bedc5..0a8766619db 100644
---
a/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/_ExcelServiceHelper.java
+++
b/extensions/core/excel/applib/src/main/java/org/apache/causeway/extensions/excel/applib/service/_ExcelServiceHelper.java
@@ -211,7 +211,7 @@ List<List<?>> fromExcel(
final Blob excelBlob,
final List<WorksheetSpec> worksheetSpecs) throws
ExcelServiceDefault.Exception {
try {
- return newExcelConverter().fromBytes(worksheetSpecs,
excelBlob.getBytes());
+ return newExcelConverter().fromBytes(worksheetSpecs,
excelBlob.bytes());
} catch (final IOException | InvalidFormatException e) {
throw new ExcelServiceDefault.Exception(e);
}
diff --git
a/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
b/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
index ccc1d52c7de..a271f87376b 100644
---
a/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
+++
b/extensions/core/excel/integtests/src/test/java/org/apache/causeway/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
@@ -78,7 +78,7 @@ public void export_then_import() throws Exception {
final Blob exportedBlob = bulkUpdateManager.export();
// then
- final byte[] actualBytes = exportedBlob.getBytes();
+ final byte[] actualBytes = exportedBlob.bytes();
// assertThat(actualBytes, lengthWithinPercentage(expectedBytes, 10));
/// ... too flaky
// and given
diff --git
a/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture.java
b/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture.java
index ac3cb266fc9..25315d8468d 100644
---
a/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture.java
+++
b/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture.java
@@ -196,7 +196,7 @@ private void addToCombined(final List<Object>
createdObjects) {
private byte[] getBytes() {
if (bytes == null) {
if (blob != null){
- bytes = blob.getBytes();
+ bytes = blob.bytes();
} else {
bytes = readBytes();
}
diff --git
a/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture2.java
b/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture2.java
index 8fc042d0be6..2ea3aed50b5 100644
---
a/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture2.java
+++
b/extensions/core/excel/testing/src/main/java/org/apache/causeway/extensions/excel/testing/ExcelFixture2.java
@@ -134,7 +134,7 @@ protected void execute(final ExecutionContext
executionContext) {
private byte[] getBytes() {
if (bytes == null) {
if (blob != null){
- bytes = blob.getBytes();
+ bytes = blob.bytes();
} else {
bytes = readBytes();
}
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 c37b0fe8bfb..f235a176dfc 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
@@ -217,7 +217,7 @@ void roundtrip_ELE_bookmarks() {
// then
assertThat(eleBookmarkIfAny).isPresent();
Bookmark eleBookmark = eleBookmarkIfAny.get();
- String identifier = eleBookmark.getIdentifier();
+ String identifier = eleBookmark.identifier();
UUID.fromString(identifier.substring(0, identifier.indexOf("_"))); //
should not fail, ie check the format is as we expect
Integer.parseInt(identifier.substring(identifier.indexOf("_")+1)); //
should not fail, ie check the format is as we expect
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 9c1d8349b9e..c35fe6211d9 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
@@ -232,7 +232,7 @@ void roundtrip_EOE_bookmarks() {
// then
assertThat(eleBookmarkIfAny).isPresent();
Bookmark eleBookmark = eleBookmarkIfAny.get();
- String identifier = eleBookmark.getIdentifier();
+ String identifier = eleBookmark.identifier();
UUID.fromString(identifier.substring(0, identifier.indexOf("_"))); //
should not fail, ie check the format is as we expect
Integer.parseInt(identifier.substring(identifier.indexOf("_")+1)); //
should not fail, ie check the format is as we expect
diff --git
a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUserRepository.java
b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUserRepository.java
index 8780644d0e9..dda3e04b0d7 100644
---
a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUserRepository.java
+++
b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUserRepository.java
@@ -67,32 +67,32 @@ public interface ApplicationUserRepository {
ApplicationUser newUser(String username, AccountType accountType,
Consumer<ApplicationUser> beforePersist);
default ApplicationUser upsertLocal(
- @NonNull String username,
- @Nullable Password password,
- @NonNull ApplicationUserStatus status) {
+ @NonNull final String username,
+ @Nullable final Password password,
+ @NonNull final ApplicationUserStatus status) {
return findByUsername(username)
.orElseGet(() -> newLocalUser(username, password, status));
}
default ApplicationUser newLocalUser(
- @NonNull String username,
- @Nullable Password password,
- @NonNull ApplicationUserStatus status) {
+ @NonNull final String username,
+ @Nullable final Password password,
+ @NonNull final ApplicationUserStatus status) {
return newUser(username, AccountType.LOCAL, user->{
user.setStatus(status);
if (password != null) {
- updatePassword(user, password.getPassword());
+ updatePassword(user, password.password());
}
});
}
default ApplicationUser newDelegateUser(
- String username,
- ApplicationUserStatus status) {
+ final String username,
+ final ApplicationUserStatus status) {
return newUser(username, AccountType.DELEGATED, user->{
user.setStatus(status);
diff --git
a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_resetPassword.java
b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_resetPassword.java
index 9772ea9e720..a401409f039 100644
---
a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_resetPassword.java
+++
b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_resetPassword.java
@@ -63,7 +63,7 @@ public static class DomainEvent
final Password newPassword,
final Password repeatPassword) {
- applicationUserRepository.updatePassword(target,
newPassword.getPassword());
+ applicationUserRepository.updatePassword(target,
newPassword.password());
return target;
}
diff --git
a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_updatePassword.java
b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_updatePassword.java
index 67b4d508fb9..7ca804ec9b6 100644
---
a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_updatePassword.java
+++
b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/ApplicationUser_updatePassword.java
@@ -69,7 +69,7 @@ public static class DomainEvent
final Password newPassword,
final Password repeatNewPassword) {
- applicationUserRepository.updatePassword(target,
newPassword.getPassword());
+ applicationUserRepository.updatePassword(target,
newPassword.password());
return target;
}
@@ -99,7 +99,7 @@ public static class DomainEvent
var encryptedPassword = target.getEncryptedPassword();
if(target.getEncryptedPassword() != null) {
- if (!passwordEncoder.matches(existingPassword.getPassword(),
encryptedPassword)) {
+ if (!passwordEncoder.matches(existingPassword.password(),
encryptedPassword)) {
return "Existing password is incorrect";
}
}
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 3d761ece825..cee92279a03 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
@@ -232,7 +232,7 @@ protected Component createCompactFrame() {
}
var compactFrame = new WebMarkupContainer(ID_SCALAR_IF_COMPACT);
var downloadLink = Wkt.add(compactFrame,
Wkt.downloadLinkNoCache(ID_DOWNLOAD_IF_COMPACT, asBlobResource(blob)));
- Wkt.labelAdd(downloadLink, ID_FILE_NAME_IF_COMPACT, blob.getName());
+ Wkt.labelAdd(downloadLink, ID_FILE_NAME_IF_COMPACT, blob.name());
return compactFrame;
}
@@ -282,16 +282,6 @@ public void onRequest() {
new ResourceRequestHandler(asBlobResourceNoCache(blob), null));
}
-// @Override
-// protected void setupInlinePrompt() {
-// // not used
-// }
-//
-// @Override
-// protected Component getValidationFeedbackReceiver() {
-// return null; // not used
-// }
-
// -- HELPER
private Blob getBlob() {
@@ -299,11 +289,11 @@ private Blob getBlob() {
}
private static ByteArrayResource asBlobResource(final @NonNull Blob blob) {
- return new ByteArrayResource(blob.getMimeType().getBaseType(),
blob.getBytes(), blob.getName());
+ return new ByteArrayResource(blob.mimeType().getBaseType(),
blob.bytes(), blob.name());
}
private static ByteArrayResource asBlobResourceNoCache(final @NonNull Blob
blob) {
- final byte[] bytes = blob.getBytes();
+ final byte[] bytes = blob.bytes();
return new ByteArrayResource("application/pdf", bytes) {
private static final long serialVersionUID = 1L;
@Override protected void configureResponse(
diff --git
a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java
b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java
index 97300ddfc42..0e48869e037 100644
---
a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java
+++
b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/causeway/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java
@@ -62,7 +62,7 @@ private static boolean isPdf(final ManagedObject
objectAdapter) {
return false;
}
final Blob blob = (Blob) objectPojo;
- return CommonMimeType.PDF.matches(blob.getMimeType());
+ return CommonMimeType.PDF.matches(blob.mimeType());
}
@Override
diff --git
a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/typeconverters/applib/CausewayPasswordConverter.java
b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/typeconverters/applib/CausewayPasswordConverter.java
index 441bae2a3f4..3ef9868da2d 100644
---
a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/typeconverters/applib/CausewayPasswordConverter.java
+++
b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/typeconverters/applib/CausewayPasswordConverter.java
@@ -33,7 +33,7 @@ public class CausewayPasswordConverter
@Override
public String convertToDatabaseColumn(final Password memberValue) {
return memberValue != null
- ? memberValue.getPassword()
+ ? memberValue.password()
: null;
}
diff --git
a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/NoPermissionChecks.java
b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/NoPermissionChecks.java
index e5adda5112c..00a9d0dec0d 100644
---
a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/NoPermissionChecks.java
+++
b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/NoPermissionChecks.java
@@ -45,14 +45,14 @@ public class NoPermissionChecks implements
BeforeEachCallback {
@Override
public void beforeEach(final ExtensionContext extensionContext) {
_Helper.getInteractionFactory(extensionContext)
- .ifPresent(interactionService ->
-
interactionService.currentInteractionContext().ifPresent(
- currentInteractionContext -> {
- var sudoUser =
currentInteractionContext.getUser().withRoleAdded(SudoService.ACCESS_ALL_ROLE.getName());
-
interactionService.openInteraction(currentInteractionContext.withUser(sudoUser));
- }
- )
- );
+ .ifPresent(interactionService ->
+ interactionService.currentInteractionContext().ifPresent(
+ currentInteractionContext -> {
+ var sudoUser =
currentInteractionContext.getUser().withRoleAdded(SudoService.ACCESS_ALL_ROLE.name());
+
interactionService.openInteraction(currentInteractionContext.withUser(sudoUser));
+ }
+ )
+ );
}
}
diff --git
a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetBlobMimeType.java
b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetBlobMimeType.java
index 2c4dad73144..eb14528b903 100644
---
a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetBlobMimeType.java
+++
b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetBlobMimeType.java
@@ -35,7 +35,7 @@ public RichPropertyGetBlobMimeType(
@Override
protected Object fetchData(DataFetchingEnvironment environment) {
- return fetchDataFromBlob(environment, blob ->
blob.getMimeType().toString());
+ return fetchDataFromBlob(environment, blob ->
blob.mimeType().toString());
}
}
diff --git
a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetBlobName.java
b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetBlobName.java
index 54521ef9058..639b5519527 100644
---
a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetBlobName.java
+++
b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetBlobName.java
@@ -35,7 +35,7 @@ public RichPropertyGetBlobName(
@Override
protected Object fetchData(DataFetchingEnvironment environment) {
- return fetchDataFromBlob(environment, Blob::getName);
+ return fetchDataFromBlob(environment, Blob::name);
}
}
diff --git
a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetClobMimeType.java
b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetClobMimeType.java
index 9daa20a977c..0c033efed15 100644
---
a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetClobMimeType.java
+++
b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetClobMimeType.java
@@ -35,7 +35,7 @@ public RichPropertyGetClobMimeType(
@Override
protected Object fetchData(DataFetchingEnvironment environment) {
- return fetchDataFromBlob(environment, blob ->
blob.getMimeType().toString());
+ return fetchDataFromBlob(environment, blob ->
blob.mimeType().toString());
}
}
diff --git
a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetClobName.java
b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetClobName.java
index eff6ca57035..47af2469576 100644
---
a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetClobName.java
+++
b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/rich/query/RichPropertyGetClobName.java
@@ -35,7 +35,7 @@ public RichPropertyGetClobName(
@Override
protected Object fetchData(DataFetchingEnvironment environment) {
- return fetchDataFromBlob(environment, Blob::getName);
+ return fetchDataFromBlob(environment, Blob::name);
}
}
diff --git
a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobMimeType.java
b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobMimeType.java
index 9cfc231b0ea..8f7142f20a1 100644
---
a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobMimeType.java
+++
b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobMimeType.java
@@ -35,7 +35,7 @@ public SimplePropertyLobMimeType(
@Override
protected Object fetchData(DataFetchingEnvironment environment) {
- return fetchDataFromBlob(environment, blob ->
blob.getMimeType().toString());
+ return fetchDataFromBlob(environment, blob ->
blob.mimeType().toString());
}
}
diff --git
a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobName.java
b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobName.java
index 79c8e4f50b1..51c6f3f2d25 100644
---
a/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobName.java
+++
b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/domain/simple/query/SimplePropertyLobName.java
@@ -35,7 +35,7 @@ public SimplePropertyLobName(
@Override
protected Object fetchData(DataFetchingEnvironment environment) {
- return fetchDataFromBlob(environment, Blob::getName);
+ return fetchDataFromBlob(environment, Blob::name);
}
}
diff --git
a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DepartmentMutating_IntegTest.java
b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DepartmentMutating_IntegTest.java
index 34f15d5da8e..f8633d85b31 100644
---
a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DepartmentMutating_IntegTest.java
+++
b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DepartmentMutating_IntegTest.java
@@ -54,7 +54,7 @@ void change_department_name_visibility() throws Exception {
}
).valueAsNonNullElseFail();
- var response = submit(_Maps.unmodifiable("$departmentId",
bookmark.getIdentifier()));
+ var response = submit(_Maps.unmodifiable("$departmentId",
bookmark.identifier()));
// then payload
Approvals.verify(response, jsonOptions());
diff --git
a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DeptHeadMutating_IntegTest.java
b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DeptHeadMutating_IntegTest.java
index 2a35564ffb0..ae299e96a5a 100644
---
a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DeptHeadMutating_IntegTest.java
+++
b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/DeptHeadMutating_IntegTest.java
@@ -52,7 +52,7 @@ void change_department_name() throws Exception {
}
).valueAsNonNullElseFail();
- var response = submit(_Maps.unmodifiable("$departmentId",
bookmark.getIdentifier()));
+ var response = submit(_Maps.unmodifiable("$departmentId",
bookmark.identifier()));
// then payload
Approvals.verify(response, jsonOptions());
diff --git
a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/Person_2_IntegTest.java
b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/Person_2_IntegTest.java
index 4315f530af2..e546b97b8a5 100644
---
a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/Person_2_IntegTest.java
+++
b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/special/Person_2_IntegTest.java
@@ -52,7 +52,7 @@ void name_of_person_using_id_and_logicalTypeName() throws
Exception {
}
).valueAsNonNullElseFail();
- var response = submit(_Maps.unmodifiable("$staffMemberId",
bookmark.getIdentifier()));
+ var response = submit(_Maps.unmodifiable("$staffMemberId",
bookmark.identifier()));
// then payload
Approvals.verify(response, jsonOptions());
diff --git
a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/univ/staffmutating/StaffMutating_IntegTest.java
b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/univ/staffmutating/StaffMutating_IntegTest.java
index dce6a63b50f..161b2062e7e 100644
---
a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/univ/staffmutating/StaffMutating_IntegTest.java
+++
b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/univ/staffmutating/StaffMutating_IntegTest.java
@@ -51,7 +51,7 @@ void staff_member_edit_name() throws Exception {
}
).valueAsNonNullElseFail();
- var response = submit(_Maps.unmodifiable("$staffMemberId",
bookmark.getIdentifier()));
+ var response = submit(_Maps.unmodifiable("$staffMemberId",
bookmark.identifier()));
// then payload
Approvals.verify(response, jsonOptions());
