This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
commit f69dc8f2726c2ba32b658e0621163c1ba268899f Author: Dan Haywood <[email protected]> AuthorDate: Thu Aug 25 17:09:22 2022 +0100 ISIS-3176: adds missing @ObjectSupport everywhere to allow usage under ENCAPSULATED_ENABLED introspection. --- .../isis/applib/services/appfeat/ApplicationFeatureId.java | 5 +++-- .../applib/services/appfeatui/ApplicationFeatureMenu.java | 3 +-- .../services/appfeatui/ApplicationFeatureViewModel.java | 3 +-- .../org/apache/isis/core/metamodel/inspect/model/MMNode.java | 3 +-- .../src/main/java/demoapp/dom/domain/_changes/ChangesVm.java | 3 +-- .../domain/actions/progmodel/assoc/AssociatedActionDemo.java | 3 +-- .../actions/progmodel/depargs/DependentArgsActionDemo.java | 2 +- .../nature/viewmodels/jaxbrefentity/JaxbRefEntity.java | 3 +-- .../properties/PropertyLayout/navigable/FileNodeVm.java | 3 +-- .../extensions/commandlog/applib/dom/CommandLogEntry.java | 3 ++- .../dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java | 3 ++- .../dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java | 3 ++- .../fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java | 3 +-- .../executionlog/applib/dom/ExecutionLogEntry.java | 3 ++- .../executionoutbox/applib/dom/ExecutionOutboxEntry.java | 3 ++- .../executionoutbox/applib/restapi/OutboxEvents.java | 3 ++- .../extensions/audittrail/applib/dom/AuditTrailEntry.java | 3 ++- .../secman/applib/feature/api/ApplicationFeatureChoices.java | 4 ++-- .../secman/applib/tenancy/menu/ApplicationTenancyMenu.java | 3 +-- .../extensions/sessionlog/applib/dom/SessionLogEntry.java | 8 ++++---- .../org/apache/isis/testdomain/jpa/entities/JpaProduct.java | 3 ++- .../model/good/ProperMemberInheritanceAbstract.java | 12 ++++-------- 22 files changed, 39 insertions(+), 43 deletions(-) diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java index 0ae4cc67e2..d34ae60d80 100644 --- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java +++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java @@ -25,6 +25,7 @@ import java.util.function.Consumer; import org.springframework.lang.Nullable; import org.apache.isis.applib.Identifier; +import org.apache.isis.applib.annotation.ObjectSupport; import org.apache.isis.applib.annotation.Programmatic; import org.apache.isis.applib.annotation.Value; import org.apache.isis.applib.id.LogicalType; @@ -218,8 +219,8 @@ implements * having a title() method (rather than using @Title annotation) is necessary as a workaround to be able to use * wrapperFactory#unwrap(...) method, which is otherwise broken in Isis 1.6.0 */ - public String title() { - final TitleBuffer buf = new TitleBuffer(); + @ObjectSupport public String title() { + val buf = new TitleBuffer(); buf.append(getFullyQualifiedName()); return buf.toString(); } diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureMenu.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureMenu.java index f00a22d1e0..d65fbfe4a6 100644 --- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureMenu.java +++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureMenu.java @@ -69,8 +69,7 @@ public class ApplicationFeatureMenu { // -- ICON NAME - @ObjectSupport - public String iconName() { + @ObjectSupport public String iconName() { return "applicationFeature"; } diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.java index 0a42f25e94..3f6de2977a 100644 --- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.java +++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.java @@ -146,8 +146,7 @@ public abstract class ApplicationFeatureViewModel implements ViewModel { @ObjectSupport public String title() { return getFullyQualifiedName(); } - @ObjectSupport - public String iconName() { + @ObjectSupport public String iconName() { return "applicationFeature"; } diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMNode.java index 005a85adb2..7af0299fb4 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMNode.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMNode.java @@ -77,8 +77,7 @@ public abstract class MMNode { protected abstract String iconSuffix(); - @ObjectSupport - public final String iconName() { + @ObjectSupport public final String iconName() { return iconSuffix(); } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/_changes/ChangesVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/_changes/ChangesVm.java index 3d5fdf1b24..ca876ff836 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/_changes/ChangesVm.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/_changes/ChangesVm.java @@ -53,8 +53,7 @@ import lombok.Setter; @AllArgsConstructor public class ChangesVm { - @ObjectSupport - public String title() { + @ObjectSupport public String title() { int numCreated = changesDto.getObjects().getCreated().getOid().size(); int numUpdated = changesDto.getObjects().getUpdated().getOid().size(); int numDeleted = changesDto.getObjects().getDeleted().getOid().size(); diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java index f496cd0e26..2e628c5abe 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java @@ -67,8 +67,7 @@ public class AssociatedActionDemo implements HasAsciiDocDescription { @Getter private final Set<DemoItem> items = new LinkedHashSet<>(); - @ObjectSupport - public String title() { + @ObjectSupport public String title() { return "Associated Action Demo"; } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.java index 54322c4f47..8f5568fb60 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.java @@ -49,7 +49,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription; @DomainObject(nature=Nature.VIEW_MODEL, editing=Editing.ENABLED) public class DependentArgsActionDemo implements HasAsciiDocDescription { - public String title() { + @ObjectSupport public String title() { return "Dependent Arguments Demo"; } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/JaxbRefEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/JaxbRefEntity.java index bcfc59a447..87b604809a 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/JaxbRefEntity.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/JaxbRefEntity.java @@ -39,8 +39,7 @@ implements return getName(); } - @ObjectSupport - public String title() { + @ObjectSupport public String title() { return Objects.requireNonNull(getName(), "most likely a serialization or re-attach issue"); } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java index d7d348390c..9cffed17b1 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java @@ -69,8 +69,7 @@ public class FileNodeVm implements HasAsciiDocDescription { //end::title[] //tag::iconName[] - @ObjectSupport - public String iconName() { + @ObjectSupport public String iconName() { return type!=null ? type.name() : ""; } //end::iconName[] diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/CommandLogEntry.java b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/CommandLogEntry.java index bb3d61ef19..e1b3e18946 100644 --- a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/CommandLogEntry.java +++ b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/CommandLogEntry.java @@ -39,6 +39,7 @@ import org.apache.isis.applib.annotation.DomainObject; import org.apache.isis.applib.annotation.DomainObjectLayout; import org.apache.isis.applib.annotation.Editing; import org.apache.isis.applib.annotation.MemberSupport; +import org.apache.isis.applib.annotation.ObjectSupport; import org.apache.isis.applib.annotation.Optionality; import org.apache.isis.applib.annotation.Parameter; import org.apache.isis.applib.annotation.PriorityPrecedence; @@ -206,7 +207,7 @@ implements Comparable<CommandLogEntry>, DomainChangeRecord, HasCommandDto { private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); - public String title() { + @ObjectSupport public String title() { return new TitleBuffer() .append(formatter.format(getTimestamp().toLocalDateTime())) .append(" ") diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java index c5d7868a0b..e43cb3f4aa 100644 --- a/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java +++ b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java @@ -36,6 +36,7 @@ import org.apache.isis.applib.annotation.BookmarkPolicy; import org.apache.isis.applib.annotation.DomainObject; import org.apache.isis.applib.annotation.DomainObjectLayout; import org.apache.isis.applib.annotation.Nature; +import org.apache.isis.applib.annotation.ObjectSupport; import org.apache.isis.applib.annotation.SemanticsOf; import org.apache.isis.applib.jaxb.JavaTimeJaxbAdapters; import org.apache.isis.applib.services.message.MessageService; @@ -79,7 +80,7 @@ public class BulkUpdateLineItemForDemoToDoItem modifyToDoItem(toDoItem); } - public String title() { + @ObjectSupport public String title() { final ExcelDemoToDoItem existingItem = getToDoItem(); if(existingItem != null) { return "EXISTING: " + titleService.titleOf(existingItem); diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java index a1904d15b6..f30da4ed32 100644 --- a/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java +++ b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java @@ -40,6 +40,7 @@ import org.apache.isis.applib.annotation.DomainObject; import org.apache.isis.applib.annotation.DomainObjectLayout; import org.apache.isis.applib.annotation.MemberSupport; import org.apache.isis.applib.annotation.Nature; +import org.apache.isis.applib.annotation.ObjectSupport; import org.apache.isis.applib.annotation.Parameter; import org.apache.isis.applib.annotation.ParameterLayout; import org.apache.isis.applib.annotation.SemanticsOf; @@ -86,7 +87,7 @@ public class BulkUpdateManagerForDemoToDoItem { public BulkUpdateManagerForDemoToDoItem(){ } - public String title() { + @ObjectSupport public String title() { return "Import/export manager"; } diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java index d880d26f3f..f5ba2ffc09 100644 --- a/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java +++ b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java @@ -148,8 +148,7 @@ public class ExcelDemoToDoItem implements Comparable<ExcelDemoToDoItem> /*, Cale return buf.toString(); } - @ObjectSupport - public String iconName() { + @ObjectSupport public String iconName() { return "ExcelModuleDemoToDoItem-" + (!isComplete() ? "todo" : "done"); } diff --git a/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/ExecutionLogEntry.java b/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/ExecutionLogEntry.java index d5247f6ce0..b5df1ff65b 100644 --- a/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/ExecutionLogEntry.java +++ b/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/ExecutionLogEntry.java @@ -37,6 +37,7 @@ import org.springframework.stereotype.Service; import org.apache.isis.applib.annotation.DomainObject; import org.apache.isis.applib.annotation.DomainObjectLayout; import org.apache.isis.applib.annotation.Editing; +import org.apache.isis.applib.annotation.ObjectSupport; import org.apache.isis.applib.annotation.Optionality; import org.apache.isis.applib.annotation.Parameter; import org.apache.isis.applib.annotation.PriorityPrecedence; @@ -167,7 +168,7 @@ implements Comparable<ExecutionLogEntry>, DomainChangeRecord, HasInteractionIdAn private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); - public String title() { + @ObjectSupport public String title() { return new TitleBuffer() .append(formatter.format(getTimestamp().toLocalDateTime())) .append(" ") diff --git a/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java b/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java index 4bc4376cc0..49c95b7898 100644 --- a/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java +++ b/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java @@ -37,6 +37,7 @@ import org.springframework.stereotype.Service; import org.apache.isis.applib.annotation.DomainObject; import org.apache.isis.applib.annotation.DomainObjectLayout; import org.apache.isis.applib.annotation.Editing; +import org.apache.isis.applib.annotation.ObjectSupport; import org.apache.isis.applib.annotation.Optionality; import org.apache.isis.applib.annotation.Parameter; import org.apache.isis.applib.annotation.PriorityPrecedence; @@ -159,7 +160,7 @@ implements Comparable<ExecutionOutboxEntry>, DomainChangeRecord, HasInteractionI private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); - public String title() { + @ObjectSupport public String title() { return new TitleBuffer() .append(formatter.format(getTimestamp().toLocalDateTime())) .append(" ") diff --git a/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/restapi/OutboxEvents.java b/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/restapi/OutboxEvents.java index c5caa99562..e965212aeb 100644 --- a/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/restapi/OutboxEvents.java +++ b/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/restapi/OutboxEvents.java @@ -35,6 +35,7 @@ import org.apache.isis.applib.annotation.Collection; import org.apache.isis.applib.annotation.CollectionLayout; import org.apache.isis.applib.annotation.DomainObject; import org.apache.isis.applib.annotation.Nature; +import org.apache.isis.applib.annotation.ObjectSupport; import org.apache.isis.extensions.executionoutbox.applib.IsisModuleExtExecutionOutboxApplib; import org.apache.isis.extensions.executionoutbox.applib.dom.ExecutionOutboxEntry; @@ -56,7 +57,7 @@ public class OutboxEvents { static final String LOGICAL_TYPE_NAME = IsisModuleExtExecutionOutboxApplib.NAMESPACE + ".OutboxEvents"; - public String title() { + @ObjectSupport public String title() { return String.format("%d executions", executions.size()); } diff --git a/extensions/security/audittrail/applib/src/main/java/org/apache/isis/extensions/audittrail/applib/dom/AuditTrailEntry.java b/extensions/security/audittrail/applib/src/main/java/org/apache/isis/extensions/audittrail/applib/dom/AuditTrailEntry.java index 8c8fdbc9e6..fec4aa42d1 100644 --- a/extensions/security/audittrail/applib/src/main/java/org/apache/isis/extensions/audittrail/applib/dom/AuditTrailEntry.java +++ b/extensions/security/audittrail/applib/src/main/java/org/apache/isis/extensions/audittrail/applib/dom/AuditTrailEntry.java @@ -30,6 +30,7 @@ import javax.inject.Named; import org.apache.isis.applib.annotation.DomainObject; import org.apache.isis.applib.annotation.DomainObjectLayout; import org.apache.isis.applib.annotation.Editing; +import org.apache.isis.applib.annotation.ObjectSupport; import org.apache.isis.applib.annotation.Optionality; import org.apache.isis.applib.annotation.Programmatic; import org.apache.isis.applib.annotation.Property; @@ -108,7 +109,7 @@ public abstract class AuditTrailEntry implements DomainChangeRecord, Comparable< setInteractionId(change.getInteractionId()); } - public String title() { + @ObjectSupport public String title() { val buf = new TitleBuffer(); buf.append(_Temporals.DEFAULT_LOCAL_DATETIME_FORMATTER .format(getTimestamp().toLocalDateTime())); diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/feature/api/ApplicationFeatureChoices.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/feature/api/ApplicationFeatureChoices.java index fae2fcb744..35f1e36a72 100644 --- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/feature/api/ApplicationFeatureChoices.java +++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/feature/api/ApplicationFeatureChoices.java @@ -34,6 +34,7 @@ import org.apache.isis.applib.ViewModel; import org.apache.isis.applib.annotation.DomainObject; import org.apache.isis.applib.annotation.MinLength; import org.apache.isis.applib.annotation.Nature; +import org.apache.isis.applib.annotation.ObjectSupport; import org.apache.isis.applib.annotation.Property; import org.apache.isis.applib.annotation.Title; import org.apache.isis.applib.services.appfeat.ApplicationFeatureId; @@ -129,8 +130,7 @@ public class ApplicationFeatureChoices { @Getter private ApplicationFeatureId featureId; - @Title - public String title() { + @ObjectSupport public String title() { return toString(); } diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/tenancy/menu/ApplicationTenancyMenu.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/tenancy/menu/ApplicationTenancyMenu.java index 8b2ac1bc81..4a9e898583 100644 --- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/tenancy/menu/ApplicationTenancyMenu.java +++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/tenancy/menu/ApplicationTenancyMenu.java @@ -61,8 +61,7 @@ public class ApplicationTenancyMenu { @Inject private FactoryService factory; - @ObjectSupport - public String iconName() { + @ObjectSupport public String iconName() { return "applicationTenancy"; } diff --git a/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/extensions/sessionlog/applib/dom/SessionLogEntry.java b/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/extensions/sessionlog/applib/dom/SessionLogEntry.java index 8491db4b08..86f059897e 100644 --- a/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/extensions/sessionlog/applib/dom/SessionLogEntry.java +++ b/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/extensions/sessionlog/applib/dom/SessionLogEntry.java @@ -37,6 +37,7 @@ import org.apache.isis.applib.annotation.DomainObject; import org.apache.isis.applib.annotation.DomainObjectLayout; import org.apache.isis.applib.annotation.Editing; import org.apache.isis.applib.annotation.MemberSupport; +import org.apache.isis.applib.annotation.ObjectSupport; import org.apache.isis.applib.annotation.Optionality; import org.apache.isis.applib.annotation.Parameter; import org.apache.isis.applib.annotation.ParameterLayout; @@ -114,8 +115,7 @@ public abstract class SessionLogEntry implements HasUsername, Comparable<Session setLoginTimestamp(loginTimestamp); } - public String title() { - + @ObjectSupport public String title() { return String.format("%s: %s logged %s %s", _Temporals.DEFAULT_LOCAL_DATETIME_FORMATTER .format(getLoginTimestamp().toLocalDateTime()), @@ -124,11 +124,11 @@ public abstract class SessionLogEntry implements HasUsername, Comparable<Session getCausedBy() == SessionSubscriber.CausedBy.SESSION_EXPIRATION ? "(session expired)" : ""); } - public String cssClass() { + @ObjectSupport public String cssClass() { return "sessionLogEntry-" + iconName(); } - public String iconName() { + @ObjectSupport public String iconName() { return getLogoutTimestamp() == null ? "login" :getCausedBy() != SessionSubscriber.CausedBy.SESSION_EXPIRATION diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProduct.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProduct.java index 14629ba117..22f0b908f4 100644 --- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProduct.java +++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProduct.java @@ -39,6 +39,7 @@ import org.apache.isis.applib.annotation.Collection; import org.apache.isis.applib.annotation.DomainObject; import org.apache.isis.applib.annotation.Editing; import org.apache.isis.applib.annotation.MemberSupport; +import org.apache.isis.applib.annotation.ObjectSupport; import org.apache.isis.applib.annotation.Property; import org.apache.isis.applib.annotation.Publishing; import org.apache.isis.commons.internal.base._Strings; @@ -63,7 +64,7 @@ import lombok.ToString; @ToString public class JpaProduct implements Comparable<JpaProduct> { - public String title() { + @ObjectSupport public String title() { return toString(); } diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberInheritanceAbstract.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberInheritanceAbstract.java index b59f77e88d..80f8b7bd2a 100644 --- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberInheritanceAbstract.java +++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberInheritanceAbstract.java @@ -33,23 +33,19 @@ import lombok.Setter; abstract class ProperMemberInheritanceAbstract { - @ObjectSupport - public String title() { + @ObjectSupport public String title() { return "inherited title"; } - @ObjectSupport - public String iconName() { + @ObjectSupport public String iconName() { return "inherited icon"; } - @ObjectSupport - public String cssClass(){ + @ObjectSupport public String cssClass(){ return "another-class"; } - @ObjectSupport - public String layout(){ + @ObjectSupport public String layout(){ return "layout"; }
