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/23 08:08:56 UTC
[isis] branch master updated (abf318a -> 4a41c73)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from abf318a ISIS-2445: revert to org.gradle:gradle-tooling-api:jar:7.0.2
new 450fe48 ISIS-1720: adds Can<T>.unique()
new 4a41c73 ISIS-2445: restore org.gradle:gradle-tooling-api:jar:7.1
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/isis/commons/collections/Can.java | 36 ++++++++++++--------
.../apache/isis/commons/collections/Can_Empty.java | 39 ++++++++++++----------
.../isis/commons/collections/Can_Multiple.java | 38 ++++++++++++---------
.../isis/commons/collections/Can_Singleton.java | 39 ++++++++++++----------
extensions/security/secman/persistence-jdo/pom.xml | 5 ---
tooling/pom.xml | 2 +-
6 files changed, 90 insertions(+), 69 deletions(-)
[isis] 01/02: ISIS-1720: adds Can.unique()
Posted by ah...@apache.org.
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 450fe487b7e0ea0f9fe399740f713654b0f76726
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jun 23 09:46:29 2021 +0200
ISIS-1720: adds Can<T>.unique()
---
.../org/apache/isis/commons/collections/Can.java | 36 ++++++++++++--------
.../apache/isis/commons/collections/Can_Empty.java | 39 ++++++++++++----------
.../isis/commons/collections/Can_Multiple.java | 38 ++++++++++++---------
.../isis/commons/collections/Can_Singleton.java | 39 ++++++++++++----------
4 files changed, 89 insertions(+), 63 deletions(-)
diff --git a/commons/src/main/java/org/apache/isis/commons/collections/Can.java b/commons/src/main/java/org/apache/isis/commons/collections/Can.java
index 33741f5..5fba3ac 100644
--- a/commons/src/main/java/org/apache/isis/commons/collections/Can.java
+++ b/commons/src/main/java/org/apache/isis/commons/collections/Can.java
@@ -183,7 +183,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param element
* @return non-null
*/
- public static <T> Can<T> ofNullable(@Nullable T element) {
+ public static <T> Can<T> ofNullable(@Nullable final T element) {
if(element==null) {
return empty();
}
@@ -198,7 +198,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @return non-null
* @throws NullPointerException if {@code element} is {@code null}
*/
- public static <T> Can<T> ofSingleton(T element) {
+ public static <T> Can<T> ofSingleton(final T element) {
requires(element, "element");
return Can_Singleton.of(element);
}
@@ -211,7 +211,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @see Can#ofArray(Object[])
*/
@SafeVarargs
- public static <T> Can<T> of(T ... array) {
+ public static <T> Can<T> of(final T ... array) {
return ofArray(array);
}
@@ -223,7 +223,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param array
* @return non-null
*/
- public static <T> Can<T> ofArray(@Nullable T[] array) {
+ public static <T> Can<T> ofArray(@Nullable final T[] array) {
if(_NullSafe.size(array)==0) {
return empty();
@@ -261,7 +261,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param collection
* @return non-null
*/
- public static <T> Can<T> ofCollection(@Nullable Collection<T> collection) {
+ public static <T> Can<T> ofCollection(@Nullable final Collection<T> collection) {
if(_NullSafe.size(collection)==0) {
return empty();
@@ -298,7 +298,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param iterable
* @return non-null
*/
- public static <T> Can<T> ofIterable(@Nullable Iterable<T> iterable) {
+ public static <T> Can<T> ofIterable(@Nullable final Iterable<T> iterable) {
if(iterable==null) {
return empty();
@@ -320,7 +320,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param enumeration
* @return non-null
*/
- public static <T> Can<T> ofEnumeration(@Nullable Enumeration<T> enumeration) {
+ public static <T> Can<T> ofEnumeration(@Nullable final Enumeration<T> enumeration) {
if(enumeration==null) {
return empty();
@@ -343,7 +343,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param stream
* @return non-null
*/
- public static <T> Can<T> ofStream(@Nullable Stream<T> stream) {
+ public static <T> Can<T> ofStream(@Nullable final Stream<T> stream) {
if(stream==null) {
return empty();
@@ -374,7 +374,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param instance
* @return non-null
*/
- public static <T> Can<T> ofInstance(@Nullable Instance<T> instance) {
+ public static <T> Can<T> ofInstance(@Nullable final Instance<T> instance) {
if(instance==null || instance.isUnsatisfied()) {
return empty();
}
@@ -391,7 +391,15 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
// -- OPERATORS
/**
- * Returns a {@code Can} with all the elements from this {@code Can} but
+ * Returns a {@code Can} with all the elements from this {@code Can}, but
+ * duplicated elements removed, based on
+ * {@link Object#equals(Object)} object equality.
+ * @return non-null
+ */
+ public Can<T> unique();
+
+ /**
+ * Returns a {@code Can} with all the elements from this {@code Can}, but
* contained in reversed order.
* @return non-null
*/
@@ -415,7 +423,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param mapper - if absent throws if this {@code Can} is non-empty
* @return non-null
*/
- default <R> Can<R> map(Function<? super T, R> mapper) {
+ default <R> Can<R> map(final Function<? super T, R> mapper) {
if(isEmpty()) {
return empty();
@@ -443,7 +451,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param element - nullable
* @return non-null
*/
- public static <T> Can<T> concat(@Nullable Can<T> can, @Nullable T element) {
+ public static <T> Can<T> concat(@Nullable final Can<T> can, @Nullable final T element) {
if(can==null || can.isEmpty()) {
return ofNullable(element);
}
@@ -494,7 +502,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param element
* @return same or new instance
*/
- default Can<T> addUnique(@NonNull T element) {
+ default Can<T> addUnique(@NonNull final T element) {
if(contains(element)) {
return this;
}
@@ -723,7 +731,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* same runtime type is allocated for this purpose.
* @return a non-null array, containing the elements of this Can
*/
- default T[] toArray(T[] a) {
+ default T[] toArray(final T[] a) {
return toList().toArray(a);
}
diff --git a/commons/src/main/java/org/apache/isis/commons/collections/Can_Empty.java b/commons/src/main/java/org/apache/isis/commons/collections/Can_Empty.java
index 997a8f5..9468d4c 100644
--- a/commons/src/main/java/org/apache/isis/commons/collections/Can_Empty.java
+++ b/commons/src/main/java/org/apache/isis/commons/collections/Can_Empty.java
@@ -81,12 +81,12 @@ final class Can_Empty<T> implements Can<T> {
}
@Override
- public Optional<T> get(int elementIndex) {
+ public Optional<T> get(final int elementIndex) {
return Optional.empty();
}
@Override
- public boolean contains(T element) {
+ public boolean contains(final T element) {
return false;
}
@@ -101,6 +101,11 @@ final class Can_Empty<T> implements Can<T> {
}
@Override
+ public Can<T> unique() {
+ return this;
+ }
+
+ @Override
public Can<T> reverse() {
return this;
}
@@ -111,41 +116,41 @@ final class Can_Empty<T> implements Can<T> {
}
@Override
- public void forEach(Consumer<? super T> action) {
+ public void forEach(final Consumer<? super T> action) {
}
@Override
- public Can<T> filter(@Nullable Predicate<? super T> predicate) {
+ public Can<T> filter(@Nullable final Predicate<? super T> predicate) {
return this; // identity
}
@Override
- public <R> void zip(Iterable<R> zippedIn, BiConsumer<? super T, ? super R> action) {
+ public <R> void zip(final Iterable<R> zippedIn, final BiConsumer<? super T, ? super R> action) {
// no-op
}
@Override
- public <R, Z> Can<R> zipMap(Iterable<Z> zippedIn, BiFunction<? super T, ? super Z, R> mapper) {
+ public <R, Z> Can<R> zipMap(final Iterable<Z> zippedIn, final BiFunction<? super T, ? super Z, R> mapper) {
return Can.empty();
}
@Override
- public Can<T> add(@NonNull T element) {
+ public Can<T> add(@NonNull final T element) {
return Can.ofSingleton(element);
}
@Override
- public Can<T> addUnique(@NonNull T element) {
+ public Can<T> addUnique(@NonNull final T element) {
return Can.ofSingleton(element);
}
@Override
- public Can<T> addAll(@NonNull Can<T> other) {
+ public Can<T> addAll(@NonNull final Can<T> other) {
return other;
}
@Override
- public Can<T> add(int index, @NonNull T element) {
+ public Can<T> add(final int index, @NonNull final T element) {
if(index!=0) {
throw new IndexOutOfBoundsException(
"cannot add to empty can with index other than 0; got " + index);
@@ -154,17 +159,17 @@ final class Can_Empty<T> implements Can<T> {
}
@Override
- public Can<T> replace(int index, T element) {
+ public Can<T> replace(final int index, final T element) {
throw _Exceptions.unsupportedOperation("cannot replace an element in an empty Can");
}
@Override
- public Can<T> remove(int index) {
+ public Can<T> remove(final int index) {
throw new IndexOutOfBoundsException("cannot remove anything from an empty Can");
}
@Override
- public Can<T> remove(T element) {
+ public Can<T> remove(final T element) {
return this; // on an empty can this is a no-op
}
@@ -174,7 +179,7 @@ final class Can_Empty<T> implements Can<T> {
}
@Override
- public int indexOf(T element) {
+ public int indexOf(final T element) {
return -1;
}
@@ -220,17 +225,17 @@ final class Can_Empty<T> implements Can<T> {
}
@Override
- public Set<T> toSet(@NonNull Consumer<T> onDuplicated) {
+ public Set<T> toSet(@NonNull final Consumer<T> onDuplicated) {
return Collections.emptySet(); // serializable and immutable
}
@Override
- public <C extends Collection<T>> C toCollection(@NonNull Supplier<C> collectionFactory) {
+ public <C extends Collection<T>> C toCollection(@NonNull final Supplier<C> collectionFactory) {
return collectionFactory.get();
}
@Override
- public T[] toArray(@NonNull Class<T> elementType) {
+ public T[] toArray(@NonNull final Class<T> elementType) {
val array = _Casts.<T[]>uncheckedCast(Array.newInstance(elementType, 0));
return array;
}
diff --git a/commons/src/main/java/org/apache/isis/commons/collections/Can_Multiple.java b/commons/src/main/java/org/apache/isis/commons/collections/Can_Multiple.java
index 1149952..49637d2 100644
--- a/commons/src/main/java/org/apache/isis/commons/collections/Can_Multiple.java
+++ b/commons/src/main/java/org/apache/isis/commons/collections/Can_Multiple.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
@@ -88,7 +89,7 @@ final class Can_Multiple<T> implements Can<T> {
}
@Override
- public boolean contains(T element) {
+ public boolean contains(final T element) {
if(element==null) {
return false; // an optimization: Can's dont't contain null
}
@@ -96,7 +97,7 @@ final class Can_Multiple<T> implements Can<T> {
}
@Override
- public Optional<T> get(int elementIndex) {
+ public Optional<T> get(final int elementIndex) {
// we do an index out of bounds check ourselves, in order to prevent any stack-traces,
// that pollute the heap
val size = size();
@@ -112,6 +113,13 @@ final class Can_Multiple<T> implements Can<T> {
}
@Override
+ public Can<T> unique() {
+ val set = new LinkedHashSet<T>(); // preserve order
+ set.addAll(elements);
+ return Can.ofCollection(set);
+ }
+
+ @Override
public Iterator<T> iterator() {
return Collections.unmodifiableList(elements).iterator();
}
@@ -161,7 +169,7 @@ final class Can_Multiple<T> implements Can<T> {
@Override
- public <R> void zip(@NonNull Iterable<R> zippedIn, @NonNull BiConsumer<? super T, ? super R> action) {
+ public <R> void zip(@NonNull final Iterable<R> zippedIn, @NonNull final BiConsumer<? super T, ? super R> action) {
val zippedInIterator = zippedIn.iterator();
stream().forEach(t->{
action.accept(t, zippedInIterator.next());
@@ -169,19 +177,19 @@ final class Can_Multiple<T> implements Can<T> {
}
@Override
- public <R, Z> Can<R> zipMap(@NonNull Iterable<Z> zippedIn, @NonNull BiFunction<? super T, ? super Z, R> mapper) {
+ public <R, Z> Can<R> zipMap(@NonNull final Iterable<Z> zippedIn, @NonNull final BiFunction<? super T, ? super Z, R> mapper) {
val zippedInIterator = zippedIn.iterator();
return map(t->mapper.apply(t, zippedInIterator.next()));
}
@Override
- public Can<T> add(@NonNull T element) {
+ public Can<T> add(@NonNull final T element) {
val elementStream = Stream.concat(elements.stream(), Stream.of(element)); // append
return Can.ofStream(elementStream);
}
@Override
- public Can<T> addAll(@NonNull Can<T> other) {
+ public Can<T> addAll(@NonNull final Can<T> other) {
if(other.isEmpty()) {
return this;
}
@@ -192,28 +200,28 @@ final class Can_Multiple<T> implements Can<T> {
}
@Override
- public Can<T> add(int index, @NonNull T element) {
+ public Can<T> add(final int index, @NonNull final T element) {
val newElements = new ArrayList<T>(elements);
newElements.add(index, element);
return Can.ofCollection(newElements);
}
@Override
- public Can<T> replace(int index, T element) {
+ public Can<T> replace(final int index, final T element) {
val newElements = new ArrayList<T>(elements);
newElements.set(index, element);
return Can.ofCollection(newElements);
}
@Override
- public Can<T> remove(int index) {
+ public Can<T> remove(final int index) {
val newElements = new ArrayList<T>(elements);
newElements.remove(index);
return Can.ofCollection(newElements);
}
@Override
- public Can<T> remove(T element) {
+ public Can<T> remove(final T element) {
val newElements = new ArrayList<T>(elements);
newElements.remove(element);
return Can.ofCollection(newElements);
@@ -237,7 +245,7 @@ final class Can_Multiple<T> implements Can<T> {
}
@Override
- public int indexOf(@NonNull T element) {
+ public int indexOf(@NonNull final T element) {
return this.elements.indexOf(element);
}
@@ -250,7 +258,7 @@ final class Can_Multiple<T> implements Can<T> {
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if(obj instanceof Can) {
return ((Can<?>) obj).isEqualTo(this);
}
@@ -322,7 +330,7 @@ final class Can_Multiple<T> implements Can<T> {
}
@Override
- public Set<T> toSet(@NonNull Consumer<T> onDuplicated) {
+ public Set<T> toSet(@NonNull final Consumer<T> onDuplicated) {
val set = _Sets.<T>newHashSet(); // serializable
elements
.forEach(s->{
@@ -334,14 +342,14 @@ final class Can_Multiple<T> implements Can<T> {
}
@Override
- public <C extends Collection<T>> C toCollection(@NonNull Supplier<C> collectionFactory) {
+ public <C extends Collection<T>> C toCollection(@NonNull final Supplier<C> collectionFactory) {
val collection = collectionFactory.get();
collection.addAll(elements);
return collection;
}
@Override
- public T[] toArray(@NonNull Class<T> elementType) {
+ public T[] toArray(@NonNull final Class<T> elementType) {
val array = _Casts.<T[]>uncheckedCast(Array.newInstance(elementType, size()));
return elements.toArray(array);
}
diff --git a/commons/src/main/java/org/apache/isis/commons/collections/Can_Singleton.java b/commons/src/main/java/org/apache/isis/commons/collections/Can_Singleton.java
index 65e09b6..a2028db 100644
--- a/commons/src/main/java/org/apache/isis/commons/collections/Can_Singleton.java
+++ b/commons/src/main/java/org/apache/isis/commons/collections/Can_Singleton.java
@@ -82,7 +82,7 @@ final class Can_Singleton<T> implements Can<T> {
}
@Override
- public Optional<T> get(int elementIndex) {
+ public Optional<T> get(final int elementIndex) {
return getSingleton();
}
@@ -92,7 +92,7 @@ final class Can_Singleton<T> implements Can<T> {
}
@Override
- public boolean contains(T element) {
+ public boolean contains(final T element) {
return Objects.equals(this.element, element);
}
@@ -102,6 +102,11 @@ final class Can_Singleton<T> implements Can<T> {
}
@Override
+ public Can<T> unique() {
+ return this;
+ }
+
+ @Override
public Can<T> reverse() {
return this;
}
@@ -112,12 +117,12 @@ final class Can_Singleton<T> implements Can<T> {
}
@Override
- public void forEach(@NonNull Consumer<? super T> action) {
+ public void forEach(@NonNull final Consumer<? super T> action) {
action.accept(this.element);
}
@Override
- public Can<T> filter(@Nullable Predicate<? super T> predicate) {
+ public Can<T> filter(@Nullable final Predicate<? super T> predicate) {
if(predicate==null) {
return this; // identity
}
@@ -127,22 +132,22 @@ final class Can_Singleton<T> implements Can<T> {
}
@Override
- public <R> void zip(Iterable<R> zippedIn, BiConsumer<? super T, ? super R> action) {
+ public <R> void zip(final Iterable<R> zippedIn, final BiConsumer<? super T, ? super R> action) {
action.accept(element, zippedIn.iterator().next());
}
@Override
- public <R, Z> Can<R> zipMap(Iterable<Z> zippedIn, BiFunction<? super T, ? super Z, R> mapper) {
+ public <R, Z> Can<R> zipMap(final Iterable<Z> zippedIn, final BiFunction<? super T, ? super Z, R> mapper) {
return Can_Singleton.of(mapper.apply(element, zippedIn.iterator().next()));
}
@Override
- public Can<T> add(@NonNull T element) {
+ public Can<T> add(@NonNull final T element) {
return Can.ofStream(Stream.of(this.element, element)); // append
}
@Override
- public Can<T> addAll(@NonNull Can<T> other) {
+ public Can<T> addAll(@NonNull final Can<T> other) {
if(other.isEmpty()) {
return this;
}
@@ -156,7 +161,7 @@ final class Can_Singleton<T> implements Can<T> {
}
@Override
- public Can<T> add(int index, @NonNull T element) {
+ public Can<T> add(final int index, @NonNull final T element) {
if(index==0) {
return Can.ofStream(Stream.of(element, this.element)); // insert before
}
@@ -168,7 +173,7 @@ final class Can_Singleton<T> implements Can<T> {
}
@Override
- public Can<T> replace(int index, T element) {
+ public Can<T> replace(final int index, final T element) {
if(index==0) {
return Can.ofSingleton(element);
}
@@ -177,7 +182,7 @@ final class Can_Singleton<T> implements Can<T> {
}
@Override
- public Can<T> remove(int index) {
+ public Can<T> remove(final int index) {
if(index==0) {
return Can.empty();
}
@@ -186,7 +191,7 @@ final class Can_Singleton<T> implements Can<T> {
}
@Override
- public Can<T> remove(T element) {
+ public Can<T> remove(final T element) {
if(this.element.equals(element)) {
return Can.empty();
}
@@ -219,7 +224,7 @@ final class Can_Singleton<T> implements Can<T> {
}
@Override
- public int indexOf(@NonNull T element) {
+ public int indexOf(@NonNull final T element) {
return this.element.equals(element) ? 0 : -1;
}
@@ -229,7 +234,7 @@ final class Can_Singleton<T> implements Can<T> {
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if(obj instanceof Can) {
return ((Can<?>) obj).isEqualTo(this);
}
@@ -272,19 +277,19 @@ final class Can_Singleton<T> implements Can<T> {
}
@Override
- public Set<T> toSet(@NonNull Consumer<T> onDuplicated) {
+ public Set<T> toSet(@NonNull final Consumer<T> onDuplicated) {
return Collections.singleton(element); // serializable and immutable
}
@Override
- public <C extends Collection<T>> C toCollection(@NonNull Supplier<C> collectionFactory) {
+ public <C extends Collection<T>> C toCollection(@NonNull final Supplier<C> collectionFactory) {
val collection = collectionFactory.get();
collection.add(element);
return collection;
}
@Override
- public T[] toArray(@NonNull Class<T> elementType) {
+ public T[] toArray(@NonNull final Class<T> elementType) {
val array = _Casts.<T[]>uncheckedCast(Array.newInstance(elementType, 1));
array[0] = element;
return array;
[isis] 02/02: ISIS-2445: restore
org.gradle:gradle-tooling-api:jar:7.1
Posted by ah...@apache.org.
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 4a41c735a0c728e71476b579aba3b3544a0f2c0e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jun 23 10:08:44 2021 +0200
ISIS-2445: restore org.gradle:gradle-tooling-api:jar:7.1
also fix 'duplicate' maven warning originating from one of secman's
pom.xml
---
extensions/security/secman/persistence-jdo/pom.xml | 5 -----
tooling/pom.xml | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/extensions/security/secman/persistence-jdo/pom.xml b/extensions/security/secman/persistence-jdo/pom.xml
index ae9e463..accef62 100644
--- a/extensions/security/secman/persistence-jdo/pom.xml
+++ b/extensions/security/secman/persistence-jdo/pom.xml
@@ -41,11 +41,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-integration</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.isis.persistence</groupId>
<artifactId>isis-persistence-jdo-applib</artifactId>
<scope>provided</scope>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 0098c4a..d9da680 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -43,7 +43,7 @@
<git-plugin.propertiesDir>org/apache/isis/tooling</git-plugin.propertiesDir>
<asciidoctorj.version>2.5.1</asciidoctorj.version>
- <gradle-tooling.version>7.0.2</gradle-tooling.version>
+ <gradle-tooling.version>7.1</gradle-tooling.version>
<maven-model-builder.version>3.8.1</maven-model-builder.version>
<picocli.version>4.6.1</picocli.version>
<jsoup.version>1.13.1</jsoup.version>