You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/11/03 16:52:00 UTC
[16/29] git commit: fix merge conflicts
fix merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7f09a80e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7f09a80e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7f09a80e
Branch: refs/heads/master
Commit: 7f09a80e8b4d54fa75798326b2e9e88f8222a4b0
Parents: ec3701a
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Oct 27 06:48:32 2014 -0700
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Oct 31 09:38:20 2014 -0500
----------------------------------------------------------------------
core/src/main/java/brooklyn/entity/basic/EntityPredicates.java | 3 +++
.../entity/brooklynnode/effector/CallbackEntityHttpClient.java | 5 +++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7f09a80e/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java b/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java
index 0531441..b81b835 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java
@@ -206,6 +206,9 @@ public class EntityPredicates {
};
}
+ public static <T> Predicate<Entity> attributeNotEqualTo(final AttributeSensor<T> attribute, final T val) {
+ return attributeSatisfies(attribute, Predicates.not(Predicates.equalTo(val)));
+ }
// ---------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7f09a80e/software/base/src/test/java/brooklyn/entity/brooklynnode/effector/CallbackEntityHttpClient.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/effector/CallbackEntityHttpClient.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/effector/CallbackEntityHttpClient.java
index 8c8004b..78eef1e 100644
--- a/software/base/src/test/java/brooklyn/entity/brooklynnode/effector/CallbackEntityHttpClient.java
+++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/effector/CallbackEntityHttpClient.java
@@ -87,4 +87,9 @@ public class CallbackEntityHttpClient implements EntityHttpClient {
String result = callback.apply(new Request(entity, HttpPost.METHOD_NAME, path, formParams));
return new HttpToolResponse(HttpStatus.SC_OK, Collections.<String, List<String>>emptyMap(), result.getBytes(), 0, 0, 0);
}
+
+ @Override
+ public HttpToolResponse delete(String path, Map<String, String> headers) {
+ throw new IllegalStateException("Method call not expected");
+ }
}