You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by m4...@apache.org on 2017/05/19 17:04:26 UTC
[07/12] brooklyn-server git commit: Delete deprecated EffectorUtils
methods
Delete deprecated EffectorUtils methods
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e3722916
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e3722916
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e3722916
Branch: refs/heads/master
Commit: e37229168970bacef2555d6f6bbc8e6063fcad98
Parents: e920c26
Author: Aled Sage <al...@gmail.com>
Authored: Thu May 18 16:57:25 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Fri May 19 13:27:04 2017 +0100
----------------------------------------------------------------------
.../core/mgmt/internal/EffectorUtils.java | 34 --------------------
1 file changed, 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e3722916/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EffectorUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EffectorUtils.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EffectorUtils.java
index bab9fc7..245c1c5 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EffectorUtils.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/EffectorUtils.java
@@ -20,14 +20,12 @@ package org.apache.brooklyn.core.mgmt.internal;
import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth;
-import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
-import java.util.Set;
import org.apache.brooklyn.api.effector.Effector;
import org.apache.brooklyn.api.effector.ParameterType;
@@ -348,32 +346,6 @@ public class EffectorUtils {
}
}
- /** @deprecated since 0.7.0, not used */
- @Deprecated
- public static Effector<?> findEffectorMatching(Entity entity, Method method) {
- outer: for (Effector<?> effector : entity.getEntityType().getEffectors()) {
- if (!effector.getName().equals(entity)) continue;
- if (effector.getParameters().size() != method.getParameterTypes().length) continue;
- for (int i = 0; i < effector.getParameters().size(); i++) {
- if (effector.getParameters().get(i).getParameterClass() != method.getParameterTypes()[i]) continue outer;
- }
- return effector;
- }
- return null;
- }
-
- /** @deprecated since 0.7.0, expects parameters but does not use them! */
- @Deprecated
- public static Effector<?> findEffectorMatching(Set<Effector<?>> effectors, String effectorName, Map<String, ?> parameters) {
- // TODO Support overloading: check parameters as well
- for (Effector<?> effector : effectors) {
- if (effector.getName().equals(effectorName)) {
- return effector;
- }
- }
- return null;
- }
-
/** matches effectors by name only (not parameters) */
public static Maybe<Effector<?>> findEffector(Collection<? extends Effector<?>> effectors, String effectorName) {
for (Effector<?> effector : effectors) {
@@ -389,12 +361,6 @@ public class EffectorUtils {
return findEffector(entity.getEntityType().getEffectors(), effectorName);
}
- /** @deprecated since 0.7.0 use {@link #getTaskFlagsForEffectorInvocation(Entity, Effector, ConfigBag)} */
- @Deprecated
- public static Map<Object,Object> getTaskFlagsForEffectorInvocation(Entity entity, Effector<?> effector) {
- return getTaskFlagsForEffectorInvocation(entity, effector, null);
- }
-
/** returns a (mutable) map of the standard flags which should be placed on an effector */
public static Map<Object,Object> getTaskFlagsForEffectorInvocation(Entity entity, Effector<?> effector, ConfigBag parameters) {
List<Object> tags = MutableList.of(