Github user geomacy commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/462#discussion_r94440837
--- Diff:
core/src/main/java/org/apache/brooklyn/core/config/internal/AbstractConfigMapImpl.java
---
@@ -355,40 +355,40 @@ protected ConfigInheritance
getDefaultRuntimeInheritance() {
// prefer default and type of ownKey
Maybe<T> defaultValue = raw ? Maybe.<T>absent() :
ownKey.hasDefaultValue() ?
coerceFn.apply(Maybe.of((Object)ownKey.getDefaultValue())) :
- queryKey.hasDefaultValue() ?
coerceFn.apply(Maybe.of((Object)queryKey.getDefaultValue())) :
- Maybe.<T>absent();
-
- if (ownKey instanceof ConfigKeySelfExtracting) {
-
- Function<TContainer, Maybe<Object>> lookupFn = new
Function<TContainer, Maybe<Object>>() {
- @Override public Maybe<Object> apply(TContainer input) {
- // lookup against ownKey as it may do extra resolution
(eg grab *.* subkeys if a map)
- Maybe<Object> result = getRawValueAtContainer(input,
ownKey);
- if (!raw) result = resolveRawValueFromContainer(input,
ownKey, result);
- return result;
- }
- };
- Function<TContainer, TContainer> parentFn = new
Function<TContainer, TContainer>() {
- @Override public TContainer apply(TContainer input) {
- return getParentOfContainer(input);
+ queryKey.hasDefaultValue() ?
coerceFn.apply(Maybe.of((Object)queryKey.getDefaultValue())) :
+ Maybe.<T>absent();
+
+ if (ownKey instanceof ConfigKeySelfExtracting) {
--- End diff --
Indentation is wrong
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
