Removed incorrect nullable=false annotations from 'target' & 'targetId'
Both config keys may be null ... just not at the same time Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4ce5c1ca Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4ce5c1ca Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4ce5c1ca Branch: refs/heads/master Commit: 4ce5c1cab75d583074755babd5576dbb9440d132 Parents: 5a3b962 Author: Mark McKenna <[email protected]> Authored: Wed Nov 11 11:18:27 2015 +0000 Committer: Mark McKenna <[email protected]> Committed: Wed Nov 11 11:18:27 2015 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/brooklyn/test/framework/BaseTest.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ce5c1ca/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/BaseTest.java ---------------------------------------------------------------------- diff --git a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/BaseTest.java b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/BaseTest.java index b0f347d..69eb04d 100644 --- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/BaseTest.java +++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/BaseTest.java @@ -4,30 +4,26 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.trait.Startable; -import org.apache.brooklyn.util.core.flags.SetFromFlag; /** - * A base interface for all tests. + * A base interface for all tests. */ public interface BaseTest extends Entity, Startable { /** * The target entity to test (optional, use either this or targetId). */ - @SetFromFlag(nullable = false) ConfigKey<Entity> TARGET_ENTITY = ConfigKeys.newConfigKey(Entity.class, "target", "Entity under test"); /** * Id of the target entity to test (optional, use either this or target). */ - @SetFromFlag(nullable = false) ConfigKey<String> TARGET_ID = ConfigKeys.newStringConfigKey("targetId", "Id of the entity under test"); /** * Get the target of the test. * * @return The target. - * * @throws IllegalArgumentException if the target cannot be found. */ Entity resolveTarget();
