You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/02/07 09:49:44 UTC
[1/2] brooklyn-server git commit: Resolve deferred values in
containers (list, map) on config().getNonBlocking(...)
Repository: brooklyn-server
Updated Branches:
refs/heads/master 422e025ea -> 114d47da1
Resolve deferred values in containers (list, map) on config().getNonBlocking(...)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/03dc429b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/03dc429b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/03dc429b
Branch: refs/heads/master
Commit: 03dc429b1b75bf364e7601ded896d2bfb505a9c4
Parents: 4c75815
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Jan 30 17:50:53 2017 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Jan 30 17:58:16 2017 +0200
----------------------------------------------------------------------
.../AbstractConfigurationSupportInternal.java | 1 +
.../core/config/ConfigTypeCoercionTest.java | 61 ++++++++++++++++++++
2 files changed, 62 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/03dc429b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java
index a878e52..2714f67 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java
@@ -144,6 +144,7 @@ public abstract class AbstractConfigurationSupportInternal implements BrooklynOb
.as(Object.class)
.defaultValue(marker)
.immediately(true)
+ .deep(true)
.context(getContext())
.swallowExceptions()
.get();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/03dc429b/core/src/test/java/org/apache/brooklyn/core/config/ConfigTypeCoercionTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/config/ConfigTypeCoercionTest.java b/core/src/test/java/org/apache/brooklyn/core/config/ConfigTypeCoercionTest.java
new file mode 100644
index 0000000..3c3a9a0
--- /dev/null
+++ b/core/src/test/java/org/apache/brooklyn/core/config/ConfigTypeCoercionTest.java
@@ -0,0 +1,61 @@
+/*
+ * 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.core.config;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import java.util.List;
+import java.util.concurrent.Callable;
+
+import org.apache.brooklyn.api.mgmt.Task;
+import org.apache.brooklyn.api.sensor.Sensor;
+import org.apache.brooklyn.config.ConfigKey;
+import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
+import org.apache.brooklyn.core.test.entity.TestApplication;
+import org.apache.brooklyn.util.guava.Maybe;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+import com.google.common.reflect.TypeToken;
+
+public class ConfigTypeCoercionTest extends BrooklynAppUnitTestSupport {
+ private static ConfigKey<Object> SENSORS_UNTYPED = ConfigKeys.newConfigKey(Object.class, "sensors");
+ @SuppressWarnings("serial")
+ private static ConfigKey<List<? extends Sensor<?>>> SENSORS = ConfigKeys.newConfigKey(new TypeToken<List<? extends Sensor<?>>>() {}, "sensors");
+
+ @Test
+ public void testSshConfigFromDefault() throws Exception {
+ // Simulate a deferred value
+ Task<Sensor<?>> sensorFuture = app.getExecutionContext().submit(new Callable<Sensor<?>>() {
+ @Override
+ public Sensor<?> call() throws Exception {
+ return TestApplication.MY_ATTRIBUTE;
+ }
+ });
+ app.config().set(SENSORS_UNTYPED, (Object)ImmutableList.of(sensorFuture));
+
+ Maybe<List<? extends Sensor<?>>> sensors = app.config().getNonBlocking(SENSORS);
+ assertTrue(sensors.isPresent(), "value expected");
+ Sensor<?> sensor = Iterables.getOnlyElement(sensors.get());
+ assertEquals(sensor, TestApplication.MY_ATTRIBUTE);
+ }
+
+}
[2/2] brooklyn-server git commit: This closes #542
Posted by dr...@apache.org.
This closes #542
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/114d47da
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/114d47da
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/114d47da
Branch: refs/heads/master
Commit: 114d47da1c2b6d35c4c1a9d2266a377a2c826258
Parents: 422e025 03dc429
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Tue Feb 7 09:49:25 2017 +0000
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Tue Feb 7 09:49:25 2017 +0000
----------------------------------------------------------------------
.../AbstractConfigurationSupportInternal.java | 1 +
.../core/config/ConfigTypeCoercionTest.java | 61 ++++++++++++++++++++
2 files changed, 62 insertions(+)
----------------------------------------------------------------------