You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/06/10 04:56:18 UTC
[isis] branch master updated: ISIS-2727: minor: housekeeping
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 39d48d4 ISIS-2727: minor: housekeeping
39d48d4 is described below
commit 39d48d4ca944fb1ec39b2a8be010d39dc134f462
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jun 10 06:56:04 2021 +0200
ISIS-2727: minor: housekeeping
---
.../org/apache/isis/applib/mixins/dto/Dto_downloadXml.java | 7 +++----
.../isis/applib/mixins/layout/Object_downloadLayoutXml.java | 7 ++++---
.../apache/isis/applib/services/grid/GridSystemService.java | 3 ---
.../isis/applib/services/i18n/TranslationsResolver.java | 1 -
.../org/apache/isis/applib/services/iactn/Interaction.java | 7 ++-----
.../isis/applib/services/iactnlayer/InteractionLayer.java | 1 -
.../org/apache/isis/applib/services/jaxb/JaxbService.java | 3 ---
.../org/apache/isis/applib/services/menu/MenuBarsService.java | 1 -
.../isis/applib/services/publishing/spi/EntityChanges.java | 11 +----------
.../applib/services/queryresultscache/QueryResultsCache.java | 1 -
.../services/queryresultscache/QueryResultsCacheControl.java | 2 --
.../apache/isis/applib/services/registry/ServiceRegistry.java | 1 -
.../apache/isis/applib/services/routing/RoutingService.java | 2 --
.../apache/isis/applib/services/swagger/SwaggerService.java | 1 -
.../tablecol/TableColumnOrderForCollectionTypeAbstract.java | 3 +--
.../isis/applib/services/user/ImpersonateMenuAdvisor.java | 6 ------
.../applib/services/userreg/EmailNotificationService.java | 2 --
.../isis/applib/services/userreg/UserRegistrationService.java | 3 ---
.../isis/applib/services/wrapper/control/AsyncControl.java | 5 +----
.../isis/core/security/authentication/Authentication.java | 3 +--
.../security/authorization/manager/AuthorizorChooser.java | 3 ---
.../fixtures/applib/fixturescripts/FixtureScripts.java | 9 ++-------
.../fixtures/applib/personas/BuilderScriptWithResult.java | 1 -
.../testing/fixtures/applib/personas/PersonaWithFinder.java | 1 -
24 files changed, 15 insertions(+), 69 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java
index 935290f..c0be6be 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXml.java
@@ -22,6 +22,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.ParameterLayout;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
@@ -62,6 +63,7 @@ public class Dto_downloadXml {
public static class ActionDomainEvent
extends org.apache.isis.applib.IsisModuleApplib.ActionDomainEvent<Dto_downloadXml> {}
+ @MemberSupport
public Object act(
// PARAM 0
@@ -74,10 +76,7 @@ public class Dto_downloadXml {
return Clob.of(fileName, CommonMimeType.XML, xmlString);
}
- /**
- *
- * @return
- */
+ @MemberSupport
public String default0Act() {
return holder.getClass().getName();
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java
index 0d6bb3e..2cc76a3 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java
@@ -80,15 +80,16 @@ public class Object_downloadLayoutXml {
/**
* Defaults to the (simple) name of the domain object's class, with a <code>.layout</code> suffix
*/
- @MemberSupport public String default0Act() {
+ @MemberSupport
+ public String default0Act() {
return holder.getClass().getSimpleName() + ".layout";
}
/**
* Default style is {@link Style#NORMALIZED}.
- * @return
*/
- @MemberSupport public Style default1Act() {
+ @MemberSupport
+ public Style default1Act() {
return Style.NORMALIZED;
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/grid/GridSystemService.java b/api/applib/src/main/java/org/apache/isis/applib/services/grid/GridSystemService.java
index 613e22c..ecba5e6 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/grid/GridSystemService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/grid/GridSystemService.java
@@ -69,8 +69,6 @@ public interface GridSystemService<G extends Grid> {
* provided by the framework returns the value
* `http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd`.
* </p>
- *
- * @return
*/
String schemaLocation();
@@ -83,7 +81,6 @@ public interface GridSystemService<G extends Grid> {
* </p>
*
* @param domainClass
- * @return
*/
G defaultGrid(Class<?> domainClass);
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslationsResolver.java b/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslationsResolver.java
index 06f4d7c..7b82f18 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslationsResolver.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslationsResolver.java
@@ -43,7 +43,6 @@ public interface TranslationsResolver {
* </p>
*
* @param file
- * @return
*/
List<String> readLines(final String file);
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
index 72bda27..fb2d922 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
@@ -53,8 +53,8 @@ import org.apache.isis.commons.having.HasTypeSpecificAttributes;
*
* @since 1.x revised for 2.0 {@index}
*/
-public interface Interaction
-extends
+public interface Interaction
+extends
HasInteractionId,
HasTypeSpecificAttributes {
@@ -66,15 +66,12 @@ extends
* This can be used to correlate audit records and transactions
* happening as a consequence or within the interaction.
* </p>
- *
- * @return
*/
@Override
UUID getInteractionId();
/**
* Represents the <i>intention</i> to perform this interaction.
- * @return
*/
Command getCommand();
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/iactnlayer/InteractionLayer.java b/api/applib/src/main/java/org/apache/isis/applib/services/iactnlayer/InteractionLayer.java
index e9d7344..b0cb579 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/iactnlayer/InteractionLayer.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/iactnlayer/InteractionLayer.java
@@ -21,7 +21,6 @@ package org.apache.isis.applib.services.iactnlayer;
import org.apache.isis.applib.services.iactn.Interaction;
import lombok.Getter;
-import lombok.NonNull;
import lombok.RequiredArgsConstructor;
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
index 5658e83..4d61aab 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
@@ -55,7 +55,6 @@ public interface JaxbService {
*
* @param jaxbContext - configured for the expected target class
* @param xml
- * @return
*/
default Object fromXml(
JAXBContext jaxbContext,
@@ -70,7 +69,6 @@ public interface JaxbService {
* @param jaxbContext - configured for the expected target class
* @param xml
* @param unmarshallerProperties
- * @return
*/
Object fromXml(
JAXBContext jaxbContext,
@@ -124,7 +122,6 @@ public interface JaxbService {
*
* @param domainObject
* @param isisSchemas
- * @return
*/
Map<String, String> toXsd(
Object domainObject,
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/menu/MenuBarsService.java b/api/applib/src/main/java/org/apache/isis/applib/services/menu/MenuBarsService.java
index 5e9a03c..73ff504 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/menu/MenuBarsService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/menu/MenuBarsService.java
@@ -64,7 +64,6 @@ public interface MenuBarsService {
* Returns the menu bars with the requested {@link Type}.
*
* @param type - as requested
- * @return
*/
MenuBars menuBars(final Type type);
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/spi/EntityChanges.java b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/spi/EntityChanges.java
index e695e18..1c9e8f1 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/publishing/spi/EntityChanges.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/publishing/spi/EntityChanges.java
@@ -21,8 +21,8 @@ package org.apache.isis.applib.services.publishing.spi;
import java.sql.Timestamp;
import java.util.UUID;
-import org.apache.isis.applib.mixins.system.HasInteractionId;
import org.apache.isis.applib.mixins.security.HasUsername;
+import org.apache.isis.applib.mixins.system.HasInteractionId;
import org.apache.isis.applib.mixins.system.HasTransactionId;
import org.apache.isis.schema.chg.v2.ChangesDto;
@@ -62,44 +62,37 @@ public interface EntityChanges
/**
* Inherited from {@link HasUsername}, is the user that initiated the
* transaction causing these objects to change.
- * @return
*/
@Override
String getUsername();
/**
* Time that the interaction execution completed
- * @return
*/
Timestamp getCompletedAt();
/**
* Number of domain objects loaded in this interaction
- * @return
*/
int getNumberLoaded();
/**
* Number of domain objects created in this interaction
- * @return
*/
int getNumberCreated();
/**
* Number of domain objects updated in this interaction
- * @return
*/
int getNumberUpdated();
/**
* Number of domain objects deleted in this interaction
- * @return
*/
int getNumberDeleted();
/**
* Number of domain objects properties that were changed in this interaction
- * @return
*/
int getNumberPropertiesModified();
@@ -110,8 +103,6 @@ public interface EntityChanges
* This can be converted into a serializable XML representation using the
* {@link org.apache.isis.applib.util.schema.ChangesDtoUtils} utility class.
* </p>
- *
- * @return
*/
ChangesDto getDto();
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java b/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
index a29248e..a09f053 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
@@ -51,7 +51,6 @@ public interface QueryResultsCache extends DisposableBean {
* @param methodName
* @param keys
* @param <T>
- * @return
*/
<T> T execute(
Callable<T> callable,
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheControl.java b/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheControl.java
index e5a1b20..e9cca33 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheControl.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheControl.java
@@ -34,8 +34,6 @@ public interface QueryResultsCacheControl {
/**
* Whether the {@link QueryResultsCache} should be disabled, in other
* words to stop using any cached results.
- *
- * @return
*/
boolean isIgnoreCache();
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java b/api/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
index 3bd342e..0b0022c 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
@@ -148,7 +148,6 @@ public interface ServiceRegistry {
*
* @param serviceClass
* @param <T>
- * @return
*/
default <T> T lookupServiceElseFail(final Class<T> serviceClass) {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingService.java b/api/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingService.java
index 6316ee7..e2a8dc3 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingService.java
@@ -70,7 +70,6 @@ public interface RoutingService {
* </p>
*
* @param original
- * @return
*/
boolean canRoute(Object original);
@@ -79,7 +78,6 @@ public interface RoutingService {
* object, some other object, or (indeed) `null`.
*
* @param original
- * @return
*/
Object route(Object original);
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerService.java b/api/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerService.java
index 7de6ab6..29bf6f4 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerService.java
@@ -39,7 +39,6 @@ public interface SwaggerService {
*
* @param visibility
* @param format
- * @return
*/
String generateSwaggerSpec(
final Visibility visibility,
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderForCollectionTypeAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderForCollectionTypeAbstract.java
index e5d8804..7b3a6f8 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderForCollectionTypeAbstract.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/tablecol/TableColumnOrderForCollectionTypeAbstract.java
@@ -20,8 +20,6 @@ package org.apache.isis.applib.services.tablecol;
import java.util.List;
-import org.apache.isis.applib.annotation.Programmatic;
-
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -79,6 +77,7 @@ public abstract class TableColumnOrderForCollectionTypeAbstract<T>
*
* @see #orderStandalone(List)
*/
+ @Override
public final List<String> orderStandalone(
final Class<?> collectionType,
final List<String> propertyIds) {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/user/ImpersonateMenuAdvisor.java b/api/applib/src/main/java/org/apache/isis/applib/services/user/ImpersonateMenuAdvisor.java
index 023435f..d669419 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/user/ImpersonateMenuAdvisor.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/user/ImpersonateMenuAdvisor.java
@@ -24,8 +24,6 @@ public interface ImpersonateMenuAdvisor {
* (drop-down) for the username (string) argument of
* {@link ImpersonateMenu#impersonateWithRoles(String, List)}.
* </p>
- *
- * @return
*/
List<String> allUserNames();
@@ -37,8 +35,6 @@ public interface ImpersonateMenuAdvisor {
* (drop-down) for the rolenames (list) argument of
* {@link ImpersonateMenu#impersonateWithRoles(String, List)}.
* </p>
- *
- * @return
*/
List<String> allRoleNames();
@@ -50,8 +46,6 @@ public interface ImpersonateMenuAdvisor {
* for the rolenames (list) argument of
* {@link ImpersonateMenu#impersonateWithRoles(String, List)}.
* </p>
- *
- * @return
*/
List<String> roleNamesFor(final String username);
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/userreg/EmailNotificationService.java b/api/applib/src/main/java/org/apache/isis/applib/services/userreg/EmailNotificationService.java
index 2197919..703cde8 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/userreg/EmailNotificationService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/userreg/EmailNotificationService.java
@@ -39,7 +39,6 @@ public interface EmailNotificationService
* Sends an email to verify an email address as part of the initial user registration
*
* @param ev
- * @return
*/
boolean send(EmailRegistrationEvent ev);
@@ -47,7 +46,6 @@ public interface EmailNotificationService
* Sends an email to reset a password for an already-registered user
*
* @param ev
- * @return
*/
boolean send(PasswordResetEvent ev);
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/userreg/UserRegistrationService.java b/api/applib/src/main/java/org/apache/isis/applib/services/userreg/UserRegistrationService.java
index a4e8ae5..a2af7c5 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/userreg/UserRegistrationService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/userreg/UserRegistrationService.java
@@ -31,7 +31,6 @@ public interface UserRegistrationService {
* Checks if there is already a user with the specified username
*
* @param username
- * @return
*/
boolean usernameExists(String username);
@@ -39,7 +38,6 @@ public interface UserRegistrationService {
* Checks if there is already a user with the specified email address.
*
* @param emailAddress
- * @return
*/
boolean emailExists(String emailAddress);
@@ -60,7 +58,6 @@ public interface UserRegistrationService {
*
* @param emailAddress
* @param password
- * @return
*/
boolean updatePasswordByEmail(String emailAddress, String password);
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/control/AsyncControl.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/control/AsyncControl.java
index 643de25..badfd21 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/control/AsyncControl.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/control/AsyncControl.java
@@ -29,7 +29,6 @@ import org.apache.isis.applib.services.user.UserMemento;
import lombok.Getter;
import lombok.NonNull;
-import lombok.Setter;
import lombok.extern.log4j.Log4j2;
/**
@@ -68,7 +67,6 @@ public class AsyncControl<R> extends ControlAbstract<AsyncControl<R>> {
*
* @param cls
* @param <X>
- * @return
*/
public static <X> AsyncControl<X> returning(final Class<X> cls) {
return new AsyncControl<X>(cls);
@@ -123,7 +121,6 @@ public class AsyncControl<R> extends ControlAbstract<AsyncControl<R>> {
*
*
* @param executorService
- * @return
*/
public AsyncControl<R> with(ExecutorService executorService) {
this.executorService = executorService;
@@ -207,7 +204,7 @@ public class AsyncControl<R> extends ControlAbstract<AsyncControl<R>> {
buf.append(" ").append(getMethod().getName()).append(" ");
if(getBookmark() != null) {
buf.append(" on '")
- .append(getBookmark().getObjectType())
+ .append(getBookmark().getLogicalTypeName())
.append(":")
.append(getBookmark().getIdentifier())
.append("'");
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/Authentication.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/Authentication.java
index 4828e0c..ef52626 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/Authentication.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/Authentication.java
@@ -22,8 +22,8 @@ package org.apache.isis.core.security.authentication;
import java.io.Serializable;
import java.util.Optional;
-import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.iactn.Interaction;
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.user.UserMemento;
import lombok.NonNull;
@@ -115,7 +115,6 @@ public interface Authentication extends Serializable {
* </p>
*
* @param interactionContext
- * @return
*/
public static Optional<Authentication> authenticationFrom(final @NonNull InteractionContext interactionContext) {
return interactionContext.getAttribute(INTERACTION_CONTEXT_KEY, Authentication.class);
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizorChooser.java b/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizorChooser.java
index 4fe05c4..cf583e8 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizorChooser.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizorChooser.java
@@ -2,8 +2,6 @@ package org.apache.isis.core.security.authorization.manager;
import java.util.List;
-import javax.annotation.Nonnull;
-
import org.apache.isis.core.security.authorization.Authorizor;
/**
@@ -18,7 +16,6 @@ public interface AuthorizorChooser {
/**
*
* @param authorizors
- * @return
*/
Authorizor chooseFrom(final List<Authorizor> authorizors);
}
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
index a5465c9..382609a 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
@@ -30,8 +30,6 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.xml.bind.annotation.XmlRootElement;
-import org.springframework.lang.Nullable;
-
import org.apache.isis.applib.ViewModel;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
@@ -55,10 +53,10 @@ import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.interaction.session.InteractionFactory;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
-import org.apache.isis.testing.fixtures.applib.personas.BuilderScriptAbstract;
-import org.apache.isis.testing.fixtures.applib.personas.PersonaWithBuilderScript;
import org.apache.isis.testing.fixtures.applib.events.FixturesInstalledEvent;
import org.apache.isis.testing.fixtures.applib.events.FixturesInstallingEvent;
+import org.apache.isis.testing.fixtures.applib.personas.BuilderScriptAbstract;
+import org.apache.isis.testing.fixtures.applib.personas.PersonaWithBuilderScript;
import lombok.Getter;
import lombok.Setter;
@@ -295,7 +293,6 @@ public class FixtureScripts {
*
* @param fixtureScriptName
* @param parameters
- * @return
*/
@Action(
restrictTo = RestrictTo.PROTOTYPING
@@ -390,8 +387,6 @@ public class FixtureScripts {
* Convenience action - exposed through the UI - to execute the specified
* "recreate" {@link FixtureScript fixture script} and
* return/show the first object returned by that fixture script.
- *
- * @return
*/
@Action(
restrictTo = RestrictTo.PROTOTYPING
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/personas/BuilderScriptWithResult.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/personas/BuilderScriptWithResult.java
index 3f6b282..84feb58 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/personas/BuilderScriptWithResult.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/personas/BuilderScriptWithResult.java
@@ -34,7 +34,6 @@ public abstract class BuilderScriptWithResult<T> extends BuilderScriptAbstract<T
/**
* Simply returns the object returned by {@link #buildResult(ExecutionContext)}.
- * @return
*/
@Override
public final T getObject() {
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/personas/PersonaWithFinder.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/personas/PersonaWithFinder.java
index 7275880..a24b16e 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/personas/PersonaWithFinder.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/personas/PersonaWithFinder.java
@@ -41,7 +41,6 @@ public interface PersonaWithFinder<T> {
* </p>
*
* @param serviceRegistry
- * @return
*/
T findUsing(final ServiceRegistry serviceRegistry);