brooklyn-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From neykov <...@git.apache.org>
Subject [GitHub] brooklyn-server pull request #462: Inherit config default values
Date Fri, 06 Jan 2017 17:42:48 GMT
Github user neykov commented on a diff in the pull request:

    https://github.com/apache/brooklyn-server/pull/462#discussion_r94953612
  
    --- Diff: core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java ---
    @@ -227,13 +234,30 @@ public String toString() {
                 String label = (String)inputDef.get("label");
                 String description = (String)inputDef.get("description");
                 String type = (String)inputDef.get("type");
    -            Object defaultValue = inputDef.get("default");
                 Boolean pinned = (Boolean)inputDef.get("pinned");
    +            boolean hasDefaultValue = inputDef.containsKey("default");
    +            Object defaultValue = inputDef.get("default");
                 if (specialFlagTransformer != null) {
                     defaultValue = specialFlagTransformer.apply(defaultValue);
                 }
    +            boolean hasConstraints = inputDef.containsKey("constraints");
                 Predicate<?> constraint = parseConstraints(inputDef.get("constraints"),
loader);
    -            ConfigInheritance parentInheritance = parseInheritance(inputDef.get("inheritance.parent"),
loader);
    +
    +            ConfigInheritance runtimeInheritance;
    +            boolean hasRuntimeInheritance;
    +            if (inputDef.containsKey("inheritance.runtime")) {
    +                hasRuntimeInheritance = true;
    +                runtimeInheritance = parseInheritance(inputDef.get("inheritance.runtime"),
loader);
    +            } else if (inputDef.containsKey("inheritance.parent")) {
    +                // this alias will be deprecated
    +                hasRuntimeInheritance = true;
    +                runtimeInheritance = parseInheritance(inputDef.get("inheritance.parent"),
loader);
    +            } else {
    +                hasRuntimeInheritance = false;
    +                runtimeInheritance = parseInheritance(null, loader);
    --- End diff --
    
    `runtimeInheritance = null` is more clear


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

Mime
View raw message