You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/04/01 11:10:13 UTC
[isis] 02/05: ISIS-2484: regen projdoc.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 75eb0787ff238d68d5596d1e896e95b1eb7dc2f2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Apr 1 11:42:48 2021 +0100
ISIS-2484: regen projdoc.
---
.run/isis-tooling-cli (index).run.xml | 2 +-
.run/isis-tooling-cli (overview).run.xml | 2 +-
.run/isis-tooling-cli (projdoc).run.xml | 2 +-
.../commons/pages/index/collections/Can.adoc | 51 ++--------------------
.../changetracking/EntityChangeTrackerDefault.adoc | 4 +-
.../jdo/applib/services/JdoSupportService.adoc | 2 +
core/adoc/modules/_overview/pages/about.adoc | 12 ++---
7 files changed, 16 insertions(+), 59 deletions(-)
diff --git a/.run/isis-tooling-cli (index).run.xml b/.run/isis-tooling-cli (index).run.xml
index 29a5aeb..8707b26 100644
--- a/.run/isis-tooling-cli (index).run.xml
+++ b/.run/isis-tooling-cli (index).run.xml
@@ -4,7 +4,7 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="MAIN_CLASS_NAME" value="org.apache.isis.tooling.cli.Cli" />
<module name="isis-tooling-cli" />
- <option name="PROGRAM_PARAMETERS" value="-p . -o antora/components/refguide-index index " />
+ <option name="PROGRAM_PARAMETERS" value="-p . -x antora/components/refguide-index index " />
<extension name="net.ashald.envfile">
<option name="IS_ENABLED" value="false" />
<option name="IS_SUBST" value="false" />
diff --git a/.run/isis-tooling-cli (overview).run.xml b/.run/isis-tooling-cli (overview).run.xml
index 5f75cff..5fbe480 100644
--- a/.run/isis-tooling-cli (overview).run.xml
+++ b/.run/isis-tooling-cli (overview).run.xml
@@ -44,7 +44,7 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="MAIN_CLASS_NAME" value="org.apache.isis.tooling.cli.Cli" />
<module name="isis-tooling-cli" />
- <option name="PROGRAM_PARAMETERS" value="-p . -r core/adoc overview" />
+ <option name="PROGRAM_PARAMETERS" value="-p . -w core/adoc overview" />
<extension name="net.ashald.envfile">
<option name="IS_ENABLED" value="false" />
<option name="IS_SUBST" value="false" />
diff --git a/.run/isis-tooling-cli (projdoc).run.xml b/.run/isis-tooling-cli (projdoc).run.xml
index dae02a7..6791ec0 100644
--- a/.run/isis-tooling-cli (projdoc).run.xml
+++ b/.run/isis-tooling-cli (projdoc).run.xml
@@ -4,7 +4,7 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="MAIN_CLASS_NAME" value="org.apache.isis.tooling.cli.Cli" />
<module name="isis-tooling-cli" />
- <option name="PROGRAM_PARAMETERS" value="-p . -r core/adoc -o antora/components/refguide-index projdoc" />
+ <option name="PROGRAM_PARAMETERS" value="-p . -w core/adoc -x antora/components/refguide-index projdoc" />
<extension name="net.ashald.envfile">
<option name="IS_ENABLED" value="false" />
<option name="IS_SUBST" value="false" />
diff --git a/antora/components/refguide-index/modules/commons/pages/index/collections/Can.adoc b/antora/components/refguide-index/modules/commons/pages/index/collections/Can.adoc
index 1dec8f8..3b0a393 100644
--- a/antora/components/refguide-index/modules/commons/pages/index/collections/Can.adoc
+++ b/antora/components/refguide-index/modules/commons/pages/index/collections/Can.adoc
@@ -32,11 +32,10 @@ interface Can<T> {
Can<T> empty() // <.>
Can<T> ofNullable(T element) // <.>
Can<T> ofSingleton(T element) // <.>
- Can<T> of(T... array) // <.>
- Can<T> ofArray(T[] array) // <.>
+ Can<T> of(T... array)
+ Can<T> ofArray(T[] array)
Can<T> ofCollection(Collection<T> collection) // <.>
- Can<T> ofIterable(Iterable<T> iterable) // <.>
- Can<T> ofEnumeration(Enumeration<T> enumeration) // <.>
+ Can<T> ofIterable(Iterable<T> iterable)
Can<T> ofStream(Stream<T> stream) // <.>
Can<T> ofInstance(Instance<T> instance) // <.>
Can<T> reverse() // <.>
@@ -122,31 +121,11 @@ Returns either a _Can_ with the given _element_ or an empty _Can_ if the _elemen
--
Returns either a _Can_ with the given _element_ or throws if the _element_ is _null_ .
--
-<.> xref:#of__T[of(T)]
-+
---
-Var-arg version of _Can#ofArray(Object[])_ .
---
-<.> xref:#ofArray__T[][ofArray(T[])]
-+
---
-Returns either a _Can_ with all the elements from given _array_ or an empty _Can_ if the _array_ is _null_ . Any elements equal to _null_ are ignored and will not be contained in the resulting _Can_ .
---
<.> xref:#ofCollection__Collection[ofCollection(Collection)]
+
--
Returns either a _Can_ with all the elements from given _collection_ or an empty _Can_ if the _collection_ is _null_ . Any elements equal to _null_ are ignored and will not be contained in the resulting _Can_ .
--
-<.> xref:#ofIterable__Iterable[ofIterable(Iterable)]
-+
---
-Returns either a _Can_ with all the elements from given _iterable_ or an empty _Can_ if the _iterable_ is _null_ . Any elements equal to _null_ are ignored and will not be contained in the resulting _Can_ .
---
-<.> xref:#ofEnumeration__Enumeration[ofEnumeration(Enumeration)]
-+
---
-Returns either a _Can_ with all the elements from given _enumeration_ or an empty _Can_ if the _enumeration_ is _null_ . Any elements equal to _null_ are ignored and will not be contained in the resulting _Can_ .
---
<.> xref:#ofStream__Stream[ofStream(Stream)]
+
--
@@ -291,40 +270,16 @@ Returns either a _Can_ with the given _element_ or an empty _Can_ if the _elemen
Returns either a _Can_ with the given _element_ or throws if the _element_ is _null_ .
-[#of__T]
-=== of(T)
-
-Var-arg version of _Can#ofArray(Object[])_ .
-
-[#ofArray__T[]]
-=== ofArray(T[])
-
-Returns either a _Can_ with all the elements from given _array_ or an empty _Can_ if the _array_ is _null_ . Any elements equal to _null_ are ignored and will not be contained in the resulting _Can_ .
-
[#ofCollection__Collection]
=== ofCollection(Collection)
Returns either a _Can_ with all the elements from given _collection_ or an empty _Can_ if the _collection_ is _null_ . Any elements equal to _null_ are ignored and will not be contained in the resulting _Can_ .
-[#ofIterable__Iterable]
-=== ofIterable(Iterable)
-
-Returns either a _Can_ with all the elements from given _iterable_ or an empty _Can_ if the _iterable_ is _null_ . Any elements equal to _null_ are ignored and will not be contained in the resulting _Can_ .
-
-[#ofEnumeration__Enumeration]
-=== ofEnumeration(Enumeration)
-
-Returns either a _Can_ with all the elements from given _enumeration_ or an empty _Can_ if the _enumeration_ is _null_ . Any elements equal to _null_ are ignored and will not be contained in the resulting _Can_ .
-
-As side-effect, consumes given _enumeration_ .
-
[#ofStream__Stream]
=== ofStream(Stream)
Returns either a _Can_ with all the elements from given _stream_ or an empty _Can_ if the _stream_ is _null_ . Any elements equal to _null_ are ignored and will not be contained in the resulting _Can_ .
-As side-effect, consumes given _stream_ .
-
[#ofInstance__Instance]
=== ofInstance(Instance)
diff --git a/antora/components/refguide-index/modules/core/pages/index/transaction/changetracking/EntityChangeTrackerDefault.adoc b/antora/components/refguide-index/modules/core/pages/index/transaction/changetracking/EntityChangeTrackerDefault.adoc
index 03c55e0..1a91092 100644
--- a/antora/components/refguide-index/modules/core/pages/index/transaction/changetracking/EntityChangeTrackerDefault.adoc
+++ b/antora/components/refguide-index/modules/core/pages/index/transaction/changetracking/EntityChangeTrackerDefault.adoc
@@ -8,7 +8,7 @@
----
class EntityChangeTrackerDefault {
void onPreCommit(TransactionBeforeCompletionEvent event) // <.>
- Optional<EntityChanges> getEntityChanges(final java.sql.Timestamp timestamp, final String userName)
+ EntityChanges getEntityChanges(final java.sql.Timestamp timestamp, final String userName)
Interaction currentInteraction()
String asString(Object object)
int numberEntitiesLoaded()
@@ -20,7 +20,7 @@ class EntityChangeTrackerDefault {
void recognizeLoaded(ManagedObject entity)
void recognizePersisting(ManagedObject entity)
void recognizeUpdating(ManagedObject entity)
- Can<EntityPropertyChange> getPropertyChanges(final java.sql.Timestamp timestamp, final String userName, final TransactionId txId)
+ Stream<EntityPropertyChange> streamPropertyChanges(final java.sql.Timestamp timestamp, final String userName, final TransactionId txId)
}
----
diff --git a/antora/components/refguide-index/modules/persistence/pages/index/jdo/applib/services/JdoSupportService.adoc b/antora/components/refguide-index/modules/persistence/pages/index/jdo/applib/services/JdoSupportService.adoc
index 5ccc033..12e01e4 100644
--- a/antora/components/refguide-index/modules/persistence/pages/index/jdo/applib/services/JdoSupportService.adoc
+++ b/antora/components/refguide-index/modules/persistence/pages/index/jdo/applib/services/JdoSupportService.adoc
@@ -136,3 +136,5 @@ For RDBMS any single-valued member will be fetched in the original SQL query, bu
=== disableMultivaluedFetch(Query)
Fetch Optimization
+
+include::hooks/JdoSupportService_010-examples-and-usage.adoc[]
diff --git a/core/adoc/modules/_overview/pages/about.adoc b/core/adoc/modules/_overview/pages/about.adoc
index 0f0eaf1..65ac959 100644
--- a/core/adoc/modules/_overview/pages/about.adoc
+++ b/core/adoc/modules/_overview/pages/about.adoc
@@ -3764,22 +3764,22 @@ skinparam rectangle<<11>> {
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<23>> {
+skinparam rectangle<<12>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<12>> {
+skinparam rectangle<<23>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<13>> {
+skinparam rectangle<<24>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<24>> {
+skinparam rectangle<<13>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295
@@ -3859,12 +3859,12 @@ skinparam rectangle<<20>> {
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<21>> {
+skinparam rectangle<<10>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<10>> {
+skinparam rectangle<<21>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295