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/27 21:43:00 UTC
[isis] branch master updated: ISIS-1841 move deprecated classes
from applib to applib-legacy
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 9d66cb3 ISIS-1841 move deprecated classes from applib to applib-legacy
9d66cb3 is described below
commit 9d66cb3f13b79226c6b75022d128c51f288f32eb
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Feb 27 22:42:56 2018 +0100
ISIS-1841 move deprecated classes from applib to applib-legacy
---
.../isis/applib/fixtures/AbstractFixture.java | 0
.../isis/applib/fixtures/AbstractFixtureSusa.java | 0
.../apache/isis/applib/fixtures/BaseFixture.java | 0
.../isis/applib/fixtures/CompositeFixture.java | 0
.../apache/isis/applib/fixtures/DateFixture.java | 0
.../apache/isis/applib/fixtures/LogonFixture.java | 0
.../isis/applib/fixtures/SwitchUserFixture.java | 0
.../fixtures/switchuser/SwitchUserService.java | 0
.../switchuser/SwitchUserServiceAware.java | 0
.../applib/fixtures/switchuser/package-info.java | 0
.../java/org/apache/isis/applib/layout/Util.java | 0
.../component/CollectionLayoutData_legacy.java} | 31 +++++++++++---------
.../applib/layout/component/FieldSet_legacy.java} | 33 +++++++++++++---------
.../services/actinvoc/ActionInvocationContext.java | 0
.../applib/services/actinvoc/package-info.java | 0
.../ExceptionRecognizerAbstractLegacy.java | 0
.../ExceptionRecognizerForTypeLegacy.java | 0
.../repository/RepositoryServiceLegacy.java | 0
...aseEncodingWithSupportForLargeUrlsAbstract.java | 1 +
.../java/org/apache/isis/applib/value/Date.java | 0
.../org/apache/isis/applib/value/DateTime.java | 0
.../java/org/apache/isis/applib/value/Time.java | 0
.../org/apache/isis/applib/value/TimeStamp.java | 0
.../ExceptionRecognizerForTypeLegacyTest.java} | 27 +-----------------
.../ExceptionRecognizerGeneralLegacyTest.java} | 25 ++--------------
.../org/apache/isis/applib/value/DateTest.java | 0
.../org/apache/isis/applib/value/DateTimeTest.java | 0
.../apache/isis/applib/value/TimeStampTest.java | 0
.../org/apache/isis/applib/value/TimeTest.java | 0
.../org/apache/isis/applib/AbstractSubscriber.java | 24 ++++++++++++++--
.../collections/package-info.java} | 24 +++++++---------
.../exceprecog/ExceptionRecognizerForTypeTest.java | 29 -------------------
.../exceprecog/ExceptionRecognizerGeneralTest.java | 26 -----------------
.../services/acceptheader/AcceptHeaderService.java | 0
.../applib/services/acceptheader/package-info.java | 0
35 files changed, 73 insertions(+), 147 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixture.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/AbstractFixture.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixture.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/AbstractFixture.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixtureSusa.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/AbstractFixtureSusa.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/fixtures/AbstractFixtureSusa.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/AbstractFixtureSusa.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/BaseFixture.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/BaseFixture.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/fixtures/BaseFixture.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/BaseFixture.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java
similarity index 100%
copy from core/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java
copy to core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/DateFixture.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/DateFixture.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/fixtures/DateFixture.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/DateFixture.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/LogonFixture.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/SwitchUserFixture.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/SwitchUserFixture.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/fixtures/SwitchUserFixture.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/SwitchUserFixture.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserService.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserService.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserServiceAware.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserServiceAware.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserServiceAware.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserServiceAware.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/package-info.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/switchuser/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/package-info.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/fixtures/switchuser/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/Util.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/layout/Util.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/layout/Util.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/layout/Util.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData_legacy.java
similarity index 57%
copy from core/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java
copy to core/applib-legacy/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData_legacy.java
index d6f3f97..b29f284 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java
+++ b/core/applib-legacy/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData_legacy.java
@@ -16,22 +16,25 @@
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.isis.applib.layout.component;
-package org.apache.isis.applib.fixtures;
+import java.util.function.Function;
-import java.util.List;
-
-import org.apache.isis.applib.fixturescripts.FixtureScript;
-
-/**
- * @deprecated - use {@link FixtureScript} instead.
- */
@Deprecated
-public interface CompositeFixture {
+public class CollectionLayoutData_legacy {
+
+ @Deprecated //[ahuber] not used, or otherwise replace with java 8+ function variant
+ public static class Functions {
+ private Functions(){}
- /**
- * @deprecated - use {@link FixtureScript} instead.
- */
- @Deprecated
- public List<Object> getFixtures();
+ public static Function<CollectionLayoutData, String> id() {
+ return new Function<CollectionLayoutData, String>() {
+ @Override
+ public String apply(final CollectionLayoutData metadata) {
+ return metadata.getId();
+ }
+ };
+ }
+ }
+
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/layout/component/FieldSet_legacy.java
similarity index 57%
rename from core/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/layout/component/FieldSet_legacy.java
index d6f3f97..0ff20ac 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixtures/CompositeFixture.java
+++ b/core/applib-legacy/src/main/java/org/apache/isis/applib/layout/component/FieldSet_legacy.java
@@ -16,22 +16,29 @@
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.isis.applib.layout.component;
-package org.apache.isis.applib.fixtures;
+import java.util.function.Function;
-import java.util.List;
+import javax.annotation.Nullable;
-import org.apache.isis.applib.fixturescripts.FixtureScript;
-
-/**
- * @deprecated - use {@link FixtureScript} instead.
- */
@Deprecated
-public interface CompositeFixture {
+public class FieldSet_legacy {
+
+
+ @Deprecated //[ahuber] not used, or otherwise replace with java 8+ function variant
+ public static class Util {
+ private Util(){}
+ public static Function<? super FieldSet, String> nameOf() {
+ return new Function<FieldSet, String>() {
+ @Nullable @Override
+ public String apply(@Nullable final FieldSet fieldSet) {
+ return fieldSet.getName();
+ }
+ };
+ }
+ }
+
+
- /**
- * @deprecated - use {@link FixtureScript} instead.
- */
- @Deprecated
- public List<Object> getFixtures();
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/actinvoc/ActionInvocationContext.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/services/actinvoc/ActionInvocationContext.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/actinvoc/ActionInvocationContext.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/services/actinvoc/ActionInvocationContext.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/actinvoc/package-info.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/services/actinvoc/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/actinvoc/package-info.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/services/actinvoc/package-info.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstractLegacy.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstractLegacy.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstractLegacy.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstractLegacy.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeLegacy.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeLegacy.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeLegacy.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeLegacy.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/repository/RepositoryServiceLegacy.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/services/repository/RepositoryServiceLegacy.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/repository/RepositoryServiceLegacy.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/services/repository/RepositoryServiceLegacy.java
diff --git a/core/applib/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
similarity index 96%
rename from core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingWithSupportForLargeUrlsAbstract.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingWithSupportForLargeUrlsAbstract.java
index c0d7689..739ec60 100644
--- a/core/applib/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
@@ -12,6 +12,7 @@ import com.google.common.collect.Maps;
* @DomainService(nature=DOMAIN, menuOrder="100")
* </pre>
*/
+@Deprecated // [ahuber] why not use variant with compression ?
public abstract class UrlEncodingServiceUsingBaseEncodingWithSupportForLargeUrlsAbstract extends UrlEncodingServiceUsingBaseEncoding {
/**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/Date.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/value/Date.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/value/Date.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/value/Date.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/DateTime.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/value/DateTime.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/value/DateTime.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/value/DateTime.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/Time.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/value/Time.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/value/Time.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/value/Time.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/value/TimeStamp.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/value/TimeStamp.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/value/TimeStamp.java
rename to core/applib-legacy/src/main/java/org/apache/isis/applib/value/TimeStamp.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java b/core/applib-legacy/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeLegacyTest.java
similarity index 73%
copy from core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java
copy to core/applib-legacy/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeLegacyTest.java
index 9c8da58..0538eef 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java
+++ b/core/applib-legacy/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeLegacyTest.java
@@ -27,7 +27,7 @@ import java.util.function.Function;
import org.junit.Test;
-public class ExceptionRecognizerForTypeTest {
+public class ExceptionRecognizerForTypeLegacyTest {
private ExceptionRecognizer ersForType;
@@ -45,31 +45,6 @@ public class ExceptionRecognizerForTypeTest {
}
}
- private Function<String,String> prepend = new Function<String, String>() {
- @Override
- public String apply(String input) {
- return "pre: " + input;
- }
- };
-
- @Test
- public void whenRecognized() {
- ersForType = new ExceptionRecognizerForType(FooException.class);
- assertThat(ersForType.recognize(new FooException()), is("foo"));
- }
-
- @Test
- public void whenDoesNotRecognize() {
- ersForType = new ExceptionRecognizerForType(FooException.class);
- assertThat(ersForType.recognize(new BarException()), is(nullValue()));
- }
-
- @Test
- public void whenRecognizedWithMessageParser() {
- ersForType = new ExceptionRecognizerForType(FooException.class, prepend);
- assertThat(ersForType.recognize(new FooException()), is("pre: foo"));
- }
-
// -- LEGACY TESTS
private com.google.common.base.Function<String,String> prependLegacy =
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java b/core/applib-legacy/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralLegacyTest.java
similarity index 73%
copy from core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java
copy to core/applib-legacy/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralLegacyTest.java
index e9c8bcb..26bf3be 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java
+++ b/core/applib-legacy/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralLegacyTest.java
@@ -27,7 +27,7 @@ import java.util.function.Predicate;
import org.junit.Test;
-public class ExceptionRecognizerGeneralTest {
+public class ExceptionRecognizerGeneralLegacyTest {
private ExceptionRecognizer ersGeneral;
@@ -63,26 +63,5 @@ public class ExceptionRecognizerGeneralTest {
ersGeneral = new ExceptionRecognizerAbstractLegacy(com.google.common.base.Predicates.<Throwable>alwaysTrue(), prepend){};
assertThat(ersGeneral.recognize(new FooException()), is("pre: foo"));
}
-
- private final static Predicate<Throwable> ALWAYS_TRUE = __->true;
- private final static Predicate<Throwable> ALWAYS_FALSE = __->false;
-
- @Test
- public void whenRecognized() {
- ersGeneral = new ExceptionRecognizerAbstract(ALWAYS_TRUE){};
- assertThat(ersGeneral.recognize(new FooException()), is("foo"));
- }
-
- @Test
- public void whenDoesNotRecognize() {
- ersGeneral = new ExceptionRecognizerAbstract(ALWAYS_FALSE){};
- assertThat(ersGeneral.recognize(new FooException()), is(nullValue()));
- }
-
- @Test
- public void whenRecognizedWithMessageParser() {
- ersGeneral = new ExceptionRecognizerAbstract(ALWAYS_TRUE, s->"pre: " + s){};
- assertThat(ersGeneral.recognize(new FooException()), is("pre: foo"));
- }
-
+
}
diff --git a/core/applib/src/test/java/org/apache/isis/applib/value/DateTest.java b/core/applib-legacy/src/test/java/org/apache/isis/applib/value/DateTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/value/DateTest.java
rename to core/applib-legacy/src/test/java/org/apache/isis/applib/value/DateTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/value/DateTimeTest.java b/core/applib-legacy/src/test/java/org/apache/isis/applib/value/DateTimeTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/value/DateTimeTest.java
rename to core/applib-legacy/src/test/java/org/apache/isis/applib/value/DateTimeTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/value/TimeStampTest.java b/core/applib-legacy/src/test/java/org/apache/isis/applib/value/TimeStampTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/value/TimeStampTest.java
rename to core/applib-legacy/src/test/java/org/apache/isis/applib/value/TimeStampTest.java
diff --git a/core/applib/src/test/java/org/apache/isis/applib/value/TimeTest.java b/core/applib-legacy/src/test/java/org/apache/isis/applib/value/TimeTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/value/TimeTest.java
rename to core/applib-legacy/src/test/java/org/apache/isis/applib/value/TimeTest.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/AbstractSubscriber.java b/core/applib/src/main/java/org/apache/isis/applib/AbstractSubscriber.java
index 23d681f..27ad1f7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/AbstractSubscriber.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/AbstractSubscriber.java
@@ -23,6 +23,12 @@ import javax.annotation.PostConstruct;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.eventbus.EventBusService;
+import org.apache.isis.applib.services.factory.FactoryService;
+import org.apache.isis.applib.services.message.MessageService;
+import org.apache.isis.applib.services.repository.RepositoryService;
+import org.apache.isis.applib.services.title.TitleService;
+import org.apache.isis.applib.services.user.UserService;
+import org.apache.isis.applib.services.xactn.TransactionService;
/**
* Convenience class for services that act as subscribers.
@@ -42,9 +48,23 @@ public abstract class AbstractSubscriber {
eventBusService.unregister(this);
}
-
@javax.inject.Inject
- protected DomainObjectContainer container;
+ protected MessageService messageService;
+
+ @javax.inject.Inject
+ protected TitleService titleService;
+
+ @javax.inject.Inject
+ protected RepositoryService repositoryService;
+
+ @javax.inject.Inject
+ protected FactoryService factoryService;
+
+ @javax.inject.Inject
+ protected UserService userService;
+
+ @javax.inject.Inject
+ protected TransactionService transactionService;
@javax.inject.Inject
protected EventBusService eventBusService;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/acceptheader/AcceptHeaderService.java b/core/applib/src/main/java/org/apache/isis/applib/internal/collections/package-info.java
similarity index 73%
copy from core/applib/src/main/java/org/apache/isis/applib/services/acceptheader/AcceptHeaderService.java
copy to core/applib/src/main/java/org/apache/isis/applib/internal/collections/package-info.java
index 017604c..455f8c3 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/acceptheader/AcceptHeaderService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/internal/collections/package-info.java
@@ -16,17 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.acceptheader;
-
-import java.util.List;
-
-import com.google.common.net.MediaType;
-
-import org.apache.isis.applib.annotation.Programmatic;
-
-public interface AcceptHeaderService {
-
- @Programmatic
- List<MediaType> getAcceptableMediaTypes();
-
-}
+/**
+ * <h1>Internal API</h1>
+ * Internal classes, contributing to the internal proprietary API.
+ * These may be changed or removed without notice!
+ * <p>
+ * <b>WARNING</b>:
+ * Do NOT use any of the classes provided by this package!
+ * </p>
+ */
+package org.apache.isis.applib.internal.collections;
\ No newline at end of file
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java
index 9c8da58..081a2ab 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java
@@ -69,35 +69,6 @@ public class ExceptionRecognizerForTypeTest {
ersForType = new ExceptionRecognizerForType(FooException.class, prepend);
assertThat(ersForType.recognize(new FooException()), is("pre: foo"));
}
-
- // -- LEGACY TESTS
-
- private com.google.common.base.Function<String,String> prependLegacy =
- new com.google.common.base.Function<String, String>() {
- @Override
- public String apply(String input) {
- return "pre: " + input;
- }
- };
-
- @Test
- public void legacyWhenRecognized() {
- ersForType = new ExceptionRecognizerForTypeLegacy(FooException.class);
- assertThat(ersForType.recognize(new FooException()), is("foo"));
- }
-
- @Test
- public void legacyWhenDoesNotRecognize() {
- ersForType = new ExceptionRecognizerForTypeLegacy(FooException.class);
- assertThat(ersForType.recognize(new BarException()), is(nullValue()));
- }
-
- @Test
- public void legacyWhenRecognizedWithMessageParser() {
- ersForType = new ExceptionRecognizerForTypeLegacy(FooException.class, prependLegacy);
- assertThat(ersForType.recognize(new FooException()), is("pre: foo"));
- }
-
}
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java
index e9c8bcb..d7af332 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java
@@ -38,32 +38,6 @@ public class ExceptionRecognizerGeneralTest {
}
}
- private com.google.common.base.Function<String,String> prepend = new com.google.common.base.Function<String, String>() {
- @Override
- public String apply(String input) {
- return "pre: " + input;
- }
- };
-
-
- @Test
- public void whenRecognized_guava() {
- ersGeneral = new ExceptionRecognizerAbstractLegacy(com.google.common.base.Predicates.<Throwable>alwaysTrue()){};
- assertThat(ersGeneral.recognize(new FooException()), is("foo"));
- }
-
- @Test
- public void whenDoesNotRecognize_guava() {
- ersGeneral = new ExceptionRecognizerAbstractLegacy(com.google.common.base.Predicates.<Throwable>alwaysFalse()){};
- assertThat(ersGeneral.recognize(new FooException()), is(nullValue()));
- }
-
- @Test
- public void whenRecognizedWithMessageParser_guava() {
- ersGeneral = new ExceptionRecognizerAbstractLegacy(com.google.common.base.Predicates.<Throwable>alwaysTrue(), prepend){};
- assertThat(ersGeneral.recognize(new FooException()), is("pre: foo"));
- }
-
private final static Predicate<Throwable> ALWAYS_TRUE = __->true;
private final static Predicate<Throwable> ALWAYS_FALSE = __->false;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/acceptheader/AcceptHeaderService.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/applib/services/acceptheader/AcceptHeaderService.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/acceptheader/AcceptHeaderService.java
rename to core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/applib/services/acceptheader/AcceptHeaderService.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/acceptheader/package-info.java b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/applib/services/acceptheader/package-info.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/acceptheader/package-info.java
rename to core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/applib/services/acceptheader/package-info.java
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.