You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2017/10/18 08:29:03 UTC
[1/7] brooklyn-server git commit: Deletes old deprecated code
Repository: brooklyn-server
Updated Branches:
refs/heads/master efa4af664 -> 38de52240
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxNotificationFilters.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxNotificationFilters.java b/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxNotificationFilters.java
index 0b9e0b2..6d38f54 100644
--- a/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxNotificationFilters.java
+++ b/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxNotificationFilters.java
@@ -47,15 +47,11 @@ public class JmxNotificationFilters {
}
/**
- * @deprecated since 0.6.0;
- * only works if this brooklyn class is on the classpath of the JVM that your
- * subscribing to notifications on (because it tries to push the filter instance
- * to that JVM). So of very limited use in real-world java processes to be managed.
- * Therefore this will be deleted to avoid people hitting this surprising behaviour.
+ * @deprecated since 0.6.0; kept only for persisted state backwards compatibility.
*/
@Deprecated
- @SuppressWarnings("serial")
- public static NotificationFilter matchesTypeRegex(final String typeRegex) {
+ @SuppressWarnings({ "serial", "unused" })
+ private static NotificationFilter unused_matchesTypeRegex(final String typeRegex) {
return new NotificationFilter() {
@Override public boolean isNotificationEnabled(Notification notif) {
return notif.getType().matches(typeRegex);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/software/base/src/test/java/org/apache/brooklyn/entity/java/VanillaJavaAppRebindTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/java/VanillaJavaAppRebindTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/java/VanillaJavaAppRebindTest.java
index 35125be..f63b08d 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/java/VanillaJavaAppRebindTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/java/VanillaJavaAppRebindTest.java
@@ -146,7 +146,7 @@ public class VanillaJavaAppRebindTest {
LOG.info("Avg now "+javaProcess2.getAttribute(EnrichedVanillaJavaAppImpl.AVG1));
// and check we don't have too many
- Assert.assertEquals(javaProcess2.getEnrichers().size(), javaProcess.getEnrichers().size());
+ Assert.assertEquals(javaProcess2.enrichers().size(), javaProcess.enrichers().size());
}
public static class EnrichedVanillaJavaAppImpl extends VanillaJavaAppImpl {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessOpenIptablesStreamsLiveTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessOpenIptablesStreamsLiveTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessOpenIptablesStreamsLiveTest.java
index 81b58fd..5a5628d 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessOpenIptablesStreamsLiveTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessOpenIptablesStreamsLiveTest.java
@@ -70,7 +70,7 @@ public class SoftwareProcessOpenIptablesStreamsLiveTest extends BrooklynAppLiveT
Set<Task<?>> tasks = BrooklynTaskTags.getTasksInEntityContext(mgmt.getExecutionManager(), softwareProcessEntity);
- Task<?> subTask = findTaskOrSubTask(tasks, TaskPredicates.displayNameMatches(StringPredicates.matchesRegex("open iptables.*"))).get();
+ Task<?> subTask = findTaskOrSubTask(tasks, TaskPredicates.displayNameSatisfies(StringPredicates.matchesRegex("open iptables.*"))).get();
String stdout = AbstractSoftwareProcessStreamsTest.getStreamOrFail(subTask, BrooklynTaskTags.STREAM_STDOUT);
String msg = "stdout="+stdout;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/test/Asserts.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/test/Asserts.java b/utils/common/src/main/java/org/apache/brooklyn/test/Asserts.java
index 3cd70b1..6975139 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/test/Asserts.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/test/Asserts.java
@@ -119,9 +119,6 @@ public class Asserts {
*/
public static final Duration DEFAULT_SHORT_TIMEOUT = Duration.ONE_SECOND;
- /** @deprecated since 0.9.0 use {@link #DEFAULT_LONG_TIMEOUT} */ @Deprecated
- public static final Duration DEFAULT_TIMEOUT = DEFAULT_LONG_TIMEOUT;
-
private static final Duration DEFAULT_SHORT_PERIOD = Repeater.DEFAULT_REAL_QUICK_PERIOD;
private static final Logger log = LoggerFactory.getLogger(Asserts.class);
@@ -792,15 +789,6 @@ public class Asserts {
eventually(supplier, predicate, null, null, null);
}
- /** @deprecated since 0.9.0 use {@link #eventually(Supplier, Predicate, Duration, Duration, String)} */ @Deprecated
- public static <T> void eventually(Map<String,?> flags, Supplier<? extends T> supplier, Predicate<T> predicate) {
- eventually(flags, supplier, predicate, (String)null);
- }
- /** @deprecated since 0.9.0 use {@link #eventually(Supplier, Predicate, Duration, Duration, String)} */ @Deprecated
- public static <T> void eventually(Map<String,?> flags, Supplier<? extends T> supplier, Predicate<T> predicate, String errMsg) {
- eventually(supplier, predicate, toDuration(flags.get("timeout"), null), toDuration(flags.get("period"), null), errMsg);
- }
-
/** As {@link #eventually(Supplier, Predicate, Duration, Duration, String)} with default. */
public static <T> void eventually(Supplier<? extends T> supplier, Predicate<T> predicate, Duration timeout) {
eventually(supplier, predicate, timeout, null, null);
@@ -855,19 +843,9 @@ public class Asserts {
/** As {@link #continually(Supplier, Predicate, Duration, Duration, String)} with defaults. */
public static <T> void continually(Supplier<? extends T> supplier, Predicate<T> predicate) {
- continually(ImmutableMap.<String,Object>of(), supplier, predicate);
+ continually(supplier, predicate, (Duration)null, (Duration)null, (String)null);
}
- /** @deprecated since 0.9.0 use {@link #continually(Supplier, Predicate, Duration, Duration, String)} */ @Deprecated
- public static <T> void continually(Map<String,?> flags, Supplier<? extends T> supplier, Predicate<? super T> predicate) {
- continually(flags, supplier, predicate, null);
- }
-
- /** @deprecated since 0.9.0 use {@link #continually(Supplier, Predicate, Duration, Duration, String)} */ @Deprecated
- public static <T> void continually(Map<String,?> flags, Supplier<? extends T> supplier, Predicate<T> predicate, String errMsg) {
- continually(supplier, predicate, toDuration(flags.get("timeout"), toDuration(flags.get("duration"), null)),
- toDuration(flags.get("period"), null), null);
- }
/**
* Asserts that continually the supplier gives a value accepted by the predicate.
* Tests periodically and fails if the supplier gives a disallowed value.
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/collections/MutableList.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/collections/MutableList.java b/utils/common/src/main/java/org/apache/brooklyn/util/collections/MutableList.java
index 6bdc3e0..6383a09 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/collections/MutableList.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/collections/MutableList.java
@@ -82,10 +82,6 @@ public class MutableList<V> extends ArrayList<V> {
}
}
- /** @deprecated since 0.7.0, use {@link #asImmutableCopy()}, or {@link #asUnmodifiable()} / {@link #asUnmodifiableCopy()} */ @Deprecated
- public ImmutableList<V> toImmutable() {
- return ImmutableList.copyOf(this);
- }
/** creates an {@link ImmutableList} which is a copy of this list. note that the list should not contain nulls. */
public List<V> asImmutableCopy() {
try {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/collections/MutableMap.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/collections/MutableMap.java b/utils/common/src/main/java/org/apache/brooklyn/util/collections/MutableMap.java
index 71f9aa8..41a9bd1 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/collections/MutableMap.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/collections/MutableMap.java
@@ -142,10 +142,6 @@ public class MutableMap<K,V> extends LinkedHashMap<K,V> {
return Maybe.absent("No entry for key '"+key+"' in this map");
}
- /** @deprecated since 0.7.0, use {@link #asImmutableCopy()}, or {@link #asUnmodifiable()} / {@link #asUnmodifiableCopy()} */ @Deprecated
- public ImmutableMap<K,V> toImmutable() {
- return ImmutableMap.copyOf(this);
- }
/** as {@link MutableList#asImmutableCopy()} */
public Map<K,V> asImmutableCopy() {
try {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/collections/MutableSet.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/collections/MutableSet.java b/utils/common/src/main/java/org/apache/brooklyn/util/collections/MutableSet.java
index 1049304..d5a632f 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/collections/MutableSet.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/collections/MutableSet.java
@@ -82,11 +82,6 @@ public class MutableSet<V> extends LinkedHashSet<V> {
super((source instanceof Collection) ? (Collection<? extends V>)source : Sets.newLinkedHashSet(source));
}
- /** @deprecated since 0.7.0, use {@link #asImmutableCopy()}, or {@link #asUnmodifiable()} / {@link #asUnmodifiableCopy()} */ @Deprecated
- public Set<V> toImmutable() {
- // Don't use ImmutableSet as that does not accept nulls
- return Collections.unmodifiableSet(Sets.newLinkedHashSet(this));
- }
/** as {@link MutableList#asImmutableCopy()()} */
public Set<V> asImmutableCopy() {
try {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/collections/TimeWindowedList.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/collections/TimeWindowedList.java b/utils/common/src/main/java/org/apache/brooklyn/util/collections/TimeWindowedList.java
index 246dec1..bf2f091 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/collections/TimeWindowedList.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/collections/TimeWindowedList.java
@@ -32,8 +32,6 @@ import com.google.common.collect.ImmutableList;
* and to keep the given number of out-of-date values.
*
* For example, this is useful if we want to determine if a metric has been consistently high.
- *
- * @author aled
*/
public class TimeWindowedList<T> {
private final LinkedList<TimestampedValue<T>> values = new LinkedList<TimestampedValue<T>>();
@@ -47,14 +45,6 @@ public class TimeWindowedList<T> {
minExpiredVals = 0;
}
- /**
- * @deprecated since 0.7.0; use {@link #TimeWindowedList(Duration)}
- */
- @Deprecated
- public TimeWindowedList(long timePeriod) {
- this(Duration.millis(timePeriod));
- }
-
public TimeWindowedList(Map<String,?> flags) {
if (!flags.containsKey("timePeriod")) throw new IllegalArgumentException("Must define timePeriod");
timePeriod = Duration.of(flags.get("timePeriod"));
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/exceptions/Exceptions.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/exceptions/Exceptions.java b/utils/common/src/main/java/org/apache/brooklyn/util/exceptions/Exceptions.java
index 55bf8a2..4d3946c 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/exceptions/Exceptions.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/exceptions/Exceptions.java
@@ -388,13 +388,6 @@ public class Exceptions {
return message + ": " + next;
}
- /** removes uninteresting items from the top of the call stack (but keeps interesting messages), and throws
- * @deprecated since 0.7.0 same as {@link #propagate(Throwable)} */
- @Deprecated
- public static RuntimeException propagateCollapsed(Throwable source) {
- throw propagate(source);
- }
-
/** like {@link #collapse(Throwable)} but returning a one-line message suitable for logging without traces */
public static String collapseText(Throwable t) {
return collapseText(t, false);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/javalang/AggregateClassLoader.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/AggregateClassLoader.java b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/AggregateClassLoader.java
index cea9028..9e9aeeb 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/AggregateClassLoader.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/AggregateClassLoader.java
@@ -106,13 +106,6 @@ public class AggregateClassLoader extends ClassLoader {
return classLoaders.isEmpty();
}
- /** Returns the _live_ (and modifiable) list of classloaders; dangerous and discouraged.
- * @deprecated since 0.7.0 */
- @Deprecated
- public List<ClassLoader> getList() {
- return classLoaders;
- }
-
public Iterator<ClassLoader> iterator() {
synchronized (classLoaders) {
// CopyOnWriteList iterator is immutable view of snapshot
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Enums.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Enums.java b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Enums.java
index a9305a8..d1dd7f8 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Enums.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Enums.java
@@ -34,9 +34,10 @@ import com.google.common.collect.Iterables;
public class Enums {
/** returns a function which given an enum, returns its <code>name()</code> function
- * @deprecated since 0.7.0 use {@link #nameFunction()} to avoid inner class */
+ * @deprecated since 0.7.0; kept for backwards compatibility of persisted state */
+ @SuppressWarnings("unused")
@Deprecated
- public static Function<Enum<?>,String> enumValueNameFunction() {
+ private static Function<Enum<?>,String> enumValueNameFunction() {
return new Function<Enum<?>,String>() {
@Override
public String apply(Enum<?> input) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/javalang/StackTraceSimplifier.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/StackTraceSimplifier.java b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/StackTraceSimplifier.java
index 0468d33..6425fac 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/StackTraceSimplifier.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/StackTraceSimplifier.java
@@ -26,10 +26,6 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import org.apache.brooklyn.util.text.Strings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.google.common.annotations.Beta;
import com.google.common.collect.ImmutableSet;
@@ -38,14 +34,9 @@ import com.google.common.collect.ImmutableSet;
*/
public class StackTraceSimplifier {
- private static final Logger log = LoggerFactory.getLogger(StackTraceSimplifier.class);
-
/** comma-separated prefixes (not regexes) */
public static final String DEFAULT_BLACKLIST_SYSTEM_PROPERTY_NAME = "org.apache.brooklyn.util.javalang.StackTraceSimplifier.blacklist";
- /** @deprecated since 0.8.0 use {@link #DEFAULT_BLACKLIST_SYSTEM_PROPERTY_NAME} */ @Deprecated
- public static final String LEGACY_DEFAULT_BLACKLIST_SYSTEM_PROPERTY_NAME = "brooklyn.util.javalang.StackTraceSimplifier.blacklist";
-
private static final Collection<String> DEFAULT_BLACKLIST;
static {
@@ -60,12 +51,6 @@ public class StackTraceSimplifier {
"gjdk.groovy.,"
).split("(\\s|,)+")));
- String legacyDefaults = System.getProperty(LEGACY_DEFAULT_BLACKLIST_SYSTEM_PROPERTY_NAME);
- if (Strings.isNonBlank(legacyDefaults)) {
- log.warn("Detected ude of legacy system property "+LEGACY_DEFAULT_BLACKLIST_SYSTEM_PROPERTY_NAME);
- blacklist.addAll(Arrays.asList(legacyDefaults.split("(\\s|,)+")));
- }
-
DEFAULT_BLACKLIST = blacklist.build();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/math/MathFunctions.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/math/MathFunctions.java b/utils/common/src/main/java/org/apache/brooklyn/util/math/MathFunctions.java
index fded95b..1b5c9c3 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/math/MathFunctions.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/math/MathFunctions.java
@@ -280,14 +280,6 @@ public class MathFunctions {
}
}
- /**
- * @deprecated since 0.9.0; use {@link Functionals#chain(Function, Function)} and {@link MathFunctions#divide(double)}
- */
- @Deprecated
- public static <T> Function<T, Double> divide(final Function<T, ? extends Number> preprocessor, final double divisor) {
- return Functionals.chain(preprocessor, divide(divisor));
- }
-
/** returns a string of up to maxLen length (longer in extreme cases) also capped at significantDigits significantDigits */
public static Function<Number, String> readableString(int significantDigits, int maxLen) {
return new ReadableString(significantDigits, maxLen);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/os/Os.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/os/Os.java b/utils/common/src/main/java/org/apache/brooklyn/util/os/Os.java
index f444c7a..464ef4c 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/os/Os.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/os/Os.java
@@ -512,12 +512,6 @@ public class Os {
(path.length() >= 3 && path.codePointAt(1) == ':' && isSeparator(path.codePointAt(2))));
}
- /** @deprecated since 0.7.0, use {@link #isAbsolutish(String)} */
- @Deprecated
- public static boolean isAbsolute(String path) {
- return isAbsolutish(path);
- }
-
private static boolean isSeparator(int sep) {
return sep == SEPARATOR_UNIX ||
sep == SEPARATOR_WIN;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/repeat/Repeater.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/repeat/Repeater.java b/utils/common/src/main/java/org/apache/brooklyn/util/repeat/Repeater.java
index bcd1c9c..512fba8 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/repeat/Repeater.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/repeat/Repeater.java
@@ -115,18 +115,6 @@ public class Repeater implements Callable<Boolean> {
}
/**
- * Sets the main body of the loop to be a no-op; useful if using {@link #until(Callable)} instead
- *
- * @return {@literal this} to aid coding in a fluent style.
- * @deprecated since 0.7.0 this is no-op, as the repeater defaults to repeating nothing, simply remove the call,
- * using just <code>Repeater.until(...)</code>.
- */
- @Deprecated
- public Repeater repeat() {
- return repeat(Callables.returning(null));
- }
-
- /**
* Sets the main body of the loop.
*
* @param body a closure or other Runnable that is executed in the main body of the loop.
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/ssh/IptablesCommands.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/ssh/IptablesCommands.java b/utils/common/src/main/java/org/apache/brooklyn/util/ssh/IptablesCommands.java
index 2edc9bf..d504544 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/ssh/IptablesCommands.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/ssh/IptablesCommands.java
@@ -36,7 +36,9 @@ public class IptablesCommands {
ACCEPT, REJECT, DROP, LOG
}
- /*** @deprecated since 0.7; use {@link org.apache.brooklyn.util.net.Protocol} */
+ /**
+ * @deprecated since 0.7; use {@link org.apache.brooklyn.util.net.Protocol}; kept for persisted state backwards compatibility.
+ */
@Deprecated
public enum Protocol {
TCP("tcp"), UDP("udp"), ALL("all");
@@ -160,12 +162,6 @@ public class IptablesCommands {
return addIptablesRule("-I", chain, Optional.<String> absent(), protocol, port, policy);
}
- /** @deprecated since 0.7.0; use {@link #insertIptablesRule(Chain, org.apache.brooklyn.util.net.Protocol, int, Policy)} */
- @Deprecated
- public static String insertIptablesRule(Chain chain, Protocol protocol, int port, Policy policy) {
- return insertIptablesRule(chain, protocol.convert(), port, policy);
- }
-
/**
* Returns the command that inserts a rule on top of the iptables' rules.
*
@@ -176,12 +172,6 @@ public class IptablesCommands {
return addIptablesRule("-I", chain, Optional.of(networkInterface), protocol, port, policy);
}
- /** @deprecated since 0.7.0; use {@link #insertIptablesRule(Chain, String, org.apache.brooklyn.util.net.Protocol, int, Policy)} */
- @Deprecated
- public static String insertIptablesRule(Chain chain, String networkInterface, Protocol protocol, int port, Policy policy) {
- return insertIptablesRule(chain, networkInterface, protocol.convert(), port, policy);
- }
-
/**
* Returns the command that appends a rule to iptables to all interfaces.
*
@@ -191,12 +181,6 @@ public class IptablesCommands {
return addIptablesRule("-A", chain, Optional.<String> absent(), protocol, port, policy);
}
- /** @deprecated since 0.7.0; use {@link #appendIptablesRule(Chain, org.apache.brooklyn.util.net.Protocol, int, Policy)} */
- @Deprecated
- public static String appendIptablesRule(Chain chain, Protocol protocol, int port, Policy policy) {
- return appendIptablesRule(chain, protocol.convert(), port, policy);
- }
-
/**
* Returns the command that appends a rule to iptables.
*
@@ -206,12 +190,6 @@ public class IptablesCommands {
return addIptablesRule("-A", chain, Optional.of(networkInterface), protocol, port, policy);
}
- /** @deprecated since 0.7.0; use {@link #appendIptablesRule(Chain, String, org.apache.brooklyn.util.net.Protocol, int, Policy)} */
- @Deprecated
- public static String appendIptablesRule(Chain chain, String networkInterface, Protocol protocol, int port, Policy policy) {
- return appendIptablesRule(chain, networkInterface, protocol.convert(), port, policy);
- }
-
/**
* Returns the command that creates a rule to iptables.
*
@@ -227,12 +205,6 @@ public class IptablesCommands {
return sudo(addIptablesRule);
}
- /** @deprecated since 0.7.0; use {@link #addIptablesRule(String, Chain, Optional, org.apache.brooklyn.util.net.Protocol, int, Policy)} */
- @Deprecated
- public static String addIptablesRule(String direction, Chain chain, Optional<String> networkInterface, Protocol protocol, int port, Policy policy) {
- return addIptablesRule(direction, chain, networkInterface, protocol.convert(), port, policy);
- }
-
/**
* Returns the command that adds firewalld direct rule.
*
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/stream/InputStreamSupplier.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/stream/InputStreamSupplier.java b/utils/common/src/main/java/org/apache/brooklyn/util/stream/InputStreamSupplier.java
index 2b6afac..11be01a 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/stream/InputStreamSupplier.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/stream/InputStreamSupplier.java
@@ -31,9 +31,7 @@ public class InputStreamSupplier implements InputSupplier<InputStream> {
private final InputStream target;
- /** @deprecated since 0.7.0; use {@link InputStreamSupplier#of(InputStream)} instead */
- @Deprecated
- public InputStreamSupplier(InputStream target) {
+ private InputStreamSupplier(InputStream target) {
this.target = target;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/stream/Streams.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/stream/Streams.java b/utils/common/src/main/java/org/apache/brooklyn/util/stream/Streams.java
index 907edfe..a14f8b2 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/stream/Streams.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/stream/Streams.java
@@ -72,11 +72,6 @@ public class Streams {
}
}
- /** @deprecated since 0.7.0 use {@link #newInputStreamWithContents(String)} */ @Deprecated
- public static InputStream fromString(String contents) {
- return newInputStreamWithContents(contents);
- }
-
public static InputStream newInputStreamWithContents(String contents) {
byte[] bytes = checkNotNull(contents, "contents").getBytes(Charsets.UTF_8);
return KnownSizeInputStream.of(bytes);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/text/Strings.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/text/Strings.java b/utils/common/src/main/java/org/apache/brooklyn/util/text/Strings.java
index db24b58..dc134bc 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/text/Strings.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/text/Strings.java
@@ -801,13 +801,6 @@ public class Strings {
return ies(count);
}
- /** converts a map of any objects to a map of strings, using the tostring, and returning "null" for nulls
- * @deprecated since 0.7.0 use {@link #toStringMap(Map, String)} to remove ambiguity about how to handle null */
- // NB previously the javadoc here was wrong, said it returned null not "null"
- @Deprecated
- public static Map<String, String> toStringMap(Map<?,?> map) {
- return toStringMap(map, "null");
- }
/** converts a map of any objects to a map of strings, using {@link Object#toString()},
* with the second argument used where a value (or key) is null */
public static Map<String, String> toStringMap(Map<?,?> map, String valueIfNull) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/time/CountdownTimer.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/time/CountdownTimer.java b/utils/common/src/main/java/org/apache/brooklyn/util/time/CountdownTimer.java
index fea8ee6..5895ce4 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/time/CountdownTimer.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/time/CountdownTimer.java
@@ -85,9 +85,6 @@ public class CountdownTimer {
return stopwatch.isRunning();
}
- /** @deprecated since 0.9.0 use better named {@link #isNotPaused()} */ @Deprecated
- public boolean isRunning() { return isNotPaused(); }
-
// --- constructor methods
public static CountdownTimer newInstanceStarted(Duration duration) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/time/Duration.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/time/Duration.java b/utils/common/src/main/java/org/apache/brooklyn/util/time/Duration.java
index 64ab629..8cf34e2 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/time/Duration.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/time/Duration.java
@@ -328,15 +328,4 @@ public class Duration implements Comparable<Duration>, Serializable {
if (isLongerThan(alternateMaximumValue)) return alternateMaximumValue;
return this;
}
-
- /** @deprecated since 0.7.0 use {@link #lowerBound(Duration)} */ @Deprecated
- public Duration minimum(Duration alternateMinimumValue) {
- return lowerBound(alternateMinimumValue);
- }
-
- /** @deprecated since 0.7.0 use {@link #upperBound(Duration)} */ @Deprecated
- /** returns the smaller of this value or the argument */
- public Duration maximum(Duration alternateMaximumValue) {
- return upperBound(alternateMaximumValue);
- }
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/utils/common/src/main/java/org/apache/brooklyn/util/time/Time.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/time/Time.java b/utils/common/src/main/java/org/apache/brooklyn/util/time/Time.java
index 7df03c1..3a0237a 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/time/Time.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/time/Time.java
@@ -307,11 +307,7 @@ public class Time {
}
}
- /** @deprecated since 0.7.0 use {@link #fromLongToTimeStringExact()} */
- @Deprecated
- public static Function<Long, String> toTimeString() {
- return timeString;
- }
+ /** @deprecated since 0.7.0; kept for persisted state backwards compatibility */
@Deprecated
private static Function<Long, String> timeString = new Function<Long, String>() {
@Override
@@ -334,11 +330,7 @@ public class Time {
}
}
- /** @deprecated since 0.7.0 use {@link #fromLongToTimeStringRounded()} */
- @Deprecated
- public static Function<Long, String> toTimeStringRounded() {
- return timeStringRounded;
- }
+ /** @deprecated since 0.7.0; kept for persisted state backwards compatibility */
@Deprecated
private static Function<Long, String> timeStringRounded = new Function<Long, String>() {
@Override
@@ -449,14 +441,6 @@ public class Time {
public static long parseElapsedTime(String timeString) {
return (long) parseElapsedTimeAsDouble(timeString);
}
- /** @deprecated since 0.7.0 see {@link #parseElapsedTime(String)} */ @Deprecated
- public static long parseTimeString(String timeString) {
- return parseElapsedTime(timeString);
- }
- /** @deprecated since 0.7.0 see {@link #parseElapsedTimeAsDouble(String)} */ @Deprecated
- public static double parseTimeStringAsDouble(String timeString) {
- return parseElapsedTimeAsDouble(timeString);
- }
/**
* Parses a string eg '5s' or '20m 22.123ms', returning the number of milliseconds it represents;
@@ -936,24 +920,6 @@ public class Time {
return Maybe.absent();
}
- /**
- * Parses the given date, accepting either a UTC timestamp (i.e. a long), or a formatted date.
- * <p>
- * If no time zone supplied, this defaults to the TZ configured at the brooklyn server.
- *
- * @deprecated since 0.7.0 use {@link #parseCalendar(String)} for general or {@link #parseCalendarFormat(String, DateFormat)} for a format,
- * plus {@link #parseCalendarUtc(String)} if you want to accept UTC
- */
- @Deprecated
- public static Date parseDateString(String dateString, DateFormat format) {
- Maybe<Calendar> r = parseCalendarFormat(dateString, format);
- if (r.isPresent()) return r.get().getTime();
-
- r = parseCalendarUtc(dateString);
- if (r.isPresent()) return r.get().getTime();
-
- throw new IllegalArgumentException("Date " + dateString + " cannot be parsed as UTC millis or using format " + format);
- }
public static Maybe<Calendar> parseCalendarFormat(String dateString, String format) {
return parseCalendarFormat(dateString, new SimpleDateFormat(format, Locale.ROOT));
}
[5/7] brooklyn-server git commit: Deletes old deprecated code
Posted by tb...@apache.org.
Deletes old deprecated code
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/7df1d382
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/7df1d382
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/7df1d382
Branch: refs/heads/master
Commit: 7df1d382f73638d25c0e85518a64ea26abebc269
Parents: 7c6f7d4
Author: Aled Sage <al...@gmail.com>
Authored: Mon Oct 9 10:59:10 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Oct 17 12:32:15 2017 +0100
----------------------------------------------------------------------
.../brooklyn/api/catalog/BrooklynCatalog.java | 23 --
.../brooklyn/api/catalog/CatalogItem.java | 11 -
.../org/apache/brooklyn/api/entity/Entity.java | 100 ------
.../apache/brooklyn/api/entity/EntityLocal.java | 131 -------
.../apache/brooklyn/api/entity/EntitySpec.java | 48 ---
.../apache/brooklyn/api/location/Location.java | 17 -
.../apache/brooklyn/api/objs/Configurable.java | 9 +-
.../org/apache/brooklyn/api/policy/Policy.java | 8 -
.../brooklyn/camp/spi/pdp/DeploymentPlan.java | 4 -
.../spi/dsl/methods/BrooklynDslCommon.java | 6 +-
.../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 5 -
.../apache/brooklyn/core/BrooklynVersion.java | 25 --
.../core/catalog/CatalogPredicates.java | 11 -
.../catalog/internal/BasicBrooklynCatalog.java | 10 -
.../core/catalog/internal/CatalogBundleDto.java | 3 -
.../catalog/internal/CatalogItemBuilder.java | 6 -
.../core/catalog/internal/CatalogItemDo.java | 33 --
.../internal/CatalogItemDtoAbstract.java | 17 -
.../core/catalog/internal/CatalogUtils.java | 36 +-
.../brooklyn/core/config/ConfigPredicates.java | 24 --
.../core/config/render/RendererHints.java | 21 --
.../core/effector/AbstractEffector.java | 4 -
.../brooklyn/core/effector/EffectorTasks.java | 4 -
.../core/enricher/AbstractEnricher.java | 1 -
.../brooklyn/core/entity/AbstractEntity.java | 340 -------------------
.../core/entity/BrooklynConfigKeys.java | 7 -
.../apache/brooklyn/core/entity/Entities.java | 32 --
.../core/entity/EntityAndAttribute.java | 8 -
.../brooklyn/core/entity/EntityDynamicType.java | 8 -
.../brooklyn/core/entity/EntityFunctions.java | 2 +-
.../brooklyn/core/entity/EntityInternal.java | 27 --
.../brooklyn/core/entity/EntityPredicates.java | 11 -
.../internal/EntityTransientCopyInternal.java | 10 -
.../core/feed/AttributePollHandler.java | 2 +-
.../apache/brooklyn/core/feed/FeedConfig.java | 4 -
.../core/internal/BrooklynInitialization.java | 9 -
.../core/internal/BrooklynPropertiesImpl.java | 6 -
.../core/location/AbstractLocation.java | 62 +---
.../core/location/LocationPredicates.java | 2 +-
.../apache/brooklyn/core/location/Machines.java | 9 -
.../location/access/PortForwardManager.java | 72 ----
.../access/PortForwardManagerClient.java | 106 +-----
.../location/access/PortForwardManagerImpl.java | 96 +-----
.../core/location/geo/UtraceHostGeoLookup.java | 16 -
.../location/internal/LocationInternal.java | 17 -
.../core/mgmt/EntityManagementUtils.java | 27 --
.../JavaBrooklynClassLoadingContext.java | 5 -
.../core/mgmt/entitlement/Entitlements.java | 9 -
.../mgmt/ha/HighAvailabilityManagerImpl.java | 14 -
.../core/mgmt/ha/OsgiArchiveInstaller.java | 7 +-
.../core/objs/AbstractEntityAdjunct.java | 118 +------
.../core/objs/BasicConfigurableObject.java | 6 -
.../core/objs/proxy/InternalEntityFactory.java | 10 -
.../objs/proxy/InternalLocationFactory.java | 30 --
.../core/objs/proxy/InternalPolicyFactory.java | 42 ---
.../brooklyn/core/sensor/AttributeMap.java | 2 +-
.../core/sensor/DependentConfiguration.java | 13 -
.../core/server/BrooklynServerConfig.java | 39 ---
.../core/server/BrooklynServiceAttributes.java | 12 -
.../core/typereg/BasicManagedBundle.java | 5 -
.../core/typereg/BasicOsgiBundleWithUrl.java | 6 -
.../brooklyn/core/typereg/RegisteredTypes.java | 3 -
.../enricher/stock/reducer/Reducer.java | 2 +-
.../group/AbstractMembershipTrackingPolicy.java | 28 +-
.../brooklyn/entity/group/DynamicGroup.java | 4 -
.../brooklyn/entity/group/DynamicGroupImpl.java | 9 -
.../apache/brooklyn/feed/CommandPollConfig.java | 12 -
.../brooklyn/feed/function/FunctionFeed.java | 4 +-
.../org/apache/brooklyn/feed/http/HttpFeed.java | 3 +-
.../brooklyn/feed/http/HttpPollValue.java | 40 ---
.../apache/brooklyn/feed/http/HttpPolls.java | 39 ---
.../apache/brooklyn/feed/shell/ShellFeed.java | 2 +-
.../brooklyn/feed/ssh/SshValueFunctions.java | 18 +-
.../LocalhostMachineProvisioningLocation.java | 8 +-
.../location/ssh/SshMachineLocation.java | 15 +-
.../util/core/BrooklynLanguageExtensions.java | 46 ---
.../brooklyn/util/core/ResourceUtils.java | 89 +----
.../brooklyn/util/core/config/ConfigBag.java | 2 +-
.../brooklyn/util/core/crypto/SecureKeys.java | 23 +-
.../brooklyn/util/core/file/ArchiveBuilder.java | 92 -----
.../brooklyn/util/core/flags/FlagUtils.java | 14 -
.../brooklyn/util/core/http/HttpTool.java | 28 --
.../util/core/http/HttpToolResponse.java | 31 --
.../util/core/internal/ssh/SshTool.java | 9 -
.../util/core/internal/ssh/cli/SshCliTool.java | 5 -
.../core/internal/ssh/process/ProcessTool.java | 25 --
.../util/core/internal/ssh/sshj/SshjTool.java | 6 -
.../brooklyn/util/core/osgi/BundleMaker.java | 40 +--
.../apache/brooklyn/util/core/osgi/Osgis.java | 55 ---
.../brooklyn/util/core/task/TaskBuilder.java | 8 -
.../brooklyn/util/core/task/TaskPredicates.java | 6 -
.../util/core/text/TemplateProcessor.java | 10 -
.../brooklyn/core/BrooklynVersionTest.java | 7 -
.../internal/CatalogItemBuilderTest.java | 10 -
.../core/config/BrooklynPropertiesTest.java | 8 +-
.../core/config/ConfigPredicatesTest.java | 18 +-
.../brooklyn/core/entity/AttributeTest.java | 11 -
.../brooklyn/core/entity/EntitiesTest.java | 6 -
.../core/entity/EntityConfigGroovyTest.groovy | 2 +-
.../brooklyn/core/entity/EntitySpecTest.java | 21 --
.../brooklyn/core/entity/EntityTypeTest.java | 2 +-
.../core/entity/PolicyRegistrationTest.java | 7 -
.../core/location/LocationConfigTest.java | 16 -
.../brooklyn/core/location/MachinesTest.java | 9 -
.../access/PortForwardManagerRebindTest.java | 26 --
.../location/access/PortForwardManagerTest.java | 27 +-
...agementPlaneSyncRecordPersisterInMemory.java | 99 ------
.../core/mgmt/rebind/RebindEnricherTest.java | 5 +-
.../core/mgmt/rebind/RebindFeedWithHaTest.java | 2 +-
.../core/mgmt/rebind/RebindTestFixture.java | 57 ----
.../core/mgmt/rebind/RebindTestUtils.java | 125 -------
.../core/test/entity/TestApplicationImpl.java | 13 +-
.../qa/performance/AbstractPerformanceTest.java | 93 -----
.../apache/brooklyn/feed/http/HttpFeedTest.java | 12 +-
.../util/core/internal/FlagUtilsTest.java | 5 -
.../core/internal/ssh/RecordingSshTool.java | 3 -
.../BrooklynEntityMirrorIntegrationTest.java | 4 +-
.../jclouds/BlobStoreContextFactoryImpl.java | 4 +-
.../location/jclouds/BrooklynImageChooser.java | 15 +-
.../location/jclouds/JcloudsLocation.java | 2 -
.../jclouds/JcloudsMachineLocation.java | 9 -
.../location/jclouds/JcloudsPredicates.java | 7 +-
.../jclouds/JcloudsSshMachineLocation.java | 78 -----
.../jclouds/JcloudsWinRmMachineLocation.java | 17 -
.../api/JcloudsLocationConfigPublic.java | 15 -
.../customize/AutoCreateFloatingIpsOption.java | 42 ---
.../customize/TemplateOptionCustomizers.java | 8 -
.../customize/UserDataUuencodedOption.java | 54 ---
.../jclouds/JcloudsByonRebindLiveTest.java | 2 -
.../JcloudsImageChoiceStubbedLiveTest.java | 2 -
.../jclouds/JcloudsLocationResolverTest.java | 2 +-
.../location/jclouds/JcloudsRebindLiveTest.java | 3 -
.../location/jclouds/JcloudsRebindStubTest.java | 1 -
.../jclouds/JcloudsRebindStubUnitTest.java | 1 -
.../policy/enricher/HttpLatencyDetector.java | 6 +-
.../enricher/RollingTimeWindowMeanEnricher.java | 10 -
.../RollingTimeWindowMeanEnricherTest.java | 24 +-
.../loadbalancing/MockContainerEntityImpl.java | 8 -
.../loadbalancing/MockItemEntityImpl.java | 7 -
.../apache/brooklyn/rest/domain/ApiError.java | 12 -
.../brooklyn/rest/domain/TaskSummary.java | 14 -
.../rest/filter/HaHotCheckResourceFilter.java | 6 -
.../resources/AbstractBrooklynRestResource.java | 5 -
.../rest/resources/LocationResource.java | 6 -
.../rest/transform/LocationTransformer.java | 12 -
.../brooklyn/rest/util/ShutdownHandler.java | 26 --
.../brooklyn/rest/util/URLParamEncoder.java | 28 --
.../brooklyn/rest/util/WebResourceUtils.java | 7 -
.../util/json/BrooklynJacksonJsonProvider.java | 23 --
.../BrooklynPropertiesSecurityFilter.java | 11 +-
.../BrooklynRestApiLauncherTestFixture.java | 6 -
.../entity/brooklynnode/BrooklynNodeImpl.java | 2 +-
.../brooklyn/entity/java/JavaAppUtils.java | 6 -
.../java/JavaSoftwareProcessSshDriver.java | 8 -
.../software/base/SameServerEntityImpl.java | 6 -
.../org/apache/brooklyn/feed/jmx/JmxFeed.java | 20 +-
.../feed/jmx/JmxNotificationFilters.java | 10 +-
.../entity/java/VanillaJavaAppRebindTest.java | 2 +-
...twareProcessOpenIptablesStreamsLiveTest.java | 2 +-
.../java/org/apache/brooklyn/test/Asserts.java | 24 +-
.../brooklyn/util/collections/MutableList.java | 4 -
.../brooklyn/util/collections/MutableMap.java | 4 -
.../brooklyn/util/collections/MutableSet.java | 5 -
.../util/collections/TimeWindowedList.java | 10 -
.../brooklyn/util/exceptions/Exceptions.java | 7 -
.../util/javalang/AggregateClassLoader.java | 7 -
.../apache/brooklyn/util/javalang/Enums.java | 5 +-
.../util/javalang/StackTraceSimplifier.java | 15 -
.../brooklyn/util/math/MathFunctions.java | 8 -
.../java/org/apache/brooklyn/util/os/Os.java | 6 -
.../apache/brooklyn/util/repeat/Repeater.java | 12 -
.../brooklyn/util/ssh/IptablesCommands.java | 34 +-
.../util/stream/InputStreamSupplier.java | 4 +-
.../apache/brooklyn/util/stream/Streams.java | 5 -
.../org/apache/brooklyn/util/text/Strings.java | 7 -
.../brooklyn/util/time/CountdownTimer.java | 3 -
.../org/apache/brooklyn/util/time/Duration.java | 11 -
.../org/apache/brooklyn/util/time/Time.java | 38 +--
178 files changed, 177 insertions(+), 3573 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java b/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java
index e03adbf..2e5bce9 100644
--- a/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java
+++ b/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java
@@ -153,29 +153,6 @@ public interface BrooklynCatalog {
@Beta // method may move elsewhere
Collection<Throwable> validateType(RegisteredType typeToValidate, @Nullable RegisteredTypeLoadingContext optionalConstraint);
-
- /**
- * Adds an item (represented in yaml) to the catalog.
- * Fails if the same version exists in catalog.
- *
- * @throws IllegalArgumentException if the yaml was invalid
- * @deprecated since 0.7.0 use {@link #addItems(String, boolean)}
- */
- @Deprecated
- CatalogItem<?,?> addItem(String yaml);
-
- /**
- * Adds an item (represented in yaml) to the catalog.
- *
- * @param forceUpdate If true allows catalog update even when an
- * item exists with the same symbolicName and version
- *
- * @throws IllegalArgumentException if the yaml was invalid
- * @deprecated since 0.7.0 use {@link #addItems(String, boolean)}
- */
- @Deprecated
- CatalogItem<?,?> addItem(String yaml, boolean forceUpdate);
-
/**
* As {@link #addItemsFromBundle(String, ManagedBundle)} with a null bundle.
*/
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/api/src/main/java/org/apache/brooklyn/api/catalog/CatalogItem.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/catalog/CatalogItem.java b/api/src/main/java/org/apache/brooklyn/api/catalog/CatalogItem.java
index f3440d9..b26b652 100644
--- a/api/src/main/java/org/apache/brooklyn/api/catalog/CatalogItem.java
+++ b/api/src/main/java/org/apache/brooklyn/api/catalog/CatalogItem.java
@@ -76,9 +76,6 @@ public interface CatalogItem<T,SpecT> extends BrooklynObject, Rebindable {
}
public static interface CatalogBundle extends OsgiBundleWithUrl {
- /** @deprecated since 0.9.0, use {@link #isNameResolved()} */
- @Deprecated
- public boolean isNamed();
}
/**
@@ -115,14 +112,6 @@ public interface CatalogItem<T,SpecT> extends BrooklynObject, Rebindable {
@Deprecated
@Nullable public String getJavaType();
- /** @deprecated since 0.7.0. Use {@link #getDisplayName} */
- @Deprecated
- public String getName();
-
- /** @deprecated since 0.7.0. Use {@link #getSymbolicName} */
- @Deprecated
- public String getRegisteredTypeName();
-
@Nullable public String getDescription();
@Nullable public String getIconUrl();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java b/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java
index cafe0ed..d981efd 100644
--- a/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java
+++ b/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java
@@ -164,56 +164,6 @@ public interface Entity extends BrooklynObject {
boolean removeChild(Entity child);
/**
- * @return an immutable thread-safe view of the policies.
- *
- * @deprecated since 0.9.0; see {@link PolicySupport#asList()}
- */
- @Deprecated
- Collection<Policy> getPolicies();
-
- /**
- * @return an immutable thread-safe view of the enrichers.
- *
- * @deprecated since 0.9.0; see {@link EnricherSupport#asList()}
- */
- @Deprecated
- Collection<Enricher> getEnrichers();
-
- /**
- * The {@link Collection} of {@link Group}s that this entity is a member of.
- *
- * Groupings can be used to allow easy management/monitoring of a group of entities.
- *
- * @deprecated since 0.9.0; see {@link #groups()} and {@link GroupSupport#iterator()}
- */
- @Deprecated
- Collection<Group> getGroups();
-
- /**
- * Add this entity as a member of the given {@link Group}. Called by framework.
- * <p>
- * Users should call {@link Group#addMember(Entity)} instead; this method will then
- * automatically be called. However, the reverse is not true (calling this method will
- * not tell the group; this behaviour may change in a future release!)
- *
- * @deprecated since 0.9.0; see {@link GroupSupport#add()} and {@link #groups()}
- */
- @Deprecated
- void addGroup(Group group);
-
- /**
- * Removes this entity as a member of the given {@link Group}. Called by framework.
- * <p>
- * Users should call {@link Group#removeMember(Entity)} instead; this method will then
- * automatically be called. However, the reverse is not true (calling this method will
- * not tell the group; this behaviour may change in a future release!)
- *
- * @deprecated since 0.9.0; see {@link GroupSupport#remove()} and {@link #groups()}
- */
- @Deprecated
- void removeGroup(Group group);
-
- /**
* Return all the {@link Location}s this entity is deployed to.
*/
Collection<Location> getLocations();
@@ -235,56 +185,6 @@ public interface Entity extends BrooklynObject {
<T> Task<T> invoke(Effector<T> eff, Map<String,?> parameters);
/**
- * Adds the given policy to this entity. Also calls policy.setEntity if available.
- *
- * @deprecated since 0.9.0; see {@link PolicySupport#add(Policy)}
- */
- @Deprecated
- void addPolicy(Policy policy);
-
- /**
- * Adds the given policy to this entity. Also calls policy.setEntity if available.
- *
- * @deprecated since 0.9.0; see {@link PolicySupport#add(PolicySpec)}
- */
- @Deprecated
- <T extends Policy> T addPolicy(PolicySpec<T> policy);
-
- /**
- * Removes the given policy from this entity.
- * @return True if the policy existed at this entity; false otherwise
- *
- * @deprecated since 0.9.0; see {@link PolicySupport#remove(Policy)}
- */
- @Deprecated
- boolean removePolicy(Policy policy);
-
- /**
- * Adds the given enricher to this entity. Also calls enricher.setEntity if available.
- *
- * @deprecated since 0.9.0; see {@link EnricherSupport#add(Enricher)}
- */
- @Deprecated
- void addEnricher(Enricher enricher);
-
- /**
- * Adds the given enricher to this entity. Also calls enricher.setEntity if available.
- *
- * @deprecated since 0.9.0; see {@link EnricherSupport#add(EnricherSpec)}
- */
- @Deprecated
- <T extends Enricher> T addEnricher(EnricherSpec<T> enricher);
-
- /**
- * Removes the given enricher from this entity.
- * @return True if the policy enricher at this entity; false otherwise
- *
- * @deprecated since 0.9.0; see {@link EnricherSupport#remove(Enricher)}
- */
- @Deprecated
- boolean removeEnricher(Enricher enricher);
-
- /**
* Adds the given feed to this entity. Also calls feed.setEntity if available.
*
* @deprecated since 1.0.0; see {@link FeedSupport#add(Feed)}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/api/src/main/java/org/apache/brooklyn/api/entity/EntityLocal.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/EntityLocal.java b/api/src/main/java/org/apache/brooklyn/api/entity/EntityLocal.java
index bc3b818..c6511e5 100644
--- a/api/src/main/java/org/apache/brooklyn/api/entity/EntityLocal.java
+++ b/api/src/main/java/org/apache/brooklyn/api/entity/EntityLocal.java
@@ -18,22 +18,6 @@
*/
package org.apache.brooklyn.api.entity;
-import java.util.Map;
-
-import org.apache.brooklyn.api.mgmt.SubscriptionContext;
-import org.apache.brooklyn.api.mgmt.SubscriptionHandle;
-import org.apache.brooklyn.api.mgmt.SubscriptionManager;
-import org.apache.brooklyn.api.mgmt.Task;
-import org.apache.brooklyn.api.sensor.AttributeSensor;
-import org.apache.brooklyn.api.sensor.Sensor;
-import org.apache.brooklyn.api.sensor.SensorEventListener;
-import org.apache.brooklyn.config.ConfigKey;
-import org.apache.brooklyn.config.ConfigKey.HasConfigKey;
-import org.apache.brooklyn.util.guava.Maybe;
-
-import com.google.common.annotations.Beta;
-import com.google.common.base.Function;
-
/**
* Extended Entity interface for use in places where the caller should have certain privileges,
* such as setting attribute values, adding policies, etc.
@@ -52,119 +36,4 @@ public interface EntityLocal extends Entity {
// FIXME Rename to something other than EntityLocal.
// Separate out what is specific to "local jvm", and what is here for an SPI rather than API.
- /**
- * @deprecated since 0.7.0; use {@link #config()}, such as {@code entity.config().set(key, val)}
- */
- @Override
- @Deprecated
- <T> T setConfig(ConfigKey<T> key, T val);
-
- /**
- * @deprecated since 0.7.0; use {@link #config()}, such as {@code entity.config().set(key, val)}
- */
- @Deprecated
- <T> T setConfig(ConfigKey<T> key, Task<T> val);
-
- /**
- * @deprecated since 0.7.0; use {@link #config()}, such as {@code entity.config().set(key, val)}
- */
- @Deprecated
- <T> T setConfig(HasConfigKey<T> key, T val);
-
- /**
- * @deprecated since 0.7.0; use {@link #config()}, such as {@code entity.config().set(key, val)}
- */
- @Deprecated
- <T> T setConfig(HasConfigKey<T> key, Task<T> val);
-
- /**
- * @deprecated since 0.8.0; use {@link SensorSupport#set(AttributeSensor, Object)} via code like {@code sensors().set(attribute, val)}.
- */
- @Deprecated
- <T> T setAttribute(AttributeSensor<T> attribute, T val);
-
- /**
- * @deprecated since 0.8.0; use {@link SensorSupport#modify(AttributeSensor, Function)} via code like {@code sensors().modify(attribute, modifier)}.
- */
- @Deprecated
- @Beta
- <T> T modifyAttribute(AttributeSensor<T> attribute, Function<? super T, Maybe<T>> modifier);
-
- /**
- * @deprecated since 0.8.0; use {@link SensorSupport#emit(Sensor, Object)} via code like {@code sensors().emit(sensor, val)}.
- */
- @Deprecated
- <T> void emit(Sensor<T> sensor, T value);
-
- /**
- * Allow us to subscribe to data from a {@link Sensor} on another entity.
- *
- * @return a subscription id which can be used to unsubscribe
- *
- * @see SubscriptionManager#subscribe(Map, Entity, Sensor, SensorEventListener)
- *
- * @deprecated since 0.9.0; see {@link SubscriptionSupportInternal#getSubscriptionContext()}, e.g. with {@code subscriptions().getSubscriptionContext()}
- */
- @Deprecated
- @Beta
- <T> SubscriptionHandle subscribe(Entity producer, Sensor<T> sensor, SensorEventListener<? super T> listener);
-
- /**
- * @see SubscriptionManager#subscribeToChildren(Map, Entity, Sensor, SensorEventListener)
- *
- * @deprecated since 0.9.0; see {@link SubscriptionSupport#subscribeToChildren(Entity, Sensor, SensorEventListener)}, e.g. with {@code subscriptions().subscribeToChildren(...)}
- */
- @Deprecated
- @Beta
- <T> SubscriptionHandle subscribeToChildren(Entity parent, Sensor<T> sensor, SensorEventListener<? super T> listener);
-
- /**
- * @see SubscriptionManager#subscribeToMembers(Group, Sensor, SensorEventListener)
- *
- * @deprecated since 0.9.0; see {@link SubscriptionSupport#subscribeToMembers(Entity, Sensor, SensorEventListener)}, e.g. with {@code subscriptions().subscribeToMembers(...)}
- */
- @Deprecated
- @Beta
- <T> SubscriptionHandle subscribeToMembers(Group group, Sensor<T> sensor, SensorEventListener<? super T> listener);
-
- /**
- * Unsubscribes from the given producer.
- *
- * @see SubscriptionContext#unsubscribe(SubscriptionHandle)
- *
- * @deprecated since 0.9.0; see {@link SubscriptionSupport#unsubscribe(Entity)}, e.g. with {@code subscriptions().unsubscribe(...)}
- */
- @Deprecated
- @Beta
- boolean unsubscribe(Entity producer);
-
- /**
- * Unsubscribes the given handle.
- *
- * @see SubscriptionContext#unsubscribe(SubscriptionHandle)
- *
- * @deprecated since 0.9.0; see {@link SubscriptionSupport#unsubscribe(Entity, SubscriptionHandle)}, e.g. with {@code subscriptions().unsubscribe(...)}
- */
- @Deprecated
- @Beta
- boolean unsubscribe(Entity producer, SubscriptionHandle handle);
-
- /**
- * Removes all policy from this entity.
- * @return True if any policies existed at this entity; false otherwise
- *
- * @deprecated since 0.9.0; see {@link PolicySupportInternal#removeAllPolicies()}, e.g. {@code ((EntityInternal)entity).policies().removeAllPolicies()}
- */
- @Deprecated
- boolean removeAllPolicies();
-
- /**
- * Removes all enricher from this entity.
- * Use with caution as some entities automatically register enrichers; this will remove those enrichers as well.
- * @return True if any enrichers existed at this entity; false otherwise
- *
- * @deprecated since 0.9.0; see {@link EnricherSupportInternal#removeAllEnrichers()}, e.g. {@code ((EntityInternal)entity).enrichers().removeAllEnrichers()}
- */
- @Deprecated
- boolean removeAllEnrichers();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/api/src/main/java/org/apache/brooklyn/api/entity/EntitySpec.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/EntitySpec.java b/api/src/main/java/org/apache/brooklyn/api/entity/EntitySpec.java
index d431c17..7e11387 100644
--- a/api/src/main/java/org/apache/brooklyn/api/entity/EntitySpec.java
+++ b/api/src/main/java/org/apache/brooklyn/api/entity/EntitySpec.java
@@ -29,9 +29,7 @@ import javax.annotation.Nullable;
import org.apache.brooklyn.api.internal.AbstractBrooklynObjectSpec;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.location.LocationSpec;
-import org.apache.brooklyn.api.policy.Policy;
import org.apache.brooklyn.api.policy.PolicySpec;
-import org.apache.brooklyn.api.sensor.Enricher;
import org.apache.brooklyn.api.sensor.EnricherSpec;
import org.apache.brooklyn.util.collections.MutableList;
@@ -104,9 +102,7 @@ public class EntitySpec<T extends Entity> extends AbstractBrooklynObjectSpec<T,E
private Class<? extends T> impl;
private Entity parent;
- private final List<Policy> policies = Lists.newArrayList();
private final List<PolicySpec<?>> policySpecs = Lists.newArrayList();
- private final List<Enricher> enrichers = Lists.newArrayList();
private final List<EnricherSpec<?>> enricherSpecs = Lists.newArrayList();
private final List<Location> locations = Lists.newArrayList();
private final List<LocationSpec<?>> locationSpecs = Lists.newArrayList();
@@ -126,9 +122,7 @@ public class EntitySpec<T extends Entity> extends AbstractBrooklynObjectSpec<T,E
super.copyFrom(otherSpec)
.additionalInterfaces(otherSpec.getAdditionalInterfaces())
.policySpecs(otherSpec.getPolicySpecs())
- .policies(otherSpec.getPolicies())
.enricherSpecs(otherSpec.getEnricherSpecs())
- .enrichers(otherSpec.getEnrichers())
.addInitializers(otherSpec.getInitializers())
.children(copyFromSpecs(otherSpec.getChildren()))
.members(otherSpec.getMembers())
@@ -210,20 +204,10 @@ public class EntitySpec<T extends Entity> extends AbstractBrooklynObjectSpec<T,E
return policySpecs;
}
- /** @deprecated since 0.9.0 in future only {@link #getPolicySpecs()} will be supported */ @Deprecated
- public List<Policy> getPolicies() {
- return policies;
- }
-
public List<EnricherSpec<?>> getEnricherSpecs() {
return enricherSpecs;
}
- /** @deprecated since 0.9.0 in future only {@link #getEnricherSpecs()} will be supported */ @Deprecated
- public List<Enricher> getEnrichers() {
- return enrichers;
- }
-
public List<LocationSpec<?>> getLocationSpecs() {
return locationSpecs;
}
@@ -321,14 +305,6 @@ public class EntitySpec<T extends Entity> extends AbstractBrooklynObjectSpec<T,E
return this;
}
- /** adds a policy to the spec
- * @deprecated since 0.9.0 pass a spec, using {@link #policy(EnricherSpec)} */ @Deprecated
- public <V> EntitySpec<T> policy(Policy val) {
- checkMutable();
- policies.add(checkNotNull(val, "policy"));
- return this;
- }
-
/** adds a policy to the spec */
public <V> EntitySpec<T> policy(PolicySpec<?> val) {
checkMutable();
@@ -343,22 +319,6 @@ public class EntitySpec<T extends Entity> extends AbstractBrooklynObjectSpec<T,E
return this;
}
- /** adds the supplied policies to the spec
- * @deprecated since 0.9.0 pass a spec, using {@link #policySpecs(Iterable)} */ @Deprecated
- public <V> EntitySpec<T> policies(Iterable<? extends Policy> val) {
- checkMutable();
- policies.addAll(MutableList.copyOf(checkNotNull(val, "policies")));
- return this;
- }
-
- /** adds an enricher to the spec
- * @deprecated since 0.9.0 pass a spec, using {@link #enricher(EnricherSpec)} */ @Deprecated
- public <V> EntitySpec<T> enricher(Enricher val) {
- checkMutable();
- enrichers.add(checkNotNull(val, "enricher"));
- return this;
- }
-
/** adds an enricher to the spec */
public <V> EntitySpec<T> enricher(EnricherSpec<?> val) {
checkMutable();
@@ -373,14 +333,6 @@ public class EntitySpec<T extends Entity> extends AbstractBrooklynObjectSpec<T,E
return this;
}
- /** adds the supplied policies to the spec
- * @deprecated since 0.9.0 pass a spec, using {@link #enricherSpecs(Iterable)} */ @Deprecated
- public <V> EntitySpec<T> enrichers(Iterable<? extends Enricher> val) {
- checkMutable();
- enrichers.addAll(MutableList.copyOf(checkNotNull(val, "enrichers")));
- return this;
- }
-
/** adds a location to the spec
* @deprecated since 0.9.0 pass a spec, using {@link #location(LocationSpec)} */
@Deprecated
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/api/src/main/java/org/apache/brooklyn/api/location/Location.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/location/Location.java b/api/src/main/java/org/apache/brooklyn/api/location/Location.java
index ea43bfd..efbb801 100644
--- a/api/src/main/java/org/apache/brooklyn/api/location/Location.java
+++ b/api/src/main/java/org/apache/brooklyn/api/location/Location.java
@@ -19,7 +19,6 @@
package org.apache.brooklyn.api.location;
import java.util.Collection;
-import java.util.Map;
import org.apache.brooklyn.api.objs.BrooklynObject;
import org.apache.brooklyn.config.ConfigKey;
@@ -94,22 +93,6 @@ public interface Location extends BrooklynObject {
* @see {@link #getConfig(ConfigKey)}
*/
<T> T getConfig(HasConfigKey<T> key);
-
- /**
- * True iff the indication config key is set, either inherited (second argument true) or locally-only (second argument false).
- *
- * @deprecated since 0.7.0; use {@link #config()}, such as {@code ((LocationInternal)location).config().getRaw(key).isPresent()}
- */
- @Deprecated
- boolean hasConfig(ConfigKey<?> key, boolean includeInherited);
-
- /**
- * Returns all config set, either inherited (argument true) or locally-only (argument false).
- *
- * @deprecated since 0.7.0; use {@link #config()}, such as {@code policy.config().getBag()}
- */
- @Deprecated
- public Map<String,Object> getAllConfig(boolean includeInherited);
/**
* Whether this location has support for the given extension type.
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/api/src/main/java/org/apache/brooklyn/api/objs/Configurable.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/objs/Configurable.java b/api/src/main/java/org/apache/brooklyn/api/objs/Configurable.java
index e0226b0..40de655 100644
--- a/api/src/main/java/org/apache/brooklyn/api/objs/Configurable.java
+++ b/api/src/main/java/org/apache/brooklyn/api/objs/Configurable.java
@@ -22,8 +22,8 @@ import java.util.Set;
import org.apache.brooklyn.api.mgmt.Task;
import org.apache.brooklyn.config.ConfigKey;
-import org.apache.brooklyn.config.ConfigMap;
import org.apache.brooklyn.config.ConfigKey.HasConfigKey;
+import org.apache.brooklyn.config.ConfigMap;
import com.google.common.annotations.Beta;
import com.google.common.base.Predicate;
@@ -36,13 +36,6 @@ import com.google.common.base.Predicate;
public interface Configurable {
/**
- * @return the old value, or null if there was not one
- * @deprecated since 0.7.0; use {@link ConfigurationSupport#set(ConfigKey, Object)}, such as {@code config().set(key, val)}
- */
- @Deprecated
- public <T> T setConfig(ConfigKey<T> key, T val);
-
- /**
* Convenience for calling {@link ConfigurationSupport#get(ConfigKey)},
* via code like {@code config().get(key)}.
*
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/api/src/main/java/org/apache/brooklyn/api/policy/Policy.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/policy/Policy.java b/api/src/main/java/org/apache/brooklyn/api/policy/Policy.java
index c1a9899..6297727 100644
--- a/api/src/main/java/org/apache/brooklyn/api/policy/Policy.java
+++ b/api/src/main/java/org/apache/brooklyn/api/policy/Policy.java
@@ -23,7 +23,6 @@ import org.apache.brooklyn.api.mgmt.rebind.Rebindable;
import org.apache.brooklyn.api.mgmt.rebind.mementos.PolicyMemento;
import org.apache.brooklyn.api.objs.Configurable;
import org.apache.brooklyn.api.objs.EntityAdjunct;
-import org.apache.brooklyn.config.ConfigKey;
import com.google.common.annotations.Beta;
@@ -60,13 +59,6 @@ public interface Policy extends EntityAdjunct, Rebindable, Configurable {
boolean isSuspended();
/**
- * @deprecated since 0.7.0; use {@link #config()}, such as {@code policy.config().set(key, val)}
- */
- @Override
- @Deprecated
- <T> T setConfig(ConfigKey<T> key, T val);
-
- /**
* Users are strongly discouraged from calling or overriding this method.
* It is for internal calls only, relating to persisting/rebinding entities.
* This method may change (or be removed) in a future release without notice.
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlan.java
----------------------------------------------------------------------
diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlan.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlan.java
index f7dbaf2..e154971 100644
--- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlan.java
+++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlan.java
@@ -40,10 +40,6 @@ public class DeploymentPlan {
List<Service> services;
Map<String,Object> customAttributes;
- @Deprecated /** @deprecated since 0.7.0; supply source code also, for reference */
- public static DeploymentPlan of(Map<String,Object> root) {
- return of(root, null);
- }
@SuppressWarnings("unchecked")
public static DeploymentPlan of(Map<String,Object> root, String optionalSourceCode) {
Map<String,Object> attrs = MutableMap.copyOf(root);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
index f3f39e7..e265e84 100644
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
@@ -512,10 +512,10 @@ public class BrooklynDslCommon {
}
}
- /** @deprecated since 0.7.0; use {@link DslFormatString} */
- @SuppressWarnings("serial")
+ /** @deprecated since 0.7.0; kept for persisted state backwards compatibility */
+ @SuppressWarnings({ "serial", "unused" })
@Deprecated
- protected static class FormatString extends DslFormatString {
+ private static class FormatString extends DslFormatString {
public FormatString(String pattern, Object[] args) {
super(pattern, args);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java
index ec9937c..f96348d 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java
@@ -143,11 +143,6 @@ public class ObjectsYamlTest extends AbstractYamlTest {
}
@Override
- public <T> T setConfig(ConfigKey<T> key, T value) {
- return config().set(key, value);
- }
-
- @Override
public ConfigurationSupport config() {
return configSupport;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java b/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java
index d2c4b9c..ed48c98 100644
--- a/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java
+++ b/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java
@@ -35,12 +35,10 @@ import java.util.jar.Attributes;
import javax.annotation.Nullable;
-import org.apache.brooklyn.api.catalog.CatalogItem;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.typereg.ManagedBundle;
import org.apache.brooklyn.api.typereg.OsgiBundleWithUrl;
import org.apache.brooklyn.api.typereg.RegisteredType;
-import org.apache.brooklyn.core.catalog.internal.BasicBrooklynCatalog;
import org.apache.brooklyn.core.mgmt.classloading.OsgiBrooklynClassLoadingContext;
import org.apache.brooklyn.core.mgmt.ha.OsgiManager;
import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
@@ -121,21 +119,6 @@ public class BrooklynVersion implements BrooklynVersionService {
}
}
- /**
- * Returns version as inferred from classpath/osgi, if possible, or 0.0.0-SNAPSHOT.
- * See also {@link #getVersionFromMavenProperties()} and {@link #getVersionFromOsgiManifest()}.
- *
- * @deprecated since 0.7.0, in favour of the more specific methods (and does anyone need that default value?)
- */
- @Deprecated
- public String getVersionFromClasspath() {
- String v = getVersionFromMavenProperties();
- if (Strings.isNonBlank(v)) return v;
- v = getVersionFromOsgiManifest();
- if (Strings.isNonBlank(v)) return v;
- return BasicBrooklynCatalog.NO_VERSION;
- }
-
@Override
@Nullable
public String getVersionFromMavenProperties() {
@@ -285,14 +268,6 @@ public class BrooklynVersion implements BrooklynVersionService {
log.debug("Brooklyn version " + getVersion() + " (git SHA1 " + getSha1FromOsgiManifest() + ")");
}
- /**
- * @deprecated since 0.7.0, redundant with {@link #get()}
- */
- @Deprecated
- public static String getVersionFromStatic() {
- return VERSION_FROM_STATIC;
- }
-
public static String get() {
return INSTANCE.getVersion();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/catalog/CatalogPredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/CatalogPredicates.java b/core/src/main/java/org/apache/brooklyn/core/catalog/CatalogPredicates.java
index 849cdd8..4756007 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/CatalogPredicates.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/CatalogPredicates.java
@@ -174,12 +174,6 @@ public class CatalogPredicates {
}
};
- /** @deprecated since 0.7.0 use {@link #displayName(Predicate)} */
- @Deprecated
- public static <T,SpecT> Predicate<CatalogItem<T,SpecT>> name(final Predicate<? super String> filter) {
- return displayName(filter);
- }
-
/**
* @since 0.7.0
*/
@@ -213,11 +207,6 @@ public class CatalogPredicates {
}
}
- @Deprecated
- public static <T,SpecT> Predicate<CatalogItem<T,SpecT>> registeredTypeName(final Predicate<? super String> filter) {
- return symbolicName(filter);
- }
-
public static <T,SpecT> Predicate<CatalogItem<T,SpecT>> symbolicName(final Predicate<? super String> filter) {
// TODO PERSISTENCE WORKAROUND kept anonymous function in case referenced in persisted state
new Predicate<CatalogItem<T,SpecT>>() {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
index 4126d5d..e6b092d 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
@@ -1420,21 +1420,11 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
//------------------------
@Override
- public CatalogItem<?,?> addItem(String yaml) {
- return addItem(yaml, false);
- }
-
- @Override
public List<? extends CatalogItem<?,?>> addItems(String yaml) {
return addItems(yaml, false);
}
@Override
- public CatalogItem<?,?> addItem(String yaml, boolean forceUpdate) {
- return Iterables.getOnlyElement(addItems(yaml, forceUpdate));
- }
-
- @Override
public List<? extends CatalogItem<?,?>> addItems(String yaml, boolean forceUpdate) {
Maybe<OsgiManager> osgiManager = ((ManagementContextInternal)mgmt).getOsgiManager();
if (osgiManager.isPresent() && AUTO_WRAP_CATALOG_YAML_AS_BUNDLE) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogBundleDto.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogBundleDto.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogBundleDto.java
index 1653fcc..bf49cb6 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogBundleDto.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogBundleDto.java
@@ -57,9 +57,6 @@ public class CatalogBundleDto implements CatalogBundle {
}
@Override
- public boolean isNamed() { return isNameResolved(); }
-
- @Override
public String getSymbolicName() {
return symbolicName;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilder.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilder.java
index 82ab357..f08ef17 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilder.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilder.java
@@ -87,12 +87,6 @@ public class CatalogItemBuilder<CIConcreteType extends CatalogItemDtoAbstract<?,
return this;
}
- /** @deprecated since 0.7.0 use {@link #displayName}*/
- @Deprecated
- public CatalogItemBuilder<CIConcreteType> name(String name) {
- return displayName(name);
- }
-
public CatalogItemBuilder<CIConcreteType> displayName(String displayName) {
dto.setDisplayName(displayName);
return this;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java
index 2c1bec6..7f4f6c8 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java
@@ -87,11 +87,6 @@ public class CatalogItemDo<T,SpecT> implements CatalogItem<T,SpecT>, BrooklynObj
}
@Override
- public <U> U setConfig(ConfigKey<U> key, U val) {
- return config().set(key, val);
- }
-
- @Override
public CatalogItemType getCatalogItemType() {
return itemDto.getCatalogItemType();
}
@@ -161,18 +156,6 @@ public class CatalogItemDo<T,SpecT> implements CatalogItem<T,SpecT>, BrooklynObj
return itemDto.getJavaType();
}
- @Deprecated
- @Override
- public String getName() {
- return getDisplayName();
- }
-
- @Deprecated
- @Override
- public String getRegisteredTypeName() {
- return getSymbolicName();
- }
-
@Override
public String getDisplayName() {
return itemDto.getDisplayName();
@@ -214,22 +197,6 @@ public class CatalogItemDo<T,SpecT> implements CatalogItem<T,SpecT>, BrooklynObj
return itemDto.getLibraries();
}
- /** @deprecated since 0.7.0 this is the legacy mechanism; still needed for policies and apps, but being phased out.
- * new items should use {@link #getPlanYaml} and {@link #newClassLoadingContext} */
- @Deprecated
- public Class<T> getJavaClass() {
- if (javaClass==null) loadJavaClass(null);
- return javaClass;
- }
-
- @SuppressWarnings("unchecked")
- @Deprecated
- Class<? extends T> loadJavaClass(final ManagementContext mgmt) {
- if (javaClass!=null) return javaClass;
- javaClass = (Class<T>)CatalogUtils.newClassLoadingContext(mgmt, getId(), getLibraries(), catalog.getRootClassLoader()).loadClass(getJavaType());
- return javaClass;
- }
-
@Override
public String toString() {
return getClass().getCanonicalName()+"["+itemDto+"]";
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java
index 9f6e3d4..eb1ef5e 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java
@@ -93,11 +93,6 @@ public abstract class CatalogItemDtoAbstract<T, SpecT> extends AbstractBrooklynO
}
@Override
- public <U> U setConfig(ConfigKey<U> key, U val) {
- return config().set(key, val);
- }
-
- @Override
public String getId() {
return getCatalogItemId();
}
@@ -114,18 +109,6 @@ public abstract class CatalogItemDtoAbstract<T, SpecT> extends AbstractBrooklynO
}
@Override
- @Deprecated
- public String getName() {
- return getDisplayName();
- }
-
- @Override
- @Deprecated
- public String getRegisteredTypeName() {
- return getSymbolicName();
- }
-
- @Override
public String getContainingBundle() {
return containingBundle;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java
index 5621588..5912ffa 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java
@@ -112,8 +112,8 @@ public class CatalogUtils {
return newClassLoadingContext(mgmt, catalogItemId, libraries, JavaBrooklynClassLoadingContext.create(mgmt));
}
- @Deprecated /** @deprecated since 0.9.0; becoming private because we should now always have a registered type callers can pass instead of the catalog item id */
- public static BrooklynClassLoadingContext newClassLoadingContext(@Nullable ManagementContext mgmt, String catalogItemId, Collection<? extends OsgiBundleWithUrl> libraries, BrooklynClassLoadingContext loader) {
+ @Deprecated /** @deprecated since 0.9.0; we should now always have a registered type callers can pass instead of the catalog item id */
+ private static BrooklynClassLoadingContext newClassLoadingContext(@Nullable ManagementContext mgmt, String catalogItemId, Collection<? extends OsgiBundleWithUrl> libraries, BrooklynClassLoadingContext loader) {
BrooklynClassLoadingContextSequential result = new BrooklynClassLoadingContextSequential(mgmt);
if (libraries!=null && !libraries.isEmpty()) {
@@ -134,25 +134,6 @@ public class CatalogUtils {
return result;
}
- /**
- * @deprecated since 0.7.0 only for legacy catalog items which provide a non-osgi loader; see {@link #newDefault(ManagementContext)}
- */ @Deprecated
- public static BrooklynClassLoadingContext newClassLoadingContext(@Nullable ManagementContext mgmt, String catalogItemId, Collection<CatalogBundle> libraries, ClassLoader customClassLoader) {
- BrooklynClassLoadingContextSequential result = new BrooklynClassLoadingContextSequential(mgmt);
-
- if (libraries!=null && !libraries.isEmpty()) {
- result.add(new OsgiBrooklynClassLoadingContext(mgmt, catalogItemId, libraries));
- }
-
- BrooklynClassLoadingContext loader = BrooklynLoaderTracker.getLoader();
- if (loader != null) {
- result.add(loader);
- }
-
- result.addSecondary(JavaBrooklynClassLoadingContext.create(mgmt, customClassLoader));
- return result;
- }
-
public static BrooklynClassLoadingContext newClassLoadingContextForCatalogItems(
ManagementContext managementContext, String primaryItemId, List<String> searchPath) {
@@ -342,19 +323,6 @@ public class CatalogUtils {
return (best.getVersion().equals(item.getVersion()));
}
- /** @deprecated since 0.9.0 use {@link BrooklynTypeRegistry#get(String, org.apache.brooklyn.api.typereg.BrooklynTypeRegistry.RegisteredTypeKind, Class)} */
- // not used
- @Deprecated
- public static <T,SpecT> CatalogItem<T, SpecT> getCatalogItemOptionalVersion(ManagementContext mgmt, Class<T> type, String versionedId) {
- if (looksLikeVersionedId(versionedId)) {
- String id = getSymbolicNameFromVersionedId(versionedId);
- String version = getVersionFromVersionedId(versionedId);
- return mgmt.getCatalog().getCatalogItem(type, id, version);
- } else {
- return mgmt.getCatalog().getCatalogItem(type, versionedId, BrooklynCatalog.DEFAULT_VERSION);
- }
- }
-
/** @deprecated since it was introduced in 0.9.0; TBD where this should live */
@Deprecated
public static void setDeprecated(ManagementContext mgmt, String symbolicNameAndOptionalVersion, boolean newValue) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/config/ConfigPredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/config/ConfigPredicates.java b/core/src/main/java/org/apache/brooklyn/core/config/ConfigPredicates.java
index 16ffca4..0f86759 100644
--- a/core/src/main/java/org/apache/brooklyn/core/config/ConfigPredicates.java
+++ b/core/src/main/java/org/apache/brooklyn/core/config/ConfigPredicates.java
@@ -82,30 +82,6 @@ public class ConfigPredicates {
};
}
- /** @deprecated since 0.9.0; use {@link #nameStartsWith(String)} */
- @Deprecated
- public static Predicate<ConfigKey<?>> startingWith(final String prefix) {
- return nameStartsWith(prefix);
- }
-
- /** @deprecated since 0.9.0; use {@link #nameMatchesGlob(String)} */
- @Deprecated
- public static Predicate<ConfigKey<?>> matchingGlob(final String glob) {
- return nameMatchesGlob(glob);
- }
-
- /** @deprecated since 0.9.0; use {@link #nameMatchesRegex(String)} */
- @Deprecated
- public static Predicate<ConfigKey<?>> matchingRegex(final String regex) {
- return nameMatchesRegex(regex);
- }
-
- /** @deprecated since 0.9.0; use {@link #nameSatisfies(Predicate)} */
- @Deprecated
- public static Predicate<ConfigKey<?>> nameMatching(final Predicate<String> filter) {
- return nameSatisfies(filter);
- }
-
/**
* @since 0.9.0
*/
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/config/render/RendererHints.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/config/render/RendererHints.java b/core/src/main/java/org/apache/brooklyn/core/config/render/RendererHints.java
index 2cef27e..b843aad 100644
--- a/core/src/main/java/org/apache/brooklyn/core/config/render/RendererHints.java
+++ b/core/src/main/java/org/apache/brooklyn/core/config/render/RendererHints.java
@@ -18,15 +18,12 @@
*/
package org.apache.brooklyn.core.config.render;
-import groovy.lang.Closure;
-
import java.util.Set;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.config.render.RendererHints;
-import org.apache.brooklyn.util.groovy.GroovyJavaMethods;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -85,13 +82,6 @@ public class RendererHints {
/** as {@link #getHintsFor(AttributeSensor)} */
public static Set<Hint<?>> getHintsFor(Class<?> element) { return _getHintsFor(element, null); }
- @Deprecated /** @deprecated since 0.7.0 only supported for certain types */
- public static Set<Hint<?>> getHintsFor(Object element) { return getHintsFor(element, null); }
-
- @Deprecated /** @deprecated since 0.7.0 only supported for certain types */
- @SuppressWarnings({ "rawtypes", "unchecked" })
- public static Set<Hint<?>> getHintsFor(Object element, Class<? extends Hint> optionalHintSuperClass) { return (Set<Hint<?>>) _getHintsFor(element, optionalHintSuperClass); }
-
@SuppressWarnings({ "unchecked", "rawtypes" })
private static <T extends Hint> Set<T> _getHintsFor(Object element, Class<T> optionalHintSuperClass) {
Set<Hint<?>> found = ImmutableSet.copyOf(registry.get(element));
@@ -159,22 +149,11 @@ public class RendererHints {
this(actionName, (Function<T, String>)null);
}
- @SuppressWarnings("unchecked") @Deprecated /** @deprecated since 0.7.0 use Function */
- public NamedActionWithUrl(String actionName, Closure<String> postProcessing) {
- this.actionName = actionName;
- this.postProcessing = (Function<T, String>) ((postProcessing == null) ? null : GroovyJavaMethods.functionFromClosure(postProcessing));
- }
-
public NamedActionWithUrl(String actionName, Function<T, String> postProcessing) {
this.actionName = actionName;
this.postProcessing = postProcessing;
}
- /** @deprecated since 0.7.0 call {@link #getUrlFromValue(Object)}, parsing the sensor value yourself */ @Deprecated
- public String getUrl(Entity e, AttributeSensor<T> s) {
- return getUrlFromValue(e.getAttribute(s));
- }
-
@Override
public String getActionName() {
return actionName;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/effector/AbstractEffector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/effector/AbstractEffector.java b/core/src/main/java/org/apache/brooklyn/core/effector/AbstractEffector.java
index 4acd0e0..bea48c6 100644
--- a/core/src/main/java/org/apache/brooklyn/core/effector/AbstractEffector.java
+++ b/core/src/main/java/org/apache/brooklyn/core/effector/AbstractEffector.java
@@ -60,10 +60,6 @@ public abstract class AbstractEffector<T> extends EffectorBase<T> implements Eff
/** Convenience for named-parameter syntax (needs map in first argument) */
public T call(@SuppressWarnings("rawtypes") Map parameters, Entity entity) { return call(entity, parameters); }
- /** @deprecated since 0.7.0 use {@link #getFlagsForTaskInvocationAt(Entity, Effector, ConfigBag)} */ @Deprecated
- protected final Map<Object,Object> getFlagsForTaskInvocationAt(Entity entity) {
- return getFlagsForTaskInvocationAt(entity, this, null);
- }
/** subclasses may override to add additional flags, but they should include the flags returned here
* unless there is very good reason not to */
protected Map<Object,Object> getFlagsForTaskInvocationAt(Entity entity, Effector<T> effector, ConfigBag parameters) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/effector/EffectorTasks.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/effector/EffectorTasks.java b/core/src/main/java/org/apache/brooklyn/core/effector/EffectorTasks.java
index b9429a0..db49227 100644
--- a/core/src/main/java/org/apache/brooklyn/core/effector/EffectorTasks.java
+++ b/core/src/main/java/org/apache/brooklyn/core/effector/EffectorTasks.java
@@ -93,10 +93,6 @@ public class EffectorTasks {
return dst.get();
};
- /** @deprecated since 0.7.0 use {@link #getFlagsForTaskInvocationAt(Entity, Effector, ConfigBag)} */ @Deprecated
- protected final Map<Object,Object> getFlagsForTaskInvocationAt(Entity entity, Effector<?> effector) {
- return getFlagsForTaskInvocationAt(entity, effector, null);
- }
/** subclasses may override to add additional flags, but they should include the flags returned here
* unless there is very good reason not to; default impl returns a MutableMap */
protected Map<Object,Object> getFlagsForTaskInvocationAt(Entity entity, Effector<?> effector, ConfigBag parameters) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/enricher/AbstractEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/enricher/AbstractEnricher.java b/core/src/main/java/org/apache/brooklyn/core/enricher/AbstractEnricher.java
index 08a39be..b92e930 100644
--- a/core/src/main/java/org/apache/brooklyn/core/enricher/AbstractEnricher.java
+++ b/core/src/main/java/org/apache/brooklyn/core/enricher/AbstractEnricher.java
@@ -122,7 +122,6 @@ public abstract class AbstractEnricher extends AbstractEntityAdjunct implements
requestPersist();
}
- @Override
protected <T> void emit(Sensor<T> sensor, Object val) {
checkState(entity != null, "entity must first be set");
if (val == Entities.UNCHANGED) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java b/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
index 73275e4..70942a0 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
@@ -71,7 +71,6 @@ import org.apache.brooklyn.core.entity.lifecycle.PolicyDescriptor;
import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic;
import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceNotUpLogic;
import org.apache.brooklyn.core.feed.AbstractFeed;
-import org.apache.brooklyn.core.feed.ConfigToAttributes;
import org.apache.brooklyn.core.internal.BrooklynInitialization;
import org.apache.brooklyn.core.internal.storage.BrooklynStorage;
import org.apache.brooklyn.core.internal.storage.Reference;
@@ -90,7 +89,6 @@ import org.apache.brooklyn.core.objs.AbstractEntityAdjunct;
import org.apache.brooklyn.core.objs.AbstractEntityAdjunct.AdjunctTagSupport;
import org.apache.brooklyn.core.policy.AbstractPolicy;
import org.apache.brooklyn.core.sensor.AttributeMap;
-import org.apache.brooklyn.core.sensor.AttributeSensorAndConfigKey;
import org.apache.brooklyn.core.sensor.BasicNotificationSensor;
import org.apache.brooklyn.core.sensor.Sensors;
import org.apache.brooklyn.core.typereg.RegisteredTypes;
@@ -282,15 +280,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
// If FEATURE_USE_BROOKLYN_LIVE_OBJECTS_DATAGRID_STORAGE, this value will be only temporary.
private AttributeMap attributesInternal = new AttributeMap(this);
- /**
- * For temporary data, e.g. timestamps etc for calculating real attribute values, such as when
- * calculating averages over time etc.
- *
- * @deprecated since 0.6; use attributes
- */
- @Deprecated
- protected final Map<String,Object> tempWorkings = Maps.newLinkedHashMap();
-
protected transient volatile SubscriptionTracker _subscriptionTracker;
public AbstractEntity() {
@@ -479,46 +468,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
return getProxy()!=null ? getProxy() : this;
}
- /**
- * Sets a config key value, and returns this Entity instance for use in fluent-API style coding.
- *
- * @deprecated since 0.7.0; see {@link #config()}, such as {@code config().set(key, value)}
- */
- @Deprecated
- public <T> AbstractEntity configure(ConfigKey<T> key, T value) {
- setConfig(key, value);
- return this;
- }
-
- /**
- * @deprecated since 0.7.0; see {@link #config()}, such as {@code config().set(key, value)}
- */
- @SuppressWarnings("unchecked")
- @Deprecated
- public <T> AbstractEntity configure(ConfigKey<T> key, String value) {
- config().set((ConfigKey)key, value);
- return this;
- }
-
- /**
- * @deprecated since 0.7.0; see {@link #config()}, such as {@code config().set(key, value)}
- */
- @Deprecated
- public <T> AbstractEntity configure(HasConfigKey<T> key, T value) {
- config().set(key, value);
- return this;
- }
-
- /**
- * @deprecated since 0.7.0; see {@link #config()}, such as {@code config().set(key, value)}
- */
- @SuppressWarnings("unchecked")
- @Deprecated
- public <T> AbstractEntity configure(HasConfigKey<T> key, String value) {
- config().set((ConfigKey)key, value);
- return this;
- }
-
@Override
public void setManagementContext(ManagementContextInternal managementContext) {
super.setManagementContext(managementContext);
@@ -769,33 +718,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
}
}
- /**
- * @deprecated since 0.9.0; see {@link #groups()} and {@link GroupSupport#addGroup(Group)}
- */
- @Override
- @Deprecated
- public void addGroup(Group group) {
- groups().add(group);
- }
-
- /**
- * @deprecated since 0.9.0; see {@link #groups()} and {@link GroupSupport#removeGroup(Group)}
- */
- @Override
- @Deprecated
- public void removeGroup(Group group) {
- groups().remove(group);
- }
-
- /**
- * @deprecated since 0.9.0; see {@link #groups()} and {@link GroupSupport#iterator()}
- */
- @Override
- @Deprecated
- public Collection<Group> getGroups() {
- return groups().asList();
- }
-
@Override
public Entity getParent() {
return parent.get();
@@ -978,64 +900,8 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
return sensors().get(attribute);
}
- /**
- * @deprecated since 0.8.0; use {@link SensorSupport#get(AttributeSensor)},
- * which may require constructing a temporary sensor using {@link Sensors#newSensor(Class, String)}.
- */
- @SuppressWarnings("unchecked")
- @Deprecated
- public <T> T getAttributeByNameParts(List<String> nameParts) {
- return (T) attributesInternal.getValue(nameParts);
- }
-
static Set<String> WARNED_READ_ONLY_ATTRIBUTES = Collections.synchronizedSet(MutableSet.<String>of());
- @Override
- @Deprecated
- public <T> T setAttribute(AttributeSensor<T> attribute, T val) {
- return sensors().set(attribute, val);
- }
-
- @Override
- @Deprecated
- public <T> T setAttributeWithoutPublishing(AttributeSensor<T> attribute, T val) {
- return sensors().setWithoutPublishing(attribute, val);
- }
-
- @Beta
- @Override
- @Deprecated
- public <T> T modifyAttribute(AttributeSensor<T> attribute, Function<? super T, Maybe<T>> modifier) {
- return sensors().modify(attribute, modifier);
- }
-
- @Override
- @Deprecated
- public void removeAttribute(AttributeSensor<?> attribute) {
- sensors().remove(attribute);
- }
-
- /** sets the value of the given attribute sensor from the config key value herein
- * if the attribtue sensor is not-set or null
- * <p>
- * returns old value
- * @deprecated on interface since 0.5.0; use {@link ConfigToAttributes#apply(Entity, AttributeSensorAndConfigKey)} */
- @Deprecated
- public <T> T setAttribute(AttributeSensorAndConfigKey<?,T> configuredSensor) {
- T v = getAttribute(configuredSensor);
- if (v!=null) return v;
- v = configuredSensor.getAsSensorValue(this);
- if (v!=null) return setAttribute(configuredSensor, v);
- return null;
- }
-
- @Override
- @Deprecated
- @SuppressWarnings("rawtypes")
- public Map<AttributeSensor, Object> getAllAttributes() {
- return Collections.<AttributeSensor, Object>unmodifiableMap(sensors().getAll());
- }
-
// -------- CONFIGURATION --------------
@@ -1286,30 +1152,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
return result;
}
- @Override
- @Deprecated
- public <T> T setConfig(ConfigKey<T> key, T val) {
- return config().set(key, val);
- }
-
- @Override
- @Deprecated
- public <T> T setConfig(ConfigKey<T> key, Task<T> val) {
- return config().set(key, val);
- }
-
- @Override
- @Deprecated
- public <T> T setConfig(HasConfigKey<T> key, T val) {
- return config().set(key, val);
- }
-
- @Override
- @Deprecated
- public <T> T setConfig(HasConfigKey<T> key, Task<T> val) {
- return config().set(key, val);
- }
-
@SuppressWarnings("unchecked")
public <T> T setConfigEvenIfOwned(ConfigKey<T> key, T val) {
return (T) configsInternal.setConfig(key, val);
@@ -1319,24 +1161,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
return setConfigEvenIfOwned(key.getConfigKey(), val);
}
- /**
- * @deprecated since 0.7.0; use {@code if (val != null) config().set(key, val)}
- */
- @Deprecated
- @SuppressWarnings({ "unchecked", "rawtypes" })
- protected void setConfigIfValNonNull(ConfigKey key, Object val) {
- if (val != null) config().set(key, val);
- }
-
- /**
- * @deprecated since 0.7.0; use {@code if (val != null) config().set(key, val)}
- */
- @Deprecated
- @SuppressWarnings({ "unchecked", "rawtypes" })
- protected void setConfigIfValNonNull(HasConfigKey key, Object val) {
- if (val != null) config().set(key, val);
- }
-
// -------- SUBSCRIPTIONS --------------
@Override
@@ -1439,59 +1263,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
}
}
- /**
- * @deprecated since 0.9.0; see {@code subscriptions().subscribe(producer, sensor, listener)}
- */
- @Override
- @Deprecated
- public <T> SubscriptionHandle subscribe(Entity producer, Sensor<T> sensor, SensorEventListener<? super T> listener) {
- return subscriptions().subscribe(producer, sensor, listener);
- }
-
- /**
- * @deprecated since 0.9.0; see {@code subscriptions().subscribeToChildren(parent, sensor, listener)}
- */
- @Override
- @Deprecated
- public <T> SubscriptionHandle subscribeToChildren(Entity parent, Sensor<T> sensor, SensorEventListener<? super T> listener) {
- return subscriptions().subscribeToChildren(parent, sensor, listener);
- }
-
- /**
- * @deprecated since 0.9.0; see {@code subscriptions().subscribeToMembers(producer, sensor, listener)}
- */
- @Override
- @Deprecated
- public <T> SubscriptionHandle subscribeToMembers(Group group, Sensor<T> sensor, SensorEventListener<? super T> listener) {
- return subscriptions().subscribeToMembers(group, sensor, listener);
- }
-
- /**
- * @deprecated since 0.9.0; see {@code subscriptions().unsubscribe(producer)}
- */
- @Override
- @Deprecated
- public boolean unsubscribe(Entity producer) {
- return subscriptions().unsubscribe(producer);
- }
-
- /**
- * @deprecated since 0.9.0; see {@code subscriptions().unsubscribe(producer, handle)}
- */
- @Override
- @Deprecated
- public boolean unsubscribe(Entity producer, SubscriptionHandle handle) {
- return subscriptions().unsubscribe(producer, handle);
- }
-
- /**
- * @deprecated since 0.9.0; for internal use only
- */
- @Deprecated
- protected SubscriptionTracker getSubscriptionTracker() {
- return subscriptions().getSubscriptionTracker();
- }
-
@Override
public ExecutionContext getExecutionContext() {
// NB May 2016 - removed synch keyword above due to deadlock (see https://issues.apache.org/jira/browse/BROOKLYN-284).
@@ -1712,78 +1483,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
}
}
- /**
- * @deprecated since 0.9.0; see {@link BasicPolicySupport#iterator()}; e.g. {@code policies().iterator()}
- */
- @Override
- @Deprecated
- public Collection<Policy> getPolicies() {
- return policies().asList();
- }
-
- /**
- * @deprecated since 0.9.0; see {@link BasicPolicySupport#addPolicy(Policy)}; e.g. {@code policies().addPolicy(policy)}
- */
- @Override
- @Deprecated
- public void addPolicy(Policy policy) {
- policies().add(policy);
- }
-
- /**
- * @deprecated since 0.9.0; see {@link BasicPolicySupport#addPolicy(PolicySpec)}; e.g. {@code policies().addPolicy(spec)}
- */
- @Override
- @Deprecated
- public <T extends Policy> T addPolicy(PolicySpec<T> spec) {
- return policies().add(spec);
- }
-
- /**
- * @deprecated since 0.9.0; see {@link BasicEnricherSupport#; e.g. {@code enrichers().addEnricher(spec)}
- */
- @Override
- @Deprecated
- public <T extends Enricher> T addEnricher(EnricherSpec<T> spec) {
- return enrichers().add(spec);
- }
-
- /**
- * @deprecated since 0.9.0; see {@link BasicPolicySupport#removePolicy(Policy)}; e.g. {@code policies().removePolicy(policy)}
- */
- @Override
- @Deprecated
- public boolean removePolicy(Policy policy) {
- return policies().remove(policy);
- }
-
- /**
- * @deprecated since 0.9.0; see {@link BasicPolicySupport#removeAllPolicies()}; e.g. {@code policies().removeAllPolicies()}
- */
- @Override
- @Deprecated
- public boolean removeAllPolicies() {
- return policies().removeAllPolicies();
- }
-
- /**
- * @deprecated since 0.9.0; see {@link BasicEnricherSupport#iterator()}; e.g. {@code enrichers().iterator()}
- */
- @Override
- @Deprecated
- public Collection<Enricher> getEnrichers() {
- return enrichers().asList();
- }
-
- /**
- * @deprecated since 0.9.0; see {@link BasicEnricherSupport#addEnricher(Enricher)}; e.g. {@code enrichers().addEnricher(enricher)}
- */
- @Override
- @Deprecated
- public void addEnricher(Enricher enricher) {
- enrichers().add(enricher);
- }
-
private <T extends EntityAdjunct> T findApparentlyEqualAndWarnIfNotSameUniqueTag(Collection<? extends T> items, T newItem) {
T oldItem = findApparentlyEqual(items, newItem, true);
@@ -1861,24 +1560,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
return null;
}
- /**
- * @deprecated since 0.9.0; see {@link BasicEnricherSupport#removeEnricher(Enricher)}; e.g. {@code enrichers().removeEnricher(enricher)}
- */
- @Override
- @Deprecated
- public boolean removeEnricher(Enricher enricher) {
- return enrichers().remove(enricher);
- }
-
- /**
- * @deprecated since 0.9.0; see {@link BasicEnricherSupport#removeAllEnrichers()}; e.g. {@code enrichers().removeAllEnrichers()}
- */
- @Override
- @Deprecated
- public boolean removeAllEnrichers() {
- return enrichers().removeAll();
- }
-
// -------- FEEDS --------------------
/**
@@ -1895,12 +1576,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
return feeds;
}
- @Override
- @Deprecated
- public FeedSupport getFeedSupport() {
- return feeds();
- }
-
protected class BasicFeedSupport implements FeedSupport {
@Override
@@ -1996,21 +1671,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
// }
}
- // -------- SENSORS --------------------
-
- @Override
- @Deprecated
- public <T> void emit(Sensor<T> sensor, T val) {
- sensors().emit(sensor, val);
- }
-
- /**
- * Warning: for internal purposes only; this method may be deleted without notice in future releases.
- */
- public <T> void emitInternal(Sensor<T> sensor, T val) {
- sensors().emitInternal(sensor, val);
- }
-
// -------- EFFECTORS --------------
/** Convenience for finding named effector in {@link EntityType#getEffectors()} {@link Map}. */
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java b/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java
index ab7013b..f3dca6b 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java
@@ -184,13 +184,6 @@ public class BrooklynConfigKeys {
"Directory for installed artifacts (e.g. expanded dir after unpacking .tgz)",
null);
- /** @deprecated since 0.7.0; use {@link #INSTALL_DIR} */
- @Deprecated
- public static final ConfigKey<String> SUGGESTED_INSTALL_DIR = INSTALL_DIR.getConfigKey();
- /** @deprecated since 0.7.0; use {@link #RUN_DIR} */
- @Deprecated
- public static final ConfigKey<String> SUGGESTED_RUN_DIR = RUN_DIR.getConfigKey();
-
/*
* Intention is to use these with DependentConfiguration.attributeWhenReady, to allow an entity's start
* to block until dependents are ready. This is particularly useful when we want to block until a dependent
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/entity/Entities.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/Entities.java b/core/src/main/java/org/apache/brooklyn/core/entity/Entities.java
index df904d3..9f1853f 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/Entities.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/Entities.java
@@ -130,22 +130,6 @@ public class Entities {
private static final Logger log = LoggerFactory.getLogger(Entities.class);
- /**
- * Names that, if they appear anywhere in an attribute/config/field indicates that it
- * may be private, so should not be logged etc.
- *
- * @deprecated since 0.7; instead use {@link Sanitizer#SECRET_NAMES}
- */
- @Deprecated
- public static final List<String> SECRET_NAMES = ImmutableList.of(
- "password",
- "passwd",
- "credential",
- "secret",
- "private",
- "access.cert",
- "access.key");
-
// Don't use `new Object()` - deserialization creates a different object from the constant.
// Instead, use this enum.
private enum ValueMarkers {
@@ -286,22 +270,6 @@ public class Entities {
(v instanceof CharSequence&& ((CharSequence)v).length() == 0);
}
- /**
- * @deprecated since 0.7; instead use {@link Sanitizer#sanitize(ConfigBag)}
- */
- @Deprecated
- public static Map<String,Object> sanitize(ConfigBag input) {
- return Sanitizer.sanitize(input );
- }
-
- /**
- * @deprecated since 0.7; instead use {@link Sanitizer#sanitize(Map)}
- */
- @Deprecated
- public static <K> Map<K,Object> sanitize(Map<K,?> input) {
- return Sanitizer.sanitize(input);
- }
-
public static void dumpInfo(Iterable<? extends Entity> entities) {
for (Entity e : entities) {
dumpInfo(e);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/entity/EntityAndAttribute.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/EntityAndAttribute.java b/core/src/main/java/org/apache/brooklyn/core/entity/EntityAndAttribute.java
index ce86c53..31ef985 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/EntityAndAttribute.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/EntityAndAttribute.java
@@ -42,14 +42,6 @@ public class EntityAndAttribute<T> implements Supplier<T> {
return new EntityAndAttribute<T>(entity, attribute);
}
- /**
- * @deprecated since 0.7.0; use {@link #create(Entity, AttributeSensor)}; this does not relate to {@link Supplier}
- */
- @Deprecated
- public static <T> EntityAndAttribute<T> supplier(Entity entity, AttributeSensor<T> attribute) {
- return create(entity, attribute);
- }
-
public EntityAndAttribute(Entity entity, AttributeSensor<T> attribute) {
this.entity = checkNotNull(entity, "entity");
this.attribute = checkNotNull(attribute, "attribute");
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/entity/EntityDynamicType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/EntityDynamicType.java b/core/src/main/java/org/apache/brooklyn/core/entity/EntityDynamicType.java
index ecf2a17..a0dfa5f 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/EntityDynamicType.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/EntityDynamicType.java
@@ -92,14 +92,6 @@ public class EntityDynamicType extends BrooklynDynamicType<Entity, AbstractEntit
refreshSnapshot();
}
- /**
- * @deprecated since 0.7; unused code; instead use {@link #getBrooklynClass()}
- */
- @Deprecated
- public Class<? extends Entity> getEntityClass() {
- return super.getBrooklynClass();
- }
-
@Override
public EntityType getSnapshot() {
return (EntityType) super.getSnapshot();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/entity/EntityFunctions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/EntityFunctions.java b/core/src/main/java/org/apache/brooklyn/core/entity/EntityFunctions.java
index fa7438f..8270f54 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/EntityFunctions.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/EntityFunctions.java
@@ -108,7 +108,7 @@ public class EntityFunctions {
if (value==Entities.UNCHANGED) {
// nothing
} else if (value==Entities.REMOVE) {
- ((EntityInternal)input).removeAttribute(sensor);
+ ((EntityInternal)input).sensors().remove(sensor);
} else {
value = TypeCoercions.coerce(value, sensor.getTypeToken());
((EntityInternal)input).sensors().set(sensor, value);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java b/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java
index cc76f8c..a185824 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java
@@ -63,26 +63,6 @@ public interface EntityInternal extends BrooklynObjectInternal, EntityLocal, Reb
void clearLocations();
/**
- * @deprecated since 0.8.0; use {@link SensorSupportInternal#setWithoutPublishing(AttributeSensor, Object)} via code like {@code sensors().setWithoutPublishing(attribute, val)}.
- */
- @Deprecated
- <T> T setAttributeWithoutPublishing(AttributeSensor<T> sensor, T val);
-
- /**
- * @deprecated since 0.8.0; use {@link SensorSupportInternal#getAll()} via code like {@code sensors().getAll()}.
- */
- @Deprecated
- @Beta
- Map<AttributeSensor, Object> getAllAttributes();
-
- /**
- * @deprecated since 0.8.0; use {@link SensorSupportInternal#remove(AttributeSensor)} via code like {@code sensors().remove(attribute)}.
- */
- @Deprecated
- @Beta
- void removeAttribute(AttributeSensor<?> attribute);
-
- /**
* Must be called before the entity is started.
*
* @return this entity (i.e. itself)
@@ -127,13 +107,6 @@ public interface EntityInternal extends BrooklynObjectInternal, EntityLocal, Reb
FeedSupport feeds();
- /**
- * @since 0.7.0-M2
- * @deprecated since 0.7.0-M2; use {@link #feeds()}
- */
- @Deprecated
- FeedSupport getFeedSupport();
-
Map<String, String> toMetadataRecord();
/**
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/entity/EntityPredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/EntityPredicates.java b/core/src/main/java/org/apache/brooklyn/core/entity/EntityPredicates.java
index 4b85724..4cdc2cd 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/EntityPredicates.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/EntityPredicates.java
@@ -454,12 +454,6 @@ public class EntityPredicates {
}
}
- /** @deprecated since 0.7.0 use {@link #locationsIncludes(Location)} */
- @Deprecated
- public static <T> Predicate<Entity> withLocation(final Location location) {
- return locationsIncludes(location);
- }
-
/** @deprecated since 0.7.0 use {@link #locationsIncludes(Location)}, introduced to allow deserialization of anonymous inner class */
@SuppressWarnings("unused") @Deprecated
private static <T> Predicate<Entity> withLocationOld(final Location location) {
@@ -488,11 +482,6 @@ public class EntityPredicates {
}
}
- /** @deprecated since 0.7.0 use {@link #isManaged()} */ @Deprecated
- public static <T> Predicate<Entity> managed() {
- return isManaged();
- }
-
/** @deprecated since 0.7.0 use {@link #isManaged()}, introduced to allow deserialization of anonymous inner class */
@SuppressWarnings("unused") @Deprecated
private static <T> Predicate<Entity> managedOld() {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/entity/internal/EntityTransientCopyInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/internal/EntityTransientCopyInternal.java b/core/src/main/java/org/apache/brooklyn/core/entity/internal/EntityTransientCopyInternal.java
index 548f159..06b9a51 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/internal/EntityTransientCopyInternal.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/internal/EntityTransientCopyInternal.java
@@ -19,7 +19,6 @@
package org.apache.brooklyn.core.entity.internal;
import java.util.Collection;
-import java.util.Map;
import javax.annotation.Nullable;
@@ -27,16 +26,13 @@ import org.apache.brooklyn.api.effector.Effector;
import org.apache.brooklyn.api.entity.Application;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntityType;
-import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.mgmt.ExecutionContext;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.mgmt.rebind.RebindSupport;
import org.apache.brooklyn.api.mgmt.rebind.mementos.EntityMemento;
import org.apache.brooklyn.api.objs.BrooklynObject.TagSupport;
-import org.apache.brooklyn.api.policy.Policy;
import org.apache.brooklyn.api.sensor.AttributeSensor;
-import org.apache.brooklyn.api.sensor.Enricher;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.config.ConfigKey.HasConfigKey;
import org.apache.brooklyn.core.entity.EntityInternal;
@@ -70,9 +66,6 @@ public interface EntityTransientCopyInternal {
String getApplicationId();
Entity getParent();
Collection<Entity> getChildren();
- Collection<Policy> getPolicies();
- Collection<Enricher> getEnrichers();
- Collection<Group> getGroups();
Collection<Location> getLocations();
<T> T getAttribute(AttributeSensor<T> sensor);
<T> T getConfig(ConfigKey<T> key);
@@ -82,12 +75,9 @@ public interface EntityTransientCopyInternal {
// from EntityInternal:
- @SuppressWarnings("rawtypes")
- Map<AttributeSensor, Object> getAllAttributes();
EntityManagementSupport getManagementSupport();
ManagementContext getManagementContext();
Effector<?> getEffector(String effectorName);
- @Deprecated FeedSupport getFeedSupport();
FeedSupport feeds();
RebindSupport<EntityMemento> getRebindSupport();
// for REST calls on read-only entities which want to resolve values
[6/7] brooklyn-server git commit: Regenerate osgi bundles,
fixing deprecation usage
Posted by tb...@apache.org.
Regenerate osgi bundles, fixing deprecation usage
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4f86cfd3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/4f86cfd3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/4f86cfd3
Branch: refs/heads/master
Commit: 4f86cfd3151b12e24470d7e5f583503b109a3fb8
Parents: 7df1d38
Author: Aled Sage <al...@gmail.com>
Authored: Mon Oct 9 23:46:52 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Oct 17 12:32:16 2017 +0100
----------------------------------------------------------------------
.../test/osgi/entities/more/MoreEntityImpl.java | 2 +-
.../test/osgi/entities/more/MoreEntityImpl.java | 4 +++-
.../brooklyn-test-osgi-more-entities_0.2.0.jar | Bin 16893 -> 16958 bytes
...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 14077 -> 14146 bytes
4 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4f86cfd3/utils/common/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java
----------------------------------------------------------------------
diff --git a/utils/common/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java b/utils/common/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java
index d2cfa08..30da615 100644
--- a/utils/common/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java
+++ b/utils/common/dependencies/osgi/more-entities-v2-evil-twin/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java
@@ -35,7 +35,7 @@ public class MoreEntityImpl extends AbstractEntity implements MoreEntity {
return sayHI((String)parameters.getStringKey("name"));
}
});
- addPolicy(PolicySpec.create(org.apache.brooklyn.test.osgi.entities.SimplePolicy.class));
+ policies().add(PolicySpec.create(org.apache.brooklyn.test.osgi.entities.SimplePolicy.class));
}
/** Returns HO instead of HI (like v2 non-evil twin) or Hi (like v1) */
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4f86cfd3/utils/common/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java
----------------------------------------------------------------------
diff --git a/utils/common/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java b/utils/common/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java
index 0aff562..f89643c 100644
--- a/utils/common/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java
+++ b/utils/common/dependencies/osgi/more-entities-v2/src/main/java/org/apache/brooklyn/test/osgi/entities/more/MoreEntityImpl.java
@@ -23,6 +23,8 @@ import org.apache.brooklyn.core.effector.EffectorBody;
import org.apache.brooklyn.core.entity.AbstractEntity;
import org.apache.brooklyn.util.core.config.ConfigBag;
+import com.google.common.util.concurrent.CycleDetectingLockFactory.Policies;
+
public class MoreEntityImpl extends AbstractEntity implements MoreEntity {
/** Unlike v1, this declares an explicit dependency on SimplePolicy */
@@ -35,7 +37,7 @@ public class MoreEntityImpl extends AbstractEntity implements MoreEntity {
return sayHI((String)parameters.getStringKey("name"));
}
});
- addPolicy(PolicySpec.create(org.apache.brooklyn.test.osgi.entities.SimplePolicy.class));
+ policies().add(PolicySpec.create(org.apache.brooklyn.test.osgi.entities.SimplePolicy.class));
}
/** Unlike v1, this returns "HI " rather than "Hi " */
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4f86cfd3/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar
----------------------------------------------------------------------
diff --git a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar
index 7dad78d..3b76043 100644
Binary files a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar and b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar differ
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4f86cfd3/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_evil-twin_0.2.0.jar
----------------------------------------------------------------------
diff --git a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_evil-twin_0.2.0.jar b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_evil-twin_0.2.0.jar
index d5997ba..5046d38 100644
Binary files a/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_evil-twin_0.2.0.jar and b/utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_evil-twin_0.2.0.jar differ
[7/7] brooklyn-server git commit: This closes #859
Posted by tb...@apache.org.
This closes #859
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/38de5224
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/38de5224
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/38de5224
Branch: refs/heads/master
Commit: 38de52240839a50195cde6812764e007d6084d8f
Parents: efa4af6 4f86cfd
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Wed Oct 18 09:28:42 2017 +0100
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Wed Oct 18 09:28:42 2017 +0100
----------------------------------------------------------------------
.../brooklyn/api/catalog/BrooklynCatalog.java | 23 --
.../brooklyn/api/catalog/CatalogItem.java | 11 -
.../org/apache/brooklyn/api/entity/Entity.java | 100 ------
.../apache/brooklyn/api/entity/EntityLocal.java | 131 -------
.../apache/brooklyn/api/entity/EntitySpec.java | 48 ---
.../apache/brooklyn/api/location/Location.java | 17 -
.../apache/brooklyn/api/objs/Configurable.java | 9 +-
.../org/apache/brooklyn/api/policy/Policy.java | 8 -
.../brooklyn/camp/spi/pdp/DeploymentPlan.java | 4 -
.../spi/dsl/methods/BrooklynDslCommon.java | 6 +-
.../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 5 -
.../apache/brooklyn/core/BrooklynVersion.java | 25 --
.../core/catalog/CatalogPredicates.java | 11 -
.../catalog/internal/BasicBrooklynCatalog.java | 10 -
.../core/catalog/internal/CatalogBundleDto.java | 3 -
.../catalog/internal/CatalogItemBuilder.java | 6 -
.../core/catalog/internal/CatalogItemDo.java | 33 --
.../internal/CatalogItemDtoAbstract.java | 17 -
.../core/catalog/internal/CatalogUtils.java | 36 +-
.../brooklyn/core/config/ConfigPredicates.java | 24 --
.../core/config/render/RendererHints.java | 21 --
.../core/effector/AbstractEffector.java | 4 -
.../brooklyn/core/effector/EffectorTasks.java | 4 -
.../core/enricher/AbstractEnricher.java | 1 -
.../brooklyn/core/entity/AbstractEntity.java | 340 -------------------
.../core/entity/BrooklynConfigKeys.java | 7 -
.../apache/brooklyn/core/entity/Entities.java | 32 --
.../core/entity/EntityAndAttribute.java | 8 -
.../brooklyn/core/entity/EntityDynamicType.java | 8 -
.../brooklyn/core/entity/EntityFunctions.java | 2 +-
.../brooklyn/core/entity/EntityInternal.java | 27 --
.../brooklyn/core/entity/EntityPredicates.java | 11 -
.../internal/EntityTransientCopyInternal.java | 10 -
.../core/feed/AttributePollHandler.java | 2 +-
.../apache/brooklyn/core/feed/FeedConfig.java | 4 -
.../core/internal/BrooklynInitialization.java | 9 -
.../core/internal/BrooklynPropertiesImpl.java | 6 -
.../core/location/AbstractLocation.java | 62 +---
.../core/location/LocationPredicates.java | 2 +-
.../apache/brooklyn/core/location/Machines.java | 9 -
.../location/access/PortForwardManager.java | 72 ----
.../access/PortForwardManagerClient.java | 106 +-----
.../location/access/PortForwardManagerImpl.java | 96 +-----
.../core/location/geo/UtraceHostGeoLookup.java | 16 -
.../location/internal/LocationInternal.java | 17 -
.../core/mgmt/EntityManagementUtils.java | 27 --
.../JavaBrooklynClassLoadingContext.java | 5 -
.../core/mgmt/entitlement/Entitlements.java | 9 -
.../mgmt/ha/HighAvailabilityManagerImpl.java | 14 -
.../core/mgmt/ha/OsgiArchiveInstaller.java | 7 +-
.../core/objs/AbstractEntityAdjunct.java | 118 +------
.../core/objs/BasicConfigurableObject.java | 6 -
.../core/objs/proxy/InternalEntityFactory.java | 10 -
.../objs/proxy/InternalLocationFactory.java | 30 --
.../core/objs/proxy/InternalPolicyFactory.java | 42 ---
.../brooklyn/core/sensor/AttributeMap.java | 2 +-
.../core/sensor/DependentConfiguration.java | 13 -
.../core/server/BrooklynServerConfig.java | 39 ---
.../core/server/BrooklynServiceAttributes.java | 12 -
.../core/typereg/BasicManagedBundle.java | 5 -
.../core/typereg/BasicOsgiBundleWithUrl.java | 6 -
.../brooklyn/core/typereg/RegisteredTypes.java | 3 -
.../enricher/stock/reducer/Reducer.java | 2 +-
.../group/AbstractMembershipTrackingPolicy.java | 28 +-
.../brooklyn/entity/group/DynamicGroup.java | 4 -
.../brooklyn/entity/group/DynamicGroupImpl.java | 9 -
.../apache/brooklyn/feed/CommandPollConfig.java | 12 -
.../brooklyn/feed/function/FunctionFeed.java | 4 +-
.../org/apache/brooklyn/feed/http/HttpFeed.java | 3 +-
.../brooklyn/feed/http/HttpPollValue.java | 40 ---
.../apache/brooklyn/feed/http/HttpPolls.java | 39 ---
.../apache/brooklyn/feed/shell/ShellFeed.java | 2 +-
.../brooklyn/feed/ssh/SshValueFunctions.java | 18 +-
.../LocalhostMachineProvisioningLocation.java | 8 +-
.../location/ssh/SshMachineLocation.java | 15 +-
.../util/core/BrooklynLanguageExtensions.java | 46 ---
.../brooklyn/util/core/ResourceUtils.java | 89 +----
.../brooklyn/util/core/config/ConfigBag.java | 2 +-
.../brooklyn/util/core/crypto/SecureKeys.java | 23 +-
.../brooklyn/util/core/file/ArchiveBuilder.java | 92 -----
.../brooklyn/util/core/flags/FlagUtils.java | 14 -
.../brooklyn/util/core/http/HttpTool.java | 28 --
.../util/core/http/HttpToolResponse.java | 31 --
.../util/core/internal/ssh/SshTool.java | 9 -
.../util/core/internal/ssh/cli/SshCliTool.java | 5 -
.../core/internal/ssh/process/ProcessTool.java | 25 --
.../util/core/internal/ssh/sshj/SshjTool.java | 6 -
.../brooklyn/util/core/osgi/BundleMaker.java | 40 +--
.../apache/brooklyn/util/core/osgi/Osgis.java | 55 ---
.../brooklyn/util/core/task/TaskBuilder.java | 8 -
.../brooklyn/util/core/task/TaskPredicates.java | 6 -
.../util/core/text/TemplateProcessor.java | 10 -
.../brooklyn/core/BrooklynVersionTest.java | 7 -
.../internal/CatalogItemBuilderTest.java | 10 -
.../core/config/BrooklynPropertiesTest.java | 8 +-
.../core/config/ConfigPredicatesTest.java | 18 +-
.../brooklyn/core/entity/AttributeTest.java | 11 -
.../brooklyn/core/entity/EntitiesTest.java | 6 -
.../core/entity/EntityConfigGroovyTest.groovy | 2 +-
.../brooklyn/core/entity/EntitySpecTest.java | 21 --
.../brooklyn/core/entity/EntityTypeTest.java | 2 +-
.../core/entity/PolicyRegistrationTest.java | 7 -
.../core/location/LocationConfigTest.java | 16 -
.../brooklyn/core/location/MachinesTest.java | 9 -
.../access/PortForwardManagerRebindTest.java | 26 --
.../location/access/PortForwardManagerTest.java | 27 +-
...agementPlaneSyncRecordPersisterInMemory.java | 99 ------
.../core/mgmt/rebind/RebindEnricherTest.java | 5 +-
.../core/mgmt/rebind/RebindFeedWithHaTest.java | 2 +-
.../core/mgmt/rebind/RebindTestFixture.java | 46 ---
.../core/mgmt/rebind/RebindTestUtils.java | 125 -------
.../core/test/entity/TestApplicationImpl.java | 13 +-
.../qa/performance/AbstractPerformanceTest.java | 93 -----
.../apache/brooklyn/feed/http/HttpFeedTest.java | 12 +-
.../util/core/internal/FlagUtilsTest.java | 5 -
.../core/internal/ssh/RecordingSshTool.java | 3 -
.../BrooklynEntityMirrorIntegrationTest.java | 4 +-
.../jclouds/BlobStoreContextFactoryImpl.java | 4 +-
.../location/jclouds/BrooklynImageChooser.java | 15 +-
.../location/jclouds/JcloudsLocation.java | 2 -
.../jclouds/JcloudsMachineLocation.java | 9 -
.../location/jclouds/JcloudsPredicates.java | 7 +-
.../jclouds/JcloudsSshMachineLocation.java | 78 -----
.../jclouds/JcloudsWinRmMachineLocation.java | 17 -
.../api/JcloudsLocationConfigPublic.java | 15 -
.../customize/AutoCreateFloatingIpsOption.java | 42 ---
.../customize/TemplateOptionCustomizers.java | 8 -
.../customize/UserDataUuencodedOption.java | 54 ---
.../jclouds/JcloudsByonRebindLiveTest.java | 2 -
.../JcloudsImageChoiceStubbedLiveTest.java | 2 -
.../jclouds/JcloudsLocationResolverTest.java | 2 +-
.../location/jclouds/JcloudsRebindLiveTest.java | 3 -
.../location/jclouds/JcloudsRebindStubTest.java | 1 -
.../jclouds/JcloudsRebindStubUnitTest.java | 1 -
.../policy/enricher/HttpLatencyDetector.java | 6 +-
.../enricher/RollingTimeWindowMeanEnricher.java | 10 -
.../RollingTimeWindowMeanEnricherTest.java | 24 +-
.../loadbalancing/MockContainerEntityImpl.java | 8 -
.../loadbalancing/MockItemEntityImpl.java | 7 -
.../apache/brooklyn/rest/domain/ApiError.java | 12 -
.../brooklyn/rest/domain/TaskSummary.java | 14 -
.../rest/filter/HaHotCheckResourceFilter.java | 6 -
.../resources/AbstractBrooklynRestResource.java | 5 -
.../rest/resources/LocationResource.java | 6 -
.../rest/transform/LocationTransformer.java | 12 -
.../brooklyn/rest/util/ShutdownHandler.java | 26 --
.../brooklyn/rest/util/URLParamEncoder.java | 28 --
.../brooklyn/rest/util/WebResourceUtils.java | 7 -
.../util/json/BrooklynJacksonJsonProvider.java | 23 --
.../BrooklynPropertiesSecurityFilter.java | 11 +-
.../BrooklynRestApiLauncherTestFixture.java | 6 -
.../entity/brooklynnode/BrooklynNodeImpl.java | 2 +-
.../brooklyn/entity/java/JavaAppUtils.java | 6 -
.../java/JavaSoftwareProcessSshDriver.java | 8 -
.../software/base/SameServerEntityImpl.java | 6 -
.../org/apache/brooklyn/feed/jmx/JmxFeed.java | 20 +-
.../feed/jmx/JmxNotificationFilters.java | 10 +-
.../entity/java/VanillaJavaAppRebindTest.java | 2 +-
...twareProcessOpenIptablesStreamsLiveTest.java | 2 +-
.../test/osgi/entities/more/MoreEntityImpl.java | 2 +-
.../test/osgi/entities/more/MoreEntityImpl.java | 4 +-
.../java/org/apache/brooklyn/test/Asserts.java | 24 +-
.../brooklyn/util/collections/MutableList.java | 4 -
.../brooklyn/util/collections/MutableMap.java | 4 -
.../brooklyn/util/collections/MutableSet.java | 5 -
.../util/collections/TimeWindowedList.java | 10 -
.../brooklyn/util/exceptions/Exceptions.java | 7 -
.../util/javalang/AggregateClassLoader.java | 7 -
.../apache/brooklyn/util/javalang/Enums.java | 5 +-
.../util/javalang/StackTraceSimplifier.java | 15 -
.../brooklyn/util/math/MathFunctions.java | 8 -
.../java/org/apache/brooklyn/util/os/Os.java | 6 -
.../apache/brooklyn/util/repeat/Repeater.java | 12 -
.../brooklyn/util/ssh/IptablesCommands.java | 34 +-
.../util/stream/InputStreamSupplier.java | 4 +-
.../apache/brooklyn/util/stream/Streams.java | 5 -
.../org/apache/brooklyn/util/text/Strings.java | 7 -
.../brooklyn/util/time/CountdownTimer.java | 3 -
.../org/apache/brooklyn/util/time/Duration.java | 11 -
.../org/apache/brooklyn/util/time/Time.java | 38 +--
.../brooklyn-test-osgi-more-entities_0.2.0.jar | Bin 16893 -> 16958 bytes
...-test-osgi-more-entities_evil-twin_0.2.0.jar | Bin 14077 -> 14146 bytes
182 files changed, 181 insertions(+), 3564 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/38de5224/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/38de5224/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/38de5224/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
----------------------------------------------------------------------
[2/7] brooklyn-server git commit: Deletes old deprecated code
Posted by tb...@apache.org.
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java
index 7a27d8d..030f5d2 100644
--- a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java
+++ b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java
@@ -22,17 +22,13 @@ import java.util.Map;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntitySpec;
-import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.api.location.LocationSpec;
-import org.apache.brooklyn.api.mgmt.SubscriptionHandle;
-import org.apache.brooklyn.api.sensor.Sensor;
-import org.apache.brooklyn.api.sensor.SensorEventListener;
import org.apache.brooklyn.core.entity.AbstractApplication;
import org.apache.brooklyn.core.location.SimulatedLocation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation;
import org.apache.brooklyn.util.logging.LoggingSetup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Mock application for testing.
@@ -61,11 +57,6 @@ public class TestApplicationImpl extends AbstractApplication implements TestAppl
}
@Override
- public <T> SubscriptionHandle subscribeToMembers(Group parent, Sensor<T> sensor, SensorEventListener<? super T> listener) {
- return subscriptions().subscribeToMembers(parent, sensor, listener);
- }
-
- @Override
public String toString() {
String id = getId();
return "Application["+id.substring(Math.max(0, id.length()-8))+"]";
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/AbstractPerformanceTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/AbstractPerformanceTest.java b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/AbstractPerformanceTest.java
index ab6978d..5985ac0 100644
--- a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/AbstractPerformanceTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/AbstractPerformanceTest.java
@@ -18,11 +18,6 @@
*/
package org.apache.brooklyn.core.test.qa.performance;
-import static org.testng.Assert.assertTrue;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
import org.apache.brooklyn.core.internal.BrooklynProperties;
import org.apache.brooklyn.core.location.SimulatedLocation;
import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
@@ -34,8 +29,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.BeforeMethod;
-import com.google.common.base.Stopwatch;
-
/**
* For running simplistic performance tests, to measure the number of operations per second and compare
* it against some min rate.
@@ -96,90 +89,4 @@ public class AbstractPerformanceTest extends BrooklynAppUnitTestSupport {
LOG.info("test="+options+"; result="+result);
return result;
}
-
- /**
- * @deprecated since 0.9.0; use {@link #measure(PerformanceTestDescriptor)}
- */
- @Deprecated
- protected void measureAndAssert(String prefix, int numIterations, double minRatePerSec, Runnable r) {
- measure(PerformanceTestDescriptor.create()
- .summary(prefix)
- .iterations(numIterations)
- .minAcceptablePerSecond(minRatePerSec)
- .job(r));
- }
-
- /**
- * @deprecated since 0.9.0; use {@link #measure(PerformanceTestDescriptor)}
- */
- @Deprecated
- protected void measureAndAssert(String prefix, int numIterations, double minRatePerSec, Runnable r, CountDownLatch completionLatch) {
- measure(PerformanceTestDescriptor.create()
- .summary(prefix)
- .iterations(numIterations)
- .completionLatch(completionLatch)
- .minAcceptablePerSecond(minRatePerSec)
- .job(r));
- }
-
- /**
- * @deprecated since 0.9.0; use {@link #measure(PerformanceTestDescriptor)}
- */
- @Deprecated
- protected void measureAndAssert(String prefix, int numIterations, double minRatePerSec, Runnable r, Runnable postIterationPhase) {
- long durationMillis = measure(prefix, numIterations, r);
- long postIterationDurationMillis = (postIterationPhase != null) ? measure(postIterationPhase) : 0;
-
- double numPerSec = ((double)numIterations/durationMillis * 1000);
- double numPerSecIncludingPostIteration = ((double)numIterations/(durationMillis+postIterationDurationMillis) * 1000);
-
- String msg1 = prefix+": "+durationMillis+"ms for "+numIterations+" iterations"+
- (postIterationPhase != null ? "(+"+postIterationDurationMillis+"ms for post-iteration phase)" : "")+
- ": numPerSec="+numPerSec+"; minAcceptableRate="+minRatePerSec;
- String msg2 = (postIterationPhase != null ? " (or "+numPerSecIncludingPostIteration+" per sec including post-iteration phase time)" : "");
-
- LOG.info(msg1+msg2);
- System.out.println("\n"+msg1+"\n"+msg2+"\n"); //make it easier to see in the console in eclipse :)
- assertTrue(numPerSecIncludingPostIteration >= minRatePerSec, msg1+msg2);
- }
-
- /**
- * @deprecated since 0.9.0; use {@link #measure(PerformanceTestDescriptor)}
- */
- @Deprecated
- protected long measure(String prefix, int numIterations, Runnable r) {
- final int logInterval = 5*1000;
- long nextLogTime = logInterval;
-
- // Give it some warm-up cycles
- Stopwatch warmupWatch = Stopwatch.createStarted();
- for (int i = 0; i < (numIterations/10); i++) {
- if (warmupWatch.elapsed(TimeUnit.MILLISECONDS) >= nextLogTime) {
- LOG.info("Warm-up "+prefix+" iteration="+i+" at "+warmupWatch.elapsed(TimeUnit.MILLISECONDS)+"ms");
- nextLogTime += logInterval;
- }
- r.run();
- }
-
- Stopwatch stopwatch = Stopwatch.createStarted();
- nextLogTime = 0;
- for (int i = 0; i < numIterations; i++) {
- if (stopwatch.elapsed(TimeUnit.MILLISECONDS) >= nextLogTime) {
- LOG.info(prefix+" iteration="+i+" at "+stopwatch.elapsed(TimeUnit.MILLISECONDS)+"ms");
- nextLogTime += logInterval;
- }
- r.run();
- }
- return stopwatch.elapsed(TimeUnit.MILLISECONDS);
- }
-
- /**
- * @deprecated since 0.9.0; use {@link #measure(PerformanceTestDescriptor)}
- */
- @Deprecated
- protected long measure(Runnable r) {
- Stopwatch stopwatch = Stopwatch.createStarted();
- r.run();
- return stopwatch.elapsed(TimeUnit.MILLISECONDS);
- }
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedTest.java b/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedTest.java
index af66e45..d22dbf0 100644
--- a/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedTest.java
+++ b/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedTest.java
@@ -26,7 +26,6 @@ import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.concurrent.Callable;
-import org.apache.brooklyn.api.entity.EntityLocal;
import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.sensor.AttributeSensor;
@@ -79,7 +78,7 @@ public class HttpFeedTest extends BrooklynAppUnitTestSupport {
protected URL baseUrl;
protected Location loc;
- protected EntityLocal entity;
+ protected TestEntity entity;
protected HttpFeed feed;
@BeforeMethod(alwaysRun=true)
@@ -131,12 +130,12 @@ public class HttpFeedTest extends BrooklynAppUnitTestSupport {
@Test
public void testFeedDeDupe() throws Exception {
testPollsAndParsesHttpGetResponse();
- entity.addFeed(feed);
+ entity.feeds().add(feed);
log.info("Feed 0 is: "+feed);
testPollsAndParsesHttpGetResponse();
log.info("Feed 1 is: "+feed);
- entity.addFeed(feed);
+ entity.feeds().add(feed);
FeedSupport feeds = ((EntityInternal)entity).feeds();
Assert.assertEquals(feeds.getFeeds().size(), 1, "Wrong feed count: "+feeds.getFeeds());
@@ -300,8 +299,7 @@ public class HttpFeedTest extends BrooklynAppUnitTestSupport {
.onSuccess(HttpValueFunctions.stringContentsFunction()))
.suspended()
.build();
- Asserts.continually(MutableMap.of("timeout", 500),
- Entities.attributeSupplier(entity, SENSOR_INT), Predicates.<Integer>equalTo(null));
+ Asserts.continually(Entities.attributeSupplier(entity, SENSOR_INT), Predicates.<Integer>equalTo(null), Duration.millis(500), null, null);
int countWhenSuspended = server.getRequestCount();
feed.resume();
Asserts.eventually(Entities.attributeSupplier(entity, SENSOR_INT), Predicates.<Integer>equalTo(200));
@@ -360,7 +358,7 @@ public class HttpFeedTest extends BrooklynAppUnitTestSupport {
assertSensorEventually(SENSOR_INT, -1, TIMEOUT_MS);
assertSensorEventually(SENSOR_STRING, null, TIMEOUT_MS);
- List<String> attrs = Lists.transform(MutableList.copyOf( ((EntityInternal)entity).getAllAttributes().keySet() ),
+ List<String> attrs = Lists.transform(MutableList.copyOf( ((EntityInternal)entity).sensors().getAll().keySet() ),
new Function<AttributeSensor,String>() {
@Override public String apply(AttributeSensor input) { return input.getName(); } });
Assert.assertTrue(!attrs.contains(SENSOR_STRING.getName()), "attrs contained "+SENSOR_STRING);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java b/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java
index 7a407cf..b4ace3a 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java
@@ -370,11 +370,6 @@ public class FlagUtilsTest {
return config().get(key);
}
- @Override
- public <T> T setConfig(ConfigKey<T> key, T val) {
- return config().set(key, val);
- }
-
private class BasicConfigurationSupport implements ConfigurationSupport {
@Override
public <T> T get(ConfigKey<T> key) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java
index 9361d7a..b9e5e1c 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java
@@ -246,9 +246,6 @@ public class RecordingSshTool implements SshTool {
@Override public void connect() {
connected = true;
}
- @Override public void connect(int maxAttempts) {
- connected = true;
- }
@Override public void disconnect() {
connected = false;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java
----------------------------------------------------------------------
diff --git a/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java b/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java
index 3c874f8..ed8c93b 100644
--- a/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java
+++ b/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java
@@ -121,7 +121,7 @@ public class BrooklynEntityMirrorIntegrationTest {
EntityAsserts.assertAttributeEqualsEventually(mirror, TestApplication.MY_ATTRIBUTE, "austria");
EntityAsserts.assertAttributeEqualsEventually(mirror, BrooklynEntityMirror.MIRROR_CATALOG_ITEM_ID, catalogItemId);
assertTrue(mirror.getAttribute(BrooklynEntityMirror.MIRROR_SUMMARY) != null, "entity summary is null");
- log.info("Sensors mirrored are: "+((EntityInternal)mirror).getAllAttributes());
+ log.info("Sensors mirrored are: "+((EntityInternal)mirror).sensors().getAll());
serverApp.sensors().set(TestApplication.MY_ATTRIBUTE, "bermuda");
serverApp.setCatalogItemId(catalogItemIdGA);
@@ -157,7 +157,7 @@ public class BrooklynEntityMirrorIntegrationTest {
);
EntityAsserts.assertAttributeEqualsEventually(mirror, TestApplication.MY_ATTRIBUTE, "austria");
- log.info("Sensors mirrored are: "+((EntityInternal)mirror).getAllAttributes());
+ log.info("Sensors mirrored are: "+((EntityInternal)mirror).sensors().getAll());
serverApp.sensors().set(TestApplication.MY_ATTRIBUTE, "bermuda");
EntityAsserts.assertAttributeEqualsEventually(mirror, TestApplication.MY_ATTRIBUTE, "bermuda");
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BlobStoreContextFactoryImpl.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BlobStoreContextFactoryImpl.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BlobStoreContextFactoryImpl.java
index 4885935..5b4b957 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BlobStoreContextFactoryImpl.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BlobStoreContextFactoryImpl.java
@@ -27,9 +27,9 @@ import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.core.config.Sanitizer;
import org.apache.brooklyn.core.location.LocationConfigKeys;
import org.apache.brooklyn.core.location.cloud.CloudLocationConfig;
+import org.apache.brooklyn.core.location.internal.LocationInternal;
import org.apache.brooklyn.core.mgmt.persist.DeserializingJcloudsRenamesProvider;
import org.apache.brooklyn.util.collections.MutableList;
-import org.apache.brooklyn.util.core.config.ConfigBag;
import org.jclouds.Constants;
import org.jclouds.ContextBuilder;
import org.jclouds.blobstore.BlobStoreContext;
@@ -88,7 +88,7 @@ public class BlobStoreContextFactoryImpl implements BlobStoreContextFactory {
overrides.setProperty(Constants.PROPERTY_STRIP_EXPECT_HEADER, "true");
// Add extra jclouds-specific configuration
- Map<String, Object> extra = Maps.filterKeys(location.getAllConfig(true), Predicates.containsPattern("^jclouds\\."));
+ Map<String, Object> extra = Maps.filterKeys(((LocationInternal)location).config().getBag().getAllConfig(), Predicates.containsPattern("^jclouds\\."));
if (extra.size() > 0) {
LOG.debug("Configuring custom jclouds property overrides for {}: {}", provider, Sanitizer.sanitize(extra));
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java
index e00c41a..701528a 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java
@@ -258,9 +258,10 @@ public class BrooklynImageChooser implements Cloneable {
return new OrderingScoredWithoutDefaults(this);
}
- /** @deprecated since 0.7.0 kept in case persisted */
+ /** @deprecated since 0.7.0; kept for persisted state backwards compatibility */
@Deprecated
- public Ordering<Image> orderingScoredWithoutDefaultsDeprecated() {
+ @SuppressWarnings("unused")
+ private Ordering<Image> orderingScoredWithoutDefaultsDeprecated() {
return new Ordering<Image>() {
@Override
public int compare(Image left, Image right) {
@@ -309,9 +310,10 @@ public class BrooklynImageChooser implements Cloneable {
return new OrderingWithDefaults(primaryOrdering);
}
- /** @deprecated since 0.7.0 kept in case persisted */
+ /** @deprecated since 0.7.0; kept for persisted state backwards compatibility */
@Deprecated
- public static Ordering<Image> orderingWithDefaultsDeprecated(final Ordering<Image> primaryOrdering) {
+ @SuppressWarnings("unused")
+ private static Ordering<Image> orderingWithDefaultsDeprecated(final Ordering<Image> primaryOrdering) {
return new Ordering<Image>() {
@Override
public int compare(Image left, Image right) {
@@ -392,9 +394,10 @@ public class BrooklynImageChooser implements Cloneable {
return new ImageChooserFromOrdering(orderings);
}
- /** @deprecated since 0.7.0 kept in case persisted */
+ /** @deprecated since 0.7.0; kept for persisted state backwards compatibility */
@Deprecated
- public static Function<Iterable<? extends Image>, Image> imageChooserFromOrderingDeprecated(final Ordering<Image> ordering) {
+ @SuppressWarnings("unused")
+ private static Function<Iterable<? extends Image>, Image> imageChooserFromOrderingDeprecated(final Ordering<Image> ordering) {
return new Function<Iterable<? extends Image>, Image>() {
@Override
public Image apply(Iterable<? extends Image> input) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
index 450ba79..39ccc52 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
@@ -1251,7 +1251,6 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
/** properties which cause customization of the TemplateOptions */
public static final Map<ConfigKey<?>, ? extends TemplateOptionCustomizer>SUPPORTED_TEMPLATE_OPTIONS_PROPERTIES = ImmutableMap.<ConfigKey<?>, TemplateOptionCustomizer>builder()
.put(AUTO_ASSIGN_FLOATING_IP, TemplateOptionCustomizers.autoAssignFloatingIp())
- .put(AUTO_CREATE_FLOATING_IPS, TemplateOptionCustomizers.autoCreateFloatingIps())
.put(AUTO_GENERATE_KEYPAIRS, TemplateOptionCustomizers.autoGenerateKeypairs())
.put(DOMAIN_NAME, TemplateOptionCustomizers.domainName())
.put(EXTRA_PUBLIC_KEY_DATA_TO_AUTH, TemplateOptionCustomizers.extraPublicKeyDataToAuth())
@@ -1266,7 +1265,6 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
.put(SECURITY_GROUPS, TemplateOptionCustomizers.securityGroups())
.put(STRING_TAGS, TemplateOptionCustomizers.stringTags())
.put(TEMPLATE_OPTIONS, TemplateOptionCustomizers.templateOptions())
- .put(USER_DATA_UUENCODED, TemplateOptionCustomizers.userDataUuencoded())
.put(USER_METADATA_MAP, TemplateOptionCustomizers.userMetadataMap())
.put(USER_METADATA_STRING, TemplateOptionCustomizers.userMetadataString())
.build();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java
index fc93745..83cfc2e 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java
@@ -20,7 +20,6 @@ package org.apache.brooklyn.location.jclouds;
import org.apache.brooklyn.location.jclouds.api.JcloudsMachineLocationPublic;
import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.domain.Template;
import com.google.common.base.Optional;
@@ -40,12 +39,4 @@ public interface JcloudsMachineLocation extends JcloudsMachineLocationPublic {
*/
@Deprecated
public NodeMetadata getNode();
-
- /**
- * @deprecated since 0.9.0; instead use {@link #getOptionalNode()}. After rebind, the node will not
- * be available if the VM is no longer running.
- */
- @Deprecated
- public Template getTemplate();
-
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPredicates.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPredicates.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPredicates.java
index 3143e59..e68382a 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPredicates.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPredicates.java
@@ -29,12 +29,7 @@ public class JcloudsPredicates {
return new NodeInLocation(regionId, matchNullLocations);
}
- /**
- * @deprecated since 0.9.0; direct access strongly discouraged; will be made protected in future release;
- * use {@link JcloudsPredicates#nodeInLocation(String, boolean)}
- */
- @Deprecated
- public static class NodeInLocation implements Predicate<ComputeMetadata> {
+ private static class NodeInLocation implements Predicate<ComputeMetadata> {
private final String regionId;
private final boolean matchNullLocations;
public NodeInLocation(String regionId, boolean matchNullLocations) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
index 82b873a..26c37ad 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
@@ -300,23 +300,6 @@ public class JcloudsSshMachineLocation extends SshMachineLocation implements Jcl
return _node;
}
- /**
- * @deprecated since 0.9.0
- */
- @Override
- @Deprecated
- public Template getTemplate() {
- Optional<Template> result = getOptionalTemplate();
- if (result.isPresent()) {
- String msg = "Deprecated use of getTemplate() for "+this;
- LOG.warn(msg + " - see debug log for stacktrace");
- LOG.debug(msg, new Exception("for stacktrace"));
- return result.get();
- } else {
- throw new IllegalStateException("Template for "+nodeId+" (in "+getParent()+") not cached (deprecated use of getTemplate())");
- }
- }
-
@Override
public JcloudsLocation getParent() {
return jcloudsParent;
@@ -437,67 +420,6 @@ public class JcloudsSshMachineLocation extends SshMachineLocation implements Jcl
return imageId;
}
- /** executes the given statements on the server using jclouds ScriptBuilder,
- * wrapping in a script which is polled periodically.
- * the output is returned once the script completes (disadvantage compared to other methods)
- * but the process is nohupped and the SSH session is not kept,
- * so very useful for long-running processes
- *
- * @deprecated since 0.9.0; use standard {@link #execScript(String, List)} and the other variants.
- */
- @Deprecated
- public ListenableFuture<ExecResponse> submitRunScript(String ...statements) {
- return submitRunScript(new InterpretableStatement(statements));
- }
-
- /**
- * @deprecated since 0.9.0; use standard {@link #execScript(String, List)} and the other variants.
- */
- @Deprecated
- public ListenableFuture<ExecResponse> submitRunScript(Statement script) {
- return submitRunScript(script, new RunScriptOptions());
- }
-
- /**
- * @deprecated since 0.9.0; use standard {@link #execScript(String, List)} and the other variants.
- */
- @Deprecated
- public ListenableFuture<ExecResponse> submitRunScript(Statement script, RunScriptOptions options) {
- JcloudsLocation jcloudsParent = getParent();
- Optional<NodeMetadata> node = getOptionalNode();
-
- if (!node.isPresent()) {
- throw new IllegalStateException("Node "+nodeId+" not present in "+jcloudsParent);
- }
- if (jcloudsParent == null) {
- throw new IllegalStateException("No jclouds parent location for "+this+"; cannot retrieve jclouds script-runner");
- }
-
- ComputeServiceContext context = jcloudsParent.getComputeService().getContext();
- RunScriptOnNode.Factory runScriptFactory = context.utils().injector().getInstance(RunScriptOnNode.Factory.class);
-
- return runScriptFactory.submit(node.get(), script, options);
- }
-
- /**
- * Uses submitRunScript to execute the commands, and throws error if it fails or returns non-zero
- *
- * @deprecated since 0.9.0; use standard {@link #execScript(String, List)} and the other variants.
- */
- @Deprecated
- public void execRemoteScript(String ...commands) {
- try {
- ExecResponse result = submitRunScript(commands).get();
- if (result.getExitStatus()!=0)
- throw new IllegalStateException("Error running remote commands (code "+result.getExitStatus()+"): "+commands);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
- } catch (ExecutionException e) {
- throw Throwables.propagate(e);
- }
- }
-
/**
* Retrieves the password for this VM, if one exists. The behaviour/implementation is different for different clouds.
* e.g. on Rackspace, the password for a windows VM is available immediately; on AWS-EC2, for a Windows VM you need
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java
index d491791..003b38a 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java
@@ -210,23 +210,6 @@ public class JcloudsWinRmMachineLocation extends WinRmMachineLocation implements
}
}
- /**
- * @deprecated since 0.9.0
- */
- @Override
- @Deprecated
- public Template getTemplate() {
- Optional<Template> result = getOptionalTemplate();
- if (result.isPresent()) {
- String msg = "Deprecated use of getTemplate() for "+this;
- LOG.warn(msg + " - see debug log for stacktrace");
- LOG.debug(msg, new Exception("for stacktrace"));
- return result.get();
- } else {
- throw new IllegalStateException("Template for "+nodeId+" (in "+getParent()+") not cached (deprecated use of getTemplate())");
- }
- }
-
@Override
public String getHostname() {
if (hostname != null) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/api/JcloudsLocationConfigPublic.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/api/JcloudsLocationConfigPublic.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/api/JcloudsLocationConfigPublic.java
index 8c9a3c4..caadf94 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/api/JcloudsLocationConfigPublic.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/api/JcloudsLocationConfigPublic.java
@@ -65,10 +65,6 @@ public interface JcloudsLocationConfigPublic extends CloudLocationConfig {
public static final ConfigKey<Boolean> AUTO_GENERATE_KEYPAIRS = ConfigKeys.newBooleanConfigKey("jclouds.openstack-nova.auto-generate-keypairs",
"Whether to generate keypairs automatically (OpenStack Nova)");
- /** @deprecated since 0.9.0 Use {@link #AUTO_ASSIGN_FLOATING_IP} instead (deprecated in 0.7.0 but warning not given until 0.9.0) */
- @Deprecated
- public static final ConfigKey<Boolean> AUTO_CREATE_FLOATING_IPS = ConfigKeys.newBooleanConfigKey("jclouds.openstack-nova.auto-create-floating-ips",
- "Whether to generate floating ips for Nova");
public static final ConfigKey<Boolean> AUTO_ASSIGN_FLOATING_IP = ConfigKeys.newBooleanConfigKey("autoAssignFloatingIp",
"Whether to generate floating ips (in Nova paralance), or elastic IPs (in CloudStack parlance)");
@@ -141,25 +137,14 @@ public interface JcloudsLocationConfigPublic extends CloudLocationConfig {
public static final ConfigKey<String> USER_METADATA_STRING = ConfigKeys.newStringConfigKey("userMetadataString",
"Arbitrary user data, as a single string, on supported clouds (AWS)", null);
- @Deprecated /** @deprecated since 0.7.0 even AWS (the only one where this was supported) does not seem to want this uuencoded;
- use #USER_METADATA_STRING */
- public static final ConfigKey<String> USER_DATA_UUENCODED = ConfigKeys.newStringConfigKey("userData",
- "Arbitrary user data, as a single string in uuencoded format, on supported clouds (AWS)", null);
-
public static final ConfigKey<Object> STRING_TAGS = new BasicConfigKey<Object>(Object.class, "tags",
"Tags to be applied when creating a VM, on supported clouds " +
"(either a single tag as a String, or an Iterable<String> or String[];" +
"note this is not key-value pairs (e.g. what AWS calls 'tags'), for that see userMetadata)", null);
- @Deprecated /** @deprecated since 0.7.0 use #STRING_TAGS */
- public static final ConfigKey<Object> TAGS = STRING_TAGS;
-
public static final ConfigKey<Object> USER_METADATA_MAP = new BasicConfigKey<Object>(Object.class, "userMetadata",
"Arbitrary user metadata, as a map (or String of comma-separated key=value pairs), on supported clouds; " +
"note often values cannot be null", null);
- @Deprecated /** @deprecated since 0.7.0 use #USER_METADATA_MAP */
- public static final ConfigKey<Object> USER_METADATA = USER_METADATA_MAP;
-
public static final ConfigKey<Boolean> INCLUDE_BROOKLYN_USER_METADATA = ConfigKeys.newBooleanConfigKey("includeBrooklynUserMetadata",
"Whether to set metadata about the context of a machine, e.g. brooklyn-entity-id, brooklyn-app-name (default true)", true);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/AutoCreateFloatingIpsOption.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/AutoCreateFloatingIpsOption.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/AutoCreateFloatingIpsOption.java
deleted file mode 100644
index 96590c8..0000000
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/AutoCreateFloatingIpsOption.java
+++ /dev/null
@@ -1,42 +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.brooklyn.location.jclouds.templates.customize;
-
-import org.apache.brooklyn.location.jclouds.JcloudsLocationConfig;
-import org.apache.brooklyn.util.core.config.ConfigBag;
-import org.jclouds.compute.options.TemplateOptions;
-import org.jclouds.openstack.nova.v2_0.compute.options.NovaTemplateOptions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class AutoCreateFloatingIpsOption implements TemplateOptionCustomizer {
-
- private static final Logger LOG = LoggerFactory.getLogger(AutoCreateFloatingIpsOption.class);
-
- @Override
- public void apply(TemplateOptions t, ConfigBag props, Object v) {
- LOG.warn("Using deprecated " + JcloudsLocationConfig.AUTO_CREATE_FLOATING_IPS + "; use " + JcloudsLocationConfig.AUTO_ASSIGN_FLOATING_IP + " instead");
- if (t instanceof NovaTemplateOptions) {
- ((NovaTemplateOptions) t).autoAssignFloatingIp((Boolean) v);
- } else {
- LOG.info("ignoring auto-generate-floating-ips({}) in VM creation because not supported for cloud/type ({})", v, t);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/TemplateOptionCustomizers.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/TemplateOptionCustomizers.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/TemplateOptionCustomizers.java
index 3cc7807..2c08b18 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/TemplateOptionCustomizers.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/TemplateOptionCustomizers.java
@@ -28,10 +28,6 @@ public class TemplateOptionCustomizers {
return new AutoAssignFloatingIpOption();
}
- public static TemplateOptionCustomizer autoCreateFloatingIps() {
- return new AutoCreateFloatingIpsOption();
- }
-
public static TemplateOptionCustomizer autoGenerateKeypairs() {
return new AutoGenerateKeypairsOption();
}
@@ -88,10 +84,6 @@ public class TemplateOptionCustomizers {
return new TemplateOptionsOption();
}
- public static TemplateOptionCustomizer userDataUuencoded() {
- return new UserDataUuencodedOption();
- }
-
public static TemplateOptionCustomizer userMetadataMap() {
return new UserMetadataMapOption();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/UserDataUuencodedOption.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/UserDataUuencodedOption.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/UserDataUuencodedOption.java
deleted file mode 100644
index ee0075e..0000000
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/UserDataUuencodedOption.java
+++ /dev/null
@@ -1,54 +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.brooklyn.location.jclouds.templates.customize;
-
-import org.apache.brooklyn.util.core.config.ConfigBag;
-import org.apache.brooklyn.util.text.Strings;
-import org.jclouds.compute.options.TemplateOptions;
-import org.jclouds.ec2.compute.options.EC2TemplateOptions;
-import org.jclouds.softlayer.compute.options.SoftLayerTemplateOptions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class UserDataUuencodedOption implements TemplateOptionCustomizer {
- private static final Logger LOG = LoggerFactory.getLogger(UserDataUuencodedOption.class);
-
- @Override
- public void apply(TemplateOptions t, ConfigBag props, Object v) {
- if (t instanceof EC2TemplateOptions) {
- byte[] bytes = toByteArray(v);
- ((EC2TemplateOptions) t).userData(bytes);
- } else if (t instanceof SoftLayerTemplateOptions) {
- ((SoftLayerTemplateOptions) t).userData(Strings.toString(v));
- } else {
- LOG.info("ignoring userData({}) in VM creation because not supported for cloud/type ({})", v, t.getClass());
- }
- }
-
- private byte[] toByteArray(Object v) {
- if (v instanceof byte[]) {
- return (byte[]) v;
- } else if (v instanceof CharSequence) {
- return v.toString().getBytes();
- } else {
- throw new IllegalArgumentException("Invalid type for byte[]: " + v + " of type " + v.getClass());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java
index 53bc32d..8a12c1d 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java
@@ -120,7 +120,6 @@ public class JcloudsByonRebindLiveTest extends RebindTestFixtureWithApp {
JcloudsLocation origJcloudsLocation = origMachine.getParent();
String origHostname = origMachine.getHostname();
NodeMetadata origNode = origMachine.getNode();
- Template origTemplate = origMachine.getTemplate();
assertSshable(origMachine);
rebind();
@@ -131,7 +130,6 @@ public class JcloudsByonRebindLiveTest extends RebindTestFixtureWithApp {
JcloudsLocation newJcloudsLocation = newMachine.getParent();
String newHostname = newMachine.getHostname();
NodeMetadata newNode = newMachine.getNode();
- Template newTemplate = newMachine.getTemplate();
assertSshable(newMachine);
assertEquals(newHostname, origHostname);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsImageChoiceStubbedLiveTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsImageChoiceStubbedLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsImageChoiceStubbedLiveTest.java
index 3ce9dbd..6f4094b 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsImageChoiceStubbedLiveTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsImageChoiceStubbedLiveTest.java
@@ -88,7 +88,6 @@ public class JcloudsImageChoiceStubbedLiveTest extends AbstractJcloudsStubbedLiv
.put(JcloudsLocationConfig.SECURITY_GROUPS, null)
.put(JcloudsLocationConfig.INBOUND_PORTS, null)
.put(JcloudsLocationConfig.USER_METADATA_STRING, null)
- .put(JcloudsLocationConfig.USER_DATA_UUENCODED, null)
.put(JcloudsLocationConfig.STRING_TAGS, null)
.put(JcloudsLocationConfig.USER_METADATA_MAP, null)
.put(JcloudsLocationConfig.EXTRA_PUBLIC_KEY_DATA_TO_AUTH, null)
@@ -98,7 +97,6 @@ public class JcloudsImageChoiceStubbedLiveTest extends AbstractJcloudsStubbedLiv
.put(JcloudsLocationConfig.LOGIN_USER_PRIVATE_KEY_FILE, null)
.put(JcloudsLocationConfig.KEY_PAIR, null)
.put(JcloudsLocationConfig.AUTO_GENERATE_KEYPAIRS, null)
- .put(JcloudsLocationConfig.AUTO_CREATE_FLOATING_IPS, null)
.put(JcloudsLocationConfig.AUTO_ASSIGN_FLOATING_IP, null)
.put(JcloudsLocationConfig.NETWORK_NAME, null)
.put(JcloudsLocationConfig.DOMAIN_NAME, null)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
index 28d340a..371c8a3 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
@@ -249,7 +249,7 @@ public class JcloudsLocationResolverTest {
JcloudsLocation loc = resolve("myloc");
// Test relies on the computeService not being used! Not great, but good enough.
- Function<Iterable<? extends Image>, Image> chooser = loc.getImageChooser((ComputeService)null, loc.getLocalConfigBag());
+ Function<Iterable<? extends Image>, Image> chooser = loc.getImageChooser((ComputeService)null, loc.config().getLocalBag());
assertTrue(chooser instanceof MyFunction, "chooser="+chooser);
}
public static class MyFunction implements Function<Iterable<? extends Image>, Image> {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindLiveTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindLiveTest.java
index 1390608..9cbd9ac 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindLiveTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindLiveTest.java
@@ -136,9 +136,6 @@ public class JcloudsRebindLiveTest extends RebindTestFixtureWithApp {
JcloudsMachineLocation origMachine = obtainMachine(location, obtainFlags);
String origHostname = origMachine.getHostname();
NodeMetadata origNode = origMachine.getNode();
- if (origMachine instanceof JcloudsSshMachineLocation) {
- Template origTemplate = origMachine.getTemplate(); // WinRM machines don't bother with template!
- }
assertConnectable(origMachine);
rebind();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubTest.java
index f20a271..47d8912 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubTest.java
@@ -194,7 +194,6 @@ public class JcloudsRebindStubTest extends RebindTestFixtureWithApp {
String origHostname = origMachine.getHostname();
NodeMetadata origNode = origMachine.getNode();
- Template origTemplate = origMachine.getTemplate();
rebind();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubUnitTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubUnitTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubUnitTest.java
index 01cb558..5201932 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubUnitTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubUnitTest.java
@@ -155,7 +155,6 @@ public class JcloudsRebindStubUnitTest extends RebindTestFixtureWithApp {
String origHostname = origMachine.getHostname();
NodeMetadata origNode = origMachine.getNode();
- Template origTemplate = origMachine.getTemplate();
rebind();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/policy/src/main/java/org/apache/brooklyn/policy/enricher/HttpLatencyDetector.java
----------------------------------------------------------------------
diff --git a/policy/src/main/java/org/apache/brooklyn/policy/enricher/HttpLatencyDetector.java b/policy/src/main/java/org/apache/brooklyn/policy/enricher/HttpLatencyDetector.java
index 3e56c27..8d695d2 100644
--- a/policy/src/main/java/org/apache/brooklyn/policy/enricher/HttpLatencyDetector.java
+++ b/policy/src/main/java/org/apache/brooklyn/policy/enricher/HttpLatencyDetector.java
@@ -45,6 +45,7 @@ import org.apache.brooklyn.feed.http.HttpPollConfig;
import org.apache.brooklyn.feed.http.HttpValueFunctions;
import org.apache.brooklyn.util.collections.MutableMap;
import org.apache.brooklyn.util.core.flags.SetFromFlag;
+import org.apache.brooklyn.util.guava.Functionals;
import org.apache.brooklyn.util.javalang.AtomicReferences;
import org.apache.brooklyn.util.javalang.Boxing;
import org.apache.brooklyn.util.javalang.JavaClassNames;
@@ -122,9 +123,6 @@ public class HttpLatencyDetector extends AbstractEnricher implements Enricher {
startSubscriptions(entity);
activateAdditionalEnrichers(entity);
- if (log.isDebugEnabled())
- log.debug(""+this+" enabled="+computeEnablement()+" when attached, subscribing to "+getAllSubscriptions());
-
updateEnablement();
}
@@ -145,7 +143,7 @@ public class HttpLatencyDetector extends AbstractEnricher implements Enricher {
.period(getConfig(PERIOD))
.baseUri(Suppliers.compose(Urls.stringToUriFunction(), AtomicReferences.supplier(url)))
.poll(new HttpPollConfig<Double>(REQUEST_LATENCY_IN_SECONDS_MOST_RECENT)
- .onResult(MathFunctions.divide(HttpValueFunctions.latency(), 1000.0d))
+ .onResult(Functionals.chain(HttpValueFunctions.latency(), MathFunctions.divide(1000.0d)))
.setOnException(null))
.suspended()
.build();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/policy/src/main/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricher.java
----------------------------------------------------------------------
diff --git a/policy/src/main/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricher.java b/policy/src/main/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricher.java
index 6a023d8..16a1286 100644
--- a/policy/src/main/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricher.java
+++ b/policy/src/main/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricher.java
@@ -138,16 +138,6 @@ public class RollingTimeWindowMeanEnricher<T extends Number> extends AbstractTyp
}
}
- @Deprecated /** @deprecated since 0.7.0; not used except in groovy tests; use the 2-arg method */
- public ConfidenceQualifiedNumber getAverage() {
- return getAverage(System.currentTimeMillis(), 0);
- }
-
- @Deprecated /** @deprecated since 0.7.0; not used except in groovy tests; use the 2-arg method */
- public ConfidenceQualifiedNumber getAverage(long fromTimeExact) {
- return getAverage(fromTimeExact, 0);
- }
-
public ConfidenceQualifiedNumber getAverage(long fromTime, long graceAllowed) {
if (timestamps.isEmpty()) {
return lastAverage = new ConfidenceQualifiedNumber(lastAverage.value, 0.0d);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/policy/src/test/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricherTest.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricherTest.java b/policy/src/test/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricherTest.java
index e911fe4..8af6d65 100644
--- a/policy/src/test/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricherTest.java
+++ b/policy/src/test/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricherTest.java
@@ -29,11 +29,9 @@ import org.apache.brooklyn.core.sensor.BasicAttributeSensor;
import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
import org.apache.brooklyn.core.test.entity.TestEntity;
import org.apache.brooklyn.policy.enricher.RollingTimeWindowMeanEnricher.ConfidenceQualifiedNumber;
-import org.apache.brooklyn.util.time.Duration;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-@SuppressWarnings("deprecation")
public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSupport {
Entity producer;
@@ -71,7 +69,7 @@ public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSuppor
@Test
public void testDefaultAverageWhenEmpty() {
- average = averager.getAverage(0);
+ average = averager.getAverage(0, 0);
assertEquals(average.value, 0d);
assertEquals(average.confidence, 0.0d);
}
@@ -79,7 +77,7 @@ public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSuppor
@Test
public void testNoRecentValuesAverage() {
averager.onEvent(intSensor.newEvent(producer, 10), 0L);
- average = averager.getAverage(timePeriod+1000);
+ average = averager.getAverage(timePeriod+1000, 0);
assertEquals(average.value, 10d);
assertEquals(average.confidence, 0d);
}
@@ -88,7 +86,7 @@ public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSuppor
public void testNoRecentValuesUsesLastForAverage() {
averager.onEvent(intSensor.newEvent(producer, 10), 0L);
averager.onEvent(intSensor.newEvent(producer, 20), 10L);
- average = averager.getAverage(timePeriod+1000);
+ average = averager.getAverage(timePeriod+1000, 0);
assertEquals(average.value, 20d);
assertEquals(average.confidence, 0d);
}
@@ -96,7 +94,7 @@ public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSuppor
@Test
public void testSingleValueTimeAverage() {
averager.onEvent(intSensor.newEvent(producer, 10), 1000);
- average = averager.getAverage(1000);
+ average = averager.getAverage(1000, 0);
assertEquals(average.confidence, 0d);
}
@@ -104,7 +102,7 @@ public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSuppor
public void testTwoValueAverageForPeriod() {
averager.onEvent(intSensor.newEvent(producer, 10), 1000);
averager.onEvent(intSensor.newEvent(producer, 10), 2000);
- average = averager.getAverage(2000);
+ average = averager.getAverage(2000, 0);
assertEquals(average.value, 10 /1d);
assertEquals(average.confidence, 1d);
}
@@ -116,7 +114,7 @@ public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSuppor
averager.onEvent(intSensor.newEvent(producer, 30), 1500);
averager.onEvent(intSensor.newEvent(producer, 40), 1750);
averager.onEvent(intSensor.newEvent(producer, 50), 2000);
- average = averager.getAverage(2000);
+ average = averager.getAverage(2000, 0);
assertEquals(average.value, (20+30+40+50)/4d);
assertEquals(average.confidence, 1d);
}
@@ -128,7 +126,7 @@ public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSuppor
averager.onEvent(intSensor.newEvent(producer, 30), 1300);
averager.onEvent(intSensor.newEvent(producer, 40), 1600);
averager.onEvent(intSensor.newEvent(producer, 50), 2000);
- average = averager.getAverage(2000);
+ average = averager.getAverage(2000, 0);
assertEquals(average.value, (20*0.1d)+(30*0.2d)+(40*0.3d)+(50*0.4d));
assertEquals(average.confidence, 1d);
}
@@ -141,16 +139,16 @@ public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSuppor
averager.onEvent(intSensor.newEvent(producer, 40), 1750);
averager.onEvent(intSensor.newEvent(producer, 50), 2000);
- average = averager.getAverage(2250);
+ average = averager.getAverage(2250, 0);
assertEquals(average.value, (30+40+50)/3d);
assertEquals(average.confidence, 0.75d);
- average = averager.getAverage(2500);
+ average = averager.getAverage(2500, 0);
assertEquals(average.value, (40+50)/2d);
assertEquals(average.confidence, 0.5d);
- average = averager.getAverage(2750);
+ average = averager.getAverage(2750, 0);
assertEquals(average.value, 50d);
assertEquals(average.confidence, 0.25d);
- average = averager.getAverage(3000);
+ average = averager.getAverage(3000, 0);
assertEquals(average.value, 50d);
assertEquals(average.confidence, 0d);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
index ba2c519..de76cb1 100644
--- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
+++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
@@ -28,7 +28,6 @@ import java.util.concurrent.locks.ReentrantLock;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.location.Location;
-import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.core.entity.Attributes;
import org.apache.brooklyn.entity.group.AbstractGroupImpl;
import org.apache.brooklyn.util.collections.MutableList;
@@ -54,13 +53,6 @@ public class MockContainerEntityImpl extends AbstractGroupImpl implements MockCo
ReentrantLock _lock = new ReentrantLock();
@Override
- @Deprecated
- public <T> T setAttribute(AttributeSensor<T> attribute, T val) {
- if (LOG.isDebugEnabled()) LOG.debug("Mocks: container {} setting {} to {}", new Object[] {this, attribute, val});
- return super.sensors().set(attribute, val);
- }
-
- @Override
public void lock() {
_lock.lock();
if (!running) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java
index e0c960d..7166cf5 100644
--- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java
+++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java
@@ -25,7 +25,6 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.brooklyn.api.entity.Entity;
-import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.core.entity.AbstractEntity;
import org.apache.brooklyn.core.entity.Entities;
import org.apache.brooklyn.util.collections.MutableList;
@@ -57,12 +56,6 @@ public class MockItemEntityImpl extends AbstractEntity implements MockItemEntity
}
@Override
- public <T> T setAttribute(AttributeSensor<T> attribute, T val) {
- if (LOG.isDebugEnabled()) LOG.debug("Mocks: item {} setting {} to {}", new Object[] {this, attribute, val});
- return super.sensors().set(attribute, val);
- }
-
- @Override
public void move(Entity destination) {
totalMoveCount.incrementAndGet();
lastMoveTime.set(System.currentTimeMillis());
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApiError.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApiError.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApiError.java
index a2a1834..be72f07 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApiError.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApiError.java
@@ -50,12 +50,6 @@ public class ApiError implements Serializable {
return builder().message(message).build();
}
- /** @deprecated since 0.7.0; use {@link #builderFromThrowable(Throwable)} */
- @Deprecated
- public static Builder fromThrowable(Throwable t) {
- return builderFromThrowable(t);
- }
-
/**
* @return An {@link ApiError.Builder} whose message is initialised to either the throwable's
* message or the throwable's class name if the message is null and whose details are
@@ -120,12 +114,6 @@ public class ApiError implements Serializable {
return new ApiError(message, details, data, errorCode);
}
- /** @deprecated since 0.7.0; use {@link #copy(ApiError)} */
- @Deprecated
- public Builder fromApiError(ApiError error) {
- return copy(error);
- }
-
public Builder copy(ApiError error) {
return this
.message(error.message)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
index e3b0e95..6064572 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
@@ -169,20 +169,6 @@ public class TaskSummary implements HasId, Serializable {
return result;
}
- /** @deprecated since 0.7.0 use {@link #isError} instead. */
- @Deprecated
- @JsonIgnore
- public boolean getIsError() {
- return isError;
- }
-
- /** @deprecated since 0.7.0 use {@link #isCancelled} instead. */
- @Deprecated
- @JsonIgnore
- public boolean getIsCancelled() {
- return isCancelled;
- }
-
public boolean isError() {
return isError;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java
index 2971378..28eac1c 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java
@@ -112,12 +112,6 @@ public class HaHotCheckResourceFilter implements ContainerRequestFilter {
return null;
}
- /** @deprecated since 0.9.0 use {@link BrooklynRestResourceUtils#getProblemMessageIfServerNotRunning(ManagementContext)} */
- @Deprecated
- public static String lookForProblemIfServerNotRunning(ManagementContext mgmt) {
- return HaHotCheckHelperAbstract.getProblemMessageIfServerNotRunning(mgmt).orNull();
- }
-
private boolean isMaster() {
return ManagementNodeState.MASTER.equals(
mgmt.getContext(ManagementContext.class)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
index 3f33643..04761a5 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
@@ -91,11 +91,6 @@ public abstract class AbstractBrooklynRestResource {
return mapper;
}
- /** @deprecated since 0.7.0 use {@link #getValueForDisplay(Object, boolean, boolean, Boolean, EntityLocal, Duration)} */ @Deprecated
- protected Object getValueForDisplay(Object value, boolean preferJson, boolean isJerseyReturnValue) {
- return resolving(value).preferJson(preferJson).asJerseyOutermostReturnValue(isJerseyReturnValue).resolve();
- }
-
protected RestValueResolver resolving(Object v) {
return resolving(v, mgmt());
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java
index 052114a..0b28c2f 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java
@@ -123,12 +123,6 @@ public class LocationResource extends AbstractBrooklynRestResource implements Lo
return result;
}
- /** @deprecated since 0.7.0; REST call now handled by below (optional query parameter added) */
- @Deprecated
- public LocationSummary get(String locationId) {
- return get(locationId, false);
- }
-
@Override
public LocationSummary get(String locationId, String fullConfig) {
return get(locationId, Boolean.valueOf(fullConfig));
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java
index 430cbbe..26385ec 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java
@@ -55,12 +55,6 @@ public class LocationTransformer {
public static enum LocationDetailLevel { NONE, LOCAL_EXCLUDING_SECRET, FULL_EXCLUDING_SECRET, FULL_INCLUDING_SECRET }
- /** @deprecated since 0.7.0 use method taking management context and detail specifier */
- @Deprecated
- public static LocationSummary newInstance(String id, org.apache.brooklyn.rest.domain.LocationSpec locationSpec, UriBuilder ub) {
- return newInstance(null, id, locationSpec, LocationDetailLevel.LOCAL_EXCLUDING_SECRET, ub);
- }
-
private static LocationSummary newInstance(ManagementContext mgmt,
LocationSpec<? extends Location> spec, ConfigBag explicitConfig,
String optionalExplicitId, String name, String specString,
@@ -111,12 +105,6 @@ public class LocationTransformer {
return newInstance(mgmt, ld, level, ub);
}
- /** @deprecated since 0.7.0 use method taking management context and detail specifier */
- @Deprecated
- public static LocationSummary newInstance(LocationDefinition l, UriBuilder ub) {
- return newInstance(null, l, LocationDetailLevel.LOCAL_EXCLUDING_SECRET, ub);
- }
-
public static LocationSummary newInstance(ManagementContext mgmt, LocationDefinition ld, LocationDetailLevel level, UriBuilder ub) {
return newInstance(mgmt, mgmt.getLocationRegistry().getLocationSpec(ld).orNull(), ConfigBag.newInstance(ld.getConfig()),
ld.getId(), ld.getName(), ld.getSpec(), level, ub);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/ShutdownHandler.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/ShutdownHandler.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/ShutdownHandler.java
deleted file mode 100644
index d959ca0..0000000
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/ShutdownHandler.java
+++ /dev/null
@@ -1,26 +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.brooklyn.rest.util;
-
-/** @deprecated since 0.9.0, use {@link org.apache.brooklyn.core.mgmt.ShutdownHandler} instead. */
-@Deprecated
-public interface ShutdownHandler extends org.apache.brooklyn.core.mgmt.ShutdownHandler {
- @Override
- void onShutdownRequest();
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/URLParamEncoder.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/URLParamEncoder.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/URLParamEncoder.java
deleted file mode 100644
index 55ff4d3..0000000
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/URLParamEncoder.java
+++ /dev/null
@@ -1,28 +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.brooklyn.rest.util;
-
-
-/**
- * @deprecated since 0.7.0 use {@link org.apache.brooklyn.util.net.URLParamEncoder}
- */
-@Deprecated
-public class URLParamEncoder extends org.apache.brooklyn.util.net.URLParamEncoder {
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java
index bd7a740..8da72f8 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java
@@ -21,7 +21,6 @@ package org.apache.brooklyn.rest.util;
import java.io.IOException;
import java.util.Map;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
@@ -185,12 +184,6 @@ public class WebResourceUtils {
}
}
- /** @deprecated since 0.9.0, use {@link #applyJsonResponse(ManagementContext, Response, HttpServletResponse)} */
- @Deprecated
- public static void applyJsonResponse(ServletContext servletContext, Response source, HttpServletResponse target) throws IOException {
- applyJsonResponse(OsgiCompat.getManagementContext(servletContext), source, target);
- }
-
/** Sets the {@link HttpServletResponse} target (last argument) from the given source {@link Response};
* useful in filters where we might have a {@link Response} and need to set up an {@link HttpServletResponse}.
*/
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java
index 050fa4e..3dca3e9 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java
@@ -31,9 +31,7 @@ import javax.ws.rs.ext.Provider;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.config.ConfigKeys;
-import org.apache.brooklyn.core.internal.BrooklynProperties;
import org.apache.brooklyn.core.server.BrooklynServiceAttributes;
-import org.apache.brooklyn.rest.util.OsgiCompat;
import org.apache.brooklyn.util.core.json.BrooklynObjectsJsonMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -93,21 +91,6 @@ public class BrooklynJacksonJsonProvider extends JacksonJsonProvider implements
return mgmt.getContext(ManagementContext.class);
}
- /** @deprecated since 0.9.0, use {@link #findSharedObjectMapper(ManagementContext)} */
- @Deprecated
- public static ObjectMapper findSharedObjectMapper(ServletContext servletContext, ManagementContext mgmt) {
- return findSharedObjectMapper(getManagementContext(servletContext, mgmt));
- }
-
- @Deprecated
- private static ManagementContext getManagementContext(ServletContext servletContext, ManagementContext mgmt) {
- if (mgmt != null) {
- return mgmt;
- } else {
- return OsgiCompat.getManagementContext(servletContext);
- }
- }
-
/**
* Finds a shared {@link ObjectMapper} or makes a new one, stored against the servlet context;
* returns null if a shared instance cannot be created.
@@ -126,12 +109,6 @@ public class BrooklynJacksonJsonProvider extends JacksonJsonProvider implements
}
}
- /** @deprecated since 0.9.0, use {@link #findAnyObjectMapper(ManagementContext) */
- @Deprecated
- public static ObjectMapper findAnyObjectMapper(ServletContext servletContext, ManagementContext mgmt) {
- return findAnyObjectMapper(getManagementContext(servletContext, mgmt));
- }
-
/**
* Like {@link #findSharedObjectMapper(ServletContext, ManagementContext)} but will create a private
* ObjectMapper if it can, from the servlet context and/or the management context, or else fail
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java b/rest/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java
index 8b3a04b..f5089a1 100644
--- a/rest/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java
+++ b/rest/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java
@@ -60,15 +60,6 @@ public class BrooklynPropertiesSecurityFilter implements Filter {
*/
public static final String AUTHENTICATED_USER_SESSION_ATTRIBUTE = BrooklynLoginModule.AUTHENTICATED_USER_SESSION_ATTRIBUTE;
- /**
- * The session attribute set to indicate the remote address of the HTTP request.
- * Corresponds to {@link javax.servlet.http.HttpServletRequest#getRemoteAddr()}.
- *
- * @deprecated since 0.9.0, use {@link BrooklynWebConfig#REMOTE_ADDRESS_SESSION_ATTRIBUTE}
- */
- @Deprecated
- public static final String REMOTE_ADDRESS_SESSION_ATTRIBUTE = BrooklynWebConfig.REMOTE_ADDRESS_SESSION_ATTRIBUTE;
-
private static final Logger log = LoggerFactory.getLogger(BrooklynPropertiesSecurityFilter.class);
protected DelegatingSecurityProvider provider;
@@ -181,7 +172,7 @@ public class BrooklynPropertiesSecurityFilter implements Filter {
request.getSession().getAttribute(AUTHENTICATED_USER_SESSION_ATTRIBUTE), request.getSession().getId());
provider.logout(request.getSession());
request.getSession().removeAttribute(AUTHENTICATED_USER_SESSION_ATTRIBUTE);
- request.getSession().removeAttribute(REMOTE_ADDRESS_SESSION_ATTRIBUTE);
+ request.getSession().removeAttribute(BrooklynWebConfig.REMOTE_ADDRESS_SESSION_ATTRIBUTE);
request.getSession().invalidate();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
index 828727a..1ec89a4 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
@@ -117,12 +117,6 @@ public abstract class BrooklynRestApiLauncherTestFixture {
assertTrue(HttpAsserts.isHealthyStatusCode(response.getResponseCode()), "code="+response.getResponseCode()+"; reason="+response.getReasonPhrase());
}
- /** @deprecated since 0.9.0 use {@link #getBaseUriHostAndPost(Server)} or {@link #getBaseUriRest(Server)} */
- @Deprecated
- public static String getBaseUri(Server server) {
- return getBaseUriHostAndPost(server);
- }
-
protected String getBaseUriHostAndPost() {
return getBaseUriHostAndPost(server);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
index d6e3fce..df83086 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
@@ -497,7 +497,7 @@ public class BrooklynNodeImpl extends SoftwareProcessImpl implements BrooklynNod
.computing(Functionals.ifNotEquals(true).value("URL where Brooklyn listens is not answering correctly") )
.build());
- addEnricher(Enrichers.builder().transforming(WEB_CONSOLE_ACCESSIBLE)
+ enrichers().add(Enrichers.builder().transforming(WEB_CONSOLE_ACCESSIBLE)
.computing(Functions.identity())
.publishing(SERVICE_PROCESS_IS_RUNNING)
.build());
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaAppUtils.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaAppUtils.java b/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaAppUtils.java
index 0f44f3c..8aad550 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaAppUtils.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaAppUtils.java
@@ -222,12 +222,6 @@ public class JavaAppUtils {
return builder;
}
- /** @deprecated Since 0.7.0. Use {@link org.apache.brooklyn.util.math.MathFunctions#times(double)} instead */
- @Deprecated
- public static Function<Number, Double> times(final double x) {
- return MathFunctions.times(x);
- }
-
public static Function<CompositeData, MemoryUsage> compositeDataToMemoryUsage() {
return new Function<CompositeData, MemoryUsage>() {
@Override public MemoryUsage apply(CompositeData input) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java b/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
index 6a64c6c..28c12d6 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
@@ -333,14 +333,6 @@ public abstract class JavaSoftwareProcessSshDriver extends AbstractSoftwareProce
}
/**
- * @deprecated since 0.7.0; instead use {@link #getInstalledJavaVersion()}
- */
- @Deprecated
- protected Optional<String> getCurrentJavaVersion() {
- return getInstalledJavaVersion();
- }
-
- /**
* Checks for the version of Java installed on the entity's location over SSH.
* @return An Optional containing the version portion of `java -version`, or absent if no Java found.
*/
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java
index 11bb42d..4cf3ea2 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java
@@ -129,10 +129,4 @@ public class SameServerEntityImpl extends AbstractEntity implements SameServerEn
protected void doRestart(ConfigBag parameters) {
LIFECYCLE_TASKS.restart(parameters);
}
-
- @Deprecated /** @deprecated since 0.7.0 subclasses should instead override {@link #doRestart(ConfigBag)} */
- protected final void doRestart() {
- doRestart(ConfigBag.EMPTY);
- }
-
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxFeed.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxFeed.java b/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxFeed.java
index 2047144..4220d05 100644
--- a/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxFeed.java
+++ b/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxFeed.java
@@ -190,11 +190,11 @@ public class JmxFeed extends AbstractFeed {
super();
if (builder.helper != null) {
JmxHelper helper = builder.helper;
- setConfig(HELPER, helper);
- setConfig(OWN_HELPER, false);
- setConfig(JMX_URI, helper.getUrl());
+ config().set(HELPER, helper);
+ config().set(OWN_HELPER, false);
+ config().set(JMX_URI, helper.getUrl());
}
- setConfig(JMX_CONNECTION_TIMEOUT, builder.jmxConnectionTimeout);
+ config().set(JMX_CONNECTION_TIMEOUT, builder.jmxConnectionTimeout);
SetMultimap<String, JmxAttributePollConfig<?>> attributePolls = HashMultimap.<String,JmxAttributePollConfig<?>>create();
for (JmxAttributePollConfig<?> config : builder.attributePolls) {
@@ -204,7 +204,7 @@ public class JmxFeed extends AbstractFeed {
if (configCopy.getPeriod() < 0) configCopy.period(builder.period, builder.periodUnits);
attributePolls.put(configCopy.getObjectName().getCanonicalName() + configCopy.getAttributeName(), configCopy);
}
- setConfig(ATTRIBUTE_POLLS, attributePolls);
+ config().set(ATTRIBUTE_POLLS, attributePolls);
SetMultimap<List<?>, JmxOperationPollConfig<?>> operationPolls = HashMultimap.<List<?>,JmxOperationPollConfig<?>>create();
for (JmxOperationPollConfig<?> config : builder.operationPolls) {
@@ -214,14 +214,14 @@ public class JmxFeed extends AbstractFeed {
if (configCopy.getPeriod() < 0) configCopy.period(builder.period, builder.periodUnits);
operationPolls.put(configCopy.buildOperationIdentity(), configCopy);
}
- setConfig(OPERATION_POLLS, operationPolls);
+ config().set(OPERATION_POLLS, operationPolls);
SetMultimap<NotificationFilter, JmxNotificationSubscriptionConfig<?>> notificationSubscriptions = HashMultimap.create();
for (JmxNotificationSubscriptionConfig<?> config : builder.notificationSubscriptions) {
if (!config.isEnabled()) continue;
notificationSubscriptions.put(config.getNotificationFilter(), config);
}
- setConfig(NOTIFICATION_SUBSCRIPTIONS, notificationSubscriptions);
+ config().set(NOTIFICATION_SUBSCRIPTIONS, notificationSubscriptions);
initUniqueTag(builder.uniqueTag, attributePolls, operationPolls, notificationSubscriptions);
}
@@ -229,9 +229,9 @@ public class JmxFeed extends AbstractFeed {
public void setEntity(EntityLocal entity) {
if (getConfig(HELPER) == null) {
JmxHelper helper = new JmxHelper(entity);
- setConfig(HELPER, helper);
- setConfig(OWN_HELPER, true);
- setConfig(JMX_URI, helper.getUrl());
+ config().set(HELPER, helper);
+ config().set(OWN_HELPER, true);
+ config().set(JMX_URI, helper.getUrl());
}
super.setEntity(entity);
}
[4/7] brooklyn-server git commit: Deletes old deprecated code
Posted by tb...@apache.org.
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/feed/AttributePollHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/feed/AttributePollHandler.java b/core/src/main/java/org/apache/brooklyn/core/feed/AttributePollHandler.java
index fca844b..903b6e0 100644
--- a/core/src/main/java/org/apache/brooklyn/core/feed/AttributePollHandler.java
+++ b/core/src/main/java/org/apache/brooklyn/core/feed/AttributePollHandler.java
@@ -218,7 +218,7 @@ public class AttributePollHandler<V> implements PollHandler<V> {
if (v == FeedConfig.UNCHANGED) {
// nothing
} else if (v == FeedConfig.REMOVE) {
- ((EntityInternal)entity).removeAttribute(sensor);
+ ((EntityInternal)entity).sensors().remove(sensor);
feed.onRemoveSensor(sensor);
} else if (sensor == FeedConfig.NO_SENSOR) {
// nothing
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/feed/FeedConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/feed/FeedConfig.java b/core/src/main/java/org/apache/brooklyn/core/feed/FeedConfig.java
index 7c5bebb..91f6f7c 100644
--- a/core/src/main/java/org/apache/brooklyn/core/feed/FeedConfig.java
+++ b/core/src/main/java/org/apache/brooklyn/core/feed/FeedConfig.java
@@ -41,10 +41,6 @@ import com.google.common.base.Predicate;
*/
public class FeedConfig<V, T, F extends FeedConfig<V, T, F>> {
- /** The onSuccess or onError functions can return this value to indicate that the sensor should not change.
- * @deprecated since 0.7.0 use UNCHANGED */
- @Deprecated
- public static final Object UNSET = Entities.UNCHANGED;
/** The onSuccess or onError functions can return this value to indicate that the sensor should not change. */
public static final Object UNCHANGED = Entities.UNCHANGED;
/** The onSuccess or onError functions can return this value to indicate that the sensor value should be removed
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java
index bcbde05..1671412 100644
--- a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java
+++ b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynInitialization.java
@@ -50,11 +50,6 @@ public class BrooklynInitialization {
PortRanges.init();
}
- @SuppressWarnings("deprecation")
- public static void initLegacyLanguageExtensions() {
- org.apache.brooklyn.util.core.BrooklynLanguageExtensions.init();
- }
-
/* other things:
*
* RendererHints - done by the entity classes which need them, including Sensors
@@ -67,15 +62,11 @@ public class BrooklynInitialization {
initSecureKeysBouncyCastleProvider();
initNetworking();
initPortRanges();
- initLegacyLanguageExtensions();
}
}
- @SuppressWarnings("deprecation")
public synchronized static void reinitAll() {
done.set(false);
- org.apache.brooklyn.util.core.BrooklynLanguageExtensions.reinit();
initAll();
}
-
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynPropertiesImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynPropertiesImpl.java b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynPropertiesImpl.java
index 31f0b0b..2c8d282 100644
--- a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynPropertiesImpl.java
+++ b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynPropertiesImpl.java
@@ -93,12 +93,6 @@ public class BrooklynPropertiesImpl implements BrooklynProperties {
private String localPropertiesFile = null;
private BrooklynPropertiesImpl originalProperties = null;
- /** @deprecated since 0.7.0 use static methods in {@link Factory} to create */
- @Deprecated
- public Builder() {
- this(true);
- }
-
private Builder(boolean setGlobalFileDefaults) {
resetDefaultLocationMetadataUrl();
if (setGlobalFileDefaults) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/location/AbstractLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/AbstractLocation.java b/core/src/main/java/org/apache/brooklyn/core/location/AbstractLocation.java
index 32b01fa..624f854 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/AbstractLocation.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/AbstractLocation.java
@@ -92,9 +92,7 @@ import com.google.common.reflect.TypeToken;
*/
public abstract class AbstractLocation extends AbstractBrooklynObject implements LocationInternal, HasHostGeoInfo, Configurable {
- /** @deprecated since 0.7.0 shouldn't be public */
- @Deprecated
- public static final Logger LOG = LoggerFactory.getLogger(AbstractLocation.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractLocation.class);
public static final ConfigKey<Location> PARENT_LOCATION = new BasicConfigKey<Location>(Location.class, "parentLocation");
@@ -465,60 +463,6 @@ public abstract class AbstractLocation extends AbstractBrooklynObject implements
}
@Override
- @Deprecated
- public boolean hasConfig(ConfigKey<?> key, boolean includeInherited) {
- return config().getInternalConfigMap().getConfigInheritedRaw(key).getWithoutError().asMaybe().isPresent();
- }
-
- @Override
- @Deprecated
- public Map<String,Object> getAllConfig(boolean includeInherited) {
- // TODO Have no information about what to include/exclude inheritance wise.
- // however few things use getAllConfigBag()
- ConfigBag bag = (includeInherited ? config().getBag() : config().getLocalBag());
- return bag.getAllConfig();
- }
-
- @Override
- @Deprecated
- public ConfigBag getAllConfigBag() {
- // TODO see comments in EntityConfigMap and on interface methods.
- // here ConfigBag is used exclusively so
- // we have no information about what to include/exclude inheritance wise.
- // however few things use getAllConfigBag()
- return config().getBag();
- }
-
- @Override
- public ConfigBag getLocalConfigBag() {
- return config().getLocalBag();
- }
-
- /**
- * @deprecated since 0.7; use {@link #getLocalConfigBag()}
- * @since 0.6
- */
- @Deprecated
- public ConfigBag getRawLocalConfigBag() {
- return config().getLocalBag();
- }
-
- @Override
- @Deprecated
- public <T> T setConfig(ConfigKey<T> key, T value) {
- return config().set(key, value);
- }
-
- /**
- * @since 0.6.0 (?) - use getDisplayName
- * @deprecated since 0.7.0; use {@link #getDisplayName()}
- */
- @Deprecated
- public void setName(String newName) {
- setDisplayName(newName);
- }
-
- @Override
public void setDisplayName(String newName) {
name.set(newName);
displayNameAutoGenerated = false;
@@ -675,8 +619,8 @@ public abstract class AbstractLocation extends AbstractBrooklynObject implements
public void setHostGeoInfo(HostGeoInfo hostGeoInfo) {
if (hostGeoInfo!=null) {
this.hostGeoInfo.set(hostGeoInfo);
- setConfig(LocationConfigKeys.LATITUDE, hostGeoInfo.latitude);
- setConfig(LocationConfigKeys.LONGITUDE, hostGeoInfo.longitude);
+ config().set(LocationConfigKeys.LATITUDE, hostGeoInfo.latitude);
+ config().set(LocationConfigKeys.LONGITUDE, hostGeoInfo.longitude);
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/location/LocationPredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/LocationPredicates.java b/core/src/main/java/org/apache/brooklyn/core/location/LocationPredicates.java
index 35cf54f..69ee40a 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/LocationPredicates.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/LocationPredicates.java
@@ -75,7 +75,7 @@ public class LocationPredicates {
return new Predicate<Location>() {
@Override
public boolean apply(@Nullable Location input) {
- return (input != null) && Objects.equal(input.getConfig(configKey), val);
+ return (input != null) && Objects.equal(input.config().get(configKey), val);
}
};
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/location/Machines.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/Machines.java b/core/src/main/java/org/apache/brooklyn/core/location/Machines.java
index 2a2ccba..2bb39dc 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/Machines.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/Machines.java
@@ -109,15 +109,6 @@ public class Machines {
return Maybe.of(result);
}
- /**
- * @deprecated since 0.9.0; see {@link #findUniqueMachineLocation(Iterable, Class)},
- * e.g. {@code findUniqueMachineLocation(locations, SshMachineLocation.class)}
- */
- @Deprecated
- public static Maybe<SshMachineLocation> findUniqueSshMachineLocation(Iterable<? extends Location> locations) {
- return findUniqueMachineLocation(locations, SshMachineLocation.class);
- }
-
public static Maybe<MachineLocation> findUniqueMachineLocation(Iterable<? extends Location> locations) {
return findUniqueMachineLocation(locations, MachineLocation.class);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManager.java b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManager.java
index f27836b..659b32e 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManager.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManager.java
@@ -202,78 +202,6 @@ public interface PortForwardManager extends Location {
///////////////////////////////////////////////////////////////////////////////////
- // Deprecated
- ///////////////////////////////////////////////////////////////////////////////////
-
- /**
- * Reserves a unique public port for the purpose of forwarding to the given target,
- * associated with a given location for subsequent lookup purpose.
- * <p>
- * If already allocated, returns the previously allocated.
- *
- * @deprecated since 0.7.0; use {@link #acquirePublicPort(String)}, and then use {@link #associate(String, HostAndPort, int)} or {@link #associate(String, HostAndPort, Location, int)}
- */
- @Deprecated
- public int acquirePublicPort(String publicIpId, Location l, int privatePort);
-
- /**
- * Returns old mapping if it existed, null if it is new.
- *
- * @deprecated since 0.7.0; use {@link #associate(String, HostAndPort, int)} or {@link #associate(String, HostAndPort, Location, int)}
- */
- @Deprecated
- public PortMapping acquirePublicPortExplicit(String publicIpId, int port);
-
- /**
- * Records a location and private port against a publicIp and public port,
- * to support {@link #lookup(Location, int)}.
- * <p>
- * Superfluous if {@link #acquirePublicPort(String, Location, int)} was used,
- * but strongly recommended if {@link #acquirePublicPortExplicit(String, int)} was used
- * e.g. if the location is not known ahead of time.
- *
- * @deprecated Use {@link #associate(String, HostAndPort, Location, int)}
- */
- @Deprecated
- public void associate(String publicIpId, int publicPort, Location l, int privatePort);
-
- /**
- * Records a public hostname or address to be associated with the given publicIpId for lookup purposes.
- * <p>
- * Conceivably this may have to be access-location specific.
- *
- * @deprecated Use {@link #associate(String, HostAndPort, int)} or {@link #associate(String, HostAndPort, Location, int)}
- */
- @Deprecated
- public void recordPublicIpHostname(String publicIpId, String hostnameOrPublicIpAddress);
-
- /**
- * Returns a recorded public hostname or address.
- *
- * @deprecated Use {@link #lookup(String, int)} or {@link #lookup(Location, int)}
- */
- @Deprecated
- public String getPublicIpHostname(String publicIpId);
-
- /**
- * Clears a previous call to {@link #recordPublicIpHostname(String, String)}.
- *
- * @deprecated Use {@link #forgetPortMapping(String, int)} or {@link #forgetPortMappings(Location)}
- */
- @Deprecated
- public boolean forgetPublicIpHostname(String publicIpId);
-
- /**
- * Returns true if this implementation is a client which is immutable/safe for serialization
- * i.e. it delegates to something on an entity or location elsewhere.
- *
- * @deprecated since 0.7.0; no need to separate client-proxy from impl
- */
- @Deprecated
- public boolean isClient();
-
-
- ///////////////////////////////////////////////////////////////////////////////////
// Deprecated; just internal
///////////////////////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerClient.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerClient.java b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerClient.java
index 92091fc..61eae2f 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerClient.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerClient.java
@@ -20,7 +20,6 @@ package org.apache.brooklyn.core.location.access;
import java.util.Collection;
import java.util.List;
-import java.util.Map;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.location.Location;
@@ -163,93 +162,7 @@ public class PortForwardManagerClient implements PortForwardManager {
return getClass().getName()+"[wrapping="+getDelegate().toVerboseString()+"]";
}
- ///////////////////////////////////////////////////////////////////////////////////
- // Deprecated
- ///////////////////////////////////////////////////////////////////////////////////
-
- /**
- * Reserves a unique public port for the purpose of forwarding to the given target,
- * associated with a given location for subsequent lookup purpose.
- * <p>
- * If already allocated, returns the previously allocated.
- *
- * @deprecated since 0.7.0; use {@link #acquirePublicPort(String)}, and then use {@link #associate(String, HostAndPort, int)} or {@link #associate(String, HostAndPort, Location, int)}
- */
- @Override
- @Deprecated
- public int acquirePublicPort(String publicIpId, Location l, int privatePort) {
- return getDelegate().acquirePublicPort(publicIpId, l, privatePort);
- }
-
- /**
- * Returns old mapping if it existed, null if it is new.
- *
- * @deprecated since 0.7.0; use {@link #associate(String, HostAndPort, int)} or {@link #associate(String, HostAndPort, Location, int)}
- */
- @Override
- @Deprecated
- public PortMapping acquirePublicPortExplicit(String publicIpId, int publicPort) {
- return getDelegate().acquirePublicPortExplicit(publicIpId, publicPort);
- }
-
- /**
- * Records a location and private port against a publicIp and public port,
- * to support {@link #lookup(Location, int)}.
- * <p>
- * Superfluous if {@link #acquirePublicPort(String, Location, int)} was used,
- * but strongly recommended if {@link #acquirePublicPortExplicit(String, int)} was used
- * e.g. if the location is not known ahead of time.
- *
- * @deprecated Use {@link #associate(String, HostAndPort, Location, int)}
- */
- @Override
- @Deprecated
- public void associate(String publicIpId, int publicPort, Location l, int privatePort) {
- getDelegate().associate(publicIpId, publicPort, l, privatePort);
- }
-
- /**
- * Records a public hostname or address to be associated with the given publicIpId for lookup purposes.
- * <p>
- * Conceivably this may have to be access-location specific.
- *
- * @deprecated Use {@link #associate(String, HostAndPort, int)} or {@link #associate(String, HostAndPort, Location, int)}
- */
- @Override
- @Deprecated
- public void recordPublicIpHostname(String publicIpId, String hostnameOrPublicIpAddress) {
- getDelegate().recordPublicIpHostname(publicIpId, hostnameOrPublicIpAddress);
- }
-
- /**
- * Returns a recorded public hostname or address.
- *
- * @deprecated Use {@link #lookup(String, int)} or {@link #lookup(Location, int)}
- */
- @Override
- @Deprecated
- public String getPublicIpHostname(String publicIpId) {
- return getDelegate().getPublicIpHostname(publicIpId);
- }
- /**
- * Clears a previous call to {@link #recordPublicIpHostname(String, String)}.
- *
- * @deprecated Use {@link #forgetPortMapping(String, int)} or {@link #forgetPortMapping(Location, int)}
- */
- @Override
- @Deprecated
- public boolean forgetPublicIpHostname(String publicIpId) {
- return getDelegate().forgetPublicIpHostname(publicIpId);
- }
-
- @Override
- @Deprecated
- public boolean isClient() {
- return true;
- }
-
-
///////////////////////////////////////////////////////////////////////////////////
// Deprecated; just internal
///////////////////////////////////////////////////////////////////////////////////
@@ -353,23 +266,13 @@ public class PortForwardManagerClient implements PortForwardManager {
}
@Override
- public <T> T getConfig(ConfigKey<T> key) {
- return getDelegate().getConfig(key);
- }
-
- @Override
public <T> T getConfig(HasConfigKey<T> key) {
return getDelegate().getConfig(key);
}
@Override
- public boolean hasConfig(ConfigKey<?> key, boolean includeInherited) {
- return getDelegate().hasConfig(key, includeInherited);
- }
-
- @Override
- public Map<String, Object> getAllConfig(boolean includeInherited) {
- return getDelegate().getAllConfig(includeInherited);
+ public <T> T getConfig(ConfigKey<T> key) {
+ return getDelegate().getConfig(key);
}
@Override
@@ -403,11 +306,6 @@ public class PortForwardManagerClient implements PortForwardManager {
}
@Override
- public <T> T setConfig(ConfigKey<T> key, T val) {
- return getDelegate().config().set(key, val);
- }
-
- @Override
public ConfigurationSupport config() {
return getDelegate().config();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerImpl.java b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerImpl.java
index c3b9858..f2c73ee 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerImpl.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerImpl.java
@@ -102,7 +102,7 @@ public class PortForwardManagerImpl extends AbstractLocation implements PortForw
public void init() {
super.init();
Integer portStartingPoint;
- Object rawPort = getAllConfigBag().getStringKey(PORT_FORWARD_MANAGER_STARTING_PORT.getName());
+ Object rawPort = config().getBag().getStringKey(PORT_FORWARD_MANAGER_STARTING_PORT.getName());
if (rawPort != null) {
portStartingPoint = getConfig(PORT_FORWARD_MANAGER_STARTING_PORT);
} else {
@@ -314,11 +314,6 @@ public class PortForwardManagerImpl extends AbstractLocation implements PortForw
}
@Override
- public boolean isClient() {
- return false;
- }
-
- @Override
public void addAssociationListener(AssociationListener listener, Predicate<? super AssociationMetadata> filter) {
associationListeners.put(listener, filter);
}
@@ -359,28 +354,28 @@ public class PortForwardManagerImpl extends AbstractLocation implements PortForw
// Deprecated
///////////////////////////////////////////////////////////////////////////////////
+
@Override
@Deprecated
- public PortMapping acquirePublicPortExplicit(String publicIpId, int port) {
- PortMapping mapping = new PortMapping(publicIpId, port, null, -1);
- log.debug("assigning explicit public port "+port+" at "+publicIpId);
- PortMapping result;
+ public boolean forgetPortMapping(PortMapping m) {
+ return forgetPortMapping(m.publicIpId, m.publicPort);
+ }
+
+ protected void associateImpl(String publicIpId, int publicPort, Location l, int privatePort) {
synchronized (mutex) {
- result = mappings.put(makeKey(publicIpId, port), mapping);
+ PortMapping mapping = new PortMapping(publicIpId, publicPort, l, privatePort);
+ PortMapping oldMapping = getPortMappingWithPublicSide(publicIpId, publicPort);
+ log.debug("associating public port "+publicPort+" on "+publicIpId+" with private port "+privatePort+" at "+l+" ("+mapping+")"
+ +(oldMapping == null ? "" : " (overwriting "+oldMapping+" )"));
+ mappings.put(makeKey(publicIpId, publicPort), mapping);
}
- onChanged();
- return result;
}
- @Override
- @Deprecated
- public boolean forgetPortMapping(PortMapping m) {
- return forgetPortMapping(m.publicIpId, m.publicPort);
- }
+ ///////////////////////////////////////////////////////////////////////////////////
+ // Internal only; make protected when deprecated interface method removed
+ ///////////////////////////////////////////////////////////////////////////////////
- @Override
- @Deprecated
- public void recordPublicIpHostname(String publicIpId, String hostnameOrPublicIpAddress) {
+ protected void recordPublicIpHostname(String publicIpId, String hostnameOrPublicIpAddress) {
log.debug("recording public IP "+publicIpId+" associated with "+hostnameOrPublicIpAddress);
synchronized (mutex) {
String old = publicIpIdToHostname.put(publicIpId, hostnameOrPublicIpAddress);
@@ -390,70 +385,13 @@ public class PortForwardManagerImpl extends AbstractLocation implements PortForw
onChanged();
}
- @Override
- @Deprecated
- public String getPublicIpHostname(String publicIpId) {
+ protected String getPublicIpHostname(String publicIpId) {
synchronized (mutex) {
return publicIpIdToHostname.get(publicIpId);
}
}
@Override
- @Deprecated
- public boolean forgetPublicIpHostname(String publicIpId) {
- log.debug("forgetting public IP "+publicIpId+" association");
- boolean result;
- synchronized (mutex) {
- result = (publicIpIdToHostname.remove(publicIpId) != null);
- }
- onChanged();
- return result;
- }
-
- @Override
- @Deprecated
- public int acquirePublicPort(String publicIpId, Location l, int privatePort) {
- int publicPort;
- synchronized (mutex) {
- PortMapping old = getPortMappingWithPrivateSide(l, privatePort);
- // only works for 1 public IP ID per location (which is the norm)
- if (old!=null && old.publicIpId.equals(publicIpId)) {
- log.debug("request to acquire public port at "+publicIpId+" for "+l+":"+privatePort+", reusing old assignment "+old);
- return old.getPublicPort();
- }
-
- publicPort = acquirePublicPort(publicIpId);
- log.debug("request to acquire public port at "+publicIpId+" for "+l+":"+privatePort+", allocating "+publicPort);
- associateImpl(publicIpId, publicPort, l, privatePort);
- }
- onChanged();
- return publicPort;
- }
-
- @Override
- @Deprecated
- public void associate(String publicIpId, int publicPort, Location l, int privatePort) {
- synchronized (mutex) {
- associateImpl(publicIpId, publicPort, l, privatePort);
- }
- onChanged();
- }
-
- protected void associateImpl(String publicIpId, int publicPort, Location l, int privatePort) {
- synchronized (mutex) {
- PortMapping mapping = new PortMapping(publicIpId, publicPort, l, privatePort);
- PortMapping oldMapping = getPortMappingWithPublicSide(publicIpId, publicPort);
- log.debug("associating public port "+publicPort+" on "+publicIpId+" with private port "+privatePort+" at "+l+" ("+mapping+")"
- +(oldMapping == null ? "" : " (overwriting "+oldMapping+" )"));
- mappings.put(makeKey(publicIpId, publicPort), mapping);
- }
- }
-
- ///////////////////////////////////////////////////////////////////////////////////
- // Internal only; make protected when deprecated interface method removed
- ///////////////////////////////////////////////////////////////////////////////////
-
- @Override
public HostAndPort getPublicHostAndPort(PortMapping m) {
if (m.publicEndpoint == null) {
String hostname = getPublicIpHostname(m.publicIpId);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/location/geo/UtraceHostGeoLookup.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/geo/UtraceHostGeoLookup.java b/core/src/main/java/org/apache/brooklyn/core/location/geo/UtraceHostGeoLookup.java
index 16ffa18..62fd437 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/geo/UtraceHostGeoLookup.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/geo/UtraceHostGeoLookup.java
@@ -83,22 +83,6 @@ Beyond this you get blacklisted and requests may time out, or return none.
return "http://xml.utrace.de/?query="+ip.trim();
}
- /**
- * @deprecated since 0.7.0. Use {@link LocalhostExternalIpLoader} instead.
- */
- @Deprecated
- public static String getLocalhostExternalIp() {
- return LocalhostExternalIpLoader.getLocalhostIpWithin(Duration.seconds(2));
- }
-
- /**
- * @deprecated since 0.7.0. Use {@link LocalhostExternalIpLoader} instead.
- */
- @Deprecated
- public static String getLocalhostExternalIpImpl() {
- return LocalhostExternalIpLoader.getLocalhostIpWithin(Duration.seconds(2));
- }
-
public String getLookupUrlForLocalhost() {
return getLookupUrlForPublicIp(LocalhostExternalIpLoader.getLocalhostIpQuicklyOrDefault());
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/location/internal/LocationInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/internal/LocationInternal.java b/core/src/main/java/org/apache/brooklyn/core/location/internal/LocationInternal.java
index 9ed1767..a9a3611 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/internal/LocationInternal.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/internal/LocationInternal.java
@@ -24,7 +24,6 @@ import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.mgmt.rebind.RebindSupport;
import org.apache.brooklyn.api.mgmt.rebind.mementos.LocationMemento;
-import org.apache.brooklyn.config.ConfigInheritance;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.config.ConfigKeys;
import org.apache.brooklyn.core.objs.BrooklynObjectInternal;
@@ -63,22 +62,6 @@ public interface LocationInternal extends BrooklynObjectInternal, Location {
public Map<String, String> toMetadataRecord();
/**
- * @deprecated since 0.7.0; use {@link #config()}, such as {@code ((LocationInternal)location).config().getLocalBag()}
- */
- @Deprecated
- ConfigBag getLocalConfigBag();
-
- /**
- * Returns all config, including that inherited from parents.
- *
- * This method does not respect {@link ConfigInheritance} and so usage is discouraged.
- *
- * @deprecated since 0.7.0; use {@link #config()}, such as {@code ((LocationInternal)location).config().getBag()}
- */
- @Deprecated
- ConfigBag getAllConfigBag();
-
- /**
* Users are strongly discouraged from calling or overriding this method.
* It is for internal calls only, relating to persisting/rebinding entities.
* This method may change (or be removed) in a future release without notice.
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java
index de9964c..218a24a 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java
@@ -20,20 +20,16 @@ package org.apache.brooklyn.core.mgmt;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.concurrent.Callable;
import javax.annotation.Nullable;
-import org.apache.brooklyn.api.catalog.CatalogItem;
import org.apache.brooklyn.api.entity.Application;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntitySpec;
-import org.apache.brooklyn.api.internal.AbstractBrooklynObjectSpec;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.mgmt.Task;
import org.apache.brooklyn.config.ConfigKey;
-import org.apache.brooklyn.core.catalog.internal.BasicBrooklynCatalog;
import org.apache.brooklyn.core.config.BasicConfigInheritance;
import org.apache.brooklyn.core.config.ConfigKeys;
import org.apache.brooklyn.core.effector.Effectors;
@@ -57,7 +53,6 @@ import com.google.common.base.Optional;
import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
import com.google.common.util.concurrent.Runnables;
@@ -109,18 +104,6 @@ public class EntityManagementUtils {
return mgmt.getTypeRegistry().createSpecFromPlan(null, plan, RegisteredTypeLoadingContexts.spec(Application.class), EntitySpec.class);
}
- @Deprecated /** @deprecated since 0.9.0; use {@link BrooklynTypeRegistry#createSpec(RegisteredType, org.apache.brooklyn.api.typereg.RegisteredTypeConstraint, Class)} */
- // not used in Brooklyn
- public static <T,SpecT extends AbstractBrooklynObjectSpec<? extends T, SpecT>> SpecT createCatalogSpec(ManagementContext mgmt, CatalogItem<T, SpecT> item) {
- return createCatalogSpec(mgmt, item, ImmutableSet.<String>of());
- }
-
- @Deprecated /** @deprecated since 0.9.0; use {@link BrooklynTypeRegistry#createSpec(RegisteredType, org.apache.brooklyn.api.typereg.RegisteredTypeConstraint, Class)} */
- // not used in Brooklyn
- public static <T,SpecT extends AbstractBrooklynObjectSpec<? extends T, SpecT>> SpecT createCatalogSpec(ManagementContext mgmt, final CatalogItem<T, SpecT> item, final Set<String> encounteredTypes) {
- return BasicBrooklynCatalog.internalCreateSpecLegacy(mgmt, item, encounteredTypes, true);
- }
-
/** container for operation which creates something and which wants to return both
* the items created and any pending create/start task */
public static class CreationResult<T,U> {
@@ -307,10 +290,6 @@ public class EntityManagementUtils {
EntitySpec<?> childSpec = Iterables.getOnlyElement(wrapperApplication.getChildren());
return (childSpec.getType()!=null && Application.class.isAssignableFrom(childSpec.getType()));
}
- /** @deprecated since 0.9.0 use {@link #canUnwrapApplication(EntitySpec)} */ @Deprecated
- public static boolean canPromoteWrappedApplication(EntitySpec<? extends Application> app) {
- return canUnwrapApplication(app);
- }
/** Returns true if the spec is for a wrapper app with no important settings, wrapping a single child entity.
* for use when adding from a plan specifying multiple entities but there is nothing significant at the application level,
@@ -325,10 +304,8 @@ public class EntityManagementUtils {
return isWrapperApp(spec) && hasSingleChild(spec) &&
// these "brooklyn.*" items on the app rather than the child absolutely prevent unwrapping
// as their semantics could well be different whether they are on the parent or the child
- spec.getEnrichers().isEmpty() &&
spec.getEnricherSpecs().isEmpty() &&
spec.getInitializers().isEmpty() &&
- spec.getPolicies().isEmpty() &&
spec.getPolicySpecs().isEmpty() &&
// prevent merge only if a location is defined at both levels
((spec.getLocations().isEmpty() && spec.getLocationSpecs().isEmpty()) ||
@@ -336,10 +313,6 @@ public class EntityManagementUtils {
// parameters are collapsed on merge so don't need to be considered here
;
}
- /** @deprecated since 0.9.0 use {@link #canUnwrapEntity(EntitySpec)} */ @Deprecated
- public static boolean canPromoteChildrenInWrappedApplication(EntitySpec<? extends Application> spec) {
- return canUnwrapEntity(spec);
- }
public static boolean isWrapperApp(EntitySpec<?> spec) {
return Boolean.TRUE.equals(spec.getConfig().get(EntityManagementUtils.WRAPPER_APP_MARKER));
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
index e4cb55a..17c1573 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
@@ -62,11 +62,6 @@ public class JavaBrooklynClassLoadingContext extends AbstractBrooklynClassLoadin
return new JavaBrooklynClassLoadingContext(checkNotNull(mgmt, "mgmt"), null);
}
- @Deprecated /** @deprecated since 0.7.0 use {@link #create(ManagementContext)} */
- public static JavaBrooklynClassLoadingContext newDefault(ManagementContext mgmt) {
- return new JavaBrooklynClassLoadingContext(checkNotNull(mgmt, "mgmt"), null);
- }
-
@Deprecated /** @deprecated since 0.7.0 will become private; use one of the static methods to instantiate */
public JavaBrooklynClassLoadingContext(ManagementContext mgmt, ClassLoader loader) {
super(mgmt);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/mgmt/entitlement/Entitlements.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/entitlement/Entitlements.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/entitlement/Entitlements.java
index f7b5f72..67f7080 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/entitlement/Entitlements.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/entitlement/Entitlements.java
@@ -416,15 +416,6 @@ public class Entitlements {
throw new NotEntitledException(getEntitlementContext(), permission, typeArgument);
}
}
- /** throws {@link NotEntitledException} if entitlement not available for current {@link #getEntitlementContext()}
- * @since 0.7.0
- * @deprecated since 0.7.0, use {@link #checkEntitled(EntitlementManager, EntitlementClass, Object)};
- * kept briefly because there is some downstream usage*/
- // Note: @Deprecated annotation only added from v0.10.0.
- @Deprecated
- public static <T> void requireEntitled(EntitlementManager checker, EntitlementClass<T> permission, T typeArgument) {
- checkEntitled(checker, permission, typeArgument);
- }
// ----------------- initialization ----------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java
index 0148275..ab8dca9 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java
@@ -877,15 +877,6 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
}
}
- /** @deprecated since 0.7.0, use {@link #demoteTo(ManagementNodeState)} */ @Deprecated
- protected void demoteToFailed() {
- demoteTo(ManagementNodeState.FAILED);
- }
- /** @deprecated since 0.7.0, use {@link #demoteTo(ManagementNodeState)} */ @Deprecated
- protected void demoteToStandby(boolean hot) {
- demoteTo(hot ? ManagementNodeState.HOT_STANDBY : ManagementNodeState.STANDBY);
- }
-
protected void demoteTo(ManagementNodeState toState) {
if (toState!=ManagementNodeState.FAILED && !running) {
LOG.warn("Ignoring demote-from-master request, as HighAvailabilityManager is no longer running");
@@ -960,11 +951,6 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager {
((BasicBrooklynCatalog)managementContext.getCatalog()).reset(CatalogDto.newEmptyInstance("<reset-by-ha-status-change>"));
}
- /** @deprecated since 0.7.0, use {@link #activateHotProxy(ManagementNodeState)} */ @Deprecated
- protected boolean attemptHotStandby() {
- return activateHotProxy(ManagementNodeState.HOT_STANDBY).getWithoutError();
- }
-
/** Starts hot standby or hot backup, in foreground
* <p>
* In the case of the former, the caller is responsible for publishing health afterwards,
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java
index 583e7cd..f4c2a10 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiArchiveInstaller.java
@@ -240,9 +240,9 @@ class OsgiArchiveInstaller {
}
zipFile = Os.newTempFile("brooklyn-bundle-transient-"+suppliedKnownBundleMetadata, "zip");
- try (FileOutputStream fos = new FileOutputStream(zipFile)) {
- Streams.copy(zipIn, fos);
- zipIn.close();
+ try {
+ FileOutputStream fos = new FileOutputStream(zipFile);
+ Streams.copyClose(zipIn, fos);
try (ZipFile zf = new ZipFile(zipFile)) {
// validate it is a valid ZIP, otherwise errors are more obscure later.
// can happen esp if user supplies a file://path/to/folder/ as the URL.openStream returns a list of that folder (!)
@@ -252,6 +252,7 @@ class OsgiArchiveInstaller {
} catch (Exception e) {
throw Exceptions.propagate(e);
} finally {
+ Streams.closeQuietly(zipIn);
zipIn = null;
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
index 85b1451..8838eab 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
@@ -18,7 +18,6 @@
*/
package org.apache.brooklyn.core.objs;
-import static com.google.common.base.Preconditions.checkState;
import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth;
import java.util.Collection;
@@ -43,15 +42,12 @@ import org.apache.brooklyn.api.objs.BrooklynObject;
import org.apache.brooklyn.api.objs.Configurable;
import org.apache.brooklyn.api.objs.EntityAdjunct;
import org.apache.brooklyn.api.objs.HighlightTuple;
-import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.api.sensor.Sensor;
import org.apache.brooklyn.api.sensor.SensorEventListener;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.config.ConfigConstraints;
import org.apache.brooklyn.core.config.ConfigKeys;
import org.apache.brooklyn.core.config.internal.AbstractConfigMapImpl;
-import org.apache.brooklyn.core.enricher.AbstractEnricher;
-import org.apache.brooklyn.core.entity.Entities;
import org.apache.brooklyn.core.entity.EntityInternal;
import org.apache.brooklyn.core.entity.internal.ConfigUtilsInternal;
import org.apache.brooklyn.core.mgmt.internal.SubscriptionTracker;
@@ -100,11 +96,7 @@ public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject imple
*/
private final AdjunctConfigMap configsInternal = new AdjunctConfigMap(this);
- /**
- * @deprecated since 0.7.0; use {@link #getAdjunctType()} instead; this field may be made private or deleted in a future release.
- */
- @Deprecated
- protected final AdjunctType adjunctType = new AdjunctType(this);
+ private final AdjunctType adjunctType = new AdjunctType(this);
@SetFromFlag
protected String name;
@@ -375,12 +367,6 @@ public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject imple
return result;
}
- @Override
- @Deprecated
- public <T> T setConfig(ConfigKey<T> key, T val) {
- return config().set(key, val);
- }
-
/**
* Invoked whenever a config change is applied after management is started.
* Default implementation throws an exception to disallow the change.
@@ -435,113 +421,13 @@ public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject imple
return entity;
}
- /** @deprecated since 0.7.0 only {@link AbstractEnricher} has emit convenience */
- @Deprecated
- protected <T> void emit(Sensor<T> sensor, Object val) {
- checkState(entity != null, "entity must first be set");
- if (val == Entities.UNCHANGED) {
- return;
- }
- if (val == Entities.REMOVE) {
- ((EntityInternal)entity).removeAttribute((AttributeSensor<T>) sensor);
- return;
- }
-
- T newVal = TypeCoercions.coerce(val, sensor.getTypeToken());
- if (sensor instanceof AttributeSensor) {
- entity.sensors().set((AttributeSensor<T>)sensor, newVal);
- } else {
- entity.sensors().emit(sensor, newVal);
- }
- }
-
- /**
- * @deprecated since 0.9.0; for internal use only
- */
- @Deprecated
- protected synchronized SubscriptionTracker getSubscriptionTracker() {
+ private synchronized SubscriptionTracker getSubscriptionTracker() {
if (_subscriptionTracker!=null) return _subscriptionTracker;
if (entity==null) return null;
_subscriptionTracker = new SubscriptionTracker(((EntityInternal)entity).subscriptions().getSubscriptionContext());
return _subscriptionTracker;
}
-
- /**
- * @deprecated since 0.9.0; see {@link SubscriptionSupport#subscribe(Entity, Sensor, SensorEventListener)} and {@link BrooklynObject#subscriptions()}
- */
- @Deprecated
- public <T> SubscriptionHandle subscribe(Entity producer, Sensor<T> sensor, SensorEventListener<? super T> listener) {
- if (!checkCanSubscribe()) return null;
- return getSubscriptionTracker().subscribe(producer, sensor, listener);
- }
-
- /**
- * @deprecated since 0.9.0; see {@link SubscriptionSupport#subscribeToMembers(Entity, Sensor, SensorEventListener)} and {@link BrooklynObject#subscriptions()}
- */
- @Deprecated
- public <T> SubscriptionHandle subscribeToMembers(Group producerGroup, Sensor<T> sensor, SensorEventListener<? super T> listener) {
- if (!checkCanSubscribe(producerGroup)) return null;
- return getSubscriptionTracker().subscribeToMembers(producerGroup, sensor, listener);
- }
-
- /**
- * @deprecated since 0.9.0; see {@link SubscriptionSupport#subscribeToChildren(Entity, Sensor, SensorEventListener)} and {@link BrooklynObject#subscriptions()}
- */
- @Deprecated
- public <T> SubscriptionHandle subscribeToChildren(Entity producerParent, Sensor<T> sensor, SensorEventListener<? super T> listener) {
- if (!checkCanSubscribe(producerParent)) return null;
- return getSubscriptionTracker().subscribeToChildren(producerParent, sensor, listener);
- }
- /**
- * @deprecated since 0.7.0 use {@link BasicSubscriptionSupport#checkCanSubscribe(Entity)
- */
- @Deprecated
- protected boolean check(Entity requiredEntity) {
- return checkCanSubscribe(requiredEntity);
- }
-
- /**
- * @deprecated since 0.9.0; for internal use only
- */
- @Deprecated
- protected boolean checkCanSubscribe(Entity producer) {
- return subscriptions().checkCanSubscribe(producer);
- }
-
- /**
- * @deprecated since 0.9.0; for internal use only
- */
- @Deprecated
- protected boolean checkCanSubscribe() {
- return subscriptions().checkCanSubscribe();
- }
-
- /**
- * @deprecated since 0.9.0; see {@link SubscriptionSupport#unsubscribe(Entity)} and {@link BrooklynObject#subscriptions()}
- */
- @Deprecated
- public boolean unsubscribe(Entity producer) {
- return subscriptions().unsubscribe(producer);
- }
-
- /**
- * @deprecated since 0.9.0; see {@link SubscriptionSupport#unsubscribe(Entity, SubscriptionHandle)} and {@link BrooklynObject#subscriptions()}
- */
- @Deprecated
- public boolean unsubscribe(Entity producer, SubscriptionHandle handle) {
- return subscriptions().unsubscribe(producer, handle);
- }
-
- /**
- * @deprecated since 0.9.0; for internal use only
- */
- @Deprecated
- protected Collection<SubscriptionHandle> getAllSubscriptions() {
- SubscriptionTracker tracker = getSubscriptionTracker();
- return (tracker != null) ? tracker.getAllSubscriptions() : Collections.<SubscriptionHandle>emptyList();
- }
-
/**
* Unsubscribes and clears all managed subscriptions; is called by the owning entity when a policy is removed
* and should always be called by any subclasses overriding this method
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/objs/BasicConfigurableObject.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/BasicConfigurableObject.java b/core/src/main/java/org/apache/brooklyn/core/objs/BasicConfigurableObject.java
index 06662c3..3c28fc0 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/BasicConfigurableObject.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/BasicConfigurableObject.java
@@ -79,12 +79,6 @@ public class BasicConfigurableObject implements Configurable, Identifiable, Mana
}
@Override
- @Deprecated
- public <T> T setConfig(ConfigKey<T> key, T value) {
- return config().set(key, value);
- }
-
- @Override
public <T> T getConfig(ConfigKey<T> key) {
return config().get(key);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java
index bd6cc1d..2f61c83 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java
@@ -35,9 +35,7 @@ import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.location.LocationSpec;
import org.apache.brooklyn.api.objs.SpecParameter;
-import org.apache.brooklyn.api.policy.Policy;
import org.apache.brooklyn.api.policy.PolicySpec;
-import org.apache.brooklyn.api.sensor.Enricher;
import org.apache.brooklyn.api.sensor.EnricherSpec;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.config.ConfigConstraints;
@@ -332,18 +330,10 @@ public class InternalEntityFactory extends InternalFactory {
initializer.apply((EntityInternal)entity);
}
- for (Enricher enricher : spec.getEnrichers()) {
- entity.enrichers().add(enricher);
- }
-
for (EnricherSpec<?> enricherSpec : spec.getEnricherSpecs()) {
entity.enrichers().add(policyFactory.createEnricher(enricherSpec));
}
- for (Policy policy : spec.getPolicies()) {
- entity.policies().add(policy);
- }
-
for (PolicySpec<?> policySpec : spec.getPolicySpecs()) {
entity.policies().add(policyFactory.createPolicy(policySpec));
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalLocationFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalLocationFactory.java b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalLocationFactory.java
index ffe3e21..0a19a26 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalLocationFactory.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalLocationFactory.java
@@ -24,7 +24,6 @@ import java.util.Map.Entry;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.location.LocationSpec;
-import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.location.AbstractLocation;
import org.apache.brooklyn.core.location.Locations;
@@ -47,35 +46,6 @@ public class InternalLocationFactory extends InternalFactory {
private static final Logger LOG = LoggerFactory.getLogger(InternalLocationFactory.class);
- /**
- * Returns true if this is a "new-style" location (i.e. where not expected to call the constructor to instantiate it).
- *
- * @param managementContext
- * @param clazz
- *
- * @deprecated since 0.7.0; use {@link InternalFactory#isNewStyle(Class)}
- */
- @Deprecated
- public static boolean isNewStyleLocation(ManagementContext managementContext, Class<?> clazz) {
- try {
- return isNewStyleLocation(clazz);
- } catch (IllegalArgumentException e) {
- return false;
- }
- }
-
- /**
- * @deprecated since 0.7.0; use {@link InternalFactory#isNewStyle(Class)}
- */
- @Deprecated
- public static boolean isNewStyleLocation(Class<?> clazz) {
- if (!Location.class.isAssignableFrom(clazz)) {
- throw new IllegalArgumentException("Class "+clazz+" is not an location");
- }
-
- return InternalFactory.isNewStyle(clazz);
- }
-
public InternalLocationFactory(ManagementContextInternal managementContext) {
super(managementContext);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalPolicyFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalPolicyFactory.java b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalPolicyFactory.java
index 8ba7f81..afd0ea6 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalPolicyFactory.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalPolicyFactory.java
@@ -20,7 +20,6 @@ package org.apache.brooklyn.core.objs.proxy;
import java.util.Map;
-import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.policy.Policy;
import org.apache.brooklyn.api.policy.PolicySpec;
import org.apache.brooklyn.api.sensor.Enricher;
@@ -47,47 +46,6 @@ import org.apache.brooklyn.util.exceptions.Exceptions;
*/
public class InternalPolicyFactory extends InternalFactory {
- /**
- * Returns true if this is a "new-style" policy (i.e. where not expected to call the constructor to instantiate it).
- *
- * @param managementContext
- * @param clazz
- *
- * @deprecated since 0.7.0; use {@link InternalFactory#isNewStyle(Class)}
- */
- @Deprecated
- public static boolean isNewStylePolicy(ManagementContext managementContext, Class<?> clazz) {
- try {
- return isNewStylePolicy(clazz);
- } catch (IllegalArgumentException e) {
- return false;
- }
- }
-
- /**
- * @deprecated since 0.7.0; use {@link InternalFactory#isNewStyle(Class)}
- */
- @Deprecated
- public static boolean isNewStylePolicy(Class<?> clazz) {
- if (!Policy.class.isAssignableFrom(clazz)) {
- throw new IllegalArgumentException("Class "+clazz+" is not a policy");
- }
-
- return InternalFactory.isNewStyle(clazz);
- }
-
- /**
- * @deprecated since 0.7.0; use {@link InternalFactory#isNewStyle(Class)}
- */
- @Deprecated
- public static boolean isNewStyleEnricher(Class<?> clazz) {
- if (!Enricher.class.isAssignableFrom(clazz)) {
- throw new IllegalArgumentException("Class "+clazz+" is not an enricher");
- }
-
- return InternalFactory.isNewStyle(clazz);
- }
-
public InternalPolicyFactory(ManagementContextInternal managementContext) {
super(managementContext);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/sensor/AttributeMap.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/sensor/AttributeMap.java b/core/src/main/java/org/apache/brooklyn/core/sensor/AttributeMap.java
index 8cc7737..9f89a27 100644
--- a/core/src/main/java/org/apache/brooklyn/core/sensor/AttributeMap.java
+++ b/core/src/main/java/org/apache/brooklyn/core/sensor/AttributeMap.java
@@ -182,7 +182,7 @@ public final class AttributeMap {
// ands gets here won't call any other code at all
return withLock(() -> {
T oldValue = updateInternalWithoutLockOrPublish(attribute, newValue);
- entity.emitInternal(attribute, newValue);
+ entity.sensors().emitInternal(attribute, newValue);
return oldValue;
});
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/sensor/DependentConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/sensor/DependentConfiguration.java b/core/src/main/java/org/apache/brooklyn/core/sensor/DependentConfiguration.java
index c2b2fe7..6a42aa2 100644
--- a/core/src/main/java/org/apache/brooklyn/core/sensor/DependentConfiguration.java
+++ b/core/src/main/java/org/apache/brooklyn/core/sensor/DependentConfiguration.java
@@ -880,19 +880,6 @@ public class DependentConfiguration {
}
/**
- * Will wait for the attribute on the given entity.
- * If that entity report {@link Lifecycle#ON_FIRE} for its {@link Attributes#SERVICE_STATE_ACTUAL} then it will abort.
- * @deprecated since 0.7.0 use {@link DependentConfiguration#builder()} then {@link ProtoBuilder#attributeWhenReady(Entity, AttributeSensor)} then {@link #abortIfOnFire()}
- */
- @Deprecated
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public <T2> Builder<T2,T2> attributeWhenReady(Entity source, AttributeSensor<T2> sensor) {
- this.source = checkNotNull(source, "source");
- this.sensor = (AttributeSensor) checkNotNull(sensor, "sensor");
- abortIfOnFire();
- return (Builder<T2, T2>) this;
- }
- /**
* @deprecated since 0.11.0; explicit groovy utilities/support will be deleted.
*/
@Deprecated
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/server/BrooklynServerConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/server/BrooklynServerConfig.java b/core/src/main/java/org/apache/brooklyn/core/server/BrooklynServerConfig.java
index 391d789..530095d 100644
--- a/core/src/main/java/org/apache/brooklyn/core/server/BrooklynServerConfig.java
+++ b/core/src/main/java/org/apache/brooklyn/core/server/BrooklynServerConfig.java
@@ -20,7 +20,6 @@ package org.apache.brooklyn.core.server;
import static org.apache.brooklyn.core.config.ConfigKeys.newStringConfigKey;
-import java.io.File;
import java.net.URI;
import java.util.List;
import java.util.Map;
@@ -30,7 +29,6 @@ import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.config.StringConfigMap;
import org.apache.brooklyn.core.config.ConfigKeys;
import org.apache.brooklyn.core.mgmt.usage.ManagementNodeStateListener;
-import org.apache.brooklyn.core.mgmt.usage.UsageListener;
import org.apache.brooklyn.util.guava.Maybe;
import org.apache.brooklyn.util.os.Os;
import org.apache.brooklyn.util.time.Duration;
@@ -146,43 +144,6 @@ public class BrooklynServerConfig {
return BrooklynServerPaths.getMgmtBaseDir(brooklynProperties);
}
- /** @deprecated since 0.7.0 use {@link BrooklynServerPaths#newMainPersistencePathResolver(ManagementContext)} */
- @Deprecated
- public static String getPersistenceDir(ManagementContext mgmt) {
- return getPersistenceDir(mgmt.getConfig());
- }
- /** @deprecated since 0.7.0 use {@link BrooklynServerPaths#newMainPersistencePathResolver(ManagementContext)} */
- @Deprecated
- public static String getPersistenceDir(StringConfigMap brooklynProperties) {
- return resolvePersistencePath(null, brooklynProperties, null);
- }
-
- /**
- * @param optionalSuppliedValue
- * An optional value which has been supplied explicitly
- * @param brooklynProperties
- * The properties map where the persistence path should be looked up if not supplied,
- * along with finding the brooklyn.base.dir if needed (using file system persistence
- * with a relative path)
- * @param optionalObjectStoreLocationSpec
- * If a location spec is supplied, this will return a container name suitable for use
- * with the given object store based on brooklyn.persistence.dir; if null this method
- * will return a full file system path, relative to the brooklyn.base.dir if the
- * configured brooklyn.persistence.dir is not absolute
- * @return The container name or full path for where persist state should be kept
- * @deprecated since 0.7.0 use {@link BrooklynServerPaths#newMainPersistencePathResolver(ManagementContext)} */
- @Deprecated
- public static String resolvePersistencePath(String optionalSuppliedValue, StringConfigMap brooklynProperties, String optionalObjectStoreLocationSpec) {
- return BrooklynServerPaths.newMainPersistencePathResolver(brooklynProperties).location(optionalObjectStoreLocationSpec).dir(optionalSuppliedValue).resolve();
- }
-
-
- /** @deprecated since 0.7.0 use {@link BrooklynServerPaths#getBrooklynWebTmpDir(ManagementContext)} */
- @Deprecated
- public static File getBrooklynWebTmpDir(ManagementContext mgmt) {
- return BrooklynServerPaths.getBrooklynWebTmpDir(mgmt);
- }
-
/**
* @return {@link ManagementContext#getManagementNodeUri()}, located in this utility class for convenience.
*/
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/server/BrooklynServiceAttributes.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/server/BrooklynServiceAttributes.java b/core/src/main/java/org/apache/brooklyn/core/server/BrooklynServiceAttributes.java
index 1c756cc..015b738 100644
--- a/core/src/main/java/org/apache/brooklyn/core/server/BrooklynServiceAttributes.java
+++ b/core/src/main/java/org/apache/brooklyn/core/server/BrooklynServiceAttributes.java
@@ -39,18 +39,6 @@ public class BrooklynServiceAttributes {
/** used to hold the instance of ManagementContext which should be used */
public static final String BROOKLYN_MANAGEMENT_CONTEXT = ManagementContext.class.getName();
- /** poor-man's security, to specify a user to be automatically logged in
- * (e.g. to bypass security, during dev/test); 'admin' is usually a sensible choice.
- * if not specified (the default) username+password is required.
- * @deprecated since 0.6.0; not used; you can now configure security properly instead!
- * (though this may be useful again when we have users and permissions,
- * to indicate the user who should be logged in by default...) */ @Deprecated
- public static final String BROOKLYN_AUTOLOGIN_USERNAME = "brooklyn.autologin.username";
-
- /** poor-man's security, to specify a default password for access
- * @deprecated since 0.6.0; not used; you can now configure security properly instead! */ @Deprecated
- public static final String BROOKLYN_DEFAULT_PASSWORD = "brooklyn.default.password";
-
// TODO use ConfigKey (or possibly BrooklynSystemProperties ?)
/** in some cases localhost does not resolve correctly
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/typereg/BasicManagedBundle.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/BasicManagedBundle.java b/core/src/main/java/org/apache/brooklyn/core/typereg/BasicManagedBundle.java
index 253f3a6..8372b99 100644
--- a/core/src/main/java/org/apache/brooklyn/core/typereg/BasicManagedBundle.java
+++ b/core/src/main/java/org/apache/brooklyn/core/typereg/BasicManagedBundle.java
@@ -147,11 +147,6 @@ public class BasicManagedBundle extends AbstractBrooklynObject implements Manage
}
@Override
- public <T> T setConfig(ConfigKey<T> key, T val) {
- throw new UnsupportedOperationException();
- }
-
- @Override
public <T> T getConfig(ConfigKey<T> key) {
throw new UnsupportedOperationException();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/typereg/BasicOsgiBundleWithUrl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/BasicOsgiBundleWithUrl.java b/core/src/main/java/org/apache/brooklyn/core/typereg/BasicOsgiBundleWithUrl.java
index 9001ad4..f34e070 100644
--- a/core/src/main/java/org/apache/brooklyn/core/typereg/BasicOsgiBundleWithUrl.java
+++ b/core/src/main/java/org/apache/brooklyn/core/typereg/BasicOsgiBundleWithUrl.java
@@ -59,12 +59,6 @@ public class BasicOsgiBundleWithUrl implements CatalogBundle, OsgiBundleWithUrl
}
@Override
- @Deprecated //see super
- public boolean isNamed() {
- return isNameResolved();
- }
-
- @Override
public String getSymbolicName() {
return symbolicName;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java b/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java
index a21ffd3..a8f3e50 100644
--- a/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java
+++ b/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java
@@ -141,9 +141,7 @@ public class RegisteredTypes {
@Override public String getDisplayName() { return type.getDisplayName(); }
@Override public String getCatalogItemId() { return type.getVersionedName().toString(); }
@Override public String getId() { return type.getId(); }
- @Override public String getName() { return type.getSymbolicName(); }
@Override public String getSymbolicName() { return type.getSymbolicName(); }
- @Override public String getRegisteredTypeName() { return type.getSymbolicName(); }
@Override public String getDescription() { return type.getDescription(); }
@Override public String getIconUrl() { return type.getIconUrl(); }
@Override public String getContainingBundle() { return type.getContainingBundle(); }
@@ -157,7 +155,6 @@ public class RegisteredTypes {
@Override public List<String> getCatalogItemIdSearchPath() { throw new UnsupportedOperationException(); }
@Override public TagSupport tags() { throw new UnsupportedOperationException(); }
@Override public RelationSupport<?> relations() { throw new UnsupportedOperationException(); }
- @Override public <T> T setConfig(ConfigKey<T> key, T val) { throw new UnsupportedOperationException(); }
@Override public <T> T getConfig(ConfigKey<T> key) { throw new UnsupportedOperationException(); }
@Override public ConfigurationSupport config() { throw new UnsupportedOperationException(); }
@Override public SubscriptionSupport subscriptions() { throw new UnsupportedOperationException(); }
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/enricher/stock/reducer/Reducer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/enricher/stock/reducer/Reducer.java b/core/src/main/java/org/apache/brooklyn/enricher/stock/reducer/Reducer.java
index 5f4ab1b..dec0dc2 100644
--- a/core/src/main/java/org/apache/brooklyn/enricher/stock/reducer/Reducer.java
+++ b/core/src/main/java/org/apache/brooklyn/enricher/stock/reducer/Reducer.java
@@ -121,7 +121,7 @@ public class Reducer extends AbstractEnricher implements SensorEventListener<Obj
Preconditions.checkState(sensorListTemp.size() > 0, "Nothing to reduce");
for (Sensor<?> sensor : sensorListTemp) {
- subscribe(producer, sensor, this);
+ subscriptions().subscribe(producer, sensor, this);
}
subscribedSensors = ImmutableList.copyOf(sensorListTemp);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java b/core/src/main/java/org/apache/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java
index d61944c..ecf7b88 100644
--- a/core/src/main/java/org/apache/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java
+++ b/core/src/main/java/org/apache/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java
@@ -95,22 +95,6 @@ public abstract class AbstractMembershipTrackingPolicy extends AbstractPolicy {
}
}
- /**
- * Sets the group to be tracked; unsubscribes from any previous group, and subscribes to this group.
- *
- * Note this must be called *after* adding the policy to the entity.
- *
- * @param group
- *
- * @deprecated since 0.7; instead set the group as config
- */
- @Deprecated
- public void setGroup(Group group) {
- // relies on doReconfigureConfig to make the actual change
- LOG.warn("Deprecated use of setGroup in "+AbstractMembershipTrackingPolicy.class.getSimpleName()+"; group should be set as config");
- config().set(GROUP, group);
- }
-
@Override
protected <T> void doReconfigureConfig(ConfigKey<T> key, T val) {
if (GROUP.getName().equals(key.getName())) {
@@ -128,16 +112,6 @@ public abstract class AbstractMembershipTrackingPolicy extends AbstractPolicy {
}
}
- /**
- * Unsubscribes from the group.
- *
- * @deprecated since 0.7; misleading method name; either remove the policy, or suspend/resume
- */
- @Deprecated
- public void reset() {
- unsubscribeFromGroup();
- }
-
@Override
public void suspend() {
unsubscribeFromGroup();
@@ -216,7 +190,7 @@ public abstract class AbstractMembershipTrackingPolicy extends AbstractPolicy {
protected void unsubscribeFromGroup() {
Group group = getGroup();
- if (getSubscriptionTracker() != null && group != null) subscriptions().unsubscribe(group);
+ if (group != null) subscriptions().unsubscribe(group);
}
/** Invoked by framework prior to all entity events, to provide default highlight info;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/entity/group/DynamicGroup.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/entity/group/DynamicGroup.java b/core/src/main/java/org/apache/brooklyn/entity/group/DynamicGroup.java
index 6b7f3a2..4787297 100644
--- a/core/src/main/java/org/apache/brooklyn/entity/group/DynamicGroup.java
+++ b/core/src/main/java/org/apache/brooklyn/entity/group/DynamicGroup.java
@@ -70,10 +70,6 @@ public interface DynamicGroup extends AbstractGroup {
/** Sets {@link #ENTITY_FILTER}, overriding (and rescanning all) if already set. */
void setEntityFilter(Predicate<? super Entity> filter);
- /** @deprecated since 0.7.0; use {@link #setEntityFilter(Predicate)} */
- @Deprecated
- void setEntityFilter(Closure<Boolean> filter);
-
/** As {@link #addSubscription(Entity, Sensor)} but with an additional filter. */
<T> void addSubscription(Entity producer, Sensor<T> sensor, Predicate<? super SensorEvent<? super T>> filter);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/entity/group/DynamicGroupImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/entity/group/DynamicGroupImpl.java b/core/src/main/java/org/apache/brooklyn/entity/group/DynamicGroupImpl.java
index 0815d93..2470c7e 100644
--- a/core/src/main/java/org/apache/brooklyn/entity/group/DynamicGroupImpl.java
+++ b/core/src/main/java/org/apache/brooklyn/entity/group/DynamicGroupImpl.java
@@ -33,7 +33,6 @@ import org.apache.brooklyn.core.mgmt.internal.CollectionChangeListener;
import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
import org.apache.brooklyn.util.core.task.Tasks;
import org.apache.brooklyn.util.exceptions.Exceptions;
-import org.apache.brooklyn.util.groovy.GroovyJavaMethods;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,8 +41,6 @@ import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
-import groovy.lang.Closure;
-
public class DynamicGroupImpl extends AbstractGroupImpl implements DynamicGroup {
private static final Logger log = LoggerFactory.getLogger(DynamicGroupImpl.class);
@@ -65,12 +62,6 @@ public class DynamicGroupImpl extends AbstractGroupImpl implements DynamicGroup
rescanEntities();
}
- @Deprecated
- @Override
- public void setEntityFilter(Closure<Boolean> filter) {
- setEntityFilter(filter != null ? GroovyJavaMethods.<Entity>predicateFromClosure(filter) : null);
- }
-
@Override
public Predicate<? super Entity> entityFilter() {
return getEntityFilter();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/feed/CommandPollConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/feed/CommandPollConfig.java b/core/src/main/java/org/apache/brooklyn/feed/CommandPollConfig.java
index f3d8cc4..6da0985 100644
--- a/core/src/main/java/org/apache/brooklyn/feed/CommandPollConfig.java
+++ b/core/src/main/java/org/apache/brooklyn/feed/CommandPollConfig.java
@@ -79,22 +79,10 @@ public class CommandPollConfig<T> extends PollConfig<SshPollValue, T, CommandPol
commandSupplier = other.commandSupplier;
}
- /** @deprecated since 0.7.0; use {@link #getCommandSupplier()} and resolve just-in-time */
- @Deprecated
- public String getCommand() {
- return getCommandSupplier().get();
- }
public Supplier<String> getCommandSupplier() {
return commandSupplier;
}
- /** @deprecated since 0.7.0; use {@link #getEnvSupplier()} and resolve just-in-time */
- @Deprecated
- public Map<String, String> getEnv() {
- return getEnvSupplier().get();
- }
-
- @SuppressWarnings("unused")
public Supplier<Map<String,String>> getEnvSupplier() {
return new CombiningEnvSupplier(dynamicEnvironmentSupplier);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/feed/function/FunctionFeed.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/feed/function/FunctionFeed.java b/core/src/main/java/org/apache/brooklyn/feed/function/FunctionFeed.java
index 0a6d060..962c2c0 100644
--- a/core/src/main/java/org/apache/brooklyn/feed/function/FunctionFeed.java
+++ b/core/src/main/java/org/apache/brooklyn/feed/function/FunctionFeed.java
@@ -171,7 +171,7 @@ public class FunctionFeed extends AbstractFeed {
}
protected FunctionFeed(Builder builder) {
- setConfig(ONLY_IF_SERVICE_UP, builder.onlyIfServiceUp);
+ config().set(ONLY_IF_SERVICE_UP, builder.onlyIfServiceUp);
SetMultimap<FunctionPollIdentifier, FunctionPollConfig<?,?>> polls = HashMultimap.<FunctionPollIdentifier,FunctionPollConfig<?,?>>create();
for (FunctionPollConfig<?,?> config : builder.polls) {
@@ -182,7 +182,7 @@ public class FunctionFeed extends AbstractFeed {
Callable<?> job = config.getCallable();
polls.put(new FunctionPollIdentifier(job), configCopy);
}
- setConfig(POLLS, polls);
+ config().set(POLLS, polls);
initUniqueTag(builder.uniqueTag, polls.values());
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java b/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java
index a2d3125..64a6169 100644
--- a/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java
+++ b/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java
@@ -45,6 +45,7 @@ import org.apache.brooklyn.core.feed.DelegatingPollHandler;
import org.apache.brooklyn.core.feed.Poller;
import org.apache.brooklyn.core.location.Locations;
import org.apache.brooklyn.core.location.Machines;
+import org.apache.brooklyn.core.location.internal.LocationInternal;
import org.apache.brooklyn.util.executor.HttpExecutorFactory;
import org.apache.brooklyn.util.guava.Maybe;
import org.apache.brooklyn.util.http.HttpToolResponse;
@@ -342,7 +343,7 @@ public class HttpFeed extends AbstractFeed {
Maybe<MachineLocation> location = Machines.findUniqueElement(locations, MachineLocation.class);
if (location.isPresent() && location.get().hasExtension(HttpExecutorFactory.class)) {
httpExecutorFactory = location.get().getExtension(HttpExecutorFactory.class);
- Map<String, Object> httpExecutorProps = location.get().getAllConfig(true);
+ Map<String, Object> httpExecutorProps = ((LocationInternal)location.get()).config().getBag().getAllConfig();
httpExecutor = httpExecutorFactory.getHttpExecutor(httpExecutorProps);
} else {
httpExecutor = HttpExecutorImpl.newInstance();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/feed/http/HttpPollValue.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/feed/http/HttpPollValue.java b/core/src/main/java/org/apache/brooklyn/feed/http/HttpPollValue.java
deleted file mode 100644
index de3a4b5..0000000
--- a/core/src/main/java/org/apache/brooklyn/feed/http/HttpPollValue.java
+++ /dev/null
@@ -1,40 +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.brooklyn.feed.http;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.brooklyn.util.http.HttpToolResponse;
-
-/** @deprecated since 0.7.0, use {@link HttpToolResponse}.
- * the old {@link HttpPollValue} concrete class has been renamed {@link HttpToolResponse}
- * because it has nothing specific to polls. this is now just a transitional interface. */
-@Deprecated
-public interface HttpPollValue {
-
- public int getResponseCode();
- public String getReasonPhrase();
- public long getStartTime();
- public long getLatencyFullContent();
- public long getLatencyFirstResponse();
- public Map<String, List<String>> getHeaderLists();
- public byte[] getContent();
-
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/feed/http/HttpPolls.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/feed/http/HttpPolls.java b/core/src/main/java/org/apache/brooklyn/feed/http/HttpPolls.java
deleted file mode 100644
index ecc33ed..0000000
--- a/core/src/main/java/org/apache/brooklyn/feed/http/HttpPolls.java
+++ /dev/null
@@ -1,39 +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.brooklyn.feed.http;
-
-import java.net.URI;
-
-import org.apache.brooklyn.util.http.HttpTool;
-import org.apache.brooklyn.util.http.HttpToolResponse;
-import org.apache.http.impl.client.DefaultHttpClient;
-
-import com.google.common.collect.ImmutableMap;
-
-/**
- * @deprecated since 0.7; use {@link HttpTool}
- */
-@Deprecated
-public class HttpPolls {
-
- public static HttpToolResponse executeSimpleGet(URI uri) {
- return HttpTool.httpGet(new DefaultHttpClient(), uri, ImmutableMap.<String,String>of());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/feed/shell/ShellFeed.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/feed/shell/ShellFeed.java b/core/src/main/java/org/apache/brooklyn/feed/shell/ShellFeed.java
index 3f78c3a..ab617f1 100644
--- a/core/src/main/java/org/apache/brooklyn/feed/shell/ShellFeed.java
+++ b/core/src/main/java/org/apache/brooklyn/feed/shell/ShellFeed.java
@@ -209,7 +209,7 @@ public class ShellFeed extends AbstractFeed {
polls.put(new ShellPollIdentifier(command, env, dir, input, context, timeout), configCopy);
}
- setConfig(POLLS, polls);
+ config().set(POLLS, polls);
initUniqueTag(builder.uniqueTag, polls.values());
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/feed/ssh/SshValueFunctions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/feed/ssh/SshValueFunctions.java b/core/src/main/java/org/apache/brooklyn/feed/ssh/SshValueFunctions.java
index f73f604..67fbca5 100644
--- a/core/src/main/java/org/apache/brooklyn/feed/ssh/SshValueFunctions.java
+++ b/core/src/main/java/org/apache/brooklyn/feed/ssh/SshValueFunctions.java
@@ -114,22 +114,6 @@ public class SshValueFunctions {
}
public static Function<SshPollValue, Boolean> exitStatusEquals(final int expected) {
- return chain(SshValueFunctions.exitStatus(), Functions.forPredicate(Predicates.equalTo(expected)));
- }
-
- /**
- * @deprecated since 0.9.0; use {@link Functionals#chain(Function, Function)}
- */
- @Deprecated
- public static <A,B,C> Function<A,C> chain(final Function<A,? extends B> f1, final Function<B,C> f2) {
- return Functionals.chain(f1, f2);
- }
-
- /**
- * @deprecated since 0.9.0; use {@link Functionals#chain(Function, Function, Function)}
- */
- @Deprecated
- public static <A,B,C,D> Function<A,D> chain(final Function<A,? extends B> f1, final Function<B,? extends C> f2, final Function<C,D> f3) {
- return Functionals.chain(f1, f2, f3);
+ return Functionals.chain(SshValueFunctions.exitStatus(), Functions.forPredicate(Predicates.equalTo(expected)));
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java
index ae26b05..1ea8a4d 100644
--- a/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java
+++ b/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java
@@ -71,9 +71,7 @@ import com.google.common.collect.Sets;
*/
public class LocalhostMachineProvisioningLocation extends FixedListMachineProvisioningLocation<SshMachineLocation> implements AddressableLocation, LocationWithObjectStore {
- /** @deprecated since 0.9.0; shouldn't be public */
- @Deprecated
- public static final Logger LOG = LoggerFactory.getLogger(LocalhostMachineProvisioningLocation.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LocalhostMachineProvisioningLocation.class);
public static final ConfigKey<Boolean> SKIP_ON_BOX_BASE_DIR_RESOLUTION = ConfigKeys.newConfigKeyWithDefault(
BrooklynConfigKeys.SKIP_ON_BOX_BASE_DIR_RESOLUTION,
@@ -152,7 +150,7 @@ public class LocalhostMachineProvisioningLocation extends FixedListMachineProvis
}
if (getConfig(BrooklynConfigKeys.ONBOX_BASE_DIR)==null && (getManagementContext()==null || getManagementContext().getConfig().getConfig(BrooklynConfigKeys.ONBOX_BASE_DIR)==null)) {
- setConfig(BrooklynConfigKeys.ONBOX_BASE_DIR, "/tmp/brooklyn-"+Os.user());
+ config().set(BrooklynConfigKeys.ONBOX_BASE_DIR, "/tmp/brooklyn-"+Os.user());
}
return this;
@@ -187,7 +185,7 @@ public class LocalhostMachineProvisioningLocation extends FixedListMachineProvis
// (or alternatively switch to copying all ancestor keys)
for (HasConfigKey<?> k: SshMachineLocation.ALL_SSH_CONFIG_KEYS) {
if (config().getRaw(k).isPresent())
- flags2.put(k, getConfig(k));
+ flags2.put(k, config().get(k));
}
if (isManaged()) {
[3/7] brooklyn-server git commit: Deletes old deprecated code
Posted by tb...@apache.org.
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
index 7033398..0ef3812 100644
--- a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
+++ b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
@@ -765,8 +765,9 @@ public class SshMachineLocation extends AbstractLocation implements MachineLocat
private Map<String, Object> augmentPropertiesWithSshConfigGivenToProps(Map<String, ?> props) {
Map<String,Object> augmentedProps = Maps.newHashMap(props);
for (ConfigKey<?> config : SSH_CONFIG_GIVEN_TO_PROPS) {
- if (!augmentedProps.containsKey(config.getName()) && hasConfig(config, true))
+ if (!augmentedProps.containsKey(config.getName()) && config().getRaw(config).isPresent()) {
augmentedProps.put(config.getName(), getConfig(config));
+ }
}
return augmentedProps;
}
@@ -795,18 +796,6 @@ public class SshMachineLocation extends AbstractLocation implements MachineLocat
}.logger(logSsh);
}
- /**
- * @deprecated since 0.7.0; use {@link #execCommands(Map, String, List, Map), and rely on that calling the execWithLogging
- */
- @SuppressWarnings({"rawtypes", "unchecked"})
- @Deprecated
- protected int execWithLogging(Map<String,?> props, String summaryForLogging, List<String> commands, Map env, final Closure<Integer> execCommand) {
- return newExecWithLoggingHelpers().execWithLogging(props, summaryForLogging, commands, env, new ExecRunner() {
- @Override public int exec(ShellTool ssh, Map<String, ?> flags, List<String> cmds, Map<String, ?> env) {
- return execCommand.call(ssh, flags, cmds, env);
- }});
- }
-
public int copyTo(File src, File destination) {
return copyTo(MutableMap.<String,Object>of(), src, destination);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/BrooklynLanguageExtensions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/BrooklynLanguageExtensions.java b/core/src/main/java/org/apache/brooklyn/util/core/BrooklynLanguageExtensions.java
deleted file mode 100644
index 05b53d3..0000000
--- a/core/src/main/java/org/apache/brooklyn/util/core/BrooklynLanguageExtensions.java
+++ /dev/null
@@ -1,46 +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.brooklyn.util.core;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.brooklyn.core.internal.BrooklynInitialization;
-
-/** @deprecated since 0.7.0 use {@link BrooklynInitialization} */
-@Deprecated
-public class BrooklynLanguageExtensions {
-
- private BrooklynLanguageExtensions() {}
-
- private static AtomicBoolean done = new AtomicBoolean(false);
-
- public synchronized static void reinit() {
- done.set(false);
- init();
- }
-
- /** performs the language extensions required for this project */
- public synchronized static void init() {
- if (done.getAndSet(true)) return;
- BrooklynInitialization.initPortRanges();
- }
-
- static { BrooklynInitialization.initLegacyLanguageExtensions(); }
-
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/ResourceUtils.java b/core/src/main/java/org/apache/brooklyn/util/core/ResourceUtils.java
index 88bb4ad..ecc50b4 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/ResourceUtils.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/ResourceUtils.java
@@ -23,7 +23,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.InetAddress;
import java.net.MalformedURLException;
@@ -33,16 +32,26 @@ import java.net.URL;
import java.net.URLDecoder;
import java.util.List;
import java.util.NoSuchElementException;
-import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.mgmt.classloading.BrooklynClassLoadingContext;
-import org.apache.brooklyn.core.catalog.internal.CatalogUtils;
import org.apache.brooklyn.core.catalog.internal.BasicBrooklynCatalog.BrooklynLoaderTracker;
+import org.apache.brooklyn.core.catalog.internal.CatalogUtils;
import org.apache.brooklyn.core.internal.BrooklynInitialization;
import org.apache.brooklyn.core.mgmt.classloading.JavaBrooklynClassLoadingContext;
+import org.apache.brooklyn.location.ssh.SshMachineLocation;
+import org.apache.brooklyn.util.collections.MutableMap;
+import org.apache.brooklyn.util.core.text.DataUriSchemeParser;
+import org.apache.brooklyn.util.exceptions.Exceptions;
+import org.apache.brooklyn.util.http.HttpTool;
+import org.apache.brooklyn.util.http.HttpTool.HttpClientBuilder;
+import org.apache.brooklyn.util.net.Urls;
+import org.apache.brooklyn.util.os.Os;
+import org.apache.brooklyn.util.osgi.OsgiUtils;
+import org.apache.brooklyn.util.stream.Streams;
+import org.apache.brooklyn.util.text.Strings;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.auth.Credentials;
@@ -52,25 +61,12 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.util.EntityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.brooklyn.location.ssh.SshMachineLocation;
-import org.apache.brooklyn.util.collections.MutableMap;
-import org.apache.brooklyn.util.http.HttpTool;
-import org.apache.brooklyn.util.http.HttpTool.HttpClientBuilder;
-import org.apache.brooklyn.util.core.text.DataUriSchemeParser;
-import org.apache.brooklyn.util.exceptions.Exceptions;
-import org.apache.brooklyn.util.javalang.Threads;
-import org.apache.brooklyn.util.net.Urls;
-import org.apache.brooklyn.util.os.Os;
-import org.apache.brooklyn.util.stream.Streams;
-import org.apache.brooklyn.util.text.Strings;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
-import org.apache.brooklyn.util.osgi.OsgiUtils;
-
public class ResourceUtils {
private static final Logger log = LoggerFactory.getLogger(ResourceUtils.class);
@@ -347,21 +343,6 @@ public class ResourceUtils {
}
}
- /** @deprecated since 0.7.0; use method {@link Os#mergePaths(String...)} */ @Deprecated
- public static String mergeFilePaths(String... items) {
- return Os.mergePaths(items);
- }
-
- /** @deprecated since 0.7.0; use method {@link Os#tidyPath(String)} */ @Deprecated
- public static String tidyFilePath(String path) {
- return Os.tidyPath(path);
- }
-
- /** @deprecated since 0.7.0; use method {@link Urls#getProtocol(String)} */ @Deprecated
- public static String getProtocol(String url) {
- return Urls.getProtocol(url);
- }
-
private InputStream getResourceViaClasspath(String url) throws IOException {
assert url.startsWith("classpath:");
String subUrl = url.substring("classpath:".length());
@@ -561,50 +542,4 @@ public class ResourceUtils {
public static URL getContainerUrl(URL url, String resourceInThatDir) {
return OsgiUtils.getContainerUrl(url, resourceInThatDir);
}
-
- /** @deprecated since 0.7.0 use {@link Streams#copy(InputStream, OutputStream)} */ @Deprecated
- public static void copy(InputStream input, OutputStream output) throws IOException {
- Streams.copy(input, output);
- }
-
- /** @deprecated since 0.7.0; use same method in {@link Os} */ @Deprecated
- public static File mkdirs(File dir) {
- return Os.mkdirs(dir);
- }
-
- /** @deprecated since 0.7.0; use same method in {@link Os} */ @Deprecated
- public static File writeToTempFile(InputStream is, String prefix, String suffix) {
- return Os.writeToTempFile(is, prefix, suffix);
- }
-
- /** @deprecated since 0.7.0; use same method in {@link Os} */ @Deprecated
- public static File writeToTempFile(InputStream is, File tempDir, String prefix, String suffix) {
- return Os.writeToTempFile(is, tempDir, prefix, suffix);
- }
-
- /** @deprecated since 0.7.0; use method {@link Os#writePropertiesToTempFile(Properties, String, String)} */ @Deprecated
- public static File writeToTempFile(Properties props, String prefix, String suffix) {
- return Os.writePropertiesToTempFile(props, prefix, suffix);
- }
-
- /** @deprecated since 0.7.0; use method {@link Os#writePropertiesToTempFile(Properties, File, String, String)} */ @Deprecated
- public static File writeToTempFile(Properties props, File tempDir, String prefix, String suffix) {
- return Os.writePropertiesToTempFile(props, tempDir, prefix, suffix);
- }
-
- /** @deprecated since 0.7.0; use method {@link Threads#addShutdownHook(Runnable)} */ @Deprecated
- public static Thread addShutdownHook(final Runnable task) {
- return Threads.addShutdownHook(task);
- }
- /** @deprecated since 0.7.0; use method {@link Threads#removeShutdownHook(Thread)} */ @Deprecated
- public static boolean removeShutdownHook(Thread hook) {
- return Threads.removeShutdownHook(hook);
- }
-
- /** returns the items with exactly one "/" between items (whether or not the individual items start or end with /),
- * except where character before the / is a : (url syntax) in which case it will permit multiple (will not remove any)
- * @deprecated since 0.7.0 use either {@link Os#mergePathsUnix(String...)} {@link Urls#mergePaths(String...) */ @Deprecated
- public static String mergePaths(String ...items) {
- return Urls.mergePaths(items);
- }
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/config/ConfigBag.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/config/ConfigBag.java b/core/src/main/java/org/apache/brooklyn/util/core/config/ConfigBag.java
index 1075cf1..5d77e32 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/config/ConfigBag.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/config/ConfigBag.java
@@ -132,7 +132,7 @@ public class ConfigBag {
/** @deprecated since 0.7.0, not used; kept only for rebind compatibility where the inner class is used
* (now replaced by a static class above) */
@Beta @Deprecated
- public static ConfigBag newInstanceWithInnerClass(final ConfigBag configBag, Map<?,?> optionalAdditionalValues) {
+ private static ConfigBag newInstanceWithInnerClass(final ConfigBag configBag, Map<?,?> optionalAdditionalValues) {
return new ConfigBag() {
@Override
public void markUsed(String key) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/crypto/SecureKeys.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/crypto/SecureKeys.java b/core/src/main/java/org/apache/brooklyn/util/core/crypto/SecureKeys.java
index 5a1e54a..30aa0cb 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/crypto/SecureKeys.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/crypto/SecureKeys.java
@@ -131,7 +131,15 @@ public class SecureKeys extends SecureKeysWithoutBouncyCastle {
* this starts -----BEGIN PRIVATE KEY----- and ends similarly, like id_rsa.
* also see {@link #readPem(byte[], String)} */
public static String toPem(KeyPair key) {
- return stringPem(key);
+ try {
+ StringWriter sw = new StringWriter();
+ PEMWriter w = new PEMWriter(sw);
+ w.writeObject(key);
+ w.close();
+ return sw.toString();
+ } catch (IOException e) {
+ throw Throwables.propagate(e);
+ }
}
/** returns id_rsa.pub style file, of public key */
@@ -143,17 +151,4 @@ public class SecureKeys extends SecureKeysWithoutBouncyCastle {
public static PublicKey fromPub(String pubText) {
return AuthorizedKeysParser.decodePublicKey(pubText);
}
-
- /** @deprecated since 0.7.0, use {@link #toPem(KeyPair)} */ @Deprecated
- public static String stringPem(KeyPair key) {
- try {
- StringWriter sw = new StringWriter();
- PEMWriter w = new PEMWriter(sw);
- w.writeObject(key);
- w.close();
- return sw.toString();
- } catch (IOException e) {
- throw Throwables.propagate(e);
- }
- }
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveBuilder.java b/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveBuilder.java
index 5213d8e..19cecac 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveBuilder.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveBuilder.java
@@ -147,39 +147,6 @@ public class ArchiveBuilder {
}
/**
- * Add the file located at the {@code filePath} to the archive,
- * with some complicated base-name strategies.
- *
- * @deprecated since 0.7.0 use one of the other add methods which makes the strategy explicit */ @Deprecated
- public ArchiveBuilder add(String filePath) {
- checkNotNull(filePath, "filePath");
- return add(new File(Os.tidyPath(filePath)));
- }
-
- /**
- * Add the {@code file} to the archive.
- * <p>
- * If the file path is absolute, or points to a file above the current directory,
- * the file is added to the archive as a top-level entry, using the file name only.
- * For relative {@code filePath}s below the current directory, the file is added
- * using the path given and is assumed to be located relative to the current
- * working directory.
- * <p>
- * No checks for file existence are made at this stage.
- *
- * @see #entry(String, File)
- * @deprecated since 0.7.0 use one of the other add methods which makes the strategy explicit */ @Deprecated
- public ArchiveBuilder add(File file) {
- checkNotNull(file, "file");
- String filePath = Os.tidyPath(file.getPath());
- if (file.isAbsolute() || filePath.startsWith("../")) {
- return entry(Os.mergePaths(".", file.getName()), file);
- } else {
- return entry(Os.mergePaths(".", filePath), file);
- }
- }
-
- /**
* Add a file located at the {@code fileSubPath}, relative to the {@code baseDir} on the local system,
* as {@code fileSubPath} in the archive. For most archives directories are supported.
* <p>
@@ -199,16 +166,6 @@ public class ArchiveBuilder {
checkNotNull(fileSubPath, "filePath");
return entry(fileSubPath, Os.mergePaths(baseDir.getPath(), fileSubPath));
}
- /** @deprecated since 0.7.0 use {@link #addFromLocalBaseDir(File, String)}, or
- * one of the other add methods if adding relative to baseDir was not intended */ @Deprecated
- public ArchiveBuilder addFromLocalBaseDir(String baseDir, String fileSubPath) {
- return addFromLocalBaseDir(new File(baseDir), fileSubPath);
- }
- /** @deprecated since 0.7.0 use {@link #addFromLocalBaseDir(File, String)}, or
- * one of the other add methods if adding relative to baseDir was not intended */ @Deprecated
- public ArchiveBuilder add(String baseDir, String fileSubPath) {
- return addFromLocalBaseDir(baseDir, fileSubPath);
- }
/**
* Adds the given file or directory to the archive, preserving its name but putting under the given directory in the archive (may be <code>""</code> or <code>"./"</code>).
@@ -228,16 +185,6 @@ public class ArchiveBuilder {
}
/**
- * Add the contents of the directory named {@code dirName} to the archive.
- *
- * @see #addDir(File)
- * @deprecated since 0.7.0 use {@link #addDirContentsAt(File, String) */ @Deprecated
- public ArchiveBuilder addDir(String dirName) {
- checkNotNull(dirName, "dirName");
- return addDir(new File(Os.tidyPath(dirName)));
- }
-
- /**
* Add the contents of the directory {@code dir} to the archive.
* The directory's name is not included; use {@link #addAt(File, String)} with <code>""</code> as the second argument if you want that behavior.
*
@@ -254,45 +201,6 @@ public class ArchiveBuilder {
}
/**
- * As {@link #addDirContentsAt(File, String)},
- * using {@literal .} as the parent directory name for the contents.
- *
- * @deprecated since 0.7.0 use {@link #addDirContentsAt(File, String)
- * to clarify API, argument types, and be explicit about where it should be installed,
- * because JARs seem to require <code>""<code> whereas ZIPs might want <code>"./"</code>. */ @Deprecated
- public ArchiveBuilder addDir(File dir) {
- return addDirContentsAt(dir, ".");
- }
-
- /**
- * Add the collection of {@code files} to the archive.
- *
- * @see #add(String)
- * @deprecated since 0.7.0 use one of the other add methods if keeping this file's path was not intended */ @Deprecated
- public ArchiveBuilder add(Iterable<String> files) {
- checkNotNull(files, "files");
- for (String filePath : files) {
- add(filePath);
- }
- return this;
- }
-
- /**
- * Add the collection of {@code files}, relative to the {@code baseDir}, to
- * the archive.
- *
- * @see #add(String, String)
- * @deprecated since 0.7.0 use one of the other add methods if keeping this file's path was not intended */ @Deprecated
- public ArchiveBuilder add(String baseDir, Iterable<String> files) {
- checkNotNull(baseDir, "baseDir");
- checkNotNull(files, "files");
- for (String filePath : files) {
- add(baseDir, filePath);
- }
- return this;
- }
-
- /**
* Add the {@code file} to the archive with the path {@code entryPath}.
*
* @see #entry(String, File)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/flags/FlagUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/flags/FlagUtils.java b/core/src/main/java/org/apache/brooklyn/util/core/flags/FlagUtils.java
index 589dc4f..4ee4930 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/flags/FlagUtils.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/flags/FlagUtils.java
@@ -146,13 +146,6 @@ public class FlagUtils {
}
/** sets _all_ accessible _{@link ConfigKey}_ and {@link HasConfigKey} fields on the given object,
- * using the indicated flags/config-bag
- * @deprecated since 0.7.0 use {@link #setAllConfigKeys(Map, Configurable, boolean)} */
- @Deprecated
- public static Map<String, ?> setAllConfigKeys(Map<String, ?> flagsOrConfig, Configurable instance) {
- return setAllConfigKeys(flagsOrConfig, instance, false);
- }
- /** sets _all_ accessible _{@link ConfigKey}_ and {@link HasConfigKey} fields on the given object,
* using the indicated flags/config-bag */
public static Map<String, ?> setAllConfigKeys(Map<String, ?> flagsOrConfig, Configurable instance, boolean includeFlags) {
ConfigBag bag = new ConfigBag().putAll(flagsOrConfig);
@@ -161,13 +154,6 @@ public class FlagUtils {
}
/** sets _all_ accessible _{@link ConfigKey}_ and {@link HasConfigKey} fields on the given object,
- * using the indicated flags/config-bag
- * @deprecated since 0.7.0 use {@link #setAllConfigKeys(Configurable, ConfigBag, boolean)} */
- @Deprecated
- public static void setAllConfigKeys(Configurable o, ConfigBag bag) {
- setAllConfigKeys(o, bag, false);
- }
- /** sets _all_ accessible _{@link ConfigKey}_ and {@link HasConfigKey} fields on the given object,
* using the indicated flags/config-bag */
public static void setAllConfigKeys(Configurable o, ConfigBag bag, boolean includeFlags) {
for (Field f: getAllFields(o.getClass())) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/http/HttpTool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/http/HttpTool.java b/core/src/main/java/org/apache/brooklyn/util/core/http/HttpTool.java
deleted file mode 100644
index 3837d69..0000000
--- a/core/src/main/java/org/apache/brooklyn/util/core/http/HttpTool.java
+++ /dev/null
@@ -1,28 +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.brooklyn.util.core.http;
-
-
-
-/**
- * @deprecated since 0.9.0. Prefer {@link org.apache.brooklyn.util.http.HttpTool}.
- */
-@Deprecated
-public class HttpTool {
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/http/HttpToolResponse.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/http/HttpToolResponse.java b/core/src/main/java/org/apache/brooklyn/util/core/http/HttpToolResponse.java
deleted file mode 100644
index 1343c08..0000000
--- a/core/src/main/java/org/apache/brooklyn/util/core/http/HttpToolResponse.java
+++ /dev/null
@@ -1,31 +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.brooklyn.util.core.http;
-
-
-/**
- * @deprecated since 0.9.0. Prefer {@link org.apache.brooklyn.util.http.HttpToolResponse}.
- *
- * @see {@link HttpTool}
- */
-@Deprecated
-public class HttpToolResponse {
-
-
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/SshTool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/SshTool.java b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/SshTool.java
index 94c8609..785c58e 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/SshTool.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/SshTool.java
@@ -103,15 +103,6 @@ public interface SshTool extends ShellTool {
*/
public void connect();
- /**
- * @deprecated since 0.7.0; (since much earlier) this ignores the argument in favour of {@link #PROP_SSH_TRIES}
- *
- * @param maxAttempts
- * @throws SshException
- */
- @Deprecated
- public void connect(int maxAttempts);
-
public void disconnect();
public boolean isConnected();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliTool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliTool.java b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliTool.java
index e0bb94d..19dccdc 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliTool.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliTool.java
@@ -110,11 +110,6 @@ public class SshCliTool extends SshAbstractTool implements SshTool {
}
@Override
- public void connect(int maxAttempts) {
- // no-op
- }
-
- @Override
public void disconnect() {
if (LOG.isTraceEnabled()) LOG.trace("Disconnecting SshCliTool {} ({}) - no-op", this, System.identityHashCode(this));
// no-op
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/process/ProcessTool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/process/ProcessTool.java b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/process/ProcessTool.java
index 75d761b..7a5464e 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/process/ProcessTool.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/process/ProcessTool.java
@@ -122,23 +122,6 @@ public class ProcessTool extends ShellAbstractTool implements ShellTool {
return asInt(execProcesses(allcmds, env, directoryDir, out, err, separator, getOptionalVal(props, PROP_LOGIN_SHELL), this), -1);
}
- /**
- * as {@link #execProcesses(List, Map, OutputStream, OutputStream, String, boolean, Object)} but not using a login shell
- * @deprecated since 0.7; use {@link #execProcesses(List, Map, File, OutputStream, OutputStream, String, boolean, Object)}
- */
- @Deprecated
- public static int execProcesses(List<String> cmds, Map<String,?> env, OutputStream out, OutputStream err, String separator, Object contextForLogging) {
- return execProcesses(cmds, env, (File)null, out, err, separator, false, contextForLogging);
- }
-
- /**
- * @deprecated since 0.7; use {@link #execProcesses(List, Map, File, OutputStream, OutputStream, String, boolean, Object)}
- */
- @Deprecated
- public static int execProcesses(List<String> cmds, Map<String,?> env, OutputStream out, OutputStream err, String separator, boolean asLoginShell, Object contextForLogging) {
- return execProcesses(cmds, env, (File)null, out, err, separator, asLoginShell, contextForLogging);
- }
-
/** executes a set of commands by sending them as a single process to `bash -c`
* (single command argument of all the commands, joined with separator)
* <p>
@@ -152,14 +135,6 @@ public class ProcessTool extends ShellAbstractTool implements ShellTool {
return execSingleProcess(commands, env, directory, out, err, contextForLogging);
}
- /**
- * @deprecated since 0.7; use {@link #execSingleProcess(List, Map, File, OutputStream, OutputStream, Object)}
- */
- @Deprecated
- public static int execSingleProcess(List<String> cmdWords, Map<String,?> env, OutputStream out, OutputStream err, Object contextForLogging) {
- return execSingleProcess(cmdWords, env, (File)null, out, err, contextForLogging);
- }
-
/** executes a single process made up of the given command words (*not* bash escaped);
* should be portable across OS's */
public static int execSingleProcess(List<String> cmdWords, Map<String,?> env, File directory, OutputStream out, OutputStream err, Object contextForLogging) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjTool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjTool.java b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjTool.java
index a9ed010..385513e 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjTool.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjTool.java
@@ -210,12 +210,6 @@ public class SshjTool extends SshAbstractTool implements SshTool {
}
@Override
- @Deprecated // see super
- public void connect(int maxAttempts) {
- connect(); // FIXME Should callers instead configure sshTries? But that would apply to all ssh attempts
- }
-
- @Override
public void disconnect() {
if (LOG.isTraceEnabled()) LOG.trace("Disconnecting SshjTool {} ({})", this, System.identityHashCode(this));
try {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/osgi/BundleMaker.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/osgi/BundleMaker.java b/core/src/main/java/org/apache/brooklyn/util/core/osgi/BundleMaker.java
index d87bcf8..374eb5d 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/osgi/BundleMaker.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/osgi/BundleMaker.java
@@ -110,8 +110,6 @@ public class BundleMaker {
addUrlItemRecursively(zout, path, path, Predicates.alwaysTrue());
}
- Streams.closeQuietly(zout);
-
return f;
} catch (Exception e) {
@@ -298,15 +296,17 @@ public class BundleMaker {
Exceptions.propagateIfFatal(e);
return false;
}
-
- if (isKnownNotToBeADirectoryListing(item) || !
+ try {
// can't reliably tell if item a file or a folder (listing files), esp w classpath where folder is treated as a list of files,
// so if we can't tell try it as a list of files; not guaranteed, and empty dir and a file of size 0 will appear identical, but better than was
// (mainly used for tests)
- addUrlDirToZipRecursively(zout, root, item, itemFound, filter)) {
- addUrlFileToZip(zout, root, item, filter);
+ if (isKnownNotToBeADirectoryListing(item) || !addUrlDirToZipRecursively(zout, root, item, itemFound, filter)) {
+ addUrlFileToZip(zout, root, item, filter);
+ }
+ return true;
+ } finally {
+ Streams.closeQuietly(itemFound);
}
- return true;
}
private boolean isKnownNotToBeADirectoryListing(String item) {
@@ -348,13 +348,6 @@ public class BundleMaker {
}
private void addUrlFileToZip(ZipOutputStream zout, String root, String item, Predicate<? super String> filter) throws IOException {
- InputStream itemFound = null;
- try {
- itemFound = resources.getResourceFromUrl(item);
- } catch (Exception e) {
- throw Exceptions.propagate(e);
- }
-
int startPos = item.indexOf(root);
if (startPos<0) {
throw new IllegalStateException("URL of "+item+" does not appear relative to root "+root);
@@ -370,11 +363,20 @@ public class BundleMaker {
if (!filter.apply(itemE)) {
return;
}
- ZipEntry e = new ZipEntry(itemE);
- zout.putNextEntry(e);
- Streams.copy(itemFound, zout);
- Streams.closeQuietly(itemFound);
- zout.closeEntry();
+
+ InputStream itemFound = null;
+ try {
+ itemFound = resources.getResourceFromUrl(item);
+
+ ZipEntry e = new ZipEntry(itemE);
+ zout.putNextEntry(e);
+ Streams.copy(itemFound, zout);
+ zout.closeEntry();
+ } catch (Exception e) {
+ throw Exceptions.propagate(e);
+ } finally {
+ Streams.closeQuietly(itemFound);
+ }
}
/** Creates a temporary file with the given metadata */
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java b/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
index db459ae..6d7651a 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
@@ -26,7 +26,6 @@ import java.net.URISyntaxException;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import java.util.Map;
import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
@@ -287,39 +286,6 @@ public class Osgis {
return new BundleFinder(framework);
}
- /** @deprecated since 0.7.0 use {@link #bundleFinder(Framework)} */ @Deprecated
- public static List<Bundle> getBundlesByName(Framework framework, String symbolicName, Predicate<Version> versionMatcher) {
- return bundleFinder(framework).symbolicName(symbolicName).version(versionMatcher).findAll();
- }
-
- /** @deprecated since 0.7.0 use {@link #bundleFinder(Framework)} */ @Deprecated
- public static List<Bundle> getBundlesByName(Framework framework, String symbolicName) {
- return bundleFinder(framework).symbolicName(symbolicName).findAll();
- }
-
- /**
- * Tries to find a bundle in the given framework with name matching either `name' or `name:version'.
- * @deprecated since 0.7.0 use {@link #bundleFinder(Framework)} */ @Deprecated
- public static Maybe<Bundle> getBundle(Framework framework, String symbolicNameOptionallyWithVersion) {
- return bundleFinder(framework).id(symbolicNameOptionallyWithVersion).find();
- }
-
- /** @deprecated since 0.7.0 use {@link #bundleFinder(Framework)} */ @Deprecated
- public static Maybe<Bundle> getBundle(Framework framework, String symbolicName, String version) {
- return bundleFinder(framework).symbolicName(symbolicName).version(version).find();
- }
-
- /** @deprecated since 0.7.0 use {@link #bundleFinder(Framework)} */ @Deprecated
- public static Maybe<Bundle> getBundle(Framework framework, String symbolicName, Version version) {
- return bundleFinder(framework).symbolicName(symbolicName).version(Predicates.equalTo(version)).findUnique();
- }
-
- /** @deprecated since 0.9.0, replaced by {@link #getFramework(java.lang.String, boolean) } */
- @Deprecated
- public static Framework newFrameworkStarted(String felixCacheDir, boolean clean, Map<?,?> extraStartupConfig) {
- return getFramework(felixCacheDir, clean);
- }
-
/**
* Provides an OSGI framework.
*
@@ -346,20 +312,6 @@ public class Osgis {
SystemFrameworkLoader.get().ungetFramework(framework);
}
-
-
- /** @deprecated since 0.9.0, replaced with {@link OsgiUtils#getVersionedId(org.osgi.framework.Bundle) } */
- @Deprecated
- public static String getVersionedId(Bundle b) {
- return OsgiUtils.getVersionedId(b);
- }
-
- /** @deprecated since 0.9.0, replaced with {@link OsgiUtils#getVersionedId(java.util.jar.Manifest) } */
- @Deprecated
- public static String getVersionedId(Manifest manifest) {
- return OsgiUtils.getVersionedId(manifest);
- }
-
/**
* Installs a bundle from the given URL, doing a check if already installed, and
* using the {@link ResourceUtils} loader for this project (brooklyn core)
@@ -450,16 +402,9 @@ public class Osgis {
return ResourceUtils.create(Osgis.class).getResourceFromUrl(url);
}
- /** @deprecated since 0.9.0, replaced with {@code SystemFrameworkLoader.get().isSystemBundle(bundle)} */
- @Deprecated
- public static boolean isExtensionBundle(Bundle bundle) {
- return SystemFrameworkLoader.get().isSystemBundle(bundle);
- }
-
@Beta
public static Optional<Bundle> getBundleOf(Class<?> clazz) {
Bundle bundle = org.osgi.framework.FrameworkUtil.getBundle(clazz);
return Optional.fromNullable(bundle);
}
-
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java
index 816065e..aaf5b87 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java
@@ -52,14 +52,6 @@ public class TaskBuilder<T> {
return new TaskBuilder<T>();
}
- /**
- * @deprecated since 0.8.0; use {@link #displayName(String)}
- */
- @Deprecated
- public TaskBuilder<T> name(String name) {
- return displayName(name);
- }
-
public TaskBuilder<T> displayName(String displayName) {
this.displayName = displayName;
return this;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/task/TaskPredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskPredicates.java b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskPredicates.java
index ee34fb7..9cdb57a 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskPredicates.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskPredicates.java
@@ -28,12 +28,6 @@ import com.google.common.base.Predicates;
public class TaskPredicates {
- /** @deprecated since 0.9.0; use {@link #displayNameSatisfies(Predicate)} */
- @Deprecated
- public static Predicate<Task<?>> displayNameMatches(Predicate<? super String> matcher) {
- return displayNameSatisfies(matcher);
- }
-
/**
* @since 0.9.0
*/
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java b/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java
index 923f733..c3b8246 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java
@@ -74,11 +74,6 @@ public class TemplateProcessor {
return ObjectWrapper.DEFAULT_WRAPPER.wrap(o);
}
- /** @deprecated since 0.7.0 use {@link #processTemplateFile(String, Map)} */ @Deprecated
- public static String processTemplate(String templateFileName, Map<String, ? extends Object> substitutions) {
- return processTemplateFile(templateFileName, substitutions);
- }
-
/** As per {@link #processTemplateContents(String, Map)}, but taking a file. */
public static String processTemplateFile(String templateFileName, Map<String, ? extends Object> substitutions) {
String templateContents;
@@ -91,11 +86,6 @@ public class TemplateProcessor {
return processTemplateContents(templateContents, substitutions);
}
- /** @deprecated since 0.7.0 use {@link #processTemplateFile(String, EntityDriver, Map)} */ @Deprecated
- public static String processTemplate(String templateFileName, EntityDriver driver, Map<String, ? extends Object> extraSubstitutions) {
- return processTemplateFile(templateFileName, driver, extraSubstitutions);
- }
-
/** Processes template contents according to {@link EntityAndMapTemplateModel}. */
public static String processTemplateFile(String templateFileName, EntityDriver driver, Map<String, ? extends Object> extraSubstitutions) {
String templateContents;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/BrooklynVersionTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/BrooklynVersionTest.java b/core/src/test/java/org/apache/brooklyn/core/BrooklynVersionTest.java
index 049916c..0ef9232 100644
--- a/core/src/test/java/org/apache/brooklyn/core/BrooklynVersionTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/BrooklynVersionTest.java
@@ -52,13 +52,6 @@ public class BrooklynVersionTest {
}
@Test
- public void testGetHardcodedClasspathVersion() {
- @SuppressWarnings("deprecation")
- String v = BrooklynVersion.INSTANCE.getVersionFromClasspath();
- assertTrue(BrooklynVersion.get().equals(v) || "0.0.0-SNAPSHOT".equals(v), v);
- }
-
- @Test
public void testGetFromMaven() {
String v = BrooklynVersion.INSTANCE.getVersionFromMavenProperties();
assertTrue(v == null || BrooklynVersion.get().equals(v), v);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilderTest.java b/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilderTest.java
index f930b6e..8ba271b 100644
--- a/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilderTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilderTest.java
@@ -100,16 +100,6 @@ public class CatalogItemBuilderTest {
}
@Test
- public void testNameReplacedByDisplayName() {
- final CatalogEntityItemDto catalogItem = CatalogItemBuilder.newEntity(symbolicName, version)
- .name(name)
- .displayName(displayName)
- .build();
-
- assertEquals(catalogItem.getName(), displayName);
- }
-
- @Test
public void testBuiltEntity() {
final CatalogEntityItemDto catalogItem = CatalogItemBuilder.newEntity(symbolicName, version)
.javaType(javaType)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesTest.java b/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesTest.java
index d802892..77bfa7c 100644
--- a/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesTest.java
@@ -148,18 +148,18 @@ public class BrooklynPropertiesTest {
public void testGetSubMap() {
BrooklynProperties props = BrooklynProperties.Factory.newEmpty().addFromMap(ImmutableMap.of(
"a.key", "aval", "a.key2", "aval2", "akey", "noval", "b.key", "bval"));
- BrooklynProperties p2 = props.submap(ConfigPredicates.matchingGlob("a.*"));
+ BrooklynProperties p2 = props.submap(ConfigPredicates.nameMatchesGlob("a.*"));
assertEquals(p2.getAllConfig().keySet().size(), 2, "wrong size submap: "+p2);
assertEquals(p2.getFirst("a.key"), "aval");
assertEquals(p2.getFirst("b.key"), null);
assertEquals(p2.getFirst("akey"), null);
- BrooklynProperties p3a = props.submap(ConfigPredicates.startingWith("a."));
+ BrooklynProperties p3a = props.submap(ConfigPredicates.nameStartsWith("a."));
assertPropertiesEquals(p3a, p2);
- BrooklynProperties p3b = props.submap(ConfigPredicates.matchingRegex("a\\..*"));
+ BrooklynProperties p3b = props.submap(ConfigPredicates.nameMatchesRegex("a\\..*"));
assertPropertiesEquals(p3b, p2);
- BrooklynProperties p4 = props.submap(ConfigPredicates.matchingRegex("a.*"));
+ BrooklynProperties p4 = props.submap(ConfigPredicates.nameMatchesRegex("a.*"));
assertEquals(p4.getAllConfig().keySet().size(), 3, "wrong size submap: "+p4);
assertEquals(p4.getFirst("a.key"), "aval");
assertEquals(p4.getFirst("b.key"), null);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/config/ConfigPredicatesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/config/ConfigPredicatesTest.java b/core/src/test/java/org/apache/brooklyn/core/config/ConfigPredicatesTest.java
index e9bc9b5..e85968a 100644
--- a/core/src/test/java/org/apache/brooklyn/core/config/ConfigPredicatesTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/config/ConfigPredicatesTest.java
@@ -32,27 +32,21 @@ public class ConfigPredicatesTest extends BrooklynAppUnitTestSupport {
private final ConfigKey<String> STR1 = ConfigKeys.newStringConfigKey("test.str1");
@Test
- public void testNameMatchingPredicate() throws Exception {
- assertTrue(ConfigPredicates.nameMatching(Predicates.equalTo("test.str1")).apply(STR1));
- assertFalse(ConfigPredicates.nameMatching(Predicates.equalTo("wrong")).apply(STR1));
- }
-
- @Test
public void testNameMatchingGlob() throws Exception {
- assertTrue(ConfigPredicates.matchingGlob("*str*").apply(STR1));
- assertFalse(ConfigPredicates.matchingGlob("*wrong*").apply(STR1));
+ assertTrue(ConfigPredicates.nameMatchesGlob("*str*").apply(STR1));
+ assertFalse(ConfigPredicates.nameMatchesGlob("*wrong*").apply(STR1));
}
@Test
public void testNameMatchingRegex() throws Exception {
- assertTrue(ConfigPredicates.matchingRegex(".*str.*").apply(STR1));
- assertFalse(ConfigPredicates.matchingRegex(".*wrong.*").apply(STR1));
+ assertTrue(ConfigPredicates.nameMatchesRegex(".*str.*").apply(STR1));
+ assertFalse(ConfigPredicates.nameMatchesRegex(".*wrong.*").apply(STR1));
}
@Test
public void testNameStartingWith() throws Exception {
- assertTrue(ConfigPredicates.startingWith("test.s").apply(STR1));
- assertFalse(ConfigPredicates.startingWith("wrong.s").apply(STR1));
+ assertTrue(ConfigPredicates.nameStartsWith("test.s").apply(STR1));
+ assertFalse(ConfigPredicates.nameStartsWith("wrong.s").apply(STR1));
}
@Test
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/entity/AttributeTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/AttributeTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/AttributeTest.java
index e4e5699..f259ba7 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/AttributeTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/AttributeTest.java
@@ -19,7 +19,6 @@
package org.apache.brooklyn.core.entity;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.sensor.AttributeSensor;
@@ -54,14 +53,4 @@ public class AttributeTest extends BrooklynAppUnitTestSupport {
public void missingAttributeIsNull() {
assertEquals(entity.getAttribute(COLOR), null);
}
-
- @Test
- public void canGetAttributeByNameParts() {
- // Initially null
- assertNull(entityImpl.getAttributeByNameParts(COLOR.getNameParts()));
-
- // Once set, returns val
- entity.sensors().set(COLOR, "red");
- assertEquals(entityImpl.getAttributeByNameParts(COLOR.getNameParts()), "red");
- }
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/entity/EntitiesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntitiesTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntitiesTest.java
index 80ae563..909e8f8 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/EntitiesTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntitiesTest.java
@@ -107,12 +107,6 @@ public class EntitiesTest extends BrooklynAppUnitTestSupport {
assertEquals(Entities.attributeSupplier(entity, TestEntity.NAME).get(), "myname");
}
- @Test
- public void testAttributeSupplierUsingTuple() throws Exception {
- entity.sensors().set(TestEntity.NAME, "myname");
- assertEquals(Entities.attributeSupplier(EntityAndAttribute.supplier(entity, TestEntity.NAME)).get(), "myname");
- }
-
@Test(groups="Integration") // takes 1 second
public void testAttributeSupplierWhenReady() throws Exception {
final AtomicReference<String> result = new AtomicReference<String>();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigGroovyTest.groovy
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigGroovyTest.groovy b/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigGroovyTest.groovy
index 40d66be..faa619c 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigGroovyTest.groovy
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigGroovyTest.groovy
@@ -58,7 +58,7 @@ public class EntityConfigGroovyTest extends BrooklynAppUnitTestSupport {
@Test
public void testGetConfigOfPredicateTaskReturnsCoercedClosure() throws Exception {
MyOtherEntity entity2 = app.addChild(EntitySpec.create(MyOtherEntity.class));
- entity2.setConfig(MyOtherEntity.PREDICATE_KEY, { return it != null } );
+ entity2.config().set(MyOtherEntity.PREDICATE_KEY, { return it != null } );
Predicate<?> predicate = entity2.getConfig(MyOtherEntity.PREDICATE_KEY);
assertTrue(predicate instanceof Predicate, "predicate="+predicate);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/entity/EntitySpecTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntitySpecTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntitySpecTest.java
index fb84693..c679d00 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/EntitySpecTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntitySpecTest.java
@@ -31,7 +31,6 @@ import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.config.BasicConfigKey;
import org.apache.brooklyn.core.config.ConfigKeys;
import org.apache.brooklyn.core.enricher.AbstractEnricher;
-import org.apache.brooklyn.core.location.SimulatedLocation;
import org.apache.brooklyn.core.policy.AbstractPolicy;
import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
import org.apache.brooklyn.core.test.entity.TestEntity;
@@ -48,14 +47,12 @@ import com.google.common.collect.Iterables;
public class EntitySpecTest extends BrooklynAppUnitTestSupport {
- private SimulatedLocation loc;
private TestEntity entity;
@BeforeMethod(alwaysRun=true)
@Override
public void setUp() throws Exception {
super.setUp();
- loc = new SimulatedLocation();
}
@Test
@@ -96,15 +93,6 @@ public class EntitySpecTest extends BrooklynAppUnitTestSupport {
}
@Test
- public void testAddsPolicy() throws Exception {
- MyPolicy policy = new MyPolicy();
- entity = app.createAndManageChild(EntitySpec.create(TestEntity.class)
- .policy(policy));
-
- assertEquals(Iterables.getOnlyElement(entity.policies()), policy);
- }
-
- @Test
public void testAddsEnricherSpec() throws Exception {
entity = app.createAndManageChild(EntitySpec.create(TestEntity.class, TestEntityNoEnrichersImpl.class)
.enricher(EnricherSpec.create(MyEnricher.class)
@@ -119,15 +107,6 @@ public class EntitySpecTest extends BrooklynAppUnitTestSupport {
}
@Test
- public void testAddsEnricher() throws Exception {
- MyEnricher enricher = new MyEnricher();
- entity = app.createAndManageChild(EntitySpec.create(TestEntity.class, TestEntityNoEnrichersImpl.class)
- .enricher(enricher));
-
- assertEquals(Iterables.getOnlyElement(entity.enrichers()), enricher);
- }
-
- @Test
public void testAddsMembers() throws Exception {
entity = app.createAndManageChild(EntitySpec.create(TestEntity.class));
BasicGroup group = app.createAndManageChild(EntitySpec.create(BasicGroup.class)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/entity/EntityTypeTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntityTypeTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntityTypeTest.java
index e7cf727..8354253 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/EntityTypeTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntityTypeTest.java
@@ -210,7 +210,7 @@ public class EntityTypeTest extends BrooklynAppUnitTestSupport {
@Test
public void testRemoveSensorThroughEntity() throws Exception{
entity.sensors().set(TEST_SENSOR, "abc");
- entity.removeAttribute(TEST_SENSOR);
+ entity.sensors().remove(TEST_SENSOR);
assertFalse(entity.getEntityType().getSensors().contains(TEST_SENSOR), "sensors="+entity.getEntityType().getSensors());
assertEquals(entity.getAttribute(TEST_SENSOR), null);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/entity/PolicyRegistrationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/PolicyRegistrationTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/PolicyRegistrationTest.java
index 59d126f..c4341ef 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/PolicyRegistrationTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/PolicyRegistrationTest.java
@@ -81,13 +81,6 @@ public class PolicyRegistrationTest extends BrooklynAppUnitTestSupport {
}
@Test(expectedExceptions = { UnsupportedOperationException.class })
- @SuppressWarnings("deprecation")
- public void testGetPoliciesReturnsImmutableCollection() {
- entity.getPolicies().add(new MyPolicy());
- fail();
- }
-
- @Test(expectedExceptions = { UnsupportedOperationException.class })
public void testPoliciesAsListReturnsImmutableCollection() {
entity.policies().asList().add(new MyPolicy());
fail();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/location/LocationConfigTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/location/LocationConfigTest.java b/core/src/test/java/org/apache/brooklyn/core/location/LocationConfigTest.java
index fb6cb16..b5cd674 100644
--- a/core/src/test/java/org/apache/brooklyn/core/location/LocationConfigTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/location/LocationConfigTest.java
@@ -63,8 +63,6 @@ public class LocationConfigTest {
assertEquals(loc.config().getBag().getAllConfig(), ImmutableMap.of("mylocation.myconfig", "myval1", "mylocation.myconfigwithflagname", "myval2"));
assertEquals(loc.config().getLocalBag().getAllConfig(), ImmutableMap.of("mylocation.myconfig", "myval1", "mylocation.myconfigwithflagname", "myval2"));
- Assert.assertEquals(loc.getAllConfig(true), ImmutableMap.of("mylocation.myconfig", "myval1", "mylocation.myconfigwithflagname", "myval2"));
- Assert.assertEquals(loc.getAllConfig(false), ImmutableMap.of("mylocation.myconfig", "myval1", "mylocation.myconfigwithflagname", "myval2"));
}
// TODO Note difference compared to Location, where both flag-name + config-key-name are in the ConfigBag
@@ -76,8 +74,6 @@ public class LocationConfigTest {
assertEquals(loc.config().getBag().getAllConfig(), ImmutableMap.of("mylocation.myconfigwithflagname", "myval", "myconfigflagname", "myval"));
assertEquals(loc.config().getLocalBag().getAllConfig(), ImmutableMap.of("mylocation.myconfigwithflagname", "myval", "myconfigflagname", "myval"));
- Assert.assertEquals(loc.getAllConfig(true), ImmutableMap.of("mylocation.myconfigwithflagname", "myval", "myconfigflagname", "myval"));
- Assert.assertEquals(loc.getAllConfig(false), ImmutableMap.of("mylocation.myconfigwithflagname", "myval", "myconfigflagname", "myval"));
}
@Test
@@ -87,8 +83,6 @@ public class LocationConfigTest {
assertEquals(loc.config().getBag().getAllConfig(), ImmutableMap.of("notThere", "notThereVal"));
assertEquals(loc.config().getLocalBag().getAllConfig(), ImmutableMap.of("notThere", "notThereVal"));
- Assert.assertEquals(loc.getAllConfig(true), ImmutableMap.of("notThere", "notThereVal"));
- Assert.assertEquals(loc.getAllConfig(false), ImmutableMap.of("notThere", "notThereVal"));
}
// TODO Note difference from entity: child's bag contains both the flag-name and the config-key-name
@@ -103,8 +97,6 @@ public class LocationConfigTest {
assertEquals(child.config().getBag().getAllConfig(), ImmutableMap.of("mychildlocation.myconfig", "myval1", "notThere", "notThereVal"));
assertEquals(child.config().getLocalBag().getAllConfig(), ImmutableMap.of());
- Assert.assertEquals(child.getAllConfig(true), ImmutableMap.of("mychildlocation.myconfig", "myval1", "notThere", "notThereVal"));
- Assert.assertEquals(child.getAllConfig(false), ImmutableMap.of());
}
// Fails for location, but passes (or used to pass) for entity; not worth fixing here; locations will soon be entities, we hope
@@ -119,8 +111,6 @@ public class LocationConfigTest {
assertEquals(child.config().getBag().getAllConfig(), ImmutableMap.of("mychildlocation.myconfigwithflagname", "myval"));
assertEquals(child.config().getLocalBag().getAllConfig(), ImmutableMap.of());
- Assert.assertEquals(child.getAllConfig(true), ImmutableMap.of("mychildlocation.myconfigwithflagname", "myval"));
- Assert.assertEquals(child.getAllConfig(false), ImmutableMap.of());
}
@Test
@@ -133,8 +123,6 @@ public class LocationConfigTest {
assertEquals(child.config().getBag().getAllConfig(), ImmutableMap.of("mylocation.myconfig", "myval1"));
assertEquals(child.config().getLocalBag().getAllConfig(), ImmutableMap.of());
- Assert.assertEquals(child.getAllConfig(true), ImmutableMap.of("mylocation.myconfig", "myval1"));
- Assert.assertEquals(child.getAllConfig(false), ImmutableMap.of());
}
@Test
@@ -150,8 +138,6 @@ public class LocationConfigTest {
assertEquals(child.config().getBag().getAllConfig(), ImmutableMap.of("mychildlocation.myconfigwithflagname", "overrideMyval", "notThere", "overrideNotThereVal"));
assertEquals(child.config().getLocalBag().getAllConfig(), ImmutableMap.of("mychildlocation.myconfigwithflagname", "overrideMyval", "notThere", "overrideNotThereVal"));
- Assert.assertEquals(child.getAllConfig(true), ImmutableMap.of("mychildlocation.myconfigwithflagname", "overrideMyval", "notThere", "overrideNotThereVal"));
- Assert.assertEquals(child.getAllConfig(false), ImmutableMap.of("mychildlocation.myconfigwithflagname", "overrideMyval", "notThere", "overrideNotThereVal"));
}
// TODO Note difference compared to Location, where both flag-name + config-key-name are in the ConfigBag
@@ -168,8 +154,6 @@ public class LocationConfigTest {
log.info("all="+child.config().getBag());
assertEquals(child.config().getBag().getAllConfig(), ImmutableMap.of("mychildlocation.myconfigwithflagname", "overrideMyval", "mychildconfigflagname", "overrideMyval"));
assertEquals(child.config().getLocalBag().getAllConfig(), ImmutableMap.of("mychildlocation.myconfigwithflagname", "overrideMyval", "mychildconfigflagname", "overrideMyval"));
- Assert.assertEquals(child.getAllConfig(true), ImmutableMap.of("mychildlocation.myconfigwithflagname", "overrideMyval", "mychildconfigflagname", "overrideMyval"));
- Assert.assertEquals(child.getAllConfig(false), ImmutableMap.of("mychildlocation.myconfigwithflagname", "overrideMyval", "mychildconfigflagname", "overrideMyval"));
}
@Test
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/location/MachinesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/location/MachinesTest.java b/core/src/test/java/org/apache/brooklyn/core/location/MachinesTest.java
index 3e36f7a..51149d5 100644
--- a/core/src/test/java/org/apache/brooklyn/core/location/MachinesTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/location/MachinesTest.java
@@ -73,15 +73,6 @@ public class MachinesTest extends BrooklynAppUnitTestSupport {
}
@Test
- @SuppressWarnings("deprecation")
- public void testFindUniqueSshMachineLocation() throws Exception {
- SshMachineLocation l1 = create(sshMachineSpec);
- LocalhostMachineProvisioningLocation l2 = create(otherLocSpec);
- assertEquals(Machines.findUniqueSshMachineLocation(ImmutableList.of(l1, l2)).get(), l1);
- assertFalse(Machines.findUniqueSshMachineLocation(ImmutableList.of(l2)).isPresent());
- }
-
- @Test
public void testFindUniqueMachineLocationOfType() throws Exception {
SshMachineLocation l1 = create(sshMachineSpec);
LocalhostMachineProvisioningLocation l2 = create(otherLocSpec);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java b/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java
index 798f591..f7b1e43 100644
--- a/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java
@@ -131,32 +131,6 @@ public class PortForwardManagerRebindTest extends RebindTestFixtureWithApp {
}
@Test
- public void testAssociationPreservedOnRebindLegacy() throws Exception {
- String publicIpId = "5.6.7.8";
- String publicAddress = "5.6.7.8";
-
- TestEntity origEntity = origApp.createAndManageChild(EntitySpec.create(TestEntity.class).impl(MyEntity.class));
- PortForwardManager origPortForwardManager = origEntity.getConfig(MyEntity.PORT_FORWARD_MANAGER);
-
- // We first wait for persisted, to ensure that it is the PortForwardManager.onChanged that is causing persistence.
- RebindTestUtils.waitForPersisted(origApp);
- origPortForwardManager.recordPublicIpHostname(publicIpId, publicAddress);
- origPortForwardManager.acquirePublicPortExplicit(publicIpId, 40080);
- origPortForwardManager.associate(publicIpId, 40080, origSimulatedMachine, 80);
-
- newApp = rebind();
-
- // After rebind, confirm that lookups still work
- TestEntity newEntity = (TestEntity) Iterables.find(newApp.getChildren(), Predicates.instanceOf(TestEntity.class));
- Location newSimulatedMachine = newApp.getManagementContext().getLocationManager().getLocation(origSimulatedMachine.getId());
- PortForwardManager newPortForwardManager = newEntity.getConfig(MyEntity.PORT_FORWARD_MANAGER);
-
- assertEquals(newPortForwardManager.getPublicIpHostname(publicIpId), publicAddress);
- assertEquals(newPortForwardManager.lookup(newSimulatedMachine, 80), HostAndPort.fromParts(publicAddress, 40080));
- assertEquals(newPortForwardManager.lookup(publicIpId, 80), HostAndPort.fromParts(publicAddress, 40080));
- }
-
- @Test
public void testAcquirePortCounterPreservedOnRebindLegacy() throws Exception {
String publicIpId = "5.6.7.8";
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerTest.java b/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerTest.java
index aef2d41..095648b 100644
--- a/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerTest.java
@@ -22,30 +22,28 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotEquals;
import static org.testng.Assert.assertNull;
-import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.brooklyn.util.net.Networking;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
import org.apache.brooklyn.api.location.LocationSpec;
import org.apache.brooklyn.core.entity.Entities;
import org.apache.brooklyn.core.internal.BrooklynProperties;
-import org.apache.brooklyn.core.location.access.PortForwardManager;
import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
import org.apache.brooklyn.location.ssh.SshMachineLocation;
+import org.apache.brooklyn.util.net.Networking;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
import com.google.common.base.Predicate;
import com.google.common.net.HostAndPort;
public class PortForwardManagerTest extends BrooklynAppUnitTestSupport {
+ @SuppressWarnings("unused")
private static final Logger log = LoggerFactory.getLogger(PortForwardManagerTest.class);
- private Map<HostAndPort, HostAndPort> portMapping;
private SshMachineLocation machine1;
private SshMachineLocation machine2;
private PortForwardManager pfm;
@@ -145,19 +143,6 @@ public class PortForwardManagerTest extends BrooklynAppUnitTestSupport {
}
@Test
- public void testAssociateLegacy() throws Exception {
- String publicIpId = "myipid";
- String publicAddress = "5.6.7.8";
-
- pfm.acquirePublicPortExplicit(publicIpId, 40080);
- pfm.recordPublicIpHostname(publicIpId, publicAddress);
- pfm.associate(publicIpId, 40080, machine1, 80);
-
- assertEquals(pfm.lookup(publicIpId, 80), HostAndPort.fromParts(publicAddress, 40080));
- assertEquals(pfm.lookup(machine1, 80), HostAndPort.fromParts(publicAddress, 40080));
- }
-
- @Test
public void testAssociationListeners() throws Exception {
final AtomicInteger associationCreatedCount = new AtomicInteger(0);
final AtomicInteger associationDeletedCount = new AtomicInteger(0);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/ManagementPlaneSyncRecordPersisterInMemory.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/ManagementPlaneSyncRecordPersisterInMemory.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/ManagementPlaneSyncRecordPersisterInMemory.java
deleted file mode 100644
index 208a3d0..0000000
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/ManagementPlaneSyncRecordPersisterInMemory.java
+++ /dev/null
@@ -1,99 +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.brooklyn.core.mgmt.ha;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.io.IOException;
-import java.util.concurrent.TimeoutException;
-
-import org.apache.brooklyn.api.mgmt.ha.ManagementNodeSyncRecord;
-import org.apache.brooklyn.api.mgmt.ha.ManagementPlaneSyncRecord;
-import org.apache.brooklyn.api.mgmt.ha.ManagementPlaneSyncRecordPersister;
-import org.apache.brooklyn.core.mgmt.ha.ManagementPlaneSyncRecordPersisterToObjectStore;
-import org.apache.brooklyn.core.mgmt.persist.InMemoryObjectStore;
-import org.apache.brooklyn.util.time.Duration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.annotations.VisibleForTesting;
-
-/** @deprecated since 0.7.0 use {@link ManagementPlaneSyncRecordPersisterToObjectStore}
- * with {@link InMemoryObjectStore}
- * <code>
- * new ManagementPlaneSyncRecordPersisterToObjectStore(new InMemoryObjectStore(), classLoader)
- * </code> */
-@Deprecated
-public class ManagementPlaneSyncRecordPersisterInMemory implements ManagementPlaneSyncRecordPersister {
-
- private static final Logger LOG = LoggerFactory.getLogger(ManagementPlaneSyncRecordPersisterInMemory.class);
-
- private final MutableManagementPlaneSyncRecord memento = new MutableManagementPlaneSyncRecord();
-
- private volatile boolean running = true;
-
- @Override
- public synchronized void stop() {
- running = false;
- }
-
- @Override
- public ManagementPlaneSyncRecord loadSyncRecord() throws IOException {
- if (!running) {
- throw new IllegalStateException("Persister not running; cannot load memento");
- }
-
- return memento.snapshot();
- }
-
- @VisibleForTesting
- @Override
- public synchronized void waitForWritesCompleted(Duration timeout) throws InterruptedException, TimeoutException {
- // The synchronized is sufficient - guarantee that no concurrent calls
- return;
- }
-
- @Override
- public synchronized void delta(Delta delta) {
- if (!running) {
- if (LOG.isDebugEnabled()) LOG.debug("Persister not running; ignoring checkpointed delta of manager-memento");
- return;
- }
-
- for (ManagementNodeSyncRecord m : delta.getNodes()) {
- memento.addNode(m);
- }
- for (String id : delta.getRemovedNodeIds()) {
- memento.deleteNode(id);
- }
- switch (delta.getMasterChange()) {
- case NO_CHANGE:
- break; // no-op
- case SET_MASTER:
- memento.setMasterNodeId(checkNotNull(delta.getNewMasterOrNull()));
- break;
- case CLEAR_MASTER:
- memento.setMasterNodeId(null);
- break; // no-op
- default:
- throw new IllegalStateException("Unknown state for master-change: "+delta.getMasterChange());
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java
index 113c6c5..a8599b1 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java
@@ -124,7 +124,6 @@ public class RebindEnricherTest extends RebindTestFixtureWithApp {
EntityAsserts.assertAttributeEqualsEventually(newApp, METRIC2, "myval");
}
- @SuppressWarnings("unchecked")
@Test
public void testCombiningEnricher() throws Exception {
origApp.enrichers().add(Enrichers.builder()
@@ -307,14 +306,14 @@ public class RebindEnricherTest extends RebindTestFixtureWithApp {
@Test
public void testEntityCreatingItsEnricherDoesNotReCreateItUnlessUniqueTagDifferent() throws Exception {
TestEntity e1 = origApp.createAndManageChild(EntitySpec.create(TestEntity.class, MyTestEntityWithEnricher.class));
- Collection<Enricher> e1e = e1.getEnrichers();
+ Collection<Enricher> e1e = e1.enrichers().asList();
log.info("enrichers1: "+e1e);
Entities.dumpInfo(e1);
assertEquals(e1e.size(), 5);
newApp = rebind();
Entity e2 = Iterables.getOnlyElement( Entities.descendantsAndSelf(newApp, EntityPredicates.idEqualTo(e1.getId())) );
- Collection<Enricher> e2e = e2.getEnrichers();
+ Collection<Enricher> e2e = e2.enrichers().asList();
log.info("enrichers2: "+e2e);
Entities.dumpInfo(e2);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java
index 85c99d5..6362a14 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java
@@ -110,7 +110,7 @@ public class RebindFeedWithHaTest extends RebindTestFixtureWithApp {
}).runRequiringTrue();
newManagementContext = createNewManagementContext();
- newApp = (TestApplication) RebindTestUtils.rebind(newManagementContext, classLoader);
+ newApp = (TestApplication) RebindTestUtils.rebind(RebindOptions.create().newManagementContext(newManagementContext).classLoader(classLoader));
TestEntity newEntity = (TestEntity) Iterables.getOnlyElement(newApp.getChildren());
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java
index c7d97a9..3a99234 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java
@@ -18,16 +18,11 @@
*/
package org.apache.brooklyn.core.mgmt.rebind;
-import static org.testng.Assert.assertEquals;
-
import java.io.File;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.concurrent.Callable;
-import org.apache.brooklyn.api.catalog.BrooklynCatalog;
-import org.apache.brooklyn.api.catalog.CatalogItem;
import org.apache.brooklyn.api.entity.Application;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.mgmt.Task;
@@ -35,9 +30,7 @@ import org.apache.brooklyn.api.mgmt.ha.HighAvailabilityMode;
import org.apache.brooklyn.api.mgmt.rebind.RebindExceptionHandler;
import org.apache.brooklyn.api.mgmt.rebind.RebindManager;
import org.apache.brooklyn.api.mgmt.rebind.mementos.BrooklynMementoManifest;
-import org.apache.brooklyn.core.catalog.internal.CatalogUtils;
import org.apache.brooklyn.core.entity.Entities;
-import org.apache.brooklyn.core.entity.EntityFunctions;
import org.apache.brooklyn.core.entity.EntityPredicates;
import org.apache.brooklyn.core.entity.StartableApplication;
import org.apache.brooklyn.core.entity.trait.Startable;
@@ -56,10 +49,6 @@ import org.slf4j.LoggerFactory;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-
public abstract class RebindTestFixture<T extends StartableApplication> {
private static final Logger LOG = LoggerFactory.getLogger(RebindTestFixture.class);
@@ -241,52 +230,6 @@ public abstract class RebindTestFixture<T extends StartableApplication> {
return rebind(RebindOptions.create());
}
- /**
- * Checking serializable is overly strict.
- * State only needs to be xstream-serializable, which does not require `implements Serializable`.
- * Also, the xstream serializer has some special hooks that replaces an entity reference with
- * a marker for that entity, etc.
- *
- * @deprecated since 0.7.0; use {@link #rebind()} or {@link #rebind(RebindOptions)})
- */
- @Deprecated
- protected T rebind(boolean checkSerializable) throws Exception {
- return rebind(RebindOptions.create().checkSerializable(checkSerializable));
- }
-
- /**
- * Checking serializable is overly strict.
- * State only needs to be xstream-serializable, which does not require `implements Serializable`.
- * Also, the xstream serializer has some special hooks that replaces an entity reference with
- * a marker for that entity, etc.
- *
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)})
- */
- @Deprecated
- protected T rebind(boolean checkSerializable, boolean terminateOrigManagementContext) throws Exception {
- return rebind(RebindOptions.create()
- .checkSerializable(checkSerializable)
- .terminateOrigManagementContext(terminateOrigManagementContext));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)})
- */
- @Deprecated
- protected T rebind(RebindExceptionHandler exceptionHandler) throws Exception {
- return rebind(RebindOptions.create().exceptionHandler(exceptionHandler));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)})
- */
- @Deprecated
- protected T rebind(ManagementContext newManagementContext, RebindExceptionHandler exceptionHandler) throws Exception {
- return rebind(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .exceptionHandler(exceptionHandler));
- }
-
@SuppressWarnings("unchecked")
protected T rebind(RebindOptions options) throws Exception {
if (newApp != null || newManagementContext != null) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
index ba0ece2..e6d0ad1 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
@@ -308,75 +308,6 @@ public class RebindTestUtils {
.mementoDir(mementoDir)
.classLoader(classLoader));
}
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Application rebind(File mementoDir, ClassLoader classLoader, RebindExceptionHandler exceptionHandler) throws Exception {
- return rebind(RebindOptions.create()
- .mementoDir(mementoDir)
- .classLoader(classLoader)
- .exceptionHandler(exceptionHandler));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Application rebind(ManagementContext newManagementContext, ClassLoader classLoader) throws Exception {
- return rebind(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .classLoader(classLoader));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Application rebind(ManagementContext newManagementContext, ClassLoader classLoader, RebindExceptionHandler exceptionHandler) throws Exception {
- return rebind(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .classLoader(classLoader)
- .exceptionHandler(exceptionHandler));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Application rebind(ManagementContext newManagementContext, File mementoDir, ClassLoader classLoader) throws Exception {
- return rebind(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .mementoDir(mementoDir)
- .classLoader(classLoader));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Application rebind(ManagementContext newManagementContext, File mementoDir, ClassLoader classLoader, RebindExceptionHandler exceptionHandler) throws Exception {
- return rebind(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .mementoDir(mementoDir)
- .classLoader(classLoader)
- .exceptionHandler(exceptionHandler));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Application rebind(ManagementContext newManagementContext, File mementoDir,
- ClassLoader classLoader, RebindExceptionHandler exceptionHandler, PersistenceObjectStore objectStore) throws Exception {
- return rebind(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .mementoDir(mementoDir)
- .classLoader(classLoader)
- .exceptionHandler(exceptionHandler)
- .objectStore(objectStore));
- }
public static Application rebind(RebindOptions options) throws Exception {
boolean hadApps = true;
@@ -401,62 +332,6 @@ public class RebindTestUtils {
}
}
- /**
- * @deprecated since 0.7.0; use {@link #rebindAll(RebindOptions)}
- */
- @Deprecated
- public static Collection<Application> rebindAll(File mementoDir, ClassLoader classLoader) throws Exception {
- return rebindAll(RebindOptions.create()
- .mementoDir(mementoDir)
- .classLoader(classLoader));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Collection<Application> rebindAll(File mementoDir, ClassLoader classLoader, RebindExceptionHandler exceptionHandler) throws Exception {
- return rebindAll(RebindOptions.create()
- .mementoDir(mementoDir)
- .classLoader(classLoader)
- .exceptionHandler(exceptionHandler));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Collection<Application> rebindAll(LocalManagementContext newManagementContext, ClassLoader classLoader, RebindExceptionHandler exceptionHandler) throws Exception {
- return rebindAll(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .classLoader(classLoader)
- .exceptionHandler(exceptionHandler));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Collection<Application> rebindAll(ManagementContext newManagementContext, File mementoDir, ClassLoader classLoader) throws Exception {
- return rebindAll(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .mementoDir(mementoDir)
- .classLoader(classLoader));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Collection<Application> rebindAll(ManagementContext newManagementContext, File mementoDir, ClassLoader classLoader, RebindExceptionHandler exceptionHandler, PersistenceObjectStore objectStore) throws Exception {
- return rebindAll(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .mementoDir(mementoDir)
- .classLoader(classLoader)
- .exceptionHandler(exceptionHandler)
- .objectStore(objectStore));
- }
-
public static Collection<Application> rebindAll(RebindOptions options) throws Exception {
File mementoDir = options.mementoDir;
File mementoDirBackup = options.mementoDirBackup;