From 50331ca8395ad6a3a1748b15336720e61b925158 Mon Sep 17 00:00:00 2001 From: Aled Sage Date: Tue, 10 Oct 2017 09:04:11 +0100 Subject: [PATCH 1/2] Fix use of deprecated code --- .../org/apache/brooklyn/entity/chef/ChefAttributeFeed.java | 6 +++--- .../brooklyn/entity/chef/ChefLifecycleEffectorTasks.java | 1 - .../org/apache/brooklyn/entity/chef/ChefServerTasks.java | 2 +- .../apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/software/cm/chef/src/main/java/org/apache/brooklyn/entity/chef/ChefAttributeFeed.java b/software/cm/chef/src/main/java/org/apache/brooklyn/entity/chef/ChefAttributeFeed.java index f6d2615d0..91c9b0980 100644 --- a/software/cm/chef/src/main/java/org/apache/brooklyn/entity/chef/ChefAttributeFeed.java +++ b/software/cm/chef/src/main/java/org/apache/brooklyn/entity/chef/ChefAttributeFeed.java @@ -194,8 +194,8 @@ public ChefAttributeFeed() { } protected ChefAttributeFeed(Builder builder) { - setConfig(ONLY_IF_SERVICE_UP, builder.onlyIfServiceUp); - setConfig(NODE_NAME, checkNotNull(builder.nodeName, "builder.nodeName")); + config().set(ONLY_IF_SERVICE_UP, builder.onlyIfServiceUp); + config().set(NODE_NAME, checkNotNull(builder.nodeName, "builder.nodeName")); Set> polls = Sets.newLinkedHashSet(); for (ChefAttributePollConfig config : builder.polls) { @@ -205,7 +205,7 @@ protected ChefAttributeFeed(Builder builder) { if (configCopy.getPeriod() < 0) configCopy.period(builder.period); polls.add(configCopy); } - setConfig(POLLS, polls); + config().set(POLLS, polls); initUniqueTag(builder.uniqueTag, polls); } diff --git a/software/cm/chef/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java b/software/cm/chef/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java index 8c3dad960..a142de430 100644 --- a/software/cm/chef/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java +++ b/software/cm/chef/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Map; -import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.MachineLocation; diff --git a/software/cm/chef/src/main/java/org/apache/brooklyn/entity/chef/ChefServerTasks.java b/software/cm/chef/src/main/java/org/apache/brooklyn/entity/chef/ChefServerTasks.java index c81ff9def..af0c8138b 100644 --- a/software/cm/chef/src/main/java/org/apache/brooklyn/entity/chef/ChefServerTasks.java +++ b/software/cm/chef/src/main/java/org/apache/brooklyn/entity/chef/ChefServerTasks.java @@ -51,7 +51,7 @@ synchronized static File extractKeyFile(SshMachineLocation machine) { if (data==null) return null; try { f.deleteOnExit(); - Files.write(SecureKeys.stringPem(data), f, Charset.defaultCharset()); + Files.write(SecureKeys.toPem(data), f, Charset.defaultCharset()); return f; } catch (IOException e) { throw Throwables.propagate(e); diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java index 222891e18..b8366a991 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxSshDriver.java @@ -118,10 +118,10 @@ public void postLaunch() { entity.sensors().set(NginxController.PID_FILE, getRunDir() + "/" + AbstractSoftwareProcessSshDriver.PID_FILENAME); if (((AbstractController)entity).isSsl()) { entity.sensors().set(Attributes.HTTPS_PORT, getPort()); - ((EntityInternal)entity).removeAttribute(Attributes.HTTP_PORT); + ((EntityInternal)entity).sensors().remove(Attributes.HTTP_PORT); } else { entity.sensors().set(Attributes.HTTP_PORT, getPort()); - ((EntityInternal)entity).removeAttribute(Attributes.HTTPS_PORT); + ((EntityInternal)entity).sensors().remove(Attributes.HTTPS_PORT); } super.postLaunch(); } From 03b414c4b449713a33334c0a57ee98b35c2d2567 Mon Sep 17 00:00:00 2001 From: Aled Sage Date: Tue, 10 Oct 2017 09:04:20 +0100 Subject: [PATCH 2/2] Fix storm live test setup/teardown --- .../storm/StormAbstractCloudLiveTest.java | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java index 9fa27bf2d..e712791db 100644 --- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java +++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java @@ -34,8 +34,9 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.EntityAsserts; import org.apache.brooklyn.core.entity.trait.Startable; -import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport; +import org.apache.brooklyn.entity.messaging.storm.topologies.ExclamationBolt; +import org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.ResourceUtils; import org.apache.brooklyn.util.core.file.ArchiveBuilder; @@ -45,10 +46,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import com.google.common.base.Throwables; +import com.google.common.collect.ImmutableList; + import backtype.storm.Config; import backtype.storm.StormSubmitter; import backtype.storm.generated.AlreadyAliveException; @@ -57,12 +60,6 @@ import backtype.storm.testing.TestWordSpout; import backtype.storm.topology.TopologyBuilder; -import org.apache.brooklyn.entity.messaging.storm.topologies.ExclamationBolt; -import org.apache.brooklyn.entity.zookeeper.ZooKeeperEnsemble; - -import com.google.common.base.Throwables; -import com.google.common.collect.ImmutableList; - public abstract class StormAbstractCloudLiveTest extends BrooklynAppLiveTestSupport { protected static final Logger log = LoggerFactory @@ -73,17 +70,11 @@ public abstract class StormAbstractCloudLiveTest extends BrooklynAppLiveTestSupp private Storm supervisor; private Storm ui; - @BeforeClass(alwaysRun = true) - public void beforeClass() throws Exception { - mgmt = new LocalManagementContext(); - location = mgmt.getLocationRegistry() - .getLocationManaged(getLocation(), getFlags()); + @BeforeMethod(alwaysRun = true) + @Override + public void setUp() throws Exception { super.setUp(); - } - - @AfterClass(alwaysRun = true) - public void afterClass() throws Exception { - // Entities.destroyAll(mgmt); + location = mgmt.getLocationRegistry().getLocationManaged(getLocation(), getFlags()); } public abstract String getLocation();