Repository: brooklyn-server Updated Branches: refs/heads/master 749f75bf2 -> c4d505551
Delete all @author Javadoc from test-framework Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/921a7767 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/921a7767 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/921a7767 Branch: refs/heads/master Commit: 921a7767f06799447de75164915f4f1e263dafbd Parents: 1f2e2a1 Author: Sam Corbett <sam.corb...@cloudsoftcorp.com> Authored: Wed Jun 15 16:47:20 2016 +0100 Committer: Sam Corbett <sam.corb...@cloudsoftcorp.com> Committed: Wed Jul 6 12:02:06 2016 +0100 ---------------------------------------------------------------------- .../framework/InfrastructureDeploymentTestCase.java | 3 --- .../InfrastructureDeploymentTestCaseImpl.java | 3 --- .../test/framework/LoopOverGroupMembersTestCase.java | 3 --- .../framework/LoopOverGroupMembersTestCaseImpl.java | 3 --- .../brooklyn/test/framework/ParallelTestCase.java | 2 -- .../brooklyn/test/framework/ParallelTestCaseImpl.java | 2 -- .../test/framework/TargetableTestComponent.java | 2 -- .../org/apache/brooklyn/test/framework/TestCase.java | 2 -- .../apache/brooklyn/test/framework/TestEffector.java | 2 -- .../brooklyn/test/framework/TestEffectorImpl.java | 3 --- .../test/framework/TestFrameworkAssertions.java | 2 -- .../apache/brooklyn/test/framework/TestHttpCall.java | 2 -- .../org/apache/brooklyn/test/framework/TestSensor.java | 2 -- .../InfrastructureDeploymentTestCaseTest.java | 3 --- .../framework/LoopOverGroupMembersTestCaseTest.java | 4 ---- .../brooklyn/test/framework/TestEffectorTest.java | 3 --- .../test/framework/TestFrameworkAssertionsTest.java | 4 ---- .../brooklyn/test/framework/TestHttpCallTest.java | 3 --- .../apache/brooklyn/test/framework/TestSensorTest.java | 3 --- .../brooklyn/test/framework/entity/TestEntity.java | 4 ---- .../brooklyn/test/framework/entity/TestEntityImpl.java | 13 ++++--------- .../test/framework/entity/TestInfrastructure.java | 4 ---- .../test/framework/entity/TestInfrastructureImpl.java | 3 --- 23 files changed, 4 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCase.java ---------------------------------------------------------------------- diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCase.java b/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCase.java index 41ba1b7..7b2872e 100644 --- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCase.java +++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCase.java @@ -30,9 +30,6 @@ import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.entity.software.base.SoftwareProcess; -/** - * Created by graememiller on 04/12/2015. - */ @ImplementedBy(value = InfrastructureDeploymentTestCaseImpl.class) public interface InfrastructureDeploymentTestCase extends TargetableTestComponent { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseImpl.java ---------------------------------------------------------------------- diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseImpl.java b/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseImpl.java index 13504c8..b6eccd2 100644 --- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseImpl.java +++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseImpl.java @@ -32,9 +32,6 @@ import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.core.sensor.Sensors; -/** - * Created by graememiller on 04/12/2015. - */ public class InfrastructureDeploymentTestCaseImpl extends TestCaseImpl implements InfrastructureDeploymentTestCase { @Override http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCase.java ---------------------------------------------------------------------- diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCase.java b/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCase.java index 4e76604..c0db7b3 100644 --- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCase.java +++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCase.java @@ -27,9 +27,6 @@ import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.util.core.flags.SetFromFlag; -/** - * Created by graememiller on 11/12/2015. - */ @ImplementedBy(value = LoopOverGroupMembersTestCaseImpl.class) public interface LoopOverGroupMembersTestCase extends TargetableTestComponent { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseImpl.java ---------------------------------------------------------------------- diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseImpl.java b/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseImpl.java index 58dce17..8a10797 100644 --- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseImpl.java +++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseImpl.java @@ -35,9 +35,6 @@ import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.util.exceptions.Exceptions; -/** - * Created by graememiller on 11/12/2015. - */ public class LoopOverGroupMembersTestCaseImpl extends TargetableTestComponentImpl implements LoopOverGroupMembersTestCase { private static final Logger logger = LoggerFactory.getLogger(LoopOverGroupMembersTestCaseImpl.class); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCase.java ---------------------------------------------------------------------- diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCase.java b/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCase.java index 96f54b8..cf26693 100644 --- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCase.java +++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCase.java @@ -22,8 +22,6 @@ import org.apache.brooklyn.api.entity.ImplementedBy; /** * This implementation will start all child entities in parallel. - * - * @author Chris Burke */ @ImplementedBy(value = ParallelTestCaseImpl.class) public interface ParallelTestCase extends TargetableTestComponent { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCaseImpl.java ---------------------------------------------------------------------- diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCaseImpl.java b/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCaseImpl.java index 3ded474..cec7d95 100644 --- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCaseImpl.java +++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCaseImpl.java @@ -33,8 +33,6 @@ import org.apache.brooklyn.util.exceptions.Exceptions; /** * This implementation will start all child entities in parallel. - * - * @author Chris Burke */ public class ParallelTestCaseImpl extends TargetableTestComponentImpl implements ParallelTestCase { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/main/java/org/apache/brooklyn/test/framework/TargetableTestComponent.java ---------------------------------------------------------------------- diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TargetableTestComponent.java b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TargetableTestComponent.java index 67daff6..5ea28cb 100644 --- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TargetableTestComponent.java +++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TargetableTestComponent.java @@ -28,8 +28,6 @@ import org.apache.brooklyn.util.time.Duration; /** * Entity that can target another entity for the purpouse of testing - * - * @author m4rkmckenna */ @ImplementedBy(value = TargetableTestComponentImpl.class) public interface TargetableTestComponent extends Entity, Startable { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCase.java ---------------------------------------------------------------------- diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCase.java b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCase.java index b6d6f61..6f17ca0 100644 --- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCase.java +++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestCase.java @@ -22,8 +22,6 @@ import org.apache.brooklyn.api.entity.ImplementedBy; /** * Entity that logically groups other test entities - * - * @author m4rkmckenna */ @ImplementedBy(value = TestCaseImpl.class) public interface TestCase extends TargetableTestComponent { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffector.java ---------------------------------------------------------------------- diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffector.java b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffector.java index 6639845..493bfaf 100644 --- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffector.java +++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffector.java @@ -31,8 +31,6 @@ import java.util.Map; /** * Entity that invokes an effector on another entity - * - * @author m4rkmckenna */ @ImplementedBy(value = TestEffectorImpl.class) public interface TestEffector extends BaseTest { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffectorImpl.java ---------------------------------------------------------------------- diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffectorImpl.java b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffectorImpl.java index bd94ad8..1cdf473 100644 --- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffectorImpl.java +++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestEffectorImpl.java @@ -43,9 +43,6 @@ import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.guava.Maybe; import org.apache.brooklyn.util.time.Duration; -/** - * - */ public class TestEffectorImpl extends TargetableTestComponentImpl implements TestEffector { private static final Logger LOG = LoggerFactory.getLogger(TestEffectorImpl.class); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestFrameworkAssertions.java ---------------------------------------------------------------------- diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestFrameworkAssertions.java b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestFrameworkAssertions.java index 7f1406c..fbe3ed0 100644 --- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestFrameworkAssertions.java +++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestFrameworkAssertions.java @@ -39,8 +39,6 @@ import org.apache.brooklyn.util.text.Strings; /** * Utility class to evaluate test-framework assertions - * - * @author m4rkmckenna on 11/11/2015. */ public class TestFrameworkAssertions { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCall.java ---------------------------------------------------------------------- diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCall.java b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCall.java index 44e8ba3..353e8b4 100644 --- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCall.java +++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestHttpCall.java @@ -25,8 +25,6 @@ import org.apache.brooklyn.util.core.flags.SetFromFlag; /** * Entity that makes a HTTP Request and tests the response - * - * @author johnmccabe */ @ImplementedBy(value = TestHttpCallImpl.class) public interface TestHttpCall extends BaseTest { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensor.java ---------------------------------------------------------------------- diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensor.java b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensor.java index ec070d1..4bc9521 100644 --- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensor.java +++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestSensor.java @@ -25,8 +25,6 @@ import org.apache.brooklyn.util.core.flags.SetFromFlag; /** * Entity that tests a sensor value on another entity - * - * @author m4rkmckenna */ @ImplementedBy(value = TestSensorImpl.class) public interface TestSensor extends BaseTest { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/test/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseTest.java ---------------------------------------------------------------------- diff --git a/test-framework/src/test/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseTest.java b/test-framework/src/test/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseTest.java index 73d2854..ed6e274 100644 --- a/test-framework/src/test/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseTest.java +++ b/test-framework/src/test/java/org/apache/brooklyn/test/framework/InfrastructureDeploymentTestCaseTest.java @@ -47,9 +47,6 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; import com.google.common.reflect.TypeToken; -/** - * @author Graeme Miller on 27/10/2015. - */ @SuppressWarnings("serial") public class InfrastructureDeploymentTestCaseTest { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/test/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseTest.java ---------------------------------------------------------------------- diff --git a/test-framework/src/test/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseTest.java b/test-framework/src/test/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseTest.java index 39c85c5..09dba5a 100644 --- a/test-framework/src/test/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseTest.java +++ b/test-framework/src/test/java/org/apache/brooklyn/test/framework/LoopOverGroupMembersTestCaseTest.java @@ -47,12 +47,8 @@ import org.apache.brooklyn.entity.group.DynamicGroup; import org.apache.brooklyn.entity.software.base.EmptySoftwareProcess; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.util.collections.MutableSet; -import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.text.Identifiers; -/** - * @author Graeme Miller on 27/10/2015. - */ public class LoopOverGroupMembersTestCaseTest { private TestApplication app; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestEffectorTest.java ---------------------------------------------------------------------- diff --git a/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestEffectorTest.java b/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestEffectorTest.java index b1d987c..c5ccafd 100644 --- a/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestEffectorTest.java +++ b/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestEffectorTest.java @@ -41,9 +41,6 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -/** - * @author m4rkmckenna on 27/10/2015. - */ public class TestEffectorTest { private TestApplication app; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestFrameworkAssertionsTest.java ---------------------------------------------------------------------- diff --git a/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestFrameworkAssertionsTest.java b/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestFrameworkAssertionsTest.java index 22197e5..1f2465b 100644 --- a/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestFrameworkAssertionsTest.java +++ b/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestFrameworkAssertionsTest.java @@ -35,10 +35,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; - -/** - * @author m4rkmckenna on 11/11/2015. - */ public class TestFrameworkAssertionsTest { private static final Logger LOG = LoggerFactory.getLogger(TestFrameworkAssertionsTest.class); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestHttpCallTest.java ---------------------------------------------------------------------- diff --git a/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestHttpCallTest.java b/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestHttpCallTest.java index 055c5fa..975e65a 100644 --- a/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestHttpCallTest.java +++ b/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestHttpCallTest.java @@ -38,9 +38,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -/** - * @author m4rkmckenna on 12/11/2015. - */ public class TestHttpCallTest { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestSensorTest.java ---------------------------------------------------------------------- diff --git a/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestSensorTest.java b/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestSensorTest.java index 4a00d75..bb376cf 100644 --- a/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestSensorTest.java +++ b/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestSensorTest.java @@ -43,9 +43,6 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -/** - * @author m4rkmckenna on 27/10/2015. - */ public class TestSensorTest { private static final AttributeSensorAndConfigKey<Boolean, Boolean> BOOLEAN_SENSOR = ConfigKeys.newSensorAndConfigKey(Boolean.class, "boolean-sensor", "Boolean Sensor"); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntity.java ---------------------------------------------------------------------- diff --git a/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntity.java b/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntity.java index 4de9587..939f452 100644 --- a/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntity.java +++ b/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntity.java @@ -27,10 +27,6 @@ import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.core.sensor.AttributeSensorAndConfigKey; -/** - * @author m4rkmckenna on 27/10/2015. - */ - @ImplementedBy(TestEntityImpl.class) public interface TestEntity extends Entity, Startable { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntityImpl.java ---------------------------------------------------------------------- diff --git a/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntityImpl.java b/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntityImpl.java index 7f066a7..8cb59cf 100644 --- a/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntityImpl.java +++ b/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestEntityImpl.java @@ -19,16 +19,11 @@ package org.apache.brooklyn.test.framework.entity; +import java.util.Collection; + import org.apache.brooklyn.api.location.Location; -import org.apache.brooklyn.core.annotation.EffectorParam; import org.apache.brooklyn.core.entity.AbstractEntity; -import org.apache.brooklyn.test.framework.entity.TestEntity; -import java.util.Collection; - -/** - * @author m4rkmckenna on 27/10/2015. - */ public class TestEntityImpl extends AbstractEntity implements TestEntity { @Override public void start(final Collection<? extends Location> locations) { @@ -49,7 +44,7 @@ public class TestEntityImpl extends AbstractEntity implements TestEntity { } @Override - public TestPojo complexEffector(@EffectorParam(name = "stringValue") final String stringValue, @EffectorParam(name = "booleanValue") final Boolean booleanValue, @EffectorParam(name = "longValue") final Long longValue) { + public TestPojo complexEffector(final String stringValue, final Boolean booleanValue, final Long longValue) { sensors().set(COMPLEX_EFFECTOR_INVOKED, Boolean.TRUE); sensors().set(COMPLEX_EFFECTOR_STRING, stringValue); sensors().set(COMPLEX_EFFECTOR_BOOLEAN, booleanValue); @@ -58,7 +53,7 @@ public class TestEntityImpl extends AbstractEntity implements TestEntity { } @Override - public String effectorReturnsString(@EffectorParam(name = "stringToReturn") String stringToReturn) { + public String effectorReturnsString(String stringToReturn) { return stringToReturn; } } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestInfrastructure.java ---------------------------------------------------------------------- diff --git a/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestInfrastructure.java b/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestInfrastructure.java index abcd679..8eb5e82 100644 --- a/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestInfrastructure.java +++ b/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestInfrastructure.java @@ -22,10 +22,6 @@ package org.apache.brooklyn.test.framework.entity; import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.entity.stock.BasicApplication; -/** - * Created by graememiller on 17/12/2015. - */ - @ImplementedBy(TestInfrastructureImpl.class) public interface TestInfrastructure extends BasicApplication { } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/921a7767/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestInfrastructureImpl.java ---------------------------------------------------------------------- diff --git a/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestInfrastructureImpl.java b/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestInfrastructureImpl.java index 6ec0638..b9295ac 100644 --- a/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestInfrastructureImpl.java +++ b/test-framework/src/test/java/org/apache/brooklyn/test/framework/entity/TestInfrastructureImpl.java @@ -28,9 +28,6 @@ import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.sensor.AttributeSensorAndConfigKey; import org.apache.brooklyn.entity.stock.BasicApplicationImpl; -/** - * Created by graememiller on 17/12/2015. - */ public class TestInfrastructureImpl extends BasicApplicationImpl implements TestInfrastructure { private final AttributeSensorAndConfigKey<Location, Location> DEPLOYMENT_LOCATION = ConfigKeys.newSensorAndConfigKey(
