From b0c78e692cc7f2bd867e95ec82e314586fab586d Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sat, 18 Jan 2020 20:50:55 +0100 Subject: [PATCH] [Minor] Added ExpressionsSupport.param(String) --- .../src/main/java/li/strolch/search/ExpressionsSupport.java | 5 +++++ .../src/main/java/li/strolch/search/SearchExpressions.java | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/li.strolch.agent/src/main/java/li/strolch/search/ExpressionsSupport.java b/li.strolch.agent/src/main/java/li/strolch/search/ExpressionsSupport.java index 7bf3b3d1c..461981505 100644 --- a/li.strolch.agent/src/main/java/li/strolch/search/ExpressionsSupport.java +++ b/li.strolch.agent/src/main/java/li/strolch/search/ExpressionsSupport.java @@ -1,5 +1,6 @@ package li.strolch.search; +import static li.strolch.model.StrolchModelConstants.BAG_PARAMETERS; import static li.strolch.model.StrolchModelConstants.BAG_RELATIONS; import static li.strolch.runtime.StrolchConstants.*; @@ -99,6 +100,10 @@ public class ExpressionsSupport { return element -> predicate.coerce(eb.getValueCoercer(element)).matches(eb.extract(element)); } + public static ExpressionBuilder param(String paramId) { + return param(BAG_PARAMETERS, paramId); + } + public static ExpressionBuilder param(String bagId, String paramId) { return new ExpressionBuilder() { diff --git a/li.strolch.agent/src/main/java/li/strolch/search/SearchExpressions.java b/li.strolch.agent/src/main/java/li/strolch/search/SearchExpressions.java index 6d587cc2e..326a14483 100644 --- a/li.strolch.agent/src/main/java/li/strolch/search/SearchExpressions.java +++ b/li.strolch.agent/src/main/java/li/strolch/search/SearchExpressions.java @@ -1,5 +1,7 @@ package li.strolch.search; +import static li.strolch.model.StrolchModelConstants.BAG_PARAMETERS; + import java.util.function.Supplier; import li.strolch.model.StrolchRootElement; @@ -50,6 +52,10 @@ public interface SearchExpressions { return ExpressionsSupport.state(predicate); } + default ExpressionBuilder param(String paramId) { + return ExpressionsSupport.param(BAG_PARAMETERS, paramId); + } + default ExpressionBuilder param(String bagId, String paramId) { return ExpressionsSupport.param(bagId, paramId); }