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 2018/02/25 17:57:53 UTC
[isis] branch master updated: ISIS-1841 _Bytes: refactor to
symmetrical naming
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 6f4d95b ISIS-1841 _Bytes: refactor to symmetrical naming
6f4d95b is described below
commit 6f4d95b3ddf0f98464f79d440ce1fe7bcfa4c792
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Feb 25 18:57:52 2018 +0100
ISIS-1841 _Bytes: refactor to symmetrical naming
---
.../main/java/org/apache/isis/applib/internal/base/_Bytes.java | 10 ++++++++--
.../urlencoding/UrlEncodingServiceWithCompressionAbstract.java | 2 +-
.../java/org/apache/isis/applib/internal/base/BytesTest.java | 8 +++++---
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Bytes.java b/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Bytes.java
index 8bde7d2..12c725c 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Bytes.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Bytes.java
@@ -148,13 +148,19 @@ public final class _Bytes {
// -- SPECIAL COMPOSITES
- // using naming convention asXxx...
+ // using naming convention asX../ofX..
+ public final static BytesOperator asUrlBase64 = operator()
+ .andThen(bytes->encodeToBase64(Base64.getUrlEncoder(), bytes));
+
+ public final static BytesOperator ofUrlBase64 = operator()
+ .andThen(bytes->decodeBase64(Base64.getUrlDecoder(), bytes));
+
public final static BytesOperator asCompressedUrlBase64 = operator()
.andThen(_Bytes::compress)
.andThen(bytes->encodeToBase64(Base64.getUrlEncoder(), bytes));
- public final static BytesOperator asDecompressedUrlBase64 = operator()
+ public final static BytesOperator ofCompressedUrlBase64 = operator()
.andThen(bytes->decodeBase64(Base64.getUrlDecoder(), bytes))
.andThen(_Bytes::decompress);
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompressionAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompressionAbstract.java
index 02a22d1..ebbc455 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompressionAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompressionAbstract.java
@@ -20,7 +20,7 @@ public abstract class UrlEncodingServiceWithCompressionAbstract implements UrlEn
@Override
public String decode(final String str) {
- return _Strings.convert(str, _Bytes.asDecompressedUrlBase64, StandardCharsets.UTF_8);
+ return _Strings.convert(str, _Bytes.ofCompressedUrlBase64, StandardCharsets.UTF_8);
}
}
diff --git a/core/applib/src/test/java/org/apache/isis/applib/internal/base/BytesTest.java b/core/applib/src/test/java/org/apache/isis/applib/internal/base/BytesTest.java
index b16163d..907b260 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/internal/base/BytesTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/internal/base/BytesTest.java
@@ -105,20 +105,22 @@ public class BytesTest {
@Test
public void composedOperatorWithNull() throws Exception {
Assert.assertNull(_Bytes.asCompressedUrlBase64.apply(null));
- Assert.assertNull(_Bytes.asDecompressedUrlBase64.apply(null));
+ Assert.assertNull(_Bytes.ofCompressedUrlBase64.apply(null));
+ Assert.assertNull(_Bytes.asUrlBase64.apply(null));
+ Assert.assertNull(_Bytes.ofUrlBase64.apply(null));
}
@Test
public void composedIdentityWithByteRange() throws Exception {
Assert.assertArrayEquals(allBytes,
- _Bytes.asDecompressedUrlBase64.apply(
+ _Bytes.ofCompressedUrlBase64.apply(
_Bytes.asCompressedUrlBase64.apply(allBytes)));
}
@Test
public void composedIdentityWithTestimonial() throws Exception {
Assert.assertArrayEquals(testimonal,
- _Bytes.asDecompressedUrlBase64.apply(
+ _Bytes.ofCompressedUrlBase64.apply(
_Bytes.asCompressedUrlBase64.apply(testimonal)));
}
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.