Repository: incubator-brooklyn Updated Branches: refs/heads/master 032c53309 -> 21b74b450
Use com.google.common.base.Function Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1aaf75b5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1aaf75b5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1aaf75b5 Branch: refs/heads/master Commit: 1aaf75b5d2cacf6230191632169f04b35b1baec0 Parents: 032c533 Author: Valentin Aitken <[email protected]> Authored: Mon Sep 21 16:53:04 2015 +0300 Committer: Valentin Aitken <[email protected]> Committed: Mon Sep 21 16:53:16 2015 +0300 ---------------------------------------------------------------------- .../entity/software/base/lifecycle/WinRmExecuteHelper.java | 5 ----- .../entity/software/base/lifecycle/ScriptHelperUnitTest.java | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1aaf75b5/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/WinRmExecuteHelper.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/WinRmExecuteHelper.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/WinRmExecuteHelper.java index 60b58c4..703a44b 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/WinRmExecuteHelper.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/WinRmExecuteHelper.java @@ -48,7 +48,6 @@ import static java.lang.String.format; public class WinRmExecuteHelper { public static final Logger LOG = LoggerFactory.getLogger(WinRmExecuteHelper.class); - private Entity entity; private Task<Integer> task; protected final NativeWindowsScriptRunner runner; @@ -77,10 +76,6 @@ public class WinRmExecuteHelper { return this; } - protected Entity getEntity() { - return entity; - } - /** queues the task for execution if we are in a {@link TaskQueueingContext} (e.g. EffectorTaskFactory); * or if we aren't in a queueing context, it will submit the task (assuming there is an {@link ExecutionContext} * _and_ block until completion, throwing on error */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1aaf75b5/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelperUnitTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelperUnitTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelperUnitTest.java index 4cb3dd0..35471cf 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelperUnitTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelperUnitTest.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.entity.software.base.lifecycle; +import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import org.apache.brooklyn.api.mgmt.Task; import org.apache.brooklyn.core.mgmt.BrooklynTaskTags; @@ -35,7 +36,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.List; import java.util.Map; -import java.util.function.Function; import static org.apache.brooklyn.entity.software.base.VanillaSoftwareProcessStreamsIntegrationTest.getStreamOrFail; import static org.mockito.Mockito.any;
