This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to tag saveit in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0105c96afb57e8363c3c3b26f170075db0a8c7f7 Author: Dan Haywood <d...@haywood-associates.co.uk> AuthorDate: Mon Aug 29 10:13:49 2022 +0100 ISIS-3188: adds missing @MemberSupport; formatting changes. --- .../mixins/metamodel/Object_logicalTypeName.java | 2 +- .../mixins/metamodel/Object_objectIdentifier.java | 2 +- .../services/bookmark/BookmarkHolder_lookup.java | 3 +- .../services/bookmark/BookmarkHolder_object.java | 3 +- .../commandlog/applib/app/CommandLogMenu.java | 2 +- .../dom/mixins/CommandLogEntry_childCommands.java | 3 +- .../mixins/CommandLogEntry_openResultObject.java | 3 +- .../mixins/CommandLogEntry_siblingCommands.java | 3 +- .../contributions/ExcelDemoToDoItem_export.java | 3 +- .../contributions/ExcelDemoToDoItem_export2.java | 3 +- .../ExecutionLogEntry_copyToOutbox.java | 3 +- .../ApplicationFeatureViewModel_permissions.java | 3 +- .../permission/dom/ApplicationPermission.java | 10 +++---- .../dom/mixins/ApplicationRole_addPermission.java | 2 +- .../secman/applib/user/dom/ApplicationUser.java | 32 +++++++++------------- .../user/dom/mixins/ApplicationUser_timeZone.java | 4 +-- .../mixins/ApplicationUser_updateAccountType.java | 2 +- .../mixins/Persistable_datanucleusVersionLong.java | 2 +- .../Persistable_datanucleusVersionTimestamp.java | 2 +- .../model/bad/AmbiguousMixinAnnotations.java | 6 ++-- .../commons/applib/mixins/Object_impersonate.java | 2 +- .../applib/mixins/Object_impersonateWithRoles.java | 2 +- 22 files changed, 44 insertions(+), 53 deletions(-) diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java index 980d9aea7f..a669d1115d 100644 --- a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java +++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java @@ -72,7 +72,7 @@ public class Object_logicalTypeName { @Action( domainEvent = ActionDomainEvent.class // this is a workaround to allow the mixin to be subscribed to (ISIS-2650) ) - public String prop() { + @MemberSupport public String prop() { val bookmark = bookmarkService.bookmarkForElseFail(this.holder); return bookmark.getLogicalTypeName(); } diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java index 2e3435404a..49c7a93970 100644 --- a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java +++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java @@ -72,7 +72,7 @@ public class Object_objectIdentifier { @Action( domainEvent = Object_objectIdentifier.ActionDomainEvent.class // this is a workaround to allow the mixin to be subscribed to (ISIS-2650) ) - public String prop() { + @MemberSupport public String prop() { val bookmark = bookmarkService.bookmarkForElseFail(this.holder); return bookmark.getIdentifier(); } diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java index be454b4d4f..261c55cd93 100644 --- a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java +++ b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_lookup.java @@ -23,6 +23,7 @@ import javax.inject.Inject; import org.apache.isis.applib.IsisModuleApplib; import org.apache.isis.applib.annotation.Action; import org.apache.isis.applib.annotation.ActionLayout; +import org.apache.isis.applib.annotation.MemberSupport; import org.apache.isis.applib.annotation.SemanticsOf; import lombok.RequiredArgsConstructor; @@ -44,7 +45,7 @@ public class BookmarkHolder_lookup { public static class ActionDomainEvent extends IsisModuleApplib.ActionDomainEvent<BookmarkHolder_lookup> {} - public Object act() { + @MemberSupport public Object act() { return bookmarkService.lookup(bookmarkHolder).orElse(null); } diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java index 901ee3f2ba..f901d6d121 100644 --- a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java +++ b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkHolder_object.java @@ -21,6 +21,7 @@ package org.apache.isis.applib.services.bookmark; import javax.inject.Inject; import org.apache.isis.applib.IsisModuleApplib; +import org.apache.isis.applib.annotation.MemberSupport; import org.apache.isis.applib.annotation.Property; import lombok.RequiredArgsConstructor; @@ -39,7 +40,7 @@ public class BookmarkHolder_object { public static class PropertyDomainEvent extends IsisModuleApplib.PropertyDomainEvent<BookmarkHolder_object, Object> { } - public Object prop() { + @MemberSupport public Object prop() { return bookmarkService.lookup(bookmarkHolder).orElse(null); } diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/app/CommandLogMenu.java b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/app/CommandLogMenu.java index 200f5d9c0d..eab63d1a53 100644 --- a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/app/CommandLogMenu.java +++ b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/app/CommandLogMenu.java @@ -136,7 +136,7 @@ public class CommandLogMenu { public class truncateLog { public class DomainEvent extends ActionDomainEvent { } - public void act() { + @MemberSupport public void act() { commandLogEntryRepository.truncateLog(); } } diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_childCommands.java b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_childCommands.java index 981001dff1..10e5d296f9 100644 --- a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_childCommands.java +++ b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_childCommands.java @@ -45,8 +45,7 @@ public class CommandLogEntry_childCommands { private final CommandLogEntry commandLogEntry; - @MemberSupport - public List<? extends CommandLogEntry> coll() { + @MemberSupport public List<? extends CommandLogEntry> coll() { return commandLogEntryRepository.findByParent(commandLogEntry); } diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_openResultObject.java b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_openResultObject.java index e438ef85a5..6aad15f8e7 100644 --- a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_openResultObject.java +++ b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_openResultObject.java @@ -45,8 +45,7 @@ public class CommandLogEntry_openResultObject { private final CommandLogEntry commandLogEntry; - @MemberSupport - public Object act() { + @MemberSupport public Object act() { val targetBookmark = bookmarkService.lookup(commandLogEntry.getResult()).orElse(null); if(targetBookmark == null) { messageService.warnUser("Object not found - has it since been deleted?"); diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_siblingCommands.java b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_siblingCommands.java index fe8371e6ab..66c0f93cf3 100644 --- a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_siblingCommands.java +++ b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_siblingCommands.java @@ -45,8 +45,7 @@ public class CommandLogEntry_siblingCommands { private final CommandLogEntry commandLogEntry; - @MemberSupport - public List<? extends CommandLogEntry> coll() { + @MemberSupport public List<? extends CommandLogEntry> coll() { final CommandLogEntry parentJdo = commandLogEntry.getParent(); if(parentJdo == null) { return Collections.emptyList(); diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java index 11d123882e..704d013201 100644 --- a/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java +++ b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java @@ -21,6 +21,7 @@ package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.contributio import javax.inject.Inject; import org.apache.isis.applib.annotation.Action; +import org.apache.isis.applib.annotation.MemberSupport; import org.apache.isis.applib.value.Blob; import org.apache.isis.extensions.excel.applib.ExcelService; import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem; @@ -36,7 +37,7 @@ public class ExcelDemoToDoItem_export { this.toDoItem = toDoItem; } - public Blob act() { + @MemberSupport public Blob act() { throw new UnsupportedOperationException(); // if(actionInvocationContext.isLast()) { // // ie current object only diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java index 4968c90672..2d0039dfd3 100644 --- a/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java +++ b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java @@ -21,6 +21,7 @@ package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.contributio import javax.inject.Inject; import org.apache.isis.applib.annotation.Action; +import org.apache.isis.applib.annotation.MemberSupport; import org.apache.isis.applib.value.Blob; import org.apache.isis.extensions.excel.applib.ExcelService; import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem; @@ -36,7 +37,7 @@ public class ExcelDemoToDoItem_export2 { this.toDoItem = toDoItem; } - public Blob act() { + @MemberSupport public Blob act() { throw new UnsupportedOperationException(); // if(actionInvocationContext.isLast()) { // // ie current object only diff --git a/extensions/core/executionrepublisher/applib/src/main/java/org/apache/isis/extensions/executionrepublisher/applib/contributions/ExecutionLogEntry_copyToOutbox.java b/extensions/core/executionrepublisher/applib/src/main/java/org/apache/isis/extensions/executionrepublisher/applib/contributions/ExecutionLogEntry_copyToOutbox.java index 8244666cbe..55cafafd37 100644 --- a/extensions/core/executionrepublisher/applib/src/main/java/org/apache/isis/extensions/executionrepublisher/applib/contributions/ExecutionLogEntry_copyToOutbox.java +++ b/extensions/core/executionrepublisher/applib/src/main/java/org/apache/isis/extensions/executionrepublisher/applib/contributions/ExecutionLogEntry_copyToOutbox.java @@ -25,6 +25,7 @@ import javax.inject.Inject; import org.apache.isis.applib.annotation.Action; import org.apache.isis.applib.annotation.ActionLayout; +import org.apache.isis.applib.annotation.MemberSupport; import org.apache.isis.applib.annotation.SemanticsOf; import org.apache.isis.extensions.executionlog.applib.dom.ExecutionLogEntry; import org.apache.isis.extensions.executionlog.applib.dom.ExecutionLogEntryType; @@ -52,7 +53,7 @@ public class ExecutionLogEntry_copyToOutbox { public static class ActionDomainEvent extends IsisModuleExtExecutionRepublisherApplib.ActionDomainEvent<ExecutionLogEntry_copyToOutbox> { } - public ExecutionLogEntry act() { + @MemberSupport public ExecutionLogEntry act() { outboxRepository.upsert( executionLogEntry.getInteractionId(), diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/feature/contributions/ApplicationFeatureViewModel_permissions.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/feature/contributions/ApplicationFeatureViewModel_permissions.java index 49b380c78f..69590b4013 100644 --- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/feature/contributions/ApplicationFeatureViewModel_permissions.java +++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/feature/contributions/ApplicationFeatureViewModel_permissions.java @@ -24,6 +24,7 @@ import org.apache.isis.applib.IsisModuleApplib; import org.apache.isis.applib.annotation.Action; import org.apache.isis.applib.annotation.Collection; import org.apache.isis.applib.annotation.CollectionLayout; +import org.apache.isis.applib.annotation.MemberSupport; import org.apache.isis.applib.services.appfeatui.ApplicationFeatureViewModel; import org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermission; import org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionRepository; @@ -47,7 +48,7 @@ public class ApplicationFeatureViewModel_permissions { @Action( domainEvent = ApplicationFeatureViewModel_permissions.ActionDomainEvent.class ) - public java.util.Collection<ApplicationPermission> coll() { + @MemberSupport public java.util.Collection<ApplicationPermission> coll() { return applicationPermissionRepository.findByFeatureCached(viewModel.getFeatureId()); } diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/dom/ApplicationPermission.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/dom/ApplicationPermission.java index d03e27e891..2176f09d47 100644 --- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/dom/ApplicationPermission.java +++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/dom/ApplicationPermission.java @@ -330,17 +330,16 @@ public abstract class ApplicationPermission implements Comparable<ApplicationPer // -- FIND FEATURE - @Programmatic - public ApplicationFeature findFeature(final ApplicationFeatureId featureId) { + @Programmatic public ApplicationFeature findFeature(final ApplicationFeatureId featureId) { return featureRepository.findFeature(featureId); } - private Optional<ApplicationMemberSort> getMemberSort() { + @Programmatic private Optional<ApplicationMemberSort> getMemberSort() { return getFeature() .flatMap(ApplicationFeature::getMemberSort); } - private Optional<ApplicationFeature> getFeature() { + @Programmatic private Optional<ApplicationFeature> getFeature() { return asFeatureId() .map(this::findFeature); } @@ -348,8 +347,7 @@ public abstract class ApplicationPermission implements Comparable<ApplicationPer // -- HELPER - @Programmatic - Optional<ApplicationFeatureId> asFeatureId() { + @Programmatic Optional<ApplicationFeatureId> asFeatureId() { return Optional.ofNullable(getFeatureSort()) .map(featureSort -> ApplicationFeatureId.newFeature(featureSort, getFeatureFqn())); } diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/dom/mixins/ApplicationRole_addPermission.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/dom/mixins/ApplicationRole_addPermission.java index 477819cc08..26b467acd3 100644 --- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/dom/mixins/ApplicationRole_addPermission.java +++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/dom/mixins/ApplicationRole_addPermission.java @@ -73,7 +73,7 @@ public class ApplicationRole_addPermission { * Adds a {@link ApplicationPermission permission} for this role to a * {@link ApplicationFeature feature}. */ - public ApplicationRole act( + @MemberSupport public ApplicationRole act( final ApplicationPermissionRule rule, final ApplicationPermissionMode mode, @ParameterLayout( diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/ApplicationUser.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/ApplicationUser.java index 9bf9ef6081..ebd6c47f0d 100644 --- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/ApplicationUser.java +++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/ApplicationUser.java @@ -31,6 +31,7 @@ import javax.inject.Named; import org.apache.isis.applib.annotation.Collection; import org.apache.isis.applib.annotation.CollectionLayout; +import org.apache.isis.applib.annotation.Domain; import org.apache.isis.applib.annotation.DomainObject; import org.apache.isis.applib.annotation.DomainObjectLayout; import org.apache.isis.applib.annotation.Editing; @@ -111,15 +112,15 @@ public abstract class ApplicationUser @Inject private transient PermissionsEvaluationService permissionsEvaluationService; @Inject private transient IsisConfiguration config; - protected ApplicationUserRepository getApplicationUserRepository() { + @Programmatic protected ApplicationUserRepository getApplicationUserRepository() { return applicationUserRepository; } - protected ApplicationPermissionRepository getApplicationPermissionRepository() { + @Programmatic protected ApplicationPermissionRepository getApplicationPermissionRepository() { return applicationPermissionRepository; } - protected UserService getUserService() { + @Programmatic protected UserService getUserService() { return userService; } @@ -128,11 +129,11 @@ public abstract class ApplicationUser * {@link ApplicationPermissionValueSet#evaluate(ApplicationFeatureId, ApplicationPermissionMode)} * else will fallback to a default implementation. */ - protected PermissionsEvaluationService getPermissionsEvaluationService() { + @Programmatic protected PermissionsEvaluationService getPermissionsEvaluationService() { return permissionsEvaluationService; } - protected Secman getSecmanConfig() { + @Programmatic protected Secman getSecmanConfig() { return config.getExtensions().getSecman(); } @@ -627,8 +628,7 @@ public abstract class ApplicationUser // short-term caching private transient ApplicationPermissionValueSet cachedPermissionSet; - @Programmatic - public ApplicationPermissionValueSet getPermissionSet() { + @Programmatic public ApplicationPermissionValueSet getPermissionSet() { if(cachedPermissionSet != null) { return cachedPermissionSet; } @@ -648,16 +648,14 @@ public abstract class ApplicationUser // -- IS FOR SELF OR RUN AS ADMINISTRATOR - @Programmatic - public boolean isForSelf() { + @Programmatic public boolean isForSelf() { val currentUser = currentUser(); val currentUserName = currentUser.getName(); val forSelf = Objects.equals(getUsername(), currentUserName); return forSelf; } - @Programmatic - public boolean isRunAsAdministrator() { + @Programmatic public boolean isRunAsAdministrator() { val currentUser = currentUser(); val adminRoleSuffix = ":" + getAdminRoleName(); for (final RoleMemento role : currentUser.getRoles()) { @@ -672,26 +670,22 @@ public abstract class ApplicationUser return false; } - @Programmatic - public boolean isForSelfOrRunAsAdministrator() { + @Programmatic public boolean isForSelfOrRunAsAdministrator() { return isForSelf() || isRunAsAdministrator(); } // -- HELPERS - @Programmatic - public boolean isLocalAccount() { + @Programmatic public boolean isLocalAccount() { return getAccountType() == org.apache.isis.extensions.secman.applib.user.dom.AccountType.LOCAL; } - @Programmatic - private String getAdminRoleName() { + @Programmatic private String getAdminRoleName() { return getSecmanConfig().getSeed().getAdmin().getRoleName(); } - @Programmatic - private UserMemento currentUser() { + @Programmatic private UserMemento currentUser() { return getUserService().currentUserElseFail(); } diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_timeZone.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_timeZone.java index 6048d2826b..01832b89ec 100644 --- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_timeZone.java +++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_timeZone.java @@ -48,9 +48,7 @@ public class ApplicationUser_timeZone { @Inject private UserCurrentSessionTimeZoneHolder userCurrentSessionTimeZoneHolder; - @MemberSupport - @Nullable - public String prop() { + @MemberSupport @Nullable public String prop() { return userCurrentSessionTimeZoneHolder.getUserTimeZone() .map(_Temporals::formatZoneId) .orElse(null); diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_updateAccountType.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_updateAccountType.java index 32db57769a..0170a15a37 100644 --- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_updateAccountType.java +++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_updateAccountType.java @@ -52,7 +52,7 @@ public class ApplicationUser_updateAccountType { private final ApplicationUser target; - public ApplicationUser act(final AccountType accountType) { + @MemberSupport public ApplicationUser act(final AccountType accountType) { target.setAccountType(accountType); return target; } diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.java index bf457af41f..d2150f6187 100644 --- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.java +++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.java @@ -60,7 +60,7 @@ public class Persistable_datanucleusVersionLong { extends org.apache.isis.applib.IsisModuleApplib.PropertyDomainEvent <Persistable_datanucleusVersionLong, Long> {} - public Long prop() { + @MemberSupport public Long prop() { final Object version = JDOHelper.getVersion(persistable); return version instanceof Long ? (Long) version : null; } diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.java index 6a532b9f8f..864c91d0b2 100644 --- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.java +++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.java @@ -60,7 +60,7 @@ public class Persistable_datanucleusVersionTimestamp { extends org.apache.isis.applib.IsisModuleApplib.PropertyDomainEvent <Persistable_datanucleusVersionTimestamp, java.sql.Timestamp> {} - public java.sql.Timestamp prop() { + @MemberSupport public java.sql.Timestamp prop() { final Object version = JDOHelper.getVersion(persistable); return version instanceof java.sql.Timestamp ? (java.sql.Timestamp) version : null; } diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/bad/AmbiguousMixinAnnotations.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/bad/AmbiguousMixinAnnotations.java index 4c712d555d..193855c735 100644 --- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/bad/AmbiguousMixinAnnotations.java +++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/bad/AmbiguousMixinAnnotations.java @@ -44,8 +44,7 @@ public class AmbiguousMixinAnnotations { public static class InvalidMixinP { private final Mixee mixee; - @Property - public String prop() { + @Property public String prop() { return null; } } @@ -55,8 +54,7 @@ public class AmbiguousMixinAnnotations { public static class InvalidMixinPL { private final Mixee mixee; - @PropertyLayout - public String prop() { + @PropertyLayout public String prop() { return null; } } diff --git a/viewers/commons/applib/src/main/java/org/apache/isis/viewer/commons/applib/mixins/Object_impersonate.java b/viewers/commons/applib/src/main/java/org/apache/isis/viewer/commons/applib/mixins/Object_impersonate.java index bed5ed6b12..d548de9907 100644 --- a/viewers/commons/applib/src/main/java/org/apache/isis/viewer/commons/applib/mixins/Object_impersonate.java +++ b/viewers/commons/applib/src/main/java/org/apache/isis/viewer/commons/applib/mixins/Object_impersonate.java @@ -63,7 +63,7 @@ public class Object_impersonate { private final Object holder; - public Object act(final String userName) { + @MemberSupport public Object act(final String userName) { impersonate().act(userName); return holder; } diff --git a/viewers/commons/applib/src/main/java/org/apache/isis/viewer/commons/applib/mixins/Object_impersonateWithRoles.java b/viewers/commons/applib/src/main/java/org/apache/isis/viewer/commons/applib/mixins/Object_impersonateWithRoles.java index b988a568bb..ce75309f02 100644 --- a/viewers/commons/applib/src/main/java/org/apache/isis/viewer/commons/applib/mixins/Object_impersonateWithRoles.java +++ b/viewers/commons/applib/src/main/java/org/apache/isis/viewer/commons/applib/mixins/Object_impersonateWithRoles.java @@ -67,7 +67,7 @@ public class Object_impersonateWithRoles { private final Object holder; - public Object act( + @MemberSupport public Object act( final String userName, final List<String> roleNames, final String multiTenancyToken) {