From 428ae62ff9497e6f8a875f493f9a02b8c731d0b0 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Thu, 8 Oct 2020 10:18:10 +0200
Subject: [PATCH] [New] Add non-bagId overrides in SearchExpressions

---
 .../li/strolch/search/SearchExpressions.java    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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 c875bf537..71d03607a 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
@@ -65,11 +65,19 @@ public interface SearchExpressions {
 		return ExpressionsSupport.param(bagId, paramId);
 	}
 
+	default <T extends StrolchRootElement> SearchExpression<T> param(String paramId, SearchPredicate predicate) {
+		return ExpressionsSupport.param(BAG_PARAMETERS, paramId, predicate);
+	}
+
 	default <T extends StrolchRootElement> SearchExpression<T> param(String bagId, String paramId,
 			SearchPredicate predicate) {
 		return ExpressionsSupport.param(bagId, paramId, predicate);
 	}
 
+	default <T extends StrolchRootElement> SearchExpression<T> paramNull(String paramId) {
+		return ExpressionsSupport.paramNull(BAG_PARAMETERS, paramId);
+	}
+
 	default <T extends StrolchRootElement> SearchExpression<T> paramNull(String bagId, String paramId) {
 		return ExpressionsSupport.paramNull(bagId, paramId);
 	}
@@ -83,11 +91,20 @@ public interface SearchExpressions {
 		return ExpressionsSupport.relationName(tx, relationParamId, predicate);
 	}
 
+	default ExpressionBuilder relationParam(StrolchTransaction tx, String relationParamId, String paramId) {
+		return ExpressionsSupport.relationParam(tx, relationParamId, BAG_PARAMETERS, paramId);
+	}
+
 	default ExpressionBuilder relationParam(StrolchTransaction tx, String relationParamId, String bagId,
 			String paramId) {
 		return ExpressionsSupport.relationParam(tx, relationParamId, bagId, paramId);
 	}
 
+	default <T extends StrolchRootElement> SearchExpression<T> relationParam(StrolchTransaction tx,
+			String relationParamId, String paramId, SearchPredicate predicate) {
+		return ExpressionsSupport.relationParam(tx, relationParamId, BAG_PARAMETERS, paramId, predicate);
+	}
+
 	default <T extends StrolchRootElement> SearchExpression<T> relationParam(StrolchTransaction tx,
 			String relationParamId, String bagId, String paramId, SearchPredicate predicate) {
 		return ExpressionsSupport.relationParam(tx, relationParamId, bagId, paramId, predicate);