Repository: brooklyn-library Updated Branches: refs/heads/master 3b79d36f5 -> 7ceb3c254
Close streams after usage Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/d748ec9e Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/d748ec9e Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/d748ec9e Branch: refs/heads/master Commit: d748ec9ed5957e8197e4e54f03c9d831a83c1be9 Parents: 7d8dec2 Author: Svetoslav Neykov <[email protected]> Authored: Mon Jun 13 18:34:45 2016 +0300 Committer: Svetoslav Neykov <[email protected]> Committed: Wed Jun 15 16:16:24 2016 +0300 ---------------------------------------------------------------------- .../java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java | 2 +- .../brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java | 2 +- .../brooklyn/entity/dns/geoscaling/GeoDnsServiceYamlTest.java | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/d748ec9e/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java ---------------------------------------------------------------------- diff --git a/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java b/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java index 4f9ef1f..50205e0 100644 --- a/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java +++ b/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java @@ -89,6 +89,6 @@ public class HighstateTest { private String getTestYaml() { final ResourceUtils resourceUtils = ResourceUtils.create(); final InputStream yaml = resourceUtils.getResourceFromUrl("classpath://test-highstate.yaml"); - return Streams.readFullyString(yaml); + return Streams.readFullyStringAndClose(yaml); } } http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/d748ec9e/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java index 1c72ab4..dbb743b 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java @@ -301,7 +301,7 @@ public class CassandraNodeSshDriver extends JavaSoftwareProcessSshDriver impleme Tasks.setBlockingDetails("Pausing to ensure Cassandra (singleton) has started before running creation script"); Time.sleep(Duration.seconds(20)); Tasks.resetBlockingDetails(); - executeScriptAsync(Streams.readFullyString(creationScript)); + executeScriptAsync(Streams.readFullyStringAndClose(creationScript)); } } if (isClustered() && isFirst) { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/d748ec9e/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoDnsServiceYamlTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoDnsServiceYamlTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoDnsServiceYamlTest.java index bbeee41..1f3f1b4 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoDnsServiceYamlTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoDnsServiceYamlTest.java @@ -27,7 +27,6 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.mgmt.EntityManagementUtils; import org.apache.brooklyn.entity.dns.AbstractGeoDnsService; import org.apache.brooklyn.entity.group.DynamicFabric; -import org.apache.brooklyn.util.stream.Streams; import org.testng.annotations.Test; public class GeoDnsServiceYamlTest extends AbstractYamlTest { @@ -35,7 +34,7 @@ public class GeoDnsServiceYamlTest extends AbstractYamlTest { @Test public void testTargetGroupCanBeSetInYaml() throws Exception { final String resourceName = "classpath:/" + getClass().getPackage().getName().replace('.', '/') + "/geodns.yaml"; - final String blueprint = Streams.readFully(loadYaml(resourceName)); + final String blueprint = loadYaml(resourceName); Application app = EntityManagementUtils.createUnstarted(mgmt(), blueprint); GeoscalingDnsService geodns = Entities.descendants(app, GeoscalingDnsService.class).iterator().next(); DynamicFabric fabric = Entities.descendants(app, DynamicFabric.class).iterator().next();
