CompositeEffector: code tidy
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3ac709b5 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3ac709b5 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3ac709b5 Branch: refs/heads/master Commit: 3ac709b512a09e99ea45b88d8e53abd96b6e6292 Parents: 01141a7 Author: Aled Sage <[email protected]> Authored: Thu Apr 27 13:42:53 2017 +0100 Committer: Aled Sage <[email protected]> Committed: Thu Apr 27 13:46:43 2017 +0100 ---------------------------------------------------------------------- .../core/effector/CompositeEffector.java | 16 +++++++++++----- .../CompositeEffectorIntegrationTest.java | 3 ++- .../core/effector/CompositeEffectorTest.java | 19 +++++++++++-------- 3 files changed, 24 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3ac709b5/core/src/main/java/org/apache/brooklyn/core/effector/CompositeEffector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/effector/CompositeEffector.java b/core/src/main/java/org/apache/brooklyn/core/effector/CompositeEffector.java index 5345b4a..62a5984 100644 --- a/core/src/main/java/org/apache/brooklyn/core/effector/CompositeEffector.java +++ b/core/src/main/java/org/apache/brooklyn/core/effector/CompositeEffector.java @@ -48,11 +48,17 @@ public class CompositeEffector extends AddEffector { private static final Logger LOG = LoggerFactory.getLogger(CompositeEffector.class); private static final String ORIGINAL_PREFIX = "original-"; - public static final ConfigKey<List<String>> EFFECTORS = ConfigKeys.newConfigKey(new TypeToken<List<String>>() { - }, "effectors", - "Effector names to be chained together in the composite effector", ImmutableList.<String>of()); - public static final ConfigKey<Boolean> OVERRIDE = ConfigKeys.newBooleanConfigKey("override", - "Wheter additional defined effectors should override pre-existing effector with same name or not (default: false)", Boolean.FALSE); + @SuppressWarnings("serial") + public static final ConfigKey<List<String>> EFFECTORS = ConfigKeys.newConfigKey( + new TypeToken<List<String>>() {}, + "effectors", + "Effector names to be chained together in the composite effector", + ImmutableList.<String>of()); + + public static final ConfigKey<Boolean> OVERRIDE = ConfigKeys.newBooleanConfigKey( + "override", + "Wheter additional defined effectors should override pre-existing effector with same name or not (default: false)", + Boolean.FALSE); public CompositeEffector(ConfigBag params) { super(newEffectorBuilder(params).build()); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3ac709b5/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorIntegrationTest.java index dd168ed..2134d9b 100644 --- a/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorIntegrationTest.java @@ -42,6 +42,7 @@ import com.google.common.collect.ImmutableList; public class CompositeEffectorIntegrationTest { + @SuppressWarnings("rawtypes") final static Effector<List> EFFECTOR_START = Effectors.effector(List.class, "start").buildAbstract(); private TestApplication app; @@ -78,7 +79,7 @@ public class CompositeEffectorIntegrationTest { .configure(CompositeEffector.EFFECTORS, ImmutableList.of("eff1", "eff2"))) .apply(entity); - List<Object> results = entity.invoke(EFFECTOR_START, MutableMap.<String,String>of()).get(); + List<?> results = entity.invoke(EFFECTOR_START, MutableMap.<String,String>of()).get(); assertEquals(results.size(), 3); assertNull(results.get(0)); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3ac709b5/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorTest.java b/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorTest.java index 3bf0018..3309441 100644 --- a/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorTest.java @@ -53,10 +53,13 @@ import com.google.mockwebserver.MockResponse; public class CompositeEffectorTest extends BrooklynAppUnitTestSupport { + @SuppressWarnings("unused") private static final Logger log = LoggerFactory.getLogger(CompositeEffectorTest.class); + private static final String DEFAULT_ENDPOINT = "/"; - final static Effector<List> EFFECTOR_COMPOSITE = Effectors.effector(List.class, "CompositeEffector").buildAbstract(); + @SuppressWarnings("rawtypes") + static final Effector<List> EFFECTOR_COMPOSITE = Effectors.effector(List.class, "CompositeEffector").buildAbstract(); protected BetterMockWebServer server; protected URL baseUrl; @@ -64,7 +67,7 @@ public class CompositeEffectorTest extends BrooklynAppUnitTestSupport { protected Location loc; protected CompositeEffector compositeEffector; - @BeforeMethod + @BeforeMethod(alwaysRun=true) public void start() throws IOException { server = BetterMockWebServer.newInstanceLocalhost(); server.play(); @@ -121,7 +124,7 @@ public class CompositeEffectorTest extends BrooklynAppUnitTestSupport { ); assertNotNull(compositeEffector); TestEntity testEntity = app.createAndManageChild(buildEntitySpec(httpCommandEffector, compositeEffector)); - List<Object> results = testEntity.invoke(EFFECTOR_COMPOSITE, ImmutableMap.<String, Object>of()).getUnchecked(Duration.seconds(1)); + List<?> results = testEntity.invoke(EFFECTOR_COMPOSITE, ImmutableMap.<String, Object>of()).getUnchecked(Duration.seconds(1)); Asserts.assertEquals(results.size(), 1); assertTrue(results.get(0) instanceof String); @@ -145,7 +148,7 @@ public class CompositeEffectorTest extends BrooklynAppUnitTestSupport { ); assertNotNull(compositeEffector); TestEntity testEntity = app.createAndManageChild(buildEntitySpec(httpCommandEffector, compositeEffector)); - List<Object> results = testEntity.invoke(Effectors.effector(List.class, "start").buildAbstract(), ImmutableMap.<String, Object>of()).getUnchecked(Duration.seconds(1)); + List<?> results = testEntity.invoke(Effectors.effector(List.class, "start").buildAbstract(), ImmutableMap.<String, Object>of()).getUnchecked(Duration.seconds(1)); Asserts.assertEquals(results.size(), 2); assertNull(results.get(0)); assertTrue(results.get(1) instanceof String); @@ -170,7 +173,7 @@ public class CompositeEffectorTest extends BrooklynAppUnitTestSupport { ); assertNotNull(compositeEffector); TestEntity testEntity = app.createAndManageChild(buildEntitySpec(httpCommandEffector, compositeEffector)); - List<Object> results = testEntity.invoke(Effectors.effector(List.class, "start").buildAbstract(), ImmutableMap.<String, Object>of()).getUnchecked(Duration.seconds(1)); + List<?> results = testEntity.invoke(Effectors.effector(List.class, "start").buildAbstract(), ImmutableMap.<String, Object>of()).getUnchecked(Duration.seconds(1)); Asserts.assertEquals(results.size(), 1); assertTrue(results.get(0) instanceof String); Asserts.assertEquals(results.get(0), "myLogin"); @@ -193,7 +196,7 @@ public class CompositeEffectorTest extends BrooklynAppUnitTestSupport { ); assertNotNull(compositeEffector); TestEntity testEntity = app.createAndManageChild(buildEntitySpec(httpCommandEffector, compositeEffector)); - List<Object> results = testEntity.invoke(Effectors.effector(List.class, "stop").buildAbstract(), ImmutableMap.<String, Object>of()).getUnchecked(Duration.minutes(1)); + List<?> results = testEntity.invoke(Effectors.effector(List.class, "stop").buildAbstract(), ImmutableMap.<String, Object>of()).getUnchecked(Duration.minutes(1)); Asserts.assertEquals(results.size(), 2); assertTrue(results.get(0) instanceof String); Asserts.assertEquals(results.get(0), "myLogin"); @@ -218,7 +221,7 @@ public class CompositeEffectorTest extends BrooklynAppUnitTestSupport { ); assertNotNull(compositeEffector); TestEntity testEntity = app.createAndManageChild(buildEntitySpec(httpCommandEffector, compositeEffector)); - List<Object> results = testEntity.invoke(Effectors.effector(List.class, "stop").buildAbstract(), ImmutableMap.<String, Object>of()).getUnchecked(Duration.minutes(1)); + List<?> results = testEntity.invoke(Effectors.effector(List.class, "stop").buildAbstract(), ImmutableMap.<String, Object>of()).getUnchecked(Duration.minutes(1)); Asserts.assertEquals(results.size(), 1); assertTrue(results.get(0) instanceof String); Asserts.assertEquals(results.get(0), "myLogin"); @@ -247,7 +250,7 @@ public class CompositeEffectorTest extends BrooklynAppUnitTestSupport { ); assertNotNull(compositeEffector); TestEntity testEntity = app.createAndManageChild(buildEntitySpec(eff1, compositeEffector)); - List<Object> results = testEntity.invoke(EFFECTOR_COMPOSITE, ImmutableMap.<String, Object>of()).getUnchecked(Duration.seconds(1)); + List<?> results = testEntity.invoke(EFFECTOR_COMPOSITE, ImmutableMap.<String, Object>of()).getUnchecked(Duration.seconds(1)); Asserts.assertEquals(results.size(), 2); }
