Skip to content

The Unified and Autonomous Development Platform

Refactor various entity query

Robin Shen5b9db8c389cc
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.java
index 72528825c1..3a0d25965d 100644
--- a/core/src/main/java/io/onedev/server/CoreModule.java
+++ b/core/src/main/java/io/onedev/server/CoreModule.java
@@ -101,7 +101,7 @@ import io.onedev.server.entitymanager.GroupAuthorizationManager;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.entitymanager.IssueCommentManager;
-import io.onedev.server.entitymanager.IssueFieldEntityManager;
+import io.onedev.server.entitymanager.IssueFieldManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.IssueQuerySettingManager;
import io.onedev.server.entitymanager.IssueVoteManager;
@@ -134,7 +134,7 @@ import io.onedev.server.entitymanager.impl.DefaultGroupAuthorizationManager;
import io.onedev.server.entitymanager.impl.DefaultGroupManager;
import io.onedev.server.entitymanager.impl.DefaultIssueChangeManager;
import io.onedev.server.entitymanager.impl.DefaultIssueCommentManager;
-import io.onedev.server.entitymanager.impl.DefaultIssueFieldEntityManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueFieldManager;
import io.onedev.server.entitymanager.impl.DefaultIssueManager;
import io.onedev.server.entitymanager.impl.DefaultIssueQuerySettingManager;
import io.onedev.server.entitymanager.impl.DefaultIssueVoteManager;
@@ -320,7 +320,7 @@ public class CoreModule extends AbstractPluginModule {
bind(BuildRequirementManager.class).to(DefaultBuildRequirementManager.class);
bind(MailManager.class).to(DefaultMailManager.class);
bind(IssueManager.class).to(DefaultIssueManager.class);
- bind(IssueFieldEntityManager.class).to(DefaultIssueFieldEntityManager.class);
+ bind(IssueFieldManager.class).to(DefaultIssueFieldManager.class);
bind(BuildParamManager.class).to(DefaultBuildParamManager.class);
bind(PullRequestWatchManager.class).to(DefaultPullRequestWatchManager.class);
bind(CommitInfoManager.class).to(DefaultCommitInfoManager.class);
diff --git a/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java b/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java
index 53bf31acc0..25d7521518 100644
--- a/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java
+++ b/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java
@@ -46,6 +46,7 @@ import io.onedev.server.util.facade.MembershipFacade;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.facade.UserAuthorizationFacade;
import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.inputspec.InputSpec;
@Singleton
public class DefaultCacheManager implements CacheManager {
@@ -148,9 +149,11 @@ public class DefaultCacheManager implements CacheManager {
for (UserAuthorization userAuthorization: dao.query(UserAuthorization.class))
userAuthorizations.put(userAuthorization.getId(), userAuthorization.getFacade());
- query = dao.getSessionManager().getSession().createQuery("select distinct name, value from BuildParam");
- for (Object[] fields: (List<Object[]>)query.list())
- addBuildParam((String) fields[0], (String) fields[1]);
+ query = dao.getSessionManager().getSession().createQuery("select distinct name, type, value from BuildParam");
+ for (Object[] fields: (List<Object[]>)query.list()) {
+ if (!fields[1].equals(InputSpec.SECRET))
+ addBuildParam((String) fields[0], (String) fields[2]);
+ }
}
@Transactional
@@ -257,7 +260,8 @@ public class DefaultCacheManager implements CacheManager {
buildParamsLock.writeLock().lock();
try {
BuildParam param = (BuildParam) event.getEntity();
- addBuildParam(param.getName(), param.getValue());
+ if (!param.getType().equals(InputSpec.SECRET))
+ addBuildParam(param.getName(), param.getValue());
} finally {
buildParamsLock.writeLock().unlock();
}
diff --git a/core/src/main/java/io/onedev/server/ci/CISpec.java b/core/src/main/java/io/onedev/server/ci/CISpec.java
index 3e53c943eb..9af8061301 100644
--- a/core/src/main/java/io/onedev/server/ci/CISpec.java
+++ b/core/src/main/java/io/onedev/server/ci/CISpec.java
@@ -102,7 +102,7 @@ public class CISpec implements Serializable, Validatable {
for (JobTrigger trigger: job.getTriggers()) {
try {
JobParam.validateParams(job.getParamSpecs(), trigger.getParams());
- } catch (ValidationException e) {
+ } catch (Exception e) {
String message = "Error validating job parameters: " + e.getMessage();
context.buildConstraintViolationWithTemplate(message)
.addPropertyNode("jobs").addPropertyNode("triggers")
diff --git a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
index 514b4ff3fa..8e701e12c6 100644
--- a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
+++ b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
@@ -9,6 +9,7 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.CancellationException;
@@ -21,13 +22,14 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import javax.validation.ValidationException;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.SerializationUtils;
import org.eclipse.jgit.lib.ObjectId;
import org.quartz.CronScheduleBuilder;
import org.quartz.ScheduleBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import io.onedev.commons.launcher.loader.Listen;
@@ -70,7 +72,9 @@ import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.util.Input;
import io.onedev.server.util.MatrixRunner;
+import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.patternset.PatternSet;
@Singleton
@@ -133,7 +137,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT
@Sessional
@Override
- public void submit(Project project, String commitHash, String jobName, Map<String, List<String>> paramMatrix) {
+ public void submit(Project project, String commitHash, String jobName, Map<String, List<List<String>>> paramMatrix) {
String lockKey = "job-schedule: " + project.getId() + "-" + commitHash;
Long projectId = project.getId();
Long submitterId = User.idOf(userManager.getCurrent());
@@ -151,10 +155,10 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT
public void run() {
Project project = projectManager.load(projectId);
User submitter = (submitterId != null? userManager.load(submitterId): null);
- new MatrixRunner(paramMatrix) {
+ new MatrixRunner<List<String>>(paramMatrix) {
@Override
- public void run(Map<String, String> params) {
+ public void run(Map<String, List<String>> params) {
submit(project, submitter, commitHash, jobName, params, new ArrayList<>());
}
@@ -171,15 +175,15 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT
});
}
- private Map<String, List<String>> getParamMatrix(List<JobParam> params) {
- Map<String, List<String>> paramMatrix = new LinkedHashMap<>();
+ private Map<String, List<List<String>>> getParamMatrix(List<JobParam> params) {
+ Map<String, List<List<String>>> paramMatrix = new LinkedHashMap<>();
for (JobParam param: params)
paramMatrix.put(param.getName(), param.getValuesProvider().getValues());
return paramMatrix;
}
private List<Build> submit(Project project, @Nullable User user, String commitHash, String jobName,
- Map<String, String> paramMap, List<String> dependencyChain) {
+ Map<String, List<String>> paramMap, List<String> dependencyChain) {
List<Build> builds = buildManager.query(project, commitHash, jobName, paramMap);
if (builds.isEmpty()) {
Build build = new Build();
@@ -192,22 +196,6 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT
builds.add(build);
- for (Map.Entry<String, String> entry: paramMap.entrySet()) {
- BuildParam param = new BuildParam();
- param.setBuild(build);
- param.setName(entry.getKey());
- param.setValue(entry.getValue());
- build.getParams().add(param);
- }
-
- if (dependencyChain.contains(jobName)) {
- dependencyChain.add(jobName);
- markBuildError(build, "Circular job dependencies found: " + dependencyChain);
- return builds;
- }
-
- dependencyChain.add(jobName);
-
CISpec ciSpec;
try {
ciSpec = project.getCISpec(ObjectId.fromString(commitHash));
@@ -233,11 +221,36 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT
return builds;
}
+ if (dependencyChain.contains(jobName)) {
+ dependencyChain.add(jobName);
+ markBuildError(build, "Circular job dependencies found: " + dependencyChain);
+ return builds;
+ }
+ dependencyChain.add(jobName);
+
+ for (Map.Entry<String, List<String>> entry: paramMap.entrySet()) {
+ BuildParam param = new BuildParam();
+ param.setBuild(build);
+ param.setName(entry.getKey());
+ InputSpec paramSpec = Preconditions.checkNotNull(job.getParamSpecMap().get(param.getName()));
+ param.setType(paramSpec.getType());
+ if (!entry.getValue().isEmpty()) {
+ for (String string: entry.getValue()) {
+ BuildParam cloned = (BuildParam) SerializationUtils.clone(param);
+ cloned.setBuild(build);
+ cloned.setValue(string);
+ build.getParams().add(cloned);
+ }
+ } else {
+ build.getParams().add(param);
+ }
+ }
+
for (JobDependency dependency: job.getDependencies()) {
- new MatrixRunner(getParamMatrix(dependency.getJobParams())) {
+ new MatrixRunner<List<String>>(getParamMatrix(dependency.getJobParams())) {
@Override
- public void run(Map<String, String> params) {
+ public void run(Map<String, List<String>> params) {
List<Build> dependencyBuilds = submit(project, null, commitHash, dependency.getJobName(),
params, new ArrayList<>(dependencyChain));
for (Build dependencyBuild: dependencyBuilds) {
@@ -315,9 +328,14 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT
envVars.put("ONEDEV_COMMIT", commitId.name());
envVars.put("ONEDEV_JOB", job.getName());
envVars.put("ONEDEV_BUILD_NUMBER", String.valueOf(build.getNumber()));
- for (BuildParam param: build.getParams()) {
- if (StringUtils.isNotBlank(param.getValue()))
- envVars.put(param.getName(), param.getValue());
+ for (Entry<String, Input> entry: build.getParamInputs().entrySet()) {
+ List<String> values = entry.getValue().getValues();
+ if (values.size() > 1) {
+ for (int i=0; i<values.size(); i++)
+ envVars.put(entry.getKey() + "_" + (i+1), values.get(i));
+ } else if (values.size() == 1) {
+ envVars.put(entry.getKey(), values.iterator().next());
+ }
}
for (JobOutcome outcome: job.getOutcomes()) {
diff --git a/core/src/main/java/io/onedev/server/ci/job/Job.java b/core/src/main/java/io/onedev/server/ci/job/Job.java
index e238241d24..e713b74b40 100644
--- a/core/src/main/java/io/onedev/server/ci/job/Job.java
+++ b/core/src/main/java/io/onedev/server/ci/job/Job.java
@@ -2,8 +2,10 @@ package io.onedev.server.ci.job;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.validation.ConstraintValidatorContext;
@@ -53,6 +55,8 @@ public class Job implements Serializable, Validatable {
private LogLevel logLevel = LogLevel.INFO;
+ private transient Map<String, InputSpec> paramSpecMap;
+
@Editable(order=100, description="Specify name of the job")
@NotEmpty
public String getName() {
@@ -223,5 +227,14 @@ public class Job implements Serializable, Validatable {
return isValid;
}
+
+ public Map<String, InputSpec> getParamSpecMap() {
+ if (paramSpecMap == null) {
+ paramSpecMap = new HashMap<>();
+ for (InputSpec paramSpec: getParamSpecs())
+ paramSpecMap.put(paramSpec.getName(), paramSpec);
+ }
+ return paramSpecMap;
+ }
}
diff --git a/core/src/main/java/io/onedev/server/ci/job/JobScheduler.java b/core/src/main/java/io/onedev/server/ci/job/JobScheduler.java
index 0620cf7924..867c3e5a77 100644
--- a/core/src/main/java/io/onedev/server/ci/job/JobScheduler.java
+++ b/core/src/main/java/io/onedev/server/ci/job/JobScheduler.java
@@ -8,7 +8,7 @@ import io.onedev.server.model.Project;
public interface JobScheduler {
- void submit(Project project, String commitHash, String jobName, Map<String, List<String>> paramMatrix);
+ void submit(Project project, String commitHash, String jobName, Map<String, List<List<String>>> paramMatrix);
void resubmit(Build build);
diff --git a/core/src/main/java/io/onedev/server/ci/job/param/JobParam.java b/core/src/main/java/io/onedev/server/ci/job/param/JobParam.java
index 0f1c788f2b..a5e2c8404c 100644
--- a/core/src/main/java/io/onedev/server/ci/job/param/JobParam.java
+++ b/core/src/main/java/io/onedev/server/ci/job/param/JobParam.java
@@ -15,16 +15,15 @@ import javax.validation.constraints.NotNull;
import org.hibernate.validator.constraints.NotEmpty;
import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.inputspec.secretinput.SecretInput;
public class JobParam implements Serializable {
private static final long serialVersionUID = 1L;
- public static final String STRING_SEPARATOR = "@@";
+ public static final String VALUE_SEPARATOR = "@@";
private String name;
@@ -49,37 +48,26 @@ public class JobParam implements Serializable {
}
@Nullable
- public static String toValue(List<String> strings) {
+ public static String toString(List<String> strings) {
if (!strings.isEmpty())
- return Joiner.on(STRING_SEPARATOR).join(strings);
+ return Joiner.on(VALUE_SEPARATOR).join(strings);
else
return null;
}
- public static List<String> fromValue(@Nullable String value) {
- if (value != null)
- return Splitter.on(STRING_SEPARATOR).splitToList(value);
- else
- return new ArrayList<>();
- }
-
- public static void validateValues(List<String> values) {
+ public static void validateValues(List<List<String>> values) {
if (values.isEmpty())
throw new ValidationException("At least one value needs to be specified");
- Set<String> valueSet = new HashSet<>();
- for (String value: values) {
- if (valueSet.contains(value)) {
- if (value != null)
- throw new ValidationException("Duplicate values are not allowed: " + value);
- else
- throw new ValidationException("Empty value added multiple times");
- } else {
- valueSet.add(value);
- }
+ Set<List<String>> encountered = new HashSet<>();
+ for (List<String> value: values) {
+ if (encountered.contains(value))
+ throw new ValidationException("Duplicate values not allowed");
+ else
+ encountered.add(value);
}
}
- public static void validateParams(List<InputSpec> paramSpecs, Map<String, List<String>> params) {
+ public static void validateParams(List<InputSpec> paramSpecs, Map<String, List<List<String>>> params) {
Map<String, InputSpec> paramSpecMap = new HashMap<>();
for (InputSpec paramSpec: paramSpecs) {
paramSpecMap.put(paramSpec.getName(), paramSpec);
@@ -87,7 +75,7 @@ public class JobParam implements Serializable {
throw new ValidationException("Missing job parameter: " + paramSpec.getName());
}
- for (Map.Entry<String, List<String>> entry: params.entrySet()) {
+ for (Map.Entry<String, List<List<String>>> entry: params.entrySet()) {
InputSpec paramSpec = paramSpecMap.get(entry.getKey());
if (paramSpec == null)
throw new ValidationException("Unknown job parameter: " + entry.getKey());
@@ -100,12 +88,16 @@ public class JobParam implements Serializable {
+ entry.getKey() + "': " + e.getMessage());
}
- for (String value: entry.getValue()) {
- List<String> strings = fromValue(value);
+ for (List<String> value: entry.getValue()) {
try {
- paramSpec.convertToObject(strings);
+ paramSpec.convertToObject(value);
} catch (Exception e) {
- throw new ValidationException("Error validating value '" + value + "' of parameter '"
+ String displayValue;
+ if (paramSpec instanceof SecretInput)
+ displayValue = SecretInput.MASK;
+ else
+ displayValue = value.toString();
+ throw new ValidationException("Error validating value '" + displayValue + "' of parameter '"
+ entry.getKey() + "': " + e.getMessage());
}
}
@@ -114,9 +106,9 @@ public class JobParam implements Serializable {
}
public static void validateParams(List<InputSpec> paramSpecs, List<JobParam> params) {
- Map<String, List<String>> paramMap = new HashMap<>();
+ Map<String, List<List<String>>> paramMap = new HashMap<>();
for (JobParam param: params) {
- List<String> values;
+ List<List<String>> values;
if (param.getValuesProvider() instanceof SpecifiedValues)
values = param.getValuesProvider().getValues();
else
@@ -127,10 +119,13 @@ public class JobParam implements Serializable {
validateParams(paramSpecs, paramMap);
}
- public static Map<String, List<String>> getParamMatrix(Map<String, String> paramMap) {
- Map<String, List<String>> paramMatrix = new HashMap<>();
- for (Map.Entry<String, String> entry: paramMap.entrySet())
- paramMatrix.put(entry.getKey(), Lists.newArrayList(entry.getValue()));
+ public static Map<String, List<List<String>>> getParamMatrix(Map<String, List<String>> paramMap) {
+ Map<String, List<List<String>>> paramMatrix = new HashMap<>();
+ for (Map.Entry<String, List<String>> entry: paramMap.entrySet()) {
+ List<List<String>> values = new ArrayList<>();
+ values.add(entry.getValue());
+ paramMatrix.put(entry.getKey(), values);
+ }
return paramMatrix;
}
diff --git a/core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java b/core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java
index 2f12054862..f45bbc55ed 100644
--- a/core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java
+++ b/core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java
@@ -1,11 +1,14 @@
package io.onedev.server.ci.job.param;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.hibernate.validator.constraints.NotEmpty;
+import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Script;
@@ -32,9 +35,20 @@ public class ScriptingValues implements ValuesProvider {
@SuppressWarnings("unchecked")
@Override
- public List<String> getValues() {
+ public List<List<String>> getValues() {
Map<String, Object> variables = new HashMap<>();
- return (List<String>) GroovyUtils.evalScript(getScript(), variables);
+ List<List<String>> values = new ArrayList<>();
+ for (Object each: (List<Object>) GroovyUtils.evalScript(getScript(), variables)) {
+ List<String> strings = new ArrayList<>();
+ if (each instanceof Collection) {
+ strings.addAll((Collection<? extends String>) each);
+ Collections.sort(strings);
+ } else {
+ strings.add((String) each);
+ }
+ values.add(strings);
+ }
+ return values;
}
}
diff --git a/core/src/main/java/io/onedev/server/ci/job/param/SpecifiedValues.java b/core/src/main/java/io/onedev/server/ci/job/param/SpecifiedValues.java
index 34408690b3..072be1da5b 100644
--- a/core/src/main/java/io/onedev/server/ci/job/param/SpecifiedValues.java
+++ b/core/src/main/java/io/onedev/server/ci/job/param/SpecifiedValues.java
@@ -8,14 +8,14 @@ public class SpecifiedValues implements ValuesProvider {
public static final String DISPLAY_NAME = "Use specified values";
- private List<String> values;
+ private List<List<String>> values;
@Override
- public List<String> getValues() {
+ public List<List<String>> getValues() {
return values;
}
- public void setValues(List<String> values) {
+ public void setValues(List<List<String>> values) {
this.values = values;
}
diff --git a/core/src/main/java/io/onedev/server/ci/job/param/ValuesProvider.java b/core/src/main/java/io/onedev/server/ci/job/param/ValuesProvider.java
index 52ea7cb7ce..2eba7c5673 100644
--- a/core/src/main/java/io/onedev/server/ci/job/param/ValuesProvider.java
+++ b/core/src/main/java/io/onedev/server/ci/job/param/ValuesProvider.java
@@ -5,6 +5,6 @@ import java.util.List;
public interface ValuesProvider extends Serializable {
- List<String> getValues();
+ List<List<String>> getValues();
}
diff --git a/core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java b/core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java
index 1624f19c4f..1b09ecae60 100644
--- a/core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java
+++ b/core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java
@@ -1,5 +1,7 @@
package io.onedev.server.ci.job.trigger;
+import java.util.List;
+
import io.onedev.server.ci.JobDependency;
import io.onedev.server.ci.job.Job;
import io.onedev.server.ci.job.param.JobParam;
@@ -23,7 +25,7 @@ public class DependencyBuiltTrigger extends JobTrigger {
for (JobDependency dependency: job.getDependencies()) {
if (dependency.getJobName().equals(build.getJobName())) {
for (JobParam param: dependency.getJobParams()) {
- String paramValue = build.getParamMap().get(param.getName());
+ List<String> paramValue = build.getParamMap().get(param.getName());
if (!param.getValuesProvider().getValues().contains(paramValue))
return false;
}
diff --git a/core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
index 4748463ecf..d34abc84b7 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
@@ -17,7 +17,7 @@ public interface BuildManager extends EntityManager<Build> {
@Nullable
Build find(Project project, long number);
- List<Build> query(Project project, String commitHash, @Nullable String jobName, Map<String, String> params);
+ List<Build> query(Project project, String commitHash, @Nullable String jobName, Map<String, List<String>> params);
List<Build> query(Project project, String commitHash);
diff --git a/core/src/main/java/io/onedev/server/entitymanager/IssueFieldEntityManager.java b/core/src/main/java/io/onedev/server/entitymanager/IssueFieldManager.java
similarity index 72%
rename from core/src/main/java/io/onedev/server/entitymanager/IssueFieldEntityManager.java
rename to core/src/main/java/io/onedev/server/entitymanager/IssueFieldManager.java
index 88f3f5db46..a74342c2cf 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/IssueFieldEntityManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/IssueFieldManager.java
@@ -3,10 +3,10 @@ package io.onedev.server.entitymanager;
import java.util.List;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueFieldEntity;
+import io.onedev.server.model.IssueField;
import io.onedev.server.persistence.dao.EntityManager;
-public interface IssueFieldEntityManager extends EntityManager<IssueFieldEntity> {
+public interface IssueFieldManager extends EntityManager<IssueField> {
void saveFields(Issue issue);
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index 4e663788f6..16cb26a18d 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -43,9 +43,7 @@ import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.search.entity.build.BuildQuery;
-import io.onedev.server.search.entity.build.BuildQueryBuildContext;
import io.onedev.server.storage.StorageManager;
import io.onedev.server.util.BuildConstants;
@@ -96,7 +94,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
@Sessional
@Override
- public List<Build> query(Project project, String commitHash, String jobName, Map<String, String> params) {
+ public List<Build> query(Project project, String commitHash, String jobName, Map<String, List<String>> params) {
CriteriaBuilder builder = getSession().getCriteriaBuilder();
CriteriaQuery<Build> query = builder.createQuery(Build.class);
Root<Build> root = query.from(Build.class);
@@ -107,13 +105,18 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
if (jobName != null)
restrictions.add(builder.equal(root.get("jobName"), jobName));
- for (Map.Entry<String, String> entry: params.entrySet()) {
- Join<?, ?> join = root.join("params", JoinType.INNER);
- restrictions.add(builder.equal(join.get("name"), entry.getKey()));
- if (entry.getValue() != null)
- restrictions.add(builder.equal(join.get("value"), entry.getValue()));
- else
- restrictions.add(builder.isNull(join.get("value")));
+ for (Map.Entry<String, List<String>> entry: params.entrySet()) {
+ if (!entry.getValue().isEmpty()) {
+ for (String value: entry.getValue()) {
+ Join<?, ?> join = root.join(BuildConstants.ATTR_PARAMS, JoinType.INNER);
+ restrictions.add(builder.equal(join.get(BuildParam.ATTR_NAME), entry.getKey()));
+ restrictions.add(builder.equal(join.get(BuildParam.ATTR_VALUE), value));
+ }
+ } else {
+ Join<?, ?> join = root.join(BuildConstants.ATTR_PARAMS, JoinType.INNER);
+ restrictions.add(builder.equal(join.get(BuildParam.ATTR_NAME), entry.getKey()));
+ restrictions.add(builder.isNull(join.get(BuildParam.ATTR_VALUE)));
+ }
}
query.where(restrictions.toArray(new Predicate[0]));
return getSession().createQuery(query).list();
@@ -189,11 +192,11 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
}
private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Build> criteria, Project project,
- QueryBuildContext<Build> context, User user) {
+ Root<Build> root, CriteriaBuilder builder, User user) {
List<Predicate> predicates = new ArrayList<>();
- predicates.add(context.getBuilder().equal(context.getRoot().get(BuildConstants.ATTR_PROJECT), project));
+ predicates.add(builder.equal(root.get(BuildConstants.ATTR_PROJECT), project));
if (criteria != null)
- predicates.add(criteria.getPredicate(project, context, user));
+ predicates.add(criteria.getPredicate(project, root, builder, user));
return predicates.toArray(new Predicate[0]);
}
@@ -203,8 +206,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
Root<Build> root = query.from(Build.class);
query.select(root).distinct(true);
- QueryBuildContext<Build> context = new BuildQueryBuildContext(root, builder);
- query.where(getPredicates(buildQuery.getCriteria(), project, context, user));
+ query.where(getPredicates(buildQuery.getCriteria(), project, root, builder, user));
List<javax.persistence.criteria.Order> orders = new ArrayList<>();
for (EntitySort sort: buildQuery.getSorts()) {
@@ -239,8 +241,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);
Root<Build> root = criteriaQuery.from(Build.class);
- QueryBuildContext<Build> context = new BuildQueryBuildContext(root, builder);
- criteriaQuery.where(getPredicates(buildCriteria, project, context, user));
+ criteriaQuery.where(getPredicates(buildCriteria, project, root, builder, user));
criteriaQuery.select(builder.countDistinct(root));
return getSession().createQuery(criteriaQuery).uniqueResult().intValue();
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
index 4686b58cea..e6e3daef72 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
@@ -59,9 +59,7 @@ import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
-import io.onedev.server.search.entity.codecomment.CodeCommentQueryBuildContext;
import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.util.diff.WhitespaceOption;
@@ -238,17 +236,17 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
}
- private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<CodeComment> criteria, Project project,
- PullRequest request, QueryBuildContext<CodeComment> context, User user) {
+ private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<CodeComment> criteria,
+ Project project, PullRequest request, Root<CodeComment> root, CriteriaBuilder builder, User user) {
List<Predicate> predicates = new ArrayList<>();
if (request != null) {
- Join<?, ?> relations = context.getRoot().join(CodeCommentConstants.ATTR_RELATIONS, JoinType.INNER);
- relations.on(context.getBuilder().equal(relations.get(CodeCommentRelation.ATTR_REQUEST), request));
+ Join<?, ?> relations = root.join(CodeCommentConstants.ATTR_RELATIONS, JoinType.INNER);
+ relations.on(builder.equal(relations.get(CodeCommentRelation.ATTR_REQUEST), request));
} else {
- predicates.add(context.getBuilder().equal(context.getRoot().get("project"), project));
+ predicates.add(builder.equal(root.get("project"), project));
}
if (criteria != null)
- predicates.add(criteria.getPredicate(project, context, user));
+ predicates.add(criteria.getPredicate(project, root, builder, user));
return predicates.toArray(new Predicate[0]);
}
@@ -259,8 +257,7 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
Root<CodeComment> root = query.from(CodeComment.class);
query.select(root).distinct(true);
- QueryBuildContext<CodeComment> context = new CodeCommentQueryBuildContext(root, builder);
- query.where(getPredicates(commentQuery.getCriteria(), project, request, context, user));
+ query.where(getPredicates(commentQuery.getCriteria(), project, request, root, builder, user));
List<javax.persistence.criteria.Order> orders = new ArrayList<>();
for (EntitySort sort: commentQuery.getSorts()) {
@@ -296,8 +293,7 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);
Root<CodeComment> root = criteriaQuery.from(CodeComment.class);
- QueryBuildContext<CodeComment> context = new CodeCommentQueryBuildContext(root, builder);
- criteriaQuery.where(getPredicates(commentCriteria, project, request, context, user));
+ criteriaQuery.where(getPredicates(commentCriteria, project, request, root, builder, user));
criteriaQuery.select(builder.countDistinct(root));
return getSession().createQuery(criteriaQuery).uniqueResult().intValue();
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
index e811a23d4d..e8982a1667 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
@@ -7,7 +7,7 @@ import javax.inject.Singleton;
import io.onedev.server.cache.CacheManager;
import io.onedev.server.entitymanager.GroupManager;
-import io.onedev.server.entitymanager.IssueFieldEntityManager;
+import io.onedev.server.entitymanager.IssueFieldManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Group;
@@ -27,17 +27,17 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implements
private final SettingManager settingManager;
- private final IssueFieldEntityManager issueFieldEntityManager;
+ private final IssueFieldManager issueFieldManager;
private final CacheManager cacheManager;
@Inject
public DefaultGroupManager(Dao dao, ProjectManager projectManager, SettingManager settingManager,
- IssueFieldEntityManager issueFieldEntityManager, CacheManager cacheManager) {
+ IssueFieldManager issueFieldManager, CacheManager cacheManager) {
super(dao);
this.projectManager = projectManager;
this.settingManager = settingManager;
- this.issueFieldEntityManager = issueFieldEntityManager;
+ this.issueFieldManager = issueFieldManager;
this.cacheManager = cacheManager;
}
@@ -59,7 +59,7 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implements
settingManager.saveAuthenticator(authenticator);
}
- issueFieldEntityManager.onRenameGroup(oldName, group.getName());
+ issueFieldManager.onRenameGroup(oldName, group.getName());
settingManager.getIssueSetting().onRenameGroup(oldName, group.getName());
}
dao.persist(group);
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
index aeadddea63..fa5cae496e 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
@@ -20,7 +20,7 @@ import io.onedev.commons.launcher.loader.Listen;
import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.IssueChangeManager;
-import io.onedev.server.entitymanager.IssueFieldEntityManager;
+import io.onedev.server.entitymanager.IssueFieldManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.event.build.BuildEvent;
import io.onedev.server.event.issue.IssueChangeEvent;
@@ -52,7 +52,7 @@ import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.util.IssueField;
+import io.onedev.server.util.Input;
@Singleton
public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange>
@@ -60,7 +60,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
private final IssueManager issueManager;
- private final IssueFieldEntityManager issueFieldEntityManager;
+ private final IssueFieldManager issueFieldManager;
private final ListenerRegistry listenerRegistry;
@@ -72,11 +72,11 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
@Inject
public DefaultIssueChangeManager(Dao dao, IssueManager issueManager, SessionManager sessionManager,
- IssueFieldEntityManager issueFieldEntityManager, ListenerRegistry listenerRegistry,
+ IssueFieldManager issueFieldManager, ListenerRegistry listenerRegistry,
ExecutorService executorService, BuildManager buildManager) {
super(dao);
this.issueManager = issueManager;
- this.issueFieldEntityManager = issueFieldEntityManager;
+ this.issueFieldManager = issueFieldManager;
this.listenerRegistry = listenerRegistry;
this.sessionManager = sessionManager;
this.executorService = executorService;
@@ -141,16 +141,16 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
@Transactional
@Override
public void changeFields(Issue issue, Map<String, Object> fieldValues, @Nullable User user) {
- Map<String, IssueField> prevFields = issue.getFields();
+ Map<String, Input> prevFields = issue.getFieldInputs();
issue.setFieldValues(fieldValues);
- if (!prevFields.equals(issue.getFields())) {
- issueFieldEntityManager.saveFields(issue);
+ if (!prevFields.equals(issue.getFieldInputs())) {
+ issueFieldManager.saveFields(issue);
IssueChange change = new IssueChange();
change.setIssue(issue);
change.setDate(new Date());
change.setUser(user);
- change.setData(new IssueFieldChangeData(prevFields, issue.getFields()));
+ change.setData(new IssueFieldChangeData(prevFields, issue.getFieldInputs()));
save(change);
}
}
@@ -159,18 +159,18 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
@Override
public void changeState(Issue issue, String state, Map<String, Object> fieldValues, @Nullable String comment, @Nullable User user) {
String prevState = issue.getState();
- Map<String, IssueField> prevFields = issue.getFields();
+ Map<String, Input> prevFields = issue.getFieldInputs();
issue.setState(state);
issue.setFieldValues(fieldValues);
- issueFieldEntityManager.saveFields(issue);
+ issueFieldManager.saveFields(issue);
IssueChange change = new IssueChange();
change.setIssue(issue);
change.setDate(new Date());
change.setUser(user);
- change.setData(new IssueStateChangeData(prevState, issue.getState(), prevFields, issue.getFields(), comment));
+ change.setData(new IssueStateChangeData(prevState, issue.getState(), prevFields, issue.getFieldInputs(), comment));
save(change);
}
@@ -183,20 +183,20 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
Issue issue = issues.next();
String prevState = issue.getState();
Milestone prevMilestone = issue.getMilestone();
- Map<String, IssueField> prevFields = issue.getFields();
+ Map<String, Input> prevFields = issue.getFieldInputs();
if (state != null)
issue.setState(state);
if (milestone != null)
issue.setMilestone(milestone.orNull());
issue.setFieldValues(fieldValues);
- issueFieldEntityManager.saveFields(issue);
+ issueFieldManager.saveFields(issue);
IssueChange change = new IssueChange();
change.setIssue(issue);
change.setDate(new Date());
change.setUser(user);
- change.setData(new IssueBatchUpdateData(prevState, issue.getState(), prevMilestone, issue.getMilestone(), prevFields, issue.getFields(), comment));
+ change.setData(new IssueBatchUpdateData(prevState, issue.getState(), prevMilestone, issue.getMilestone(), prevFields, issue.getFieldInputs(), comment));
save(change);
}
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldEntityManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java
similarity index 66%
rename from core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldEntityManager.java
rename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java
index 23e01d41e0..064ca507cc 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldEntityManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java
@@ -13,9 +13,9 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.Root;
-import io.onedev.server.entitymanager.IssueFieldEntityManager;
+import io.onedev.server.entitymanager.IssueFieldManager;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueFieldEntity;
+import io.onedev.server.model.IssueField;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
@@ -23,10 +23,10 @@ import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.inputspec.InputSpec;
@Singleton
-public class DefaultIssueFieldEntityManager extends AbstractEntityManager<IssueFieldEntity> implements IssueFieldEntityManager {
+public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField> implements IssueFieldManager {
@Inject
- public DefaultIssueFieldEntityManager(Dao dao) {
+ public DefaultIssueFieldManager(Dao dao) {
super(dao);
}
@@ -34,22 +34,22 @@ public class DefaultIssueFieldEntityManager extends AbstractEntityManager<IssueF
@Override
public void saveFields(Issue issue) {
Collection<Long> ids = new HashSet<>();
- for (IssueFieldEntity entity: issue.getFieldEntities()) {
+ for (IssueField entity: issue.getFields()) {
if (entity.getId() != null)
ids.add(entity.getId());
}
if (!ids.isEmpty()) {
- Query query = getSession().createQuery("delete from IssueFieldEntity where issue = :issue and id not in (:ids)");
+ Query query = getSession().createQuery("delete from IssueField where issue = :issue and id not in (:ids)");
query.setParameter("issue", issue);
query.setParameter("ids", ids);
query.executeUpdate();
} else {
- Query query = getSession().createQuery("delete from IssueFieldEntity where issue = :issue");
+ Query query = getSession().createQuery("delete from IssueField where issue = :issue");
query.setParameter("issue", issue);
query.executeUpdate();
}
- for (IssueFieldEntity entity: issue.getFieldEntities()) {
+ for (IssueField entity: issue.getFields()) {
if (entity.isNew())
save(entity);
}
@@ -58,7 +58,7 @@ public class DefaultIssueFieldEntityManager extends AbstractEntityManager<IssueF
@Transactional
@Override
public void onRenameGroup(String oldName, String newName) {
- Query query = getSession().createQuery("update IssueFieldEntity set value=:newName where type=:groupChoice and value=:oldName");
+ Query query = getSession().createQuery("update IssueField set value=:newName where type=:groupChoice and value=:oldName");
query.setParameter("groupChoice", InputSpec.GROUP);
query.setParameter("oldName", oldName);
query.setParameter("newName", newName);
@@ -68,7 +68,7 @@ public class DefaultIssueFieldEntityManager extends AbstractEntityManager<IssueF
@Transactional
@Override
public void onRenameUser(String oldName, String newName) {
- Query query = getSession().createQuery("update IssueFieldEntity set value=:newName where type=:userChoice and value=:oldName");
+ Query query = getSession().createQuery("update IssueField set value=:newName where type=:userChoice and value=:oldName");
query.setParameter("userChoice", InputSpec.USER);
query.setParameter("oldName", oldName);
query.setParameter("newName", newName);
@@ -79,9 +79,9 @@ public class DefaultIssueFieldEntityManager extends AbstractEntityManager<IssueF
@Override
public void populateFields(List<Issue> issues) {
CriteriaBuilder builder = getSession().getCriteriaBuilder();
- CriteriaQuery<IssueFieldEntity> query = builder.createQuery(IssueFieldEntity.class);
+ CriteriaQuery<IssueField> query = builder.createQuery(IssueField.class);
- Root<IssueFieldEntity> root = query.from(IssueFieldEntity.class);
+ Root<IssueField> root = query.from(IssueField.class);
query.select(root);
root.join("issue");
@@ -89,10 +89,10 @@ public class DefaultIssueFieldEntityManager extends AbstractEntityManager<IssueF
query.where(issueExpr.in(issues));
for (Issue issue: issues)
- issue.setFieldEntities(new ArrayList<>());
+ issue.setFields(new ArrayList<>());
- for (IssueFieldEntity field: getSession().createQuery(query).getResultList())
- field.getIssue().getFieldEntities().add(field);
+ for (IssueField field: getSession().createQuery(query).getResultList())
+ field.getIssue().getFields().add(field);
}
}
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index 6b66b086e9..d0e0c50b53 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -29,7 +29,7 @@ import com.google.common.base.Preconditions;
import io.onedev.commons.launcher.loader.Listen;
import io.onedev.commons.launcher.loader.ListenerRegistry;
-import io.onedev.server.entitymanager.IssueFieldEntityManager;
+import io.onedev.server.entitymanager.IssueFieldManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.IssueQuerySettingManager;
import io.onedev.server.entitymanager.ProjectManager;
@@ -38,7 +38,7 @@ import io.onedev.server.event.issue.IssueCommitted;
import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.event.issue.IssueOpened;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueFieldEntity;
+import io.onedev.server.model.IssueField;
import io.onedev.server.model.IssueQuerySetting;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
@@ -54,11 +54,9 @@ import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.search.entity.issue.AndCriteria;
import io.onedev.server.search.entity.issue.IssueCriteria;
import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.search.entity.issue.IssueQueryBuildContext;
import io.onedev.server.search.entity.issue.MilestoneCriteria;
import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.ValueSetEdit;
@@ -71,7 +69,7 @@ import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateRe
@Singleton
public class DefaultIssueManager extends AbstractEntityManager<Issue> implements IssueManager {
- private final IssueFieldEntityManager issueFieldEntityManager;
+ private final IssueFieldManager issueFieldManager;
private final ListenerRegistry listenerRegistry;
@@ -82,11 +80,11 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
private final ProjectManager projectManager;
@Inject
- public DefaultIssueManager(Dao dao, IssueFieldEntityManager issueFieldEntityManager,
+ public DefaultIssueManager(Dao dao, IssueFieldManager issueFieldManager,
IssueQuerySettingManager issueQuerySettingManager, SettingManager settingManager,
ListenerRegistry listenerRegistry, ProjectManager projectManager) {
super(dao);
- this.issueFieldEntityManager = issueFieldEntityManager;
+ this.issueFieldManager = issueFieldManager;
this.issueQuerySettingManager = issueQuerySettingManager;
this.listenerRegistry = listenerRegistry;
this.settingManager = settingManager;
@@ -112,16 +110,16 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
issue.setNumber(getNextNumber(issue.getProject(), query));
save(issue);
- issueFieldEntityManager.saveFields(issue);
+ issueFieldManager.saveFields(issue);
listenerRegistry.post(new IssueOpened(issue));
}
- private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Issue> criteria, Project project, QueryBuildContext<Issue> context, User user) {
+ private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Issue> criteria, Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
List<Predicate> predicates = new ArrayList<>();
- predicates.add(context.getBuilder().equal(context.getRoot().get("project"), project));
+ predicates.add(builder.equal(root.get("project"), project));
if (criteria != null)
- predicates.add(criteria.getPredicate(project, context, user));
+ predicates.add(criteria.getPredicate(project, root, builder, user));
return predicates.toArray(new Predicate[0]);
}
@@ -130,8 +128,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
CriteriaQuery<Issue> query = builder.createQuery(Issue.class);
Root<Issue> root = query.from(Issue.class);
- QueryBuildContext<Issue> context = new IssueQueryBuildContext(root, builder);
- query.where(getPredicates(issueQuery.getCriteria(), project, context, user));
+ query.where(getPredicates(issueQuery.getCriteria(), project, root, builder, user));
List<javax.persistence.criteria.Order> orders = new ArrayList<>();
for (EntitySort sort: issueQuery.getSorts()) {
@@ -141,12 +138,12 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
else
orders.add(builder.desc(IssueQuery.getPath(root, IssueConstants.ORDER_FIELDS.get(sort.getField()))));
} else {
- Join<Issue, IssueFieldEntity> join = root.join(IssueConstants.ATTR_FIELD_ENTITIES, JoinType.LEFT);
- join.on(builder.equal(join.get(IssueFieldEntity.ATTR_NAME), sort.getField()));
+ Join<Issue, IssueField> join = root.join(IssueConstants.ATTR_FIELDS, JoinType.LEFT);
+ join.on(builder.equal(join.get(IssueField.ATTR_NAME), sort.getField()));
if (sort.getDirection() == Direction.ASCENDING)
- orders.add(builder.asc(join.get(IssueFieldEntity.ATTR_ORDINAL)));
+ orders.add(builder.asc(join.get(IssueField.ATTR_ORDINAL)));
else
- orders.add(builder.desc(join.get(IssueFieldEntity.ATTR_ORDINAL)));
+ orders.add(builder.desc(join.get(IssueField.ATTR_ORDINAL)));
}
}
@@ -170,7 +167,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
query.setMaxResults(maxResults);
List<Issue> issues = query.getResultList();
if (!issues.isEmpty())
- issueFieldEntityManager.populateFields(issues);
+ issueFieldManager.populateFields(issues);
return issues;
}
@@ -189,8 +186,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);
Root<Issue> root = criteriaQuery.from(Issue.class);
- QueryBuildContext<Issue> context = new IssueQueryBuildContext(root, builder);
- criteriaQuery.where(getPredicates(issueCriteria, project, context, user));
+ criteriaQuery.where(getPredicates(issueCriteria, project, root, builder, user));
criteriaQuery.select(builder.count(root));
return getSession().createQuery(criteriaQuery).uniqueResult().intValue();
@@ -311,7 +307,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
@Sessional
@Override
public Collection<String> getUndefinedFields() {
- Query<?> query = getSession().createQuery("select distinct name from IssueFieldEntity");
+ Query<?> query = getSession().createQuery("select distinct name from IssueField");
Set<String> undefinedFields = new HashSet<>();
for (String fieldName: (List<String>)query.getResultList()) {
InputSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);
@@ -338,11 +334,11 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
Query<?> query;
if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {
- query = getSession().createQuery("update IssueFieldEntity set name=:newName where name=:oldName");
+ query = getSession().createQuery("update IssueField set name=:newName where name=:oldName");
query.setParameter("oldName", entry.getKey());
query.setParameter("newName", entry.getValue().getNewField());
} else {
- query = getSession().createQuery("delete from IssueFieldEntity where name=:fieldName");
+ query = getSession().createQuery("delete from IssueField where name=:fieldName");
query.setParameter("fieldName", entry.getKey());
}
query.executeUpdate();
@@ -382,7 +378,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
@Sessional
@Override
public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
- Query query = getSession().createQuery("select distinct name, value from IssueFieldEntity where type=:choice");
+ Query query = getSession().createQuery("select distinct name, value from IssueField where type=:choice");
query.setParameter("choice", InputSpec.ENUMERATION);
Set<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
for (Object[] row: (List<Object[]>)query.getResultList()) {
@@ -415,13 +411,13 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
public void fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits) {
for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {
for (String deletion: entry.getValue().getDeletions()) {
- Query query = getSession().createQuery("delete from IssueFieldEntity where name=:fieldName and value=:fieldValue");
+ Query query = getSession().createQuery("delete from IssueField where name=:fieldName and value=:fieldValue");
query.setParameter("fieldName", entry.getKey());
query.setParameter("fieldValue", deletion);
query.executeUpdate();
}
for (Map.Entry<String, String> renameEntry: entry.getValue().getRenames().entrySet()) {
- Query query = getSession().createQuery("update IssueFieldEntity set value=:newValue where name=:fieldName and value=:oldValue");
+ Query query = getSession().createQuery("update IssueField set value=:newValue where name=:fieldName and value=:oldValue");
query.setParameter("fieldName", entry.getKey());
query.setParameter("oldValue", renameEntry.getKey());
query.setParameter("newValue", renameEntry.getValue());
@@ -453,7 +449,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
@Transactional
@Override
public void fixFieldValueOrders() {
- Query query = getSession().createQuery("select distinct name, value, ordinal from IssueFieldEntity where type=:choice");
+ Query query = getSession().createQuery("select distinct name, value, ordinal from IssueField where type=:choice");
query.setParameter("choice", InputSpec.ENUMERATION);
for (Object[] row: (List<Object[]>)query.getResultList()) {
@@ -464,7 +460,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
if (specifiedChoices != null) {
long newOrdinal = specifiedChoices.getChoiceValues().indexOf(value);
if (ordinal != newOrdinal) {
- query = getSession().createQuery("update IssueFieldEntity set ordinal=:newOrdinal where name=:fieldName and value=:fieldValue");
+ query = getSession().createQuery("update IssueField set ordinal=:newOrdinal where name=:fieldName and value=:fieldValue");
query.setParameter("fieldName", name);
query.setParameter("fieldValue", value);
query.setParameter("newOrdinal", newOrdinal);
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 68b27adaaf..1fd4ed68a2 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -369,15 +369,15 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
List<Build> builds = buildManager.query(project, newObjectId.name());
for (JobDependency dependency: branchProtection.getJobDependencies()) {
- Map<String, List<String>> paramMatrix = new HashMap<>();
+ Map<String, List<List<String>>> paramMatrix = new HashMap<>();
for (JobParam param: dependency.getJobParams())
paramMatrix.put(param.getName(), param.getValuesProvider().getValues());
AtomicBoolean buildRequirementUnsatisfied = new AtomicBoolean(false);
- new MatrixRunner(paramMatrix) {
+ new MatrixRunner<List<String>>(paramMatrix) {
@Override
- public void run(Map<String, String> params) {
+ public void run(Map<String, List<String>> params) {
for (Build build: builds) {
if (build.getJobName().equals(dependency.getJobName()) && build.getParamMap().equals(params))
return;
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 2c6229a833..f1440bd7d7 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -116,9 +116,7 @@ import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
-import io.onedev.server.search.entity.pullrequest.PullRequestQueryBuildContext;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.security.permission.ProjectPrivilege;
@@ -726,14 +724,14 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
Collection<BuildRequirement> effectiveRequirements = new HashSet<>();
for (JobDependency dependency: jobDependencies) {
- Map<String, List<String>> paramMatrix = new HashMap<>();
+ Map<String, List<List<String>>> paramMatrix = new HashMap<>();
for (JobParam param: dependency.getJobParams())
paramMatrix.put(param.getName(), param.getValuesProvider().getValues());
- new MatrixRunner(paramMatrix) {
+ new MatrixRunner<List<String>>(paramMatrix) {
@Override
- public void run(Map<String, String> params) {
+ public void run(Map<String, List<String>> params) {
BuildRequirement requirement = request.getBuildRequirement(dependency.getJobName(), params);
if (requirement == null) {
requirement = new BuildRequirement();
@@ -952,11 +950,11 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
}
private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<PullRequest> criteria,
- Project targetProject, User user, QueryBuildContext<PullRequest> context) {
+ Project targetProject, User user, Root<PullRequest> root, CriteriaBuilder builder) {
List<Predicate> predicates = new ArrayList<>();
- predicates.add(context.getBuilder().equal(context.getRoot().get("targetProject"), targetProject));
+ predicates.add(builder.equal(root.get("targetProject"), targetProject));
if (criteria != null)
- predicates.add(criteria.getPredicate(targetProject, context, user));
+ predicates.add(criteria.getPredicate(targetProject, root, builder, user));
return predicates.toArray(new Predicate[0]);
}
@@ -967,8 +965,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
Root<PullRequest> root = query.from(PullRequest.class);
query.select(root).distinct(true);
- QueryBuildContext<PullRequest> context = new PullRequestQueryBuildContext(root, builder);
- query.where(getPredicates(requestQuery.getCriteria(), targetProject, user, context));
+ query.where(getPredicates(requestQuery.getCriteria(), targetProject, user, root, builder));
List<javax.persistence.criteria.Order> orders = new ArrayList<>();
for (EntitySort sort: requestQuery.getSorts()) {
@@ -1002,8 +999,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);
Root<PullRequest> root = criteriaQuery.from(PullRequest.class);
- QueryBuildContext<PullRequest> context = new PullRequestQueryBuildContext(root, builder);
- criteriaQuery.where(getPredicates(requestCriteria, targetProject, user, context));
+ criteriaQuery.where(getPredicates(requestCriteria, targetProject, user, root, builder));
criteriaQuery.select(builder.countDistinct(root));
return getSession().createQuery(criteriaQuery).uniqueResult().intValue();
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
index 826a07039e..2045526cc5 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
@@ -14,7 +14,7 @@ import io.onedev.commons.launcher.loader.Listen;
import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.cache.CacheManager;
-import io.onedev.server.entitymanager.IssueFieldEntityManager;
+import io.onedev.server.entitymanager.IssueFieldManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
@@ -38,7 +38,7 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
private final SettingManager settingManager;
- private final IssueFieldEntityManager issueFieldEntityManager;
+ private final IssueFieldManager issueFieldManager;
private final CacheManager cacheManager;
@@ -46,14 +46,14 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
@Inject
public DefaultUserManager(Dao dao, ProjectManager projectManager, SettingManager settingManager,
- IssueFieldEntityManager issueFieldEntityManager, CacheManager cacheManager,
+ IssueFieldManager issueFieldManager, CacheManager cacheManager,
PasswordService passwordService, ListenerRegistry listenerRegistry) {
super(dao);
this.passwordService = passwordService;
this.projectManager = projectManager;
this.settingManager = settingManager;
- this.issueFieldEntityManager = issueFieldEntityManager;
+ this.issueFieldManager = issueFieldManager;
this.cacheManager = cacheManager;
this.listenerRegistry = listenerRegistry;
}
@@ -77,7 +77,7 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
project.getIssueSetting().onRenameUser(oldName, user.getName());
}
- issueFieldEntityManager.onRenameUser(oldName, user.getName());
+ issueFieldManager.onRenameUser(oldName, user.getName());
settingManager.getIssueSetting().onRenameUser(oldName, user.getName());
}
}
diff --git a/core/src/main/java/io/onedev/server/event/issue/IssueOpened.java b/core/src/main/java/io/onedev/server/event/issue/IssueOpened.java
index 3585781cad..9899b77690 100644
--- a/core/src/main/java/io/onedev/server/event/issue/IssueOpened.java
+++ b/core/src/main/java/io/onedev/server/event/issue/IssueOpened.java
@@ -10,7 +10,7 @@ import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.Group;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
-import io.onedev.server.util.IssueField;
+import io.onedev.server.util.Input;
import io.onedev.server.util.inputspec.InputSpec;
public class IssueOpened extends IssueEvent implements MarkdownAware {
@@ -33,7 +33,7 @@ public class IssueOpened extends IssueEvent implements MarkdownAware {
public Map<String, User> getNewUsers() {
Map<String, User> newUsers = new HashMap<>();
UserManager userManager = OneDev.getInstance(UserManager.class);
- for (IssueField field: getIssue().getFields().values()) {
+ for (Input field: getIssue().getFieldInputs().values()) {
if (field.getType().equals(InputSpec.USER)) {
if (!field.getValues().isEmpty()) {
User newUser = userManager.findByName(field.getValues().iterator().next());
@@ -49,7 +49,7 @@ public class IssueOpened extends IssueEvent implements MarkdownAware {
public Map<String, Group> getNewGroups() {
Map<String, Group> newGroups = new HashMap<>();
GroupManager groupManager = OneDev.getInstance(GroupManager.class);
- for (IssueField field: getIssue().getFields().values()) {
+ for (Input field: getIssue().getFieldInputs().values()) {
if (field.getType().equals(InputSpec.GROUP)) {
if (!field.getValues().isEmpty()) {
Group newGroup = groupManager.find(field.getValues().iterator().next());
diff --git a/core/src/main/java/io/onedev/server/model/Build.java b/core/src/main/java/io/onedev/server/model/Build.java
index 1a3a9d87cb..513078944c 100644
--- a/core/src/main/java/io/onedev/server/model/Build.java
+++ b/core/src/main/java/io/onedev/server/model/Build.java
@@ -3,9 +3,12 @@ package io.onedev.server.model;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
@@ -32,6 +35,7 @@ import com.google.common.base.Optional;
import io.onedev.server.OneDev;
import io.onedev.server.cache.BuildInfoManager;
+import io.onedev.server.util.Input;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.Referenceable;
import io.onedev.server.util.facade.BuildFacade;
@@ -111,7 +115,7 @@ public class Build extends AbstractEntity implements Referenceable {
@OneToMany(mappedBy="dependency", cascade=CascadeType.REMOVE)
private Collection<BuildDependence> dependents= new ArrayList<>();
- private transient Map<String, String> paramMap;
+ private transient Map<String, List<String>> paramMap;
private transient Optional<Collection<Long>> fixedIssueNumbers;
@@ -277,11 +281,22 @@ public class Build extends AbstractEntity implements Referenceable {
this.statusMessage = statusMessage;
}
- public Map<String, String> getParamMap() {
+ public Map<String, List<String>> getParamMap() {
if (paramMap == null) {
paramMap = new HashMap<>();
- for (BuildParam param: getParams())
- paramMap.put(param.getName(), param.getValue());
+ for (BuildParam param: getParams()) {
+ List<String> values = paramMap.get(param.getName());
+ if (values == null) {
+ values = new ArrayList<>();
+ paramMap.put(param.getName(), values);
+ }
+ values.add(param.getValue());
+ }
+ for (Map.Entry<String, List<String>> entry: paramMap.entrySet()) {
+ List<String> values = entry.getValue();
+ Collections.sort(values);
+ entry.setValue(values);
+ }
}
return paramMap;
}
@@ -317,6 +332,20 @@ public class Build extends AbstractEntity implements Referenceable {
return fixedIssueNumbers.orNull();
}
+ public Map<String, Input> getParamInputs() {
+ Map<String, Input> inputs = new LinkedHashMap<>();
+ for (BuildParam param: getParams()) {
+ Input input = inputs.get(param.getName());
+ if (input == null) {
+ input = new Input(param.getName(), param.getType(), new ArrayList<>());
+ inputs.put(param.getName(), input);
+ }
+ if (param.getValue() != null)
+ input.getValues().add(param.getValue());
+ }
+ return inputs;
+ }
+
public BuildFacade getFacade() {
return new BuildFacade(getId(), getProject().getId(), getCommitHash());
}
diff --git a/core/src/main/java/io/onedev/server/model/BuildParam.java b/core/src/main/java/io/onedev/server/model/BuildParam.java
index 6e10f3cf32..1bbf3ce313 100644
--- a/core/src/main/java/io/onedev/server/model/BuildParam.java
+++ b/core/src/main/java/io/onedev/server/model/BuildParam.java
@@ -10,6 +10,10 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
+/**
+ * @author robin
+ *
+ */
@Entity
@Table(
indexes={@Index(columnList="o_build_id"), @Index(columnList="name"), @Index(columnList="value")},
@@ -28,7 +32,10 @@ public class BuildParam extends AbstractEntity {
@Column(nullable=false)
private String name;
-
+
+ @Column(nullable=false)
+ private String type;
+
private String value;
public Build getBuild() {
@@ -47,6 +54,14 @@ public class BuildParam extends AbstractEntity {
this.name = name;
}
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
@Nullable
public String getValue() {
return value;
diff --git a/core/src/main/java/io/onedev/server/model/BuildRequirement.java b/core/src/main/java/io/onedev/server/model/BuildRequirement.java
index 48f9e3b028..79225a3d47 100644
--- a/core/src/main/java/io/onedev/server/model/BuildRequirement.java
+++ b/core/src/main/java/io/onedev/server/model/BuildRequirement.java
@@ -1,6 +1,7 @@
package io.onedev.server.model;
import java.util.LinkedHashMap;
+import java.util.List;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -24,7 +25,7 @@ public class BuildRequirement extends AbstractEntity {
@Column(nullable=false)
@Lob
- private LinkedHashMap<String, String> buildParams = new LinkedHashMap<>();
+ private LinkedHashMap<String, List<String>> buildParams = new LinkedHashMap<>();
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
@@ -41,11 +42,11 @@ public class BuildRequirement extends AbstractEntity {
this.jobName = jobName;
}
- public LinkedHashMap<String, String> getBuildParams() {
+ public LinkedHashMap<String, List<String>> getBuildParams() {
return buildParams;
}
- public void setBuildParams(LinkedHashMap<String, String> buildParams) {
+ public void setBuildParams(LinkedHashMap<String, List<String>> buildParams) {
this.buildParams = buildParams;
}
diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.java
index c618b720c5..4c7907eef0 100644
--- a/core/src/main/java/io/onedev/server/model/Issue.java
+++ b/core/src/main/java/io/onedev/server/model/Issue.java
@@ -44,7 +44,7 @@ import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.storage.AttachmentStorageSupport;
-import io.onedev.server.util.IssueField;
+import io.onedev.server.util.Input;
import io.onedev.server.util.Referenceable;
import io.onedev.server.util.facade.IssueFacade;
import io.onedev.server.util.inputspec.InputSpec;
@@ -118,7 +118,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
private Date updateDate = new Date();
@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
- private Collection<IssueFieldEntity> fieldEntities = new ArrayList<>();
+ private Collection<IssueField> fields = new ArrayList<>();
@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
private Collection<IssueComment> comments = new ArrayList<>();
@@ -282,12 +282,12 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
this.commentCount = commentCount;
}
- public Collection<IssueFieldEntity> getFieldEntities() {
- return fieldEntities;
+ public Collection<IssueField> getFields() {
+ return fields;
}
- public void setFieldEntities(Collection<IssueFieldEntity> fieldEntities) {
- this.fieldEntities = fieldEntities;
+ public void setFields(Collection<IssueField> fields) {
+ this.fields = fields;
}
public Date getUpdateDate() {
@@ -309,38 +309,38 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
}
public Collection<String> getFieldNames() {
- return getFieldEntities().stream().map(it->it.getName()).collect(Collectors.toSet());
+ return getFields().stream().map(it->it.getName()).collect(Collectors.toSet());
}
- public Map<String, IssueField> getFields() {
- Map<String, IssueField> fields = new LinkedHashMap<>();
+ public Map<String, Input> getFieldInputs() {
+ Map<String, Input> inputs = new LinkedHashMap<>();
- Map<String, List<IssueFieldEntity>> entityMap = new HashMap<>();
- for (IssueFieldEntity entity: getFieldEntities()) {
- List<IssueFieldEntity> fieldsOfName = entityMap.get(entity.getName());
+ Map<String, List<IssueField>> fieldMap = new HashMap<>();
+ for (IssueField field: getFields()) {
+ List<IssueField> fieldsOfName = fieldMap.get(field.getName());
if (fieldsOfName == null) {
fieldsOfName = new ArrayList<>();
- entityMap.put(entity.getName(), fieldsOfName);
+ fieldMap.put(field.getName(), fieldsOfName);
}
- fieldsOfName.add(entity);
+ fieldsOfName.add(field);
}
for (InputSpec fieldSpec: getIssueSetting().getFieldSpecs()) {
String fieldName = fieldSpec.getName();
- List<IssueFieldEntity> unaries = entityMap.get(fieldName);
- if (unaries != null) {
- String type = unaries.iterator().next().getType();
+ List<IssueField> fields = fieldMap.get(fieldName);
+ if (fields != null) {
+ String type = fields.iterator().next().getType();
List<String> values = new ArrayList<>();
- for (IssueFieldEntity entity: unaries) {
+ for (IssueField entity: fields) {
if (entity.getValue() != null)
values.add(entity.getValue());
}
Collections.sort(values);
if (!fieldSpec.isAllowMultiple() && values.size() > 1)
values = Lists.newArrayList(values.iterator().next());
- fields.put(fieldName, new IssueField(fieldName, type, values));
+ inputs.put(fieldName, new Input(fieldName, type, values));
}
}
- return fields;
+ return inputs;
}
public static String getWebSocketObservable(Long issueId) {
@@ -354,10 +354,10 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
@Nullable
public Object getFieldValue(String fieldName) {
- IssueField field = getFields().get(fieldName);
+ Input input = getFieldInputs().get(fieldName);
- if (field != null)
- return field.getValue(getProject());
+ if (input != null)
+ return input.getTypedValue(getIssueSetting().getFieldSpec(fieldName));
else
return null;
}
@@ -381,18 +381,20 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
for (List<PropertyDescriptor> groupProperties: beanDescriptor.getPropertyDescriptors().values()) {
for (PropertyDescriptor property: groupProperties) {
- IssueField field = getFields().get(property.getDisplayName());
- if (field != null)
- property.setPropertyValue(fieldBean, field.getValue(getProject()));
- else if (!withDefaultValue)
+ Input input = getFieldInputs().get(property.getDisplayName());
+ if (input != null) {
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(input.getName());
+ property.setPropertyValue(fieldBean, input.getTypedValue(fieldSpec));
+ } else if (!withDefaultValue) {
property.setPropertyValue(fieldBean, null);
+ }
}
}
return fieldBean;
}
public void removeFields(Collection<String> fieldNames) {
- for (Iterator<IssueFieldEntity> it = getFieldEntities().iterator(); it.hasNext();) {
+ for (Iterator<IssueField> it = getFields().iterator(); it.hasNext();) {
if (fieldNames.contains(it.next().getName()))
it.remove();
}
@@ -404,7 +406,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
}
public void setFieldValue(String fieldName, @Nullable Object fieldValue) {
- for (Iterator<IssueFieldEntity> it = getFieldEntities().iterator(); it.hasNext();) {
+ for (Iterator<IssueField> it = getFields().iterator(); it.hasNext();) {
if (fieldName.equals(it.next().getName()))
it.remove();
}
@@ -413,7 +415,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
if (fieldSpec != null) {
long ordinal = getFieldOrdinal(fieldName, fieldValue);
- IssueFieldEntity field = new IssueFieldEntity();
+ IssueField field = new IssueField();
field.setIssue(this);
field.setName(fieldName);
field.setOrdinal(ordinal);
@@ -422,13 +424,13 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
List<String> strings = fieldSpec.convertToStrings(fieldValue);
if (!strings.isEmpty()) {
for (String string: strings) {
- IssueFieldEntity cloned = (IssueFieldEntity) SerializationUtils.clone(field);
+ IssueField cloned = (IssueField) SerializationUtils.clone(field);
cloned.setIssue(this);
cloned.setValue(string);
- getFieldEntities().add(cloned);
+ getFields().add(cloned);
}
} else {
- getFieldEntities().add(field);
+ getFields().add(field);
}
}
}
@@ -437,7 +439,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);
if (fieldSpec != null) {
if (fieldSpec.getShowCondition() != null) {
- IssueField dependentField = getFields().get(fieldSpec.getShowCondition().getInputName());
+ Input dependentField = getFieldInputs().get(fieldSpec.getShowCondition().getInputName());
if (dependentField != null) {
String value;
if (!dependentField.getValues().isEmpty())
diff --git a/core/src/main/java/io/onedev/server/model/IssueFieldEntity.java b/core/src/main/java/io/onedev/server/model/IssueField.java
similarity index 83%
rename from core/src/main/java/io/onedev/server/model/IssueFieldEntity.java
rename to core/src/main/java/io/onedev/server/model/IssueField.java
index d239550bd8..980e87912f 100644
--- a/core/src/main/java/io/onedev/server/model/IssueFieldEntity.java
+++ b/core/src/main/java/io/onedev/server/model/IssueField.java
@@ -8,14 +8,15 @@ import javax.persistence.Index;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
@Entity
@Table(
indexes={
- @Index(columnList="o_issue_id"), @Index(columnList="name"),
- @Index(columnList="value"), @Index(columnList="type"),
- @Index(columnList="ordinal")})
-public class IssueFieldEntity extends AbstractEntity {
+ @Index(columnList="o_issue_id"), @Index(columnList="name"), @Index(columnList="value"),
+ @Index(columnList="type"), @Index(columnList="ordinal")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_issue_id", "name", "value"})})
+public class IssueField extends AbstractEntity {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.java
index 0f4e64d205..92ff2d0332 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -712,7 +712,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
}
@Nullable
- public BuildRequirement getBuildRequirement(String jobName, Map<String, String> buildParams) {
+ public BuildRequirement getBuildRequirement(String jobName, Map<String, List<String>> buildParams) {
for (BuildRequirement requirement: getBuildRequirements()) {
if (requirement.getJobName().equals(jobName) && requirement.getBuildParams().equals(buildParams))
return requirement;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
index b1104e10d1..461183ae27 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
@@ -24,7 +24,7 @@ import io.onedev.server.model.support.issue.transitionprerequisite.ValueMatcher;
import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
import io.onedev.server.model.support.issue.transitiontrigger.TransitionTrigger;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
-import io.onedev.server.util.IssueField;
+import io.onedev.server.util.Input;
import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
@@ -308,7 +308,7 @@ public class TransitionSpec implements Serializable {
if (getPrerequisite() == null) {
return true;
} else {
- IssueField field = issue.getFields().get(getPrerequisite().getInputName());
+ Input field = issue.getFieldInputs().get(getPrerequisite().getInputName());
List<String> fieldValues;
if (field != null)
fieldValues = field.getValues();
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java
index 71dccdbb09..e11710fd4e 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java
@@ -12,7 +12,7 @@ import com.google.common.base.Objects;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Milestone;
import io.onedev.server.util.CommentSupport;
-import io.onedev.server.util.IssueField;
+import io.onedev.server.util.Input;
import io.onedev.server.util.diff.DiffSupport;
import io.onedev.server.web.component.issue.activities.activity.DiffAndCommentAwarePanel;
@@ -31,7 +31,7 @@ public class IssueBatchUpdateData extends IssueFieldChangeData {
private String comment;
public IssueBatchUpdateData(String oldState, String newState, @Nullable Milestone oldMilestone, @Nullable Milestone newMilestone,
- Map<String, IssueField> oldFields, Map<String, IssueField> newFields, @Nullable String comment) {
+ Map<String, Input> oldFields, Map<String, Input> newFields, @Nullable String comment) {
super(oldFields, newFields);
this.oldState = oldState;
this.newState = newState;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
index 44d43fe5ce..4779d3e08b 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
@@ -16,7 +16,7 @@ import io.onedev.server.model.Group;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.User;
import io.onedev.server.util.CommentSupport;
-import io.onedev.server.util.IssueField;
+import io.onedev.server.util.Input;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
@@ -24,23 +24,23 @@ public class IssueFieldChangeData implements IssueChangeData {
private static final long serialVersionUID = 1L;
- protected final Map<String, IssueField> oldFields;
+ protected final Map<String, Input> oldFields;
- protected final Map<String, IssueField> newFields;
+ protected final Map<String, Input> newFields;
- public IssueFieldChangeData(Map<String, IssueField> oldFields, Map<String, IssueField> newFields) {
+ public IssueFieldChangeData(Map<String, Input> oldFields, Map<String, Input> newFields) {
this.oldFields = copyNonEmptyFields(oldFields);
this.newFields = copyNonEmptyFields(newFields);
}
protected List<String> getOldLines() {
List<String> oldLines = new ArrayList<>();
- for (IssueField oldField: oldFields.values()) {
- IssueField newField = newFields.get(oldField.getName());
+ for (Input oldField: oldFields.values()) {
+ Input newField = newFields.get(oldField.getName());
if (newField == null || !describe(oldField).equals(describe(newField)))
oldLines.add(describe(oldField));
}
- for (IssueField newField: newFields.values()) {
+ for (Input newField: newFields.values()) {
if (!oldFields.containsKey(newField.getName()))
oldLines.add("");
}
@@ -49,8 +49,8 @@ public class IssueFieldChangeData implements IssueChangeData {
protected List<String> getNewLines() {
List<String> newLines = new ArrayList<>();
- for (IssueField oldField: oldFields.values()) {
- IssueField newField = newFields.get(oldField.getName());
+ for (Input oldField: oldFields.values()) {
+ Input newField = newFields.get(oldField.getName());
if (newField != null) {
if (!describe(oldField).equals(describe(newField))) {
newLines.add(describe(newField));
@@ -59,23 +59,23 @@ public class IssueFieldChangeData implements IssueChangeData {
newLines.add("");
}
}
- for (IssueField newField: newFields.values()) {
+ for (Input newField: newFields.values()) {
if (!oldFields.containsKey(newField.getName()))
newLines.add(describe(newField));
}
return newLines;
}
- private Map<String, IssueField> copyNonEmptyFields(Map<String, IssueField> fields) {
- Map<String, IssueField> copy = new LinkedHashMap<>();
- for (Map.Entry<String, IssueField> entry: fields.entrySet()) {
+ private Map<String, Input> copyNonEmptyFields(Map<String, Input> fields) {
+ Map<String, Input> copy = new LinkedHashMap<>();
+ for (Map.Entry<String, Input> entry: fields.entrySet()) {
if (!entry.getValue().getValues().isEmpty())
copy.put(entry.getKey(), entry.getValue());
}
return copy;
}
- private String describe(IssueField field) {
+ private String describe(Input field) {
return field.getName() + ": " + StringUtils.join(field.getValues(), ", ");
}
@@ -89,9 +89,9 @@ public class IssueFieldChangeData implements IssueChangeData {
return "changed fields";
}
- public List<String> getLines(Map<String, IssueField> fields) {
+ public List<String> getLines(Map<String, Input> fields) {
List<String> lines = new ArrayList<>();
- for (Map.Entry<String, IssueField> entry: fields.entrySet())
+ for (Map.Entry<String, Input> entry: fields.entrySet())
lines.add(entry.getKey() + ": " + StringUtils.join(entry.getValue().getValues(), ", "));
return lines;
}
@@ -105,8 +105,8 @@ public class IssueFieldChangeData implements IssueChangeData {
public Map<String, User> getNewUsers() {
UserManager userManager = OneDev.getInstance(UserManager.class);
Map<String, User> newUsers = new HashMap<>();
- for (IssueField oldField: oldFields.values()) {
- IssueField newField = newFields.get(oldField.getName());
+ for (Input oldField: oldFields.values()) {
+ Input newField = newFields.get(oldField.getName());
if (newField != null && !describe(oldField).equals(describe(newField))
&& newField.getType().equals(InputSpec.USER) && !newField.getValues().isEmpty()) {
User user = userManager.findByName(newField.getValues().iterator().next());
@@ -114,7 +114,7 @@ public class IssueFieldChangeData implements IssueChangeData {
newUsers.put(newField.getName(), user);
}
}
- for (IssueField newField: newFields.values()) {
+ for (Input newField: newFields.values()) {
if (!oldFields.containsKey(newField.getName()) && newField.getType().equals(InputSpec.USER)
&& !newField.getValues().isEmpty()) {
User user = userManager.findByName(newField.getValues().iterator().next());
@@ -130,8 +130,8 @@ public class IssueFieldChangeData implements IssueChangeData {
public Map<String, Group> getNewGroups() {
Map<String, Group> newGroups = new HashMap<>();
GroupManager groupManager = OneDev.getInstance(GroupManager.class);
- for (IssueField oldField: oldFields.values()) {
- IssueField newField = newFields.get(oldField.getName());
+ for (Input oldField: oldFields.values()) {
+ Input newField = newFields.get(oldField.getName());
if (newField != null
&& !describe(oldField).equals(describe(newField))
&& newField.getType().equals(InputSpec.GROUP)
@@ -141,7 +141,7 @@ public class IssueFieldChangeData implements IssueChangeData {
newGroups.put(newField.getName(), group);
}
}
- for (IssueField newField: newFields.values()) {
+ for (Input newField: newFields.values()) {
if (!oldFields.containsKey(newField.getName())
&& newField.getType().equals(InputSpec.GROUP)
&& !newField.getValues().isEmpty()) {
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java
index 7b301bf9ca..f305af0c61 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java
@@ -9,7 +9,7 @@ import org.apache.wicket.Component;
import io.onedev.server.model.IssueChange;
import io.onedev.server.util.CommentSupport;
-import io.onedev.server.util.IssueField;
+import io.onedev.server.util.Input;
import io.onedev.server.util.diff.DiffSupport;
import io.onedev.server.web.component.issue.activities.activity.DiffAndCommentAwarePanel;
@@ -23,8 +23,8 @@ public class IssueStateChangeData extends IssueFieldChangeData {
private String comment;
- public IssueStateChangeData(String oldState, String newState, Map<String, IssueField> oldFields,
- Map<String, IssueField> newFields, @Nullable String comment) {
+ public IssueStateChangeData(String oldState, String newState, Map<String, Input> oldFields,
+ Map<String, Input> newFields, @Nullable String comment) {
super(oldFields, newFields);
this.oldState = oldState;
this.newState = newState;
diff --git a/core/src/main/java/io/onedev/server/search/entity/AndCriteriaHelper.java b/core/src/main/java/io/onedev/server/search/entity/AndCriteriaHelper.java
index 9f0788f879..e6079655c4 100644
--- a/core/src/main/java/io/onedev/server/search/entity/AndCriteriaHelper.java
+++ b/core/src/main/java/io/onedev/server/search/entity/AndCriteriaHelper.java
@@ -3,7 +3,9 @@ package io.onedev.server.search.entity;
import java.util.ArrayList;
import java.util.List;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Project;
@@ -20,11 +22,11 @@ public class AndCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<T> context, User user) {
+ public Predicate getPredicate(Project project, Root<T> root, CriteriaBuilder builder, User user) {
List<Predicate> predicates = new ArrayList<>();
for (EntityCriteria<T> criteria: criterias)
- predicates.add(criteria.getPredicate(project, context, user));
- return context.getBuilder().and(predicates.toArray(new Predicate[0]));
+ predicates.add(criteria.getPredicate(project, root, builder, user));
+ return builder.and(predicates.toArray(new Predicate[0]));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/EntityCriteria.java b/core/src/main/java/io/onedev/server/search/entity/EntityCriteria.java
index b024752f12..a9828750a2 100644
--- a/core/src/main/java/io/onedev/server/search/entity/EntityCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/EntityCriteria.java
@@ -8,6 +8,7 @@ import java.util.List;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.model.AbstractEntity;
@@ -21,7 +22,7 @@ public abstract class EntityCriteria<T extends AbstractEntity> implements Serial
public static final int IN_CLAUSE_LIMIT = 1000;
- public abstract Predicate getPredicate(Project project, QueryBuildContext<T> context, User user);
+ public abstract Predicate getPredicate(Project project, Root<T> root, CriteriaBuilder builder, User user);
public abstract boolean matches(T entity, User user);
diff --git a/core/src/main/java/io/onedev/server/search/entity/NotCriteriaHelper.java b/core/src/main/java/io/onedev/server/search/entity/NotCriteriaHelper.java
index 4ddb8aefdb..6f7c027131 100644
--- a/core/src/main/java/io/onedev/server/search/entity/NotCriteriaHelper.java
+++ b/core/src/main/java/io/onedev/server/search/entity/NotCriteriaHelper.java
@@ -1,6 +1,8 @@
package io.onedev.server.search.entity;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Project;
@@ -17,8 +19,8 @@ public class NotCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<T> context, User user) {
- return criteria.getPredicate(project, context, user).not();
+ public Predicate getPredicate(Project project, Root<T> root, CriteriaBuilder builder, User user) {
+ return criteria.getPredicate(project, root, builder, user).not();
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/OrCriteriaHelper.java b/core/src/main/java/io/onedev/server/search/entity/OrCriteriaHelper.java
index f2749c625a..0473c1b193 100644
--- a/core/src/main/java/io/onedev/server/search/entity/OrCriteriaHelper.java
+++ b/core/src/main/java/io/onedev/server/search/entity/OrCriteriaHelper.java
@@ -3,7 +3,9 @@ package io.onedev.server.search.entity;
import java.util.ArrayList;
import java.util.List;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Project;
@@ -20,11 +22,11 @@ public class OrCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<T> context, User user) {
+ public Predicate getPredicate(Project project, Root<T> root, CriteriaBuilder builder, User user) {
List<Predicate> predicates = new ArrayList<>();
for (EntityCriteria<T> criteria: criterias)
- predicates.add(criteria.getPredicate(project, context, user));
- return context.getBuilder().or(predicates.toArray(new Predicate[0]));
+ predicates.add(criteria.getPredicate(project, root, builder, user));
+ return builder.or(predicates.toArray(new Predicate[0]));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/QueryBuildContext.java b/core/src/main/java/io/onedev/server/search/entity/QueryBuildContext.java
deleted file mode 100644
index 9e4c1214c5..0000000000
--- a/core/src/main/java/io/onedev/server/search/entity/QueryBuildContext.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.onedev.server.search.entity;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Root;
-
-public abstract class QueryBuildContext<T> {
-
- private final Root<T> root;
-
- private final CriteriaBuilder builder;
-
- private final Map<String, From<?, ?>> joins = new HashMap<>();
-
- public QueryBuildContext(Root<T> root, CriteriaBuilder builder) {
- this.root = root;
- this.builder = builder;
- }
-
- public From<?, ?> getJoin(String joinName) {
- From<?, ?> join = joins.get(joinName);
- if (join == null) {
- join = newJoin(joinName);
- joins.put(joinName, join);
- }
- return join;
- }
-
- protected From<?, ?> joinByAttrs(List<String> joinAttrs) {
- From<?, ?> from = root;
- for (String attr: joinAttrs)
- from = from.join(attr, JoinType.LEFT);
- return from;
- }
-
- protected abstract From<?, ?> newJoin(String joinName);
-
- public Root<T> getRoot() {
- return root;
- }
-
- public CriteriaBuilder getBuilder() {
- return builder;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/BuildQueryBuildContext.java b/core/src/main/java/io/onedev/server/search/entity/build/BuildQueryBuildContext.java
deleted file mode 100644
index bf2f4149ae..0000000000
--- a/core/src/main/java/io/onedev/server/search/entity/build/BuildQueryBuildContext.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.onedev.server.search.entity.build;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Root;
-
-import io.onedev.server.model.Build;
-import io.onedev.server.model.BuildParam;
-import io.onedev.server.search.entity.QueryBuildContext;
-import io.onedev.server.util.BuildConstants;
-
-public class BuildQueryBuildContext extends QueryBuildContext<Build> {
-
- public BuildQueryBuildContext(Root<Build> root, CriteriaBuilder builder) {
- super(root, builder);
- }
-
- @Override
- public Join<?, ?> newJoin(String joinName) {
- switch (joinName) {
- case BuildConstants.FIELD_DEPENDENCIES:
- return getRoot().join(BuildConstants.ATTR_DEPENDENCIES, JoinType.LEFT);
- case BuildConstants.FIELD_DEPENDENTS:
- return getRoot().join(BuildConstants.ATTR_DEPENDENTS, JoinType.LEFT);
- default:
- Join<Build, ?> join = getRoot().join(BuildConstants.ATTR_PARAMS, JoinType.LEFT);
- join.on(getBuilder().equal(join.get(BuildParam.ATTR_NAME), joinName));
- return join;
- }
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java
index f90fb58f3b..6ab033d4c5 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.build;
import java.util.Objects;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class CancelledByCriteria extends EntityCriteria<Build> {
@@ -26,9 +27,9 @@ public class CancelledByCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<User> attribute = context.getRoot().get(BuildConstants.ATTR_CANCELLER);
- return context.getBuilder().equal(attribute, value);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<User> attribute = root.get(BuildConstants.ATTR_CANCELLER);
+ return builder.equal(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java
index a05602301d..f0f1088c95 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.build;
import java.util.Objects;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class CancelledByMeCriteria extends EntityCriteria<Build> {
@@ -17,9 +18,9 @@ public class CancelledByMeCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<User> attribute = context.getRoot().get(BuildConstants.ATTR_CANCELLER);
- return context.getBuilder().equal(attribute, user);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<User> attribute = root.get(BuildConstants.ATTR_CANCELLER);
+ return builder.equal(attribute, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java
index 76a0af80e8..1fdc6d90fb 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java
@@ -1,13 +1,14 @@
package io.onedev.server.search.entity.build;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class CancelledCriteria extends EntityCriteria<Build> {
@@ -15,9 +16,9 @@ public class CancelledCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<?> attribute = context.getRoot().get(BuildConstants.ATTR_STATUS);
- return context.getBuilder().equal(attribute, Build.Status.CANCELLED);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);
+ return builder.equal(attribute, Build.Status.CANCELLED);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java
index 7b110b1c05..abf0a88336 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java
@@ -1,7 +1,9 @@
package io.onedev.server.search.entity.build;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.ObjectId;
@@ -9,7 +11,6 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class CommitCriteria extends EntityCriteria<Build> {
@@ -23,9 +24,9 @@ public class CommitCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<?> attribute = BuildQuery.getPath(context.getRoot(), BuildConstants.ATTR_COMMIT);
- return context.getBuilder().equal(attribute, value.name());
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = BuildQuery.getPath(root, BuildConstants.ATTR_COMMIT);
+ return builder.equal(attribute, value.name());
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java
index 49263d57b5..96841b319c 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java
@@ -1,14 +1,16 @@
package io.onedev.server.search.entity.build;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.BuildDependence;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class DependenciesOfCriteria extends EntityCriteria<Build> {
@@ -22,9 +24,9 @@ public class DependenciesOfCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- From<?, ?> join = context.getJoin(BuildConstants.FIELD_DEPENDENTS);
- return context.getBuilder().equal(join.get(BuildDependence.ATTR_DEPENDENT), value);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ From<?, ?> join = root.join(BuildConstants.ATTR_DEPENDENTS, JoinType.LEFT);
+ return builder.equal(join.get(BuildDependence.ATTR_DEPENDENT), value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java
index 86d94187da..0f3b9d542b 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java
@@ -1,14 +1,16 @@
package io.onedev.server.search.entity.build;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.BuildDependence;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class DependsOnCriteria extends EntityCriteria<Build> {
@@ -22,9 +24,9 @@ public class DependsOnCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- From<?, ?> join = context.getJoin(BuildConstants.FIELD_DEPENDENCIES);
- return context.getBuilder().equal(join.get(BuildDependence.ATTR_DEPENDENCY), value);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ From<?, ?> join = root.join(BuildConstants.ATTR_DEPENDENCIES, JoinType.LEFT);
+ return builder.equal(join.get(BuildDependence.ATTR_DEPENDENCY), value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java
index 7eea1c1280..485f19f98d 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java
@@ -1,13 +1,14 @@
package io.onedev.server.search.entity.build;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class FailedCriteria extends EntityCriteria<Build> {
@@ -15,9 +16,9 @@ public class FailedCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<?> attribute = context.getRoot().get(BuildConstants.ATTR_STATUS);
- return context.getBuilder().equal(attribute, Build.Status.FAILED);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);
+ return builder.equal(attribute, Build.Status.FAILED);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java
index 0a119733c7..02a069db83 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.build;
import java.util.Date;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class FinishDateCriteria extends EntityCriteria<Build> {
@@ -29,12 +30,12 @@ public class FinishDateCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<Date> attribute = context.getRoot().get(BuildConstants.ATTR_FINISH_DATE);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<Date> attribute = root.get(BuildConstants.ATTR_FINISH_DATE);
if (operator == BuildQueryLexer.IsBefore)
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
else
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
index 55d711595d..1253340cb1 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
@@ -3,8 +3,10 @@ package io.onedev.server.search.entity.build;
import java.util.Collection;
import java.util.HashSet;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.ObjectId;
@@ -17,7 +19,6 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class FixedIssueCriteria extends EntityCriteria<Build> {
@@ -35,15 +36,15 @@ public class FixedIssueCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<Long> attribute = context.getRoot().get(BuildConstants.ATTR_ID);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<Long> attribute = root.get(BuildConstants.ATTR_ID);
Collection<ObjectId> fixCommits = getCommitInfoManager().getFixCommits(project, value.getNumber());
Collection<String> descendents = new HashSet<>();
for (ObjectId each: getCommitInfoManager().getDescendants(project, fixCommits))
descendents.add(each.name());
CacheManager cacheManager = OneDev.getInstance(CacheManager.class);
Collection<Long> inBuildIds = cacheManager.filterBuildIds(project.getId(), descendents);
- return inManyValues(context.getBuilder(), attribute, inBuildIds, cacheManager.getBuildIdsByProject(project.getId()));
+ return inManyValues(builder, attribute, inBuildIds, cacheManager.getBuildIdsByProject(project.getId()));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/InErrorCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/InErrorCriteria.java
index 9bd148979d..d5b432b6ba 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/InErrorCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/InErrorCriteria.java
@@ -1,13 +1,14 @@
package io.onedev.server.search.entity.build;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class InErrorCriteria extends EntityCriteria<Build> {
@@ -15,9 +16,9 @@ public class InErrorCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<?> attribute = context.getRoot().get(BuildConstants.ATTR_STATUS);
- return context.getBuilder().equal(attribute, Build.Status.IN_ERROR);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);
+ return builder.equal(attribute, Build.Status.IN_ERROR);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java
index 532d9f2497..8a6547b769 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java
@@ -1,13 +1,14 @@
package io.onedev.server.search.entity.build;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class JobCriteria extends EntityCriteria<Build> {
@@ -21,9 +22,9 @@ public class JobCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<?> attribute = context.getRoot().get(BuildConstants.ATTR_JOB);
- return context.getBuilder().equal(attribute, value);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = root.get(BuildConstants.ATTR_JOB);
+ return builder.equal(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java
index ee86a7cf33..d210028d49 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java
@@ -1,13 +1,14 @@
package io.onedev.server.search.entity.build;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
import io.onedev.server.util.IssueConstants;
@@ -25,14 +26,14 @@ public class NumberCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<Long> attribute = context.getRoot().get(IssueConstants.ATTR_NUMBER);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<Long> attribute = root.get(IssueConstants.ATTR_NUMBER);
if (operator == BuildQueryLexer.Is)
- return context.getBuilder().equal(attribute, value);
+ return builder.equal(attribute, value);
else if (operator == BuildQueryLexer.IsGreaterThan)
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
else
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java
index b5327c10be..e0ded73d92 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java
@@ -1,16 +1,19 @@
package io.onedev.server.search.entity.build;
-import java.util.Objects;
+import java.util.List;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.BuildParam;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.BuildConstants;
public class ParamCriteria extends EntityCriteria<Build> {
@@ -26,15 +29,20 @@ public class ParamCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- From<?, ?> join = context.getJoin(name);
- return context.getBuilder().equal(join.get(BuildParam.ATTR_VALUE), value);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ From<?, ?> join = root.join(BuildConstants.ATTR_PARAMS, JoinType.LEFT);
+ return builder.and(
+ builder.equal(join.get(BuildParam.ATTR_NAME), name),
+ builder.equal(join.get(BuildParam.ATTR_VALUE), value));
}
@Override
public boolean matches(Build build, User user) {
- Object fieldValue = build.getParamMap().get(name);
- return Objects.equals(fieldValue, value);
+ List<String> paramValues = build.getParamMap().get(name);
+ if (paramValues == null || paramValues.isEmpty())
+ return value == null;
+ else
+ return paramValues.contains(value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/QueueingCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/QueueingCriteria.java
index 43f8b10102..5ced3725b5 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/QueueingCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/QueueingCriteria.java
@@ -1,13 +1,14 @@
package io.onedev.server.search.entity.build;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class QueueingCriteria extends EntityCriteria<Build> {
@@ -15,9 +16,9 @@ public class QueueingCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<?> attribute = context.getRoot().get(BuildConstants.ATTR_STATUS);
- return context.getBuilder().equal(attribute, Build.Status.QUEUEING);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);
+ return builder.equal(attribute, Build.Status.QUEUEING);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/QueueingDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/QueueingDateCriteria.java
index 59671abb5a..14fc96aa3c 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/QueueingDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/QueueingDateCriteria.java
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.build;
import java.util.Date;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class QueueingDateCriteria extends EntityCriteria<Build> {
@@ -29,12 +30,12 @@ public class QueueingDateCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<Date> attribute = context.getRoot().get(BuildConstants.ATTR_QUEUEING_DATE);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<Date> attribute = root.get(BuildConstants.ATTR_QUEUEING_DATE);
if (operator == BuildQueryLexer.IsBefore)
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
else
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java
index efbe987400..8e749e5518 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java
@@ -1,13 +1,14 @@
package io.onedev.server.search.entity.build;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class RunningCriteria extends EntityCriteria<Build> {
@@ -15,9 +16,9 @@ public class RunningCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<?> attribute = context.getRoot().get(BuildConstants.ATTR_STATUS);
- return context.getBuilder().equal(attribute, Build.Status.RUNNING);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);
+ return builder.equal(attribute, Build.Status.RUNNING);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java
index 5e3b0e1c08..9776f7e5d1 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.build;
import java.util.Date;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class RunningDateCriteria extends EntityCriteria<Build> {
@@ -29,12 +30,12 @@ public class RunningDateCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<Date> attribute = context.getRoot().get(BuildConstants.ATTR_RUNNING_DATE);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<Date> attribute = root.get(BuildConstants.ATTR_RUNNING_DATE);
if (operator == BuildQueryLexer.IsBefore)
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
else
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java
index dfd1f80308..72d54d9f79 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.build;
import java.util.Date;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class SubmitDateCriteria extends EntityCriteria<Build> {
@@ -29,12 +30,12 @@ public class SubmitDateCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<Date> attribute = context.getRoot().get(BuildConstants.ATTR_SUBMIT_DATE);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<Date> attribute = root.get(BuildConstants.ATTR_SUBMIT_DATE);
if (operator == BuildQueryLexer.IsBefore)
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
else
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java
index 3d822bc28c..76ab545c72 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.build;
import java.util.Objects;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class SubmittedByCriteria extends EntityCriteria<Build> {
@@ -26,9 +27,9 @@ public class SubmittedByCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<User> attribute = context.getRoot().get(BuildConstants.ATTR_SUBMITTER);
- return context.getBuilder().equal(attribute, value);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<User> attribute = root.get(BuildConstants.ATTR_SUBMITTER);
+ return builder.equal(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
index a8da20dc1b..43d18dcfae 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.build;
import java.util.Objects;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class SubmittedByMeCriteria extends EntityCriteria<Build> {
@@ -17,9 +18,9 @@ public class SubmittedByMeCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<User> attribute = context.getRoot().get(BuildConstants.ATTR_SUBMITTER);
- return context.getBuilder().equal(attribute, user);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<User> attribute = root.get(BuildConstants.ATTR_SUBMITTER);
+ return builder.equal(attribute, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java
index 4e05963f60..10a195ab71 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java
@@ -1,13 +1,14 @@
package io.onedev.server.search.entity.build;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class SuccessfulCriteria extends EntityCriteria<Build> {
@@ -15,9 +16,9 @@ public class SuccessfulCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<?> attribute = context.getRoot().get(BuildConstants.ATTR_STATUS);
- return context.getBuilder().equal(attribute, Build.Status.SUCCESSFUL);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);
+ return builder.equal(attribute, Build.Status.SUCCESSFUL);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java
index 9a623f31d1..f094e9b659 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java
@@ -1,13 +1,14 @@
package io.onedev.server.search.entity.build;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class TimedOutCriteria extends EntityCriteria<Build> {
@@ -15,9 +16,9 @@ public class TimedOutCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<?> attribute = context.getRoot().get(BuildConstants.ATTR_STATUS);
- return context.getBuilder().equal(attribute, Build.Status.TIMED_OUT);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);
+ return builder.equal(attribute, Build.Status.TIMED_OUT);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java
index 5db89007ad..cb01abf799 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java
@@ -1,13 +1,14 @@
package io.onedev.server.search.entity.build;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class VersionCriteria extends EntityCriteria<Build> {
@@ -21,10 +22,10 @@ public class VersionCriteria extends EntityCriteria<Build> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<String> attribute = context.getRoot().get(BuildConstants.ATTR_VERSION);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<String> attribute = root.get(BuildConstants.ATTR_VERSION);
String normalized = value.toLowerCase().replace("*", "%");
- return context.getBuilder().like(context.getBuilder().lower(attribute), normalized);
+ return builder.like(builder.lower(attribute), normalized);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java
index 82192e76e4..62962095a0 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java
@@ -1,13 +1,14 @@
package io.onedev.server.search.entity.build;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.BuildConstants;
public class WaitingCriteria extends EntityCriteria<Build> {
@@ -15,9 +16,9 @@ public class WaitingCriteria extends EntityCriteria<Build> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
- Path<?> attribute = context.getRoot().get(BuildConstants.ATTR_STATUS);
- return context.getBuilder().equal(attribute, Build.Status.WAITING);
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);
+ return builder.equal(attribute, Build.Status.WAITING);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQueryBuildContext.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQueryBuildContext.java
deleted file mode 100644
index 9190286721..0000000000
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQueryBuildContext.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.onedev.server.search.entity.codecomment;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Root;
-
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.search.entity.QueryBuildContext;
-
-public class CodeCommentQueryBuildContext extends QueryBuildContext<CodeComment> {
-
- public CodeCommentQueryBuildContext(Root<CodeComment> root, CriteriaBuilder builder) {
- super(root, builder);
- }
-
- @Override
- public Join<?, ?> newJoin(String joinName) {
- return getRoot().join(joinName, JoinType.LEFT);
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
index bd333ff823..7b3d9662e2 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
@@ -1,14 +1,14 @@
package io.onedev.server.search.entity.codecomment;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
-import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
import io.onedev.server.util.CodeCommentConstants;
public class ContentCriteria extends EntityCriteria<CodeComment> {
@@ -22,9 +22,9 @@ public class ContentCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
- Path<String> attribute = context.getRoot().get(CodeCommentConstants.ATTR_CONTENT);
- return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
+ public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {
+ Path<String> attribute = root.get(CodeCommentConstants.ATTR_CONTENT);
+ return builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
index ab3349ba75..23f1d1f3d1 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
@@ -2,16 +2,16 @@ package io.onedev.server.search.entity.codecomment;
import java.util.Date;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
-import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
-import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.CodeCommentConstants;
public class CreateDateCriteria extends EntityCriteria<CodeComment> {
@@ -30,12 +30,12 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
- Path<Date> attribute = context.getRoot().get(CodeCommentConstants.ATTR_CREATE_DATE);
+ public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {
+ Path<Date> attribute = root.get(CodeCommentConstants.ATTR_CREATE_DATE);
if (operator == CodeCommentQueryLexer.IsBefore)
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
else
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java
index 2be8dd5875..7424f97aba 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java
@@ -2,16 +2,16 @@ package io.onedev.server.search.entity.codecomment;
import java.util.Objects;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
-import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
-import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.CodeCommentConstants;
public class CreatedByCriteria extends EntityCriteria<CodeComment> {
@@ -24,9 +24,9 @@ public class CreatedByCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
- Path<User> attribute = context.getRoot().get(CodeCommentConstants.ATTR_USER);
- return context.getBuilder().equal(attribute, value);
+ public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {
+ Path<User> attribute = root.get(CodeCommentConstants.ATTR_USER);
+ return builder.equal(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
index c71c9d79ac..daeff0e324 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.codecomment;
import java.util.Objects;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.CodeCommentConstants;
public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {
@@ -17,9 +18,9 @@ public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
- Path<?> attribute = context.getRoot().get(CodeCommentConstants.ATTR_USER);
- return context.getBuilder().equal(attribute, user);
+ public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = root.get(CodeCommentConstants.ATTR_USER);
+ return builder.equal(attribute, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java
index 2fb647c593..4aa6f4c3b2 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java
@@ -1,17 +1,17 @@
package io.onedev.server.search.entity.codecomment;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.ObjectId;
-import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
-import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.CodeCommentConstants;
public class OnCommitCriteria extends EntityCriteria<CodeComment> {
@@ -24,9 +24,9 @@ public class OnCommitCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
- Path<?> attribute = CodeCommentQuery.getPath(context.getRoot(), CodeCommentConstants.ATTR_COMMIT);
- return context.getBuilder().equal(attribute, value.name());
+ public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = CodeCommentQuery.getPath(root, CodeCommentConstants.ATTR_COMMIT);
+ return builder.equal(attribute, value.name());
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
index e3ca356036..bc8d3e3415 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
@@ -1,16 +1,16 @@
package io.onedev.server.search.entity.codecomment;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
-import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
-import io.onedev.server.util.CodeCommentConstants;
import io.onedev.commons.utils.stringmatch.WildcardUtils;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.CodeCommentConstants;
public class PathCriteria extends EntityCriteria<CodeComment> {
@@ -23,12 +23,12 @@ public class PathCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
- Path<String> attribute = CodeCommentQuery.getPath(context.getRoot(), CodeCommentConstants.ATTR_PATH);
+ public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {
+ Path<String> attribute = CodeCommentQuery.getPath(root, CodeCommentConstants.ATTR_PATH);
String normalized = value.toLowerCase().replace('*', '%');
if (normalized.endsWith("/"))
normalized += "%";
- return context.getBuilder().like(context.getBuilder().lower(attribute), normalized);
+ return builder.like(builder.lower(attribute), normalized);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java
index 87ac06d4fa..2c3bbbae52 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java
@@ -1,15 +1,15 @@
package io.onedev.server.search.entity.codecomment;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
-import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
-import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.CodeCommentConstants;
public class ReplyCountCriteria extends EntityCriteria<CodeComment> {
@@ -25,14 +25,14 @@ public class ReplyCountCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
- Path<Integer> attribute = context.getRoot().get(CodeCommentConstants.ATTR_REPLY_COUNT);
+ public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {
+ Path<Integer> attribute = root.get(CodeCommentConstants.ATTR_REPLY_COUNT);
if (operator == CodeCommentQueryLexer.Is)
- return context.getBuilder().equal(attribute, value);
+ return builder.equal(attribute, value);
else if (operator == CodeCommentQueryLexer.IsLessThan)
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
else
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
index fbba90ddb4..fcf86db67b 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
@@ -1,17 +1,18 @@
package io.onedev.server.search.entity.codecomment;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
-import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
-import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.CodeCommentConstants;
public class ReplyCriteria extends EntityCriteria<CodeComment> {
@@ -24,10 +25,10 @@ public class ReplyCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
- From<?, ?> join = context.getJoin(CodeCommentConstants.ATTR_REPLIES);
+ public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {
+ From<?, ?> join = root.join(CodeCommentConstants.ATTR_REPLIES, JoinType.LEFT);
Path<String> attribute = join.get(CodeCommentReply.ATTR_CONTENT);
- return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
+ return builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
index c2cb369ca2..fb6518d6d8 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
@@ -2,16 +2,16 @@ package io.onedev.server.search.entity.codecomment;
import java.util.Date;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
-import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
-import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.CodeCommentConstants;
public class UpdateDateCriteria extends EntityCriteria<CodeComment> {
@@ -30,12 +30,12 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context, User user) {
- Path<Date> attribute = CodeCommentQuery.getPath(context.getRoot(), CodeCommentConstants.ATTR_UPDATE_DATE);
+ public Predicate getPredicate(Project project, Root<CodeComment> root, CriteriaBuilder builder, User user) {
+ Path<Date> attribute = CodeCommentQuery.getPath(root, CodeCommentConstants.ATTR_UPDATE_DATE);
if (operator == CodeCommentQueryLexer.IsBefore)
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
else
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java
index 7054f52f16..5d0606386a 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java
@@ -7,14 +7,15 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.AndCriteriaHelper;
import io.onedev.server.search.entity.ParensAware;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
@@ -29,8 +30,8 @@ public class AndCriteria extends IssueCriteria implements ParensAware {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- return new AndCriteriaHelper<Issue>(criterias).getPredicate(project, context, user);
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ return new AndCriteriaHelper<Issue>(criterias).getPredicate(project, root, builder, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
index abf5d8611c..184ce2e5a8 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
@@ -3,14 +3,14 @@ package io.onedev.server.search.entity.issue;
import java.util.Objects;
import java.util.Set;
-import javax.persistence.criteria.Path;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueFieldEntity;
+import io.onedev.server.model.IssueField;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
public class BooleanFieldCriteria extends FieldCriteria {
@@ -24,9 +24,8 @@ public class BooleanFieldCriteria extends FieldCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.ATTR_VALUE);
- return context.getBuilder().equal(attribute, String.valueOf(value));
+ public Predicate getValuePredicate(Project project, Join<?, ?> field, CriteriaBuilder builder, User user) {
+ return builder.equal(field.get(IssueField.ATTR_VALUE), String.valueOf(value));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
index 3213927fff..7998339b82 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
@@ -7,17 +7,17 @@ import java.util.List;
import java.util.Objects;
import java.util.Set;
-import javax.persistence.criteria.From;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
import javax.persistence.criteria.Predicate;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueFieldEntity;
+import io.onedev.server.model.IssueField;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
@@ -43,17 +43,16 @@ public class ChoiceFieldCriteria extends FieldCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- From<?, ?> join = context.getJoin(getFieldName());
+ protected Predicate getValuePredicate(Project project, Join<?, ?> field, CriteriaBuilder builder, User user) {
if (allowMultiple) {
- return context.getBuilder().equal(join.get(IssueFieldEntity.ATTR_VALUE), value);
+ return builder.equal(field.get(IssueField.ATTR_VALUE), String.valueOf(value));
} else {
- if (operator == IssueQueryLexer.Is)
- return context.getBuilder().equal(join.get(IssueFieldEntity.ATTR_VALUE), value);
- else if (operator == IssueQueryLexer.IsGreaterThan)
- return context.getBuilder().greaterThan(join.get(IssueFieldEntity.ATTR_ORDINAL), ordinal);
+ if (operator == IssueQueryLexer.Is)
+ return builder.equal(field.get(IssueField.ATTR_VALUE), String.valueOf(value));
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return builder.greaterThan(field.get(IssueField.ATTR_ORDINAL), ordinal);
else
- return context.getBuilder().lessThan(join.get(IssueFieldEntity.ATTR_ORDINAL), ordinal);
+ return builder.lessThan(field.get(IssueField.ATTR_ORDINAL), ordinal);
}
}
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.java
index e87ab17fc5..1140a7ff9c 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.java
@@ -1,6 +1,8 @@
package io.onedev.server.search.entity.issue;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
@@ -8,7 +10,6 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.StateSpec;
-import io.onedev.server.search.entity.QueryBuildContext;
public class ClosedCriteria extends IssueCriteria {
@@ -19,8 +20,8 @@ public class ClosedCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- return getCriteria(project).getPredicate(project, context, user);
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ return getCriteria(project).getPredicate(project, root, builder, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java
index 4b1b2e2dc6..56b0719a36 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java
@@ -1,12 +1,13 @@
package io.onedev.server.search.entity.issue;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.IssueConstants;
public class CommentCountCriteria extends IssueCriteria {
@@ -23,14 +24,14 @@ public class CommentCountCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<Integer> attribute = context.getRoot().get(IssueConstants.ATTR_COMMENT_COUNT);
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ Path<Integer> attribute = root.get(IssueConstants.ATTR_COMMENT_COUNT);
if (operator == IssueQueryLexer.Is)
- return context.getBuilder().equal(attribute, value);
+ return builder.equal(attribute, value);
else if (operator == IssueQueryLexer.IsGreaterThan)
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
else
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
index 1966d2d67b..67f52be51a 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
@@ -1,14 +1,16 @@
package io.onedev.server.search.entity.issue;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.IssueConstants;
public class CommentCriteria extends IssueCriteria {
@@ -22,10 +24,10 @@ public class CommentCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- From<?, ?> join = context.getJoin(IssueConstants.FIELD_COMMENT);
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ From<?, ?> join = root.join(IssueConstants.ATTR_COMMENTS, JoinType.LEFT);
Path<String> attribute = join.get(IssueComment.PATH_CONTENT);
- return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
+ return builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
index 02d6957b17..f844a25b36 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
@@ -2,14 +2,14 @@ package io.onedev.server.search.entity.issue;
import java.util.Date;
-import javax.persistence.criteria.From;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueFieldEntity;
+import io.onedev.server.model.IssueField;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
public class DateFieldCriteria extends FieldCriteria {
@@ -29,12 +29,11 @@ public class DateFieldCriteria extends FieldCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- From<?, ?> join = context.getJoin(getFieldName());
+ protected Predicate getValuePredicate(Project project, Join<?, ?> field, CriteriaBuilder builder, User user) {
if (operator == IssueQueryLexer.IsBefore)
- return context.getBuilder().lessThan(join.get(IssueFieldEntity.ATTR_ORDINAL), value.getTime());
+ return builder.lessThan(field.get(IssueField.ATTR_ORDINAL), value.getTime());
else
- return context.getBuilder().greaterThan(join.get(IssueFieldEntity.ATTR_ORDINAL), value.getTime());
+ return builder.greaterThan(field.get(IssueField.ATTR_ORDINAL), value.getTime());
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
index 8d125d4963..7b51db687f 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
@@ -1,13 +1,14 @@
package io.onedev.server.search.entity.issue;
import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.IssueConstants;
public class DescriptionCriteria extends IssueCriteria {
@@ -21,12 +22,12 @@ public class DescriptionCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Expression<String> attribute = context.getRoot().get(IssueConstants.ATTR_DESCRIPTION);
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ Expression<String> attribute = root.get(IssueConstants.ATTR_DESCRIPTION);
if (value != null)
- return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
+ return builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");
else
- return context.getBuilder().isNull(attribute);
+ return builder.isNull(attribute);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java
index 38d0c1b919..d0060957b7 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java
@@ -4,8 +4,18 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueField;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.util.IssueConstants;
@@ -23,6 +33,15 @@ public abstract class FieldCriteria extends IssueCriteria {
return fieldName;
}
+ @Override
+ public final Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ Join<?, ?> join = root.join(IssueConstants.ATTR_FIELDS, JoinType.LEFT);
+ Predicate namePredicate = builder.equal(join.get(IssueField.ATTR_NAME), getFieldName());
+ return builder.and(namePredicate, getValuePredicate(project, join, builder, user));
+ }
+
+ protected abstract Predicate getValuePredicate(Project project, Join<?, ?> field, CriteriaBuilder builder, User user);
+
@Override
public Collection<String> getUndefinedFields() {
Set<String> undefinedFields = new HashSet<>();
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
index 26f525152e..b4a581031f 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
@@ -3,14 +3,15 @@ package io.onedev.server.search.entity.issue;
import java.util.Objects;
import java.util.Set;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueFieldEntity;
+import io.onedev.server.model.IssueField;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.security.SecurityUtils;
public class FieldOperatorCriteria extends FieldCriteria {
@@ -25,12 +26,12 @@ public class FieldOperatorCriteria extends FieldCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<?> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.ATTR_VALUE);
+ protected Predicate getValuePredicate(Project project, Join<?, ?> field, CriteriaBuilder builder, User user) {
+ Path<?> attribute = field.get(IssueField.ATTR_VALUE);
if (operator == IssueQueryLexer.IsEmpty)
- return context.getBuilder().isNull(attribute);
+ return builder.isNull(attribute);
else
- return context.getBuilder().equal(attribute, user.getName());
+ return builder.equal(attribute, user.getName());
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
index 1e5355a003..f98827f488 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
@@ -8,8 +8,10 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
@@ -21,7 +23,6 @@ import io.onedev.server.cache.CacheManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.IssueUtils;
@@ -52,7 +53,7 @@ public class FixedBetweenCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
Set<Long> fixedIssueNumbers = new HashSet<>();
Repository repository = project.getRepository();
@@ -67,14 +68,14 @@ public class FixedBetweenCriteria extends IssueCriteria {
throw new RuntimeException(e);
}
- Path<Long> attribute = context.getRoot().get(IssueConstants.ATTR_NUMBER);
+ Path<Long> attribute = root.get(IssueConstants.ATTR_NUMBER);
if (fixedIssueNumbers.size() > IN_CLAUSE_LIMIT) {
Collection<Long> allIssueNumbers = OneDev.getInstance(CacheManager.class).getIssueNumbers(project.getId());
- return inManyValues(context.getBuilder(), attribute, fixedIssueNumbers, allIssueNumbers);
+ return inManyValues(builder, attribute, fixedIssueNumbers, allIssueNumbers);
} else if (!fixedIssueNumbers.isEmpty()) {
- return context.getRoot().get(IssueConstants.ATTR_NUMBER).in(fixedIssueNumbers);
+ return root.get(IssueConstants.ATTR_NUMBER).in(fixedIssueNumbers);
} else {
- return context.getBuilder().disjunction();
+ return builder.disjunction();
}
}
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java
index 4f17069e37..5867ada48f 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.issue;
import java.util.Collection;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.IssueConstants;
public class FixedInCriteria extends IssueCriteria {
@@ -22,12 +23,12 @@ public class FixedInCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
Collection<Long> fixedIssueNumbers = build.getFixedIssueNumbers();
if (fixedIssueNumbers != null && !fixedIssueNumbers.isEmpty())
- return context.getRoot().get(IssueConstants.ATTR_NUMBER).in(fixedIssueNumbers);
+ return root.get(IssueConstants.ATTR_NUMBER).in(fixedIssueNumbers);
else
- return context.getBuilder().disjunction();
+ return builder.disjunction();
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java
index 1db7265e79..9ad3354a25 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java
@@ -6,13 +6,14 @@ import java.util.List;
import java.util.Set;
import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
@@ -20,7 +21,7 @@ public abstract class IssueCriteria extends EntityCriteria<Issue> {
private static final long serialVersionUID = 1L;
- public abstract Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user);
+ public abstract Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user);
public final void fill(Issue issue) {
fill(issue, new HashSet<>());
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.java
deleted file mode 100644
index b7adb27693..0000000000
--- a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.onedev.server.search.entity.issue;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Root;
-
-import io.onedev.server.model.Issue;
-import io.onedev.server.search.entity.QueryBuildContext;
-import io.onedev.server.util.IssueConstants;
-import io.onedev.server.model.IssueFieldEntity;
-
-public class IssueQueryBuildContext extends QueryBuildContext<Issue> {
-
- public IssueQueryBuildContext(Root<Issue> root, CriteriaBuilder builder) {
- super(root, builder);
- }
-
- @Override
- public Join<?, ?> newJoin(String joinName) {
- switch (joinName) {
- case IssueConstants.FIELD_COMMENT:
- return getRoot().join(IssueConstants.ATTR_COMMENTS, JoinType.LEFT);
- case IssueConstants.FIELD_MILESTONE:
- return getRoot().join(IssueConstants.ATTR_MILESTONE, JoinType.LEFT);
- default:
- Join<Issue, ?> join = getRoot().join(IssueConstants.ATTR_FIELD_ENTITIES, JoinType.LEFT);
- join.on(getBuilder().equal(join.get(IssueFieldEntity.ATTR_NAME), joinName));
- return join;
- }
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
index a344c4b889..cd5c424a43 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
@@ -3,14 +3,16 @@ package io.onedev.server.search.entity.issue;
import java.util.Set;
import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.IssueConstants;
public class MilestoneCriteria extends IssueCriteria {
@@ -28,12 +30,12 @@ public class MilestoneCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<?> attribute = context.getJoin(IssueConstants.FIELD_MILESTONE).get(Milestone.FIELD_ATTR_NAME);
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = root.join(IssueConstants.ATTR_MILESTONE, JoinType.LEFT).get(Milestone.FIELD_ATTR_NAME);
if (value != null)
- return context.getBuilder().equal(attribute, value);
+ return builder.equal(attribute, value);
else
- return context.getBuilder().isNull(attribute);
+ return builder.isNull(attribute);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java
index 81e9f63c25..fd3fc1928d 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java
@@ -3,7 +3,9 @@ package io.onedev.server.search.entity.issue;
import java.util.ArrayList;
import java.util.List;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
@@ -11,7 +13,6 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
@@ -38,8 +39,8 @@ public class MineCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- return getCriteria(project, user).getPredicate(project, context, user);
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ return getCriteria(project, user).getPredicate(project, root, builder, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java
index f174b9c3cb..38ec72a052 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.issue;
import java.util.Collection;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.NotCriteriaHelper;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
@@ -23,8 +24,8 @@ public class NotCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- return new NotCriteriaHelper<Issue>(criteria).getPredicate(project, context, user);
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ return new NotCriteriaHelper<Issue>(criteria).getPredicate(project, root, builder, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java
index 4f343a100b..18f81d7d5e 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java
@@ -1,12 +1,13 @@
package io.onedev.server.search.entity.issue;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.IssueConstants;
public class NumberCriteria extends IssueCriteria {
@@ -23,14 +24,14 @@ public class NumberCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<Long> attribute = context.getRoot().get(IssueConstants.ATTR_NUMBER);
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ Path<Long> attribute = root.get(IssueConstants.ATTR_NUMBER);
if (operator == IssueQueryLexer.Is)
- return context.getBuilder().equal(attribute, value);
+ return builder.equal(attribute, value);
else if (operator == IssueQueryLexer.IsGreaterThan)
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
else
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java
index 681b3fc1f9..a12a58e800 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java
@@ -3,14 +3,15 @@ package io.onedev.server.search.entity.issue;
import java.util.Objects;
import java.util.Set;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueFieldEntity;
+import io.onedev.server.model.IssueField;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
public class NumericFieldCriteria extends FieldCriteria {
@@ -27,14 +28,14 @@ public class NumericFieldCriteria extends FieldCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<Integer> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.ATTR_ORDINAL);
+ protected Predicate getValuePredicate(Project project, Join<?, ?> field, CriteriaBuilder builder, User user) {
+ Path<Integer> attribute = field.get(IssueField.ATTR_ORDINAL);
if (operator == IssueQueryLexer.Is)
- return context.getBuilder().equal(attribute, value);
+ return builder.equal(attribute, value);
else if (operator == IssueQueryLexer.IsGreaterThan)
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
else
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java
index 90c5770a03..dc4b5bc237 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java
@@ -7,14 +7,15 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.OrCriteriaHelper;
import io.onedev.server.search.entity.ParensAware;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
@@ -29,8 +30,8 @@ public class OrCriteria extends IssueCriteria implements ParensAware {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- return new OrCriteriaHelper<Issue>(criterias).getPredicate(project, context, user);
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ return new OrCriteriaHelper<Issue>(criterias).getPredicate(project, root, builder, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.java
index 0bef2d352a..1d8c4ed038 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.java
@@ -1,6 +1,8 @@
package io.onedev.server.search.entity.issue;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
@@ -8,7 +10,6 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.StateSpec;
-import io.onedev.server.search.entity.QueryBuildContext;
public class OutstandingCriteria extends IssueCriteria {
@@ -19,8 +20,8 @@ public class OutstandingCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- return getCriteria(project).getPredicate(project, context, user);
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ return getCriteria(project).getPredicate(project, root, builder, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.java
index 02d6266d04..07c379ae57 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.java
@@ -2,14 +2,14 @@ package io.onedev.server.search.entity.issue;
import java.util.Objects;
-import javax.persistence.criteria.Path;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueFieldEntity;
+import io.onedev.server.model.IssueField;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
public class ReferenceableFieldCriteria extends FieldCriteria {
@@ -23,9 +23,8 @@ public class ReferenceableFieldCriteria extends FieldCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<Long> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.ATTR_ORDINAL);
- return context.getBuilder().equal(attribute, value);
+ protected Predicate getValuePredicate(Project project, Join<?, ?> field, CriteriaBuilder builder, User user) {
+ return builder.equal(field.get(IssueField.ATTR_ORDINAL), value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
index 61f2f8e0e2..ea52e61697 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
@@ -5,15 +5,16 @@ import java.util.Collection;
import java.util.List;
import java.util.Set;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.IssueConstants;
public class StateCriteria extends IssueCriteria {
@@ -27,9 +28,9 @@ public class StateCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<?> attribute = context.getRoot().get(IssueConstants.ATTR_STATE);
- return context.getBuilder().equal(attribute, value);
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = root.get(IssueConstants.ATTR_STATE);
+ return builder.equal(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java
index f2aee1eb28..caf20d366e 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.issue;
import java.util.Set;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueFieldEntity;
+import io.onedev.server.model.IssueField;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
public class StringFieldCriteria extends FieldCriteria {
@@ -30,12 +31,12 @@ public class StringFieldCriteria extends FieldCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.ATTR_VALUE);
+ protected Predicate getValuePredicate(Project project, Join<?, ?> field, CriteriaBuilder builder, User user) {
+ Path<String> attribute = field.get(IssueField.ATTR_VALUE);
if (operator == IssueQueryLexer.Is)
- return context.getBuilder().equal(context.getBuilder().lower(attribute), value.toLowerCase());
+ return builder.equal(builder.lower(attribute), value.toLowerCase());
else
- return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
+ return builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
index 38734a99b8..75583fabed 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.issue;
import java.util.Date;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.IssueConstants;
public class SubmitDateCriteria extends IssueCriteria {
@@ -28,12 +29,12 @@ public class SubmitDateCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<Date> attribute = context.getRoot().get(IssueConstants.ATTR_SUBMIT_DATE);
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ Path<Date> attribute = root.get(IssueConstants.ATTR_SUBMIT_DATE);
if (operator == IssueQueryLexer.IsBefore)
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
else
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
index d95be1838a..f063eae7e5 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.issue;
import java.util.Objects;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.IssueConstants;
public class SubmittedByCriteria extends IssueCriteria {
@@ -25,9 +26,9 @@ public class SubmittedByCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<User> attribute = context.getRoot().get(IssueConstants.ATTR_SUBMITTER);
- return context.getBuilder().equal(attribute, value);
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ Path<User> attribute = root.get(IssueConstants.ATTR_SUBMITTER);
+ return builder.equal(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
index e7a1184cd5..fbf2a2a1b4 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.issue;
import java.util.Objects;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.IssueConstants;
public class SubmittedByMeCriteria extends IssueCriteria {
@@ -16,9 +17,9 @@ public class SubmittedByMeCriteria extends IssueCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<User> attribute = context.getRoot().get(IssueConstants.ATTR_SUBMITTER);
- return context.getBuilder().equal(attribute, user);
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ Path<User> attribute = root.get(IssueConstants.ATTR_SUBMITTER);
+ return builder.equal(attribute, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
index 3c45e865c7..cb1d182bf1 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
@@ -1,12 +1,13 @@
package io.onedev.server.search.entity.issue;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.IssueConstants;
public class TitleCriteria extends IssueCriteria {
@@ -20,9 +21,9 @@ public class TitleCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<String> attribute = context.getRoot().get(IssueConstants.ATTR_TITLE);
- return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ Path<String> attribute = root.get(IssueConstants.ATTR_TITLE);
+ return builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
index d476985790..e0d038ab22 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.issue;
import java.util.Date;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.IssueConstants;
public class UpdateDateCriteria extends IssueCriteria {
@@ -28,12 +29,12 @@ public class UpdateDateCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<Date> attribute = IssueQuery.getPath(context.getRoot(), IssueConstants.ATTR_UPDATE_DATE);
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ Path<Date> attribute = IssueQuery.getPath(root, IssueConstants.ATTR_UPDATE_DATE);
if (operator == IssueQueryLexer.IsBefore)
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
else
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java
index 3d8609f6d4..e7d406b972 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java
@@ -1,12 +1,13 @@
package io.onedev.server.search.entity.issue;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.IssueConstants;
public class VoteCountCriteria extends IssueCriteria {
@@ -23,14 +24,14 @@ public class VoteCountCriteria extends IssueCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<Integer> attribute = context.getRoot().get(IssueConstants.ATTR_VOTE_COUNT);
+ public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {
+ Path<Integer> attribute = root.get(IssueConstants.ATTR_VOTE_COUNT);
if (operator == IssueQueryLexer.Is)
- return context.getBuilder().equal(attribute, value);
+ return builder.equal(attribute, value);
else if (operator == IssueQueryLexer.IsGreaterThan)
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
else
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.java
index 3009f0840c..ac60e1d276 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.java
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.List;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.AndCriteriaHelper;
import io.onedev.server.search.entity.ParensAware;
-import io.onedev.server.search.entity.QueryBuildContext;
public class AndCriteria extends PullRequestCriteria implements ParensAware {
@@ -22,8 +23,8 @@ public class AndCriteria extends PullRequestCriteria implements ParensAware {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- return new AndCriteriaHelper<PullRequest>(criterias).getPredicate(project, context, user);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ return new AndCriteriaHelper<PullRequest>(criterias).getPredicate(project, root, builder, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
index 50b9f7e18f..376903680a 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityQuery;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class ApprovedByCriteria extends PullRequestCriteria {
@@ -23,15 +25,15 @@ public class ApprovedByCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
- return context.getBuilder().and(
- context.getBuilder().equal(userPath, value),
- context.getBuilder().isNull(excludeDatePath),
- context.getBuilder().equal(approvedPath, true));
+ return builder.and(
+ builder.equal(userPath, value),
+ builder.isNull(excludeDatePath),
+ builder.equal(approvedPath, true));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
index e914e9e692..bfb1682102 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityQuery;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class ApprovedByMeCriteria extends PullRequestCriteria {
@@ -17,15 +19,15 @@ public class ApprovedByMeCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
- return context.getBuilder().and(
- context.getBuilder().equal(userPath, user),
- context.getBuilder().isNull(excludeDatePath),
- context.getBuilder().equal(approvedPath, true));
+ return builder.and(
+ builder.equal(userPath, user),
+ builder.isNull(excludeDatePath),
+ builder.equal(approvedPath, true));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
index 449d931668..efb03cc802 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Date;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class CloseDateCriteria extends PullRequestCriteria {
@@ -28,12 +29,12 @@ public class CloseDateCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- Path<Date> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_CLOSE_DATE);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ Path<Date> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_CLOSE_DATE);
if (operator == PullRequestQueryLexer.IsBefore)
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
else
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
index b7a146dbd6..f36d79248d 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
@@ -1,12 +1,13 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class CommentCountCriteria extends PullRequestCriteria {
@@ -23,14 +24,14 @@ public class CommentCountCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- Path<Long> attribute = context.getRoot().get(PullRequestConstants.ATTR_COMMENT_COUNT);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ Path<Long> attribute = root.get(PullRequestConstants.ATTR_COMMENT_COUNT);
if (operator == PullRequestQueryLexer.Is)
- return context.getBuilder().equal(attribute, value);
+ return builder.equal(attribute, value);
else if (operator == PullRequestQueryLexer.IsGreaterThan)
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
else
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
index bd3b51608b..28c9f83c88 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
@@ -1,8 +1,11 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.CodeCommentRelation;
import io.onedev.server.model.CodeCommentReply;
@@ -10,7 +13,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestComment;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.util.PullRequestConstants;
@@ -25,23 +27,25 @@ public class CommentCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_COMMENTS);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ From<?, ?> join = root.join(PullRequestConstants.ATTR_COMMENTS, JoinType.LEFT);
Path<String> attribute = join.get(PullRequestComment.ATTR_CONTENT);
- Predicate commentPredicate = context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
+ Predicate commentPredicate = builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");
- join = context.getJoin(PullRequestConstants.ATTR_CODE_COMMENT_RELATIONS +
- "." + CodeCommentRelation.ATTR_COMMENT);
+ join = root
+ .join(PullRequestConstants.ATTR_CODE_COMMENT_RELATIONS, JoinType.LEFT)
+ .join(CodeCommentRelation.ATTR_COMMENT, JoinType.LEFT);
attribute = join.get(CodeCommentConstants.ATTR_CONTENT);
- Predicate codeCommentPredicate = context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
+ Predicate codeCommentPredicate = builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");
- join = context.getJoin(PullRequestConstants.ATTR_CODE_COMMENT_RELATIONS +
- "." + CodeCommentRelation.ATTR_COMMENT +
- "." + CodeCommentConstants.ATTR_REPLIES);
+ join = root
+ .join(PullRequestConstants.ATTR_CODE_COMMENT_RELATIONS, JoinType.LEFT)
+ .join(CodeCommentRelation.ATTR_COMMENT, JoinType.LEFT)
+ .join(CodeCommentConstants.ATTR_REPLIES, JoinType.LEFT);
attribute = join.get(CodeCommentReply.ATTR_CONTENT);
- Predicate codeCommentReplyPredicate = context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
+ Predicate codeCommentReplyPredicate = builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");
- return context.getBuilder().or(commentPredicate, codeCommentPredicate, codeCommentReplyPredicate);
+ return builder.or(commentPredicate, codeCommentPredicate, codeCommentReplyPredicate);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
index 61d611582e..47d0928789 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
@@ -1,12 +1,13 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class DescriptionCriteria extends PullRequestCriteria {
@@ -20,9 +21,9 @@ public class DescriptionCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- Path<String> attribute = context.getRoot().get(PullRequestConstants.ATTR_DESCRIPTION);
- return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ Path<String> attribute = root.get(PullRequestConstants.ATTR_DESCRIPTION);
+ return builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java
index 8321865855..442771214d 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Objects;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class DiscardedByCriteria extends PullRequestCriteria {
@@ -22,9 +23,9 @@ public class DiscardedByCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- Path<User> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_CLOSE_USER);
- return context.getBuilder().equal(attribute, value);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ Path<User> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_CLOSE_USER);
+ return builder.equal(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java
index 33d77ae661..9b253c3c18 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Objects;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class DiscardedByMeCriteria extends PullRequestCriteria {
@@ -16,9 +17,9 @@ public class DiscardedByMeCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- Path<User> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_CLOSE_USER);
- return context.getBuilder().equal(attribute, user);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ Path<User> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_CLOSE_USER);
+ return builder.equal(attribute, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java
index c1aa19340c..abe71ce2c0 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java
@@ -1,12 +1,13 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.CloseInfo;
-import io.onedev.server.search.entity.QueryBuildContext;
public class DiscardedCriteria extends PullRequestCriteria {
@@ -17,8 +18,8 @@ public class DiscardedCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- return getCriteria(project).getPredicate(project, context, user);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ return getCriteria(project).getPredicate(project, root, builder, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java
index d658f5c0a9..c96c5e384c 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
+import io.onedev.server.model.BuildRequirement;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.BuildRequirement;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class HasFailedBuildsCriteria extends PullRequestCriteria {
@@ -17,15 +19,17 @@ public class HasFailedBuildsCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_BUILDS + "." + BuildRequirement.ATTR_BUILD);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ From<?, ?> join = root
+ .join(PullRequestConstants.ATTR_BUILDS, JoinType.LEFT)
+ .join(BuildRequirement.ATTR_BUILD, JoinType.LEFT);
Path<?> status = join.get(Build.STATUS);
- return context.getBuilder().or(
- context.getBuilder().equal(status, Build.Status.IN_ERROR),
- context.getBuilder().equal(status, Build.Status.FAILED),
- context.getBuilder().equal(status, Build.Status.CANCELLED),
- context.getBuilder().equal(status, Build.Status.TIMED_OUT));
+ return builder.or(
+ builder.equal(status, Build.Status.IN_ERROR),
+ builder.equal(status, Build.Status.FAILED),
+ builder.equal(status, Build.Status.CANCELLED),
+ builder.equal(status, Build.Status.TIMED_OUT));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java
index e444a97226..491f7238ea 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java
@@ -1,13 +1,14 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.MergePreview;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class HasMergeConflictsCriteria extends PullRequestCriteria {
@@ -15,12 +16,12 @@ public class HasMergeConflictsCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- Path<?> requestHead = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_LAST_MERGE_PREVIEW_REQUEST_HEAD);
- Path<?> merged = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_LAST_MERGE_PREVIEW_MERGED);
- return context.getBuilder().and(
- context.getBuilder().isNotNull(requestHead),
- context.getBuilder().isNull(merged));
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ Path<?> requestHead = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_LAST_MERGE_PREVIEW_REQUEST_HEAD);
+ Path<?> merged = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_LAST_MERGE_PREVIEW_MERGED);
+ return builder.and(
+ builder.isNotNull(requestHead),
+ builder.isNull(merged));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java
index 93b64a2408..d1521dfc84 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Build;
+import io.onedev.server.model.BuildRequirement;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.BuildRequirement;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class HasPendingBuildsCriteria extends PullRequestCriteria {
@@ -17,15 +19,18 @@ public class HasPendingBuildsCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_BUILDS + "." + BuildRequirement.ATTR_BUILD);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ From<?, ?> join = root
+ .join(PullRequestConstants.ATTR_BUILDS, JoinType.LEFT)
+ .join(BuildRequirement.ATTR_BUILD, JoinType.LEFT);
+
Path<?> status = join.get(Build.STATUS);
- return context.getBuilder().or(
- context.getBuilder().isNull(status),
- context.getBuilder().equal(status, Build.Status.RUNNING),
- context.getBuilder().equal(status, Build.Status.QUEUEING),
- context.getBuilder().equal(status, Build.Status.WAITING));
+ return builder.or(
+ builder.isNull(status),
+ builder.equal(status, Build.Status.RUNNING),
+ builder.equal(status, Build.Status.QUEUEING),
+ builder.equal(status, Build.Status.WAITING));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
index 5c63259e47..c8f7cfe208 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityQuery;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class HasPendingReviewsCriteria extends PullRequestCriteria {
@@ -17,15 +19,15 @@ public class HasPendingReviewsCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
- return context.getBuilder().and(
- context.getBuilder().isNotNull(userPath),
- context.getBuilder().isNull(excludeDatePath),
- context.getBuilder().isNull(approvedPath));
+ return builder.and(
+ builder.isNotNull(userPath),
+ builder.isNull(excludeDatePath),
+ builder.isNull(approvedPath));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
index d36cb6be98..44d7ccafd3 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
@@ -2,7 +2,9 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Collection;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.ObjectId;
@@ -11,7 +13,6 @@ import io.onedev.server.cache.CodeCommentRelationInfoManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class IncludesCommitCriteria extends PullRequestCriteria {
@@ -25,12 +26,12 @@ public class IncludesCommitCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
Collection<Long> pullRequestIds = getPullRequestIds(project);
if (!pullRequestIds.isEmpty())
- return context.getRoot().get(PullRequestConstants.ATTR_ID).in(pullRequestIds);
+ return root.get(PullRequestConstants.ATTR_ID).in(pullRequestIds);
else
- return context.getBuilder().disjunction();
+ return builder.disjunction();
}
private Collection<Long> getPullRequestIds(Project project) {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java
index fcf981e3c4..abe79283c6 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java
@@ -3,7 +3,9 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Collection;
import java.util.HashSet;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import org.eclipse.jgit.lib.ObjectId;
@@ -14,7 +16,6 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class IncludesIssueCriteria extends PullRequestCriteria {
@@ -28,12 +29,12 @@ public class IncludesIssueCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
Collection<Long> pullRequestIds = getPullRequestIds(project);
if (!pullRequestIds.isEmpty())
- return context.getRoot().get(PullRequestConstants.ATTR_ID).in(pullRequestIds);
+ return root.get(PullRequestConstants.ATTR_ID).in(pullRequestIds);
else
- return context.getBuilder().disjunction();
+ return builder.disjunction();
}
private Collection<Long> getPullRequestIds(Project project) {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java
index 180bbb99a2..d3af79a145 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java
@@ -1,13 +1,14 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class MergeStrategyCriteria extends PullRequestCriteria {
@@ -21,9 +22,9 @@ public class MergeStrategyCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- Path<?> attribute = context.getRoot().get(PullRequestConstants.ATTR_MERGE_STRATEGY);
- return context.getBuilder().equal(attribute, value);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = root.get(PullRequestConstants.ATTR_MERGE_STRATEGY);
+ return builder.equal(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java
index 06e2a5ce92..a523258af1 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java
@@ -1,12 +1,13 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.CloseInfo;
-import io.onedev.server.search.entity.QueryBuildContext;
public class MergedCriteria extends PullRequestCriteria {
@@ -17,8 +18,8 @@ public class MergedCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- return getCriteria(project).getPredicate(project, context, user);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ return getCriteria(project).getPredicate(project, root, builder, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.java
index fcc6534b7f..53cc8b8ce2 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.java
@@ -1,12 +1,13 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.NotCriteriaHelper;
-import io.onedev.server.search.entity.QueryBuildContext;
public class NotCriteria extends PullRequestCriteria {
@@ -19,8 +20,8 @@ public class NotCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- return new NotCriteriaHelper<PullRequest>(criteria).getPredicate(project, context, user);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ return new NotCriteriaHelper<PullRequest>(criteria).getPredicate(project, root, builder, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java
index 5ba3fa2f7d..682ba98212 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java
@@ -1,12 +1,13 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class NumberCriteria extends PullRequestCriteria {
@@ -23,14 +24,14 @@ public class NumberCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- Path<Long> attribute = context.getRoot().get(PullRequestConstants.ATTR_NUMBER);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ Path<Long> attribute = root.get(PullRequestConstants.ATTR_NUMBER);
if (operator == PullRequestQueryLexer.Is)
- return context.getBuilder().equal(attribute, value);
+ return builder.equal(attribute, value);
else if (operator == PullRequestQueryLexer.IsGreaterThan)
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
else
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
index 6d7d4a941b..371fed708f 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
@@ -1,11 +1,12 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class OpenCriteria extends PullRequestCriteria {
@@ -17,8 +18,8 @@ public class OpenCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- return getCriteria(project).getPredicate(project, context, user);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ return getCriteria(project).getPredicate(project, root, builder, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.java
index c377efaa58..3e6cf942d3 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.java
@@ -2,14 +2,15 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.List;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.OrCriteriaHelper;
import io.onedev.server.search.entity.ParensAware;
-import io.onedev.server.search.entity.QueryBuildContext;
public class OrCriteria extends PullRequestCriteria implements ParensAware {
@@ -22,8 +23,8 @@ public class OrCriteria extends PullRequestCriteria implements ParensAware {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- return new OrCriteriaHelper<PullRequest>(criterias).getPredicate(project, context, user);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ return new OrCriteriaHelper<PullRequest>(criterias).getPredicate(project, root, builder, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQueryBuildContext.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQueryBuildContext.java
deleted file mode 100644
index e03e2f0d5d..0000000000
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQueryBuildContext.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.onedev.server.search.entity.pullrequest;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Root;
-
-import com.google.common.base.Splitter;
-
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.search.entity.QueryBuildContext;
-
-public class PullRequestQueryBuildContext extends QueryBuildContext<PullRequest> {
-
- public PullRequestQueryBuildContext(Root<PullRequest> root, CriteriaBuilder builder) {
- super(root, builder);
- }
-
- @Override
- public From<?, ?> newJoin(String joinName) {
- return joinByAttrs(Splitter.on(".").splitToList(joinName));
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByCriteria.java
index e38636a653..e7c31ef5cc 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityQuery;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class RequestForChangesByCriteria extends PullRequestCriteria {
@@ -23,15 +25,15 @@ public class RequestForChangesByCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
- return context.getBuilder().and(
- context.getBuilder().equal(userPath, value),
- context.getBuilder().isNull(excludeDatePath),
- context.getBuilder().equal(approvedPath, false));
+ return builder.and(
+ builder.equal(userPath, value),
+ builder.isNull(excludeDatePath),
+ builder.equal(approvedPath, false));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByMeCriteria.java
index a200876bf2..b2978984fc 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByMeCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityQuery;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class RequestForChangesByMeCriteria extends PullRequestCriteria {
@@ -17,15 +19,15 @@ public class RequestForChangesByMeCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
- return context.getBuilder().and(
- context.getBuilder().equal(userPath, user),
- context.getBuilder().isNull(excludeDatePath),
- context.getBuilder().equal(approvedPath, false));
+ return builder.and(
+ builder.equal(userPath, user),
+ builder.isNull(excludeDatePath),
+ builder.equal(approvedPath, false));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
index 0fb3f74b77..242533ea3b 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityQuery;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class SomeoneRequestedForChangesCriteria extends PullRequestCriteria {
@@ -17,15 +19,15 @@ public class SomeoneRequestedForChangesCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
- return context.getBuilder().and(
- context.getBuilder().isNotNull(userPath),
- context.getBuilder().isNull(excludeDatePath),
- context.getBuilder().equal(approvedPath, false));
+ return builder.and(
+ builder.isNotNull(userPath),
+ builder.isNull(excludeDatePath),
+ builder.equal(approvedPath, false));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
index c7220857f6..9c9c97048c 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Objects;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class SourceBranchCriteria extends PullRequestCriteria {
@@ -22,9 +23,9 @@ public class SourceBranchCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- Path<User> attribute = context.getRoot().get(PullRequestConstants.ATTR_SOURCE_BRANCH);
- return context.getBuilder().equal(attribute, value);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ Path<User> attribute = root.get(PullRequestConstants.ATTR_SOURCE_BRANCH);
+ return builder.equal(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
index 6c68b8f635..04f64076c5 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Objects;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class SourceProjectCriteria extends PullRequestCriteria {
@@ -22,9 +23,9 @@ public class SourceProjectCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- Path<User> attribute = context.getRoot().get(PullRequestConstants.ATTR_SOURCE_PROJECT);
- return context.getBuilder().equal(attribute, value);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ Path<User> attribute = root.get(PullRequestConstants.ATTR_SOURCE_PROJECT);
+ return builder.equal(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java
index 2b6d91e8ce..dad3c4446f 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java
@@ -1,13 +1,14 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.CloseInfo;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class StatusCriteria extends PullRequestCriteria {
@@ -21,12 +22,12 @@ public class StatusCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- Path<?> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_CLOSE_STATUS);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_CLOSE_STATUS);
if (value.equalsIgnoreCase(PullRequestConstants.STATE_OPEN))
- return context.getBuilder().isNull(attribute);
+ return builder.isNull(attribute);
else
- return context.getBuilder().equal(attribute, CloseInfo.Status.valueOf(value.toUpperCase()));
+ return builder.equal(attribute, CloseInfo.Status.valueOf(value.toUpperCase()));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
index d4203379f5..af4fd0b0cb 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Date;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class SubmitDateCriteria extends PullRequestCriteria {
@@ -28,12 +29,12 @@ public class SubmitDateCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- Path<Date> attribute = context.getRoot().get(PullRequestConstants.ATTR_SUBMIT_DATE);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ Path<Date> attribute = root.get(PullRequestConstants.ATTR_SUBMIT_DATE);
if (operator == PullRequestQueryLexer.IsBefore)
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
else
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
index 3cac0376f6..be2cd499df 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Objects;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class SubmittedByCriteria extends PullRequestCriteria {
@@ -22,9 +23,9 @@ public class SubmittedByCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- Path<User> attribute = context.getRoot().get(PullRequestConstants.ATTR_SUBMITTER);
- return context.getBuilder().equal(attribute, value);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ Path<User> attribute = root.get(PullRequestConstants.ATTR_SUBMITTER);
+ return builder.equal(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
index ebda582007..79d1a0f2ab 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Objects;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class SubmittedByMeCriteria extends PullRequestCriteria {
@@ -16,9 +17,9 @@ public class SubmittedByMeCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- Path<?> attribute = context.getRoot().get(PullRequestConstants.ATTR_SUBMITTER);
- return context.getBuilder().equal(attribute, user);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = root.get(PullRequestConstants.ATTR_SUBMITTER);
+ return builder.equal(attribute, user);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
index 135ee11d40..fe1a2feaa6 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Objects;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class TargetBranchCriteria extends PullRequestCriteria {
@@ -22,9 +23,9 @@ public class TargetBranchCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- Path<User> attribute = context.getRoot().get(PullRequestConstants.ATTR_TARGET_BRANCH);
- return context.getBuilder().equal(attribute, value);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ Path<User> attribute = root.get(PullRequestConstants.ATTR_TARGET_BRANCH);
+ return builder.equal(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
index 3f05659359..c5935592e5 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
@@ -1,12 +1,13 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class TitleCriteria extends PullRequestCriteria {
@@ -20,9 +21,9 @@ public class TitleCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- Path<String> attribute = context.getRoot().get(PullRequestConstants.ATTR_TITLE);
- return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ Path<String> attribute = root.get(PullRequestConstants.ATTR_TITLE);
+ return builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
index 7c85feb0f4..4e517f1255 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityQuery;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class ToBeReviewedByCriteria extends PullRequestCriteria {
@@ -23,15 +25,15 @@ public class ToBeReviewedByCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
- return context.getBuilder().and(
- context.getBuilder().equal(userPath, value),
- context.getBuilder().isNull(excludeDatePath),
- context.getBuilder().isNull(approvedPath));
+ return builder.and(
+ builder.equal(userPath, value),
+ builder.isNull(excludeDatePath),
+ builder.isNull(approvedPath));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
index 807b0555ed..65ecda9041 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
@@ -1,15 +1,17 @@
package io.onedev.server.search.entity.pullrequest;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.From;
+import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityQuery;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class ToBeReviewedByMeCriteria extends PullRequestCriteria {
@@ -17,15 +19,15 @@ public class ToBeReviewedByMeCriteria extends PullRequestCriteria {
private static final long serialVersionUID = 1L;
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);
Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);
Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);
- return context.getBuilder().and(
- context.getBuilder().equal(userPath, user),
- context.getBuilder().isNull(excludeDatePath),
- context.getBuilder().isNull(approvedPath));
+ return builder.and(
+ builder.equal(userPath, user),
+ builder.isNull(excludeDatePath),
+ builder.isNull(approvedPath));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
index 1c39733f66..9c1be6d76a 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
@@ -2,13 +2,14 @@ package io.onedev.server.search.entity.pullrequest;
import java.util.Date;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.PullRequestConstants;
public class UpdateDateCriteria extends PullRequestCriteria {
@@ -28,12 +29,12 @@ public class UpdateDateCriteria extends PullRequestCriteria {
}
@Override
- public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {
- Path<Date> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_UPDATE_DATE);
+ public Predicate getPredicate(Project project, Root<PullRequest> root, CriteriaBuilder builder, User user) {
+ Path<Date> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_UPDATE_DATE);
if (operator == PullRequestQueryLexer.IsBefore)
- return context.getBuilder().lessThan(attribute, value);
+ return builder.lessThan(attribute, value);
else
- return context.getBuilder().greaterThan(attribute, value);
+ return builder.greaterThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/util/IssueField.java b/core/src/main/java/io/onedev/server/util/Input.java
similarity index 61%
rename from core/src/main/java/io/onedev/server/util/IssueField.java
rename to core/src/main/java/io/onedev/server/util/Input.java
index ae96462187..96d1e92e2d 100644
--- a/core/src/main/java/io/onedev/server/util/IssueField.java
+++ b/core/src/main/java/io/onedev/server/util/Input.java
@@ -13,16 +13,14 @@ import org.slf4j.LoggerFactory;
import com.thoughtworks.xstream.annotations.XStreamOmitField;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.Project;
import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.inputspec.secretinput.SecretInput;
-public class IssueField implements Serializable {
+public class Input implements Serializable {
private static final long serialVersionUID = 1L;
- private static final Logger logger = LoggerFactory.getLogger(IssueField.class);
+ private static final Logger logger = LoggerFactory.getLogger(Input.class);
private final String name;
@@ -31,7 +29,7 @@ public class IssueField implements Serializable {
private final List<String> values;
- public IssueField(String name, String type, List<String> values) {
+ public Input(String name, String type, List<String> values) {
this.name = name;
this.type = type;
this.values = values;
@@ -53,8 +51,8 @@ public class IssueField implements Serializable {
public boolean equals(Object other) {
if (this == other) {
return true;
- } else if (other instanceof IssueField) {
- IssueField otherField = (IssueField) other;
+ } else if (other instanceof Input) {
+ Input otherField = (Input) other;
return new EqualsBuilder()
.append(getName(), otherField.getName())
.append(getType(), otherField.getType())
@@ -75,17 +73,20 @@ public class IssueField implements Serializable {
}
@Nullable
- public Object getValue(Project project) {
- InputSpec fieldSpec = OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpec(getName());
- if (fieldSpec != null) {
- try {
- return fieldSpec.convertToObject(getValues());
- } catch (ValidationException e) {
- logger.error("Error converting field value (field: {}, value: {}, error: {})",
- getName(), getValues(), e.getMessage());
- }
+ public Object getTypedValue(@Nullable InputSpec inputSpec) {
+ try {
+ return inputSpec.convertToObject(getValues());
+ } catch (ValidationException e) {
+ String displayValue;
+ if (type.equals(InputSpec.SECRET))
+ displayValue = SecretInput.MASK;
+ else
+ displayValue = "" + getValues();
+
+ logger.error("Error converting field value (field: {}, value: {}, error: {})",
+ getName(), displayValue, e.getMessage());
+ return null;
}
- return null;
}
}
diff --git a/core/src/main/java/io/onedev/server/util/IssueConstants.java b/core/src/main/java/io/onedev/server/util/IssueConstants.java
index 4a94cd14bf..862c768621 100644
--- a/core/src/main/java/io/onedev/server/util/IssueConstants.java
+++ b/core/src/main/java/io/onedev/server/util/IssueConstants.java
@@ -58,7 +58,7 @@ public class IssueConstants {
public static final String ATTR_MILESTONE = "milestone";
- public static final String ATTR_FIELD_ENTITIES = "fieldEntities";
+ public static final String ATTR_FIELDS = "fields";
public static final Set<String> ALL_FIELDS = Sets.newHashSet(
FIELD_NUMBER, FIELD_STATE, FIELD_TITLE, FIELD_SUBMITTER, FIELD_DESCRIPTION,
diff --git a/core/src/main/java/io/onedev/server/util/MatrixRunner.java b/core/src/main/java/io/onedev/server/util/MatrixRunner.java
index 1a3f4e51a1..95e9e63bc4 100644
--- a/core/src/main/java/io/onedev/server/util/MatrixRunner.java
+++ b/core/src/main/java/io/onedev/server/util/MatrixRunner.java
@@ -4,33 +4,33 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-public abstract class MatrixRunner {
+public abstract class MatrixRunner<T> {
- private final Map<String, String> params;
+ private final Map<String, T> params;
- private final Map<String, List<String>> paramMatrix;
+ private final Map<String, List<T>> paramMatrix;
- public MatrixRunner(Map<String, List<String>> paramMatrix) {
+ public MatrixRunner(Map<String, List<T>> paramMatrix) {
this(new LinkedHashMap<>(), paramMatrix);
}
- private MatrixRunner(Map<String, String> params, Map<String, List<String>> paramMatrix) {
+ private MatrixRunner(Map<String, T> params, Map<String, List<T>> paramMatrix) {
this.params = params;
this.paramMatrix = paramMatrix;
}
public void run() {
if (!paramMatrix.isEmpty()) {
- Map.Entry<String, List<String>> entry = paramMatrix.entrySet().iterator().next();
- for (String value: entry.getValue()) {
- Map<String, String> paramsCopy = new LinkedHashMap<>(params);
+ Map.Entry<String, List<T>> entry = paramMatrix.entrySet().iterator().next();
+ for (T value: entry.getValue()) {
+ Map<String, T> paramsCopy = new LinkedHashMap<>(params);
paramsCopy.put(entry.getKey(), value);
- Map<String, List<String>> matrixCopy = new LinkedHashMap<>(paramMatrix);
+ Map<String, List<T>> matrixCopy = new LinkedHashMap<>(paramMatrix);
matrixCopy.remove(entry.getKey());
- new MatrixRunner(paramsCopy, matrixCopy) {
+ new MatrixRunner<T>(paramsCopy, matrixCopy) {
@Override
- protected void run(Map<String, String> paramMap) {
+ protected void run(Map<String, T> paramMap) {
MatrixRunner.this.run(paramMap);
}
@@ -41,6 +41,6 @@ public abstract class MatrixRunner {
}
}
- protected abstract void run(Map<String, String> paramMap);
+ protected abstract void run(Map<String, T> paramMap);
}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.java
index 11d425002c..59de41f60e 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.java
@@ -52,7 +52,7 @@ public class BuildChoiceInput extends InputSpec {
@Override
public List<String> convertToStrings(Object value) {
- if (value != null)
+ if (value instanceof Long)
return Lists.newArrayList((String) value);
else
return new ArrayList<>();
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/CommitInput.java b/core/src/main/java/io/onedev/server/util/inputspec/CommitInput.java
index 597ec83654..bfecdf19fa 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/CommitInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/CommitInput.java
@@ -46,7 +46,7 @@ public class CommitInput extends InputSpec {
@Override
public List<String> convertToStrings(Object value) {
- if (value != null)
+ if (value instanceof String)
return Lists.newArrayList((String) value);
else
return new ArrayList<>();
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java
index 9a62eb2379..7b48fceb9a 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java
@@ -376,4 +376,16 @@ public abstract class InputSpec implements Serializable {
return false;
}
+ protected boolean checkListElements(Object value, Class<?> elementClass) {
+ if (value instanceof List) {
+ for (Object element: (List<?>)value) {
+ if (element == null || element.getClass() != elementClass)
+ return false;
+ }
+ return true;
+ } else {
+ return false;
+ }
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/IssueChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/IssueChoiceInput.java
index 4df7776a11..66341b70fd 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/IssueChoiceInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/IssueChoiceInput.java
@@ -52,7 +52,7 @@ public class IssueChoiceInput extends InputSpec {
@Override
public List<String> convertToStrings(Object value) {
- if (value != null)
+ if (value instanceof Long)
return Lists.newArrayList((String) value);
else
return new ArrayList<>();
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/PullRequestChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/PullRequestChoiceInput.java
index 03c76c9d66..d84fba773a 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/PullRequestChoiceInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/PullRequestChoiceInput.java
@@ -52,7 +52,7 @@ public class PullRequestChoiceInput extends InputSpec {
@Override
public List<String> convertToStrings(Object value) {
- if (value != null)
+ if (value instanceof Long)
return Lists.newArrayList((String) value);
else
return new ArrayList<>();
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java b/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java
index 286de7bf62..afed5cc849 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java
@@ -79,7 +79,10 @@ public class BooleanInput extends InputSpec {
@Override
public List<String> convertToStrings(Object value) {
- return Lists.newArrayList(((Boolean)value)?"true":"false");
+ if (value instanceof Boolean)
+ return Lists.newArrayList(((Boolean)value)?"true":"false");
+ else
+ return Lists.newArrayList("false");
}
}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java
index 404c5baba8..bd21ac0b4f 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java
@@ -8,8 +8,7 @@ import javax.validation.ValidationException;
import javax.validation.Validator;
import javax.validation.constraints.NotNull;
-import com.google.common.collect.Lists;
-
+import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.util.OneContext;
import io.onedev.server.util.inputspec.InputSpec;
@@ -129,12 +128,15 @@ public class ChoiceInput extends InputSpec {
@SuppressWarnings("unchecked")
@Override
public List<String> convertToStrings(Object value) {
- if (isAllowMultiple())
- return (List<String>) value;
- else if (value != null)
- return Lists.newArrayList((String) value);
- else
- return new ArrayList<>();
+ List<String> strings = new ArrayList<>();
+ if (isAllowMultiple()) {
+ if (checkListElements(value, String.class))
+ strings.addAll((List<String>) value);
+ Collections.sort(strings);
+ } else if (value instanceof String) {
+ strings.add((String) value);
+ }
+ return strings;
}
@Override
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java b/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java
index bc70dd675a..7845eb8455 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java
@@ -73,7 +73,7 @@ public class DateInput extends InputSpec {
@Override
public long getOrdinal(Object fieldValue) {
- if (fieldValue != null)
+ if (fieldValue instanceof Date)
return ((Date)fieldValue).getTime();
else
return super.getOrdinal(fieldValue);
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java
index e329edb934..c8e7b02ccb 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java
@@ -90,7 +90,7 @@ public class GroupChoiceInput extends InputSpec {
@Override
public List<String> convertToStrings(Object value) {
- if (value != null)
+ if (value instanceof String)
return Lists.newArrayList((String) value);
else
return new ArrayList<>();
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java b/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java
index cf8d2f2abc..1ee726b4ba 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java
@@ -91,7 +91,7 @@ public class NumberInput extends InputSpec {
@Override
public List<String> convertToStrings(Object value) {
- if (value != null)
+ if (value instanceof Integer)
return Lists.newArrayList(String.valueOf(value));
else
return new ArrayList<>();
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/secretinput/SecretInput.java b/core/src/main/java/io/onedev/server/util/inputspec/secretinput/SecretInput.java
index b15c8737fe..6cd720dd19 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/secretinput/SecretInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/secretinput/SecretInput.java
@@ -17,6 +17,8 @@ public class SecretInput extends InputSpec {
private static final long serialVersionUID = 1L;
+ public static final String MASK = "******";
+
private DefaultValueProvider defaultValueProvider;
@Editable(order=1000, name="Default Value")
@@ -61,7 +63,7 @@ public class SecretInput extends InputSpec {
@Override
public List<String> convertToStrings(Object value) {
- if (value != null)
+ if (value instanceof String)
return Lists.newArrayList((String)value);
else
return new ArrayList<>();
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java b/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java
index 10edcd9b95..a0c9e3529c 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java
@@ -10,6 +10,7 @@ import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
+import jersey.repackaged.com.google.common.collect.Lists;
@Editable(order=100, name=InputSpec.TEXT)
public class TextInput extends InputSpec {
@@ -86,10 +87,10 @@ public class TextInput extends InputSpec {
@Override
public List<String> convertToStrings(Object value) {
- List<String> strings = new ArrayList<>();
- if (value != null)
- strings.add((String) value);
- return strings;
+ if (value instanceof String)
+ return Lists.newArrayList((String)value);
+ else
+ return new ArrayList<>();
}
}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java
index f68d7aa65c..0ebd873631 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java
@@ -128,7 +128,7 @@ public class UserChoiceInput extends InputSpec {
@Override
public List<String> convertToStrings(Object value) {
- if (value != null)
+ if (value instanceof String)
return Lists.newArrayList((String) value);
else
return new ArrayList<>();
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
index fe64c9da60..1ec7c62d73 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
@@ -27,12 +27,13 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.util.EditContext;
-import io.onedev.server.util.IssueField;
+import io.onedev.server.util.Input;
import io.onedev.server.util.OneContext;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.util.inputspec.secretinput.SecretInput;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
@@ -103,7 +104,12 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
item.add(new Label("value", "#" + value));
}
} else {
- Label label = new Label("value", value);
+ Label label;
+ if (getField().getType().equals(InputSpec.SECRET))
+ label = new Label("value", SecretInput.MASK);
+ else
+ label = new Label("value", value);
+
InputSpec fieldSpec = getIssueSetting().getFieldSpec(getField().getName());
if (fieldSpec != null && fieldSpec instanceof ChoiceInput) {
ChoiceProvider choiceProvider = ((ChoiceInput)fieldSpec).getChoiceProvider();
@@ -146,7 +152,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
@Override
public Object getInputValue(String name) {
- IssueField field = getIssue().getFields().get(name);
+ Input field = getIssue().getFieldInputs().get(name);
InputSpec fieldSpec = getIssueSetting().getFieldSpec(name);
if (field != null && fieldSpec != null && field.getType().equals(EditableUtils.getDisplayName(fieldSpec.getClass()))) {
return fieldSpec.convertToObject(field.getValues());
@@ -158,7 +164,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
protected abstract Issue getIssue();
@Nullable
- protected abstract IssueField getField();
+ protected abstract Input getField();
@Override
public void renderHead(IHeaderResponse response) {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index a87e1311ed..2a4d5adcad 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -57,7 +57,7 @@ import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.util.IssueField;
+import io.onedev.server.util.Input;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.WebConstants;
@@ -569,10 +569,10 @@ public abstract class IssueListPanel extends Panel {
}
@Override
- protected IssueField getField() {
+ protected Input getField() {
Issue issue = rowModel.getObject();
if (issue.isFieldVisible(field))
- return issue.getFields().get(field);
+ return issue.getFieldInputs().get(field);
else
return null;
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
index 4c4f438168..2f50fcb8f9 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
@@ -41,7 +41,7 @@ import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueConstants;
-import io.onedev.server.util.IssueField;
+import io.onedev.server.util.Input;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
@@ -183,7 +183,7 @@ public abstract class IssueOperationsPanel extends Panel {
List<String> criterias = new ArrayList<>();
if (getIssue().getMilestone() != null)
criterias.add(IssueQuery.quote(IssueConstants.FIELD_MILESTONE) + " is " + IssueQuery.quote(getIssue().getMilestoneName()));
- for (Map.Entry<String, IssueField> entry: getIssue().getFields().entrySet()) {
+ for (Map.Entry<String, Input> entry: getIssue().getFieldInputs().entrySet()) {
List<String> strings = entry.getValue().getValues();
if (strings.isEmpty()) {
criterias.add(IssueQuery.quote(entry.getKey()) + " is empty");
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index bc830149df..1ed12e4241 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -53,7 +53,7 @@ import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.IssueField;
+import io.onedev.server.util.Input;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.userident.UserIdent;
@@ -138,12 +138,12 @@ public abstract class IssueSidePanel extends Panel {
}
private Component newFieldsContainer() {
- IModel<List<IssueField>> fieldsModel = new LoadableDetachableModel<List<IssueField>>() {
+ IModel<List<Input>> fieldsModel = new LoadableDetachableModel<List<Input>>() {
@Override
- protected List<IssueField> load() {
- List<IssueField> fields = new ArrayList<>();
- for (IssueField field: getIssue().getFields().values()) {
+ protected List<Input> load() {
+ List<Input> fields = new ArrayList<>();
+ for (Input field: getIssue().getFieldInputs().values()) {
if (getIssue().isFieldVisible(field.getName()))
fields.add(field);
}
@@ -163,11 +163,11 @@ public abstract class IssueSidePanel extends Panel {
fragment.setOutputMarkupId(true);
- fragment.add(new ListView<IssueField>("fields", fieldsModel) {
+ fragment.add(new ListView<Input>("fields", fieldsModel) {
@Override
- protected void populateItem(ListItem<IssueField> item) {
- IssueField field = item.getModelObject();
+ protected void populateItem(ListItem<Input> item) {
+ Input field = item.getModelObject();
item.add(new Label("name", field.getName()));
item.add(new FieldValuesPanel("values") {
@@ -177,7 +177,7 @@ public abstract class IssueSidePanel extends Panel {
}
@Override
- protected IssueField getField() {
+ protected Input getField() {
return item.getModelObject();
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.java
index faa036a267..75fc6daaf2 100644
--- a/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.java
@@ -7,6 +7,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import javax.annotation.Nullable;
import javax.validation.ValidationException;
import org.apache.wicket.Component;
@@ -29,7 +30,6 @@ import org.apache.wicket.validation.IValidatable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
@@ -216,15 +216,17 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
private SpecifiedValues newSpecifiedValueProvider(PropertyDescriptor property) {
SpecifiedValues specifiedValues = new SpecifiedValues();
- Object propertyValue = property.getPropertyValue(getDefaultParamBean());
+ Object typedValue = property.getPropertyValue(getDefaultParamBean());
InputSpec paramSpec = getParamSpecs().get(property.getDisplayName());
Preconditions.checkNotNull(paramSpec);
- List<String> strings = paramSpec.convertToStrings(propertyValue);
- specifiedValues.setValues(Lists.newArrayList(JobParam.toValue(strings)));
+ List<String> strings = paramSpec.convertToStrings(typedValue);
+ List<List<String>> values = new ArrayList<>();
+ values.add(strings);
+ specifiedValues.setValues(values);
return specifiedValues;
}
- private Component newSpecifiedValueEditor(String componentId, PropertyDescriptor property, Optional<String> value) {
+ private Component newSpecifiedValueEditor(String componentId, PropertyDescriptor property, @Nullable List<String> value) {
WebMarkupContainer item = new WebMarkupContainer(componentId);
InputSpec paramSpec = Preconditions.checkNotNull(getParamSpecs().get(property.getDisplayName()));
Serializable paramBean;
@@ -234,10 +236,8 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
throw new RuntimeException(e);
}
try {
- if (value.isPresent()) {
- List<String> strings = JobParam.fromValue(value.orNull());
- property.setPropertyValue(paramBean, paramSpec.convertToObject(strings));
- }
+ if (value != null)
+ property.setPropertyValue(paramBean, paramSpec.convertToObject(value));
} catch (Exception e) {
logger.error("Error setting property value", e);
}
@@ -267,8 +267,12 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
RepeatingView valuesView = new RepeatingView("values");
fragment.add(valuesView);
- for (String value: specifiedValues.getValues())
- valuesView.add(newSpecifiedValueEditor(valuesView.newChildId(), property, Optional.fromNullable(value)));
+ try {
+ for (List<String> value: specifiedValues.getValues())
+ valuesView.add(newSpecifiedValueEditor(valuesView.newChildId(), property, value));
+ } catch (Exception e) {
+ logger.error("Error creating value editors", e);
+ }
fragment.add(new FencedFeedbackPanel("feedback", fragment));
@@ -277,7 +281,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public void onClick(AjaxRequestTarget target) {
Component newSpecifiedValueEditor = newSpecifiedValueEditor(valuesView.newChildId(),
- property, Optional.absent());
+ property, null);
valuesView.add(newSpecifiedValueEditor);
String script = String.format("$('#%s').before('<li id=\"%s\"></li>')",
getMarkupId(), newSpecifiedValueEditor.getMarkupId());
@@ -320,7 +324,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
for (Component valueItem: (WebMarkupContainer)valuesEditor.get("values")) {
Object propertyValue = ((PropertyEditor<Serializable>) valueItem.get("value")).getConvertedInput();
InputSpec paramSpec = Preconditions.checkNotNull(getParamSpecs().get(param.getName()));
- specifiedValues.getValues().add(JobParam.toValue(paramSpec.convertToStrings(propertyValue)));
+ specifiedValues.getValues().add(paramSpec.convertToStrings(propertyValue));
}
param.setValuesProvider(specifiedValues);
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.java
index 427a8309bc..9f72b7ae9b 100644
--- a/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.java
@@ -4,7 +4,6 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -44,12 +43,12 @@ class ParamListViewPanel extends Panel {
Fragment fragment = new Fragment("values", "specifiedValuesFrag", this);
RepeatingView valuesView = new RepeatingView("values");
SpecifiedValues specifiedValues = (SpecifiedValues) param.getValuesProvider();
- for (String value: specifiedValues.getValues()) {
+ for (List<String> value: specifiedValues.getValues()) {
WebMarkupContainer valueItem = new WebMarkupContainer(valuesView.newChildId());
- if (StringUtils.isNotBlank(value))
- valueItem.add(new Label("value", value));
+ if (!value.isEmpty())
+ valueItem.add(new Label("value", value.toString()));
else
- valueItem.add(new Label("value", "<i>Empty value</i>").setEscapeModelStrings(false));
+ valueItem.add(new Label("value", "<i>Empty</i>").setEscapeModelStrings(false));
valuesView.add(valueItem);
}
fragment.add(valuesView);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
index 71e15cedbd..84337ac7bf 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
@@ -27,7 +27,7 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueConstants;
-import io.onedev.server.util.IssueField;
+import io.onedev.server.util.Input;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.userident.UserIdent;
@@ -79,7 +79,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
RepeatingView fieldsView = new RepeatingView("fields");
for (String fieldName: displayFields) {
if (!fieldName.equals(IssueConstants.FIELD_STATE)) {
- IssueField field = getIssue().getFields().get(fieldName);
+ Input field = getIssue().getFieldInputs().get(fieldName);
if (field != null && !field.getType().equals(InputSpec.USER) && !field.getValues().isEmpty()) {
fieldsView.add(new FieldValuesPanel(fieldsView.newChildId()) {
@@ -89,7 +89,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
}
@Override
- protected IssueField getField() {
+ protected Input getField() {
return field;
}
@@ -102,7 +102,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
RepeatingView avatarsView = new RepeatingView("avatars");
for (String fieldName: displayFields) {
- IssueField field = getIssue().getFields().get(fieldName);
+ Input field = getIssue().getFieldInputs().get(fieldName);
if (field != null && field.getType().equals(InputSpec.USER) && !field.getValues().isEmpty()) {
User user = OneDev.getInstance(UserManager.class)
.findByName(field.getValues().iterator().next());
@@ -203,7 +203,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
Issue issue = OneDev.getInstance(IssueManager.class).load(issueId);
Hibernate.initialize(issue.getProject());
Hibernate.initialize(issue.getMilestone());
- Hibernate.initialize(issue.getFieldEntities());
+ Hibernate.initialize(issue.getFields());
Hibernate.initialize(issue.getSubmitter());
send(getPage(), Broadcast.BREADTH, new IssueDragging(target, issue));
}
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index e8a32b1e9a..1719b495e0 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
@@ -1,2 +1,3 @@
<wicket:extend>
+ <a wicket:id="test">test</a>
</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 8c5e0b3ff5..6ac9d78a73 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.page.test;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.web.page.base.BasePage;
@@ -17,6 +18,14 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
+
+ add(new Link<Void>("test") {
+
+ @Override
+ public void onClick() {
+ }
+
+ });
}
@Override
diff --git a/core/src/test/java/io/onedev/server/util/MatrixRunnerTest.java b/core/src/test/java/io/onedev/server/util/MatrixRunnerTest.java
index a0c3ae3e47..5eccd48a00 100644
--- a/core/src/test/java/io/onedev/server/util/MatrixRunnerTest.java
+++ b/core/src/test/java/io/onedev/server/util/MatrixRunnerTest.java
@@ -20,7 +20,7 @@ public class MatrixRunnerTest {
Map<String, List<String>> matrix = new LinkedHashMap<>();
List<Map<String, String>> usedParams = new ArrayList<>();
- new MatrixRunner(matrix) {
+ new MatrixRunner<String>(matrix) {
@Override
public void run(Map<String, String> params) {
@@ -37,7 +37,7 @@ public class MatrixRunnerTest {
usedParams.clear();
- new MatrixRunner(matrix) {
+ new MatrixRunner<String>(matrix) {
@Override
public void run(Map<String, String> params) {