You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/10/16 12:43:25 UTC
[isis] branch dev/2.0.0/ISIS-1742-remove-deprecations updated
(ba1817a -> 6bc8bb6)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git.
from ba1817a ISIS-1742: removes unused methods of ClassUtil, moves ClassUtil.Functions method into ClassFunctions instead.
new d5d57c5 ISIS-1742: removes unused method in InputStreamExtensions
new d700ea8 ISIS-1742: deletes unused methods of ListExtensions
new fd8333d ISIS-1742: deletes unused methods in MethodExtensions
new f29bbbc ISIS-1742: removes unused methods from ObjectExtensions
new 67930a7 ISIS-1742: deletes PropertiesExtensions, since not used.
new 871165e ISIS-1742: deletes method from ResourceUtil, unused
new e7819db ISIS-1742: deletes RunnableExtensions, unused
new a74fe5e ISIS-1742: deletes StringBuilderExtensions, unused
new 8de7cdf ISIS-1742: deletes unused methods from StringExtensions
new 0ed1679 ISIS-1742: deletes unused method from ThrowableExtensions
new 96db249 ISIS-1742: improves ThrowableExtensions#throwWithinIsisException - use the provided error parameter
new 55e9574 ISIS-1742: deletes unused methods in StringExtensions
new bb537f9 ISIS-11742: deletes unused methods from IsisMatchers
new f3616e8 ISIS-1742: deletes UrlEncodingUtils#urlEncode, since not used
new 829b7b1 ISIS-1742: renames UrlEncodingUtils to UrlDecoderUtil, and deletes unused constants
new cfb9b6b ISIS-1742: deletes commented out code, .ucd file, fixes javadoc references
new cf8130c ISIS-1742: deletes AnonymousSession, unused
new 140f992 ISIS-1742: deletes OidMatchers & OidMatchers (two different classes, unrelated except with same name, both unused).
new 4ee5272 ISIS-1742: deletes unused IsisMatchers, or - where used by only a single test class - moves them to their only usage
new b9950c9 ISIS-1742: deletes Oid.Matchers, since unused
new b16398e ISIS-1742: updates todo doc, removed filters from applib
new 1232412 ISIS-1742: moves ContentMappingService from applib.conmap to applib.services.conmap
new 3d16cdc ISIS-1742: deletes the non-applib ContentMappingService
new 25da4f5 ISIS-1742: deletes unused RepresentationServiceForRestfulObjects
new ca8a36e ISIS-1742: removes unused methods from applib.clock.Clock
new 6bc8bb6 ISIS-1742: removes FixtureScript.ExecutionContext#add methods (use #addResult instead) and removes asKeyValueMap(...) utility method completely
The 26 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/isis/applib/clock/Clock.java | 30 +--
.../isis/applib/fixturescripts/FixtureScript.java | 34 ---
.../conmap/ContentMappingService.java | 2 +-
.../applib/{ => services}/conmap/package-info.java | 4 +-
.../fixturescripts/ExecutionContextTest.java | 51 ----
.../ExecutionParameters_AsKeyValueMap_Test.java | 58 ++++
...tersTest.java => ExecutionParameters_Test.java} | 2 +-
.../commons/authentication/AnonymousSession.java | 56 ----
.../isis/core/commons/config/package-info.java | 6 +-
.../encoding/DataInputExtendedDecorator.java | 10 -
.../apache/isis/core/commons/encoding/encoding.ucd | 166 ------------
.../apache/isis/core/commons/lang/ClassUtil.java | 5 -
.../core/commons/lang/InputStreamExtensions.java | 7 -
.../isis/core/commons/lang/ListExtensions.java | 45 ----
.../isis/core/commons/lang/MethodExtensions.java | 4 -
.../isis/core/commons/lang/ObjectExtensions.java | 48 ----
.../core/commons/lang/PropertiesExtensions.java | 47 ----
.../isis/core/commons/lang/ResourceUtil.java | 32 ---
.../isis/core/commons/lang/RunnableExtensions.java | 33 ---
.../core/commons/lang/StringBuilderExtensions.java | 29 --
.../isis/core/commons/lang/StringExtensions.java | 149 ----------
.../core/commons/lang/ThrowableExtensions.java | 21 +-
.../isis/core/commons/matchers/IsisMatchers.java | 300 +--------------------
.../isis/core/commons/url/UrlDecoderUtil.java} | 24 +-
.../isis/core/commons/url/UrlEncodingUtils.java | 78 ------
.../apache/isis/core/commons/xml/package-info.java | 28 --
.../isis/core/metamodel/adapter/oid/Oid.java | 40 ---
.../core/metamodel/adapter/oid/OidMatchers.java | 48 ----
.../isis/core/metamodel/adapter/oid/RootOid.java | 4 +-
.../IsisMatchers_ContainsStripNewLinesTest.java | 68 -----
.../IsisMatchers_EndsWithStripNewLinesTest.java | 63 -----
.../IsisMatchers_EqualToStripNewLinesTest.java | 63 -----
.../IsisMatchers_NonEmptyStringOrNullTest.java | 53 ----
.../IsisMatchers_StartsWithStripNewLinesTest.java | 63 -----
...romptStyleFacetFromPropertyAnnotation_Test.java | 29 +-
...rdAuthenticationManager_AuthenticationTest.java | 28 +-
.../system/TypeExtractorMethodReturnTest.java | 2 +-
.../system/TypeExtractorMethodsParametersTest.java | 36 ++-
.../restfulobjects/applib/util/ParserTest.java | 38 ++-
.../RepresentationServiceForRestfulObjects.java | 24 --
.../service/conmap/ContentMappingService.java | 41 ---
.../ContentNegotiationServiceXRoDomainType.java | 23 +-
.../resources/DomainObjectResourceServerside.java | 5 +-
.../resources/DomainServiceResourceServerside.java | 5 +-
.../server/resources/ResourceAbstract.java | 7 +-
.../isis/viewer/wicket/model/util/OidMatchers.java | 51 ----
todo-deprecation-list.txt | 39 ++-
47 files changed, 235 insertions(+), 1764 deletions(-)
rename core/applib/src/main/java/org/apache/isis/applib/{ => services}/conmap/ContentMappingService.java (96%)
rename core/applib/src/main/java/org/apache/isis/applib/{ => services}/conmap/package-info.java (87%)
create mode 100644 core/applib/src/test/java/org/apache/isis/applib/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
rename core/applib/src/test/java/org/apache/isis/applib/fixturescripts/{ExecutionParametersTest.java => ExecutionParameters_Test.java} (99%)
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AnonymousSession.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/encoding.ucd
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/commons/lang/PropertiesExtensions.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/commons/lang/RunnableExtensions.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringBuilderExtensions.java
copy core/{viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/UrlDecoderUtils.java => metamodel/src/main/java/org/apache/isis/core/commons/url/UrlDecoderUtil.java} (70%)
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/commons/url/UrlEncodingUtils.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/commons/xml/package-info.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/OidMatchers.java
delete mode 100644 core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_ContainsStripNewLinesTest.java
delete mode 100644 core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EndsWithStripNewLinesTest.java
delete mode 100644 core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EqualToStripNewLinesTest.java
delete mode 100644 core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_NonEmptyStringOrNullTest.java
delete mode 100644 core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_StartsWithStripNewLinesTest.java
delete mode 100644 core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceForRestfulObjects.java
delete mode 100644 core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conmap/ContentMappingService.java
delete mode 100644 core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/OidMatchers.java
--
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].
[isis] 04/26: ISIS-1742: removes unused methods from
ObjectExtensions
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f29bbbcb9507c18d102b9a8edbcb3977101bf9f2
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 11:58:52 2017 +0100
ISIS-1742: removes unused methods from ObjectExtensions
---
.../isis/core/commons/lang/ObjectExtensions.java | 48 ----------------------
1 file changed, 48 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ObjectExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ObjectExtensions.java
index ff1d7cc..170a699 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ObjectExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ObjectExtensions.java
@@ -21,15 +21,7 @@ package org.apache.isis.core.commons.lang;
import java.io.IOException;
import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Iterator;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.Vector;
/**
* Helpers to co-erce non-generic values into type-safe generics without
@@ -46,50 +38,10 @@ public final class ObjectExtensions {
}
@SuppressWarnings("unchecked")
- public static <T> Enumeration<T> asEnumerationT(final Object extendee, final Class<T> castTo) {
- return (Enumeration<T>) extendee;
- }
-
- @SuppressWarnings("unchecked")
- public static <T> Iterator<T> asIteratorT(final Object extendee, final Class<T> castTo) {
- return (Iterator<T>) extendee;
- }
-
- @SuppressWarnings("unchecked")
- public static <T> Collection<T> asCollectionT(final Object extendee, final Class<T> castTo) {
- return (Collection<T>) extendee;
- }
-
- @SuppressWarnings("unchecked")
public static <T> List<T> asListT(final Object extendee, final Class<T> castTo) {
return (List<T>) extendee;
}
- @SuppressWarnings("unchecked")
- public static <T> Vector<T> asVectorT(final Object extendee, final Class<T> castTo) {
- return (Vector<T>) extendee;
- }
-
- @SuppressWarnings("unchecked")
- public static <T> Set<T> asSetT(final Object extendee, final Class<T> castTo) {
- return (Set<T>) extendee;
- }
-
- @SuppressWarnings("unchecked")
- public static <T> SortedSet<T> asSortedSetT(final Object extendee, final Class<T> castTo) {
- return (SortedSet<T>) extendee;
- }
-
- @SuppressWarnings("unchecked")
- public static <K, V> Map<K, V> asMapKV(final Object extendee, final Class<K> keyCastTo, final Class<V> valueCastTo) {
- return (Map<K, V>) extendee;
- }
-
- @SuppressWarnings("unchecked")
- public static <K, V> SortedMap<K, V> asSortedMapKV(final Object extendee, final Class<K> keyCastTo, final Class<V> valueCastTo) {
- return (SortedMap<K, V>) extendee;
- }
-
public static Object[] asArray(final Object extendee) {
final Class<?> arrayType = extendee.getClass().getComponentType();
if (!arrayType.isPrimitive()) {
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 17/26: ISIS-1742: deletes AnonymousSession, unused
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit cf8130c3b6f378de999d97fbc079ba267254c7ec
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 12:55:47 2017 +0100
ISIS-1742: deletes AnonymousSession, unused
---
.../commons/authentication/AnonymousSession.java | 56 ----------------------
1 file changed, 56 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AnonymousSession.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AnonymousSession.java
deleted file mode 100644
index f26ec9c..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AnonymousSession.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.commons.authentication;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-import org.apache.isis.core.commons.encoding.DataInputExtended;
-
-/**
- * Originally designed for webapp viewers that want to provide access without
- * requiring that the user logs on.
- *
- * <p>
- * For example, a webapp want to have a registration/sign-up page, or a 'lost
- * password' page.
- *
- * @deprecated - unused by framework and not part of applib
- */
-@Deprecated
-public class AnonymousSession extends AuthenticationSessionAbstract {
-
- private static final long serialVersionUID = 1L;
-
- private static final String USER_NAME = "__web_default";
- private static final String ROLE = "not-logged-in";
- private static final String CODE = "";
-
-
- public AnonymousSession() {
- super(USER_NAME, Arrays.asList(ROLE), CODE);
- }
-
- public AnonymousSession(final DataInputExtended input) throws IOException {
- super(input);
- }
-
-
-}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 05/26: ISIS-1742: deletes PropertiesExtensions,
since not used.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 67930a758d3df44942be1d3d3261d09ceab3b758
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 11:59:21 2017 +0100
ISIS-1742: deletes PropertiesExtensions, since not used.
---
.../core/commons/lang/PropertiesExtensions.java | 47 ----------------------
1 file changed, 47 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/PropertiesExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/PropertiesExtensions.java
deleted file mode 100644
index bd7d36c..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/PropertiesExtensions.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.isis.core.commons.lang;
-
-import java.util.Properties;
-
-import com.google.common.base.Joiner;
-
-public class PropertiesExtensions {
-
- private PropertiesExtensions(){}
-
- public static Properties subset(Properties extendee, String... prefix) {
- final String prefices = Joiner.on(".").join(prefix);
- return subsetOf(extendee, prefices+".");
- }
-
- private static Properties subsetOf(Properties extendee, String prefix) {
- final int prefixLength = prefix.length();
-
- final Properties subsetProperties = new Properties();
- for(Object keyObj: extendee.keySet()) {
- final String key = (String)keyObj;
- if (key.startsWith(prefix)) {
- final String keySuffix = key.substring(prefixLength);
- subsetProperties.put(keySuffix, extendee.get(key));
- }
- }
- return subsetProperties;
- }
-
-
-}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 13/26: ISIS-11742: deletes unused methods from IsisMatchers
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit bb537f96d2e2280730e5873555df0b9cb87ddbd9
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 12:09:32 2017 +0100
ISIS-11742: deletes unused methods from IsisMatchers
---
.../isis/core/commons/matchers/IsisMatchers.java | 108 ++-------------------
1 file changed, 7 insertions(+), 101 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
index 73b18d7..1e659ed 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
@@ -19,15 +19,18 @@
package org.apache.isis.core.commons.matchers;
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
import java.util.List;
-import org.hamcrest.*;
+
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.Description;
+import org.hamcrest.Factory;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
import org.hamcrest.core.IsEqual;
import org.hamcrest.core.StringContains;
import org.hamcrest.core.StringEndsWith;
import org.hamcrest.core.StringStartsWith;
+
import org.apache.isis.core.commons.lang.StringExtensions;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -164,11 +167,6 @@ public final class IsisMatchers {
}
@Factory
- public static <T extends Comparable<T>> Matcher<T> greaterThan(final T c) {
- return Matchers.greaterThan(c);
- }
-
- @Factory
public static Matcher<Class<?>> classEqualTo(final Class<?> operand) {
class ClassEqualsMatcher extends TypeSafeMatcher<Class<?>> {
@@ -193,23 +191,6 @@ public final class IsisMatchers {
}
@Factory
- public static Matcher<File> existsAndNotEmpty() {
-
- return new TypeSafeMatcher<File>() {
-
- @Override
- public void describeTo(final Description arg0) {
- arg0.appendText("exists and is not empty");
- }
-
- @Override
- public boolean matchesSafely(final File f) {
- return f.exists() && f.length() > 0;
- }
- };
- }
-
- @Factory
public static Matcher<String> matches(final String regex) {
return new TypeSafeMatcher<String>() {
@@ -258,60 +239,6 @@ public final class IsisMatchers {
}
@Factory
- public static <T> Matcher<List<T>> listContaining(final T t) {
- return new TypeSafeMatcher<List<T>>() {
-
- @Override
- public void describeTo(Description arg0) {
- arg0.appendText("list containing ").appendValue(t);
- }
-
- @Override
- public boolean matchesSafely(List<T> arg0) {
- return arg0.contains(t);
- }
- };
- }
-
- @Factory
- public static <T> Matcher<List<T>> listContainingAll(final T... items) {
- return new TypeSafeMatcher<List<T>>() {
-
- @Override
- public void describeTo(Description arg0) {
- arg0.appendText("has items ").appendValue(items);
-
- }
-
- @Override
- public boolean matchesSafely(List<T> arg0) {
- return arg0.containsAll(Arrays.asList(items));
- }
- };
- }
-
- @Factory
- public static Matcher<List<Object>> containsObjectOfType(final Class<?> cls) {
- return new TypeSafeMatcher<List<Object>>() {
-
- @Override
- public void describeTo(final Description desc) {
- desc.appendText("contains instance of type " + cls.getName());
- }
-
- @Override
- public boolean matchesSafely(final List<Object> items) {
- for (final Object object : items) {
- if (cls.isAssignableFrom(object.getClass())) {
- return true;
- }
- }
- return false;
- }
- };
- }
-
- @Factory
public static Matcher<String> startsWith(final String expected) {
return new TypeSafeMatcher<String>() {
@@ -343,26 +270,5 @@ public final class IsisMatchers {
};
}
-
- @Factory
- public static Matcher<File> equalsFile(final File file) throws IOException {
- final String canonicalPath = file.getCanonicalPath();
- return new TypeSafeMatcher<File>() {
-
- @Override
- public void describeTo(Description arg0) {
- arg0.appendText("file '" + canonicalPath + "'");
- }
-
- @Override
- public boolean matchesSafely(File arg0) {
- try {
- return arg0.getCanonicalPath().equals(canonicalPath);
- } catch (IOException e) {
- return false;
- }
- }
- };
- }
}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 10/26: ISIS-1742: deletes unused method from
ThrowableExtensions
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0ed167913d1fd7ba4d9be15495d44705144acf7e
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 12:03:34 2017 +0100
ISIS-1742: deletes unused method from ThrowableExtensions
---
.../isis/core/commons/lang/ThrowableExtensions.java | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ThrowableExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ThrowableExtensions.java
index 98ccc6a..2851593 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ThrowableExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ThrowableExtensions.java
@@ -19,9 +19,6 @@
package org.apache.isis.core.commons.lang;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
import java.lang.reflect.InvocationTargetException;
import org.apache.isis.applib.RecoverableException;
@@ -30,22 +27,6 @@ import org.apache.isis.core.metamodel.exceptions.MetaModelException;
public final class ThrowableExtensions {
- public static String stackTraceFor(final Throwable extendee) {
- ByteArrayOutputStream baos = null;
- try {
- baos = new ByteArrayOutputStream();
- extendee.printStackTrace(new PrintStream(baos));
- return baos.toString();
- } finally {
- if (baos != null) {
- try {
- baos.close();
- } catch (final IOException ignore) {
- }
- }
- }
- }
-
public static void throwWithinIsisException(final InvocationTargetException e, final String error) {
final Throwable targetException = e.getTargetException();
if (targetException instanceof RecoverableException) {
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 20/26: ISIS-1742: deletes Oid.Matchers, since unused
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b9950c9c231b87ca465fad7747c61d80394ad4c4
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 13:06:04 2017 +0100
ISIS-1742: deletes Oid.Matchers, since unused
---
.../isis/core/metamodel/adapter/oid/Oid.java | 40 ----------------------
1 file changed, 40 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
index 7d23946..0d6f59f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
@@ -19,10 +19,6 @@
package org.apache.isis.core.metamodel.adapter.oid;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.core.commons.encoding.Encodable;
@@ -115,42 +111,6 @@ public interface Oid extends Encodable {
}
- public final static class Matchers {
-
- private Matchers() {
- }
-
- public static Matcher<Oid> isTransient() {
- return new TypeSafeMatcher<Oid>() {
-
- @Override
- public boolean matchesSafely(final Oid item) {
- return item.isTransient();
- }
-
- @Override
- public void describeTo(final Description description) {
- description.appendText("is transient");
- }
- };
- }
-
- public static Matcher<Oid> isPersistent() {
- return new TypeSafeMatcher<Oid>() {
-
- @Override
- public boolean matchesSafely(final Oid item) {
- return !item.isTransient();
- }
-
- @Override
- public void describeTo(final Description description) {
- description.appendText("is persistent");
- }
- };
- }
-
- }
}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 11/26: ISIS-1742: improves
ThrowableExtensions#throwWithinIsisException - use the provided error
parameter
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 96db249b8cb0d22cd73c3a9f95556350f9f8e2da
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 12:04:24 2017 +0100
ISIS-1742: improves ThrowableExtensions#throwWithinIsisException - use the provided error parameter
---
.../java/org/apache/isis/core/commons/lang/ThrowableExtensions.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ThrowableExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ThrowableExtensions.java
index 2851593..70cf875 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ThrowableExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ThrowableExtensions.java
@@ -33,7 +33,7 @@ public final class ThrowableExtensions {
// an application exception from the domain code is re-thrown as an
// IsisException with same semantics
// TODO: should probably be using ApplicationException here
- throw new IsisApplicationException(targetException);
+ throw new IsisApplicationException(error, targetException);
}
if (targetException instanceof RuntimeException) {
throw (RuntimeException) targetException;
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 23/26: ISIS-1742: deletes the non-applib
ContentMappingService
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 3d16cdcf0e16ac0d2f8464c92439280c97649ea6
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 13:18:58 2017 +0100
ISIS-1742: deletes the non-applib ContentMappingService
---
.../service/conmap/ContentMappingService.java | 41 ----------------------
.../ContentNegotiationServiceXRoDomainType.java | 23 ++++--------
2 files changed, 6 insertions(+), 58 deletions(-)
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conmap/ContentMappingService.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conmap/ContentMappingService.java
deleted file mode 100644
index 44f6e77..0000000
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conmap/ContentMappingService.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.viewer.restfulobjects.rendering.service.conmap;
-
-import java.util.List;
-
-import javax.ws.rs.core.MediaType;
-
-import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
-
-/**
- * @deprecated - replaced by simplified version, {@link org.apache.isis.applib.services.conmap.ContentMappingService}, in the applib.
- */
-@Deprecated
-public interface ContentMappingService {
-
- /**
- * @deprecated - replaced by simplified version, {@link org.apache.isis.applib.services.conmap.ContentMappingService#map(Object, List)}, in the applib.
- */
- @Deprecated
- @Programmatic
- Object map(Object object, final List<MediaType> acceptableMediaTypes, final RepresentationType representationType);
-
-}
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
index 25cfd17..2eb5d39 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
@@ -25,13 +25,13 @@ import javax.ws.rs.core.Response;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.services.conmap.ContentMappingService;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAndActionInvocation;
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationService;
-import org.apache.isis.viewer.restfulobjects.rendering.service.conmap.ContentMappingService;
/**
* Handles content negotiation for accept headers requiring <code>application/json</code> or <code>application/xml</code>and specifying an x-ro-domain-type; will delegate to
@@ -126,7 +126,7 @@ public class ContentNegotiationServiceXRoDomainType extends ContentNegotiationSe
final String xRoDomainType = mediaType.getParameters().get(X_RO_DOMAIN_TYPE);
final Class<?> domainType = loadClass(xRoDomainType);
- final Object mappedDomainObject = map(domainObject, acceptableMediaTypes, representationType);
+ final Object mappedDomainObject = map(domainObject, acceptableMediaTypes);
ensureDomainObjectAssignable(xRoDomainType, domainType, mappedDomainObject);
@@ -138,34 +138,23 @@ public class ContentNegotiationServiceXRoDomainType extends ContentNegotiationSe
}
/**
- * Delegates to either the applib {@link org.apache.isis.applib.services.conmap.ContentMappingService}, else the
- * original non-applib {@link ContentMappingService}.
+ * Delegates to either the applib {@link ContentMappingService}.
*/
protected Object map(
final Object domainObject,
- final List<MediaType> acceptableMediaTypes,
- final RepresentationType representationType) {
+ final List<MediaType> acceptableMediaTypes) {
- for (org.apache.isis.applib.services.conmap.ContentMappingService contentMappingService : contentMappingServices) {
+ for (ContentMappingService contentMappingService : contentMappingServices) {
Object mappedObject = contentMappingService.map(domainObject, acceptableMediaTypes);
if(mappedObject != null) {
return mappedObject;
}
}
- for (ContentMappingService contentMappingService : legacyContentMappingServices) {
- Object mappedObject = contentMappingService.map(domainObject, acceptableMediaTypes, representationType);
- if(mappedObject != null) {
- return mappedObject;
- }
- }
-
return domainObject;
}
@javax.inject.Inject
- List<org.apache.isis.applib.services.conmap.ContentMappingService> contentMappingServices;
+ List<ContentMappingService> contentMappingServices;
- @javax.inject.Inject
- List<ContentMappingService> legacyContentMappingServices;
}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 03/26: ISIS-1742: deletes unused methods in MethodExtensions
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit fd8333d2e7223f5b0d7c327625ba5bd3aae589d2
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 11:50:14 2017 +0100
ISIS-1742: deletes unused methods in MethodExtensions
---
.../main/java/org/apache/isis/core/commons/lang/MethodExtensions.java | 4 ----
1 file changed, 4 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/MethodExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/MethodExtensions.java
index 2bed5dd..4d4e839 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/MethodExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/MethodExtensions.java
@@ -32,10 +32,6 @@ public class MethodExtensions {
private MethodExtensions() {
}
- public static boolean isPublic(final Method method) {
- return Modifier.isPublic(method.getModifiers());
- }
-
public static boolean isStatic(final Method method) {
return Modifier.isStatic(method.getModifiers());
}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 15/26: ISIS-1742: renames UrlEncodingUtils to UrlDecoderUtil,
and deletes unused constants
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 829b7b17ca4aa4e587c57b991d8e24e590f5c825
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 12:49:26 2017 +0100
ISIS-1742: renames UrlEncodingUtils to UrlDecoderUtil, and deletes unused constants
---
.../package-info.java => url/UrlDecoderUtil.java} | 35 +++++++++---
.../isis/core/commons/url/UrlEncodingUtils.java | 66 ----------------------
.../isis/core/metamodel/adapter/oid/RootOid.java | 4 +-
.../resources/DomainObjectResourceServerside.java | 5 +-
.../resources/DomainServiceResourceServerside.java | 5 +-
.../server/resources/ResourceAbstract.java | 7 +--
6 files changed, 37 insertions(+), 85 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/xml/package-info.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/url/UrlDecoderUtil.java
similarity index 58%
rename from core/metamodel/src/main/java/org/apache/isis/core/commons/xml/package-info.java
rename to core/metamodel/src/main/java/org/apache/isis/core/commons/url/UrlDecoderUtil.java
index 9ec3da4..1f246d9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/xml/package-info.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/url/UrlDecoderUtil.java
@@ -16,13 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.isis.core.commons.url;
-/**
- * Provides helper classes for writing alternative implementations
- * that just persist to a proprietary XML format.
- *
- * <p>
- * Specifically, these classes are used by the <i>XmlObjectStore</i>
- * and the <i>XmlProfileStore</i>.
- */
-package org.apache.isis.core.commons.xml;
\ No newline at end of file
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+public final class UrlDecoderUtil {
+
+ private UrlDecoderUtil() {
+ }
+
+ public static String urlDecode(final String input) {
+ try {
+ return URLDecoder.decode(input, "UTF-8");
+ } catch (final UnsupportedEncodingException e) {
+ return "";
+ }
+ }
+
+ public static String urlDecodeNullSafe(final String input) {
+ if (input == null) {
+ return null;
+ }
+
+ return urlDecode(input);
+ }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/url/UrlEncodingUtils.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/url/UrlEncodingUtils.java
deleted file mode 100644
index ee11718..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/url/UrlEncodingUtils.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.core.commons.url;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-
-import com.google.common.base.Function;
-
-public final class UrlEncodingUtils {
-
- public final static Function<String, String> FUNCTION = new Function<String, String>() {
-
- @Override
- public String apply(final String input) {
- try {
- return URLDecoder.decode(input, "UTF-8");
- } catch (final UnsupportedEncodingException e) {
- return "";
- }
- }
- };
-
- public final static Function<String, String> FUNCTION_NULLSAFE = new Function<String, String>() {
-
- @Override
- public String apply(final String input) {
- if (input == null) {
- return null;
- }
- try {
- return URLDecoder.decode(input, "UTF-8");
- } catch (final UnsupportedEncodingException e) {
- return "";
- }
- }
- };
-
- private UrlEncodingUtils() {
- }
-
- public static String urlDecode(final String string) {
- return FUNCTION.apply(string);
- }
-
- public static String urlDecodeNullSafe(final String string) {
- return FUNCTION_NULLSAFE.apply(string);
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java
index 14e8100..32215cb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.core.commons.encoding.DataInputExtended;
import org.apache.isis.core.commons.encoding.DataOutputExtended;
-import org.apache.isis.core.commons.url.UrlEncodingUtils;
+import org.apache.isis.core.commons.url.UrlDecoderUtil;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.schema.common.v1.BookmarkObjectState;
@@ -160,7 +160,7 @@ public class RootOid implements TypedOid, Serializable {
//region > deString'able, enString
public static RootOid deStringEncoded(final String urlEncodedOidStr) {
- final String oidStr = UrlEncodingUtils.urlDecode(urlEncodedOidStr);
+ final String oidStr = UrlDecoderUtil.urlDecode(urlEncodedOidStr);
return deString(oidStr);
}
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
index 6afa9f4..5d7afcd 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
@@ -32,7 +32,7 @@ import javax.ws.rs.core.Response;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.command.Command;
-import org.apache.isis.core.commons.url.UrlEncodingUtils;
+import org.apache.isis.core.commons.url.UrlDecoderUtil;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
@@ -456,7 +456,8 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements
final @PathParam("actionId") String actionId,
final @QueryParam("x-isis-querystring") String xIsisUrlEncodedQueryString) {
- final String urlUnencodedQueryString = UrlEncodingUtils.urlDecodeNullSafe(xIsisUrlEncodedQueryString != null? xIsisUrlEncodedQueryString: httpServletRequest.getQueryString());
+ final String urlUnencodedQueryString = UrlDecoderUtil
+ .urlDecodeNullSafe(xIsisUrlEncodedQueryString != null? xIsisUrlEncodedQueryString: httpServletRequest.getQueryString());
init(RepresentationType.ACTION_RESULT, Where.STANDALONE_TABLES, RepresentationService.Intent.NOT_APPLICABLE, urlUnencodedQueryString);
setCommandExecutor(Command.Executor.USER);
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServiceResourceServerside.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServiceResourceServerside.java
index 010785c..bbc7ab2 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServiceResourceServerside.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainServiceResourceServerside.java
@@ -37,7 +37,7 @@ import com.google.common.collect.Lists;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.command.Command;
-import org.apache.isis.core.commons.url.UrlEncodingUtils;
+import org.apache.isis.core.commons.url.UrlDecoderUtil;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -202,7 +202,8 @@ public class DomainServiceResourceServerside extends ResourceAbstract implements
final @PathParam("actionId") String actionId,
final @QueryParam("x-isis-querystring") String xIsisUrlEncodedQueryString) {
- final String urlUnencodedQueryString = UrlEncodingUtils.urlDecodeNullSafe(xIsisUrlEncodedQueryString != null? xIsisUrlEncodedQueryString: httpServletRequest.getQueryString());
+ final String urlUnencodedQueryString = UrlDecoderUtil
+ .urlDecodeNullSafe(xIsisUrlEncodedQueryString != null? xIsisUrlEncodedQueryString: httpServletRequest.getQueryString());
init(RepresentationType.ACTION_RESULT, Where.STANDALONE_TABLES, RepresentationService.Intent.NOT_APPLICABLE, urlUnencodedQueryString);
setCommandExecutor(Command.Executor.USER);
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
index 8806959..34ce3cb 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.url.UrlEncodingUtils;
+import org.apache.isis.core.commons.url.UrlDecoderUtil;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
@@ -53,7 +53,6 @@ import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationSer
import org.apache.isis.viewer.restfulobjects.rendering.util.Util;
import org.apache.isis.viewer.restfulobjects.server.ResourceContext;
import org.apache.isis.viewer.restfulobjects.server.util.OidUtils;
-import org.apache.isis.viewer.restfulobjects.server.util.UrlDecoderUtils;
public abstract class ResourceAbstract {
@@ -96,7 +95,7 @@ public abstract class ResourceAbstract {
private String getUrlDecodedQueryStringIfAny() {
final String queryStringIfAny = httpServletRequest.getQueryString();
- return UrlEncodingUtils.urlDecodeNullSafe(queryStringIfAny);
+ return UrlDecoderUtil.urlDecodeNullSafe(queryStringIfAny);
}
protected void init(
@@ -143,7 +142,7 @@ public abstract class ResourceAbstract {
ObjectAdapter objectAdapter = getObjectAdapterElseNull(domainType, instanceId);
if (objectAdapter == null) {
- final String instanceIdUnencoded = UrlDecoderUtils.urlDecode(instanceId);
+ final String instanceIdUnencoded = org.apache.isis.viewer.restfulobjects.server.util.UrlDecoderUtils.urlDecode(instanceId);
throw RestfulObjectsApplicationException.createWithMessage(HttpStatusCode.NOT_FOUND, "could not determine adapter for OID: '%s:%s'", domainType, instanceIdUnencoded);
}
return objectAdapter;
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 01/26: ISIS-1742: removes unused method in
InputStreamExtensions
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d5d57c5ee42e368495e0d8e928c131a5700be9c5
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 11:47:19 2017 +0100
ISIS-1742: removes unused method in InputStreamExtensions
---
.../src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java | 5 -----
.../org/apache/isis/core/commons/lang/InputStreamExtensions.java | 7 -------
2 files changed, 12 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java
index 3b74ba9..9bd70b5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ClassUtil.java
@@ -166,9 +166,4 @@ public final class ClassUtil {
}
}
- public static class Functions {
- private Functions(){}
-
- }
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/InputStreamExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/InputStreamExtensions.java
index ec93d53..b936709 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/InputStreamExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/InputStreamExtensions.java
@@ -19,11 +19,9 @@
package org.apache.isis.core.commons.lang;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
public final class InputStreamExtensions {
@@ -67,10 +65,5 @@ public final class InputStreamExtensions {
return count;
}
- public static InputStream asUtf8ByteStream(final String string) throws UnsupportedEncodingException {
- final byte[] data = string.getBytes("utf-8");
- final InputStream in = new ByteArrayInputStream(data);
- return in;
- }
}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 07/26: ISIS-1742: deletes RunnableExtensions, unused
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e7819db8f5634bf84cfc3067d4f614cf90574909
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 12:00:28 2017 +0100
ISIS-1742: deletes RunnableExtensions, unused
---
.../isis/core/commons/lang/RunnableExtensions.java | 33 ----------------------
1 file changed, 33 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/RunnableExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/RunnableExtensions.java
deleted file mode 100644
index a497ed3..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/RunnableExtensions.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.commons.lang;
-
-public class RunnableExtensions {
-
- private RunnableExtensions() {
- }
-
- public static Thread startThread(final Runnable extendee, final String name) {
- final Thread thread = new Thread(extendee, name);
- thread.start();
- return thread;
- }
-
-}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 19/26: ISIS-1742: deletes unused IsisMatchers,
or - where used by only a single test class - moves them to their
only usage
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4ee527236713cfdb4efb0c896f3a02af21ee188c
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 13:04:43 2017 +0100
ISIS-1742: deletes unused IsisMatchers, or - where used by only a single test class - moves them to their only usage
---
.../isis/core/commons/matchers/IsisMatchers.java | 198 ---------------------
.../IsisMatchers_ContainsStripNewLinesTest.java | 68 -------
.../IsisMatchers_EndsWithStripNewLinesTest.java | 63 -------
.../IsisMatchers_EqualToStripNewLinesTest.java | 63 -------
.../IsisMatchers_NonEmptyStringOrNullTest.java | 53 ------
.../IsisMatchers_StartsWithStripNewLinesTest.java | 63 -------
...romptStyleFacetFromPropertyAnnotation_Test.java | 29 ++-
...rdAuthenticationManager_AuthenticationTest.java | 28 ++-
.../system/TypeExtractorMethodReturnTest.java | 2 +-
.../system/TypeExtractorMethodsParametersTest.java | 36 +++-
.../restfulobjects/applib/util/ParserTest.java | 38 ++--
11 files changed, 103 insertions(+), 538 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
index 1e659ed..c2488eb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
@@ -19,21 +19,10 @@
package org.apache.isis.core.commons.matchers;
-import java.util.List;
-
-import org.hamcrest.CoreMatchers;
import org.hamcrest.Description;
import org.hamcrest.Factory;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
-import org.hamcrest.core.IsEqual;
-import org.hamcrest.core.StringContains;
-import org.hamcrest.core.StringEndsWith;
-import org.hamcrest.core.StringStartsWith;
-
-import org.apache.isis.core.commons.lang.StringExtensions;
-
-import static org.hamcrest.CoreMatchers.nullValue;
/**
* Hamcrest {@link Matcher} implementations.
@@ -45,86 +34,6 @@ public final class IsisMatchers {
}
@Factory
- public static Matcher<String> containsStripNewLines(final String expected) {
- final String strippedExpected = StringExtensions.stripNewLines(expected);
- return new StringContains(strippedExpected) {
- @Override
- public boolean matchesSafely(final String actual) {
- return super.matchesSafely(StringExtensions.stripNewLines(actual));
- }
-
- @Override
- public void describeTo(final Description description) {
- description.appendText("a string (ignoring new lines) containing").appendValue(strippedExpected);
- }
- };
- }
-
- @Factory
- public static Matcher<String> equalToStripNewLines(final String expected) {
- final String strippedExpected = StringExtensions.stripNewLines(expected);
- return new IsEqual<String>(strippedExpected) {
- @Override
- public boolean matches(final Object actualObj) {
- final String actual = (String) actualObj;
- return super.matches(StringExtensions.stripNewLines(actual));
- }
-
- @Override
- public void describeTo(final Description description) {
- description.appendText("a string (ignoring new lines) equal to").appendValue(strippedExpected);
- }
- };
- }
-
- @Factory
- public static StringStartsWith startsWithStripNewLines(final String expected) {
- final String strippedExpected = StringExtensions.stripNewLines(expected);
- return new StringStartsWith(strippedExpected) {
- @Override
- public boolean matchesSafely(final String actual) {
- return super.matchesSafely(StringExtensions.stripNewLines(actual));
- }
-
- @Override
- public void describeTo(final Description description) {
- description.appendText("a string (ignoring new lines) starting with").appendValue(strippedExpected);
- }
- };
- }
-
- @Factory
- public static Matcher<String> endsWithStripNewLines(final String expected) {
- final String strippedExpected = StringExtensions.stripNewLines(expected);
- return new StringEndsWith(strippedExpected) {
- @Override
- public boolean matchesSafely(final String actual) {
- return super.matchesSafely(StringExtensions.stripNewLines(actual));
- }
-
- @Override
- public void describeTo(final Description description) {
- description.appendText("a string (ignoring new lines) ending with").appendValue(strippedExpected);
- }
- };
- }
-
- @Factory
- public static <T> Matcher<T> anInstanceOf(final Class<T> expected) {
- return new TypeSafeMatcher<T>() {
- @Override
- public boolean matchesSafely(final T actual) {
- return expected.isAssignableFrom(actual.getClass());
- }
-
- @Override
- public void describeTo(final Description description) {
- description.appendText("an instance of ").appendValue(expected);
- }
- };
- }
-
- @Factory
public static Matcher<String> nonEmptyString() {
return new TypeSafeMatcher<String>() {
@Override
@@ -141,32 +50,6 @@ public final class IsisMatchers {
}
@Factory
- @SuppressWarnings("unchecked")
- public static Matcher<String> nonEmptyStringOrNull() {
- return CoreMatchers.anyOf(nullValue(String.class), nonEmptyString());
- }
-
- @Factory
- public static Matcher<List<?>> containsElementThat(final Matcher<?> elementMatcher) {
- return new TypeSafeMatcher<List<?>>() {
- @Override
- public boolean matchesSafely(final List<?> list) {
- for (final Object o : list) {
- if (elementMatcher.matches(o)) {
- return true;
- }
- }
- return false;
- }
-
- @Override
- public void describeTo(final Description description) {
- description.appendText("contains element that ").appendDescriptionOf(elementMatcher);
- }
- };
- }
-
- @Factory
public static Matcher<Class<?>> classEqualTo(final Class<?> operand) {
class ClassEqualsMatcher extends TypeSafeMatcher<Class<?>> {
@@ -190,85 +73,4 @@ public final class IsisMatchers {
return new ClassEqualsMatcher(operand);
}
- @Factory
- public static Matcher<String> matches(final String regex) {
- return new TypeSafeMatcher<String>() {
-
- @Override
- public void describeTo(final Description description) {
- description.appendText("string matching " + regex);
- }
-
- @Override
- public boolean matchesSafely(final String str) {
- return str.matches(regex);
- }
- };
- }
-
- @Factory
- public static <X> Matcher<Class<X>> anySubclassOf(final Class<X> cls) {
- return new TypeSafeMatcher<Class<X>>() {
-
- @Override
- public void describeTo(final Description arg0) {
- arg0.appendText("is subclass of ").appendText(cls.getName());
- }
-
- @Override
- public boolean matchesSafely(final Class<X> item) {
- return cls.isAssignableFrom(item);
- }
- };
- }
-
- @Factory
- public static <T> Matcher<List<T>> sameContentsAs(final List<T> expected) {
- return new TypeSafeMatcher<List<T>>() {
-
- @Override
- public void describeTo(final Description description) {
- description.appendText("same sequence as " + expected);
- }
-
- @Override
- public boolean matchesSafely(final List<T> actual) {
- return actual.containsAll(expected) && expected.containsAll(actual);
- }
- };
- }
-
- @Factory
- public static Matcher<String> startsWith(final String expected) {
- return new TypeSafeMatcher<String>() {
-
- @Override
- public void describeTo(Description description) {
- description.appendText(" starts with '" + expected + "'");
- }
-
- @Override
- public boolean matchesSafely(String actual) {
- return actual.startsWith(expected);
- }
- };
- }
-
- @Factory
- public static Matcher<String> contains(final String expected) {
- return new TypeSafeMatcher<String>() {
-
- @Override
- public void describeTo(Description description) {
- description.appendText(" contains '" + expected + "'");
- }
-
- @Override
- public boolean matchesSafely(String actual) {
- return actual.contains(expected);
- }
- };
- }
-
-
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_ContainsStripNewLinesTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_ContainsStripNewLinesTest.java
deleted file mode 100644
index b9d1e74..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_ContainsStripNewLinesTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.commons.matchers;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.hamcrest.Matcher;
-import org.junit.Before;
-import org.junit.Test;
-
-public class IsisMatchers_ContainsStripNewLinesTest {
-
- private Matcher<String> fooMatcher;
-
- @Before
- public void setUp() {
- fooMatcher = IsisMatchers.containsStripNewLines("foo");
- }
-
- @Test
- public void shouldMatchExactString() {
- assertThat(fooMatcher.matches("foo"), is(true));
- }
-
- @Test
- public void shouldMatchIfContainsStringNoNewLines() {
- assertThat(fooMatcher.matches("abcfoodef"), is(true));
- }
-
- @Test
- public void shouldMatchIfContainsStringHasNewLinesBefore() {
- assertThat(fooMatcher.matches("a\nb\rc\r\ndfoodef"), is(true));
- }
-
- @Test
- public void shouldMatchIfContainsStringHasNewLinesAfter() {
- assertThat(fooMatcher.matches("abrdfood\ne\rfan\rg"), is(true));
- }
-
- @Test
- public void shouldMatchIfContainsStringHasNewLinesWithin() {
- assertThat(fooMatcher.matches("abcf\ro\nodef"), is(true));
- }
-
- @Test
- public void shouldNotMatchIfDoesNotContainsString() {
- assertThat(fooMatcher.matches("fob"), is(false));
- }
-
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EndsWithStripNewLinesTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EndsWithStripNewLinesTest.java
deleted file mode 100644
index f8efa13..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EndsWithStripNewLinesTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.commons.matchers;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.hamcrest.Matcher;
-import org.junit.Before;
-import org.junit.Test;
-
-public class IsisMatchers_EndsWithStripNewLinesTest {
-
- private Matcher<String> fooMatcher;
-
- @Before
- public void setUp() {
- fooMatcher = IsisMatchers.endsWithStripNewLines("foo");
- }
-
- @Test
- public void shouldMatchExactString() {
- assertThat(fooMatcher.matches("foo"), is(true));
- }
-
- @Test
- public void shouldMatchIfEndsWithAndStringNoNewLines() {
- assertThat(fooMatcher.matches("abcfoo"), is(true));
- }
-
- @Test
- public void shouldMatchIfEndsWithStringHasNewLinesAfter() {
- assertThat(fooMatcher.matches("a\nb\rc\r\nfoo"), is(true));
- }
-
- @Test
- public void shouldMatchIfEndsWithStringHasNewLinesWithin() {
- assertThat(fooMatcher.matches("abcf\ro\no"), is(true));
- }
-
- @Test
- public void shouldNotMatchIfDoesNotEndsWithString() {
- assertThat(fooMatcher.matches("fob"), is(false));
- }
-
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EqualToStripNewLinesTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EqualToStripNewLinesTest.java
deleted file mode 100644
index 6d89f51..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_EqualToStripNewLinesTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.commons.matchers;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.hamcrest.Matcher;
-import org.junit.Before;
-import org.junit.Test;
-
-public class IsisMatchers_EqualToStripNewLinesTest {
-
- private Matcher<String> fooMatcher;
-
- @Before
- public void setUp() {
- fooMatcher = IsisMatchers.equalToStripNewLines("foo");
- }
-
- @Test
- public void shouldMatchExactString() {
- assertThat(fooMatcher.matches("foo"), is(true));
- }
-
- @Test
- public void shouldNotMatchIfStartsWithAnything() {
- assertThat(fooMatcher.matches("afoo"), is(false));
- }
-
- @Test
- public void shouldNotMatchIfEndsWithAnything() {
- assertThat(fooMatcher.matches("fooz"), is(false));
- }
-
- @Test
- public void shouldMatchIfEqualToStringHasNewLinesWithin() {
- assertThat(fooMatcher.matches("f\ro\no"), is(true));
- }
-
- @Test
- public void shouldNotMatchIfDoesNotStartWithString() {
- assertThat(fooMatcher.matches("fob"), is(false));
- }
-
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_NonEmptyStringOrNullTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_NonEmptyStringOrNullTest.java
deleted file mode 100644
index a1604ee..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_NonEmptyStringOrNullTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.commons.matchers;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.hamcrest.Matcher;
-import org.junit.Before;
-import org.junit.Test;
-
-public class IsisMatchers_NonEmptyStringOrNullTest {
-
- private Matcher<String> fooMatcher;
-
- @Before
- public void setUp() {
- fooMatcher = IsisMatchers.nonEmptyStringOrNull();
- }
-
- @Test
- public void shouldMatchNonEmptyString() {
- assertThat(fooMatcher.matches("foo"), is(true));
- }
-
- @Test
- public void shouldNotMatchEmptyString() {
- assertThat(fooMatcher.matches(""), is(false));
- }
-
- @Test
- public void shouldMatchNullString() {
- assertThat(fooMatcher.matches(null), is(true));
- }
-
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_StartsWithStripNewLinesTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_StartsWithStripNewLinesTest.java
deleted file mode 100644
index 500c9fd..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_StartsWithStripNewLinesTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.commons.matchers;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.hamcrest.Matcher;
-import org.junit.Before;
-import org.junit.Test;
-
-public class IsisMatchers_StartsWithStripNewLinesTest {
-
- private Matcher<String> fooMatcher;
-
- @Before
- public void setUp() {
- fooMatcher = IsisMatchers.startsWithStripNewLines("foo");
- }
-
- @Test
- public void shouldMatchExactString() {
- assertThat(fooMatcher.matches("foo"), is(true));
- }
-
- @Test
- public void shouldMatchIfStartsWithAndStringNoNewLines() {
- assertThat(fooMatcher.matches("foodef"), is(true));
- }
-
- @Test
- public void shouldMatchIfStartsWithStringHasNewLinesAfter() {
- assertThat(fooMatcher.matches("food\ne\rfan\rg"), is(true));
- }
-
- @Test
- public void shouldMatchIfStartsWithStringHasNewLinesWithin() {
- assertThat(fooMatcher.matches("f\ro\nodef"), is(true));
- }
-
- @Test
- public void shouldNotMatchIfDoesNotStartWithString() {
- assertThat(fooMatcher.matches("fob"), is(false));
- }
-
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
index 581aec4..a9e5e04 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
@@ -16,7 +16,9 @@
*/
package org.apache.isis.core.metamodel.facets.properties.promptstyle;
+import org.hamcrest.Description;
import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Assert;
@@ -26,7 +28,6 @@ import org.junit.Test;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.matchers.IsisMatchers;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacet;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured;
@@ -51,8 +52,7 @@ public class PromptStyleFacetFromPropertyAnnotation_Test {
@Mock
PropertyLayout mockPropertyLayout;
-
- public static class Create_Test extends PromptStyleFacetFromPropertyAnnotation_Test {
+ public static class Create_Test extends PromptStyleFacetFromPropertyAnnotation_Test {
@Test
public void when_annotated_with_dialog() throws Exception {
@@ -67,7 +67,7 @@ public class PromptStyleFacetFromPropertyAnnotation_Test {
PromptStyleFacet facet = PromptStyleFacetForPropertyLayoutAnnotation
.create(mockPropertyLayout, mockConfiguration, mockFacetHolder);
- Assert.assertThat(facet, is((Matcher) IsisMatchers.anInstanceOf(PromptStyleFacetForPropertyLayoutAnnotation.class)));
+ Assert.assertThat(facet, is((Matcher) anInstanceOf(PromptStyleFacetForPropertyLayoutAnnotation.class)));
Assert.assertThat(facet.value(), is(PromptStyle.DIALOG));
}
@@ -85,7 +85,7 @@ public class PromptStyleFacetFromPropertyAnnotation_Test {
PromptStyleFacet facet = PromptStyleFacetForPropertyLayoutAnnotation
.create(mockPropertyLayout, mockConfiguration, mockFacetHolder);
- Assert.assertThat(facet, is((Matcher) IsisMatchers.anInstanceOf(PromptStyleFacetForPropertyLayoutAnnotation.class)));
+ Assert.assertThat(facet, is((Matcher) anInstanceOf(PromptStyleFacetForPropertyLayoutAnnotation.class)));
Assert.assertThat(facet.value(), is(PromptStyle.INLINE));
}
@@ -106,7 +106,7 @@ public class PromptStyleFacetFromPropertyAnnotation_Test {
PromptStyleFacet facet = PromptStyleFacetForPropertyLayoutAnnotation
.create(mockPropertyLayout, mockConfiguration, mockFacetHolder);
- Assert.assertThat(facet, is((Matcher) IsisMatchers.anInstanceOf(PromptStyleFacetAsConfigured.class)));
+ Assert.assertThat(facet, is((Matcher) anInstanceOf(PromptStyleFacetAsConfigured.class)));
Assert.assertThat(facet.value(), is(PromptStyle.INLINE));
}
@@ -146,7 +146,7 @@ public class PromptStyleFacetFromPropertyAnnotation_Test {
.create(mockPropertyLayout, mockConfiguration, mockFacetHolder);
Assert.assertThat(facet.value(), is(PromptStyle.INLINE));
- Assert.assertThat(facet, is((Matcher) IsisMatchers.anInstanceOf(PromptStyleFacetFallBackToInline.class)));
+ Assert.assertThat(facet, is((Matcher) anInstanceOf(PromptStyleFacetFallBackToInline.class)));
}
@Test
@@ -171,4 +171,19 @@ public class PromptStyleFacetFromPropertyAnnotation_Test {
}
+ static <T> Matcher<T> anInstanceOf(final Class<T> expected) {
+ return new TypeSafeMatcher<T>() {
+ @Override
+ public boolean matchesSafely(final T actual) {
+ return expected.isAssignableFrom(actual.getClass());
+ }
+
+ @Override
+ public void describeTo(final Description description) {
+ description.appendText("an instance of ").appendValue(expected);
+ }
+ };
+ }
+
+
}
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
index 13262b4..98148c3 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
@@ -19,9 +19,9 @@
package org.apache.isis.core.runtime.authentication.standard;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
@@ -32,10 +32,12 @@ import org.junit.runner.RunWith;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.matchers.IsisMatchers;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
@RunWith(JMock.class)
public class StandardAuthenticationManager_AuthenticationTest {
@@ -61,7 +63,7 @@ public class StandardAuthenticationManager_AuthenticationTest {
mockery.checking(new Expectations() {
{
- allowing(mockAuthenticator).canAuthenticate(with(IsisMatchers.anySubclassOf(AuthenticationRequest.class)));
+ allowing(mockAuthenticator).canAuthenticate(with(anySubclassOf(AuthenticationRequest.class)));
will(returnValue(true));
allowing(mockAuthenticator).authenticate(with(any(AuthenticationRequest.class)), with(any(String.class)));
@@ -90,4 +92,20 @@ public class StandardAuthenticationManager_AuthenticationTest {
assertThat(authenticationManager.isSessionValid(session), is(true));
}
+ private static <X> Matcher<Class<X>> anySubclassOf(final Class<X> cls) {
+ return new TypeSafeMatcher<Class<X>>() {
+
+ @Override
+ public void describeTo(final Description arg0) {
+ arg0.appendText("is subclass of ").appendText(cls.getName());
+ }
+
+ @Override
+ public boolean matchesSafely(final Class<X> item) {
+ return cls.isAssignableFrom(item);
+ }
+ };
+ }
+
+
}
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java
index 385795b..2c728fd 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.runtime.system;
-import static org.apache.isis.core.commons.matchers.IsisMatchers.containsElementThat;
+import static org.apache.isis.core.runtime.system.TypeExtractorMethodsParametersTest.containsElementThat;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java
index 1c92687..1498579 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java
@@ -19,18 +19,20 @@
package org.apache.isis.core.runtime.system;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.lang.reflect.Method;
import java.util.List;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
import org.junit.Test;
-import org.apache.isis.core.commons.matchers.IsisMatchers;
import org.apache.isis.core.metamodel.specloader.traverser.TypeExtractorMethodParameters;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class TypeExtractorMethodsParametersTest {
@Test
@@ -51,8 +53,28 @@ public class TypeExtractorMethodsParametersTest {
final TypeExtractorMethodParameters extractor = new TypeExtractorMethodParameters(method);
assertThat(extractor.getClasses().size(), is(2));
- assertThat(extractor.getClasses(), IsisMatchers.containsElementThat(equalTo(java.util.List.class)));
- assertThat(extractor.getClasses(), IsisMatchers.containsElementThat(equalTo(Customer.class)));
+ assertThat(extractor.getClasses(), containsElementThat(equalTo(java.util.List.class)));
+ assertThat(extractor.getClasses(), containsElementThat(equalTo(Customer.class)));
}
+ static Matcher<List<?>> containsElementThat(final Matcher<?> elementMatcher) {
+ return new TypeSafeMatcher<List<?>>() {
+ @Override
+ public boolean matchesSafely(final List<?> list) {
+ for (final Object o : list) {
+ if (elementMatcher.matches(o)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public void describeTo(final Description description) {
+ description.appendText("contains element that ").appendDescriptionOf(elementMatcher);
+ }
+ };
+ }
+
+
}
diff --git a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/ParserTest.java b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/ParserTest.java
index 56766c1..9e35c63 100644
--- a/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/ParserTest.java
+++ b/core/viewer-restfulobjects-applib/src/test/java/org/apache/isis/viewer/restfulobjects/applib/util/ParserTest.java
@@ -18,10 +18,6 @@
*/
package org.apache.isis.viewer.restfulobjects.applib.util;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
@@ -29,12 +25,18 @@ import java.util.List;
import javax.ws.rs.core.CacheControl;
-import org.apache.isis.core.commons.matchers.IsisMatchers;
-import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
+import com.google.common.net.MediaType;
+
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
import org.junit.Test;
-import com.google.common.collect.Lists;
-import com.google.common.net.MediaType;
+import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class ParserTest {
@@ -71,7 +73,7 @@ public class ParserTest {
final String asString = parser.asString(v);
final List<String> valueOf = parser.valueOf(asString);
- assertThat(v, IsisMatchers.sameContentsAs(valueOf));
+ assertThat(v, sameContentsAs(valueOf));
}
@Test
@@ -129,7 +131,7 @@ public class ParserTest {
final String asString = parser.asString(list);
final List<MediaType> valueOf = parser.valueOf(asString);
- assertThat(list, IsisMatchers.sameContentsAs(valueOf));
+ assertThat(list, sameContentsAs(valueOf));
}
@Test
@@ -194,4 +196,20 @@ public class ParserTest {
return cacheControl;
}
+ private static <T> Matcher<List<T>> sameContentsAs(final List<T> expected) {
+ return new TypeSafeMatcher<List<T>>() {
+
+ @Override
+ public void describeTo(final Description description) {
+ description.appendText("same sequence as " + expected);
+ }
+
+ @Override
+ public boolean matchesSafely(final List<T> actual) {
+ return actual.containsAll(expected) && expected.containsAll(actual);
+ }
+ };
+ }
+
+
}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 16/26: ISIS-1742: deletes commented out code, .ucd file,
fixes javadoc references
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit cfb9b6b5e909f5f731a3ef7b7649d40984b7b5fa
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 12:53:33 2017 +0100
ISIS-1742: deletes commented out code, .ucd file, fixes javadoc references
---
.../isis/core/commons/config/package-info.java | 6 +-
.../encoding/DataInputExtendedDecorator.java | 10 --
.../apache/isis/core/commons/encoding/encoding.ucd | 166 ---------------------
3 files changed, 3 insertions(+), 179 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/package-info.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/package-info.java
index 17030cf..c92e544 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/package-info.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/package-info.java
@@ -23,15 +23,15 @@
* along with a number of supporting classes.
*
* <p>
- * Chief among these supporting classes is {@link org.apache.isis.core.commons.config.ConfigurationBuilder},
+ * Chief among these supporting classes is {@link org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder},
* which holds a (mutable) collection of properties and is used to build an
* {@link org.apache.isis.core.commons.config.IsisConfiguration}. The
- * {@link org.apache.isis.core.commons.config.ConfigurationBuilder} and
+ * {@link org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder} and
* {@link org.apache.isis.core.commons.config.IsisConfiguration} types form
* an mutable/immutable pair (cf {@link java.lang.StringBuilder} / {@link java.lang.String}).
*
* <p>
- * The {@link org.apache.isis.core.commons.config.ConfigurationBuilder} is used
+ * The {@link org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder} is used
* by {@link org.apache.isis.core.commons.components.InstallerAbstract}, an
* implementation of {@link org.apache.isis.core.commons.components.Installer}
* that allows the configuration to be added to as each component is
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtendedDecorator.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtendedDecorator.java
index d7f9fa3..fd3d8fe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtendedDecorator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DataInputExtendedDecorator.java
@@ -199,15 +199,5 @@ public class DataInputExtendedDecorator implements DataInputExtended {
return underlying.skipBytes(n);
}
- // //////////////////////////////////////////
- // // Closeable
- // //////////////////////////////////////////
- //
- // public void close() throws IOException {
- // if (underlying instanceof Closeable) {
- // Closeable closeable = (Closeable) underlying;
- // closeable.close();
- // }
- // }
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/encoding.ucd b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/encoding.ucd
deleted file mode 100644
index a9bfb18..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/encoding.ucd
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<editmodel:ClassDiagramEditModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editmodel="editmodel.xmi" xmlns:options="options.xmi" name="encoding" size="1283,724" id="org.apache.isis.core.commons.encoding" metadata="uml2-1.0" initialized="true" zoom="0.5" tag="1000" key="32303037303533312D31303030206F72672E6170616368652E697369732E636F72652E636F6D6D6F6E732F64616E">
- <children xsi:type="editmodel:InterfaceEditModel" name="Encodable" location="15,544" size="109,81" id="org.apache.isis.core.commons.encoding/Encodable" runTimeClassModel="encode(Lorg.apache.isis.core.commons.encoding.DataOutputExtended;)">
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="66,18">
- <children xsi:type="editmodel:MethodEditModel" name="encode" id="org.apache.isis.core.commons.encoding/Encodable#encode(Lorg.apache.isis.core.commons.encoding.DataOutputExtended;)"/>
- </children>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
- </children>
- <children xsi:type="editmodel:ClassEditModel" name="FieldType" location="989,14" size="274,643" id="org.apache.isis.core.commons.encoding/FieldType" runTimeClassModel="uNSIGNED_BYTE,sHORT_ARRAY,lONG_ARRAY,write(Lorg.apache.isis.core.commons.encoding.DataOutputExtended;LT;),eNCODABLE_ARRAY,toString(),fLOAT_ARRAY,getIdx(),sTRING,eNCODABLE,sERIALIZABLE_ARRAY,bYTE,sERIALIZABLE,dOUBLE,read(Lorg.apache.isis.core.commons.encoding.DataInputExtended;),dOUBLE_ARRAY,bOOLEAN_ARRAY,cls,idx,cHAR,org [...]
- <children xsi:type="editmodel:CompartmentEditModel" size="251,468">
- <children xsi:type="editmodel:AttributeEditModel" name="bOOLEAN" id="org.apache.isis.core.commons.encoding/FieldType#bOOLEAN"/>
- <children xsi:type="editmodel:AttributeEditModel" name="bOOLEAN_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#bOOLEAN_ARRAY"/>
- <children xsi:type="editmodel:AttributeEditModel" name="bYTE" id="org.apache.isis.core.commons.encoding/FieldType#bYTE"/>
- <children xsi:type="editmodel:AttributeEditModel" name="bYTE_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#bYTE_ARRAY"/>
- <children xsi:type="editmodel:AttributeEditModel" name="sHORT" id="org.apache.isis.core.commons.encoding/FieldType#sHORT"/>
- <children xsi:type="editmodel:AttributeEditModel" name="sHORT_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#sHORT_ARRAY"/>
- <children xsi:type="editmodel:AttributeEditModel" name="iNTEGER" id="org.apache.isis.core.commons.encoding/FieldType#iNTEGER"/>
- <children xsi:type="editmodel:AttributeEditModel" name="uNSIGNED_BYTE" id="org.apache.isis.core.commons.encoding/FieldType#uNSIGNED_BYTE"/>
- <children xsi:type="editmodel:AttributeEditModel" name="uNSIGNED_SHORT" id="org.apache.isis.core.commons.encoding/FieldType#uNSIGNED_SHORT"/>
- <children xsi:type="editmodel:AttributeEditModel" name="iNTEGER_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#iNTEGER_ARRAY"/>
- <children xsi:type="editmodel:AttributeEditModel" name="lONG" id="org.apache.isis.core.commons.encoding/FieldType#lONG"/>
- <children xsi:type="editmodel:AttributeEditModel" name="lONG_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#lONG_ARRAY"/>
- <children xsi:type="editmodel:AttributeEditModel" name="cHAR" id="org.apache.isis.core.commons.encoding/FieldType#cHAR"/>
- <children xsi:type="editmodel:AttributeEditModel" name="cHAR_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#cHAR_ARRAY"/>
- <children xsi:type="editmodel:AttributeEditModel" name="fLOAT" id="org.apache.isis.core.commons.encoding/FieldType#fLOAT"/>
- <children xsi:type="editmodel:AttributeEditModel" name="fLOAT_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#fLOAT_ARRAY"/>
- <children xsi:type="editmodel:AttributeEditModel" name="dOUBLE" id="org.apache.isis.core.commons.encoding/FieldType#dOUBLE"/>
- <children xsi:type="editmodel:AttributeEditModel" name="dOUBLE_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#dOUBLE_ARRAY"/>
- <children xsi:type="editmodel:AttributeEditModel" name="sTRING" id="org.apache.isis.core.commons.encoding/FieldType#sTRING"/>
- <children xsi:type="editmodel:AttributeEditModel" name="sTRING_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#sTRING_ARRAY"/>
- <children xsi:type="editmodel:AttributeEditModel" name="eNCODABLE" id="org.apache.isis.core.commons.encoding/FieldType#eNCODABLE"/>
- <children xsi:type="editmodel:AttributeEditModel" name="eNCODABLE_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#eNCODABLE_ARRAY"/>
- <children xsi:type="editmodel:AttributeEditModel" name="sERIALIZABLE" id="org.apache.isis.core.commons.encoding/FieldType#sERIALIZABLE"/>
- <children xsi:type="editmodel:AttributeEditModel" name="sERIALIZABLE_ARRAY" id="org.apache.isis.core.commons.encoding/FieldType#sERIALIZABLE_ARRAY"/>
- <children xsi:type="editmodel:AttributeEditModel" name="idx" id="org.apache.isis.core.commons.encoding/FieldType#idx"/>
- <children xsi:type="editmodel:AttributeEditModel" name="cls" id="org.apache.isis.core.commons.encoding/FieldType#cls"/>
- </children>
- <children xsi:type="editmodel:CompartmentEditModel" size="103,126">
- <children xsi:type="editmodel:MethodEditModel" name="get" id="org.apache.isis.core.commons.encoding/FieldType#get(B)"/>
- <children xsi:type="editmodel:MethodEditModel" name="getIdx" id="org.apache.isis.core.commons.encoding/FieldType#getIdx()"/>
- <children xsi:type="editmodel:MethodEditModel" name="getCls" id="org.apache.isis.core.commons.encoding/FieldType#getCls()"/>
- <children xsi:type="editmodel:MethodEditModel" name="readArray" id="org.apache.isis.core.commons.encoding/FieldType#readArray(Lorg.apache.isis.core.commons.encoding.DataInputExtended;Ljava.lang.Class;)"/>
- <children xsi:type="editmodel:MethodEditModel" name="read" id="org.apache.isis.core.commons.encoding/FieldType#read(Lorg.apache.isis.core.commons.encoding.DataInputExtended;)"/>
- <children xsi:type="editmodel:MethodEditModel" name="write" id="org.apache.isis.core.commons.encoding/FieldType#write(Lorg.apache.isis.core.commons.encoding.DataOutputExtended;LT;)"/>
- <children xsi:type="editmodel:MethodEditModel" name="toString" id="org.apache.isis.core.commons.encoding/FieldType#toString()"/>
- </children>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
- </children>
- <children xsi:type="editmodel:InterfaceEditModel" targetConnections="//@children.5/@sourceConnections.0" name="DataInputExtended" location="676,13" size="163,315" id="org.apache.isis.core.commons.encoding/DataInputExtended" runTimeClassModel="readFloats(),readBytes(),readSerializable(Ljava.lang.Class;),readUTFs(),readEncodable(Ljava.lang.Class;),readChars(),readDoubles(),readEncodables(Ljava.lang.Class;),readInts(),readBooleans(),readShorts(),readSerializables(Ljava.lang.Class;),getDat [...]
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="134,252">
- <children xsi:type="editmodel:MethodEditModel" name="getDataInputStream" id="org.apache.isis.core.commons.encoding/DataInputExtended#getDataInputStream()"/>
- <children xsi:type="editmodel:MethodEditModel" name="readBooleans" id="org.apache.isis.core.commons.encoding/DataInputExtended#readBooleans()"/>
- <children xsi:type="editmodel:MethodEditModel" name="readBytes" id="org.apache.isis.core.commons.encoding/DataInputExtended#readBytes()"/>
- <children xsi:type="editmodel:MethodEditModel" name="readChars" id="org.apache.isis.core.commons.encoding/DataInputExtended#readChars()"/>
- <children xsi:type="editmodel:MethodEditModel" name="readDoubles" id="org.apache.isis.core.commons.encoding/DataInputExtended#readDoubles()"/>
- <children xsi:type="editmodel:MethodEditModel" name="readEncodable" id="org.apache.isis.core.commons.encoding/DataInputExtended#readEncodable(Ljava.lang.Class;)"/>
- <children xsi:type="editmodel:MethodEditModel" name="readEncodables" id="org.apache.isis.core.commons.encoding/DataInputExtended#readEncodables(Ljava.lang.Class;)"/>
- <children xsi:type="editmodel:MethodEditModel" name="readFloats" id="org.apache.isis.core.commons.encoding/DataInputExtended#readFloats()"/>
- <children xsi:type="editmodel:MethodEditModel" name="readInts" id="org.apache.isis.core.commons.encoding/DataInputExtended#readInts()"/>
- <children xsi:type="editmodel:MethodEditModel" name="readLongs" id="org.apache.isis.core.commons.encoding/DataInputExtended#readLongs()"/>
- <children xsi:type="editmodel:MethodEditModel" name="readSerializable" id="org.apache.isis.core.commons.encoding/DataInputExtended#readSerializable(Ljava.lang.Class;)"/>
- <children xsi:type="editmodel:MethodEditModel" name="readSerializables" id="org.apache.isis.core.commons.encoding/DataInputExtended#readSerializables(Ljava.lang.Class;)"/>
- <children xsi:type="editmodel:MethodEditModel" name="readShorts" id="org.apache.isis.core.commons.encoding/DataInputExtended#readShorts()"/>
- <children xsi:type="editmodel:MethodEditModel" name="readUTFs" id="org.apache.isis.core.commons.encoding/DataInputExtended#readUTFs()"/>
- </children>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
- </children>
- <children xsi:type="editmodel:ClassEditModel" targetConnections="//@children.4/@sourceConnections.0" name="DataInputExtendedDecorator" location="757,388" size="225,29" id="org.apache.isis.core.commons.encoding/DataInputExtendedDecorator" runTimeClassModel="">
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <sourceConnections xsi:type="editmodel:GeneralizationEditModel" autoLocated="true" id="org.apache.isis.core.commons.encoding/DataInputExtended<-org.apache.isis.core.commons.encoding/DataInputExtendedDecorator" source="//@children.3" target="//@children.5/@sourceConnections.0" targetEnd="//@children.3/@sourceConnections.0/@children.1" sourceEnd="//@children.3/@sourceConnections.0/@children.0" connectionRouterKind="GeneralizationManhattan">
- <children xsi:type="editmodel:AssociationEndEditModel" location="112,0" anchorKind="FixedAtEdge" attachSource="true"/>
- <children xsi:type="editmodel:AssociationEndEditModel"/>
- </sourceConnections>
- <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
- </children>
- <children xsi:type="editmodel:ClassEditModel" name="DebugDataInputExtended" location="768,448" size="204,29" id="org.apache.isis.core.commons.encoding/DebugDataInputExtended" runTimeClassModel="">
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <sourceConnections xsi:type="editmodel:GeneralizationEditModel" autoLocated="true" id="org.apache.isis.core.commons.encoding/DataInputExtendedDecorator<-org.apache.isis.core.commons.encoding/DebugDataInputExtended" source="//@children.4" target="//@children.3" targetEnd="//@children.4/@sourceConnections.0/@children.1" sourceEnd="//@children.4/@sourceConnections.0/@children.0" connectionRouterKind="Manual">
- <children xsi:type="editmodel:AssociationEndEditModel" location="101,0" attachSource="true"/>
- <children xsi:type="editmodel:AssociationEndEditModel" location="112,29"/>
- </sourceConnections>
- <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
- </children>
- <children xsi:type="editmodel:ClassEditModel" name="DataInputStreamExtended" location="510,388" size="209,57" id="org.apache.isis.core.commons.encoding/DataInputStreamExtended" runTimeClassModel="dataInputStream">
- <children xsi:type="editmodel:CompartmentEditModel" size="182,18">
- <children xsi:type="editmodel:AttributeEditModel" name="dataInputStream" id="org.apache.isis.core.commons.encoding/DataInputStreamExtended#dataInputStream"/>
- </children>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <sourceConnections xsi:type="editmodel:GeneralizationEditModel" targetConnections="//@children.3/@sourceConnections.0" autoLocated="true" id="org.apache.isis.core.commons.encoding/DataInputExtended<-org.apache.isis.core.commons.encoding/DataInputStreamExtended" source="//@children.5" target="//@children.2" targetEnd="//@children.5/@sourceConnections.0/@children.1" sourceEnd="//@children.5/@sourceConnections.0/@children.0" connectionRouterKind="GeneralizationManhattan">
- <children xsi:type="editmodel:AssociationEndEditModel" location="104,0" anchorKind="FixedAtEdge" attachSource="true"/>
- <children xsi:type="editmodel:AssociationEndEditModel" location="81,315" anchorKind="FixedAtEdge"/>
- </sourceConnections>
- <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
- </children>
- <children xsi:type="editmodel:ClassEditModel" name="DataOutputStreamExtended" location="15,435" size="223,57" id="org.apache.isis.core.commons.encoding/DataOutputStreamExtended" runTimeClassModel="dataOutputStream">
- <children xsi:type="editmodel:CompartmentEditModel" size="200,18">
- <children xsi:type="editmodel:AttributeEditModel" name="dataOutputStream" id="org.apache.isis.core.commons.encoding/DataOutputStreamExtended#dataOutputStream"/>
- </children>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <sourceConnections xsi:type="editmodel:GeneralizationEditModel" id="org.apache.isis.core.commons.encoding/DataOutputExtended<-org.apache.isis.core.commons.encoding/DataOutputStreamExtended" source="//@children.6" target="//@children.9" targetEnd="//@children.6/@sourceConnections.0/@children.1" sourceEnd="//@children.6/@sourceConnections.0/@children.0" connectionRouterKind="Manhattan">
- <children xsi:type="editmodel:AssociationEndEditModel" location="125,-1" anchorKind="FixedAtEdge" attachSource="true"/>
- <children xsi:type="editmodel:AssociationEndEditModel" location="86,350"/>
- </sourceConnections>
- <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
- </children>
- <children xsi:type="editmodel:ClassEditModel" name="DebugDataOutputExtended" location="281,499" size="214,29" id="org.apache.isis.core.commons.encoding/DebugDataOutputExtended" runTimeClassModel="">
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <sourceConnections xsi:type="editmodel:GeneralizationEditModel" autoLocated="true" id="org.apache.isis.core.commons.encoding/DataOutputExtendedDecorator<-org.apache.isis.core.commons.encoding/DebugDataOutputExtended" source="//@children.7" target="//@children.8" targetEnd="//@children.7/@sourceConnections.0/@children.1" sourceEnd="//@children.7/@sourceConnections.0/@children.0" connectionRouterKind="Manual">
- <children xsi:type="editmodel:AssociationEndEditModel" location="106,0" attachSource="true"/>
- <children xsi:type="editmodel:AssociationEndEditModel" location="127,29"/>
- </sourceConnections>
- <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
- </children>
- <children xsi:type="editmodel:ClassEditModel" targetConnections="//@children.7/@sourceConnections.0" name="DataOutputExtendedDecorator" location="260,435" size="235,29" id="org.apache.isis.core.commons.encoding/DataOutputExtendedDecorator" runTimeClassModel="">
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <sourceConnections xsi:type="editmodel:GeneralizationEditModel" id="org.apache.isis.core.commons.encoding/DataOutputExtended<-org.apache.isis.core.commons.encoding/DataOutputExtendedDecorator" source="//@children.8" target="//@children.9" targetEnd="//@children.8/@sourceConnections.0/@children.1" sourceEnd="//@children.8/@sourceConnections.0/@children.0" connectionRouterKind="Manhattan">
- <children xsi:type="editmodel:AssociationEndEditModel" location="117,0" anchorKind="FixedAtEdge" attachSource="true"/>
- <children xsi:type="editmodel:AssociationEndEditModel" location="86,351" anchorKind="FixedAtEdge"/>
- </sourceConnections>
- <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
- </children>
- <children xsi:type="editmodel:InterfaceEditModel" targetConnections="//@children.8/@sourceConnections.0 //@children.6/@sourceConnections.0" name="DataOutputExtended" location="150,14" size="173,351" id="org.apache.isis.core.commons.encoding/DataOutputExtended" runTimeClassModel="writeByte(I),writeBooleans([Z),writeEncodables([Ljava.lang.Object;),getDataOutputStream(),writeUTFs([Ljava.lang.String;),writeSerializables([Ljava.lang.Object;),writeEncodable(Ljava.lang.Object;),writeShorts([S [...]
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <children xsi:type="editmodel:CompartmentEditModel" size="133,288">
- <children xsi:type="editmodel:MethodEditModel" name="getDataOutputStream" id="org.apache.isis.core.commons.encoding/DataOutputExtended#getDataOutputStream()"/>
- <children xsi:type="editmodel:MethodEditModel" name="write" id="org.apache.isis.core.commons.encoding/DataOutputExtended#write(I)"/>
- <children xsi:type="editmodel:MethodEditModel" name="writeBooleans" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeBooleans([Z)"/>
- <children xsi:type="editmodel:MethodEditModel" name="writeByte" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeByte(I)"/>
- <children xsi:type="editmodel:MethodEditModel" name="writeBytes" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeBytes([B)"/>
- <children xsi:type="editmodel:MethodEditModel" name="writeChars" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeChars([C)"/>
- <children xsi:type="editmodel:MethodEditModel" name="writeDoubles" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeDoubles([D)"/>
- <children xsi:type="editmodel:MethodEditModel" name="writeEncodable" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeEncodable(Ljava.lang.Object;)"/>
- <children xsi:type="editmodel:MethodEditModel" name="writeEncodables" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeEncodables([Ljava.lang.Object;)"/>
- <children xsi:type="editmodel:MethodEditModel" name="writeFloats" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeFloats([F)"/>
- <children xsi:type="editmodel:MethodEditModel" name="writeInts" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeInts([I)"/>
- <children xsi:type="editmodel:MethodEditModel" name="writeLongs" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeLongs([J)"/>
- <children xsi:type="editmodel:MethodEditModel" name="writeSerializable" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeSerializable(Ljava.lang.Object;)"/>
- <children xsi:type="editmodel:MethodEditModel" name="writeSerializables" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeSerializables([Ljava.lang.Object;)"/>
- <children xsi:type="editmodel:MethodEditModel" name="writeShorts" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeShorts([S)"/>
- <children xsi:type="editmodel:MethodEditModel" name="writeUTFs" id="org.apache.isis.core.commons.encoding/DataOutputExtended#writeUTFs([Ljava.lang.String;)"/>
- </children>
- <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/>
- <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/>
- </children>
- <diagramOptions xsi:type="options:ClassDiagramOptions" level="-1" showScope="InPackage" properties="wireOptions=3;Product=eUML2"/>
- <boardSetting snapToGeometry="true" gridEnabled="true" gridSpacing="15,15" gridOrigin="0,0" rulerUnit="pixel" gridVisibility="false">
- <leftRuler/>
- <topRuler/>
- </boardSetting>
- <classDiagramPreferences xsi:type="editmodel:UMLClassDiagramPreference" showPopupBars="true" showConnectionHandles="true" attributeSorter="Natural" methodSorter="Natural" showClassStereotype="true" showPackageStereotype="true" showDependencyStereotype="true" showInterfaceStereotype="true" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showPackageMethods="true" showStaticMethods="true" showPublicIn [...]
-</editmodel:ClassDiagramEditModel>
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 09/26: ISIS-1742: deletes unused methods from
StringExtensions
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 8de7cdf162239cd45c8bcd7262c7d93151234a8b
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 12:03:15 2017 +0100
ISIS-1742: deletes unused methods from StringExtensions
---
.../isis/core/commons/lang/StringExtensions.java | 48 ----------------------
1 file changed, 48 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringExtensions.java
index cf7f978..53a0bfd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringExtensions.java
@@ -19,7 +19,6 @@
package org.apache.isis.core.commons.lang;
-import java.io.File;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -134,17 +133,6 @@ public final class StringExtensions {
return Character.isUpperCase(c) || Character.isDigit(c) && !Character.isDigit(previousChar);
}
- public static String asSimpleName(final String extendee) {
- final int lastDot = extendee.lastIndexOf('.');
- if (lastDot == -1) {
- return extendee;
- }
- if (lastDot == extendee.length() - 1) {
- throw new IllegalArgumentException("Name cannot end in '.'");
- }
- return extendee.substring(lastDot + 1);
- }
-
public static String asCamel(final String extendee) {
final StringBuffer b = new StringBuffer(extendee.length());
final StringTokenizer t = new StringTokenizer(extendee);
@@ -181,10 +169,6 @@ public final class StringExtensions {
return capitalize(asCamel(extendee));
}
- public static String asMemberIdFor(final String extendee) {
- return asLowerFirst(asCamel(extendee));
- }
-
// ////////////////////////////////////////////////////////////
// capitalize, lowerFirst, firstWord
// ////////////////////////////////////////////////////////////
@@ -212,12 +196,6 @@ public final class StringExtensions {
return extendee.substring(0, 1).toLowerCase() + extendee.substring(1);
}
- public static String asFirstWord(final String extendee) {
- final String[] split = extendee.split(" ");
- return split[0];
- }
-
-
// ////////////////////////////////////////////////////////////
// in, combinePaths, splitOnCommas
// ////////////////////////////////////////////////////////////
@@ -231,17 +209,6 @@ public final class StringExtensions {
return false;
}
- public static String combinePaths(final String extendee, final String... furtherPaths) {
- final StringBuilder pathBuf = new StringBuilder(extendee);
- for (final String furtherPath : furtherPaths) {
- if (pathBuf.charAt(pathBuf.length() - 1) != File.separatorChar) {
- pathBuf.append(File.separatorChar);
- }
- pathBuf.append(furtherPath);
- }
- return pathBuf.toString();
- }
-
public static List<String> splitOnCommas(final String commaSeparatedExtendee) {
if (commaSeparatedExtendee == null) {
return null;
@@ -298,21 +265,6 @@ public final class StringExtensions {
// normalize
// ////////////////////////////////////////////////////////////
- public static String removeTabs(final String extendee) {
- // quick return - jvm java should always return here
- if (extendee.indexOf('\t') == -1) {
- return extendee;
- }
- final StringBuffer buf = new StringBuffer();
- for (int i = 0; i < extendee.length(); i++) {
- // a bit clunky to stay with j# api
- if (extendee.charAt(i) != '\t') {
- buf.append(extendee.charAt(i));
- }
- }
- return buf.toString();
- }
-
public static String removeLeadingWhiteSpace(final String extendee) {
if (extendee == null) {
return null;
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 21/26: ISIS-1742: updates todo doc,
removed filters from applib
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b16398ea0e0feab27b8a8b15c180bd7e88f5bd1e
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 13:08:23 2017 +0100
ISIS-1742: updates todo doc, removed filters from applib
---
todo-deprecation-list.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index 54f3fbf..965c75c 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -17,8 +17,6 @@ org.apache.isis.applib.clock
-org.apache.isis.applib.filter - entire package of Filter classes; use guava Predicate instead.
-
org.apache.isis.applib.fixturescripts
FixtureScript.java - various methods to simplify API
@@ -415,3 +413,5 @@ org.apache.isis.applib.marker - remove these marker interfaces (tend to use anno
+org.apache.isis.applib.filter - entire package of Filter classes; use guava Predicate instead.
+
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 18/26: ISIS-1742: deletes OidMatchers & OidMatchers (two
different classes, unrelated except with same name, both unused).
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 140f99230d36c459bcbf62c646c76b7e4c0cf5dd
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 12:56:31 2017 +0100
ISIS-1742: deletes OidMatchers & OidMatchers (two different classes, unrelated except with same name, both unused).
---
.../core/metamodel/adapter/oid/OidMatchers.java | 48 --------------------
.../isis/viewer/wicket/model/util/OidMatchers.java | 51 ----------------------
2 files changed, 99 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/OidMatchers.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/OidMatchers.java
deleted file mode 100644
index 65f1ff1..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/OidMatchers.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.core.metamodel.adapter.oid;
-
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-
-public class OidMatchers {
-
- private OidMatchers(){}
-
- public static Matcher<Oid> matching(final String objectType, final String identifier) {
- return new TypeSafeMatcher<Oid>() {
-
- @Override
- public void describeTo(Description arg0) {
- arg0.appendText("matching [" + objectType + ", " + identifier +"]");
- }
-
- @Override
- public boolean matchesSafely(Oid oid) {
- if(oid instanceof RootOid) {
- RootOid rootOid = (RootOid) oid;
- return rootOid.getObjectSpecId().equals(objectType) && rootOid.getIdentifier().equals(identifier);
- }
- return false;
- }
- };
- }
-
-}
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/OidMatchers.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/OidMatchers.java
deleted file mode 100644
index 7904a35..0000000
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/OidMatchers.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.viewer.wicket.model.util;
-
-import org.hamcrest.Matcher;
-
-import org.apache.isis.core.metamodel.adapter.oid.Oid;
-
-/**
- * @deprecated - use {@link Oid.Matchers}
- */
-@Deprecated
-public final class OidMatchers {
-
- private OidMatchers() {
- }
-
- /**
- * @deprecated - use {@link Oid.Matchers}
- */
- @Deprecated
- public static Matcher<Oid> isTransient() {
- return Oid.Matchers.isTransient();
- }
-
- /**
- * @deprecated - use {@link Oid.Matchers}
- */
- @Deprecated
- public static Matcher<Oid> isPersistent() {
- return Oid.Matchers.isPersistent();
- }
-
-}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 24/26: ISIS-1742: deletes unused
RepresentationServiceForRestfulObjects
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 25da4f5ed860d515287fc5e955883d49886993ab
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 13:34:05 2017 +0100
ISIS-1742: deletes unused RepresentationServiceForRestfulObjects
---
.../RepresentationServiceForRestfulObjects.java | 24 ----------------------
1 file changed, 24 deletions(-)
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceForRestfulObjects.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceForRestfulObjects.java
deleted file mode 100644
index b9dbe7d..0000000
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceForRestfulObjects.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.isis.viewer.restfulobjects.rendering.service;
-
-/**
- * @deprecated - renamed to {@link RepresentationServiceContentNegotiator}.
- */
-@Deprecated
-public class RepresentationServiceForRestfulObjects extends RepresentationServiceContentNegotiator {
-}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 22/26: ISIS-1742: moves ContentMappingService from
applib.conmap to applib.services.conmap
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 12324129660eba96e381278698557e2f1d8a9974
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 13:16:18 2017 +0100
ISIS-1742: moves ContentMappingService from applib.conmap to applib.services.conmap
---
.../{ => services}/conmap/ContentMappingService.java | 2 +-
.../isis/applib/{ => services}/conmap/package-info.java | 4 ++--
.../rendering/service/conmap/ContentMappingService.java | 4 ++--
.../conneg/ContentNegotiationServiceXRoDomainType.java | 6 +++---
todo-deprecation-list.txt | 14 ++++++++++++++
5 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/conmap/ContentMappingService.java b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java
similarity index 96%
rename from core/applib/src/main/java/org/apache/isis/applib/conmap/ContentMappingService.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java
index d577dfb..a4a0fd7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/conmap/ContentMappingService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.conmap;
+package org.apache.isis.applib.services.conmap;
import java.util.List;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/conmap/package-info.java b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/package-info.java
similarity index 87%
rename from core/applib/src/main/java/org/apache/isis/applib/conmap/package-info.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/conmap/package-info.java
index 8bec606..0df8fdd 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/conmap/package-info.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/conmap/package-info.java
@@ -18,10 +18,10 @@
*/
/**
- * The {@link org.apache.isis.applib.conmap.ContentMappingService} supports the (default implementation of the)
+ * The {@link org.apache.isis.applib.services.conmap.ContentMappingService} supports the (default implementation of the)
* <code>ContentNegotiationService</code> enabling the RestfulObjects viewer to represent domain objects in some other
* format as specified by the HTTP <code>Accept</code> header.
*
* @see <a href="http://isis.apache.org/guides/rgsvc/rgsvc.html#_rgsvc_presentation-layer-spi_ContentMappingService">Reference Guide</a>
*/
-package org.apache.isis.applib.conmap;
\ No newline at end of file
+package org.apache.isis.applib.services.conmap;
\ No newline at end of file
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conmap/ContentMappingService.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conmap/ContentMappingService.java
index b4585d7..44f6e77 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conmap/ContentMappingService.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conmap/ContentMappingService.java
@@ -26,13 +26,13 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
/**
- * @deprecated - replaced by simplified version, {@link org.apache.isis.applib.conmap.ContentMappingService}, in the applib.
+ * @deprecated - replaced by simplified version, {@link org.apache.isis.applib.services.conmap.ContentMappingService}, in the applib.
*/
@Deprecated
public interface ContentMappingService {
/**
- * @deprecated - replaced by simplified version, {@link org.apache.isis.applib.conmap.ContentMappingService#map(Object, List)}, in the applib.
+ * @deprecated - replaced by simplified version, {@link org.apache.isis.applib.services.conmap.ContentMappingService#map(Object, List)}, in the applib.
*/
@Deprecated
@Programmatic
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
index 223d885..25cfd17 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
@@ -138,7 +138,7 @@ public class ContentNegotiationServiceXRoDomainType extends ContentNegotiationSe
}
/**
- * Delegates to either the applib {@link org.apache.isis.applib.conmap.ContentMappingService}, else the
+ * Delegates to either the applib {@link org.apache.isis.applib.services.conmap.ContentMappingService}, else the
* original non-applib {@link ContentMappingService}.
*/
protected Object map(
@@ -146,7 +146,7 @@ public class ContentNegotiationServiceXRoDomainType extends ContentNegotiationSe
final List<MediaType> acceptableMediaTypes,
final RepresentationType representationType) {
- for (org.apache.isis.applib.conmap.ContentMappingService contentMappingService : contentMappingServices) {
+ for (org.apache.isis.applib.services.conmap.ContentMappingService contentMappingService : contentMappingServices) {
Object mappedObject = contentMappingService.map(domainObject, acceptableMediaTypes);
if(mappedObject != null) {
return mappedObject;
@@ -164,7 +164,7 @@ public class ContentNegotiationServiceXRoDomainType extends ContentNegotiationSe
}
@javax.inject.Inject
- List<org.apache.isis.applib.conmap.ContentMappingService> contentMappingServices;
+ List<org.apache.isis.applib.services.conmap.ContentMappingService> contentMappingServices;
@javax.inject.Inject
List<ContentMappingService> legacyContentMappingServices;
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index 965c75c..a2a4a0b 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -1,6 +1,18 @@
+
+
+
TO REMOVE:
+org.apache.isis.viewer.restfulobjects.rendering.service.conmap
+
+ ContentMappingService
+
+org.apache.isis.viewer.restfulobjects.rendering.service
+
+ RepresentationServiceForRestfulObjects
+
+
org.apache.isis.applib
@@ -18,6 +30,7 @@ org.apache.isis.applib.clock
+
org.apache.isis.applib.fixturescripts
FixtureScript.java - various methods to simplify API
add(...) - use addResult(...) instead
@@ -260,6 +273,7 @@ DONE (MOVED)
org.apache.isis.applib.events - moved to services.wrapper.events. (Still useful as provide context for exceptions, for a "transcript" framework).
org.apache.isis.applib.events.system - move to fixturescripts.events.
+ org.apache.isis.applib.conmap.ContentMappingService to applib.services.conmap
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 14/26: ISIS-1742: deletes UrlEncodingUtils#urlEncode,
since not used
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f3616e873d0d4ac21a7827e5afc82046337d205c
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 12:44:23 2017 +0100
ISIS-1742: deletes UrlEncodingUtils#urlEncode, since not used
---
.../org/apache/isis/core/commons/url/UrlEncodingUtils.java | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/url/UrlEncodingUtils.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/url/UrlEncodingUtils.java
index 8df8410..ee11718 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/url/UrlEncodingUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/url/UrlEncodingUtils.java
@@ -20,9 +20,7 @@ package org.apache.isis.core.commons.url;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
-import java.net.URLEncoder;
-import com.google.common.base.Charsets;
import com.google.common.base.Function;
public final class UrlEncodingUtils {
@@ -65,14 +63,4 @@ public final class UrlEncodingUtils {
return FUNCTION_NULLSAFE.apply(string);
}
- public static String urlEncode(final String str) {
- try {
- return URLEncoder.encode(str, Charsets.UTF_8.name());
- } catch (final UnsupportedEncodingException e) {
- // shouldn't happen
- throw new RuntimeException(e);
- }
- }
-
-
}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 08/26: ISIS-1742: deletes StringBuilderExtensions, unused
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a74fe5e4aa414548b3160c10d7303848084136df
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 12:01:50 2017 +0100
ISIS-1742: deletes StringBuilderExtensions, unused
---
.../core/commons/lang/StringBuilderExtensions.java | 29 ----------------------
1 file changed, 29 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringBuilderExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringBuilderExtensions.java
deleted file mode 100644
index fd41fc6..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringBuilderExtensions.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.commons.lang;
-
-public class StringBuilderExtensions {
-
- public static void appendFormattedStr(final StringBuilder extendee, final String formatString, final Object... args) {
- extendee.append(String.format(formatString, args));
- }
-
-
-}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 06/26: ISIS-1742: deletes method from ResourceUtil, unused
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 871165e1a1140255abc998ab05790f1839404737
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 12:00:08 2017 +0100
ISIS-1742: deletes method from ResourceUtil, unused
---
.../isis/core/commons/lang/ResourceUtil.java | 32 ----------------------
1 file changed, 32 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ResourceUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ResourceUtil.java
index 6ec236d..7e5fc77 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ResourceUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ResourceUtil.java
@@ -20,7 +20,6 @@
package org.apache.isis.core.commons.lang;
import java.io.InputStream;
-import java.net.URL;
/**
* Adapted from Ibatis Common, now with some additional guava stuff.
@@ -29,37 +28,6 @@ public class ResourceUtil {
private ResourceUtil(){}
- /**
- * Returns the URL, or null if not available.
- */
- public static URL getResourceURL(final String resource) {
-
- // try thread's classloader
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- URL url = classLoader.getResource(resource);
- if (url != null) {
- return url;
- }
-
- // try this class' classloader
- classLoader = ResourceUtil.class.getClassLoader();
- url = classLoader.getResource(resource);
- if (url != null) {
- return url;
- }
-
- // try system class loader (could return null)
- // wrapping in a try...catch because when running tests by Maven for a
- // non-existing
- // resource, seems to bomb out. Is okay when run from Eclipse. A bit of
- // a puzzle.
- try {
- return ClassLoader.getSystemResource(resource);
- } catch (final NullPointerException ignore) {
- return null;
- }
- }
-
public static InputStream getResourceAsStream(final String resource) {
// try thread's classloader
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 25/26: ISIS-1742: removes unused methods from
applib.clock.Clock
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ca8a36eec55c669212041745108e7d395426e478
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 13:34:19 2017 +0100
ISIS-1742: removes unused methods from applib.clock.Clock
---
.../java/org/apache/isis/applib/clock/Clock.java | 30 +---------------------
todo-deprecation-list.txt | 26 +++++++++----------
2 files changed, 13 insertions(+), 43 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/clock/Clock.java b/core/applib/src/main/java/org/apache/isis/applib/clock/Clock.java
index 48ac2f3..2905d84 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/clock/Clock.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/clock/Clock.java
@@ -20,7 +20,6 @@
package org.apache.isis.applib.clock;
import java.sql.Timestamp;
-import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
@@ -29,9 +28,8 @@ import org.joda.time.DateTimeZone;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
-import org.apache.isis.applib.FatalException;
-import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.Defaults;
+import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.fixtures.FixtureClock;
/**
@@ -88,27 +86,6 @@ public abstract class Clock {
return getInstance().time();
}
- /**
- * Convenience method returning the current {@link #getTime() time}
- * according to this Clock as a mutable {@link Calendar}. Consider replacing
- * with {@link #getTimeAsDateTime()
-
- */
- @Deprecated
- public static Calendar getTimeAsCalendar() {
- return getInstance().timeAsCalendar();
- }
-
- /**
- * Convenience method returning the current {@link #getTime() time}
- * according to this Clock as a (nominally im)mutable {@link Date}. You
- * should now use {@link #getTimeAsDateTime()}
- *
- */
- @Deprecated
- public static Date getTimeAsDate() {
- return new Date(getTime());
- }
public static LocalDate getTimeAsLocalDate() {
final DateTimeZone timeZone = DateTimeZone.forTimeZone(TimeZone.getDefault());
@@ -157,11 +134,6 @@ public abstract class Clock {
instance = this;
}
- public final Calendar timeAsCalendar() {
- final Calendar cal = Calendar.getInstance();
- cal.setTimeInMillis(Clock.getTime());
- return cal;
- }
/**
* The current time since midnight, January 1, 1970 UTC.
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index a2a4a0b..98c7499 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -4,13 +4,6 @@
TO REMOVE:
-org.apache.isis.viewer.restfulobjects.rendering.service.conmap
-
- ContentMappingService
-
-org.apache.isis.viewer.restfulobjects.rendering.service
-
- RepresentationServiceForRestfulObjects
@@ -23,12 +16,8 @@ org.apache.isis.applib
org.apache.isis.applib.clock
Clock.java -
- getTimeAsCalendar() (1 usage found)
- getTimeAsDate() (1 usage found)
-
-
-
-
+ getTimeAsCalendar()
+ getTimeAsDate()
org.apache.isis.applib.fixturescripts
@@ -427,5 +416,14 @@ org.apache.isis.applib.marker - remove these marker interfaces (tend to use anno
-org.apache.isis.applib.filter - entire package of Filter classes; use guava Predicate instead.
+org.apache.isis.applib.filter
+
+ - entire package of Filter classes; use guava Predicate instead.
+
+
+
+org.apache.isis.viewer.restfulobjects.rendering.service.conmap.ContentMappingService
+ - replaced by non-applib
+org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationServiceForRestfulObjects
+ - unused
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 02/26: ISIS-1742: deletes unused methods of ListExtensions
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d700ea85aa843743a562d4ff17b53948780cb90b
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 11:49:19 2017 +0100
ISIS-1742: deletes unused methods of ListExtensions
---
.../isis/core/commons/lang/ListExtensions.java | 45 ----------------------
1 file changed, 45 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ListExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ListExtensions.java
index 792e852..7fd0e46 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ListExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ListExtensions.java
@@ -19,7 +19,6 @@
package org.apache.isis.core.commons.lang;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -54,50 +53,6 @@ public final class ListExtensions {
}
- /**
- * @see #listToString(List, String)
- * @see #stringToList(String)
- */
- public static String listToString(final List<String> list) {
- return listToString(list, DEFAULT_DELIMITER);
- }
-
- /**
- * @see #listToString(List, String)
- * @see #stringToList(String)
- */
- public static String listToString(final List<String> list, final String delimiter) {
- if (list.size() == 0) {
- return null;
- }
- final StringBuilder buf = new StringBuilder();
- boolean first = true;
- for (final String str : list) {
- if (first) {
- first = false;
- } else {
- buf.append(delimiter);
- }
- buf.append(str);
- }
- return buf.toString();
- }
-
- /**
- * @see #stringToList(String, String)
- * @see #listToString(List)
- */
- public static List<String> stringToList(final String commaSeparated) {
- return appendDelimitedStringToList(commaSeparated, new ArrayList<String>());
- }
-
- /**
- * @see #stringToList(String)
- * @see #listToString(List, String)
- */
- public static List<String> stringToList(final String delimited, final String delimiter) {
- return appendDelimitedStringToList(delimited, delimiter, new ArrayList<String>());
- }
/**
* @see #appendDelimitedStringToList(String, String, List)
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 12/26: ISIS-1742: deletes unused methods in StringExtensions
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 55e957491491395b73559f3f5f71ac0133e5f545
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 12:07:57 2017 +0100
ISIS-1742: deletes unused methods in StringExtensions
---
.../isis/core/commons/lang/StringExtensions.java | 101 ---------------------
1 file changed, 101 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringExtensions.java
index 53a0bfd..2f791a5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringExtensions.java
@@ -331,108 +331,7 @@ public final class StringExtensions {
// copied in from Apache Commons
// //////////////////////////////////////
-
- public static final String EMPTY = "";
- /**
- * <p>The maximum size to which the padding constant(s) can expand.</p>
- */
- private static final int PAD_LIMIT = 8192;
-
- /**
- * <p>Repeat a String <code>repeat</code> times to form a
- * new String.</p>
- *
- * <pre>
- * StringUtils.repeat(null, 2) = null
- * StringUtils.repeat("", 0) = ""
- * StringUtils.repeat("", 2) = ""
- * StringUtils.repeat("a", 3) = "aaa"
- * StringUtils.repeat("ab", 2) = "abab"
- * StringUtils.repeat("a", -2) = ""
- * </pre>
- *
- * @param extendee the String to repeat, may be null
- * @param repeat number of times to repeat str, negative treated as zero
- * @return a new String consisting of the original String repeated,
- * <code>null</code> if null String input
- */
- public static String repeat(final String extendee, int repeat) {
- // Performance tuned for 2.0 (JDK1.4)
- if (extendee == null) {
- return null;
- }
- if (repeat <= 0) {
- return EMPTY;
- }
- int inputLength = extendee.length();
- if (repeat == 1 || inputLength == 0) {
- return extendee;
- }
- if (inputLength == 1 && repeat <= PAD_LIMIT) {
- return padding(repeat, extendee.charAt(0));
- }
-
- int outputLength = inputLength * repeat;
- switch (inputLength) {
- case 1 :
- char ch = extendee.charAt(0);
- char[] output1 = new char[outputLength];
- for (int i = repeat - 1; i >= 0; i--) {
- output1[i] = ch;
- }
- return new String(output1);
- case 2 :
- char ch0 = extendee.charAt(0);
- char ch1 = extendee.charAt(1);
- char[] output2 = new char[outputLength];
- for (int i = repeat * 2 - 2; i >= 0; i--, i--) {
- output2[i] = ch0;
- output2[i + 1] = ch1;
- }
- return new String(output2);
- default :
- StringBuilder buf = new StringBuilder(outputLength);
- for (int i = 0; i < repeat; i++) {
- buf.append(extendee);
- }
- return buf.toString();
- }
- }
-
- /**
- * <p>Returns padding using the specified delimiter repeated
- * to a given length.</p>
- *
- * <pre>
- * StringUtils.padding(0, 'e') = ""
- * StringUtils.padding(3, 'e') = "eee"
- * StringUtils.padding(-2, 'e') = IndexOutOfBoundsException
- * </pre>
- *
- * <p>Note: this method doesn't not support padding with
- * <a href="http://www.unicode.org/glossary/#supplementary_character">Unicode Supplementary Characters</a>
- * as they require a pair of <code>char</code>s to be represented.
- * If you are needing to support full I18N of your applications
- * consider using {@link #repeat(String, int)} instead.
- * </p>
- *
- * @param repeat number of times to repeat delim
- * @param padChar character to repeat
- * @return String with repeated character
- * @throws IndexOutOfBoundsException if <code>repeat < 0</code>
- * @see #repeat(String, int)
- */
- private static String padding(int repeat, char padChar) throws IndexOutOfBoundsException {
- if (repeat < 0) {
- throw new IndexOutOfBoundsException("Cannot pad a negative amount: " + repeat);
- }
- final char[] buf = new char[repeat];
- for (int i = 0; i < buf.length; i++) {
- buf[i] = padChar;
- }
- return new String(buf);
- }
public static boolean startsWith(final String extendee, final String prefix) {
final int length = prefix.length();
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 26/26: ISIS-1742: removes FixtureScript.ExecutionContext#add
methods (use #addResult instead) and removes asKeyValueMap(...) utility
method completely
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6bc8bb69311d7e5dc8f7b51668a3e4d6250379f7
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 13:41:41 2017 +0100
ISIS-1742: removes FixtureScript.ExecutionContext#add methods (use #addResult instead) and removes asKeyValueMap(...) utility method completely
---
.../isis/applib/fixturescripts/FixtureScript.java | 34 -------------
.../fixturescripts/ExecutionContextTest.java | 51 -------------------
.../ExecutionParameters_AsKeyValueMap_Test.java | 58 ++++++++++++++++++++++
...tersTest.java => ExecutionParameters_Test.java} | 2 +-
todo-deprecation-list.txt | 21 +++++---
5 files changed, 74 insertions(+), 92 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
index 402e13c..98b0109 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
@@ -262,19 +262,11 @@ public abstract class FixtureScript
*/
public static final ExecutionContext NOOP = new ExecutionContext((String)null, null) {
@Override
- public <T> T add(final FixtureScript script, final T object) {
- return object;
- }
- @Override
public <T> T addResult(final FixtureScript script, final T object) {
return object;
}
@Override
- public <T> T add(final FixtureScript script, final String key, final T object) {
- return object;
- }
- @Override
public <T> T addResult(final FixtureScript script, final String key, final T object) {
return object;
}
@@ -304,14 +296,6 @@ public abstract class FixtureScript
this.executionParameters = executionParameters;
}
- /**
- * @deprecated - this shouldn't have public visibility.
- */
- @Deprecated
- public static Map<String, String> asKeyValueMap(final String parameters) {
- return ExecutionParameters.asKeyValueMap(parameters);
- }
-
@Programmatic
public String getParameters() {
return executionParameters.getParameters();
@@ -492,30 +476,12 @@ public abstract class FixtureScript
return fixtureResultList.getResults();
}
- /**
- * @deprecated - use {@link #addResult(FixtureScript, Object)} instead.
- */
- @Deprecated
- @Programmatic
- public <T> T add(final FixtureScript script, final T object) {
- return addResult(script, object);
- }
-
@Programmatic
public <T> T addResult(final FixtureScript script, final T object) {
fixtureResultList.add(script, object);
return object;
}
- /**
- * @deprecated - use {@link #addResult(FixtureScript, String, Object)} instead.
- */
- @Programmatic
- @Deprecated
- public <T> T add(final FixtureScript script, final String key, final T object) {
- return addResult(script, key, object);
- }
-
@Programmatic
public <T> T addResult(final FixtureScript script, final String key, final T object) {
fixtureResultList.add(script, key, object);
diff --git a/core/applib/src/test/java/org/apache/isis/applib/fixturescripts/ExecutionContextTest.java b/core/applib/src/test/java/org/apache/isis/applib/fixturescripts/ExecutionContextTest.java
index 1a80415..aa9f85b 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/fixturescripts/ExecutionContextTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/fixturescripts/ExecutionContextTest.java
@@ -29,57 +29,6 @@ import static org.junit.Assert.assertThat;
public class ExecutionContextTest {
- public static class AsKeyValueMap extends ExecutionContextTest {
-
- @Test
- public void happyCase() throws Exception {
- final Map<String, String> map = FixtureScript.ExecutionContext.asKeyValueMap("foo=bar\nbop=baz");
- assertThat(map.size(), is(2));
-
- assertThat(map.get("foo"), is("bar"));
- assertThat(map.get("bop"), is("baz"));
- }
-
- @Test
- public void givenNull() throws Exception {
- final Map<String, String> map = FixtureScript.ExecutionContext.asKeyValueMap(null);
- assertThat(map.size(), is(0));
- }
-
- @Test
- public void givenEmpty() throws Exception {
- final Map<String, String> map = FixtureScript.ExecutionContext.asKeyValueMap("");
- assertThat(map.size(), is(0));
- }
-
- @Test
- public void trim() throws Exception {
-
- final Map<String, String> map = FixtureScript.ExecutionContext.asKeyValueMap(" foo=bar\nbop=baz \n bip = bap ");
- assertThat(map.size(), is(3));
-
- assertThat(map.get("foo"), is("bar"));
- assertThat(map.get("bop"), is("baz"));
- assertThat(map.get("bip"), is("bap"));
- }
-
- @Test
- public void malformed() throws Exception {
- final Map<String, String> map = FixtureScript.ExecutionContext.asKeyValueMap("abcde");
- assertThat(map.size(), is(0));
- }
-
- @Test
- public void partiallyMalformed() throws Exception {
- final Map<String, String> map = FixtureScript.ExecutionContext.asKeyValueMap("foo=bar\nabcde\nbop=baz");
- assertThat(map.size(), is(2));
-
- assertThat(map.get("foo"), is("bar"));
- assertThat(map.get("bop"), is("baz"));
- }
- }
-
-
public static class GetParameter extends ExecutionContextTest {
@Test
diff --git a/core/applib/src/test/java/org/apache/isis/applib/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java b/core/applib/src/test/java/org/apache/isis/applib/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
new file mode 100644
index 0000000..83d047b
--- /dev/null
+++ b/core/applib/src/test/java/org/apache/isis/applib/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
@@ -0,0 +1,58 @@
+package org.apache.isis.applib.fixturescripts;
+
+import java.util.Map;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class ExecutionParameters_AsKeyValueMap_Test extends ExecutionContextTest {
+
+ @Test
+ public void happyCase() throws Exception {
+ final Map<String, String> map = ExecutionParameters.asKeyValueMap("foo=bar\nbop=baz");
+ assertThat(map.size(), is(2));
+
+ assertThat(map.get("foo"), is("bar"));
+ assertThat(map.get("bop"), is("baz"));
+ }
+
+ @Test
+ public void givenNull() throws Exception {
+ final Map<String, String> map = ExecutionParameters.asKeyValueMap(null);
+ assertThat(map.size(), is(0));
+ }
+
+ @Test
+ public void givenEmpty() throws Exception {
+ final Map<String, String> map = ExecutionParameters.asKeyValueMap("");
+ assertThat(map.size(), is(0));
+ }
+
+ @Test
+ public void trim() throws Exception {
+
+ final Map<String, String> map = ExecutionParameters.asKeyValueMap(" foo=bar\nbop=baz \n bip = bap ");
+ assertThat(map.size(), is(3));
+
+ assertThat(map.get("foo"), is("bar"));
+ assertThat(map.get("bop"), is("baz"));
+ assertThat(map.get("bip"), is("bap"));
+ }
+
+ @Test
+ public void malformed() throws Exception {
+ final Map<String, String> map = ExecutionParameters.asKeyValueMap("abcde");
+ assertThat(map.size(), is(0));
+ }
+
+ @Test
+ public void partiallyMalformed() throws Exception {
+ final Map<String, String> map = ExecutionParameters.asKeyValueMap("foo=bar\nabcde\nbop=baz");
+ assertThat(map.size(), is(2));
+
+ assertThat(map.get("foo"), is("bar"));
+ assertThat(map.get("bop"), is("baz"));
+ }
+}
diff --git a/core/applib/src/test/java/org/apache/isis/applib/fixturescripts/ExecutionParametersTest.java b/core/applib/src/test/java/org/apache/isis/applib/fixturescripts/ExecutionParameters_Test.java
similarity index 99%
rename from core/applib/src/test/java/org/apache/isis/applib/fixturescripts/ExecutionParametersTest.java
rename to core/applib/src/test/java/org/apache/isis/applib/fixturescripts/ExecutionParameters_Test.java
index 49a3733..419b948 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/fixturescripts/ExecutionParametersTest.java
+++ b/core/applib/src/test/java/org/apache/isis/applib/fixturescripts/ExecutionParameters_Test.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public class ExecutionParametersTest {
+public class ExecutionParameters_Test {
private ExecutionParameters executionParameters;
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index 98c7499..e199e24 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -15,15 +15,13 @@ org.apache.isis.applib
org.apache.isis.applib.clock
- Clock.java -
- getTimeAsCalendar()
- getTimeAsDate()
+ Clock
+
+
org.apache.isis.applib.fixturescripts
- FixtureScript.java - various methods to simplify API
- add(...) - use addResult(...) instead
- asKeyValueMap(String) - removed; this shouldn't have had public visibility.
+ FixtureScript - various methods to simplify API
execute(...) and executeChild(...) - use ExecutionContext#executeChild(FixtureScript, String, FixtureScript)} instead
executeIfNotAlready(FixtureScript) - removed; this shouldn't have had public visibility.
lookup(String, Class<T>) - use ExecutionContext#lookup(...) instead
@@ -421,9 +419,20 @@ org.apache.isis.applib.filter
- entire package of Filter classes; use guava Predicate instead.
+org.apache.isis.applib.clock
+ Clock.java -
+ getTimeAsCalendar()
+ getTimeAsDate()
+
+org.apache.isis.applib.fixturescripts
+ FixtureScript.ExecutionContext - various methods to simplify API
+ add(...) - use addResult(...) instead
+ asKeyValueMap(String) - removed; this shouldn't have had public visibility.
+
org.apache.isis.viewer.restfulobjects.rendering.service.conmap.ContentMappingService
- replaced by non-applib
org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationServiceForRestfulObjects
- unused
+
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.