address further PR comments
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/fc1c5883 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/fc1c5883 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/fc1c5883 Branch: refs/heads/master Commit: fc1c588381029a3623c155d88a76185d7e01f696 Parents: fdb2784 Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Authored: Sat Sep 22 01:45:00 2018 +0100 Committer: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Committed: Sat Sep 22 01:45:00 2018 +0100 ---------------------------------------------------------------------- .../apache/brooklyn/core/config/ConfigConstraints.java | 10 +++++----- .../brooklyn/core/objs/ConstraintSerialization.java | 4 +++- .../org/apache/brooklyn/util/core/ResourcePredicates.java | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fc1c5883/core/src/main/java/org/apache/brooklyn/core/config/ConfigConstraints.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/config/ConfigConstraints.java b/core/src/main/java/org/apache/brooklyn/core/config/ConfigConstraints.java index c234aae..67d8aef 100644 --- a/core/src/main/java/org/apache/brooklyn/core/config/ConfigConstraints.java +++ b/core/src/main/java/org/apache/brooklyn/core/config/ConfigConstraints.java @@ -256,7 +256,7 @@ public abstract class ConfigConstraints<T extends BrooklynObject> { } private static abstract class OtherKeyPredicate implements BrooklynObjectPredicate<Object> { - private String otherKeyName; + private final String otherKeyName; public OtherKeyPredicate(String otherKeyName) { this.otherKeyName = otherKeyName; @@ -286,7 +286,7 @@ public abstract class ConfigConstraints<T extends BrooklynObject> { } public static Predicate<Object> forbiddenIf(String otherKeyName) { return new ForbiddenIfPredicate(otherKeyName); } - public static class ForbiddenIfPredicate extends OtherKeyPredicate { + protected static class ForbiddenIfPredicate extends OtherKeyPredicate { public ForbiddenIfPredicate(String otherKeyName) { super(otherKeyName); } @Override public String predicateName() { return "forbiddenIf"; } @Override public boolean test(Object thisValue, Object otherValue) { @@ -295,7 +295,7 @@ public abstract class ConfigConstraints<T extends BrooklynObject> { } public static Predicate<Object> forbiddenUnless(String otherKeyName) { return new ForbiddenUnlessPredicate(otherKeyName); } - public static class ForbiddenUnlessPredicate extends OtherKeyPredicate { + protected static class ForbiddenUnlessPredicate extends OtherKeyPredicate { public ForbiddenUnlessPredicate(String otherKeyName) { super(otherKeyName); } @Override public String predicateName() { return "forbiddenUnless"; } @Override public boolean test(Object thisValue, Object otherValue) { @@ -304,7 +304,7 @@ public abstract class ConfigConstraints<T extends BrooklynObject> { } public static Predicate<Object> requiredIf(String otherKeyName) { return new RequiredIfPredicate(otherKeyName); } - public static class RequiredIfPredicate extends OtherKeyPredicate { + protected static class RequiredIfPredicate extends OtherKeyPredicate { public RequiredIfPredicate(String otherKeyName) { super(otherKeyName); } @Override public String predicateName() { return "requiredIf"; } @Override public boolean test(Object thisValue, Object otherValue) { @@ -313,7 +313,7 @@ public abstract class ConfigConstraints<T extends BrooklynObject> { } public static Predicate<Object> requiredUnless(String otherKeyName) { return new RequiredUnlessPredicate(otherKeyName); } - public static class RequiredUnlessPredicate extends OtherKeyPredicate { + protected static class RequiredUnlessPredicate extends OtherKeyPredicate { public RequiredUnlessPredicate(String otherKeyName) { super(otherKeyName); } @Override public String predicateName() { return "requiredUnless"; } @Override public boolean test(Object thisValue, Object otherValue) { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fc1c5883/core/src/main/java/org/apache/brooklyn/core/objs/ConstraintSerialization.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/ConstraintSerialization.java b/core/src/main/java/org/apache/brooklyn/core/objs/ConstraintSerialization.java index 2fef0e8..984e2e7 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/ConstraintSerialization.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/ConstraintSerialization.java @@ -40,12 +40,14 @@ import org.apache.brooklyn.util.text.StringEscapes.JavaStringEscapes; import org.apache.brooklyn.util.text.StringPredicates; import org.apache.brooklyn.util.text.Strings; +import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; +@Beta public class ConstraintSerialization { private final Map<String, String> predicateToStringToPreferredName = MutableMap.of(); @@ -184,7 +186,7 @@ public class ConstraintSerialization { PredicateSerializationRuleAdder.stringConstructor(ConfigConstraints::requiredUnless).add(this); } - public static ConstraintSerialization INSTANCE = new ConstraintSerialization(); + public final static ConstraintSerialization INSTANCE = new ConstraintSerialization(); private ConstraintSerialization() {} http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fc1c5883/core/src/main/java/org/apache/brooklyn/util/core/ResourcePredicates.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/ResourcePredicates.java b/core/src/main/java/org/apache/brooklyn/util/core/ResourcePredicates.java index effed58..240ab52 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/ResourcePredicates.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/ResourcePredicates.java @@ -66,7 +66,7 @@ public class ResourcePredicates { @Override public String toString() { - return "ResourcePredicates.exists()"; + return "ResourcePredicates.urlExists()"; } }
