[brooklyn-server] branch master updated: Added wrapped values in the other map

[heneveld]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git


The following commit(s) were added to refs/heads/master by this push:
     new c009a86b01 Added wrapped values in the other map
     new 7ead50cb2a Merge pull request #1407 from iuliana/wrapped
c009a86b01 is described below

commit c009a86b01a6912b43afc667151f4659d8fefaea
Author: iuliana <iuli...@cloudsoft.io>
AuthorDate: Thu Aug 10 09:34:44 2023 +0100

    Added wrapped values in the other map
---
 .../brooklyn/spi/creation/BrooklynEntityDecorationResolver.java     | 4 +++-
 .../apache/brooklyn/util/core/task/ssh/ConnectionDefinition.java    | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java
 
b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java
index 256ba697b0..d4a0585194 100644
--- 
a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java
+++ 
b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java
@@ -193,7 +193,9 @@ public abstract class BrooklynEntityDecorationResolver<DT> {
 
     public static class InitializerResolver extends 
BrooklynEntityDecorationResolver<EntityInitializer> {
 
-        public InitializerResolver(BrooklynYamlTypeInstantiator.Factory 
instantiator) { super(instantiator, "Entity initializer", "initializer", 
BrooklynCampReservedKeys.BROOKLYN_INITIALIZERS); }
+        public InitializerResolver(BrooklynYamlTypeInstantiator.Factory 
instantiator) {
+            super(instantiator, "Entity initializer", "initializer", 
BrooklynCampReservedKeys.BROOKLYN_INITIALIZERS);
+        }
 
         @Override
         public void decorate(EntitySpec<?> entitySpec, ConfigBag attrs, 
Set<String> encounteredRegisteredTypeIds) {
diff --git 
a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/ConnectionDefinition.java
 
b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/ConnectionDefinition.java
index be816a944e..2aae1743f6 100644
--- 
a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/ConnectionDefinition.java
+++ 
b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/ConnectionDefinition.java
@@ -47,11 +47,11 @@ public class ConnectionDefinition {
     }
 
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    protected Map<String,Object> other = MutableMap.of();
+    protected Map<String,WrappedValue<Object>> other = MutableMap.of();
 
     @JsonAnySetter
     public void setOther(String k, Object v) {
-        other.put(k,v);
+        other.put(k,v instanceof WrappedValue ?  (WrappedValue<Object>) v: 
WrappedValue.of(v));
     }
 
     public String getType() {
@@ -97,7 +97,7 @@ public class ConnectionDefinition {
     public Object getOther(final String key) {
         return other.get(key);
     }
-    public Map<String, Object> getOther() {
+    public Map<String, WrappedValue<Object>> getOther() {
         return other;
     }