The Unified and Autonomous Development Platform
Able to return builds without params when query for "param is empty"
Robin Shen92ccce8b2498
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamIsEmptyCriteria.javaindex 5115c98e40..4e2bc03bcf 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamIsEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamIsEmptyCriteria.java@@ -25,11 +25,13 @@ public class ParamIsEmptyCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {- Join<?, ?> join = root.join(BuildQueryConstants.ATTR_PARAMS, JoinType.LEFT);- join.on(builder.and(- builder.equal(join.get(BuildParam.ATTR_NAME), name)),- builder.isNull(join.get(BuildParam.ATTR_VALUE)));- return join.isNotNull();+ Join<?, ?> join1 = root.join(BuildQueryConstants.ATTR_PARAMS, JoinType.LEFT);+ join1.on(builder.and(+ builder.equal(join1.get(BuildParam.ATTR_NAME), name)),+ builder.isNull(join1.get(BuildParam.ATTR_VALUE)));+ Join<?, ?> join2 = root.join(BuildQueryConstants.ATTR_PARAMS, JoinType.LEFT);+ join2.on(builder.equal(join2.get(BuildParam.ATTR_NAME), name));+ return builder.or(join1.isNotNull(), join2.isNull());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.javaindex e39276e51d..ab6d228b29 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java@@ -54,6 +54,9 @@ public abstract class FieldCriteria extends IssueCriteria {}}+ /**+ * @return predicate of field value. <tt>null</tt> to indicate that this field is empty+ */@Nullableprotected abstract Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder);diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.javaindex 279c59b721..54824c7afe 100755--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java@@ -4,12 +4,15 @@ import java.util.ArrayList;import java.util.HashMap;import java.util.List;import java.util.Map;+import java.util.stream.Collectors;import org.hibernate.validator.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import io.onedev.server.util.GroovyUtils;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;@@ -24,8 +27,8 @@ public class ScriptingChoices implements ChoiceProvider {private String scriptName;- @Editable(description="Groovy script to be evaluated. The return value should be a list of user "- + "object to be used as choices. Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")+ @Editable(description="Groovy script to be evaluated. The return value should be a list of user login names to "+ + "be used as choices. Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")@ScriptChoice@OmitName@NotEmpty@@ -43,7 +46,11 @@ public class ScriptingChoices implements ChoiceProvider {Map<String, Object> variables = new HashMap<>();variables.put("allPossible", allPossible);try {- return (List<User>) GroovyUtils.evalScriptByName(scriptName, variables);+ return ((List<String>) GroovyUtils.evalScriptByName(scriptName, variables))+ .stream()+ .map(it->OneDev.getInstance(UserManager.class).findByName(it))+ .filter(it->it!=null)+ .collect(Collectors.toList());} catch (RuntimeException e) {if (allPossible) {logger.error("Error getting all possible choices", e);