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 ce7ddb7 ISIS-1742 make UrlEncodingServiceWithCompression the new
default
ce7ddb7 is described below
commit ce7ddb7ee9b8545a2361c83948b386273854c646
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Fri Apr 13 12:37:12 2018 +0200
ISIS-1742 make UrlEncodingServiceWithCompression the new default
---
...ceUsingBaseEncodingWithSupportForLargeUrlsAbstract.java | 3 ++-
...va => UrlEncodingServiceUsingBaseEncodingAbstract.java} | 14 +++++++-------
...bstract.java => UrlEncodingServiceWithCompression.java} | 14 +++++++-------
.../apache/isis/applib/internal/memento/MementosTest.java | 12 ++++++------
.../services/urlencoding/UrlEncodingServiceTest.java | 8 ++++----
5 files changed, 26 insertions(+), 25 deletions(-)
diff --git
a/core/applib-legacy/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingWithSupportForLargeUrlsAbstract.java
b/core/applib-legacy/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingWithSupportForLargeUrlsAbstract.java
index e8e4aa1..02aaef2 100644
---
a/core/applib-legacy/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingWithSupportForLargeUrlsAbstract.java
+++
b/core/applib-legacy/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingWithSupportForLargeUrlsAbstract.java
@@ -13,7 +13,8 @@ import com.google.common.collect.Maps;
* </pre>
*/
@Deprecated // [ahuber] why not use variant with compression ?
-public abstract class
UrlEncodingServiceUsingBaseEncodingWithSupportForLargeUrlsAbstract extends
UrlEncodingServiceUsingBaseEncoding {
+public abstract class
UrlEncodingServiceUsingBaseEncodingWithSupportForLargeUrlsAbstract
+extends UrlEncodingServiceUsingBaseEncodingAbstract {
/**
* Strings under this length are not cached, just returned as is.
diff --git
a/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncoding.java
b/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
similarity index 81%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncoding.java
rename to
core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
index 1090d0a..0fd3b4a 100644
---
a/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncoding.java
+++
b/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
@@ -18,16 +18,16 @@ package org.apache.isis.applib.services.urlencoding;
import java.nio.charset.StandardCharsets;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.internal.base._Bytes;
import org.apache.isis.applib.internal.base._Strings;
-@DomainService(
- nature = NatureOfService.DOMAIN,
- menuOrder = "" + Integer.MAX_VALUE
-)
-public class UrlEncodingServiceUsingBaseEncoding implements UrlEncodingService
{
+/**
+ * to use, subclass and annotated with:
+ * <pre>
+ * @DomainService(nature=DOMAIN, menuOrder="100")
+ * </pre>
+ */
+public abstract class UrlEncodingServiceUsingBaseEncodingAbstract implements
UrlEncodingService {
@Override
public String encode(final byte[] bytes) {
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/UrlEncodingServiceWithCompression.java
similarity index 76%
rename from
core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompressionAbstract.java
rename to
core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
index cebc1fd..8b40336 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/UrlEncodingServiceWithCompression.java
@@ -2,16 +2,16 @@ package org.apache.isis.applib.services.urlencoding;
import java.nio.charset.StandardCharsets;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.internal.base._Bytes;
import org.apache.isis.applib.internal.base._Strings;
-/**
- * to use, subclass and annotated with:
- * <pre>
- * @DomainService(nature=DOMAIN, menuOrder="100")
- * </pre>
- */
-public abstract class UrlEncodingServiceWithCompressionAbstract implements
UrlEncodingService {
+@DomainService(
+ nature = NatureOfService.DOMAIN,
+ menuOrder = "" + Integer.MAX_VALUE
+)
+public class UrlEncodingServiceWithCompression implements UrlEncodingService {
@Override
public String encode(final byte[] bytes) {
diff --git
a/core/applib/src/test/java/org/apache/isis/applib/internal/memento/MementosTest.java
b/core/applib/src/test/java/org/apache/isis/applib/internal/memento/MementosTest.java
index a919c2c..d6e5331 100644
---
a/core/applib/src/test/java/org/apache/isis/applib/internal/memento/MementosTest.java
+++
b/core/applib/src/test/java/org/apache/isis/applib/internal/memento/MementosTest.java
@@ -30,8 +30,8 @@ import java.util.Date;
import org.apache.isis.applib.internal.memento._Mementos.Memento;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.urlencoding.UrlEncodingService;
-import
org.apache.isis.applib.services.urlencoding.UrlEncodingServiceUsingBaseEncoding;
-import
org.apache.isis.applib.services.urlencoding.UrlEncodingServiceWithCompressionAbstract;
+import
org.apache.isis.applib.services.urlencoding.UrlEncodingServiceUsingBaseEncodingAbstract;
+import
org.apache.isis.applib.services.urlencoding.UrlEncodingServiceWithCompression;
import org.joda.time.LocalDate;
import org.junit.Before;
import org.junit.Test;
@@ -42,13 +42,13 @@ public class MementosTest {
Mon,Tue,Wed,Thu,Fri
}
- UrlEncodingServiceWithCompressionAbstract serviceWithCompression;
- UrlEncodingServiceUsingBaseEncoding serviceBaseEncoding;
+ UrlEncodingServiceWithCompression serviceWithCompression;
+ UrlEncodingServiceUsingBaseEncodingAbstract serviceBaseEncoding;
@Before
public void setUp() throws Exception {
- serviceWithCompression = new
UrlEncodingServiceWithCompressionAbstract(){};
- serviceBaseEncoding = new UrlEncodingServiceUsingBaseEncoding(){};
+ serviceWithCompression = new UrlEncodingServiceWithCompression();
+ serviceBaseEncoding = new
UrlEncodingServiceUsingBaseEncodingAbstract(){};
}
@Test
diff --git
a/core/applib/src/test/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceTest.java
b/core/applib/src/test/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceTest.java
index 8ad36cc..013abb1 100644
---
a/core/applib/src/test/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceTest.java
+++
b/core/applib/src/test/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceTest.java
@@ -10,13 +10,13 @@ import org.junit.Test;
public class UrlEncodingServiceTest {
- UrlEncodingServiceWithCompressionAbstract serviceWithCompression;
- UrlEncodingServiceUsingBaseEncoding serviceBaseEncoding;
+ UrlEncodingServiceWithCompression serviceWithCompression;
+ UrlEncodingServiceUsingBaseEncodingAbstract serviceBaseEncoding;
@Before
public void setUp() throws Exception {
- serviceWithCompression = new
UrlEncodingServiceWithCompressionAbstract(){};
- serviceBaseEncoding = new UrlEncodingServiceUsingBaseEncoding(){};
+ serviceWithCompression = new UrlEncodingServiceWithCompression();
+ serviceBaseEncoding = new
UrlEncodingServiceUsingBaseEncodingAbstract(){};
}
@Test
--
To stop receiving notification emails like this one, please contact
ahu...@apache.org.
