You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/03/01 06:42:46 UTC
[causeway] branch master updated: CAUSEWAY-3304: cosmetics: rename just introduces utility methods
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/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new b05c3df625 CAUSEWAY-3304: cosmetics: rename just introduces utility methods
b05c3df625 is described below
commit b05c3df625376a0417efc9d9255b5c09697de50f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Mar 1 07:42:43 2023 +0100
CAUSEWAY-3304: cosmetics: rename just introduces utility methods
---
.../java/org/apache/causeway/applib/value/Blob.java | 2 +-
.../causeway/commons/internal/base/_NullSafe.java | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java b/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java
index ac2a26fc57..0e848fda51 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/Blob.java
@@ -238,7 +238,7 @@ public final class Blob implements NamedWithMimeType {
* @see DataSource
*/
public DataSource asDataSource() {
- return DataSource.ofBytes(_NullSafe.asNonNull(getBytes()));
+ return DataSource.ofBytes(_NullSafe.toNonNull(getBytes()));
}
/**
diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/base/_NullSafe.java b/commons/src/main/java/org/apache/causeway/commons/internal/base/_NullSafe.java
index 138eee14eb..ec3188e22f 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/base/_NullSafe.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/base/_NullSafe.java
@@ -312,16 +312,16 @@ public final class _NullSafe {
// -- NON-NULL VARIANTS
- public String asNonNull(final @Nullable String x){ return x!=null ? x : ""; }
- public boolean[] asNonNull(final @Nullable boolean[] array){ return array!=null ? array : new boolean[0]; }
- public byte[] asNonNull(final @Nullable byte[] array){ return array!=null ? array : new byte[0]; }
- public char[] asNonNull(final @Nullable char[] array){ return array!=null ? array : new char[0]; }
- public double[] asNonNull(final @Nullable double[] array){ return array!=null ? array : new double[0]; }
- public float[] asNonNull(final @Nullable float[] array){ return array!=null ? array : new float[0]; }
- public int[] asNonNull(final @Nullable int[] array){ return array!=null ? array : new int[0]; }
- public long[] asNonNull(final @Nullable long[] array){ return array!=null ? array : new long[0]; }
- public short[] asNonNull(final @Nullable short[] array){ return array!=null ? array : new short[0]; }
- public <T> T[] asNonNull(final @Nullable T[] array){ return array!=null ? array : _Casts.uncheckedCast(new Object[0]); }
+ public String toNonNull(final @Nullable String x){ return x!=null ? x : ""; }
+ public boolean[] toNonNull(final @Nullable boolean[] array){ return array!=null ? array : new boolean[0]; }
+ public byte[] toNonNull(final @Nullable byte[] array){ return array!=null ? array : new byte[0]; }
+ public char[] toNonNull(final @Nullable char[] array){ return array!=null ? array : new char[0]; }
+ public double[] toNonNull(final @Nullable double[] array){ return array!=null ? array : new double[0]; }
+ public float[] toNonNull(final @Nullable float[] array){ return array!=null ? array : new float[0]; }
+ public int[] toNonNull(final @Nullable int[] array){ return array!=null ? array : new int[0]; }
+ public long[] toNonNull(final @Nullable long[] array){ return array!=null ? array : new long[0]; }
+ public short[] toNonNull(final @Nullable short[] array){ return array!=null ? array : new short[0]; }
+ public <T> T[] toNonNull(final @Nullable T[] array){ return array!=null ? array : _Casts.uncheckedCast(new Object[0]); }
// -- TO STRING