This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
commit ecc37e51c73cb6a5bd3bf993acf6280f78a04be1 Author: Andi Huber <ahu...@apache.org> AuthorDate: Sat May 19 18:44:50 2018 +0200 ISIS-1949: moving Internal API to commons Task-Url: https://issues.apache.org/jira/browse/ISIS-1949 --- .../services/urlencoding/UrlEncodingService.java | 9 ++------- .../org/apache/isis/applib/internal/_Constants.java | 0 .../org/apache/isis/applib/internal/base/_Bytes.java | 0 .../applib/internal/base/_Bytes_GZipCompressor.java | 0 .../internal/base/_Bytes_GZipCompressorSmart.java | 0 .../org/apache/isis/applib/internal/base/_Casts.java | 0 .../org/apache/isis/applib/internal/base/_Lazy.java | 0 .../apache/isis/applib/internal/base/_NullSafe.java | 0 .../apache/isis/applib/internal/base/_Reduction.java | 0 .../apache/isis/applib/internal/base/_Strings.java | 0 .../applib/internal/base/_Strings_NaturalNames.java | 0 .../applib/internal/base/_Strings_SplitIterator.java | 0 .../isis/applib/internal/base/package-info.java | 0 .../isis/applib/internal/collections/_Arrays.java | 0 .../internal/collections/_Arrays_Collector.java | 0 .../collections/_Arrays_CollectorUnknownSize.java | 0 .../applib/internal/collections/_Collections.java | 0 .../internal/collections/_Collections_Collector.java | 0 .../collections/_Collections_SortedSetOfList.java | 0 .../isis/applib/internal/collections/_Lists.java | 0 .../isis/applib/internal/collections/_Maps.java | 0 .../isis/applib/internal/collections/_Multimaps.java | 0 .../isis/applib/internal/collections/_Sets.java | 0 .../applib/internal/collections/package-info.java | 0 .../isis/applib/internal/compare/_Comparators.java | 0 .../compare/_Comparators_SequenceCompare.java | 0 .../isis/applib/internal/compare/package-info.java | 0 .../apache/isis/applib/internal/context/_Context.java | 6 ++---- .../apache/isis/applib/internal/context/_Plugin.java | 10 +++++----- .../isis/applib/internal/context/package-info.java | 0 .../isis/applib/internal/discover/_Discover.java | 0 .../isis/applib/internal/discover/package-info.java | 0 .../isis/applib/internal/exceptions/_Exceptions.java | 0 .../isis/applib/internal/exceptions/package-info.java | 0 .../isis/applib/internal/functions/_Functions.java | 0 .../_Functions_IndexAwareFunctionAdapter.java | 0 .../isis/applib/internal/functions/package-info.java | 0 .../isis/applib/internal/memento/_Mementos.java | 15 +++++++++++---- .../internal/memento/_Mementos_MementoDefault.java | 10 +++++----- .../isis/applib/internal/memento/package-info.java | 0 .../org/apache/isis/applib/internal/package-info.java | 0 .../isis/applib/internal/resources/_Resource.java | 0 .../internal/resources/_Resource_ContextPath.java | 0 .../applib/internal/resources/_Resource_Path.java | 0 .../internal/resources/_Resource_RestfulPath.java | 0 .../isis/applib/internal/resources/package-info.java | 0 .../applib/plugins/classdiscovery/ClassDiscovery.java | 0 .../plugins/classdiscovery/ClassDiscoveryPlugin.java | 0 .../isis/commons/plugins/PluginResolveException.java | 19 +++++++++++++++++++ .../core/runtime/plugins/codegen/ProxyFactory.java | 0 .../runtime/plugins/codegen/ProxyFactoryPlugin.java | 0 51 files changed, 44 insertions(+), 25 deletions(-) diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java b/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java index 6754532..4e3d978 100644 --- a/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java +++ b/core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java @@ -20,14 +20,9 @@ import java.nio.charset.StandardCharsets; import org.apache.isis.applib.annotation.Programmatic; import org.apache.isis.applib.internal.base._Strings; +import org.apache.isis.applib.internal.memento._Mementos.EncoderDecoder; -public interface UrlEncodingService { - - @Programmatic - public String encode(final byte[] bytes); - - @Programmatic - public byte[] decode(String str); +public interface UrlEncodingService extends EncoderDecoder { @Programmatic public default String encodeString(final String str) { diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/_Constants.java b/core/commons/src/main/java/org/apache/isis/applib/internal/_Constants.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/_Constants.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/_Constants.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Bytes.java b/core/commons/src/main/java/org/apache/isis/applib/internal/base/_Bytes.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/base/_Bytes.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/base/_Bytes.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Bytes_GZipCompressor.java b/core/commons/src/main/java/org/apache/isis/applib/internal/base/_Bytes_GZipCompressor.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/base/_Bytes_GZipCompressor.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/base/_Bytes_GZipCompressor.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Bytes_GZipCompressorSmart.java b/core/commons/src/main/java/org/apache/isis/applib/internal/base/_Bytes_GZipCompressorSmart.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/base/_Bytes_GZipCompressorSmart.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/base/_Bytes_GZipCompressorSmart.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Casts.java b/core/commons/src/main/java/org/apache/isis/applib/internal/base/_Casts.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/base/_Casts.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/base/_Casts.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Lazy.java b/core/commons/src/main/java/org/apache/isis/applib/internal/base/_Lazy.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/base/_Lazy.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/base/_Lazy.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/base/_NullSafe.java b/core/commons/src/main/java/org/apache/isis/applib/internal/base/_NullSafe.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/base/_NullSafe.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/base/_NullSafe.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Reduction.java b/core/commons/src/main/java/org/apache/isis/applib/internal/base/_Reduction.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/base/_Reduction.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/base/_Reduction.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Strings.java b/core/commons/src/main/java/org/apache/isis/applib/internal/base/_Strings.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/base/_Strings.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/base/_Strings.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Strings_NaturalNames.java b/core/commons/src/main/java/org/apache/isis/applib/internal/base/_Strings_NaturalNames.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/base/_Strings_NaturalNames.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/base/_Strings_NaturalNames.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/base/_Strings_SplitIterator.java b/core/commons/src/main/java/org/apache/isis/applib/internal/base/_Strings_SplitIterator.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/base/_Strings_SplitIterator.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/base/_Strings_SplitIterator.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/base/package-info.java b/core/commons/src/main/java/org/apache/isis/applib/internal/base/package-info.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/base/package-info.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/base/package-info.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Arrays.java b/core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Arrays.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Arrays.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Arrays.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Arrays_Collector.java b/core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Arrays_Collector.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Arrays_Collector.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Arrays_Collector.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Arrays_CollectorUnknownSize.java b/core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Arrays_CollectorUnknownSize.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Arrays_CollectorUnknownSize.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Arrays_CollectorUnknownSize.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Collections.java b/core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Collections.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Collections.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Collections.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Collections_Collector.java b/core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Collections_Collector.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Collections_Collector.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Collections_Collector.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Collections_SortedSetOfList.java b/core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Collections_SortedSetOfList.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Collections_SortedSetOfList.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Collections_SortedSetOfList.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Lists.java b/core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Lists.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Lists.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Lists.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Maps.java b/core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Maps.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Maps.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Maps.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Multimaps.java b/core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Multimaps.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Multimaps.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Multimaps.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Sets.java b/core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Sets.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/collections/_Sets.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/collections/_Sets.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/collections/package-info.java b/core/commons/src/main/java/org/apache/isis/applib/internal/collections/package-info.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/collections/package-info.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/collections/package-info.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/compare/_Comparators.java b/core/commons/src/main/java/org/apache/isis/applib/internal/compare/_Comparators.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/compare/_Comparators.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/compare/_Comparators.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/compare/_Comparators_SequenceCompare.java b/core/commons/src/main/java/org/apache/isis/applib/internal/compare/_Comparators_SequenceCompare.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/compare/_Comparators_SequenceCompare.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/compare/_Comparators_SequenceCompare.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/compare/package-info.java b/core/commons/src/main/java/org/apache/isis/applib/internal/compare/package-info.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/compare/package-info.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/compare/package-info.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/context/_Context.java b/core/commons/src/main/java/org/apache/isis/applib/internal/context/_Context.java similarity index 98% rename from core/applib/src/main/java/org/apache/isis/applib/internal/context/_Context.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/context/_Context.java index 93bf27c..953a7b5 100644 --- a/core/applib/src/main/java/org/apache/isis/applib/internal/context/_Context.java +++ b/core/commons/src/main/java/org/apache/isis/applib/internal/context/_Context.java @@ -26,8 +26,6 @@ import java.util.Objects; import java.util.function.Function; import java.util.function.Supplier; -import javax.validation.constraints.NotNull; - import org.apache.isis.applib.internal.base._Casts; import org.apache.isis.applib.internal.base._NullSafe; import org.apache.isis.applib.internal.collections._Lists; @@ -199,9 +197,9 @@ public final class _Context { /** * As set by the framework's bootstrapping mechanism. - * @return the default class loader + * @return the default class loader (non-null) */ - public static @NotNull ClassLoader getDefaultClassLoader() { + public static ClassLoader getDefaultClassLoader() { return getOrElse(ClassLoader.class, FALLBACK_CLASSLOADER); } diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/context/_Plugin.java b/core/commons/src/main/java/org/apache/isis/applib/internal/context/_Plugin.java similarity index 93% rename from core/applib/src/main/java/org/apache/isis/applib/internal/context/_Plugin.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/context/_Plugin.java index e0ba274..89da112 100644 --- a/core/applib/src/main/java/org/apache/isis/applib/internal/context/_Plugin.java +++ b/core/commons/src/main/java/org/apache/isis/applib/internal/context/_Plugin.java @@ -26,9 +26,9 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; -import org.apache.isis.applib.NonRecoverableException; import org.apache.isis.applib.internal.base._NullSafe; import org.apache.isis.applib.internal.collections._Sets; +import org.apache.isis.commons.plugins.PluginResolveException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -119,11 +119,11 @@ public final class _Plugin { // -- CONVENIENT EXCEPTION FACTORIES - public static <T> NonRecoverableException ambiguityNonRecoverable( + public static <T> PluginResolveException ambiguityNonRecoverable( Class<T> pluginInterfaceClass, Set<? extends T> ambiguousPlugins) { - return new NonRecoverableException( + return new PluginResolveException( String.format("Ambiguous plugins implementing %s found on class path.\n{%s}", pluginInterfaceClass.getName(), @@ -135,9 +135,9 @@ public final class _Plugin { )); } - public static NonRecoverableException absenceNonRecoverable(Class<?> pluginInterfaceClass) { + public static PluginResolveException absenceNonRecoverable(Class<?> pluginInterfaceClass) { - return new NonRecoverableException( + return new PluginResolveException( String.format("No plugin implementing %s found on class path.", pluginInterfaceClass.getName() )); } diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/context/package-info.java b/core/commons/src/main/java/org/apache/isis/applib/internal/context/package-info.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/context/package-info.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/context/package-info.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/discover/_Discover.java b/core/commons/src/main/java/org/apache/isis/applib/internal/discover/_Discover.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/discover/_Discover.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/discover/_Discover.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/discover/package-info.java b/core/commons/src/main/java/org/apache/isis/applib/internal/discover/package-info.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/discover/package-info.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/discover/package-info.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/exceptions/_Exceptions.java b/core/commons/src/main/java/org/apache/isis/applib/internal/exceptions/_Exceptions.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/exceptions/_Exceptions.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/exceptions/_Exceptions.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/exceptions/package-info.java b/core/commons/src/main/java/org/apache/isis/applib/internal/exceptions/package-info.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/exceptions/package-info.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/exceptions/package-info.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/functions/_Functions.java b/core/commons/src/main/java/org/apache/isis/applib/internal/functions/_Functions.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/functions/_Functions.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/functions/_Functions.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/functions/_Functions_IndexAwareFunctionAdapter.java b/core/commons/src/main/java/org/apache/isis/applib/internal/functions/_Functions_IndexAwareFunctionAdapter.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/functions/_Functions_IndexAwareFunctionAdapter.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/functions/_Functions_IndexAwareFunctionAdapter.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/functions/package-info.java b/core/commons/src/main/java/org/apache/isis/applib/internal/functions/package-info.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/functions/package-info.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/functions/package-info.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/memento/_Mementos.java b/core/commons/src/main/java/org/apache/isis/applib/internal/memento/_Mementos.java similarity index 92% rename from core/applib/src/main/java/org/apache/isis/applib/internal/memento/_Mementos.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/memento/_Mementos.java index f3703bc..17d991e 100644 --- a/core/applib/src/main/java/org/apache/isis/applib/internal/memento/_Mementos.java +++ b/core/commons/src/main/java/org/apache/isis/applib/internal/memento/_Mementos.java @@ -22,12 +22,12 @@ package org.apache.isis.applib.internal.memento; import java.io.ObjectInput; import java.io.ObjectOutput; import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; import java.util.Set; import javax.annotation.Nullable; -import org.apache.isis.applib.services.urlencoding.UrlEncodingService; - /** * <h1>- internal use only -</h1> * <p> @@ -44,6 +44,13 @@ public final class _Mementos { private _Mementos(){} + // -- ENCODE-DECODER INTERFACE + + public static interface EncoderDecoder { + public String encode(final byte[] bytes); + public byte[] decode(String str); + } + // -- MEMENTO INTERFACE /** @@ -120,7 +127,7 @@ public final class _Mementos { * @param serializer (required) * @return non-null */ - public static Memento create(UrlEncodingService codec, SerializingAdapter serializer) { + public static Memento create(EncoderDecoder codec, SerializingAdapter serializer) { return new _Mementos_MementoDefault(codec, serializer); } @@ -141,7 +148,7 @@ public final class _Mementos { * */ public static @Nullable Memento parse( - final UrlEncodingService codec, + final EncoderDecoder codec, final SerializingAdapter serializer, final String input) { diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/memento/_Mementos_MementoDefault.java b/core/commons/src/main/java/org/apache/isis/applib/internal/memento/_Mementos_MementoDefault.java similarity index 92% rename from core/applib/src/main/java/org/apache/isis/applib/internal/memento/_Mementos_MementoDefault.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/memento/_Mementos_MementoDefault.java index deb3af0..0e1fe85 100644 --- a/core/applib/src/main/java/org/apache/isis/applib/internal/memento/_Mementos_MementoDefault.java +++ b/core/commons/src/main/java/org/apache/isis/applib/internal/memento/_Mementos_MementoDefault.java @@ -37,9 +37,9 @@ import org.apache.isis.applib.internal.base._NullSafe; import org.apache.isis.applib.internal.collections._Maps; import org.apache.isis.applib.internal.collections._Sets; import org.apache.isis.applib.internal.context._Context; +import org.apache.isis.applib.internal.memento._Mementos.EncoderDecoder; import org.apache.isis.applib.internal.memento._Mementos.Memento; import org.apache.isis.applib.internal.memento._Mementos.SerializingAdapter; -import org.apache.isis.applib.services.urlencoding.UrlEncodingService; /** * @@ -50,17 +50,17 @@ import org.apache.isis.applib.services.urlencoding.UrlEncodingService; */ class _Mementos_MementoDefault implements _Mementos.Memento { - private final UrlEncodingService codec; + private final EncoderDecoder codec; private final SerializingAdapter serializer; private final Map<String, Serializable> valuesByKey; - _Mementos_MementoDefault(UrlEncodingService codec, SerializingAdapter serializer) { + _Mementos_MementoDefault(EncoderDecoder codec, SerializingAdapter serializer) { this(codec, serializer, _Maps.newHashMap()); } private _Mementos_MementoDefault( - UrlEncodingService codec, + EncoderDecoder codec, SerializingAdapter serializer, Map<String, Serializable> valuesByKey) { @@ -106,7 +106,7 @@ class _Mementos_MementoDefault implements _Mementos.Memento { // -- PARSER - static Memento parse(UrlEncodingService codec, SerializingAdapter serializer, @Nullable String str) { + static Memento parse(EncoderDecoder codec, SerializingAdapter serializer, @Nullable String str) { Objects.requireNonNull(codec); if(_NullSafe.isEmpty(str)) { return null; diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/memento/package-info.java b/core/commons/src/main/java/org/apache/isis/applib/internal/memento/package-info.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/memento/package-info.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/memento/package-info.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/package-info.java b/core/commons/src/main/java/org/apache/isis/applib/internal/package-info.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/package-info.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/package-info.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/resources/_Resource.java b/core/commons/src/main/java/org/apache/isis/applib/internal/resources/_Resource.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/resources/_Resource.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/resources/_Resource.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/resources/_Resource_ContextPath.java b/core/commons/src/main/java/org/apache/isis/applib/internal/resources/_Resource_ContextPath.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/resources/_Resource_ContextPath.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/resources/_Resource_ContextPath.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/resources/_Resource_Path.java b/core/commons/src/main/java/org/apache/isis/applib/internal/resources/_Resource_Path.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/resources/_Resource_Path.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/resources/_Resource_Path.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/resources/_Resource_RestfulPath.java b/core/commons/src/main/java/org/apache/isis/applib/internal/resources/_Resource_RestfulPath.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/resources/_Resource_RestfulPath.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/resources/_Resource_RestfulPath.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/internal/resources/package-info.java b/core/commons/src/main/java/org/apache/isis/applib/internal/resources/package-info.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/internal/resources/package-info.java rename to core/commons/src/main/java/org/apache/isis/applib/internal/resources/package-info.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/plugins/classdiscovery/ClassDiscovery.java b/core/commons/src/main/java/org/apache/isis/applib/plugins/classdiscovery/ClassDiscovery.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/plugins/classdiscovery/ClassDiscovery.java rename to core/commons/src/main/java/org/apache/isis/applib/plugins/classdiscovery/ClassDiscovery.java diff --git a/core/applib/src/main/java/org/apache/isis/applib/plugins/classdiscovery/ClassDiscoveryPlugin.java b/core/commons/src/main/java/org/apache/isis/applib/plugins/classdiscovery/ClassDiscoveryPlugin.java similarity index 100% rename from core/applib/src/main/java/org/apache/isis/applib/plugins/classdiscovery/ClassDiscoveryPlugin.java rename to core/commons/src/main/java/org/apache/isis/applib/plugins/classdiscovery/ClassDiscoveryPlugin.java diff --git a/core/commons/src/main/java/org/apache/isis/commons/plugins/PluginResolveException.java b/core/commons/src/main/java/org/apache/isis/commons/plugins/PluginResolveException.java new file mode 100644 index 0000000..3f39581 --- /dev/null +++ b/core/commons/src/main/java/org/apache/isis/commons/plugins/PluginResolveException.java @@ -0,0 +1,19 @@ +package org.apache.isis.commons.plugins; + +public class PluginResolveException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + public PluginResolveException(final String msg) { + super(msg); + } + + public PluginResolveException(final Throwable cause) { + super(cause); + } + + public PluginResolveException(final String msg, final Throwable cause) { + super(msg, cause); + } + +} diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactory.java b/core/commons/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactory.java similarity index 100% rename from core/runtime/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactory.java rename to core/commons/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactory.java diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactoryPlugin.java b/core/commons/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactoryPlugin.java similarity index 100% rename from core/runtime/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactoryPlugin.java rename to core/commons/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactoryPlugin.java -- To stop receiving notification emails like this one, please contact ahu...@apache.org.