Github user neykov commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/462#discussion_r94960067
--- Diff:
core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java ---
@@ -404,7 +431,126 @@ public static void
addParameters(AbstractBrooklynObjectSpec<?, ?> spec, List<? e
spec.parametersAdd(BasicSpecParameter.fromSpec(loader.getManagementContext(),
spec));
}
if (explicitParams.size() > 0) {
- spec.parametersAdd(explicitParams);
+ spec.parametersReplace(resolveParameters(explicitParams,
spec.getParameters(), spec));
+ }
+ }
+
+ /** merge parameters against other parameters and known and
type-inherited config keys */
+ static Collection<SpecParameter<?>> resolveParameters(Collection<?
extends SpecParameter<?>> newParams, Collection<? extends SpecParameter<?>>
existingReferenceParamsToKeep, AbstractBrooklynObjectSpec<?,?> spec) {
+ Map<String,SpecParameter<?>> existingToKeep = MutableMap.of();
+ if (existingReferenceParamsToKeep!=null) {
+ for (SpecParameter<?> p: existingReferenceParamsToKeep) {
+ existingToKeep.put(p.getConfigKey().getName(), p);
+ }
+ }
+
+ List<SpecParameter<?>> result = MutableList.<SpecParameter<?>>of();
+ for (SpecParameter<?> p: newParams) {
+ if (p instanceof SpecParameterForInheritance) {
+ SpecParameter<?> existingP =
existingToKeep.remove(p.getConfigKey().getName());
+ if (existingP!=null) {
+ p =
((SpecParameterForInheritance<?>)p).resolveWithAncestor(existingP);
+ } else {
+ // TODO find config keys on the type (not available as
parameters)
--- End diff --
Suggest we introduce support for both cases at the same time to avoid
confusion of when the inheritance works and when it doesn't.
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
