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/08/18 03:53:10 UTC
[isis] branch master updated: ISIS-2841: batch format order 'final
@Nullable'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 2ef51be ISIS-2841: batch format order 'final @Nullable'
2ef51be is described below
commit 2ef51be03bb8e4670eb19d88fd067084d96c6de4
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Aug 18 05:53:04 2021 +0200
ISIS-2841: batch format order 'final @Nullable'
---
.../apache/isis/applib/events/EventObjectBase.java | 2 +-
.../processor/spi/CommandDtoProcessorService.java | 2 +-
.../applib/services/exceprecog/Recognition.java | 4 +-
.../isis/applib/util/ObjectContract_Parser.java | 2 +-
.../org/apache/isis/commons/collections/Can.java | 16 +++---
.../isis/commons/collections/Can_Singleton.java | 2 +-
.../apache/isis/commons/internal/base/_Bytes.java | 16 +++---
.../apache/isis/commons/internal/base/_Casts.java | 10 ++--
.../apache/isis/commons/internal/base/_Either.java | 4 +-
.../isis/commons/internal/base/_Reduction.java | 6 +-
.../isis/commons/internal/base/_Strings.java | 66 +++++++++++-----------
.../commons/internal/base/_Strings_FastSplit.java | 2 +-
.../internal/base/_Strings_SplitIterator.java | 2 +-
.../apache/isis/commons/internal/base/_With.java | 26 ++++-----
.../commons/internal/binding/InternalUtil.java | 8 +--
.../isis/commons/internal/collections/_Arrays.java | 26 ++++-----
.../commons/internal/collections/_Collections.java | 6 +-
.../isis/commons/internal/collections/_Lists.java | 22 ++++----
.../isis/commons/internal/collections/_Maps.java | 4 +-
.../commons/internal/collections/_Multimaps.java | 4 +-
.../isis/commons/internal/collections/_Sets.java | 42 +++++++-------
.../commons/internal/compare/_Comparators.java | 4 +-
.../compare/_Comparators_SequenceCompare.java | 4 +-
.../commons/internal/exceptions/_Exceptions.java | 18 +++---
.../commons/internal/ioc/_IocContainer_Spring.java | 2 +-
.../internal/memento/_Mementos_MementoDefault.java | 2 +-
.../isis/commons/internal/primitives/_Ints.java | 2 +-
.../isis/commons/internal/primitives/_Longs.java | 2 +-
.../reflection/_Annotations_AttributeMethods.java | 2 +-
.../isis/commons/internal/reflection/_Reflect.java | 14 ++---
.../commons/internal/resources/_Resources.java | 2 +-
.../config/viewer/wicket/WebAppContextPath.java | 10 ++--
.../core/metamodel/commons/StringExtensions.java | 2 +-
.../isis/core/metamodel/facets/ActionSupport.java | 2 +-
.../core/metamodel/facets/ParameterSupport.java | 2 +-
.../metamodel/facets/all/i8n/noun/NounForms.java | 4 +-
.../interactions/managed/ManagedFeature.java | 6 +-
.../interactions/managed/ManagedProperty.java | 2 +-
.../managed/ParameterNegotiationModel.java | 2 +-
.../classsubstitutor/ClassSubstitutorRegistry.java | 2 +-
.../isis/core/metamodel/spec/ManagedObject.java | 4 +-
.../isis/core/metamodel/spec/ManagedObjects.java | 60 ++++++++++----------
.../core/metamodel/spec/ObjectSpecification.java | 2 +-
.../spec/feature/ObjectActionParameter.java | 4 +-
...lableAnnotationOnParameterFacetFactoryTest.java | 4 +-
.../repository/RepositoryServiceDefault.java | 2 +-
.../secondary/fetch/CommandFetcher.java | 2 +-
.../ui/components/collections/TableViewFx.java | 2 +-
.../vaadin/ui/auth/AuthSessionStoreUtil.java | 4 +-
.../jdo/applib/services/JdoSupportService.java | 4 +-
.../entities/DnEntityStateProvider.java | 4 +-
.../datanucleus/metamodel/JdoMetamodelUtil.java | 4 +-
.../util/interaction/InteractionTestAbstract.java | 2 +-
.../modulerules/ArchitectureModuleRules.java | 2 +-
.../demomodule/dom/FakeDataDemoObjectWithAll.java | 34 +++++------
.../FixtureScriptsSpecification.java | 2 +-
.../model/components/UiComponentFactory.java | 10 ++--
.../resources/InteractionFailureHandler.java | 2 +-
.../wicket/ui/components/layout/bs3/col/Col.java | 2 +-
.../isis/viewer/wicket/ui/util/Tooltips.java | 2 +-
60 files changed, 254 insertions(+), 254 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/EventObjectBase.java b/api/applib/src/main/java/org/apache/isis/applib/events/EventObjectBase.java
index dcd6770..95fa36a 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/EventObjectBase.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/EventObjectBase.java
@@ -39,7 +39,7 @@ public abstract class EventObjectBase<T> {
*
* @param source The object on which the Event initially occurred.
*/
- protected EventObjectBase(@Nullable final T source) {
+ protected EventObjectBase(final @Nullable T source) {
this.source = source;
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/processor/spi/CommandDtoProcessorService.java b/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/processor/spi/CommandDtoProcessorService.java
index e7a2e83..5ed5152 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/processor/spi/CommandDtoProcessorService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/commanddto/processor/spi/CommandDtoProcessorService.java
@@ -57,7 +57,7 @@ public interface CommandDtoProcessorService {
* @param commandDto - is either <code>null</code>, or is passed from a
* previous implementation for further refinement.
*/
- CommandDto process(final Object domainObject, @Nullable final CommandDto commandDto);
+ CommandDto process(final Object domainObject, final @Nullable CommandDto commandDto);
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/Recognition.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/Recognition.java
index c1198dd..16adcc5 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/Recognition.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/Recognition.java
@@ -46,8 +46,8 @@ public class Recognition {
* @return optionally a recognition of the specified type, based on a whether given reason is non-null
*/
public static Optional<Recognition> of(
- @Nullable final Category category,
- @Nullable final String reason) {
+ final @Nullable Category category,
+ final @Nullable String reason) {
if (reason == null) {
return Optional.empty();
diff --git a/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java b/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
index 3fbc97a..368960f 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
@@ -51,7 +51,7 @@ class ObjectContract_Parser<T> {
* @param propertyNames
*/
@SuppressWarnings("unchecked")
- public static <T> ObjectContract<T> parse(Class<T> cls, @Nullable final String propertyNames) {
+ public static <T> ObjectContract<T> parse(Class<T> cls, final @Nullable String propertyNames) {
Objects.requireNonNull(cls);
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 3bb493d..3ad6513 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
@@ -181,7 +181,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param element
* @return non-null
*/
- public static <T> Can<T> ofNullable(@Nullable final T element) {
+ public static <T> Can<T> ofNullable(final @Nullable T element) {
if(element==null) {
return empty();
}
@@ -220,7 +220,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param array
* @return non-null
*/
- public static <T> Can<T> ofArray(@Nullable final T[] array) {
+ public static <T> Can<T> ofArray(final @Nullable T[] array) {
if(_NullSafe.size(array)==0) {
return empty();
@@ -258,7 +258,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param collection
* @return non-null
*/
- public static <T> Can<T> ofCollection(@Nullable final Collection<T> collection) {
+ public static <T> Can<T> ofCollection(final @Nullable Collection<T> collection) {
if(_NullSafe.size(collection)==0) {
return empty();
@@ -295,7 +295,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param iterable
* @return non-null
*/
- public static <T> Can<T> ofIterable(@Nullable final Iterable<T> iterable) {
+ public static <T> Can<T> ofIterable(final @Nullable Iterable<T> iterable) {
if(iterable==null) {
return empty();
@@ -317,7 +317,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param enumeration
* @return non-null
*/
- public static <T> Can<T> ofEnumeration(@Nullable final Enumeration<T> enumeration) {
+ public static <T> Can<T> ofEnumeration(final @Nullable Enumeration<T> enumeration) {
if(enumeration==null) {
return empty();
@@ -340,7 +340,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param stream
* @return non-null
*/
- public static <T> Can<T> ofStream(@Nullable final Stream<T> stream) {
+ public static <T> Can<T> ofStream(final @Nullable Stream<T> stream) {
if(stream==null) {
return empty();
@@ -371,7 +371,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param instance
* @return non-null
*/
- public static <T> Can<T> ofInstance(@Nullable final Instance<T> instance) {
+ public static <T> Can<T> ofInstance(final @Nullable Instance<T> instance) {
if(instance==null || instance.isUnsatisfied()) {
return empty();
}
@@ -446,7 +446,7 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
* @param element - nullable
* @return non-null
*/
- public static <T> Can<T> concat(@Nullable final Can<T> can, @Nullable final T element) {
+ public static <T> Can<T> concat(final @Nullable Can<T> can, final @Nullable T element) {
if(can==null || can.isEmpty()) {
return ofNullable(element);
}
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 c088251..cc6e2b1 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
@@ -122,7 +122,7 @@ final class Can_Singleton<T> implements Can<T> {
}
@Override
- public Can<T> filter(@Nullable final Predicate<? super T> predicate) {
+ public Can<T> filter(final @Nullable Predicate<? super T> predicate) {
if(predicate==null) {
return this; // identity
}
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes.java b/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes.java
index 5830e8d..8cc68b7 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes.java
@@ -55,7 +55,7 @@ public final class _Bytes {
* @return null if {@code input} is null
* @throws IOException
*/
- public static byte[] of(@Nullable final InputStream input) throws IOException {
+ public static byte[] of(final @Nullable InputStream input) throws IOException {
if(input==null) {
return null;
}
@@ -80,7 +80,7 @@ public final class _Bytes {
* @return null if {@code input} is null
* @throws IOException
*/
- public static byte[] ofKeepOpen(@Nullable final InputStream input) throws IOException {
+ public static byte[] ofKeepOpen(final @Nullable InputStream input) throws IOException {
if(input==null) {
return null;
}
@@ -105,7 +105,7 @@ public final class _Bytes {
* @param bytes to be prepended to {@code target}
* @return bytes + target, or null if both {@code target} and {@code bytes} are null
*/
- public static final byte[] prepend(@Nullable final byte[] target, @Nullable final byte ... bytes) {
+ public static final byte[] prepend(final @Nullable byte[] target, final @Nullable byte ... bytes) {
if(target==null) {
if(bytes==null) {
return null;
@@ -127,7 +127,7 @@ public final class _Bytes {
* @param bytes to be appended to {@code target}
* @return target + bytes, or null if both {@code target} and {@code bytes} are null
*/
- public static final byte[] append(@Nullable final byte[] target, @Nullable final byte ... bytes) {
+ public static final byte[] append(final @Nullable byte[] target, final @Nullable byte ... bytes) {
if(target==null) {
if(bytes==null) {
return null;
@@ -152,7 +152,7 @@ public final class _Bytes {
* @param input
* @return null if {@code input} is null
*/
- public static final byte[] encodeToBase64(final @NonNull Base64.Encoder encoder, @Nullable final byte[] input) {
+ public static final byte[] encodeToBase64(final @NonNull Base64.Encoder encoder, final @Nullable byte[] input) {
return input!=null ? encoder.encode(input) : null;
}
@@ -163,7 +163,7 @@ public final class _Bytes {
* @param base64
* @return null if {@code base64} is null
*/
- public static final byte[] decodeBase64(final @NonNull Base64.Decoder decoder, @Nullable final byte[] base64) {
+ public static final byte[] decodeBase64(final @NonNull Base64.Decoder decoder, final @Nullable byte[] base64) {
return base64!=null ? decoder.decode(base64) : null;
}
@@ -176,7 +176,7 @@ public final class _Bytes {
* @param input
* @return null if {@code input} is null
*/
- public static final byte[] compress(@Nullable final byte[] input) {
+ public static final byte[] compress(final @Nullable byte[] input) {
if(input==null) {
return null;
}
@@ -197,7 +197,7 @@ public final class _Bytes {
* @param compressed
* @return null if {@code compressed} is null
*/
- public static final byte[] decompress(@Nullable final byte[] compressed) {
+ public static final byte[] decompress(final @Nullable byte[] compressed) {
if(compressed==null) {
return null;
}
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/base/_Casts.java b/commons/src/main/java/org/apache/isis/commons/internal/base/_Casts.java
index 56c129c..d65d67e 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/base/_Casts.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/base/_Casts.java
@@ -43,7 +43,7 @@ public final class _Casts {
private _Casts(){}
@SuppressWarnings("unchecked")
- public static <T> T uncheckedCast(@Nullable final Object obj) {
+ public static <T> T uncheckedCast(final @Nullable Object obj) {
return (T) obj;
}
@@ -56,7 +56,7 @@ public final class _Casts {
* @param cls
* @return non-null
*/
- public static <T> Optional<T> castTo(@Nullable final Object value, final @NonNull Class<T> cls) {
+ public static <T> Optional<T> castTo(final @Nullable Object value, final @NonNull Class<T> cls) {
if(value==null) {
return Optional.empty();
}
@@ -74,7 +74,7 @@ public final class _Casts {
* @param cls
* @return casted value, or null
*/
- public static @Nullable <T> T castToOrElseNull(@Nullable final Object value, final @NonNull Class<T> cls) {
+ public static @Nullable <T> T castToOrElseNull(final @Nullable Object value, final @NonNull Class<T> cls) {
if(value==null) {
return null;
}
@@ -96,8 +96,8 @@ public final class _Casts {
* @param onNonCast
*/
public static <T, R, U, V> R castThenApply(
- @Nullable final U left,
- @Nullable final V right,
+ final @Nullable U left,
+ final @Nullable V right,
final @NonNull Class<T> cls,
final BiFunction<T, T, R> onBothCast,
final BiFunction<T, V, R> onLeftCast,
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java b/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java
index a9a2a7a..cdbebcc 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java
@@ -62,11 +62,11 @@ public final class _Either<L, R> {
return of(null, right, false);
}
- public static <L, R> _Either<L, R> leftNullable(@Nullable final L left) {
+ public static <L, R> _Either<L, R> leftNullable(final @Nullable L left) {
return of(left, null, true);
}
- public static <L, R> _Either<L, R> rightNullable(@Nullable final R right) {
+ public static <L, R> _Either<L, R> rightNullable(final @Nullable R right) {
return of(null, right, false);
}
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/base/_Reduction.java b/commons/src/main/java/org/apache/isis/commons/internal/base/_Reduction.java
index a229ad2..389fe7a 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/base/_Reduction.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/base/_Reduction.java
@@ -55,7 +55,7 @@ public final class _Reduction<T> implements Consumer<T> {
* @param identity
* @param accumulator
*/
- public static <T> _Reduction<T> of(@Nullable final T identity, final BinaryOperator<T> accumulator){
+ public static <T> _Reduction<T> of(final @Nullable T identity, final BinaryOperator<T> accumulator){
return new _Reduction<T>(identity, accumulator, true);
}
@@ -67,14 +67,14 @@ public final class _Reduction<T> implements Consumer<T> {
return new _Reduction<T>(null, accumulator, false);
}
- private _Reduction(@Nullable final T identity, final @NonNull BinaryOperator<T> accumulator, final boolean initialized) {
+ private _Reduction(final @Nullable T identity, final @NonNull BinaryOperator<T> accumulator, final boolean initialized) {
this.initialized = initialized;
this.result = identity;
this.accumulator = accumulator;
}
@Override
- public void accept(@Nullable final T next) {
+ public void accept(final @Nullable T next) {
if(!initialized) {
result = next;
initialized = true;
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java b/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java
index bb0e418..8ed08a8 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java
@@ -96,7 +96,7 @@ public final class _Strings {
* @return a non-empty Optional, if (and only if) the {@code keyValueLiteral}
* does contain at least one {@code separator}
*/
- public static Optional<KeyValuePair> parseKeyValuePair(@Nullable final String keyValueLiteral, final char separator) {
+ public static Optional<KeyValuePair> parseKeyValuePair(final @Nullable String keyValueLiteral, final char separator) {
return _Strings_KeyValuePair.parse(keyValueLiteral, separator);
}
@@ -170,7 +170,7 @@ public final class _Strings {
* @param x
* @return true only if string is of zero length or null.
*/
- public static boolean isEmpty(@Nullable final CharSequence x){
+ public static boolean isEmpty(final @Nullable CharSequence x){
return x==null || x.length()==0;
}
/**
@@ -178,7 +178,7 @@ public final class _Strings {
* @param x
* @return true only if string is of zero length or null.
*/
- public static boolean isNullOrEmpty(@Nullable final CharSequence x){
+ public static boolean isNullOrEmpty(final @Nullable CharSequence x){
return x==null || x.length()==0;
}
@@ -188,7 +188,7 @@ public final class _Strings {
* @param x
* @return inverse of isEmpty(CharSequence).
*/
- public static boolean isNotEmpty(@Nullable final CharSequence x){
+ public static boolean isNotEmpty(final @Nullable CharSequence x){
return x!=null && x.length()!=0;
}
@@ -198,7 +198,7 @@ public final class _Strings {
* @param x - input string
* @return optionally the input string based on whether the input is not empty
*/
- public static Optional<String> nonEmpty(@Nullable final CharSequence x) {
+ public static Optional<String> nonEmpty(final @Nullable CharSequence x) {
return isEmpty(x) ? Optional.empty() : Optional.of(x.toString());
}
@@ -208,7 +208,7 @@ public final class _Strings {
* @param input
* @return null if the {@code input} is null or empty, the {@code input} otherwise
*/
- public static @Nullable String emptyToNull(@Nullable final String input) {
+ public static @Nullable String emptyToNull(final @Nullable String input) {
if(isEmpty(input)) {
return null;
}
@@ -219,7 +219,7 @@ public final class _Strings {
* @param input
* @return the empty string if the {@code input} is null, the {@code input} otherwise
*/
- public static String nullToEmpty(@Nullable final String input) {
+ public static String nullToEmpty(final @Nullable String input) {
if(input==null) {
return "";
}
@@ -232,7 +232,7 @@ public final class _Strings {
* @param input
* @return null if the {@code input} is null
*/
- public static String trim(@Nullable final String input) {
+ public static String trim(final @Nullable String input) {
return mapIfPresentElse(input, String::trim, null);
}
@@ -241,7 +241,7 @@ public final class _Strings {
* @param input
* @return null if {@code input} is null
*/
- public static String lower(@Nullable final String input) {
+ public static String lower(final @Nullable String input) {
return mapIfPresentElse(input, String::toLowerCase, null);
}
@@ -250,7 +250,7 @@ public final class _Strings {
* @param input
* @return null if {@code input} is null
*/
- public static String upper(@Nullable final String input) {
+ public static String upper(final @Nullable String input) {
return mapIfPresentElse(input, String::toUpperCase, null);
}
@@ -259,7 +259,7 @@ public final class _Strings {
* @param input
* @return null if {@code input} is null
*/
- public static String capitalize(@Nullable final String input) {
+ public static String capitalize(final @Nullable String input) {
if(input==null) {
return null;
}
@@ -277,7 +277,7 @@ public final class _Strings {
* @param input
* @return null if {@code input} is null
*/
- public static String decapitalize(@Nullable final String input) {
+ public static String decapitalize(final @Nullable String input) {
if(input==null) {
return null;
}
@@ -304,7 +304,7 @@ public final class _Strings {
* @param prefix
* @return null if {@code input} is null
*/
- public static String prefix(@Nullable final String input, final @NonNull String prefix) {
+ public static String prefix(final @Nullable String input, final @NonNull String prefix) {
if(input==null) {
return null;
}
@@ -320,7 +320,7 @@ public final class _Strings {
* @param suffix
* @return null if {@code input} is null
*/
- public static String suffix(@Nullable final String input, final @NonNull String suffix) {
+ public static String suffix(final @Nullable String input, final @NonNull String suffix) {
if(input==null) {
return null;
}
@@ -344,7 +344,7 @@ public final class _Strings {
* @return non-null
*/
public static String combineWithDelimiter(
- @Nullable final String left, @Nullable final String right, final String delimiter) {
+ final @Nullable String left, final @Nullable String right, final String delimiter) {
requiresNotEmpty(delimiter, "pathDelimiter");
@@ -373,7 +373,7 @@ public final class _Strings {
* @param minLength
* @param c
*/
- public static String padStart(@Nullable final String str, final int minLength, final char c) {
+ public static String padStart(final @Nullable String str, final int minLength, final char c) {
if(minLength<=0) {
return str;
}
@@ -394,7 +394,7 @@ public final class _Strings {
* @param minLength
* @param c
*/
- public static String padEnd(@Nullable final String str, final int minLength, final char c) {
+ public static String padEnd(final @Nullable String str, final int minLength, final char c) {
if(minLength<=0) {
return str;
}
@@ -425,7 +425,7 @@ public final class _Strings {
* @return empty stream if {@code input} is null
* @throws IllegalArgumentException if {@code separator} is empty
*/
- public static Stream<String> splitThenStream(@Nullable final String input, final String separator) {
+ public static Stream<String> splitThenStream(final @Nullable String input, final String separator) {
if(isEmpty(separator)) {
throw new IllegalArgumentException("a non empty separator is required");
}
@@ -446,7 +446,7 @@ public final class _Strings {
* @param input
* @param delimiterPattern
*/
- public static Stream<String> splitThenStream(@Nullable final CharSequence input, final @NonNull Pattern delimiterPattern) {
+ public static Stream<String> splitThenStream(final @Nullable CharSequence input, final @NonNull Pattern delimiterPattern) {
if(isEmpty(input)) {
return Stream.of();
}
@@ -462,7 +462,7 @@ public final class _Strings {
* @param onNonEmptySplit
*/
public static <T> Optional<T> splitThenApplyRequireNonEmpty(
- @Nullable final String input,
+ final @Nullable String input,
final String separator,
final BiFunction<String, String, T> onNonEmptySplit) {
@@ -485,7 +485,7 @@ public final class _Strings {
}
public static void splitThenAccept(
- @Nullable final String input,
+ final @Nullable String input,
final String separator,
final BiConsumer<String, String> onNonEmptySplit,
final Consumer<String> onNonEmptyLhs,
@@ -495,7 +495,7 @@ public final class _Strings {
}
public static void splitThenAcceptEmptyAsNull(
- @Nullable final String input,
+ final @Nullable String input,
final String separator,
final BiConsumer<String, String> onSplit) {
@@ -505,7 +505,7 @@ public final class _Strings {
}
- public static Stream<String> grep(@Nullable final String input, @Nullable Predicate<String> matcher){
+ public static Stream<String> grep(final @Nullable String input, @Nullable Predicate<String> matcher){
matcher = matcher!=null ? matcher : _Predicates.alwaysTrue();
return splitThenStream(input, "\n")
.filter(_Strings::isNotEmpty)
@@ -513,7 +513,7 @@ public final class _Strings {
.map(s->s.replace("\r", ""));
}
- public static Stream<String> grep(@Nullable final String input, @Nullable final String contains){
+ public static Stream<String> grep(final @Nullable String input, final @Nullable String contains){
final Predicate<String> matcher = contains!=null ? line->line.contains(contains) : _Predicates.alwaysTrue();
return grep(input, matcher);
}
@@ -528,7 +528,7 @@ public final class _Strings {
* @param replacement
* @return null if {@code input} is null
*/
- public static String condenseWhitespaces(@Nullable final String input, final @NonNull String replacement) {
+ public static String condenseWhitespaces(final @Nullable String input, final @NonNull String replacement) {
return mapIfPresentElse(input, __->input.replaceAll("\\s+", replacement), null);
}
@@ -540,7 +540,7 @@ public final class _Strings {
* @return (non-null), ellipsified version of {@code input}, if {@code input} exceeds length {@code maxLength}
*/
public static String ellipsifyAtStart(
- @Nullable final CharSequence input,
+ final @Nullable CharSequence input,
final int maxLength,
final @NonNull CharSequence ellipsis) {
@@ -564,7 +564,7 @@ public final class _Strings {
* @return (non-null), ellipsified version of {@code input}, if {@code input} exceeds length {@code maxLength}
*/
public static String ellipsifyAtEnd(
- @Nullable final CharSequence input,
+ final @Nullable CharSequence input,
final int maxLength,
final @NonNull CharSequence ellipsis) {
@@ -580,7 +580,7 @@ public final class _Strings {
// -- READ FROM INPUT STREAM
- public static String read(@Nullable final InputStream input, final @NonNull Charset charset) {
+ public static String read(final @Nullable InputStream input, final @NonNull Charset charset) {
if(input==null) {
return "";
}
@@ -609,7 +609,7 @@ public final class _Strings {
* @param charset
* @return null if {@code str} is null
*/
- public static final byte[] toBytes(@Nullable final String str, final @NonNull Charset charset) {
+ public static final byte[] toBytes(final @Nullable String str, final @NonNull Charset charset) {
return mapIfPresentElse(str, __->str.getBytes(charset), null);
}
@@ -619,7 +619,7 @@ public final class _Strings {
* @param charset
* @return null if {@code bytes} is null
*/
- public static final String ofBytes(@Nullable final byte[] bytes, final @NonNull Charset charset) {
+ public static final String ofBytes(final @Nullable byte[] bytes, final @NonNull Charset charset) {
return mapIfPresentElse(bytes, __->new String(bytes, charset), null);
}
@@ -632,7 +632,7 @@ public final class _Strings {
* @param charset
* @return null if {@code input} is null
*/
- public static final String convert(@Nullable final String input, final @NonNull BytesOperator converter, final @NonNull Charset charset) {
+ public static final String convert(final @Nullable String input, final @NonNull BytesOperator converter, final @NonNull Charset charset) {
return mapIfPresentElse(input, __->ofBytes(converter.apply(toBytes(input, charset)), charset), null);
}
@@ -692,7 +692,7 @@ public final class _Strings {
* empty chunks.
* @return empty stream if {@code input} is null
*/
- public static Stream<String> splitThenStreamTrimmed(@Nullable final String input, final String separator) {
+ public static Stream<String> splitThenStreamTrimmed(final @Nullable String input, final String separator) {
return splitThenStream(input, separator)
.map(String::trim)
.filter(not(String::isEmpty));
@@ -703,7 +703,7 @@ public final class _Strings {
* then discarding empty chunks.
* @return empty stream if {@code input} is null
*/
- public static Stream<String> splitThenStreamTrimmed(@Nullable final CharSequence input, final Pattern delimiterPattern) {
+ public static Stream<String> splitThenStreamTrimmed(final @Nullable CharSequence input, final Pattern delimiterPattern) {
return splitThenStream(input, delimiterPattern)
.map(String::trim)
.filter(not(String::isEmpty));
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_FastSplit.java b/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_FastSplit.java
index d06c39e..691e700 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_FastSplit.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_FastSplit.java
@@ -26,7 +26,7 @@ import org.springframework.lang.Nullable;
class _Strings_FastSplit {
public static void splitThenAccept(
- @Nullable final String input,
+ final @Nullable String input,
final String separator,
BiConsumer<String, String> onNonEmptySplit,
Consumer<String> onNonEmptyLhs,
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_SplitIterator.java b/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_SplitIterator.java
index 1f5878f..00b3c04 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_SplitIterator.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_SplitIterator.java
@@ -33,7 +33,7 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
*/
final class _Strings_SplitIterator {
- public static Iterator<String> splitIterator(@Nullable final String x, final String delimiter){
+ public static Iterator<String> splitIterator(final @Nullable String x, final String delimiter){
if(_Strings.isEmpty(delimiter)) {
throw new IllegalArgumentException("a non empty delimiter is required");
}
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java b/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java
index 3f92d83..42ae8a1 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java
@@ -58,7 +58,7 @@ public final class _With<T> {
* @param orElse (nullable)
* @return {@code obj!=null ? obj : orElse}
*/
- public static <X> X ifPresentElse(@Nullable final X obj, @Nullable final X orElse) {
+ public static <X> X ifPresentElse(final @Nullable X obj, final @Nullable X orElse) {
return obj!=null ? obj : orElse;
}
@@ -68,7 +68,7 @@ public final class _With<T> {
* @param elseGet
* @return {@code obj!=null ? obj : elseGet.get()}
*/
- public static <X> X ifPresentElseGet(@Nullable final X obj, final Supplier<X> elseGet) {
+ public static <X> X ifPresentElseGet(final @Nullable X obj, final Supplier<X> elseGet) {
return obj!=null ? obj : requires(elseGet, "elseGet").get();
}
@@ -80,7 +80,7 @@ public final class _With<T> {
* @throws E
*/
public static <X, E extends Exception> X ifPresentElseThrow(
- @Nullable final X obj,
+ final @Nullable X obj,
final Supplier<E> elseThrow)
throws E {
if(obj!=null) {
@@ -97,7 +97,7 @@ public final class _With<T> {
* @param consumer
* @return {@code obj}
*/
- public static <X> X accept(@Nullable final X obj, final Consumer<X> consumer) {
+ public static <X> X accept(final @Nullable X obj, final Consumer<X> consumer) {
requires(consumer, "consumer").accept(obj);
return obj;
}
@@ -108,7 +108,7 @@ public final class _With<T> {
* @param ifPresent
* @return {@code obj}
*/
- public static <X> X acceptIfPresent(@Nullable final X obj, final Consumer<X> ifPresent) {
+ public static <X> X acceptIfPresent(final @Nullable X obj, final Consumer<X> ifPresent) {
if(obj!=null) {
requires(ifPresent, "ifPresent").accept(obj);
}
@@ -123,7 +123,7 @@ public final class _With<T> {
* @param elseRun
* @return {@code obj}
*/
- public static <X> X acceptIfPresentElseRun(@Nullable final X obj, final Consumer<X> ifPresent, final Runnable elseRun) {
+ public static <X> X acceptIfPresentElseRun(final @Nullable X obj, final Consumer<X> ifPresent, final Runnable elseRun) {
if(obj!=null) {
requires(ifPresent, "ifPresent").accept(obj);
} else {
@@ -142,7 +142,7 @@ public final class _With<T> {
* @throws E
*/
public static <X, E extends Exception> X acceptIfPresentElseThrow(
- @Nullable final X obj, final Consumer<X> ifPresent, final Supplier<E> elseThrow)
+ final @Nullable X obj, final Consumer<X> ifPresent, final Supplier<E> elseThrow)
throws E {
if(obj!=null) {
@@ -160,7 +160,7 @@ public final class _With<T> {
* @param supplier
* @return {@code obj!=null ? obj : supplier.get()}
*/
- public static <X> X computeIfAbsent(@Nullable final X obj, final Supplier<X> supplier) {
+ public static <X> X computeIfAbsent(final @Nullable X obj, final Supplier<X> supplier) {
return obj!=null ? obj : requires(supplier, "supplier").get();
}
@@ -173,7 +173,7 @@ public final class _With<T> {
* @param orElse (nullable)
* @return {@code obj!=null ? mapper.apply(obj) : orElse}
*/
- public static <X, R> R mapIfPresentElse(@Nullable final X obj, final Function<X, R> mapper, @Nullable final R orElse) {
+ public static <X, R> R mapIfPresentElse(final @Nullable X obj, final Function<X, R> mapper, final @Nullable R orElse) {
return obj!=null ? requires(mapper, "mapper").apply(obj) : orElse;
}
@@ -184,7 +184,7 @@ public final class _With<T> {
* @param elseGet
* @return {@code obj!=null ? mapper.apply(obj) : elseGet.get()}
*/
- public static <X, R> R mapIfPresentElseGet(@Nullable final X obj, final Function<X, R> mapper, final Supplier<R> elseGet) {
+ public static <X, R> R mapIfPresentElseGet(final @Nullable X obj, final Function<X, R> mapper, final Supplier<R> elseGet) {
return obj!=null ? requires(mapper, "mapper").apply(obj) : requires(elseGet, "elseGet").get();
}
@@ -197,7 +197,7 @@ public final class _With<T> {
* @throws E
*/
public static <X, R, E extends Exception> R mapIfPresentElseThrow(
- @Nullable final X obj,
+ final @Nullable X obj,
final Function<X, R> mapper,
final Supplier<E> elseThrow)
throws E {
@@ -219,7 +219,7 @@ public final class _With<T> {
* or {@link java.util.Objects#requireNonNull(Object, String)} on fields
*/
@Deprecated
- public static <T> T requires(@Nullable final T obj, final String paramName) {
+ public static <T> T requires(final @Nullable T obj, final String paramName) {
if (obj == null) {
val msg = String.format("Parameter/Field '%s' is required to be present (not null).", paramName);
throw new IllegalArgumentException(msg);
@@ -237,7 +237,7 @@ public final class _With<T> {
* @throws NullPointerException if {@code obj} is {@code null}
* @throws IllegalArgumentException if {@code obj} is 'empty'
*/
- public static String requiresNotEmpty(@Nullable final String obj, final String paramName) {
+ public static String requiresNotEmpty(final @Nullable String obj, final String paramName) {
if (obj == null) {
throw new NullPointerException(String.format("Parameter/Field '%s' is required to be present (not null).", paramName));
}
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/binding/InternalUtil.java b/commons/src/main/java/org/apache/isis/commons/internal/binding/InternalUtil.java
index 79a7ac6..9c661df 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/binding/InternalUtil.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/binding/InternalUtil.java
@@ -91,7 +91,7 @@ abstract class InternalUtil<T> {
// -- LISTENER ADD/REMOVE
static <T> InternalUtil<T> addListener(
- @Nullable final InternalUtil<T> helper,
+ final @Nullable InternalUtil<T> helper,
final @NonNull Observable<T> observable,
final @NonNull InvalidationListener listener) {
observable.getValue(); // validate observable
@@ -101,7 +101,7 @@ abstract class InternalUtil<T> {
}
static <T> InternalUtil<T> removeListener(
- @Nullable final InternalUtil<T> helper,
+ final @Nullable InternalUtil<T> helper,
final @NonNull InvalidationListener listener) {
return (helper == null)
? null
@@ -109,7 +109,7 @@ abstract class InternalUtil<T> {
}
static <T> InternalUtil<T> addListener(
- @Nullable final InternalUtil<T> helper,
+ final @Nullable InternalUtil<T> helper,
final @NonNull Observable<T> observable,
final @NonNull ChangeListener<? super T> listener) {
return (helper == null)
@@ -118,7 +118,7 @@ abstract class InternalUtil<T> {
}
static <T> InternalUtil<T> removeListener(
- @Nullable final InternalUtil<T> helper,
+ final @Nullable InternalUtil<T> helper,
@NonNull ChangeListener<? super T> listener) {
return (helper == null)
? null
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java b/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java
index 418316b..ad2f130 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java
@@ -66,8 +66,8 @@ public final class _Arrays {
* @throws NullPointerException - if {@code test} is null
*/
public static <T> boolean testAnyMatch(
- @Nullable final T[] array1,
- @Nullable final T[] array2,
+ final @Nullable T[] array1,
+ final @Nullable T[] array2,
final @NonNull BiPredicate<T, T> test) {
final int s1 = _NullSafe.size(array1);
@@ -99,8 +99,8 @@ public final class _Arrays {
* @throws NullPointerException - if {@code test} is null
*/
public static <T> boolean testAllMatch(
- @Nullable final T[] array1,
- @Nullable final T[] array2,
+ final @Nullable T[] array1,
+ final @Nullable T[] array2,
final @NonNull BiPredicate<T, T> test) {
return !testAnyMatch(array1, array2, test.negate());
}
@@ -110,7 +110,7 @@ public final class _Arrays {
* @param cls
* @return whether {@code cls} represents an array
*/
- public static boolean isArrayType(@Nullable final Class<?> cls) {
+ public static boolean isArrayType(final @Nullable Class<?> cls) {
return cls!=null ? cls.isArray() : false;
}
@@ -155,7 +155,7 @@ public final class _Arrays {
* because of a type mismatch.
*/
@SafeVarargs
- public static <T> T[] combine(final @NonNull T first, @Nullable final T... rest) {
+ public static <T> T[] combine(final @NonNull T first, final @Nullable T... rest) {
final int restLength = _NullSafe.size(rest);
final T[] all = _Casts.uncheckedCast(Array.newInstance(first.getClass(), restLength+1));
all[0] = first;
@@ -173,7 +173,7 @@ public final class _Arrays {
* @return (non-null)
*/
@SafeVarargs
- public static <T, X extends T, Y extends T> T[] combineWithExplicitType(final @NonNull Class<T> type, final @NonNull X first, @Nullable final Y... rest) {
+ public static <T, X extends T, Y extends T> T[] combineWithExplicitType(final @NonNull Class<T> type, final @NonNull X first, final @Nullable Y... rest) {
final int restLength = _NullSafe.size(rest);
final T[] all = _Casts.uncheckedCast(Array.newInstance(type, restLength+1));
all[0] = first;
@@ -272,7 +272,7 @@ public final class _Arrays {
* @param array
* @return null for empty arrays
*/
- public static @Nullable <T> T[] emptyToNull(@Nullable final T[] array) {
+ public static @Nullable <T> T[] emptyToNull(final @Nullable T[] array) {
if(array!=null && array.length==0) {
return null;
}
@@ -335,7 +335,7 @@ public final class _Arrays {
* @param array
* @param index
*/
- public static <T> Optional<T> get(@Nullable final T[] array, final int index) {
+ public static <T> Optional<T> get(final @Nullable T[] array, final int index) {
val size = _NullSafe.size(array);
if(size==0) {
return Optional.empty();
@@ -364,7 +364,7 @@ public final class _Arrays {
*/
@Nullable
public static <T, R> R[] map(
- @Nullable final T[] array,
+ final @Nullable T[] array,
final @NonNull Class<R> resultElementType,
final @NonNull Function<T, R> mapper) {
@@ -392,7 +392,7 @@ public final class _Arrays {
*/
@Nullable
public static <T> Object[] map(
- @Nullable final T[] array,
+ final @Nullable T[] array,
final @NonNull Function<T, ?> mapper) {
if (array == null) {
@@ -420,7 +420,7 @@ public final class _Arrays {
*/
@Nullable
public static <T, R> R[] mapCollection(
- @Nullable final Collection<T> collection,
+ final @Nullable Collection<T> collection,
final @NonNull Class<R> resultElementType,
final @NonNull Function<T, R> mapper) {
@@ -448,7 +448,7 @@ public final class _Arrays {
*/
@Nullable
public static <T> Object[] mapCollection(
- @Nullable final Collection<T> collection,
+ final @Nullable Collection<T> collection,
final @NonNull Function<T, ?> mapper) {
if (collection == null) {
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections.java b/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections.java
index 2bedbd2..3e05dc5 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections.java
@@ -206,7 +206,7 @@ public final class _Collections {
* @return a collector that collects elements of a stream into an unmodifiable SortedSet
*/
public static <T> Collector<T, SortedSet<T>, SortedSet<T>> toUnmodifiableSortedSet(
- @Nullable final Comparator<T> comparator) {
+ final @Nullable Comparator<T> comparator) {
if(comparator==null) {
return toUnmodifiableSortedSet();
@@ -255,7 +255,7 @@ public final class _Collections {
* @return
*/
static <T, R> R collectFromIterable(
- @Nullable final Iterable<T> iterable,
+ final @Nullable Iterable<T> iterable,
final Function<Collection<T>, R> factory,
final Supplier<Collector<T, ?, R>> elementCollector) {
@@ -335,7 +335,7 @@ public final class _Collections {
.collect(Collectors.joining(delimiter));
}
- public static String toStringJoiningNewLine(@Nullable final Collection<?> collection) {
+ public static String toStringJoiningNewLine(final @Nullable Collection<?> collection) {
return toStringJoining(collection, "\n");
}
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/collections/_Lists.java b/commons/src/main/java/org/apache/isis/commons/internal/collections/_Lists.java
index 6e9fd13..edd36da 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/collections/_Lists.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/collections/_Lists.java
@@ -56,7 +56,7 @@ public final class _Lists {
// -- LIST ACCESS
- public static <T> T lastElementIfAny(@Nullable final List<T> list) {
+ public static <T> T lastElementIfAny(final @Nullable List<T> list) {
if(_NullSafe.isEmpty(list)) {
return null;
}
@@ -80,7 +80,7 @@ public final class _Lists {
* @param element
* @return non null
*/
- public static <T> List<T> singletonOrElseEmpty(@Nullable final T element) {
+ public static <T> List<T> singletonOrElseEmpty(final @Nullable T element) {
return element != null ? Collections.singletonList(element) : Collections.emptyList();
}
@@ -102,7 +102,7 @@ public final class _Lists {
* @param iterable
* @return non null
*/
- public static <T> List<T> unmodifiable(@Nullable final Iterable<T> iterable) {
+ public static <T> List<T> unmodifiable(final @Nullable Iterable<T> iterable) {
if(iterable==null) {
return Collections.emptyList();
}
@@ -121,14 +121,14 @@ public final class _Lists {
return new ArrayList<T>(initialSize);
}
- public static <T> ArrayList<T> newArrayList(@Nullable final Collection<T> collection) {
+ public static <T> ArrayList<T> newArrayList(final @Nullable Collection<T> collection) {
if(collection==null) {
return newArrayList();
}
return new ArrayList<T>(collection);
}
- public static <T> ArrayList<T> newArrayList(@Nullable final Iterable<T> iterable) {
+ public static <T> ArrayList<T> newArrayList(final @Nullable Iterable<T> iterable) {
return _Collections.collectFromIterable(iterable, _Lists::newArrayList,
()->Collectors.<T, ArrayList<T>>toCollection(ArrayList::new) );
}
@@ -139,14 +139,14 @@ public final class _Lists {
return new LinkedList<T>();
}
- public static <T> LinkedList<T> newLinkedList(@Nullable final Collection<T> collection) {
+ public static <T> LinkedList<T> newLinkedList(final @Nullable Collection<T> collection) {
if(collection==null) {
return newLinkedList();
}
return new LinkedList<T>(collection);
}
- public static <T> LinkedList<T> newLinkedList(@Nullable final Iterable<T> iterable) {
+ public static <T> LinkedList<T> newLinkedList(final @Nullable Iterable<T> iterable) {
return _Collections.collectFromIterable(iterable, _Lists::newLinkedList,
()->Collectors.<T, LinkedList<T>>toCollection(LinkedList::new) );
}
@@ -157,14 +157,14 @@ public final class _Lists {
return new CopyOnWriteArrayList<T>();
}
- public static <T> CopyOnWriteArrayList<T> newConcurrentList(@Nullable final Collection<T> collection) {
+ public static <T> CopyOnWriteArrayList<T> newConcurrentList(final @Nullable Collection<T> collection) {
if(collection==null) {
return newConcurrentList();
}
return new CopyOnWriteArrayList<T>(collection);
}
- public static <T> CopyOnWriteArrayList<T> newConcurrentList(@Nullable final Iterable<T> iterable) {
+ public static <T> CopyOnWriteArrayList<T> newConcurrentList(final @Nullable Iterable<T> iterable) {
return _Collections.collectFromIterable(iterable, _Lists::newConcurrentList,
()->Collectors.<T, CopyOnWriteArrayList<T>>toCollection(CopyOnWriteArrayList::new) );
}
@@ -172,13 +172,13 @@ public final class _Lists {
// -- TRANSFORMATIONS
- public static <T, R> List<R> map(@Nullable final Collection<T> input, final Function<T, R> mapper) {
+ public static <T, R> List<R> map(final @Nullable Collection<T> input, final Function<T, R> mapper) {
return _NullSafe.stream(input)
.map(mapper)
.collect(Collectors.toList());
}
- public static <T> List<T> filter(@Nullable final Collection<T> input, final Predicate<? super T> filter) {
+ public static <T> List<T> filter(final @Nullable Collection<T> input, final Predicate<? super T> filter) {
return _NullSafe.stream(input)
.filter(filter)
.collect(Collectors.toList());
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/collections/_Maps.java b/commons/src/main/java/org/apache/isis/commons/internal/collections/_Maps.java
index b81ac46..fef4be2 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/collections/_Maps.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/collections/_Maps.java
@@ -179,7 +179,7 @@ public final class _Maps {
// -- TRANSFORMATIONS
public static <K, V0, V1> Map<K, V1> mapValues(
- @Nullable final Map<K, V0> input,
+ final @Nullable Map<K, V0> input,
final @NonNull Supplier<Map<K, V1>> mapFactory,
final @NonNull Function<V0, V1> valueMapper) {
@@ -196,7 +196,7 @@ public final class _Maps {
public static <K, V> Map<K, V> filterKeys(
- @Nullable final Map<K, V> input,
+ final @Nullable Map<K, V> input,
final @NonNull Predicate<K> keyFilter,
final @NonNull Supplier<Map<K, V>> factory) {
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/collections/_Multimaps.java b/commons/src/main/java/org/apache/isis/commons/internal/collections/_Multimaps.java
index 8ddd961..95bbcc7 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/collections/_Multimaps.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/collections/_Multimaps.java
@@ -381,8 +381,8 @@ public class _Multimaps {
* @return TreeMap of TreeSets
*/
public static <K, V> SetMultimap<K, V> newSortedSetMultimap(
- @Nullable final Comparator<K> keyComparator,
- @Nullable final Comparator<V> elementComparator){
+ final @Nullable Comparator<K> keyComparator,
+ final @Nullable Comparator<V> elementComparator){
final Supplier<SortedMap<K, SortedSet<V>>> mapFactory = ()->new TreeMap<K, SortedSet<V>>(keyComparator);
final Supplier<SortedSet<V>> elementSetFactory = ()->new TreeSet<V>(elementComparator);
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/collections/_Sets.java b/commons/src/main/java/org/apache/isis/commons/internal/collections/_Sets.java
index c075c3f..34aebb2 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/collections/_Sets.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/collections/_Sets.java
@@ -78,7 +78,7 @@ public final class _Sets {
* @param element
* @return non null
*/
- public static <T> Set<T> singletonOrElseEmpty(@Nullable final T element) {
+ public static <T> Set<T> singletonOrElseEmpty(final @Nullable T element) {
return element != null ? Collections.singleton(element) : Collections.emptySet();
}
@@ -117,7 +117,7 @@ public final class _Sets {
* @param iterable
* @return non null
*/
- public static <T> Set<T> unmodifiable(@Nullable final Iterable<T> iterable) {
+ public static <T> Set<T> unmodifiable(final @Nullable Iterable<T> iterable) {
if(iterable==null) {
return Collections.emptySet();
}
@@ -131,16 +131,16 @@ public final class _Sets {
return new TreeSet<T>();
}
- public static <T> TreeSet<T> newTreeSet(@Nullable final Comparator<T> comparator) {
+ public static <T> TreeSet<T> newTreeSet(final @Nullable Comparator<T> comparator) {
return comparator!=null ? new TreeSet<T>(comparator) : new TreeSet<T>();
}
- public static <T> TreeSet<T> newTreeSet(@Nullable final Iterable<T> iterable) {
+ public static <T> TreeSet<T> newTreeSet(final @Nullable Iterable<T> iterable) {
return _NullSafe.stream(iterable)
.collect(Collectors.<T, TreeSet<T>>toCollection(TreeSet::new));
}
- public static <T> TreeSet<T> newTreeSet(@Nullable final Iterable<T> iterable, @Nullable final Comparator<T> comparator) {
+ public static <T> TreeSet<T> newTreeSet(final @Nullable Iterable<T> iterable, final @Nullable Comparator<T> comparator) {
return _NullSafe.stream(iterable)
.collect(Collectors.<T, TreeSet<T>>toCollection(()->new TreeSet<T>(comparator)));
}
@@ -152,14 +152,14 @@ public final class _Sets {
return new HashSet<T>();
}
- public static <T> HashSet<T> newHashSet(@Nullable final Collection<T> collection) {
+ public static <T> HashSet<T> newHashSet(final @Nullable Collection<T> collection) {
if(collection==null) {
return newHashSet();
}
return new HashSet<T>(collection);
}
- public static <T> HashSet<T> newHashSet(@Nullable final Iterable<T> iterable) {
+ public static <T> HashSet<T> newHashSet(final @Nullable Iterable<T> iterable) {
return _Collections.collectFromIterable(iterable, _Sets::newHashSet,
()->Collectors.<T, HashSet<T>>toCollection(HashSet::new) );
}
@@ -170,14 +170,14 @@ public final class _Sets {
return new LinkedHashSet<T>();
}
- public static <T> LinkedHashSet<T> newLinkedHashSet(@Nullable final Collection<T> collection) {
+ public static <T> LinkedHashSet<T> newLinkedHashSet(final @Nullable Collection<T> collection) {
if(collection==null) {
return newLinkedHashSet();
}
return new LinkedHashSet<T>(collection);
}
- public static <T> LinkedHashSet<T> newLinkedHashSet(@Nullable final Iterable<T> iterable) {
+ public static <T> LinkedHashSet<T> newLinkedHashSet(final @Nullable Iterable<T> iterable) {
return _Collections.collectFromIterable(iterable, _Sets::newLinkedHashSet,
()->Collectors.<T, LinkedHashSet<T>>toCollection(LinkedHashSet::new) );
}
@@ -188,7 +188,7 @@ public final class _Sets {
return ConcurrentHashMap.newKeySet();
}
- public static <T> KeySetView<T, Boolean> newConcurrentHashSet(@Nullable final Collection<T> collection) {
+ public static <T> KeySetView<T, Boolean> newConcurrentHashSet(final @Nullable Collection<T> collection) {
final KeySetView<T, Boolean> keySetView = newConcurrentHashSet();
if(collection!=null) {
keySetView.addAll(collection);
@@ -196,7 +196,7 @@ public final class _Sets {
return keySetView;
}
- public static <T> KeySetView<T, Boolean> newConcurrentHashSet(@Nullable final Iterable<T> iterable) {
+ public static <T> KeySetView<T, Boolean> newConcurrentHashSet(final @Nullable Iterable<T> iterable) {
return _Collections.collectFromIterable(iterable, _Sets::newConcurrentHashSet,
()->Collectors.<T, KeySetView<T, Boolean>>toCollection(ConcurrentHashMap::newKeySet) );
}
@@ -207,14 +207,14 @@ public final class _Sets {
return new CopyOnWriteArraySet<T>();
}
- public static <T> CopyOnWriteArraySet<T> newCopyOnWriteArraySet(@Nullable final Collection<T> collection) {
+ public static <T> CopyOnWriteArraySet<T> newCopyOnWriteArraySet(final @Nullable Collection<T> collection) {
if(collection==null) {
return newCopyOnWriteArraySet();
}
return new CopyOnWriteArraySet<T>(collection);
}
- public static <T> CopyOnWriteArraySet<T> newCopyOnWriteArraySet(@Nullable final Iterable<T> iterable) {
+ public static <T> CopyOnWriteArraySet<T> newCopyOnWriteArraySet(final @Nullable Iterable<T> iterable) {
return _Collections.collectFromIterable(iterable, _Sets::newCopyOnWriteArraySet,
()->Collectors.<T, CopyOnWriteArraySet<T>>toCollection(CopyOnWriteArraySet::new) );
}
@@ -229,7 +229,7 @@ public final class _Sets {
* @param b
* @return non null, unmodifiable
*/
- public static <T> Set<T> intersect(@Nullable final Set<T> a, @Nullable final Set<T> b) {
+ public static <T> Set<T> intersect(final @Nullable Set<T> a, final @Nullable Set<T> b) {
if(a==null && b==null) {
return Collections.emptySet();
}
@@ -250,7 +250,7 @@ public final class _Sets {
* @param b
* @return non null, unmodifiable
*/
- public static <T> SortedSet<T> intersectSorted(@Nullable final SortedSet<T> a, @Nullable final SortedSet<T> b) {
+ public static <T> SortedSet<T> intersectSorted(final @Nullable SortedSet<T> a, final @Nullable SortedSet<T> b) {
if(a==null && b==null) {
return Collections.emptySortedSet();
}
@@ -272,7 +272,7 @@ public final class _Sets {
* @param b
* @return {@code a - b}, non null, unmodifiable
*/
- public static <T> Set<T> minus(@Nullable final Set<T> a, @Nullable final Set<T> b) {
+ public static <T> Set<T> minus(final @Nullable Set<T> a, final @Nullable Set<T> b) {
return minus(a, b, HashSet::new);
}
@@ -285,7 +285,7 @@ public final class _Sets {
* @param b
* @return {@code a - b}, non null, unmodifiable
*/
- public static <T> SortedSet<T> minusSorted(@Nullable final SortedSet<T> a, @Nullable final SortedSet<T> b) {
+ public static <T> SortedSet<T> minusSorted(final @Nullable SortedSet<T> a, final @Nullable SortedSet<T> b) {
return minusSorted(a, b, TreeSet::new);
}
@@ -300,8 +300,8 @@ public final class _Sets {
* @return {@code a - b}, non null, unmodifiable
*/
public static <T> Set<T> minus(
- @Nullable final Set<T> a,
- @Nullable final Set<T> b,
+ final @Nullable Set<T> a,
+ final @Nullable Set<T> b,
final @NonNull Supplier<Set<T>> collectionFactory) {
if(a==null || a.isEmpty()) {
@@ -329,8 +329,8 @@ public final class _Sets {
* @return {@code a - b}, non null, unmodifiable
*/
public static <T> SortedSet<T> minusSorted(
- @Nullable final SortedSet<T> a,
- @Nullable final SortedSet<T> b,
+ final @Nullable SortedSet<T> a,
+ final @Nullable SortedSet<T> b,
final @NonNull Supplier<SortedSet<T>> collectionFactory) {
if(a==null || a.isEmpty()) {
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators.java b/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators.java
index 707e940..76f9c24 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators.java
@@ -42,8 +42,8 @@ public final class _Comparators {
private static final String DEWEY_SEPERATOR = ".";
public static int deweyOrderCompare(
- @Nullable final String sequence1,
- @Nullable final String sequence2) {
+ final @Nullable String sequence1,
+ final @Nullable String sequence2) {
return _Comparators_SequenceCompare.compareNullLast(sequence1, sequence2, DEWEY_SEPERATOR);
}
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators_SequenceCompare.java b/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators_SequenceCompare.java
index fe37431..0d981a6 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators_SequenceCompare.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators_SequenceCompare.java
@@ -37,8 +37,8 @@ final class _Comparators_SequenceCompare {
private _Comparators_SequenceCompare(){}
public static int compareNullLast(
- @Nullable final String sequence1,
- @Nullable final String sequence2,
+ final @Nullable String sequence1,
+ final @Nullable String sequence2,
final String separator) {
if(_Strings.isEmpty(separator))
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java b/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
index 0e266df..a29bae9 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
@@ -61,7 +61,7 @@ public final class _Exceptions {
* @param _case the unmatched case to be reported
* @return new IllegalArgumentException
*/
- public static final IllegalArgumentException unmatchedCase(@Nullable final Object _case) {
+ public static final IllegalArgumentException unmatchedCase(final @Nullable Object _case) {
return new IllegalArgumentException("internal error: unmatched case in switch statement: "+_case);
}
@@ -113,7 +113,7 @@ public final class _Exceptions {
public static final NoSuchElementException noSuchElement(
final @NonNull String format,
- @Nullable final Object ...args) {
+ final @Nullable Object ...args) {
return noSuchElement(String.format(format, args));
}
@@ -276,7 +276,7 @@ public final class _Exceptions {
// -- STACKTRACE UTILITITIES
- public static final Stream<String> streamStacktraceLines(@Nullable final Throwable ex, final int maxLines) {
+ public static final Stream<String> streamStacktraceLines(final @Nullable Throwable ex, final int maxLines) {
if(ex==null) {
return Stream.empty();
}
@@ -285,16 +285,16 @@ public final class _Exceptions {
.limit(maxLines);
}
- public static final String asStacktrace(@Nullable final Throwable ex, final int maxLines, final String delimiter) {
+ public static final String asStacktrace(final @Nullable Throwable ex, final int maxLines, final String delimiter) {
return _Exceptions.streamStacktraceLines(ex, maxLines)
.collect(Collectors.joining(delimiter));
}
- public static final String asStacktrace(@Nullable final Throwable ex, final int maxLines) {
+ public static final String asStacktrace(final @Nullable Throwable ex, final int maxLines) {
return asStacktrace(ex, maxLines, "\n");
}
- public static final String asStacktrace(@Nullable final Throwable ex) {
+ public static final String asStacktrace(final @Nullable Throwable ex) {
return asStacktrace(ex, 1000);
}
@@ -318,7 +318,7 @@ public final class _Exceptions {
// -- CAUSAL CHAIN
- public static List<Throwable> getCausalChain(@Nullable final Throwable ex) {
+ public static List<Throwable> getCausalChain(final @Nullable Throwable ex) {
if(ex==null) {
return Collections.emptyList();
}
@@ -331,7 +331,7 @@ public final class _Exceptions {
return chain;
}
- public static Stream<Throwable> streamCausalChain(@Nullable final Throwable ex) {
+ public static Stream<Throwable> streamCausalChain(final @Nullable Throwable ex) {
if(ex==null) {
return Stream.empty();
}
@@ -339,7 +339,7 @@ public final class _Exceptions {
return chain.stream();
}
- public static Throwable getRootCause(@Nullable final Throwable ex) {
+ public static Throwable getRootCause(final @Nullable Throwable ex) {
return _Lists.lastElementIfAny(getCausalChain(ex));
}
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/ioc/_IocContainer_Spring.java b/commons/src/main/java/org/apache/isis/commons/internal/ioc/_IocContainer_Spring.java
index 1bda998..4595c10 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/ioc/_IocContainer_Spring.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/ioc/_IocContainer_Spring.java
@@ -134,7 +134,7 @@ final class _IocContainer_Spring implements _IocContainer {
* @param annotations
* @return non-null
*/
- private static Set<Annotation> filterQualifiers(@Nullable final Annotation[] annotations) {
+ private static Set<Annotation> filterQualifiers(final @Nullable Annotation[] annotations) {
if(_NullSafe.isEmpty(annotations)) {
return Collections.emptySet();
}
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java b/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java
index 6bfaeda..731dcb2 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java
@@ -106,7 +106,7 @@ class _Mementos_MementoDefault implements _Mementos.Memento {
// -- PARSER
- static Memento parse(final @NonNull EncoderDecoder codec, final SerializingAdapter serializer, @Nullable final String str) {
+ static Memento parse(final @NonNull EncoderDecoder codec, final SerializingAdapter serializer, final @Nullable String str) {
if(_NullSafe.isEmpty(str)) {
return null;
}
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/primitives/_Ints.java b/commons/src/main/java/org/apache/isis/commons/internal/primitives/_Ints.java
index 15d207f..6061fa5 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/primitives/_Ints.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/primitives/_Ints.java
@@ -254,7 +254,7 @@ public class _Ints {
* with minimum potential heap pollution (does not produce stack-traces on parsing failures)
*/
private static long parseIntElseLongMaxValue(
- @Nullable final String s,
+ final @Nullable String s,
final int radix,
final @NonNull Consumer<String> onFailure) {
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/primitives/_Longs.java b/commons/src/main/java/org/apache/isis/commons/internal/primitives/_Longs.java
index c9cbf77..a0bc2cf 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/primitives/_Longs.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/primitives/_Longs.java
@@ -169,7 +169,7 @@ public class _Longs {
* @implNote Copied over from JDK's {@link Integer#parseInt(String)} to provide a variant
* with minimum potential heap pollution (does not produce stack-traces on parsing failures)
*/
- public OptionalLong parseLong(@Nullable final String s, final int radix, final @NonNull Consumer<String> onFailure) {
+ public OptionalLong parseLong(final @Nullable String s, final int radix, final @NonNull Consumer<String> onFailure) {
if (s == null) {
onFailure.accept("null");
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_AttributeMethods.java b/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_AttributeMethods.java
index 2fed91c..410211b 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_AttributeMethods.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_AttributeMethods.java
@@ -65,7 +65,7 @@ final class _Annotations_AttributeMethods {
private _Annotations_AttributeMethods(
- @Nullable final Class<? extends Annotation> annotationType,
+ final @Nullable Class<? extends Annotation> annotationType,
final Method[] attributeMethods) {
this.annotationType = annotationType;
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Reflect.java b/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Reflect.java
index 629ad67..5196ab2 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Reflect.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Reflect.java
@@ -135,7 +135,7 @@ public final class _Reflect {
* @param ignoreAccess - whether to include non-public members
*/
public static Stream<Field> streamFields(
- @Nullable final Class<?> type,
+ final @Nullable Class<?> type,
final boolean ignoreAccess) {
if(type==null) {
@@ -153,7 +153,7 @@ public final class _Reflect {
* @param ignoreAccess - whether to include non-public members
*/
public static Stream<Field> streamAllFields(
- @Nullable final Class<?> type,
+ final @Nullable Class<?> type,
final boolean ignoreAccess) {
return streamTypeHierarchy(type, InterfacePolicy.EXCLUDE) // interfaces don't have fields
@@ -169,7 +169,7 @@ public final class _Reflect {
* @return non-null
*/
public static Stream<Method> streamMethods(
- @Nullable final Class<?> type,
+ final @Nullable Class<?> type,
final boolean ignoreAccess) {
if(type==null) {
@@ -188,7 +188,7 @@ public final class _Reflect {
* @return non-null
*/
public static Stream<Method> streamAllMethods(
- @Nullable final Class<?> type,
+ final @Nullable Class<?> type,
final boolean ignoreAccess
) {
@@ -211,7 +211,7 @@ public final class _Reflect {
* @return non-null
*/
public static Stream<Class<?>> streamTypeHierarchy(
- @Nullable final Class<?> type,
+ final @Nullable Class<?> type,
final InterfacePolicy interfacePolicy) {
val includeInterfaces = interfacePolicy == InterfacePolicy.INCLUDE;
@@ -356,7 +356,7 @@ public final class _Reflect {
* @param annotationName - fully qualified class name of the {@link Annotation} to match against
* @return false - if any of the arguments is null
*/
- public static boolean containsAnnotation(@Nullable final Class<?> cls, @Nullable final String annotationName) {
+ public static boolean containsAnnotation(final @Nullable Class<?> cls, final @Nullable String annotationName) {
if(cls==null || _Strings.isEmpty(annotationName)) {
return false;
}
@@ -545,7 +545,7 @@ public final class _Reflect {
};
}
- public static Predicate<Executable> paramAssignableFromValue(final int paramIndex, @Nullable final Object value) {
+ public static Predicate<Executable> paramAssignableFromValue(final int paramIndex, final @Nullable Object value) {
if(value==null) {
return _Predicates.alwaysTrue();
}
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/resources/_Resources.java b/commons/src/main/java/org/apache/isis/commons/internal/resources/_Resources.java
index 776ce31..44e3f88 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/resources/_Resources.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/resources/_Resources.java
@@ -128,7 +128,7 @@ public final class _Resources {
* @param extendee
* @param suffix
*/
- public static String combinePath(@Nullable final String extendee, @Nullable final String suffix) {
+ public static String combinePath(final @Nullable String extendee, final @Nullable String suffix) {
return _Strings.combineWithDelimiter(extendee, suffix, "/");
}
diff --git a/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java
index f8519d1..1d2055b 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java
@@ -59,7 +59,7 @@ public class WebAppContextPath implements Serializable {
* @param contextPath - any form allowed: leading or trailing '/',
* no matter what, gets normalized
*/
- public void setContextPath(@Nullable final String contextPath) {
+ public void setContextPath(final @Nullable String contextPath) {
this.contextPath = normalizeContextPath(contextPath);
}
@@ -74,7 +74,7 @@ public class WebAppContextPath implements Serializable {
* @param localPath - last part of an URL to be prefixed (nullable)
* @return (non-null)
*/
- public String prependContextPath(@Nullable final String localPath) {
+ public String prependContextPath(final @Nullable String localPath) {
if(localPath==null) {
return getContextPath();
}
@@ -89,7 +89,7 @@ public class WebAppContextPath implements Serializable {
* identity operator otherwise
*/
@Nullable
- public String prependContextPathIfLocal(@Nullable final String urlOrLocalPath) {
+ public String prependContextPathIfLocal(final @Nullable String urlOrLocalPath) {
if(urlOrLocalPath==null) {
return null;
}
@@ -110,7 +110,7 @@ public class WebAppContextPath implements Serializable {
/**
* make sure result is either empty or has a leading slash followed by a non-empty string
*/
- private String normalizeContextPath(@Nullable final String contextPath) {
+ private String normalizeContextPath(final @Nullable String contextPath) {
if(contextPath == null) {
return "";
}
@@ -127,7 +127,7 @@ public class WebAppContextPath implements Serializable {
}
@Nullable
- private String ensureLeadingSlash(@Nullable final String url) {
+ private String ensureLeadingSlash(final @Nullable String url) {
if(url==null || url.length()<2) {
return url;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/StringExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/StringExtensions.java
index 51530f1..cb77c75 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/StringExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/commons/StringExtensions.java
@@ -242,7 +242,7 @@ public final class StringExtensions {
*
* @param extendee
*/
- public static String normalized(@Nullable final String extendee) {
+ public static String normalized(final @Nullable String extendee) {
return _Strings.asNormalized.apply(extendee);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ActionSupport.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ActionSupport.java
index 6722f6f..fc5146f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ActionSupport.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ActionSupport.java
@@ -192,7 +192,7 @@ public final class ActionSupport {
private static Class<?>[] concat(
final Class<?>[] paramTypes,
final int paramsConsidered,
- @Nullable final Class<?> additionalParamType) {
+ final @Nullable Class<?> additionalParamType) {
if(paramsConsidered>paramTypes.length) {
val msg = String.format("paramsConsidered %d exceeds size of paramTypes %d",
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ParameterSupport.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ParameterSupport.java
index e3be243..a578cc9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ParameterSupport.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ParameterSupport.java
@@ -297,7 +297,7 @@ public final class ParameterSupport {
private static Class<?>[] concat(
final Class<?>[] paramTypes,
final int paramsConsidered,
- @Nullable final Class<?> additionalParamType) {
+ final @Nullable Class<?> additionalParamType) {
if(paramsConsidered>paramTypes.length) {
val msg = String.format("paramsConsidered %d exceeds size of paramTypes %d",
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i8n/noun/NounForms.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i8n/noun/NounForms.java
index da47819..657d932 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i8n/noun/NounForms.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i8n/noun/NounForms.java
@@ -41,12 +41,12 @@ import lombok.val;
@Value @Builder
public class NounForms {
- public static NounFormsBuilder builderSingular(@Nullable final String singular) {
+ public static NounFormsBuilder builderSingular(final @Nullable String singular) {
return NounForms.builder()
.singular(singular);
}
- public static NounFormsBuilder builderPlural(@Nullable final String plural) {
+ public static NounFormsBuilder builderPlural(final @Nullable String plural) {
return NounForms.builder()
.plural(plural);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedFeature.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedFeature.java
index 5fa6de8..5c21826 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedFeature.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedFeature.java
@@ -58,7 +58,7 @@ public interface ManagedFeature {
* @return Optionally the feature's facet of the specified {@code facetType}
* (as per the type it reports from {@link Facet#facetType()}), based on existence.
*/
- default <T extends Facet> Optional<T> getFacet(@Nullable final Class<T> facetType) {
+ default <T extends Facet> Optional<T> getFacet(final @Nullable Class<T> facetType) {
return facetType!=null
? Optional.ofNullable(getMetaModel().getFacet(facetType))
: Optional.empty();
@@ -69,13 +69,13 @@ public interface ManagedFeature {
* @return Whether there exists a facet for this feature, that is of the
* specified {@code facetType} (as per the type it reports from {@link Facet#facetType()}).
*/
- default <T extends Facet> boolean hasFacet(@Nullable final Class<T> facetType) {
+ default <T extends Facet> boolean hasFacet(final @Nullable Class<T> facetType) {
return facetType!=null
? getMetaModel().getFacet(facetType)!=null
: false;
}
- default <T extends Facet> T getFacetElseFail(@Nullable final Class<T> facetType) {
+ default <T extends Facet> T getFacetElseFail(final @Nullable Class<T> facetType) {
return getFacet(facetType)
.orElseThrow(()->_Exceptions
.noSuchElement("Feature %s has no such facet %s",
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedProperty.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedProperty.java
index ef25dca..beb70a5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedProperty.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedProperty.java
@@ -116,7 +116,7 @@ public final class ManagedProperty extends ManagedMember {
* @param proposedNewValue
* @return non-empty if the interaction is not valid for given {@code proposedNewValue}
*/
- public Optional<InteractionVeto> modifyProperty(@Nullable final ManagedObject proposedNewValue) {
+ public Optional<InteractionVeto> modifyProperty(final @Nullable ManagedObject proposedNewValue) {
val interactionVeto = checkValidity(proposedNewValue);
if(interactionVeto.isPresent()) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ParameterNegotiationModel.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ParameterNegotiationModel.java
index 0051e83..bc66533 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ParameterNegotiationModel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ParameterNegotiationModel.java
@@ -180,7 +180,7 @@ public class ParameterNegotiationModel {
paramModels.getElseFail(paramNr).getBindableParamValue().setValue(newParamValue);
}
- @NonNull public ManagedObject adaptParamValuePojo(final int paramNr, @Nullable final Object newParamValuePojo) {
+ @NonNull public ManagedObject adaptParamValuePojo(final int paramNr, final @Nullable Object newParamValuePojo) {
val paramMeta = getParamMetamodel(paramNr);
val paramSpec = paramMeta.getSpecification();
val paramValue = newParamValuePojo!=null
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
index c65b759..51c651c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorRegistry.java
@@ -58,7 +58,7 @@ public class ClassSubstitutorRegistry {
* @param originalClass
* @return (non-null) the aggregated Substitution that applies to given originalClass
*/
- public Substitution getSubstitution(@Nullable final Class<?> originalClass) {
+ public Substitution getSubstitution(final @Nullable Class<?> originalClass) {
if(originalClass == null) {
return Substitution.neverReplaceClass();
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
index 0dfb685..e2df13c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
@@ -138,7 +138,7 @@ public interface ManagedObject {
*/
public static ManagedObject of(
final @NonNull ObjectSpecification specification,
- @Nullable final Object pojo) {
+ final @Nullable Object pojo) {
ManagedObjects.assertPojoNotManaged(pojo);
specification.assertPojoCompatible(pojo);
@@ -216,7 +216,7 @@ public interface ManagedObject {
public static ManagedObject identified(
@NonNull final ObjectSpecification spec,
- @Nullable final Object pojo,
+ final @Nullable Object pojo,
@NonNull final Bookmark bookmark) {
val managedObject = SimpleManagedObject.of(spec, pojo);
managedObject.bookmarkLazy.set(Optional.of(bookmark));
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
index b762f6c..4f7bf76 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
@@ -82,7 +82,7 @@ public final class ManagedObjects {
// -- CATEGORISATION
/** is null or has neither an ObjectSpecification and a value (pojo) */
- public static boolean isNullOrUnspecifiedOrEmpty(@Nullable final ManagedObject adapter) {
+ public static boolean isNullOrUnspecifiedOrEmpty(final @Nullable ManagedObject adapter) {
if(adapter==null || adapter==ManagedObject.unspecified()) {
return true;
}
@@ -90,7 +90,7 @@ public final class ManagedObjects {
}
/** whether has at least a spec */
- public static boolean isSpecified(@Nullable final ManagedObject adapter) {
+ public static boolean isSpecified(final @Nullable ManagedObject adapter) {
return adapter!=null && adapter!=ManagedObject.unspecified();
}
@@ -98,7 +98,7 @@ public final class ManagedObjects {
* @return whether the corresponding type can be mapped onto a REFERENCE (schema) or an Oid,
* that is, the type is 'identifiable' (aka 'referencable' or 'bookmarkable')
*/
- public static boolean isIdentifiable(@Nullable final ManagedObject managedObject) {
+ public static boolean isIdentifiable(final @Nullable ManagedObject managedObject) {
return spec(managedObject)
.map(ObjectSpecification::isIdentifiable)
.orElse(false);
@@ -123,15 +123,15 @@ public final class ManagedObjects {
// -- IDENTIFICATION
- public static Optional<ObjectSpecification> spec(@Nullable final ManagedObject managedObject) {
+ public static Optional<ObjectSpecification> spec(final @Nullable ManagedObject managedObject) {
return isSpecified(managedObject) ? Optional.of(managedObject.getSpecification()) : Optional.empty();
}
- public static Optional<Bookmark> bookmark(@Nullable final ManagedObject managedObject) {
+ public static Optional<Bookmark> bookmark(final @Nullable ManagedObject managedObject) {
return isSpecified(managedObject) ? managedObject.getBookmark() : Optional.empty();
}
- public static Bookmark bookmarkElseFail(@Nullable final ManagedObject managedObject) {
+ public static Bookmark bookmarkElseFail(final @Nullable ManagedObject managedObject) {
return bookmark(managedObject)
.orElseThrow(()->_Exceptions.illegalArgument("cannot identify %s", managedObject));
}
@@ -141,12 +141,12 @@ public final class ManagedObjects {
* @return optionally a String representing a reference to the <em>identifiable</em>
* {@code managedObject}, usually made up of the object's type and its ID.
*/
- public static Optional<String> stringify(@Nullable final ManagedObject managedObject) {
+ public static Optional<String> stringify(final @Nullable ManagedObject managedObject) {
return bookmark(managedObject)
.map(Bookmark::stringify);
}
- public static String stringifyElseFail(@Nullable final ManagedObject managedObject) {
+ public static String stringifyElseFail(final @Nullable ManagedObject managedObject) {
return stringify(managedObject)
.orElseThrow(()->_Exceptions.illegalArgument("cannot stringify %s", managedObject));
}
@@ -159,14 +159,14 @@ public final class ManagedObjects {
* {@code managedObject}, made of the form <object-type> <separator> <object-id>.
*/
public static Optional<String> stringify(
- @Nullable final ManagedObject managedObject,
+ final @Nullable ManagedObject managedObject,
final @NonNull String separator) {
return bookmark(managedObject)
.map(oid->oid.getLogicalTypeName() + separator + oid.getIdentifier());
}
public static String stringifyElseFail(
- @Nullable final ManagedObject managedObject,
+ final @Nullable ManagedObject managedObject,
final @NonNull String separator) {
return stringify(managedObject, separator)
.orElseThrow(()->_Exceptions.illegalArgument("cannot stringify %s", managedObject));
@@ -175,7 +175,7 @@ public final class ManagedObjects {
// -- COMPARE UTILITIES
- public static int compare(@Nullable final ManagedObject p, @Nullable final ManagedObject q) {
+ public static int compare(final @Nullable ManagedObject p, final @Nullable ManagedObject q) {
return NATURAL_NULL_FIRST.compare(p, q);
}
@@ -198,7 +198,7 @@ public final class ManagedObjects {
private static final Comparator<ManagedObject> NATURAL_NULL_FIRST = new Comparator<ManagedObject>(){
@SuppressWarnings({"rawtypes" })
@Override
- public int compare(@Nullable final ManagedObject p, @Nullable final ManagedObject q) {
+ public int compare(final @Nullable ManagedObject p, final @Nullable ManagedObject q) {
val pPojo = UnwrapUtil.single(p);
val qPojo = UnwrapUtil.single(q);
if(pPojo instanceof Comparable && qPojo instanceof Comparable) {
@@ -221,7 +221,7 @@ public final class ManagedObjects {
// -- COPY UTILITIES
@Nullable
- public static ManagedObject copyIfClonable(@Nullable final ManagedObject adapter) {
+ public static ManagedObject copyIfClonable(final @Nullable ManagedObject adapter) {
if(adapter==null) {
return null;
@@ -290,7 +290,7 @@ public final class ManagedObjects {
* are not empty
*/
public static Optional<ObjectSpecification> commonSpecification(
- @Nullable final Can<ManagedObject> objects) {
+ final @Nullable Can<ManagedObject> objects) {
if (_NullSafe.isEmpty(objects)) {
return Optional.empty();
@@ -321,7 +321,7 @@ public final class ManagedObjects {
public static Can<ManagedObject> adaptMultipleOfType(
@NonNull final ObjectSpecification elementSpec,
- @Nullable final Object collectionOrArray) {
+ final @Nullable Object collectionOrArray) {
return _NullSafe.streamAutodetect(collectionOrArray)
.map(pojo->ManagedObject.of(elementSpec, pojo)) // pojo is nullable here
@@ -333,7 +333,7 @@ public final class ManagedObjects {
*/
public static Can<ManagedObject> adaptMultipleOfTypeThenAttachThenFilterByVisibility(
@NonNull final ObjectSpecification elementSpec,
- @Nullable final Object collectionOrArray,
+ final @Nullable Object collectionOrArray,
@NonNull final InteractionInitiatedBy interactionInitiatedBy) {
return _NullSafe.streamAutodetect(collectionOrArray)
@@ -363,7 +363,7 @@ public final class ManagedObjects {
/**
* eg. in order to prevent wrapping an object that is already wrapped
*/
- public static void assertPojoNotManaged(@Nullable final Object pojo) {
+ public static void assertPojoNotManaged(final @Nullable Object pojo) {
// can do this check only when the pojo is not null, otherwise is always considered valid
if(pojo==null) {
return;
@@ -539,7 +539,7 @@ public final class ManagedObjects {
public static final class EntityUtil {
@NonNull
- public static Optional<PersistenceStandard> getPersistenceStandard(@Nullable final ManagedObject adapter) {
+ public static Optional<PersistenceStandard> getPersistenceStandard(final @Nullable ManagedObject adapter) {
if(adapter==null) {
return Optional.empty();
}
@@ -557,7 +557,7 @@ public final class ManagedObjects {
}
@NonNull
- public static EntityState getEntityState(@Nullable final ManagedObject adapter) {
+ public static EntityState getEntityState(final @Nullable ManagedObject adapter) {
if(isNullOrUnspecifiedOrEmpty(adapter)) {
return EntityState.NOT_PERSISTABLE;
}
@@ -622,7 +622,7 @@ public final class ManagedObjects {
}
@Nullable
- public static ManagedObject reattach(@Nullable final ManagedObject managedObject) {
+ public static ManagedObject reattach(final @Nullable ManagedObject managedObject) {
if(isNullOrUnspecifiedOrEmpty(managedObject)) {
return managedObject;
}
@@ -680,16 +680,16 @@ public final class ManagedObjects {
// -- SHORTCUTS
- public static boolean isAttached(@Nullable final ManagedObject adapter) {
+ public static boolean isAttached(final @Nullable ManagedObject adapter) {
return EntityUtil.getEntityState(adapter).isAttached();
}
- public static boolean isDetachedOrRemoved(@Nullable final ManagedObject adapter) {
+ public static boolean isDetachedOrRemoved(final @Nullable ManagedObject adapter) {
return EntityUtil.getEntityState(adapter).isDetachedOrRemoved();
}
/** only supported by JDO - always false with JPA */
- public static boolean isRemoved(@Nullable final ManagedObject adapter) {
+ public static boolean isRemoved(final @Nullable ManagedObject adapter) {
return EntityUtil.getEntityState(adapter).isRemoved();
}
@@ -943,14 +943,14 @@ public final class ManagedObjects {
// -- SINGLE
@Nullable
- public static Object single(@Nullable final ManagedObject adapter) {
+ public static Object single(final @Nullable ManagedObject adapter) {
return ManagedObjects.isSpecified(adapter)
? adapter.getPojo()
: null;
}
@Nullable
- public static String singleAsStringOrElse(@Nullable final ManagedObject adapter, @Nullable final String orElse) {
+ public static String singleAsStringOrElse(final @Nullable ManagedObject adapter, final @Nullable String orElse) {
final Object obj = UnwrapUtil.single(adapter);
if (obj == null) {
return null;
@@ -970,13 +970,13 @@ public final class ManagedObjects {
}
@Nullable
- public static Object[] multipleAsArray(@Nullable final Collection<ManagedObject> adapters) {
+ public static Object[] multipleAsArray(final @Nullable Collection<ManagedObject> adapters) {
val unwrappedObjects = _Arrays.mapCollection(adapters, UnwrapUtil::single);
return unwrappedObjects;
}
@Nullable
- public static Object[] multipleAsArray(@Nullable final ManagedObject[] adapters) {
+ public static Object[] multipleAsArray(final @Nullable ManagedObject[] adapters) {
val unwrappedObjects = _Arrays.map(adapters, UnwrapUtil::single);
return unwrappedObjects;
}
@@ -988,7 +988,7 @@ public final class ManagedObjects {
* @param adapters
* @return non-null, unmodifiable
*/
- public static List<Object> multipleAsList(@Nullable final Collection<? extends ManagedObject> adapters) {
+ public static List<Object> multipleAsList(final @Nullable Collection<? extends ManagedObject> adapters) {
if (adapters == null) {
return Collections.emptyList();
}
@@ -1002,7 +1002,7 @@ public final class ManagedObjects {
* @param adapters
* @return non-null, unmodifiable
*/
- public static List<Object> multipleAsList(@Nullable final Can<? extends ManagedObject> adapters) {
+ public static List<Object> multipleAsList(final @Nullable Can<? extends ManagedObject> adapters) {
if (adapters == null) {
return Collections.emptyList();
}
@@ -1017,7 +1017,7 @@ public final class ManagedObjects {
* @param adapters
* @return non-null, unmodifiable
*/
- public static Set<Object> multipleAsSet(@Nullable final Collection<? extends ManagedObject> adapters) {
+ public static Set<Object> multipleAsSet(final @Nullable Collection<? extends ManagedObject> adapters) {
if (adapters == null) {
return Collections.emptySet();
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index f8a26aa..39cf2b4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -521,7 +521,7 @@ extends
// -- TYPE COMPATIBILITY UTILITIES
- default public void assertPojoCompatible(@Nullable final Object pojo) {
+ default public void assertPojoCompatible(final @Nullable Object pojo) {
// can do this check only when the pojo is not null, otherwise is always considered valid
if(pojo==null) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
index 2b0dc57..10384af 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
@@ -219,7 +219,7 @@ extends ObjectFeature, CurrentHolder {
}
@Override
- public boolean test(@Nullable final ObjectActionParameter objectActionParameter) {
+ public boolean test(final @Nullable ObjectActionParameter objectActionParameter) {
if (!(objectActionParameter instanceof OneToManyActionParameter)) {
return false;
}
@@ -250,7 +250,7 @@ extends ObjectFeature, CurrentHolder {
}
@Override
- public boolean test(@Nullable final ObjectActionParameter objectActionParameter) {
+ public boolean test(final @Nullable ObjectActionParameter objectActionParameter) {
if (!(objectActionParameter instanceof OneToOneActionParameter)) {
return false;
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterOptionalityOrNullableAnnotationOnParameterFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterOptionalityOrNullableAnnotationOnParameterFacetFactoryTest.java
index f98c9d4..babe366 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterOptionalityOrNullableAnnotationOnParameterFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterOptionalityOrNullableAnnotationOnParameterFacetFactoryTest.java
@@ -76,7 +76,7 @@ public class ParameterOptionalityOrNullableAnnotationOnParameterFacetFactoryTest
class Customer {
@SuppressWarnings("unused")
- public void someAction(@Nullable final String foo) {
+ public void someAction(final @Nullable String foo) {
}
}
final Method method = findMethod(Customer.class, "someAction", new Class[] { String.class });
@@ -92,7 +92,7 @@ public class ParameterOptionalityOrNullableAnnotationOnParameterFacetFactoryTest
class Customer {
@SuppressWarnings("unused")
- public void someAction(@Nullable final int foo) {
+ public void someAction(final @Nullable int foo) {
}
}
final Method method = findMethod(Customer.class, "someAction", new Class[] { int.class });
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
index e8058e8..335caf5 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
@@ -80,7 +80,7 @@ public class RepositoryServiceDefault implements RepositoryService {
}
@Override
- public EntityState getEntityState(@Nullable final Object object) {
+ public EntityState getEntityState(final @Nullable Object object) {
val adapter = objectManager.adapt(unwrapped(object));
return EntityUtil.getEntityState(adapter);
}
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java
index 83d4cd4..7b1ec09 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java
@@ -67,7 +67,7 @@ public class CommandFetcher {
* @throws StatusException
*/
public List<CommandDto> fetchCommand(
- @Nullable final CommandModel previousHwmIfAny)
+ final @Nullable CommandModel previousHwmIfAny)
throws StatusException {
log.debug("finding command on primary ...");
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/collections/TableViewFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/collections/TableViewFx.java
index 17e2fff..5a0f8f3 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/collections/TableViewFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/collections/TableViewFx.java
@@ -117,7 +117,7 @@ public class TableViewFx extends VBox {
private TableViewFx(
final @NonNull UiContextFx uiContext,
final @NonNull ObjectSpecification elementSpec,
- @Nullable final Can<ManagedObject> objects,
+ final @Nullable Can<ManagedObject> objects,
final @NonNull Where where) {
val objectGrid = new TableView<ManagedObject>();
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/auth/AuthSessionStoreUtil.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/auth/AuthSessionStoreUtil.java
index 70f4340..a0d4d2a 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/auth/AuthSessionStoreUtil.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/auth/AuthSessionStoreUtil.java
@@ -42,7 +42,7 @@ public class AuthSessionStoreUtil {
public static void put(
final @NonNull HttpSession httpSession,
- @Nullable final InteractionContext auth) {
+ final @Nullable InteractionContext auth) {
httpSession.setAttribute(InteractionContext.class.getName(), auth);
}
@@ -55,7 +55,7 @@ public class AuthSessionStoreUtil {
/** when within a VaadinSession */
public static void put(
- @Nullable final InteractionContext auth) {
+ final @Nullable InteractionContext auth) {
Optional.ofNullable(VaadinSession.getCurrent())
.map(VaadinSession::getSession)
.ifPresent(sessionVaa->{
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/services/JdoSupportService.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/services/JdoSupportService.java
index a30db50..00f1926 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/services/JdoSupportService.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/services/JdoSupportService.java
@@ -104,7 +104,7 @@ public interface JdoSupportService {
* </pre>
* </p>
*/
- <T> List<T> executeQuery(final Class<T> cls, @Nullable final BooleanExpression filter);
+ <T> List<T> executeQuery(final Class<T> cls, final @Nullable BooleanExpression filter);
default <T> List<T> executeQuery(final Class<T> cls) {
return executeQuery(cls, null);
@@ -126,7 +126,7 @@ public interface JdoSupportService {
* </pre>
* </p>
*/
- <T> T executeQueryUnique(final Class<T> cls, @Nullable final BooleanExpression filter);
+ <T> T executeQueryUnique(final Class<T> cls, final @Nullable BooleanExpression filter);
default <T> T executeQueryUnique(final Class<T> cls) {
return executeQueryUnique(cls, null);
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/entities/DnEntityStateProvider.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/entities/DnEntityStateProvider.java
index 81168d8..45c9cc4 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/entities/DnEntityStateProvider.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/entities/DnEntityStateProvider.java
@@ -45,7 +45,7 @@ public class DnEntityStateProvider implements JdoFacetContext {
}
@Override
- public boolean isPersistenceEnhanced(@Nullable final Class<?> cls) {
+ public boolean isPersistenceEnhanced(final @Nullable Class<?> cls) {
if(cls==null) {
return false;
}
@@ -53,7 +53,7 @@ public class DnEntityStateProvider implements JdoFacetContext {
}
@Override
- public boolean isMethodProvidedByEnhancement(@Nullable final Method method) {
+ public boolean isMethodProvidedByEnhancement(final @Nullable Method method) {
if(method==null) {
return false;
}
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/JdoMetamodelUtil.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/JdoMetamodelUtil.java
index d0a4ddf..8dc5004 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/JdoMetamodelUtil.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/metamodel/JdoMetamodelUtil.java
@@ -28,14 +28,14 @@ import org.apache.isis.commons.internal.collections._Sets;
public class JdoMetamodelUtil {
- public static boolean isPersistenceEnhanced(@Nullable final Class<?> cls) {
+ public static boolean isPersistenceEnhanced(final @Nullable Class<?> cls) {
if(cls==null) {
return false;
}
return org.datanucleus.enhancement.Persistable.class.isAssignableFrom(cls);
}
- public static boolean isMethodProvidedByEnhancement(@Nullable final Method method) {
+ public static boolean isMethodProvidedByEnhancement(final @Nullable Method method) {
if(method==null) {
return false;
}
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionTestAbstract.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionTestAbstract.java
index 04da9f2..651129f 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionTestAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/util/interaction/InteractionTestAbstract.java
@@ -78,7 +78,7 @@ public abstract class InteractionTestAbstract extends IsisIntegrationTestAbstrac
// -- SHORTCUTS
- protected Object invokeAction(final Class<?> type, final String actionId, @Nullable final List<Object> pojoArgList) {
+ protected Object invokeAction(final Class<?> type, final String actionId, final @Nullable List<Object> pojoArgList) {
val managedAction = startActionInteractionOn(type, actionId, Where.OBJECT_FORMS)
.getManagedAction().get(); // should not throw
diff --git a/testing/archtestsupport/applib/src/main/java/org/apache/isis/testing/archtestsupport/applib/modulerules/ArchitectureModuleRules.java b/testing/archtestsupport/applib/src/main/java/org/apache/isis/testing/archtestsupport/applib/modulerules/ArchitectureModuleRules.java
index 00fefdb..906af9b 100644
--- a/testing/archtestsupport/applib/src/main/java/org/apache/isis/testing/archtestsupport/applib/modulerules/ArchitectureModuleRules.java
+++ b/testing/archtestsupport/applib/src/main/java/org/apache/isis/testing/archtestsupport/applib/modulerules/ArchitectureModuleRules.java
@@ -203,7 +203,7 @@ public class ArchitectureModuleRules {
}
- static String nameOf(Class<?> moduleClass, @Nullable final String subpackageName) {
+ static String nameOf(Class<?> moduleClass, final @Nullable String subpackageName) {
val simpleName = moduleClass.getSimpleName();
val moduleName = simpleName.replace("Module", "");
return moduleName + (subpackageName != null ? (" " + subpackageName) : "");
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
index 17552ee..9d9237a 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
@@ -318,7 +318,7 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
@Action(semantics=SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll updateSomeByteWrapper(@Nullable final Byte b) {
+ public FakeDataDemoObjectWithAll updateSomeByteWrapper(final @Nullable Byte b) {
setSomeByteWrapper(b);
return this;
}
@@ -334,7 +334,7 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
@Action(semantics=SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll updateSomeShortWrapper(@Nullable final Short s) {
+ public FakeDataDemoObjectWithAll updateSomeShortWrapper(final @Nullable Short s) {
setSomeShortWrapper(s);
return this;
}
@@ -350,7 +350,7 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
@Action(semantics=SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll updateSomeIntegerWrapper(@Nullable final Integer i) {
+ public FakeDataDemoObjectWithAll updateSomeIntegerWrapper(final @Nullable Integer i) {
setSomeIntegerWrapper(i);
return this;
}
@@ -366,7 +366,7 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
@Action(semantics=SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll updateSomeLongWrapper(@Nullable final Long l) {
+ public FakeDataDemoObjectWithAll updateSomeLongWrapper(final @Nullable Long l) {
setSomeLongWrapper(l);
return this;
}
@@ -379,7 +379,7 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
@Action(semantics=SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll updateSomeFloatWrapper(@Nullable final Float f) {
+ public FakeDataDemoObjectWithAll updateSomeFloatWrapper(final @Nullable Float f) {
setSomeFloatWrapper(f);
return this;
}
@@ -394,7 +394,7 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
}
@Action(semantics=SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll updateSomeDoubleWrapper(@Nullable final Double d) {
+ public FakeDataDemoObjectWithAll updateSomeDoubleWrapper(final @Nullable Double d) {
setSomeDoubleWrapper(d);
return this;
}
@@ -410,7 +410,7 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
@Action(semantics=SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll updateSomeCharacterWrapper(@Nullable final Character i) {
+ public FakeDataDemoObjectWithAll updateSomeCharacterWrapper(final @Nullable Character i) {
setSomeCharacterWrapper(i);
return this;
}
@@ -426,7 +426,7 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
@Action(semantics=SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll updateSomeString(@Nullable final String i) {
+ public FakeDataDemoObjectWithAll updateSomeString(final @Nullable String i) {
setSomeString(i);
return this;
}
@@ -441,7 +441,7 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
}
@Action(semantics=SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll updateSomePassword(@Nullable final Password password) {
+ public FakeDataDemoObjectWithAll updateSomePassword(final @Nullable Password password) {
setSomePassword(password);
return this;
}
@@ -472,7 +472,7 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
@Action(semantics=SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll updateSomeClob(@Nullable final Clob clob) {
+ public FakeDataDemoObjectWithAll updateSomeClob(final @Nullable Clob clob) {
setSomeClob(clob);
return this;
}
@@ -517,7 +517,7 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
@Action(semantics = SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll updateSomeJodaLocalDate(@Nullable final LocalDate i) {
+ public FakeDataDemoObjectWithAll updateSomeJodaLocalDate(final @Nullable LocalDate i) {
setSomeJodaLocalDate(i);
return this;
}
@@ -555,7 +555,7 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
@Action(semantics = SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll updateSomeJodaDateTime(@Nullable final DateTime i) {
+ public FakeDataDemoObjectWithAll updateSomeJodaDateTime(final @Nullable DateTime i) {
setSomeJodaDateTime(i);
return this;
}
@@ -571,7 +571,7 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
@Action(semantics = SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll updateSomeJavaSqlTimestamp(@Nullable final Timestamp i) {
+ public FakeDataDemoObjectWithAll updateSomeJavaSqlTimestamp(final @Nullable Timestamp i) {
setSomeJavaSqlTimestamp(i);
return this;
}
@@ -622,7 +622,7 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
@Action(semantics= SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll updateSomeUrl(@Nullable final URL i) {
+ public FakeDataDemoObjectWithAll updateSomeUrl(final @Nullable URL i) {
setSomeUrl(i);
return this;
}
@@ -638,7 +638,7 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
@Action(semantics=SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll updateSomeUuid(@Nullable final UUID i) {
+ public FakeDataDemoObjectWithAll updateSomeUuid(final @Nullable UUID i) {
setSomeUuid(i);
return this;
}
@@ -654,7 +654,7 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
//TODO[2249] deprecated
// @Action(semantics=SemanticsOf.IDEMPOTENT)
-// public FakeDataDemoObjectWithAll updateSomeMoney(@Nullable final Money i) {
+// public FakeDataDemoObjectWithAll updateSomeMoney(final @Nullable Money i) {
// setSomeMoney(i);
// return this;
// }
@@ -670,7 +670,7 @@ public class FakeDataDemoObjectWithAll implements Comparable<FakeDataDemoObjectW
@Action(semantics=SemanticsOf.IDEMPOTENT)
- public FakeDataDemoObjectWithAll updateSomeEnumOf3(@Nullable final EnumOf3 i) {
+ public FakeDataDemoObjectWithAll updateSomeEnumOf3(final @Nullable EnumOf3 i) {
setSomeEnumOf3(i);
return this;
}
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScriptsSpecification.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScriptsSpecification.java
index 078db0a..522e1ef 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScriptsSpecification.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScriptsSpecification.java
@@ -100,7 +100,7 @@ public class FixtureScriptsSpecification {
public Builder(final Class<?> contextClass) {
this(contextClass.getPackage().getName());
}
- public Builder(@Nullable final String packagePrefix) {
+ public Builder(final @Nullable String packagePrefix) {
this.packagePrefix = packagePrefix;
}
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/components/UiComponentFactory.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/components/UiComponentFactory.java
index 9bcb5d5..2cb725e 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/components/UiComponentFactory.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/components/UiComponentFactory.java
@@ -86,17 +86,17 @@ public interface UiComponentFactory<B, C> {
return managedFeature.getCorrespondingClass();
}
- public boolean isFeatureTypeEqualTo(@Nullable final Class<?> type) {
+ public boolean isFeatureTypeEqualTo(final @Nullable Class<?> type) {
return getFeatureType() == type;
}
- public boolean isFeatureTypeAssignableFrom(@Nullable final Class<?> type) {
+ public boolean isFeatureTypeAssignableFrom(final @Nullable Class<?> type) {
return type!=null
? getFeatureType().isAssignableFrom(type)
: false;
}
- public boolean isFeatureTypeInstanceOf(@Nullable final Class<?> type) {
+ public boolean isFeatureTypeInstanceOf(final @Nullable Class<?> type) {
return type!=null
? type.isAssignableFrom(getFeatureType())
: false;
@@ -107,7 +107,7 @@ public interface UiComponentFactory<B, C> {
* @return Whether there exists a facet for this feature, that is of the
* specified {@code facetType} (as per the type it reports from {@link Facet#facetType()}).
*/
- public <T extends Facet> boolean hasFeatureTypeFacet(@Nullable final Class<T> facetType) {
+ public <T extends Facet> boolean hasFeatureTypeFacet(final @Nullable Class<T> facetType) {
return facetType!=null
? getFeatureTypeSpec().getFacet(facetType)!=null
: false;
@@ -126,7 +126,7 @@ public interface UiComponentFactory<B, C> {
}
@Deprecated
- public <T> Optional<T> getFeatureValue(@Nullable final Class<T> type) {
+ public <T> Optional<T> getFeatureValue(final @Nullable Class<T> type) {
val managedProperty = (ManagedProperty)managedFeature;
//TODO do a type check before the cast, so we can throw a more detailed exception
// that is, given type must be assignable from the actual pojo type
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/InteractionFailureHandler.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/InteractionFailureHandler.java
index 4898251..0ce0bef 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/InteractionFailureHandler.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/InteractionFailureHandler.java
@@ -32,7 +32,7 @@ import lombok.val;
public class InteractionFailureHandler {
public static RestfulObjectsApplicationException onFailure(
- @Nullable final InteractionVeto veto) {
+ final @Nullable InteractionVeto veto) {
if(veto==null) {
return RestfulObjectsApplicationException
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
index 04cd106..438d8e9 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
@@ -135,7 +135,7 @@ implements HasDynamicallyVisibleContent {
// visibility needs to be determined at point of rendering, by ActionLink itself
//
//.filter(new Predicate<ObjectAction>() {
- // @Override public boolean apply(@Nullable final ObjectAction objectAction) {
+ // @Override public boolean apply(final @Nullable ObjectAction objectAction) {
// final Consent visibility = objectAction
// .isVisible(getModel().getObject(), InteractionInitiatedBy.USER, Where.OBJECT_FORMS);
// return visibility.isAllowed();
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Tooltips.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Tooltips.java
index 8ca8f9b..3f738db 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Tooltips.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Tooltips.java
@@ -57,7 +57,7 @@ public class Tooltips {
*/
public static void addTooltip(
final @NonNull Component target,
- @Nullable final TooltipUiModel tooltipUiModel) {
+ final @Nullable TooltipUiModel tooltipUiModel) {
if(tooltipUiModel==null || _Strings.isEmpty(tooltipUiModel.getBody())) {
return; // no body so don't render
}