This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 6a5a2d4dff ISIS-3002: post merge provisioning fix for command replay
(Demo)
6a5a2d4dff is described below
commit 6a5a2d4dff12d0eba78f37f76cc550372e7bcb60
Author: andi-huber <[email protected]>
AuthorDate: Fri Jul 22 07:39:22 2022 +0200
ISIS-3002: post merge provisioning fix for command replay (Demo)
- also cleaning up some java lang deprecations
---
.../java/org/apache/isis/applib/mixins/security/HasUsername.java | 4 +---
.../org/apache/isis/applib/mixins/system/HasInteractionId.java | 4 ----
.../org/apache/isis/applib/services/bookmark/BookmarkService.java | 6 ------
.../java/org/apache/isis/applib/services/bookmark/HasTarget.java | 2 --
.../isis/applib/services/publishing/log/EntityChangesLogger.java | 3 ---
.../services/publishing/log/EntityPropertyChangeLogger.java | 2 --
.../isis/applib/services/publishing/log/ExecutionLogger.java | 2 --
.../members/publish/command/CommandPublishingFacetAbstract.java | 7 +++++--
.../object/domainobject/DomainObjectAnnotationFacetFactory.java | 1 +
...sFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java | 8 ++++++--
.../IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java | 8 ++++++--
...outFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java | 8 ++++++--
...itleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java | 8 ++++++--
.../classname/LogicalTypeFacetFromClassNameFactory.java | 2 --
.../src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java | 6 ------
.../src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java | 8 --------
.../src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java | 8 --------
.../commandlog/applib/contributions/Object_recentCommands.java | 6 +++---
18 files changed, 34 insertions(+), 59 deletions(-)
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/mixins/security/HasUsername.java
b/api/applib/src/main/java/org/apache/isis/applib/mixins/security/HasUsername.java
index 01a39a96e5..6c73c59850 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/mixins/security/HasUsername.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/mixins/security/HasUsername.java
@@ -26,14 +26,12 @@ import java.lang.annotation.Target;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.mixins.updates.OnUpdatedBy;
/**
* Allows domain objects that were created, updated or are otherwise associated
* with a named user to act as a mixee in order that other modules may
- * contribute behaviour.
+ * contribute behavior.
*
* <p>
* The {@link OnUpdatedBy}
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/mixins/system/HasInteractionId.java
b/api/applib/src/main/java/org/apache/isis/applib/mixins/system/HasInteractionId.java
index 681b9559e2..cfd354e4fd 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/mixins/system/HasInteractionId.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/mixins/system/HasInteractionId.java
@@ -21,16 +21,13 @@ package org.apache.isis.applib.mixins.system;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
import java.util.UUID;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.iactn.Interaction;
-
/**
* Allows domain objects that represent or are associated with a system
* {@link Interaction} to act as a mixee in order that other modules can
@@ -62,5 +59,4 @@ public interface HasInteractionId {
@InteractionId
UUID getInteractionId();
-
}
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
index f6da13848b..4e7c016f59 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
@@ -18,17 +18,11 @@
*/
package org.apache.isis.applib.services.bookmark;
-import java.io.Serializable;
import java.util.Optional;
import org.springframework.lang.Nullable;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-import lombok.AccessLevel;
-import lombok.Getter;
import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
/**
* This service provides a serializable 'bookmark' for any entity, and
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/HasTarget.java
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/HasTarget.java
index eb27c6d4aa..d647a9cd38 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/HasTarget.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/HasTarget.java
@@ -21,13 +21,11 @@ package org.apache.isis.applib.services.bookmark;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import java.util.UUID;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.Property;
-
/**
* @since 2.0 {@index}
*/
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/EntityChangesLogger.java
b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/EntityChangesLogger.java
index b28e77ba6d..e8e12cc404 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/EntityChangesLogger.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/EntityChangesLogger.java
@@ -26,8 +26,6 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.PriorityPrecedence;
-import org.apache.isis.applib.services.command.Command;
-import org.apache.isis.applib.services.publishing.spi.CommandSubscriber;
import org.apache.isis.applib.services.publishing.spi.EntityChanges;
import org.apache.isis.applib.services.publishing.spi.EntityChangesSubscriber;
import org.apache.isis.applib.util.schema.ChangesDtoUtils;
@@ -63,6 +61,5 @@ public class EntityChangesLogger implements
EntityChangesSubscriber {
log.debug(ChangesDtoUtils.toXml(changesDto));
}
-
}
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/EntityPropertyChangeLogger.java
b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/EntityPropertyChangeLogger.java
index 26c466889b..b94f69d46f 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/EntityPropertyChangeLogger.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/EntityPropertyChangeLogger.java
@@ -26,8 +26,6 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.PriorityPrecedence;
-import org.apache.isis.applib.services.publishing.spi.EntityChanges;
-import org.apache.isis.applib.services.publishing.spi.EntityChangesSubscriber;
import org.apache.isis.applib.services.publishing.spi.EntityPropertyChange;
import
org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscriber;
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/ExecutionLogger.java
b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/ExecutionLogger.java
index bf47c42828..4a5ce782c0 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/ExecutionLogger.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/log/ExecutionLogger.java
@@ -27,8 +27,6 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.iactn.Execution;
-import org.apache.isis.applib.services.publishing.spi.EntityPropertyChange;
-import
org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscriber;
import org.apache.isis.applib.services.publishing.spi.ExecutionSubscriber;
import org.apache.isis.applib.util.schema.InteractionDtoUtils;
import org.apache.isis.schema.ixn.v2.InteractionDto;
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetAbstract.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetAbstract.java
index 16aa9ad38f..736e5f6bc4 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetAbstract.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetAbstract.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.members.publish.command;
+import java.lang.reflect.InvocationTargetException;
import java.util.function.BiConsumer;
import
org.apache.isis.applib.services.commanddto.processor.CommandDtoProcessor;
@@ -73,8 +74,10 @@ implements CommandPublishingFacet {
return null;
}
try {
- return (CommandDtoProcessor) cls.newInstance();
- } catch (final InstantiationException | IllegalAccessException e) {
+ return (CommandDtoProcessor) cls.getConstructor().newInstance();
+ } catch (final InstantiationException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException
+ | NoSuchMethodException | SecurityException e) {
return null;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index d3cca69c49..47eefe9b48 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -127,6 +127,7 @@ implements
* (eg. ValueTypeRegistry, configuration, ...)
* TODO instead properly validate by implementing a validator that looks
into the facets that are created
*/
+ @SuppressWarnings("removal")
private void validateConflictingTypeSemantics(
final Optional<DomainObject> domainObjectIfAny,
final ProcessObjectTypeContext processClassContext) {
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
index 7aba4ff890..343a90cea0 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetViaDomainObjectLayoutAnnotationUsingCssClassUiEvent.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
+import java.lang.reflect.InvocationTargetException;
import java.util.Optional;
import java.util.function.BiConsumer;
@@ -105,10 +106,13 @@ extends CssClassFacetAbstract {
private CssClassUiEvent<Object> newCssClassUiEventForPojo(final Object
domainObject) {
try {
- final CssClassUiEvent<Object> cssClassUiEvent =
_Casts.uncheckedCast(cssClassUiEventClass.newInstance());
+ final CssClassUiEvent<Object> cssClassUiEvent =
_Casts.uncheckedCast(
+ cssClassUiEventClass.getConstructor().newInstance());
cssClassUiEvent.initSource(domainObject);
return cssClassUiEvent;
- } catch (InstantiationException | IllegalAccessException ex) {
+ } catch (InstantiationException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException
+ | NoSuchMethodException | SecurityException ex) {
throw new UnrecoverableException(ex);
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
index b3c1cfcbb9..345eb073cf 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/IconFacetViaDomainObjectLayoutAnnotationUsingIconUiEvent.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
+import java.lang.reflect.InvocationTargetException;
import java.util.Optional;
import java.util.function.BiConsumer;
@@ -103,10 +104,13 @@ extends IconFacetAbstract {
private IconUiEvent<Object> newIconUiEventForPojo(final Object
domainObject) {
try {
- final IconUiEvent<Object> iconUiEvent =
_Casts.uncheckedCast(iconUiEventClass.newInstance());
+ final IconUiEvent<Object> iconUiEvent = _Casts.uncheckedCast(
+ iconUiEventClass.getConstructor().newInstance());
iconUiEvent.initSource(domainObject);
return iconUiEvent;
- } catch (InstantiationException | IllegalAccessException ex) {
+ } catch (InstantiationException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException
+ | NoSuchMethodException | SecurityException ex) {
throw new UnrecoverableException(ex);
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
index 601f37c112..09f07152ed 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
+import java.lang.reflect.InvocationTargetException;
import java.util.Optional;
import java.util.function.BiConsumer;
@@ -105,10 +106,13 @@ implements LayoutFacet {
private LayoutUiEvent<Object> newLayoutUiEvent(final Object domainObject) {
try {
final LayoutUiEvent<Object> layoutUiEvent =
- _Casts.uncheckedCast(layoutUiEventClass.newInstance());
+ _Casts.uncheckedCast(
+ layoutUiEventClass.getConstructor().newInstance());
layoutUiEvent.initSource(domainObject);
return layoutUiEvent;
- } catch (InstantiationException | IllegalAccessException ex) {
+ } catch (InstantiationException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException
+ | NoSuchMethodException | SecurityException ex) {
throw new UnrecoverableException(ex);
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
index a29fcc7a22..1021b11d26 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
+import java.lang.reflect.InvocationTargetException;
import java.util.Optional;
import java.util.function.BiConsumer;
@@ -145,10 +146,13 @@ extends TitleFacetAbstract {
private TitleUiEvent<Object> newTitleUiEvent(final Object domainObject) {
try {
- final TitleUiEvent<Object> titleUiEvent =
_Casts.uncheckedCast(titleUiEventClass.newInstance());
+ final TitleUiEvent<Object> titleUiEvent = _Casts.uncheckedCast(
+ titleUiEventClass.getConstructor().newInstance());
titleUiEvent.initSource(domainObject);
return titleUiEvent;
- } catch (InstantiationException | IllegalAccessException ex) {
+ } catch (InstantiationException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException
+ | NoSuchMethodException | SecurityException ex) {
throw new UnrecoverableException(ex);
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java
index cda553e2af..4cc5aff593 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java
@@ -144,6 +144,4 @@ implements
return false; //skip validation
}
-
-
}
diff --git
a/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
b/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
index 210dad2544..d91c1e190c 100644
---
a/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
+++
b/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
@@ -18,7 +18,6 @@
*/
package demoapp.webapp.wicket.jdo;
-import lombok.val;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import
org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -95,9 +94,4 @@ public class DemoAppWicketJdo extends
SpringBootServletInitializer {
}
- private static String preservingAnyExisting(String profile) {
- val existingProfiles = System.getProperty("spring.profiles.active");
- return existingProfiles == null ? profile : existingProfiles + "," +
profile;
- }
-
}
diff --git
a/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
b/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
index 1ecc77d9a6..e159cd2724 100644
---
a/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
+++
b/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
@@ -38,8 +38,6 @@ import
org.apache.isis.valuetypes.sse.ui.wkt.IsisModuleValSseUiWkt;
import org.apache.isis.viewer.graphql.viewer.IsisModuleIncViewerGraphqlViewer;
import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
-import lombok.val;
-
import demoapp.web.DemoAppManifestJpa;
import demoapp.webapp.wicket.common.ui.DemoAppWicketCommon;
@@ -104,10 +102,4 @@ public class DemoAppWicketJpa extends
SpringBootServletInitializer {
}
- private static String preservingAnyExisting(final String profile) {
- val existingProfiles = System.getProperty("spring.profiles.active");
- return existingProfiles == null ? profile : existingProfiles + "," +
profile;
- }
-
-
}
diff --git
a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
index 0dbb621f28..fc83b7eec3 100644
---
a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
+++
b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
@@ -37,8 +37,6 @@ import
org.apache.isis.valuetypes.markdown.ui.wkt.IsisModuleValMarkdownUiWkt;
import org.apache.isis.valuetypes.sse.ui.wkt.IsisModuleValSseUiWkt;
import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
-import lombok.val;
-
import demoapp.web.DemoAppManifestJpa;
import demoapp.webapp.wicket.common.ui.DemoAppWicketCommon;
@@ -100,10 +98,4 @@ public class DemoAppWicketJpa extends
SpringBootServletInitializer {
}
- private static String preservingAnyExisting(final String profile) {
- val existingProfiles = System.getProperty("spring.profiles.active");
- return existingProfiles == null ? profile : existingProfiles + "," +
profile;
- }
-
-
}
diff --git
a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/Object_recentCommands.java
b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/Object_recentCommands.java
index d2b599b344..8c036c8208 100644
---
a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/Object_recentCommands.java
+++
b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/Object_recentCommands.java
@@ -65,21 +65,21 @@ public class Object_recentCommands {
private final Object domainObject;
- @MemberSupport public List<CommandLogEntry> act() {
+ @MemberSupport public List<? extends CommandLogEntry> act() {
return bookmarkService.bookmarkFor(domainObject)
.map(commandLogEntryRepository::findRecentByTarget)
.orElse(Collections.emptyList());
}
/**
- * Hide if the mixee is itself {@link HasInteractionId}
+ * Hide if the mixee itself implements {@link HasInteractionId}.
* (commands don't have commands).
*/
@MemberSupport public boolean hideAct() {
return (domainObject instanceof HasInteractionId);
}
- @Inject CommandLogEntryRepository<CommandLogEntry>
commandLogEntryRepository;
+ @Inject CommandLogEntryRepository<? extends CommandLogEntry>
commandLogEntryRepository;
@Inject BookmarkService bookmarkService;
}
