This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit e5d15821941f43b58f238f8da66cac37508fb61f Author: Alex Heneveld <[email protected]> AuthorDate: Wed Feb 20 10:01:00 2019 +0000 restore + deprecate nameless methods for registering coercions helps with backwards compatibility; methods are beta so deprecated things can be deleted at any point --- .../org/apache/brooklyn/util/core/flags/TypeCoercions.java | 6 ++++++ .../brooklyn/util/javalang/coerce/TypeCoercerExtensible.java | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/core/src/main/java/org/apache/brooklyn/util/core/flags/TypeCoercions.java b/core/src/main/java/org/apache/brooklyn/util/core/flags/TypeCoercions.java index 7c9abdb..536ae66 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/flags/TypeCoercions.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/flags/TypeCoercions.java @@ -91,6 +91,12 @@ public class TypeCoercions { coercer.registerAdapter(nameAndOrder, fn); } + /** @deprecated since introduction, use {@link #registerAdapter(String, TryCoercer)} */ + @Beta @Deprecated + public static void registerAdapter(TryCoercer fn) { + coercer.registerAdapter(fn); + } + public static <T> Function<Object, T> function(final Class<T> type) { return new CoerceFunction<T>(type); } diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/TypeCoercerExtensible.java b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/TypeCoercerExtensible.java index fd49ddb..11eb2cc 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/TypeCoercerExtensible.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/TypeCoercerExtensible.java @@ -33,6 +33,7 @@ import org.apache.brooklyn.util.guava.Maybe; import org.apache.brooklyn.util.guava.TypeTokens; import org.apache.brooklyn.util.javalang.Boxing; import org.apache.brooklyn.util.javalang.Reflections; +import org.apache.brooklyn.util.text.Strings; import org.apache.brooklyn.util.time.Duration; import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; @@ -330,4 +331,14 @@ public class TypeCoercerExtensible implements TypeCoercer { genericCoercers = ImmutableList.copyOf(genericCoercersByName.values()); } } + + /** @deprecated since introduction, use {@link #registerAdapter(String, TryCoercer)} */ + @Beta @Deprecated + public synchronized void registerAdapter(TryCoercer fn) { + synchronized (genericCoercersByName) { + genericCoercersByName.put(Time.makeDateStampString()+"-"+Strings.makePaddedString(""+(genericCoercersByName.size()), 3, "0", ""), fn); + genericCoercers = ImmutableList.copyOf(genericCoercersByName.values()); + } + } + }
