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 EDAA1200CC2 for ; Wed, 5 Jul 2017 13:49:59 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EC1E21630C8; Wed, 5 Jul 2017 11:49:59 +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 30A691630C9 for ; Wed, 5 Jul 2017 13:49:59 +0200 (CEST) Received: (qmail 13525 invoked by uid 500); 5 Jul 2017 11:49:58 -0000 Mailing-List: contact dev-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 dev@brooklyn.apache.org Received: (qmail 13293 invoked by uid 99); 5 Jul 2017 11:49:58 -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; Wed, 05 Jul 2017 11:49:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 01C1CDFC25; Wed, 5 Jul 2017 11:49:58 +0000 (UTC) From: geomacy To: dev@brooklyn.apache.org Reply-To: dev@brooklyn.apache.org References: In-Reply-To: Subject: [GitHub] brooklyn-server pull request #734: Support ConfigKey deprecated names Content-Type: text/plain Message-Id: <20170705114958.01C1CDFC25@git1-us-west.apache.org> Date: Wed, 5 Jul 2017 11:49:58 +0000 (UTC) archived-at: Wed, 05 Jul 2017 11:50:00 -0000 Github user geomacy commented on a diff in the pull request: https://github.com/apache/brooklyn-server/pull/734#discussion_r125617181 --- Diff: core/src/main/java/org/apache/brooklyn/core/location/AbstractLocation.java --- @@ -216,17 +216,14 @@ public AbstractLocation configure(Map properties) { config().removeKey(PARENT_LOCATION); } - // allow config keys to be set by name (or deprecated name) + // Allow config keys to be set by name (or deprecated name) // - // Aled thinks it would be sensible to remove the consumed flags below (i.e. properties = ...). - // However, that caused ClockerDynamicLocationPatternTest to fail because there is a field of - // StubContainerLocation annotated with `@SetFromFlag("owner")`, as well as a config key with - // name "owner" (and with `@SetFromFlag("owner")`) in the super-type (DynamicLocation). - // However, that looks mad - do we really need to support it?! - // I've preserved that behaviour (for now). - ConfigUtilsInternal.setAllConfigKeys(properties, getLocationTypeInternal().getConfigKeys().values(), this); + // The resulting `properties` will no longer contain the keys that we matched; + // we will not also use them to for `SetFromFlag` etc. + properties = ConfigUtilsInternal.setAllConfigKeys(properties, getLocationTypeInternal().getConfigKeys().values(), this); // NB: flag-setting done here must also be done in BasicLocationRebindSupport + // Must call setFieldsFromFlagsWithBag, even if properites is empty, so defaults are extracted from annotations --- End diff -- typo `properites` --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---