Mailing-List: contact dev-help@brooklyn.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@brooklyn.apache.org
From: neykov <git@git.apache.org>
To: dev@brooklyn.apache.org
Reply-To: dev@brooklyn.apache.org
References: <git-pr-151-brooklyn-server@git.apache.org>
In-Reply-To: <git-pr-151-brooklyn-server@git.apache.org>
Subject: [GitHub] brooklyn-server pull request: Merge Map values in config
Content-Type: text/plain
Message-Id: <20160523112239.7AF89DFBDE@git1-us-west.apache.org>
Date: Mon, 23 May 2016 11:22:39 +0000 (UTC)
archived-at: Mon, 23 May 2016 11:22:41 -0000

Github user neykov commented on a diff in the pull request:

    https://github.com/apache/brooklyn-server/pull/151#discussion_r64206445
  
    --- Diff: utils/common/src/main/java/org/apache/brooklyn/util/collections/CollectionHelpers.java ---
    @@ -0,0 +1,52 @@
    +/*
    + * Licensed to the Apache Software Foundation (ASF) under one
    + * or more contributor license agreements.  See the NOTICE file
    + * distributed with this work for additional information
    + * regarding copyright ownership.  The ASF licenses this file
    + * to you under the Apache License, Version 2.0 (the
    + * "License"); you may not use this file except in compliance
    + * with the License.  You may obtain a copy of the License at
    + *
    + *     http://www.apache.org/licenses/LICENSE-2.0
    + *
    + * Unless required by applicable law or agreed to in writing,
    + * software distributed under the License is distributed on an
    + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
    + * KIND, either express or implied.  See the License for the
    + * specific language governing permissions and limitations
    + * under the License.
    + */
    +package org.apache.brooklyn.util.collections;
    +
    +import org.slf4j.Logger;
    +import org.slf4j.LoggerFactory;
    +
    +import java.util.Map;
    +
    +public class CollectionHelpers {
    +    private static final Logger log = LoggerFactory.getLogger(CollectionHelpers.class);
    +
    +    public static Map<String, Object> mergeNestedMaps(Map<String, Object> defaultEntries, Map<String, Object> overrideWith) {
    +        Map<String, Object> result = MutableMap.of();
    +        result.putAll(defaultEntries);
    +        for (Map.Entry<String, Object> newEntry: overrideWith.entrySet()) {
    +            if (!defaultEntries.containsKey(newEntry.getKey())) {
    +                result.put(newEntry.getKey(), newEntry.getValue());
    +            } else if (newEntry.getValue() instanceof Map) {
    +                Map<Object, Object> mergedValue = MutableMap.of();
    +                if (defaultEntries.get(newEntry.getKey()) instanceof Map) {
    +                    mergedValue.putAll((Map) defaultEntries.get(newEntry.getKey()));
    +                } else {
    +                    log.warn("defaultEntries {} is expected to be Map but it is {}", newEntry.getKey(), defaultEntries);
    +                }
    +                for (Map.Entry<Object, Object> innerValue : ((Map<Object,Object>) newEntry.getValue()).entrySet()) {
    +                    mergedValue.put(innerValue.getKey(), innerValue.getValue());
    --- End diff --
    
    Why not `putAll(newEntry.getValue())`?


---
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.
---