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/02/08 13:58:59 UTC

[isis] 02/02: ISIS-2520: regen. index fixes wrong type params

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

commit e7b97e04a1f045cfd6cbe1c1f0c8b493600329f5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Feb 8 14:58:42 2021 +0100

    ISIS-2520: regen. index fixes wrong type params
---
 .../pages/index/applib/IsisModuleApplib.adoc       |  2 +-
 .../index/applib/domain/DomainObjectList.adoc      |  2 +-
 .../index/applib/graph/tree/LazyTreeNode.adoc      |  2 +-
 .../pages/index/applib/graph/tree/TreeNode.adoc    |  2 +-
 .../generated/pages/index/applib/query/Query.adoc  |  2 +-
 .../index/applib/services/MethodReferences.adoc    |  2 +-
 .../applib/services/bookmark/BookmarkService.adoc  |  2 +-
 .../applib/services/factory/FactoryService.adoc    |  2 +-
 .../index/applib/services/iactn/Interaction.adoc   |  2 +-
 .../applib/services/inject/ServiceInjector.adoc    |  2 +-
 .../index/applib/services/jaxb/JaxbService.adoc    |  2 +-
 .../queryresultscache/QueryResultsCache.adoc       |  2 +-
 .../applib/services/registry/ServiceRegistry.adoc  |  2 +-
 .../services/repository/RepositoryService.adoc     |  2 +-
 .../index/applib/services/sudo/SudoService.adoc    |  2 +-
 .../applib/services/wrapper/WrapperFactory.adoc    |  2 +-
 .../services/wrapper/control/AsyncControl.adoc     |  2 +-
 .../services/xactn/TransactionalProcessor.adoc     |  2 +-
 .../services/xmlsnapshot/XmlSnapshotService.adoc   |  2 +-
 .../pages/index/applib/util/Equality.adoc          |  2 +-
 .../generated/pages/index/applib/util/Hashing.adoc |  2 +-
 .../pages/index/applib/util/JaxbUtil.adoc          |  2 +-
 .../pages/index/applib/util/ObjectContracts.adoc   |  2 +-
 .../pages/index/applib/util/ToString.adoc          |  2 +-
 .../index/applib/util/schema/CommonDtoUtils.adoc   |  2 +-
 .../applib/util/schema/InteractionDtoUtils.adoc    |  2 +-
 .../util/schema/MemberExecutionDtoUtils.adoc       |  2 +-
 .../pages/index/commons/collections/Can.adoc       |  2 +-
 .../pages/index/commons/functional/Result.adoc     |  2 +-
 .../transaction/TransactionServiceSpring.adoc      |  2 +-
 .../impl/IsisModuleExtCommandLogImpl.adoc          |  2 +-
 .../commandlog/impl/ui/CommandServiceMenu.adoc     |  2 +-
 .../primary/IsisModuleExtCommandReplayPrimary.adoc |  2 +-
 .../IsisModuleExtCommandReplaySecondary.adoc       |  2 +-
 .../secondary/clock/TickingClockService.adoc       |  2 +-
 .../fullcalendar/applib/CalendarEventable.adoc     |  2 +-
 .../jaxrsclient/applib/client/JaxRsResponse.adoc   |  2 +-
 .../extensions/restclient/ResponseDigest.adoc      |  2 +-
 .../index/extensions/restclient/RestfulClient.adoc |  2 +-
 .../secman/api/IsisModuleExtSecmanApi.adoc         |  2 +-
 .../api/permission/ApplicationPermission.adoc      |  2 +-
 .../permission/ApplicationPermissionValueSet.adoc  |  2 +-
 .../secman/api/role/ApplicationRole.adoc           |  2 +-
 .../secman/api/tenancy/ApplicationTenancy.adoc     |  2 +-
 .../secman/api/user/ApplicationUser.adoc           |  2 +-
 .../secman/model/app/user/MeService.adoc           |  2 +-
 .../shiro/IsisModuleExtSecmanShiroRealm.adoc       |  2 +-
 .../jdo/applib/integration/JdoSupportService.adoc  |  2 +-
 .../pages/index/subdomains/base/applib/Dflt.adoc   |  2 +-
 .../subdomains/base/applib/utils/ClassUtils.adoc   |  2 +-
 .../subdomains/base/applib/with/WithInterval.adoc  |  2 +-
 .../base/applib/with/WithIntervalContiguous.adoc   |  2 +-
 .../base/applib/with/WithIntervalMutable.adoc      |  2 +-
 .../subdomains/excel/applib/dom/ExcelService.adoc  |  2 +-
 .../excel/applib/dom/WorksheetContent.adoc         |  2 +-
 .../subdomains/excel/applib/dom/WorksheetSpec.adoc |  2 +-
 .../excel/applib/dom/util/ExcelServiceImpl.adoc    |  2 +-
 .../subdomains/excel/testing/ExcelFixture2.adoc    |  2 +-
 .../spring/applib/service/BeanDescriptor.adoc      |  2 +-
 .../xdocreport/applib/service/XDocReportModel.adoc |  2 +-
 .../fakedata/applib/services/Collections.adoc      |  2 +-
 .../testing/fakedata/applib/services/Enums.adoc    |  2 +-
 .../applib/IsisIntegrationTestAbstract.adoc        |  2 +-
 .../integration/ObjectFactoryForIntegration.adoc   |  2 +-
 .../index/testing/specsupport/applib/specs/V.adoc  |  2 +-
 .../applib/bean/AbstractBeanPropertiesTest.adoc    |  2 +-
 .../bean/FixtureDatumFactoriesForAnyPojo.adoc      |  2 +-
 .../unittestsupport/applib/bean/PojoTester.adoc    |  2 +-
 .../ComparableContractTest_compareTo.adoc          |  2 +-
 .../core/comparable/ComparableContractTester.adoc  |  2 +-
 .../applib/core/jaxb/JaxbMatchers.adoc             |  2 +-
 .../applib/core/jmocking/IsisActions.adoc          |  2 +-
 .../applib/core/jmocking/JMockActions.adoc         |  2 +-
 .../applib/core/jmocking/JUnitRuleMockery2.adoc    |  2 +-
 .../core/soap/SoapEndpointPublishingRule.adoc      |  2 +-
 .../applib/core/streams/NullPrintStream.adoc       |  2 +-
 .../applib/core/utils/CollectUtils.adoc            |  2 +-
 .../applib/core/utils/ReflectUtils.adoc            |  2 +-
 .../applib/dom/assertions/Asserting.adoc           |  2 +-
 .../applib/dom/matchers/IsisMatchers.adoc          |  2 +-
 .../restfulobjects/applib/JsonRepresentation.adoc  |  2 +-
 .../restfulobjects/applib/RestfulRequest.adoc      |  2 +-
 .../restfulobjects/applib/RestfulResponse.adoc     |  2 +-
 .../restfulobjects/applib/util/JsonMapper.adoc     |  2 +-
 .../modules/generated/pages/system-overview.adoc   | 32 +++++++++++-----------
 85 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/antora/components/system/modules/generated/pages/index/applib/IsisModuleApplib.adoc b/antora/components/system/modules/generated/pages/index/applib/IsisModuleApplib.adoc
index 600e622..adbf005 100644
--- a/antora/components/system/modules/generated/pages/index/applib/IsisModuleApplib.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/IsisModuleApplib.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .IsisModuleApplib.java
 ----
-class IsisModuleApplib<S, S, S, S, S, S, T, S, T> {
+class IsisModuleApplib {
 }
 ----
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/domain/DomainObjectList.adoc b/antora/components/system/modules/generated/pages/index/applib/domain/DomainObjectList.adoc
index 3e57e7f..785c167 100644
--- a/antora/components/system/modules/generated/pages/index/applib/domain/DomainObjectList.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/domain/DomainObjectList.adoc
@@ -13,7 +13,7 @@ Thus, the RO client then only ever needs to know how to render an object, in all
 [source,java]
 .DomainObjectList.java
 ----
-class DomainObjectList<T, T> {
+class DomainObjectList {
   DomainObjectList()
   DomainObjectList(final String title, final String elementObjectType, final String actionOwningType, final String actionId, final String actionArguments)
   String title()
diff --git a/antora/components/system/modules/generated/pages/index/applib/graph/tree/LazyTreeNode.adoc b/antora/components/system/modules/generated/pages/index/applib/graph/tree/LazyTreeNode.adoc
index d79e8a6..899e184 100644
--- a/antora/components/system/modules/generated/pages/index/applib/graph/tree/LazyTreeNode.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/graph/tree/LazyTreeNode.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .LazyTreeNode.java
 ----
-class LazyTreeNode<T, T> {
+class LazyTreeNode<T> {
   TreeNode<T> of(T value, Class<? extends TreeAdapter<T>> treeAdapterClass, TreeState sharedState)
   T getValue()
   TreeNode<T> getParentIfAny()
diff --git a/antora/components/system/modules/generated/pages/index/applib/graph/tree/TreeNode.adoc b/antora/components/system/modules/generated/pages/index/applib/graph/tree/TreeNode.adoc
index 041c7e6..ef123d8 100644
--- a/antora/components/system/modules/generated/pages/index/applib/graph/tree/TreeNode.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/graph/tree/TreeNode.adoc
@@ -7,7 +7,7 @@ Fundamental building block of Tree structures.
 [source,java]
 .TreeNode.java
 ----
-interface TreeNode<T, T> {
+interface TreeNode<T> {
   int getIncomingCount()
   int getOutgoingCount()
   Stream<Edge<T>> streamIncoming()
diff --git a/antora/components/system/modules/generated/pages/index/applib/query/Query.adoc b/antora/components/system/modules/generated/pages/index/applib/query/Query.adoc
index cd23c04..5b468d7 100644
--- a/antora/components/system/modules/generated/pages/index/applib/query/Query.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/query/Query.adoc
@@ -13,7 +13,7 @@ Implementations are expected to implement the _#getRange()_ method, which is use
 [source,java]
 .Query.java
 ----
-interface Query<T, T, T> {
+interface Query<T> {
   Class<T> getResultType()     // <.>
   String getDescription()     // <.>
   QueryRange getRange()     // <.>
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/MethodReferences.adoc b/antora/components/system/modules/generated/pages/index/applib/services/MethodReferences.adoc
index 71e402a..8caffbf 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/MethodReferences.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/MethodReferences.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .MethodReferences.java
 ----
-class MethodReferences<A0, A0, A1, A0, A1, A2, A0, A1, A2, A3, A0, A1, A2, A3, A4, R, R, A0, R, A0, A1, R, A0, A1, A2, R, A0, A1, A2, A3, R, A0, A1, A2, A3, A4> {
+class MethodReferences {
 }
 ----
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/bookmark/BookmarkService.adoc b/antora/components/system/modules/generated/pages/index/applib/services/bookmark/BookmarkService.adoc
index 7e5966a..b4ba123 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/bookmark/BookmarkService.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/bookmark/BookmarkService.adoc
@@ -7,7 +7,7 @@ This service provides a serializable 'bookmark' for any entity, and conversely t
 [source,java]
 .BookmarkService.java
 ----
-interface BookmarkService<T> {
+interface BookmarkService {
   Bookmark bookmarkFor(Object domainObject)     // <.>
   Bookmark bookmarkForElseThrow(Object domainObject)     // <.>
   Bookmark bookmarkFor(Class<?> cls, String identifier)     // <.>
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/factory/FactoryService.adoc b/antora/components/system/modules/generated/pages/index/applib/services/factory/FactoryService.adoc
index 1a28d5b..482aff2 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/factory/FactoryService.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/factory/FactoryService.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .FactoryService.java
 ----
-interface FactoryService<T, T, T, T, T, T, T, T, T, T> {
+interface FactoryService {
   T getOrCreate(Class<T> requiredType)     // <.>
   T get(Class<T> requiredType)     // <.>
   T detachedEntity(Class<T> domainClass)     // <.>
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/iactn/Interaction.adoc b/antora/components/system/modules/generated/pages/index/applib/services/iactn/Interaction.adoc
index a312899..07d3df3 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/iactn/Interaction.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/iactn/Interaction.adoc
@@ -13,7 +13,7 @@ NOTE: you could also think of this interface as being analogous to the (database
 [source,java]
 .Interaction.java
 ----
-interface Interaction<T, E> {
+interface Interaction {
   Command getCommand()
   Execution<?, ?> getCurrentExecution()     // <.>
   Execution<?, ?> getPriorExecution()     // <.>
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/inject/ServiceInjector.adoc b/antora/components/system/modules/generated/pages/index/applib/services/inject/ServiceInjector.adoc
index 059f32e..161af19 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/inject/ServiceInjector.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/inject/ServiceInjector.adoc
@@ -9,7 +9,7 @@ Implementation must be thread-safe.
 [source,java]
 .ServiceInjector.java
 ----
-interface ServiceInjector<T, T> {
+interface ServiceInjector {
   T injectServicesInto(final T domainObject, Consumer<InjectionPoint> onNotResolvable)
   T injectServicesInto(final T domainObject)
 }
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/jaxb/JaxbService.adoc b/antora/components/system/modules/generated/pages/index/applib/services/jaxb/JaxbService.adoc
index 2624f64..502e507 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/jaxb/JaxbService.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/jaxb/JaxbService.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .JaxbService.java
 ----
-interface JaxbService<T, T, T> {
+interface JaxbService {
   Object fromXml(JAXBContext jaxbContext, String xml)
   Object fromXml(JAXBContext jaxbContext, String xml, Map<String, Object> unmarshallerProperties)
   T fromXml(Class<T> domainClass, String xml)     // <.>
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/QueryResultsCache.adoc b/antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/QueryResultsCache.adoc
index 0f6bfd8..6694441 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/QueryResultsCache.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/QueryResultsCache.adoc
@@ -9,7 +9,7 @@ This implementation has no UI and there is only one implementation (this class)
 [source,java]
 .QueryResultsCache.java
 ----
-interface QueryResultsCache<T, R, R, A0, R, A0, A1, R, A0, A1, A2, R, A0, A1, A2, A3, R, A0, A1, A2, A3, A4, T> {
+interface QueryResultsCache {
   T execute(Callable<T> callable, Class<?> callingClass, String methodName, Object... keys)
   void onTransactionEnded()     // <.>
   R execute(MethodReferences.Call0<? extends R> action, Class<?> callingClass, String methodName)
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/registry/ServiceRegistry.adoc b/antora/components/system/modules/generated/pages/index/applib/services/registry/ServiceRegistry.adoc
index 9e81f6a..fadf4d0 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/registry/ServiceRegistry.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/registry/ServiceRegistry.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .ServiceRegistry.java
 ----
-interface ServiceRegistry<T, T, T, T> {
+interface ServiceRegistry {
   Can<T> select(Class<T> type, Annotation[] qualifiers)     // <.>
   Can<T> select(final Class<T> type)     // <.>
   Stream<_ManagedBeanAdapter> streamRegisteredBeansOfType(Class<?> requiredType)     // <.>
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/repository/RepositoryService.adoc b/antora/components/system/modules/generated/pages/index/applib/services/repository/RepositoryService.adoc
index 0d2e0f3..244f9b8 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/repository/RepositoryService.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/repository/RepositoryService.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .RepositoryService.java
 ----
-interface RepositoryService<T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T> {
+interface RepositoryService {
   EntityState getEntityState(Object object)     // <.>
   T detachedEntity(T entity)     // <.>
   T persist(T domainObject)     // <.>
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/sudo/SudoService.adoc b/antora/components/system/modules/generated/pages/index/applib/services/sudo/SudoService.adoc
index fef7a89..7e77623 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/sudo/SudoService.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/sudo/SudoService.adoc
@@ -7,7 +7,7 @@ Intended only for use by fixture scripts and integration tests, allows a block o
 [source,java]
 .SudoService.java
 ----
-interface SudoService<T> {
+interface SudoService {
   RoleMemento ACCESS_ALL_ROLE;     // <.>
   T call(UnaryOperator<ExecutionContext> sudoMapper, Callable<T> supplier)     // <.>
   void run(final UnaryOperator<ExecutionContext> sudoMapper, final ThrowingRunnable runnable)     // <.>
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/WrapperFactory.adoc b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/WrapperFactory.adoc
index 777dd4a..0e986f0 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/WrapperFactory.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/WrapperFactory.adoc
@@ -24,7 +24,7 @@ If the object has (see _#isWrapper(Object)_ already been wrapped), then should j
 [source,java]
 .WrapperFactory.java
 ----
-interface WrapperFactory<T, T, T, T, T, T, T, R, T, R> {
+interface WrapperFactory {
   T wrap(T domainObject, SyncControl syncControl)     // <.>
   T wrap(T domainObject)     // <.>
   T wrapMixin(Class<T> mixinClass, Object mixedIn, SyncControl syncControl)     // <.>
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/AsyncControl.adoc b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/AsyncControl.adoc
index b3fa9f0..43d37b6 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/AsyncControl.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/AsyncControl.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .AsyncControl.java
 ----
-class AsyncControl<X, R> {
+class AsyncControl<R> {
   AsyncControl<Void> returningVoid()
   AsyncControl<X> returning(final Class<X> cls)
   AsyncControl<R> with(ExecutorService executorService)
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionalProcessor.adoc b/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionalProcessor.adoc
index 0a278af..35ce8bd 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionalProcessor.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionalProcessor.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .TransactionalProcessor.java
 ----
-interface TransactionalProcessor<T, T, T> {
+interface TransactionalProcessor {
   Result<T> callTransactional(TransactionDefinition def, Callable<T> callable)     // <.>
   Result<Void> runTransactional(TransactionDefinition def, ThrowingRunnable runnable)     // <.>
   Result<T> callTransactional(Propagation propagation, Callable<T> callable)     // <.>
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/XmlSnapshotService.adoc b/antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/XmlSnapshotService.adoc
index 90c7e40..9d7834c 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/XmlSnapshotService.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/XmlSnapshotService.adoc
@@ -9,7 +9,7 @@ The framework provides an implementation of this service ( `XmlSnapshotServiceDe
 [source,java]
 .XmlSnapshotService.java
 ----
-interface XmlSnapshotService<T> {
+interface XmlSnapshotService {
   XmlSnapshotService.Snapshot snapshotFor(final Object domainObject)     // <.>
   XmlSnapshotService.Snapshot.Builder builderFor(final Object domainObject)     // <.>
   T getChildElementValue(final Element el, final String tagname, final Class<T> expectedCls)     // <.>
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/Equality.adoc b/antora/components/system/modules/generated/pages/index/applib/util/Equality.adoc
index c55fd4f..4c0376e 100644
--- a/antora/components/system/modules/generated/pages/index/applib/util/Equality.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/util/Equality.adoc
@@ -7,7 +7,7 @@ Fluent Object Equality Composition.
 [source,java]
 .Equality.java
 ----
-class Equality<T, T> {
+class Equality<T> {
   Equality<T> checkEquals(Function<? super T, ?> getter)
   Equality<T> thenCheckEquals(Function<? super T, ?> getter)
   boolean equals(T target, Object other)
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/Hashing.adoc b/antora/components/system/modules/generated/pages/index/applib/util/Hashing.adoc
index 41511a7..f6ec0f0 100644
--- a/antora/components/system/modules/generated/pages/index/applib/util/Hashing.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/util/Hashing.adoc
@@ -7,7 +7,7 @@ Fluent Object Hash Code Composition.
 [source,java]
 .Hashing.java
 ----
-class Hashing<T, T> {
+class Hashing<T> {
   Hashing<T> hashing(Function<? super T, ?> getter)
   Hashing<T> thenHashing(Function<? super T, ?> getter)
   int hashCode(T object)
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/JaxbUtil.adoc b/antora/components/system/modules/generated/pages/index/applib/util/JaxbUtil.adoc
index e33370c..542703b 100644
--- a/antora/components/system/modules/generated/pages/index/applib/util/JaxbUtil.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/util/JaxbUtil.adoc
@@ -9,7 +9,7 @@ For example usage, seeIsis addons' publishmq module(non-ASF)
 [source,java]
 .JaxbUtil.java
 ----
-class JaxbUtil<T, T, T, T, T> {
+class JaxbUtil {
   Result<T> fromXml(final Reader reader, final Class<T> dtoClass)
   Result<T> fromXml(final Class<?> contextClass, final String resourceName, final Class<T> dtoClass)
   Result<String> toXml(final Object dto)
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/ObjectContracts.adoc b/antora/components/system/modules/generated/pages/index/applib/util/ObjectContracts.adoc
index 228cf51..93fd287 100644
--- a/antora/components/system/modules/generated/pages/index/applib/util/ObjectContracts.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/util/ObjectContracts.adoc
@@ -41,7 +41,7 @@ public int compareTo(final ApplicationFeature other) {
 [source,java]
 .ObjectContracts.java
 ----
-class ObjectContracts<T, T, T, U, U, T, T, T, T, T, T, T> {
+class ObjectContracts {
   ToString<T> toString(String name, Function<T, ?> getter)
   Equality<T> checkEquals(Function<T, ?> getter)
   Hashing<T> hashing(Function<T, ?> getter)
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/ToString.adoc b/antora/components/system/modules/generated/pages/index/applib/util/ToString.adoc
index 2d255d2..b910836 100644
--- a/antora/components/system/modules/generated/pages/index/applib/util/ToString.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/util/ToString.adoc
@@ -7,7 +7,7 @@ Fluent Object to String Composition.
 [source,java]
 .ToString.java
 ----
-class ToString<T, T, T> {
+class ToString<T> {
   ToString<T> toString(String name, Function<? super T, ?> getter)
   ToString<T> toStringOmitIfAbsent(String name, Function<? super T, ?> getter)
   ToString<T> thenToString(String name, Function<? super T, ?> getter)
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/schema/CommonDtoUtils.adoc b/antora/components/system/modules/generated/pages/index/applib/util/schema/CommonDtoUtils.adoc
index 1cb373d..a912cc3 100644
--- a/antora/components/system/modules/generated/pages/index/applib/util/schema/CommonDtoUtils.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/util/schema/CommonDtoUtils.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .CommonDtoUtils.java
 ----
-class CommonDtoUtils<T, T, T, T, T, T, T> {
+class CommonDtoUtils {
   public static final Function<ParamDto, String> PARAM_DTO_TO_NAME;
   public static final Function<ParamDto, ValueType> PARAM_DTO_TO_TYPE;
   public static final Map<Class<?>, ValueType> valueTypeByClass;
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/schema/InteractionDtoUtils.adoc b/antora/components/system/modules/generated/pages/index/applib/util/schema/InteractionDtoUtils.adoc
index 20b077e..19e76f4 100644
--- a/antora/components/system/modules/generated/pages/index/applib/util/schema/InteractionDtoUtils.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/util/schema/InteractionDtoUtils.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .InteractionDtoUtils.java
 ----
-class InteractionDtoUtils<T> {
+class InteractionDtoUtils {
   static JAXBContext jaxbContext;
   void init()
   JAXBContext getJaxbContext()
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/schema/MemberExecutionDtoUtils.adoc b/antora/components/system/modules/generated/pages/index/applib/util/schema/MemberExecutionDtoUtils.adoc
index 4ed7a60..6658163 100644
--- a/antora/components/system/modules/generated/pages/index/applib/util/schema/MemberExecutionDtoUtils.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/util/schema/MemberExecutionDtoUtils.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .MemberExecutionDtoUtils.java
 ----
-class MemberExecutionDtoUtils<T, T, T> {
+class MemberExecutionDtoUtils {
   T clone(final T dto)
   MetricsDto metricsFor(final MemberExecutionDto executionDto)
   PeriodDto timingsFor(final MetricsDto metricsDto)
diff --git a/antora/components/system/modules/generated/pages/index/commons/collections/Can.adoc b/antora/components/system/modules/generated/pages/index/commons/collections/Can.adoc
index 93fee90..7cebeed 100644
--- a/antora/components/system/modules/generated/pages/index/commons/collections/Can.adoc
+++ b/antora/components/system/modules/generated/pages/index/commons/collections/Can.adoc
@@ -13,7 +13,7 @@ A xref:system:generated:index/commons/collections/Can.adoc[Can] must not contain
 [source,java]
 .Can.java
 ----
-interface Can<T, T, T, T, T, T, T, T, T, R, T, R, R, Z, T, C, T> {
+interface Can<T> {
   Cardinality getCardinality()     // <.>
   int size()     // <.>
   Optional<T> get(int elementIndex)     // <.>
diff --git a/antora/components/system/modules/generated/pages/index/commons/functional/Result.adoc b/antora/components/system/modules/generated/pages/index/commons/functional/Result.adoc
index 2fbc885..7692a05 100644
--- a/antora/components/system/modules/generated/pages/index/commons/functional/Result.adoc
+++ b/antora/components/system/modules/generated/pages/index/commons/functional/Result.adoc
@@ -7,7 +7,7 @@ The xref:system:generated:index/commons/functional/Result.adoc[Result] type repr
 [source,java]
 .Result.java
 ----
-class Result<L, L, L, L, L, E, E, T, T, L> {
+class Result<L> {
   Result<L> of(final Callable<L> callable)
   Result<Void> ofVoid(final ThrowingRunnable runnable)
   Result<L> success(final L value)
diff --git a/antora/components/system/modules/generated/pages/index/core/runtimeservices/transaction/TransactionServiceSpring.adoc b/antora/components/system/modules/generated/pages/index/core/runtimeservices/transaction/TransactionServiceSpring.adoc
index 9dda605..aa3c470 100644
--- a/antora/components/system/modules/generated/pages/index/core/runtimeservices/transaction/TransactionServiceSpring.adoc
+++ b/antora/components/system/modules/generated/pages/index/core/runtimeservices/transaction/TransactionServiceSpring.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .TransactionServiceSpring.java
 ----
-class TransactionServiceSpring<T> {
+class TransactionServiceSpring {
   TransactionServiceSpring(final List<PlatformTransactionManager> platformTransactionManagers, final List<PersistenceExceptionTranslator> persistenceExceptionTranslators, final InteractionTracker interactionTracker)
   Result<T> callTransactional(TransactionDefinition def, Callable<T> callable)
   void nextTransaction()
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/IsisModuleExtCommandLogImpl.adoc b/antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/IsisModuleExtCommandLogImpl.adoc
index 36f6063..c5fcc27 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/IsisModuleExtCommandLogImpl.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/IsisModuleExtCommandLogImpl.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .IsisModuleExtCommandLogImpl.java
 ----
-class IsisModuleExtCommandLogImpl<S, S, S, S, S, S, T, S, T> {
+class IsisModuleExtCommandLogImpl {
   FixtureScript getTeardownFixture()
   FixtureScript getTeardownFixtureWillDelete()     // <.>
 }
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/ui/CommandServiceMenu.adoc b/antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/ui/CommandServiceMenu.adoc
index 735b721..28a60a9 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/ui/CommandServiceMenu.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/ui/CommandServiceMenu.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .CommandServiceMenu.java
 ----
-class CommandServiceMenu<T, T> {
+class CommandServiceMenu {
   final CommandJdoRepository commandServiceRepository;
   final ClockService clockService;
   List<CommandJdo> activeCommands()
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/primary/IsisModuleExtCommandReplayPrimary.adoc b/antora/components/system/modules/generated/pages/index/extensions/commandreplay/primary/IsisModuleExtCommandReplayPrimary.adoc
index 54d8f98..6be1b70 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/primary/IsisModuleExtCommandReplayPrimary.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/commandreplay/primary/IsisModuleExtCommandReplayPrimary.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .IsisModuleExtCommandReplayPrimary.java
 ----
-class IsisModuleExtCommandReplayPrimary<S, S, T, S, T> {
+class IsisModuleExtCommandReplayPrimary {
 }
 ----
 
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.adoc b/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.adoc
index 3a32ec8..4a979fe 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .IsisModuleExtCommandReplaySecondary.java
 ----
-class IsisModuleExtCommandReplaySecondary<S, S, T, S, T> {
+class IsisModuleExtCommandReplaySecondary {
   @Inject
 ApplicationContext applicationContext;
   @Inject
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/clock/TickingClockService.adoc b/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/clock/TickingClockService.adoc
index c6cd7fc..6857367 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/clock/TickingClockService.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/clock/TickingClockService.adoc
@@ -11,7 +11,7 @@ IMPORTANT: the methods provided by this service are not thread-safe, because the
 [source,java]
 .TickingClockService.java
 ----
-class TickingClockService<T> {
+class TickingClockService {
   final IsisConfiguration isisConfiguration;
   void init()
   boolean isInitialized()
diff --git a/antora/components/system/modules/generated/pages/index/extensions/fullcalendar/applib/CalendarEventable.adoc b/antora/components/system/modules/generated/pages/index/extensions/fullcalendar/applib/CalendarEventable.adoc
index 62525d4..bef2b70 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/fullcalendar/applib/CalendarEventable.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/fullcalendar/applib/CalendarEventable.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .CalendarEventable.java
 ----
-interface CalendarEventable<T, T> {
+interface CalendarEventable {
   String getCalendarName()     // <.>
   CalendarEvent toCalendarEvent()
 }
diff --git a/antora/components/system/modules/generated/pages/index/extensions/jaxrsclient/applib/client/JaxRsResponse.adoc b/antora/components/system/modules/generated/pages/index/extensions/jaxrsclient/applib/client/JaxRsResponse.adoc
index c4084c4..6df4367 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/jaxrsclient/applib/client/JaxRsResponse.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/jaxrsclient/applib/client/JaxRsResponse.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .JaxRsResponse.java
 ----
-interface JaxRsResponse<T> {
+interface JaxRsResponse {
   int getStatus()
   T readEntity(final Class<T> entityType)
 }
diff --git a/antora/components/system/modules/generated/pages/index/extensions/restclient/ResponseDigest.adoc b/antora/components/system/modules/generated/pages/index/extensions/restclient/ResponseDigest.adoc
index c6b1873..ef22a20 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/restclient/ResponseDigest.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/restclient/ResponseDigest.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .ResponseDigest.java
 ----
-class ResponseDigest<T, T, T, T> {
+class ResponseDigest<T> {
   ResponseDigest<T> of(final Response response, final Class<T> entityType)     // <.>
   ResponseDigest<T> ofList(final Response response, final Class<T> entityType, final GenericType<List<T>> genericType)     // <.>
   ResponseDigest<T> ofAsyncFailure(final Future<Response> asyncResponse, final Class<T> entityType, final Exception failure)     // <.>
diff --git a/antora/components/system/modules/generated/pages/index/extensions/restclient/RestfulClient.adoc b/antora/components/system/modules/generated/pages/index/extensions/restclient/RestfulClient.adoc
index 862c841..433f60a 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/restclient/RestfulClient.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/restclient/RestfulClient.adoc
@@ -68,7 +68,7 @@ if(digest.isSuccess()) {
 [source,java]
 .RestfulClient.java
 ----
-class RestfulClient<T, T, T, T> {
+class RestfulClient {
   RestfulClient ofConfig(RestfulClientConfig clientConfig)
   void init(RestfulClientConfig clientConfig)
   RestfulClientConfig getConfig()
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/IsisModuleExtSecmanApi.adoc b/antora/components/system/modules/generated/pages/index/extensions/secman/api/IsisModuleExtSecmanApi.adoc
index b351751..883a4ba 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/secman/api/IsisModuleExtSecmanApi.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/secman/api/IsisModuleExtSecmanApi.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .IsisModuleExtSecmanApi.java
 ----
-class IsisModuleExtSecmanApi<S, S, T, S, T> {
+class IsisModuleExtSecmanApi {
 }
 ----
 
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermission.adoc b/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermission.adoc
index 0976e5a..dc6cf9d 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermission.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermission.adoc
@@ -14,7 +14,7 @@ For a given permission, there is an interaction between the xref:system:generate
 [source,java]
 .ApplicationPermission.java
 ----
-interface ApplicationPermission<T, T> {
+interface ApplicationPermission {
   String title()     // <.>
   ApplicationFeatureType getFeatureType()
   ApplicationRole getRole()
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermissionValueSet.adoc b/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermissionValueSet.adoc
index 3dd5e91..eeb1c8b 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermissionValueSet.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermissionValueSet.adoc
@@ -9,7 +9,7 @@ Intended for value type arithmetic and also for caching.
 [source,java]
 .ApplicationPermissionValueSet.java
 ----
-class ApplicationPermissionValueSet<T, T> {
+class ApplicationPermissionValueSet {
   ApplicationPermissionValueSet(final List<ApplicationPermissionValue> permissionValues, final PermissionsEvaluationService permissionsEvaluationService)
   boolean grants(final ApplicationFeatureId featureId, final ApplicationPermissionMode mode)
   Evaluation evaluate(final ApplicationFeatureId featureId, final ApplicationPermissionMode mode)
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/role/ApplicationRole.adoc b/antora/components/system/modules/generated/pages/index/extensions/secman/api/role/ApplicationRole.adoc
index 34eba3c..a68e13c 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/secman/api/role/ApplicationRole.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/secman/api/role/ApplicationRole.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .ApplicationRole.java
 ----
-interface ApplicationRole<T, T> {
+interface ApplicationRole {
   public static final int MAX_LENGTH_NAME;
   public static final int TYPICAL_LENGTH_NAME;
   public static final int TYPICAL_LENGTH_DESCRIPTION;
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/tenancy/ApplicationTenancy.adoc b/antora/components/system/modules/generated/pages/index/extensions/secman/api/tenancy/ApplicationTenancy.adoc
index f60c82c..c2eda2a 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/secman/api/tenancy/ApplicationTenancy.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/secman/api/tenancy/ApplicationTenancy.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .ApplicationTenancy.java
 ----
-interface ApplicationTenancy<T, T> {
+interface ApplicationTenancy {
   public static final int MAX_LENGTH_PATH;
   public static final int MAX_LENGTH_NAME;
   public static final int TYPICAL_LENGTH_NAME;
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/user/ApplicationUser.adoc b/antora/components/system/modules/generated/pages/index/extensions/secman/api/user/ApplicationUser.adoc
index 426672d..41d25ad 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/secman/api/user/ApplicationUser.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/secman/api/user/ApplicationUser.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .ApplicationUser.java
 ----
-interface ApplicationUser<T, T> {
+interface ApplicationUser {
   public static final int MAX_LENGTH_USERNAME;
   public static final int MAX_LENGTH_FAMILY_NAME;
   public static final int MAX_LENGTH_GIVEN_NAME;
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/model/app/user/MeService.adoc b/antora/components/system/modules/generated/pages/index/extensions/secman/model/app/user/MeService.adoc
index 080336d..da24752 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/secman/model/app/user/MeService.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/secman/model/app/user/MeService.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .MeService.java
 ----
-class MeService<T, T> {
+class MeService {
   String iconName()
   ApplicationUser me()
 }
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.adoc b/antora/components/system/modules/generated/pages/index/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.adoc
index 9d68f3f..0ff6972 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .IsisModuleExtSecmanShiroRealm.java
 ----
-class IsisModuleExtSecmanShiroRealm<V, V> {
+class IsisModuleExtSecmanShiroRealm {
   IsisModuleExtSecmanShiroRealm()     // <.>
   EnumSet<SecurityRealmCharacteristic> getCharacteristics()
   V execute(final Supplier<V> closure)
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/applib/integration/JdoSupportService.adoc b/antora/components/system/modules/generated/pages/index/persistence/jdo/applib/integration/JdoSupportService.adoc
index 9d773e2..5b892d6 100644
--- a/antora/components/system/modules/generated/pages/index/persistence/jdo/applib/integration/JdoSupportService.adoc
+++ b/antora/components/system/modules/generated/pages/index/persistence/jdo/applib/integration/JdoSupportService.adoc
@@ -7,7 +7,7 @@ Primarily provides access to the current thread's _PersistenceManagerFactory_ an
 [source,java]
 .JdoSupportService.java
 ----
-interface JdoSupportService<T, T, T, T, T, T> {
+interface JdoSupportService {
   PersistenceManagerFactory getPersistenceManagerFactory()
   T refresh(T domainObject)     // <.>
   void ensureLoaded(Collection<?> collectionOfDomainObjects)
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/Dflt.adoc b/antora/components/system/modules/generated/pages/index/subdomains/base/applib/Dflt.adoc
index db8b208..e2b110a 100644
--- a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/Dflt.adoc
+++ b/antora/components/system/modules/generated/pages/index/subdomains/base/applib/Dflt.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .Dflt.java
 ----
-class Dflt<T> {
+class Dflt {
   T of(final Collection<T> choices)
 }
 ----
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/utils/ClassUtils.adoc b/antora/components/system/modules/generated/pages/index/subdomains/base/applib/utils/ClassUtils.adoc
index 5c3f7c0..53901a3 100644
--- a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/utils/ClassUtils.adoc
+++ b/antora/components/system/modules/generated/pages/index/subdomains/base/applib/utils/ClassUtils.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .ClassUtils.java
 ----
-class ClassUtils<T> {
+class ClassUtils {
   Class<? extends T> load(final String clsName, final Class<T> cls)
 }
 ----
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithInterval.adoc b/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithInterval.adoc
index c1bbe35..a3ed3bf 100644
--- a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithInterval.adoc
+++ b/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithInterval.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .WithInterval.java
 ----
-interface WithInterval<T, T, T> {
+interface WithInterval<T> {
   LocalDate getStartDate()     // <.>
   void setStartDate(LocalDate startDate)
   LocalDate getEndDate()     // <.>
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithIntervalContiguous.adoc b/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithIntervalContiguous.adoc
index d317ee4..1a151e9 100644
--- a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithIntervalContiguous.adoc
+++ b/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithIntervalContiguous.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .WithIntervalContiguous.java
 ----
-interface WithIntervalContiguous<T, T, T> {
+interface WithIntervalContiguous<T> {
   T getPredecessor()     // <.>
   T getSuccessor()     // <.>
   SortedSet<T> getTimeline()     // <.>
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithIntervalMutable.adoc b/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithIntervalMutable.adoc
index becc60a..53828aa 100644
--- a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithIntervalMutable.adoc
+++ b/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithIntervalMutable.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .WithIntervalMutable.java
 ----
-interface WithIntervalMutable<T, T> {
+interface WithIntervalMutable<T> {
   T changeDates(final LocalDate startDate, final LocalDate endDate)
   LocalDate default0ChangeDates()
   LocalDate default1ChangeDates()
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/ExcelService.adoc b/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/ExcelService.adoc
index 9defb55..618b938 100644
--- a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/ExcelService.adoc
+++ b/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/ExcelService.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .ExcelService.java
 ----
-class ExcelService<T, T, T, T, T, T, T, T, T, T> {
+class ExcelService {
   public static final String XSLX_MIME_TYPE;
   ExcelService()
   void init()
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/WorksheetContent.adoc b/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/WorksheetContent.adoc
index 6c65ada..09399d5 100644
--- a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/WorksheetContent.adoc
+++ b/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/WorksheetContent.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .WorksheetContent.java
 ----
-class WorksheetContent<T> {
+class WorksheetContent {
   WorksheetContent(final List<T> domainObjects, final WorksheetSpec spec)
   List<?> getDomainObjects()
   WorksheetSpec getSpec()
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/WorksheetSpec.adoc b/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/WorksheetSpec.adoc
index efdc1d3..e992ae2 100644
--- a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/WorksheetSpec.adoc
+++ b/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/WorksheetSpec.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .WorksheetSpec.java
 ----
-class WorksheetSpec<T, Q, T, T, T, T> {
+class WorksheetSpec {
   WorksheetSpec(final Class<T> viewModelClass, String sheetName)     // <.>
   WorksheetSpec(final Class<T> viewModelClass, String sheetName, final Mode mode)
   WorksheetSpec(final RowFactory<T> factory, String sheetName, final Mode mode)
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/ExcelServiceImpl.adoc b/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/ExcelServiceImpl.adoc
index 223c233..3ab2b47 100644
--- a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/ExcelServiceImpl.adoc
+++ b/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/ExcelServiceImpl.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .ExcelServiceImpl.java
 ----
-class ExcelServiceImpl<T, T, T, T, T, T, T, T, T, T> {
+class ExcelServiceImpl {
   @javax.inject.Inject
 BookmarkService bookmarkService;
   @javax.inject.Inject
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixture2.adoc b/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixture2.adoc
index 679a148..369f98a 100644
--- a/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixture2.adoc
+++ b/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixture2.adoc
@@ -7,7 +7,7 @@ This class should be executed using _org.apache.isis.testing.fixtures.applib.fix
 [source,java]
 .ExcelFixture2.java
 ----
-class ExcelFixture2<T> {
+class ExcelFixture2 {
   @Getter
 @Setter
 WorksheetSpec.Matcher matcher;     // <.>
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/spring/applib/service/BeanDescriptor.adoc b/antora/components/system/modules/generated/pages/index/subdomains/spring/applib/service/BeanDescriptor.adoc
index 0dc0919..78e7d0e 100644
--- a/antora/components/system/modules/generated/pages/index/subdomains/spring/applib/service/BeanDescriptor.adoc
+++ b/antora/components/system/modules/generated/pages/index/subdomains/spring/applib/service/BeanDescriptor.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .BeanDescriptor.java
 ----
-class BeanDescriptor<T> {
+class BeanDescriptor {
   BeanDescriptor(final String beanName, final ConfigurableApplicationContext context)
   List<T> dependencies(Class<T> cls)
 }
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/xdocreport/applib/service/XDocReportModel.adoc b/antora/components/system/modules/generated/pages/index/subdomains/xdocreport/applib/service/XDocReportModel.adoc
index 4b22a61..cabd07a 100644
--- a/antora/components/system/modules/generated/pages/index/subdomains/xdocreport/applib/service/XDocReportModel.adoc
+++ b/antora/components/system/modules/generated/pages/index/subdomains/xdocreport/applib/service/XDocReportModel.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .XDocReportModel.java
 ----
-interface XDocReportModel<T, T> {
+interface XDocReportModel {
   Map<String, Data> getContextData()
 }
 ----
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Collections.adoc b/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Collections.adoc
index cd375c0..e305c18 100644
--- a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Collections.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Collections.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .Collections.java
 ----
-class Collections<E, E, E, T, T, T, T, T, T, T, T, T, E> {
+class Collections {
   Collections(final FakeDataService fakeDataService)
   E randomEnum(final Class<E> enumType)     // <.>
   E anyEnum(final Class<E> enumType)
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Enums.adoc b/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Enums.adoc
index 3892dee..6b8ad77 100644
--- a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Enums.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Enums.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .Enums.java
 ----
-class Enums<T> {
+class Enums {
   Enums(final FakeDataService fakeDataService)
   T anyOf(Class<T> cls)
 }
diff --git a/antora/components/system/modules/generated/pages/index/testing/integtestsupport/applib/IsisIntegrationTestAbstract.adoc b/antora/components/system/modules/generated/pages/index/testing/integtestsupport/applib/IsisIntegrationTestAbstract.adoc
index 42c191c..3e59802 100644
--- a/antora/components/system/modules/generated/pages/index/testing/integtestsupport/applib/IsisIntegrationTestAbstract.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/integtestsupport/applib/IsisIntegrationTestAbstract.adoc
@@ -7,7 +7,7 @@ Convenient base class to extend for integration tests.
 [source,java]
 .IsisIntegrationTestAbstract.java
 ----
-class IsisIntegrationTestAbstract<T, T, T, T, T, T, T> {
+class IsisIntegrationTestAbstract {
 }
 ----
 
diff --git a/antora/components/system/modules/generated/pages/index/testing/specsupport/applib/integration/ObjectFactoryForIntegration.adoc b/antora/components/system/modules/generated/pages/index/testing/specsupport/applib/integration/ObjectFactoryForIntegration.adoc
index 28fcf7e..0f3201f 100644
--- a/antora/components/system/modules/generated/pages/index/testing/specsupport/applib/integration/ObjectFactoryForIntegration.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/specsupport/applib/integration/ObjectFactoryForIntegration.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .ObjectFactoryForIntegration.java
 ----
-class ObjectFactoryForIntegration<T, T, T> {
+class ObjectFactoryForIntegration {
   void start()
   void stop()
   boolean addClass(Class<?> clazz)
diff --git a/antora/components/system/modules/generated/pages/index/testing/specsupport/applib/specs/V.adoc b/antora/components/system/modules/generated/pages/index/testing/specsupport/applib/specs/V.adoc
index 755812f..6cc1098 100644
--- a/antora/components/system/modules/generated/pages/index/testing/specsupport/applib/specs/V.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/specsupport/applib/specs/V.adoc
@@ -7,7 +7,7 @@ A set of converters for built-in value types; for use in Cucumber step definitio
 [source,java]
 .V.java
 ----
-class V<T> {
+class V {
 }
 ----
 
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.adoc b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.adoc
index 3892ab2..e38ea47 100644
--- a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .AbstractBeanPropertiesTest.java
 ----
-class AbstractBeanPropertiesTest<T, T> {
+class AbstractBeanPropertiesTest {
   @Rule
 public JUnitRuleMockery2 context;
 }
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.adoc b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.adoc
index f5152e6..5aa4947 100644
--- a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .FixtureDatumFactoriesForAnyPojo.java
 ----
-class FixtureDatumFactoriesForAnyPojo<T, T> {
+class FixtureDatumFactoriesForAnyPojo {
   PojoTester.FixtureDatumFactory<T> pojos(Class<T> compileTimeType, Class<? extends T> runtimeType)
   PojoTester.FixtureDatumFactory<T> pojos(Class<T> type)
 }
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/PojoTester.adoc b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/PojoTester.adoc
index 711fc9b..de32f13 100644
--- a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/PojoTester.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/PojoTester.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .PojoTester.java
 ----
-class PojoTester<T, T, T> {
+class PojoTester {
   PojoTester strict()
   PojoTester relaxed()
   AtomicInteger getCounter()
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/comparable/ComparableContractTest_compareTo.adoc b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/comparable/ComparableContractTest_compareTo.adoc
index 8d450ce..ff50de2 100644
--- a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/comparable/ComparableContractTest_compareTo.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/comparable/ComparableContractTest_compareTo.adoc
@@ -7,7 +7,7 @@ Used by core and domain apps.
 [source,java]
 .ComparableContractTest_compareTo.java
 ----
-class ComparableContractTest_compareTo<E, T> {
+class ComparableContractTest_compareTo<T> {
   void compareAllOrderedTuples()
 }
 ----
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/comparable/ComparableContractTester.adoc b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/comparable/ComparableContractTester.adoc
index 3227b65..14d2f44 100644
--- a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/comparable/ComparableContractTester.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/comparable/ComparableContractTester.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .ComparableContractTester.java
 ----
-class ComparableContractTester<E, T> {
+class ComparableContractTester<T> {
   ComparableContractTester(List<List<T>> orderedTuples)     // <.>
   void test()
   List<E> listOf(E... elements)     // <.>
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jaxb/JaxbMatchers.adoc b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jaxb/JaxbMatchers.adoc
index c172b2f..f9f9bb8 100644
--- a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jaxb/JaxbMatchers.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jaxb/JaxbMatchers.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .JaxbMatchers.java
 ----
-class JaxbMatchers<T> {
+class JaxbMatchers {
   Matcher<? super T> isEquivalentTo(final T expected)     // <.>
 }
 ----
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/IsisActions.adoc b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/IsisActions.adoc
index 47c452f..52b446e 100644
--- a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/IsisActions.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/IsisActions.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .IsisActions.java
 ----
-class IsisActions<T> {
+class IsisActions {
   Action injectInto()
   Action returnEach(final T... values)
   Action returnArgument(final int i)
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/JMockActions.adoc b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/JMockActions.adoc
index 3c51bfb..7c4bcbe 100644
--- a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/JMockActions.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/JMockActions.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .JMockActions.java
 ----
-class JMockActions<T, T> {
+class JMockActions {
   Action returnEach(final T... values)
   Action returnArgument(final int i)
 }
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2.adoc b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2.adoc
index bf014c4..b1cddb5 100644
--- a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2.adoc
@@ -19,7 +19,7 @@ The class also adds some convenience methods, and uses a factory method to make
 [source,java]
 .JUnitRuleMockery2.java
 ----
-class JUnitRuleMockery2<T, T, T, T, T, T> {
+class JUnitRuleMockery2 {
   JUnitRuleMockery2 createFor(final Mode mode)     // <.>
   Statement apply(final Statement base, final FrameworkMethod method, final Object target)
   T getClassUnderTest()
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/soap/SoapEndpointPublishingRule.adoc b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/soap/SoapEndpointPublishingRule.adoc
index c7fa5b2..6722247 100644
--- a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/soap/SoapEndpointPublishingRule.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/soap/SoapEndpointPublishingRule.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .SoapEndpointPublishingRule.java
 ----
-class SoapEndpointPublishingRule<T> {
+class SoapEndpointPublishingRule {
   static final int INITIAL_PORT;     // <.>
   SoapEndpointPublishingRule(final Class<?> endpointClass, final String endpointAddress)
   SoapEndpointPublishingRule(Class<?>... endpointClasses)
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/streams/NullPrintStream.adoc b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/streams/NullPrintStream.adoc
index 67434c1..5e50cb6 100644
--- a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/streams/NullPrintStream.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/streams/NullPrintStream.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .NullPrintStream.java
 ----
-class NullPrintStream<T, T, T, T> {
+class NullPrintStream {
   NullPrintStream()
   void suppressingStdout(Runnable r)
   T suppressingStdout(Callable<T> c)
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/utils/CollectUtils.adoc b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/utils/CollectUtils.adoc
index 9a16690..f4aa10e 100644
--- a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/utils/CollectUtils.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/utils/CollectUtils.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .CollectUtils.java
 ----
-class CollectUtils<T> {
+class CollectUtils {
   T firstIn(final Set<T> set)
 }
 ----
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/utils/ReflectUtils.adoc b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/utils/ReflectUtils.adoc
index 41dd58c..4987b2a 100644
--- a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/utils/ReflectUtils.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/utils/ReflectUtils.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .ReflectUtils.java
 ----
-class ReflectUtils<T, T> {
+class ReflectUtils {
   public static final Predicate<? super Field> persistentMappedBy;
   Predicate<Field> withTypeAssignableFrom(final Class<T> type)
   Predicate<Method> withReturnTypeAssignableFrom(final Class<T> type)
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/assertions/Asserting.adoc b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/assertions/Asserting.adoc
index 08f982b..6a0c407 100644
--- a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/assertions/Asserting.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/assertions/Asserting.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .Asserting.java
 ----
-class Asserting<T> {
+class Asserting {
   T assertType(Object o, Class<T> type)
 }
 ----
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/matchers/IsisMatchers.adoc b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/matchers/IsisMatchers.adoc
index 61abfaf..c8808d3 100644
--- a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/matchers/IsisMatchers.adoc
+++ b/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/matchers/IsisMatchers.adoc
@@ -7,7 +7,7 @@ Hamcrest _org.hamcrest.Matcher_ implementations.
 [source,java]
 .IsisMatchers.java
 ----
-class IsisMatchers<T, T, X, T, T, T> {
+class IsisMatchers {
   Matcher<T> anInstanceOf(final Class<T> expected)
   Matcher<String> nonEmptyString()
   Matcher<String> nonEmptyStringOrNull()
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/JsonRepresentation.adoc b/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/JsonRepresentation.adoc
index b9f7814..4447371 100644
--- a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/JsonRepresentation.adoc
+++ b/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/JsonRepresentation.adoc
@@ -7,7 +7,7 @@ A wrapper around _JsonNode_ that provides some additional helper methods.
 [source,java]
 .JsonRepresentation.java
 ----
-class JsonRepresentation<T, T, T, T> {
+class JsonRepresentation {
   public static final DateTimeFormatter yyyyMMdd;
   public static final DateTimeFormatter yyyyMMddTHHmmssZ;
   public static final DateTimeFormatter _HHmmss;
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RestfulRequest.adoc b/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RestfulRequest.adoc
index 644f7c5..4ec1381 100644
--- a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RestfulRequest.adoc
+++ b/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RestfulRequest.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .RestfulRequest.java
 ----
-class RestfulRequest<Q, X, Q, Q> {
+class RestfulRequest {
   RestfulRequest withArg(final RestfulRequest.RequestParameter<Q> queryParam, final String argStrFormat, final Object... args)
   RestfulRequest withArg(final RestfulRequest.RequestParameter<Q> queryParam, final Q arg)
 }
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RestfulResponse.adoc b/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RestfulResponse.adoc
index a660f8f..d94311c 100644
--- a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RestfulResponse.adoc
+++ b/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RestfulResponse.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .RestfulResponse.java
 ----
-class RestfulResponse<X, T, V, V, Q, T> {
+class RestfulResponse<T> {
   RestfulResponse<JsonRepresentation> of(final Response response)
   RestfulResponse<T> ofT(final Response response)
   HttpStatusCode getStatus()
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/JsonMapper.adoc b/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/JsonMapper.adoc
index 0bf183a..ca24237 100644
--- a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/JsonMapper.adoc
+++ b/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/JsonMapper.adoc
@@ -5,7 +5,7 @@
 [source,java]
 .JsonMapper.java
 ----
-class JsonMapper<T, T> {
+class JsonMapper {
   String getEntityAsStringFrom(Response response)
   JsonMapper instance()     // <.>
   JsonMapper instance(final PrettyPrinting prettyPrinting)
diff --git a/antora/components/system/modules/generated/pages/system-overview.adoc b/antora/components/system/modules/generated/pages/system-overview.adoc
index 2a91820..5bf03b4 100644
--- a/antora/components/system/modules/generated/pages/system-overview.adoc
+++ b/antora/components/system/modules/generated/pages/system-overview.adoc
@@ -639,22 +639,22 @@ skinparam rectangle<<116>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<117>> {
+skinparam rectangle<<90>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<90>> {
+skinparam rectangle<<117>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<91>> {
+skinparam rectangle<<118>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<118>> {
+skinparam rectangle<<91>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
@@ -769,32 +769,32 @@ skinparam rectangle<<122>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<123>> {
+skinparam rectangle<<2>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<2>> {
+skinparam rectangle<<123>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<3>> {
+skinparam rectangle<<124>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<124>> {
+skinparam rectangle<<3>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<4>> {
+skinparam rectangle<<125>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<125>> {
+skinparam rectangle<<4>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
@@ -809,12 +809,12 @@ skinparam rectangle<<126>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<6>> {
+skinparam rectangle<<127>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<127>> {
+skinparam rectangle<<6>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
@@ -829,12 +829,12 @@ skinparam rectangle<<128>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<8>> {
+skinparam rectangle<<129>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<129>> {
+skinparam rectangle<<8>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
@@ -1379,12 +1379,12 @@ skinparam rectangle<<106>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<107>> {
+skinparam rectangle<<80>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<80>> {
+skinparam rectangle<<107>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295