Repository: brooklyn-server Updated Branches: refs/heads/master 3d7a35f90 -> d4d5966c1
Delete deprecated EntityType.getEffector(name, parameterTypesâ¦) Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f665e57a Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f665e57a Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f665e57a Branch: refs/heads/master Commit: f665e57aa63132e0930c237d86425c9fe595bdc2 Parents: 7350fd6 Author: Aled Sage <[email protected]> Authored: Thu May 18 16:24:25 2017 +0100 Committer: Aled Sage <[email protected]> Committed: Fri May 19 10:46:35 2017 +0100 ---------------------------------------------------------------------- .../apache/brooklyn/api/entity/EntityType.java | 12 --------- .../core/entity/EntityTypeSnapshot.java | 26 -------------------- 2 files changed, 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f665e57a/api/src/main/java/org/apache/brooklyn/api/entity/EntityType.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/EntityType.java b/api/src/main/java/org/apache/brooklyn/api/entity/EntityType.java index 1c3f7b5..ccadb87 100644 --- a/api/src/main/java/org/apache/brooklyn/api/entity/EntityType.java +++ b/api/src/main/java/org/apache/brooklyn/api/entity/EntityType.java @@ -18,7 +18,6 @@ */ package org.apache.brooklyn.api.entity; -import java.util.NoSuchElementException; import java.util.Set; import org.apache.brooklyn.api.effector.Effector; @@ -51,17 +50,6 @@ public interface EntityType extends BrooklynType { public Maybe<Effector<?>> getEffectorByName(String name); /** - * @return the matching effector on this entity - * @throws NoSuchElementException If there is no exact match for this signature - * <p> - * @deprecated since 0.7.0 use {@link #getEffectorByName(String)}; - * use of multiple effectors with the same name is not supported by the EntityDynamicType implementation, - * so should be discouraged. overloading can be achieved by inspecting the parameters map. - */ - @Deprecated - Effector<?> getEffector(String name, Class<?>... parameterTypes); - - /** * The Sensor with the given name, or null if not found. */ Sensor<?> getSensor(String name); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f665e57a/core/src/main/java/org/apache/brooklyn/core/entity/EntityTypeSnapshot.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/EntityTypeSnapshot.java b/core/src/main/java/org/apache/brooklyn/core/entity/EntityTypeSnapshot.java index 25223f8..956221c 100644 --- a/core/src/main/java/org/apache/brooklyn/core/entity/EntityTypeSnapshot.java +++ b/core/src/main/java/org/apache/brooklyn/core/entity/EntityTypeSnapshot.java @@ -19,20 +19,16 @@ package org.apache.brooklyn.core.entity; import java.util.Collection; -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; import org.apache.brooklyn.api.entity.EntityType; import org.apache.brooklyn.api.sensor.Sensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.objs.BrooklynTypeSnapshot; import org.apache.brooklyn.util.guava.Maybe; -import com.google.common.base.Joiner; import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; @@ -74,28 +70,6 @@ public class EntityTypeSnapshot extends BrooklynTypeSnapshot implements EntityTy } @Override - public Effector<?> getEffector(String name, Class<?>... parameterTypes) { - // TODO Could index for more efficient lookup (e.g. by name in a MultiMap, or using name+parameterTypes as a key) - // TODO Looks for exact match; could go for what would be valid to call (i.e. if parameterType is sub-class of ParameterType.getParameterClass then ok) - // TODO Could take into account ParameterType.getDefaultValue() for what can be omitted - - effectorLoop : for (Effector<?> contender : effectors) { - if (name.equals(contender.getName())) { - List<ParameterType<?>> contenderParameters = contender.getParameters(); - if (parameterTypes.length == contenderParameters.size()) { - for (int i = 0; i < parameterTypes.length; i++) { - if (parameterTypes[i] != contenderParameters.get(i).getParameterClass()) { - continue effectorLoop; - } - } - return contender; - } - } - } - throw new NoSuchElementException("No matching effector "+name+"("+Joiner.on(", ").join(parameterTypes)+") on entity "+getName()); - } - - @Override public Sensor<?> getSensor(String name) { return sensors.get(name); }
