Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A886C200C79 for ; Fri, 19 May 2017 19:04:22 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A721F160BB0; Fri, 19 May 2017 17:04:22 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A12CC160BDB for ; Fri, 19 May 2017 19:04:21 +0200 (CEST) Received: (qmail 71323 invoked by uid 500); 19 May 2017 17:04:20 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 71188 invoked by uid 99); 19 May 2017 17:04:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 May 2017 17:04:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8E828DFE34; Fri, 19 May 2017 17:04:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: m4rkmckenna@apache.org To: commits@brooklyn.apache.org Date: Fri, 19 May 2017 17:04:27 -0000 Message-Id: <1efc8d6ea6324aeeae66d971be5a94f8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/12] brooklyn-server git commit: AbstractManagementContext.runAtEntity protected, instead of public archived-at: Fri, 19 May 2017 17:04:22 -0000 AbstractManagementContext.runAtEntity protected, instead of public Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/24236966 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/24236966 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/24236966 Branch: refs/heads/master Commit: 24236966d2e1a06e251a2d971c7c4f7fb55479df Parents: e372291 Author: Aled Sage Authored: Thu May 18 17:09:57 2017 +0100 Committer: Aled Sage Committed: Fri May 19 13:27:04 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/core/mgmt/internal/AbstractManagementContext.java | 2 +- .../apache/brooklyn/core/mgmt/internal/LocalManagementContext.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/24236966/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java index c009437..850477c 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java @@ -328,7 +328,7 @@ public abstract class AbstractManagementContext implements ManagementContextInte * (Callable with Map flags is too open-ended, bothersome to support, and not used much) */ @Deprecated - public abstract Task runAtEntity(@SuppressWarnings("rawtypes") Map flags, Entity entity, Callable c); + protected abstract Task runAtEntity(@SuppressWarnings("rawtypes") Map flags, Entity entity, Callable c); /** Runs the given effector in the right place for the given entity. * The task is immediately submitted in the background, but also recorded in the queueing context (if present) http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/24236966/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContext.java index 3e3b776..7d82c52 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContext.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContext.java @@ -359,7 +359,7 @@ public class LocalManagementContext extends AbstractManagementContext { @SuppressWarnings({ "unchecked", "rawtypes" }) @Override - public Task runAtEntity(Map flags, Entity entity, Callable c) { + protected Task runAtEntity(Map flags, Entity entity, Callable c) { manageIfNecessary(entity, elvis(Arrays.asList(flags.get("displayName"), flags.get("description"), flags, c))); return runAtEntity(entity, Tasks.builder().dynamic(true).body(c).flags(flags).build()); }