You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/11/02 17:08:45 UTC
[1/5] incubator-brooklyn git commit: pass flags to
assertContentEventuallyMatches for setting timeout
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 6d0089086 -> c0021ca1b
pass flags to assertContentEventuallyMatches for setting timeout
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/68b774f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/68b774f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/68b774f8
Branch: refs/heads/master
Commit: 68b774f8a1e46ba2bd07fcc8d5d926b6ed3d8308
Parents: 6d00890
Author: John McCabe <jo...@johnmccabe.net>
Authored: Fri Oct 30 14:34:38 2015 +0000
Committer: John McCabe <jo...@johnmccabe.net>
Committed: Fri Oct 30 14:34:38 2015 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/brooklyn/test/HttpTestUtils.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68b774f8/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java
----------------------------------------------------------------------
diff --git a/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java b/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java
index eed5ef4..a554876 100644
--- a/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java
+++ b/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java
@@ -292,7 +292,11 @@ public class HttpTestUtils {
}
public static void assertContentEventuallyMatches(final String url, final String regex) {
- Asserts.succeedsEventually(new Runnable() {
+ assertContentEventuallyMatches(MutableMap.of(), url, regex);
+ }
+
+ public static void assertContentEventuallyMatches(Map flags, final String url, final String regex) {
+ Asserts.succeedsEventually(flags, new Runnable() {
@Override
public void run() {
assertContentMatches(url, regex);
[4/5] incubator-brooklyn git commit: This closes #995
Posted by he...@apache.org.
This closes #995
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c16cfbdd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c16cfbdd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c16cfbdd
Branch: refs/heads/master
Commit: c16cfbdd8d7d2a2804e231af6ba445719a2aa26f
Parents: 6d00890 e1edc98
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Nov 2 16:06:53 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Nov 2 16:06:53 2015 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/test/HttpTestUtils.java | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[5/5] incubator-brooklyn git commit: This closes #996
Posted by he...@apache.org.
This closes #996
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c0021ca1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c0021ca1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c0021ca1
Branch: refs/heads/master
Commit: c0021ca1b1226d6de6fa4b113cfd73c6c669980a
Parents: c16cfbd e27a35a
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Nov 2 16:06:57 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Nov 2 16:06:57 2015 +0000
----------------------------------------------------------------------
.../main/java/org/apache/brooklyn/enricher/stock/Aggregator.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
[2/5] incubator-brooklyn git commit: Fix sum transformation lookup
Posted by he...@apache.org.
Fix sum transformation lookup
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e27a35aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e27a35aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e27a35aa
Branch: refs/heads/master
Commit: e27a35aa4738a90ea4afe3215ea23378b3322089
Parents: 6d00890
Author: Mike Zaccardo <mi...@cloudsoftcorp.com>
Authored: Fri Oct 30 12:55:20 2015 -0500
Committer: Mike Zaccardo <mi...@cloudsoftcorp.com>
Committed: Fri Oct 30 12:55:20 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/brooklyn/enricher/stock/Aggregator.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e27a35aa/core/src/main/java/org/apache/brooklyn/enricher/stock/Aggregator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/enricher/stock/Aggregator.java b/core/src/main/java/org/apache/brooklyn/enricher/stock/Aggregator.java
index 2892427..0e0e8cc 100644
--- a/core/src/main/java/org/apache/brooklyn/enricher/stock/Aggregator.java
+++ b/core/src/main/java/org/apache/brooklyn/enricher/stock/Aggregator.java
@@ -33,7 +33,6 @@ import org.apache.brooklyn.api.sensor.SensorEventListener;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.BrooklynLogging;
import org.apache.brooklyn.core.config.ConfigKeys;
-import org.apache.brooklyn.enricher.stock.Enrichers.ComputingAverage;
import org.apache.brooklyn.util.collections.MutableList;
import org.apache.brooklyn.util.collections.MutableMap;
import org.apache.brooklyn.util.core.flags.SetFromFlag;
@@ -103,7 +102,7 @@ public class Aggregator<T,U> extends AbstractAggregator<T,U> implements SensorEv
@SuppressWarnings({ "rawtypes", "unchecked" })
protected Function<? super Collection<?>, ?> lookupTransformation(String t1) {
if ("average".equalsIgnoreCase(t1)) return new Enrichers.ComputingAverage(null, null, targetSensor.getTypeToken());
- if ("sum".equalsIgnoreCase(t1)) return new Enrichers.ComputingAverage(null, null, targetSensor.getTypeToken());
+ if ("sum".equalsIgnoreCase(t1)) return new Enrichers.ComputingSum(null, null, targetSensor.getTypeToken());
if ("list".equalsIgnoreCase(t1)) return new ComputingList();
return null;
}
[3/5] incubator-brooklyn git commit: Added types to flags Maps and
purged unused import
Posted by he...@apache.org.
Added types to flags Maps and purged unused import
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e1edc98e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e1edc98e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e1edc98e
Branch: refs/heads/master
Commit: e1edc98eeb6382e575d1a6d13368552ac50627e4
Parents: 68b774f
Author: John McCabe <jo...@johnmccabe.net>
Authored: Mon Nov 2 11:44:19 2015 +0000
Committer: John McCabe <jo...@johnmccabe.net>
Committed: Mon Nov 2 11:44:19 2015 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/test/HttpTestUtils.java | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e1edc98e/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java
----------------------------------------------------------------------
diff --git a/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java b/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java
index a554876..4625c04 100644
--- a/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java
+++ b/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java
@@ -39,7 +39,6 @@ import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLSession;
-import org.apache.brooklyn.test.Asserts;
import org.apache.brooklyn.util.collections.MutableMap;
import org.apache.brooklyn.util.crypto.SslTrustUtils;
import org.apache.brooklyn.util.exceptions.Exceptions;
@@ -51,7 +50,6 @@ import org.testng.Assert;
import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
@@ -172,10 +170,10 @@ public class HttpTestUtils {
}
public static void assertUrlUnreachableEventually(final String url) {
- assertUrlUnreachableEventually(Maps.newLinkedHashMap(), url);
+ assertUrlUnreachableEventually(MutableMap.<String, Object>of(), url);
}
- public static void assertUrlUnreachableEventually(Map flags, final String url) {
+ public static void assertUrlUnreachableEventually(Map<String,?> flags, final String url) {
Asserts.succeedsEventually(flags, new Runnable() {
public void run() {
assertUrlUnreachable(url);
@@ -201,10 +199,10 @@ public class HttpTestUtils {
}
public static void assertHttpStatusCodeEventuallyEquals(final String url, final int expectedCode) {
- assertHttpStatusCodeEventuallyEquals(Maps.newLinkedHashMap(), url, expectedCode);
+ assertHttpStatusCodeEventuallyEquals(MutableMap.<String, Object>of(), url, expectedCode);
}
- public static void assertHttpStatusCodeEventuallyEquals(Map flags, final String url, final int expectedCode) {
+ public static void assertHttpStatusCodeEventuallyEquals(Map<String,?> flags, final String url, final int expectedCode) {
Asserts.succeedsEventually(flags, new Runnable() {
public void run() {
assertHttpStatusCodeEquals(url, expectedCode);
@@ -274,10 +272,10 @@ public class HttpTestUtils {
}
public static void assertContentEventuallyContainsText(final String url, final String phrase, final String ...additionalPhrases) {
- assertContentEventuallyContainsText(MutableMap.of(), url, phrase, additionalPhrases);
+ assertContentEventuallyContainsText(MutableMap.<String, Object>of(), url, phrase, additionalPhrases);
}
- public static void assertContentEventuallyContainsText(Map flags, final String url, final String phrase, final String ...additionalPhrases) {
+ public static void assertContentEventuallyContainsText(Map<String,?> flags, final String url, final String phrase, final String ...additionalPhrases) {
Asserts.succeedsEventually(flags, new Runnable() {
public void run() {
assertContentContainsText(url, phrase, additionalPhrases);
@@ -292,10 +290,10 @@ public class HttpTestUtils {
}
public static void assertContentEventuallyMatches(final String url, final String regex) {
- assertContentEventuallyMatches(MutableMap.of(), url, regex);
+ assertContentEventuallyMatches(MutableMap.<String, Object>of(), url, regex);
}
- public static void assertContentEventuallyMatches(Map flags, final String url, final String regex) {
+ public static void assertContentEventuallyMatches(Map<String,?> flags, final String url, final String regex) {
Asserts.succeedsEventually(flags, new Runnable() {
@Override
public void run() {