split out notNull as different to required=nonBlank, fix tests
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3d214b89 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3d214b89 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3d214b89 Branch: refs/heads/master Commit: 3d214b89fc5308451e5078ee4651f878eab6d081 Parents: fc1c588 Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Authored: Sat Sep 22 02:19:42 2018 +0100 Committer: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Committed: Sat Sep 22 02:48:58 2018 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/core/objs/ConstraintSerialization.java | 3 ++- .../brooklyn/core/objs/BasicSpecParameterFromListTest.java | 5 +++-- .../apache/brooklyn/core/objs/ConstraintSerializationTest.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3d214b89/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 984e2e7..32b71f0 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 @@ -167,12 +167,13 @@ public class ConstraintSerialization { @SuppressWarnings({ "unchecked", "rawtypes" }) private void init() { PredicateSerializationRuleAdder.predicateListConstructor((o) -> ConfigConstraints.required()). - equivalentPredicates(Predicates.notNull(), StringPredicates.isNonBlank()).add(this); + equivalentPredicates(StringPredicates.isNonBlank()).add(this); PredicateSerializationRuleAdder.predicateListConstructor((o) -> Predicates.or((Iterable)o)).preferredName("any").equivalentNames("or").add(this); PredicateSerializationRuleAdder.predicateListConstructor((o) -> /* and predicate is default when given list */ toPredicateFromJson(o)).preferredName("all").sample(Predicates.and(Collections.emptyList())).equivalentNames("and").add(this); PredicateSerializationRuleAdder.noArgConstructor(Predicates::alwaysFalse).add(this); PredicateSerializationRuleAdder.noArgConstructor(Predicates::alwaysTrue).add(this); + PredicateSerializationRuleAdder.noArgConstructor(Predicates::notNull).add(this); PredicateSerializationRuleAdder.noArgConstructor(ResourcePredicates::urlExists).preferredName("urlExists").add(this); PredicateSerializationRuleAdder.noArgConstructor(StringPredicates::isBlank).add(this); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3d214b89/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromListTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromListTest.java b/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromListTest.java index 887e054..3ce8d9c 100644 --- a/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromListTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromListTest.java @@ -28,6 +28,7 @@ import java.util.List; import org.apache.brooklyn.api.mgmt.classloading.BrooklynClassLoadingContext; import org.apache.brooklyn.api.objs.SpecParameter; import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.core.config.ConfigConstraints; import org.apache.brooklyn.core.mgmt.classloading.JavaBrooklynClassLoadingContext; import org.apache.brooklyn.core.test.BrooklynMgmtUnitTestSupport; import org.apache.brooklyn.util.text.StringPredicates; @@ -99,7 +100,7 @@ public class BasicSpecParameterFromListTest extends BrooklynMgmtUnitTestSupport assertEquals(type.getDefaultValue(), defaultValue); assertEquals(type.getDescription(), description); assertTrue(type.getInheritanceByContext().values().isEmpty(), "Unexpected inheritance: "+type.getInheritanceByContext()); - assertConstraint(type.getConstraint(), StringPredicates.isNonBlank()); + assertConstraint(type.getConstraint(), ConfigConstraints.required()); } @Test @@ -132,7 +133,7 @@ public class BasicSpecParameterFromListTest extends BrooklynMgmtUnitTestSupport "name", name, "constraints", ImmutableList.of(constraint))); ConfigKey<?> type = input.getConfigKey(); - assertConstraint(type.getConstraint(), StringPredicates.isNonBlank()); + assertConstraint(type.getConstraint(), ConfigConstraints.required()); } @Test(expectedExceptions = IllegalArgumentException.class) http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3d214b89/core/src/test/java/org/apache/brooklyn/core/objs/ConstraintSerializationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/objs/ConstraintSerializationTest.java b/core/src/test/java/org/apache/brooklyn/core/objs/ConstraintSerializationTest.java index a8fdb02..bdbc5ad 100644 --- a/core/src/test/java/org/apache/brooklyn/core/objs/ConstraintSerializationTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/objs/ConstraintSerializationTest.java @@ -86,7 +86,7 @@ public class ConstraintSerializationTest extends BrooklynMgmtUnitTestSupport { @Test public void testAltPred() { - Predicate<?> p = Predicates.notNull(); + Predicate<?> p = StringPredicates.isNonBlank(); Assert.assertEquals(ConstraintSerialization.INSTANCE.toJsonList(p), MutableList.of("required")); assertSamePredicate(ConstraintSerialization.INSTANCE.toPredicateFromJson("required"),
