Skip to content

The Unified and Autonomous Development Platform

Fix issue #220 - Statistics for Jest unit test success rate and duration

Robin Shen8bc40df7e830
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index 77e231910c..1b0171d8bc 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -92,6 +92,7 @@ import io.onedev.server.buildspec.job.log.LogManager;
import io.onedev.server.buildspec.job.log.instruction.LogInstruction;
import io.onedev.server.entitymanager.BuildDependenceManager;
import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.BuildMetricManager;
import io.onedev.server.entitymanager.BuildParamManager;
import io.onedev.server.entitymanager.BuildQuerySettingManager;
import io.onedev.server.entitymanager.CodeCommentManager;
@@ -126,6 +127,7 @@ import io.onedev.server.entitymanager.UserAuthorizationManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.entitymanager.impl.DefaultBuildDependenceManager;
import io.onedev.server.entitymanager.impl.DefaultBuildManager;
+import io.onedev.server.entitymanager.impl.DefaultBuildMetricManager;
import io.onedev.server.entitymanager.impl.DefaultBuildParamManager;
import io.onedev.server.entitymanager.impl.DefaultBuildQuerySettingManager;
import io.onedev.server.entitymanager.impl.DefaultCodeCommentManager;
@@ -279,8 +281,8 @@ import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EditSupportLocator;
import io.onedev.server.web.editable.EditSupportRegistry;
import io.onedev.server.web.mapper.DynamicPathPageMapper;
-import io.onedev.server.web.page.layout.DefaultUICustomization;
-import io.onedev.server.web.page.layout.UICustomization;
+import io.onedev.server.web.page.layout.DefaultMainMenuCustomization;
+import io.onedev.server.web.page.layout.MainMenuCustomization;
import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;
import io.onedev.server.web.page.test.TestPage;
import io.onedev.server.web.websocket.BuildEventBroadcaster;
@@ -391,6 +393,7 @@ public class CoreModule extends AbstractPluginModule {
bind(BuildQuerySettingManager.class).to(DefaultBuildQuerySettingManager.class);
bind(PullRequestAssignmentManager.class).to(DefaultPullRequestAssignmentManager.class);
bind(SshKeyManager.class).to(DefaultSshKeyManager.class);
+ bind(BuildMetricManager.class).to(DefaultBuildMetricManager.class);
bind(WebHookManager.class);
@@ -610,7 +613,7 @@ public class CoreModule extends AbstractPluginModule {
bind(TaskButton.TaskFutureManager.class);
- bind(UICustomization.class).toInstance(new DefaultUICustomization());
+ bind(MainMenuCustomization.class).toInstance(new DefaultMainMenuCustomization());
}
private void configureBuild() {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
index 1c685a76cc..d17d0805fa 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
@@ -529,7 +529,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
throw maskSecrets(e, jobSecretsToMask);
} finally {
try {
- sessionManager.run(new Runnable() {
+ transactionManager.run(new Runnable() {
@Override
public void run() {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java
index e0bec8e4f2..9b991b827c 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java
@@ -10,6 +10,7 @@ import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.model.Build;
import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.util.validation.annotation.PathSegment;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.Patterns;
@@ -19,10 +20,23 @@ public abstract class JobReport implements Serializable {
private static final long serialVersionUID = 1L;
+ private String reportName;
+
private String filePatterns;
private transient PatternSet patternSet;
+ @Editable(order=50, description="Specify report name")
+ @PathSegment
+ @NotEmpty
+ public String getReportName() {
+ return reportName;
+ }
+
+ public void setReportName(String reportName) {
+ this.reportName = reportName;
+ }
+
@Editable(order=100, description="Specify files relative to OneDev workspace. Use * or ? for pattern match. "
+ "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")
@Interpolative(variableSuggester="suggestVariables")
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
index 3c0d9b8ee1..8308308b54 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
@@ -62,8 +62,10 @@ public interface BuildManager extends EntityManager<Build> {
List<String> queryVersions(Project project, String matchWith, int count);
- Map<Project, Collection<String>> getAccessibleJobNames(@Nullable Project project);
+ Collection<String> getAccessibleJobNames(Project project);
+ Map<Project, Collection<String>> getAccessibleJobNames();
+
void populateBuilds(Collection<PullRequest> requests);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildMetricManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildMetricManager.java
new file mode 100644
index 0000000000..dff05ab2aa
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildMetricManager.java
@@ -0,0 +1,16 @@
+package io.onedev.server.entitymanager;
+
+import java.util.Collection;
+import java.util.Map;
+
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.Project;
+import io.onedev.server.search.buildmetric.BuildMetricQuery;
+
+public interface BuildMetricManager {
+
+ <T extends AbstractEntity> Map<Integer, T> queryStats(Project project, Class<T> metricClass, BuildMetricQuery query);
+
+ Map<String, Collection<String>> getAccessibleReportNames(Project project, Class<?> metricClass);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildDependenceManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildDependenceManager.java
index b1f33fd3c1..f8b032f62a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildDependenceManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildDependenceManager.java
@@ -5,11 +5,11 @@ import javax.inject.Singleton;
import io.onedev.server.entitymanager.BuildDependenceManager;
import io.onedev.server.model.BuildDependence;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
@Singleton
-public class DefaultBuildDependenceManager extends AbstractEntityManager<BuildDependence> implements BuildDependenceManager {
+public class DefaultBuildDependenceManager extends BaseEntityManager<BuildDependence> implements BuildDependenceManager {
@Inject
public DefaultBuildDependenceManager(Dao dao) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index 3fe657f9ae..14e1727461 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -50,6 +50,7 @@ import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.BuildParamManager;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
@@ -65,12 +66,11 @@ import io.onedev.server.model.Role;
import io.onedev.server.model.User;
import io.onedev.server.model.UserAuthorization;
import io.onedev.server.model.support.build.BuildPreservation;
-import io.onedev.server.model.support.role.JobPrivilege;
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.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -78,17 +78,17 @@ import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.security.permission.AccessBuild;
+import io.onedev.server.security.permission.JobPermission;
import io.onedev.server.storage.StorageManager;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.StatusInfo;
import io.onedev.server.util.facade.BuildFacade;
-import io.onedev.server.util.match.StringMatcher;
-import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.schedule.SchedulableTask;
import io.onedev.server.util.schedule.TaskScheduler;
@Singleton
-public class DefaultBuildManager extends AbstractEntityManager<Build> implements BuildManager, SchedulableTask {
+public class DefaultBuildManager extends BaseEntityManager<Build> implements BuildManager, SchedulableTask {
private static final int STATUS_QUERY_BATCH = 500;
@@ -317,15 +317,28 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
projects.addAll(project.getForkParents());
List<Criterion> projectCriterions = new ArrayList<>();
- for (Project each: projects) {
- List<Criterion> jobCriterions = new ArrayList<>();
- for (String jobName: getAccessibleJobNames(each).get(each))
- jobCriterions.add(Restrictions.eq(Build.PROP_JOB, jobName));
- if (!jobCriterions.isEmpty()) {
- projectCriterions.add(Restrictions.and(
- Restrictions.eq(Build.PROP_PROJECT, each),
- Restrictions.or(jobCriterions.toArray(new Criterion[0]))));
+ jobNamesLock.readLock().lock();
+ try {
+ for (Project each: projects) {
+ Collection<String> availableJobNames = jobNames.get(each.getId());
+ if (!availableJobNames.isEmpty()) {
+ Collection<String> accessibleJobNames = getAccessibleJobNames(each);
+ if (accessibleJobNames.containsAll(availableJobNames)) {
+ projectCriterions.add(Restrictions.eq(Build.PROP_PROJECT, each));
+ } else {
+ List<Criterion> jobCriterions = new ArrayList<>();
+ for (String jobName: accessibleJobNames)
+ jobCriterions.add(Restrictions.eq(Build.PROP_JOB, jobName));
+ if (!jobCriterions.isEmpty()) {
+ projectCriterions.add(Restrictions.and(
+ Restrictions.eq(Build.PROP_PROJECT, each),
+ Restrictions.or(jobCriterions.toArray(new Criterion[0]))));
+ }
+ }
+ }
}
+ } finally {
+ jobNamesLock.readLock().unlock();
}
if (!projectCriterions.isEmpty()) {
@@ -390,33 +403,56 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
buildDependenceManager.save(dependence);
}
- private Collection<Predicate> getPredicates(@Nullable Project project, Root<Build> root,
- CriteriaBuilder builder) {
+ private Collection<Predicate> getPredicates(@Nullable Project project, Root<Build> root, CriteriaBuilder builder) {
Collection<Predicate> predicates = new ArrayList<>();
- if (project != null) {
- predicates.add(builder.equal(root.get(Build.PROP_PROJECT), project));
- if (!SecurityUtils.canManage(project)) {
- List<Predicate> jobPredicates = new ArrayList<>();
- for (String jobName: getAccessibleJobNames(project).get(project))
- jobPredicates.add(builder.equal(root.get(Build.PROP_JOB), jobName));
- predicates.add(builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()])));
- }
- } else if (!SecurityUtils.isAdministrator()) {
- List<Predicate> projectPredicates = new ArrayList<>();
- for (Map.Entry<Project, Collection<String>> entry: getAccessibleJobNames(null).entrySet()) {
- if (SecurityUtils.canManage(project)) {
- projectPredicates.add(builder.equal(root.get(Build.PROP_PROJECT), entry.getKey()));
- } else {
- List<Predicate> jobPredicates = new ArrayList<>();
- for (String jobName: entry.getValue())
- jobPredicates.add(builder.equal(root.get(Build.PROP_JOB), jobName));
- projectPredicates.add(builder.and(
- builder.equal(root.get(Build.PROP_PROJECT), entry.getKey()),
- builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()]))));
+ jobNamesLock.readLock().lock();
+ try {
+ if (project != null) {
+ predicates.add(builder.equal(root.get(Build.PROP_PROJECT), project));
+ if (!SecurityUtils.canManageBuilds(project)) {
+ Collection<String> accessibleJobNames = getAccessibleJobNames(project);
+ Collection<String> availableJobNames = jobNames.get(project.getId());
+ if (availableJobNames != null && !accessibleJobNames.containsAll(availableJobNames)) {
+ List<Predicate> jobPredicates = new ArrayList<>();
+ for (String jobName: accessibleJobNames)
+ jobPredicates.add(builder.equal(root.get(Build.PROP_JOB), jobName));
+ predicates.add(builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()])));
+ }
+ }
+ } else if (!SecurityUtils.isAdministrator()) {
+ List<Predicate> projectPredicates = new ArrayList<>();
+ Collection<Long> projectsWithAllJobs = new HashSet<>();
+ for (Map.Entry<Project, Collection<String>> entry: getAccessibleJobNames().entrySet()) {
+ project = entry.getKey();
+ if (SecurityUtils.canManageBuilds(project)) {
+ projectPredicates.add(builder.equal(root.get(Build.PROP_PROJECT), project));
+ projectsWithAllJobs.add(project.getId());
+ } else {
+ Collection<String> availableJobNamesOfProject = jobNames.get(project.getId());
+ if (availableJobNamesOfProject != null) {
+ Collection<String> accessibleJobNamesOfProject = entry.getValue();
+ if (accessibleJobNamesOfProject.containsAll(availableJobNamesOfProject)) {
+ projectsWithAllJobs.add(project.getId());
+ projectPredicates.add(builder.equal(root.get(Build.PROP_PROJECT), project));
+ } else {
+ List<Predicate> jobPredicates = new ArrayList<>();
+ for (String jobName: accessibleJobNamesOfProject)
+ jobPredicates.add(builder.equal(root.get(Build.PROP_JOB), jobName));
+ projectPredicates.add(builder.and(
+ builder.equal(root.get(Build.PROP_PROJECT), project),
+ builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()]))));
+ }
+ } else {
+ projectsWithAllJobs.add(project.getId());
+ }
+ }
}
+ if (!projectsWithAllJobs.containsAll(jobNames.keySet()))
+ predicates.add(builder.or(projectPredicates.toArray(new Predicate[projectPredicates.size()])));
}
- predicates.add(builder.or(projectPredicates.toArray(new Predicate[projectPredicates.size()])));
+ } finally {
+ jobNamesLock.readLock().unlock();
}
return predicates;
@@ -651,6 +687,29 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
taskScheduler.unschedule(taskId);
}
+ @Transactional
+ @Listen
+ public void on(EntityPersisted event) {
+ if (event.getEntity() instanceof Build) {
+ Build build = (Build) event.getEntity();
+ Long projectId = build.getProject().getId();
+ String jobName = build.getJobName();
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ jobNamesLock.writeLock().lock();
+ try {
+ populateJobNames(projectId, jobName);
+ } finally {
+ jobNamesLock.writeLock().unlock();
+ }
+ }
+
+ });
+ }
+ }
+
private CriteriaQuery<Object[]> buildQueryOfStreamPrevios(Build build, Status status, String...fields) {
CriteriaBuilder builder = getSession().getCriteriaBuilder();
CriteriaQuery<Object[]> query = builder.createQuery(Object[].class);
@@ -765,23 +824,6 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
jobNamesOfProject.add(jobName);
}
- private Collection<String> getAccessibleJobNames(Role role, Collection<String> jobNames) {
- Collection<String> accessibleJobNames = new HashSet<>();
- if (role.isManageProject()) {
- accessibleJobNames.addAll(jobNames);
- } else {
- StringMatcher matcher = new StringMatcher();
- for (JobPrivilege jobPrivilege: role.getJobPrivileges()) {
- PatternSet patternSet = PatternSet.parse(jobPrivilege.getJobNames());
- for (String jobName: jobNames) {
- if (patternSet.matches(matcher, jobName))
- accessibleJobNames.add(jobName);
- }
- }
- }
- return accessibleJobNames;
- }
-
@Override
public Collection<String> getJobNames(@Nullable Project project) {
jobNamesLock.readLock().lock();
@@ -798,57 +840,105 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
}
private void populateAccessibleJobNames(Map<Project, Collection<String>> accessibleJobNames,
- Map<Long, Collection<String>> jobNames, Project project, Role role) {
- Collection<String> jobNamesOfProject = jobNames.get(project.getId());
- if (jobNamesOfProject != null) {
- Collection<String> accessibleJobNamesOfProject = getAccessibleJobNames(role, jobNamesOfProject);
- Collection<String> currentAccessibleJobNamesOfProject = accessibleJobNames.get(project);
- if (currentAccessibleJobNamesOfProject == null) {
- currentAccessibleJobNamesOfProject = new HashSet<>();
- accessibleJobNames.put(project, currentAccessibleJobNamesOfProject);
+ Map<Long, Collection<String>> availableJobNames, Project project, Role role) {
+ Collection<String> availableJobNamesOfProject = availableJobNames.get(project.getId());
+ if (availableJobNamesOfProject != null) {
+ for (String jobName: availableJobNamesOfProject) {
+ if (role.implies(new JobPermission(jobName, new AccessBuild()))) {
+ Collection<String> accessibleJobNamesOfProject = accessibleJobNames.get(project);
+ if (accessibleJobNamesOfProject == null) {
+ accessibleJobNamesOfProject = new HashSet<>();
+ accessibleJobNames.put(project, accessibleJobNamesOfProject);
+ }
+ accessibleJobNamesOfProject.add(jobName);
+ }
}
- currentAccessibleJobNamesOfProject.addAll(accessibleJobNamesOfProject);
}
}
+ private void populateAccessibleJobNames(Collection<String> accessibleJobNames,
+ Collection<String> availableJobNames, Role role) {
+ for (String jobName: availableJobNames) {
+ if (role.implies(new JobPermission(jobName, new AccessBuild())))
+ accessibleJobNames.add(jobName);
+ }
+ }
+
@Override
- public Map<Project, Collection<String>> getAccessibleJobNames(@Nullable Project project) {
+ public Map<Project, Collection<String>> getAccessibleJobNames() {
jobNamesLock.readLock().lock();
try {
Map<Project, Collection<String>> accessibleJobNames = new HashMap<>();
User user = SecurityUtils.getUser();
+
if (SecurityUtils.isAdministrator()) {
for (Map.Entry<Long, Collection<String>> entry: jobNames.entrySet())
accessibleJobNames.put(projectManager.load(entry.getKey()), new HashSet<>(entry.getValue()));
} else {
if (user != null) {
for (UserAuthorization authorization: user.getAuthorizations()) {
- if (project == null || project.equals(authorization.getProject())) {
- populateAccessibleJobNames(accessibleJobNames, jobNames,
- authorization.getProject(), authorization.getRole());
- }
+ populateAccessibleJobNames(accessibleJobNames, jobNames,
+ authorization.getProject(), authorization.getRole());
}
for (Group group: user.getGroups()) {
for (GroupAuthorization authorization: group.getAuthorizations()) {
- if (project == null || project.equals(authorization.getProject())) {
- populateAccessibleJobNames(accessibleJobNames, jobNames,
- authorization.getProject(), authorization.getRole());
- }
+ populateAccessibleJobNames(accessibleJobNames, jobNames,
+ authorization.getProject(), authorization.getRole());
}
}
}
Group group = groupManager.findAnonymous();
if (group != null) {
for (GroupAuthorization authorization: group.getAuthorizations()) {
- if (project == null || project.equals(authorization.getProject())) {
- populateAccessibleJobNames(accessibleJobNames, jobNames,
- authorization.getProject(), authorization.getRole());
+ populateAccessibleJobNames(accessibleJobNames, jobNames,
+ authorization.getProject(), authorization.getRole());
+ }
+ }
+ }
+ return accessibleJobNames;
+ } finally {
+ jobNamesLock.readLock().unlock();
+ }
+ }
+
+ @Override
+ public Collection<String> getAccessibleJobNames(Project project) {
+ jobNamesLock.readLock().lock();
+ try {
+ Collection<String> accessibleJobNames = new HashSet<>();
+ Collection<String> availableJobNames = jobNames.get(project.getId());
+ if (availableJobNames != null) {
+ if (SecurityUtils.isAdministrator()) {
+ accessibleJobNames.addAll(availableJobNames);
+ } else {
+ User user = SecurityUtils.getUser();
+ if (user != null) {
+ for (UserAuthorization authorization: user.getAuthorizations()) {
+ if (project.equals(authorization.getProject())) {
+ populateAccessibleJobNames(accessibleJobNames, availableJobNames,
+ authorization.getRole());
+ }
+ }
+ for (Group group: user.getGroups()) {
+ for (GroupAuthorization authorization: group.getAuthorizations()) {
+ if (project.equals(authorization.getProject())) {
+ populateAccessibleJobNames(accessibleJobNames, availableJobNames,
+ authorization.getRole());
+ }
+ }
+ }
+ }
+ Group group = groupManager.findAnonymous();
+ if (group != null) {
+ for (GroupAuthorization authorization: group.getAuthorizations()) {
+ if (project == null || project.equals(authorization.getProject())) {
+ populateAccessibleJobNames(accessibleJobNames, availableJobNames,
+ authorization.getRole());
+ }
}
}
}
}
- if (project != null && !accessibleJobNames.containsKey(project))
- accessibleJobNames.put(project, new HashSet<>());
return accessibleJobNames;
} finally {
jobNamesLock.readLock().unlock();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.java
new file mode 100644
index 0000000000..f06328814c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.java
@@ -0,0 +1,344 @@
+package io.onedev.server.entitymanager.impl;
+
+import static io.onedev.commons.utils.ExceptionUtils.unchecked;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Selection;
+import javax.persistence.metamodel.EntityType;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.hibernate.query.Query;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.server.entitymanager.BuildMetricManager;
+import io.onedev.server.entitymanager.GroupManager;
+import io.onedev.server.event.entity.EntityPersisted;
+import io.onedev.server.event.entity.EntityRemoved;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Group;
+import io.onedev.server.model.GroupAuthorization;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.Role;
+import io.onedev.server.model.User;
+import io.onedev.server.model.UserAuthorization;
+import io.onedev.server.model.support.BuildMetric;
+import io.onedev.server.persistence.TransactionManager;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.search.buildmetric.BuildMetricQuery;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.security.permission.AccessBuildReports;
+import io.onedev.server.security.permission.JobPermission;
+import io.onedev.server.util.BeanUtils;
+import io.onedev.server.util.MetricIndicator;
+
+@Singleton
+public class DefaultBuildMetricManager implements BuildMetricManager {
+
+ private static final Logger logger = LoggerFactory.getLogger(DefaultBuildMetricManager.class);
+
+ private final Dao dao;
+
+ private final TransactionManager transactionManager;
+
+ private final GroupManager groupManager;
+
+ private final Map<Key, Map<String, Collection<String>>> reportNames = new HashMap<>();
+
+ private final ReadWriteLock reportNamesLock = new ReentrantReadWriteLock();
+
+ @Inject
+ public DefaultBuildMetricManager(Dao dao, TransactionManager transactionManager, GroupManager groupManager) {
+ this.dao = dao;
+ this.transactionManager = transactionManager;
+ this.groupManager = groupManager;
+ }
+
+ @SuppressWarnings("resource")
+ @Sessional
+ @Override
+ public <T extends AbstractEntity> Map<Integer, T> queryStats(Project project, Class<T> metricClass, BuildMetricQuery query) {
+ CriteriaBuilder builder = dao.getSession().getCriteriaBuilder();
+ CriteriaQuery<Object[]> criteriaQuery = builder.createQuery(Object[].class);
+ Root<T> metricRoot = criteriaQuery.from(metricClass);
+
+ List<Predicate> predicates = new ArrayList<>();
+
+ Join<?, ?> buildJoin = metricRoot.join(BuildMetric.PROP_BUILD, JoinType.INNER);
+ predicates.add(builder.equal(buildJoin.get(Build.PROP_PROJECT), project));
+
+ if (!SecurityUtils.canManageBuilds(project)) {
+ reportNamesLock.readLock().lock();
+ try {
+ Key key = new Key(project.getId(), metricClass);
+ Map<String, Collection<String>> availableReportNames = reportNames.get(key);
+ if (availableReportNames != null) {
+ List<Predicate> jobPredicates = new ArrayList<>();
+ Collection<String> jobsWithAllReports = new HashSet<>();
+ for (Map.Entry<String, Collection<String>> entry: getAccessibleReportNames(project, metricClass).entrySet()) {
+ Collection<String> availableReportNamesOfJob = availableReportNames.get(entry.getKey());
+ if (availableReportNamesOfJob != null) {
+ if (entry.getValue().containsAll(availableReportNamesOfJob)) {
+ jobsWithAllReports.add(entry.getKey());
+ jobPredicates.add(builder.equal(buildJoin.get(Build.PROP_JOB), entry.getKey()));
+ } else {
+ List<Predicate> reportPredicates = new ArrayList<>();
+ for (String reportName: entry.getValue())
+ reportPredicates.add(builder.equal(metricRoot.get(BuildMetric.PROP_REPORT), reportName));
+ jobPredicates.add(builder.and(
+ builder.equal(buildJoin.get(Build.PROP_JOB), entry.getKey()),
+ builder.or(reportPredicates.toArray(new Predicate[reportPredicates.size()]))));
+ }
+ } else {
+ jobsWithAllReports.add(entry.getKey());
+ }
+ }
+ if (!jobsWithAllReports.containsAll(availableReportNames.keySet()))
+ predicates.add(builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()])));
+ }
+ } finally {
+ reportNamesLock.readLock().unlock();
+ }
+ }
+
+ if (query.getCriteria() != null)
+ predicates.add(query.getCriteria().getPredicate(metricRoot, buildJoin, builder));
+
+ criteriaQuery.where(predicates.toArray(new Predicate[0]));
+ criteriaQuery.groupBy(buildJoin.get(Build.PROP_FINISH_DAY));
+
+ List<Method> setters = new ArrayList<>();
+ List<Selection<?>> selections = new ArrayList<>();
+ for (Method getter: BeanUtils.findGetters(metricClass)) {
+ if (getter.getAnnotation(MetricIndicator.class) != null) {
+ selections.add(builder.avg(metricRoot.get(BeanUtils.getPropertyName(getter))));
+ setters.add(Preconditions.checkNotNull(BeanUtils.findSetter(getter)));
+ }
+ }
+
+ selections.add(buildJoin.get(Build.PROP_FINISH_DAY));
+
+ criteriaQuery.multiselect(selections);
+
+ Map<Integer, T> metrics = new HashMap<>();
+
+ for (Object[] fields: dao.getSession().createQuery(criteriaQuery).list()) {
+ try {
+ T metric = metricClass.newInstance();
+ int index = 0;
+ for (Method setter: setters) {
+ double value = (double)fields[index++];
+ setter.invoke(metric, (int)value);
+ }
+ metrics.put((int)fields[setters.size()], metric);
+ } catch (Exception e) {
+ throw unchecked(e);
+ }
+ }
+ return metrics;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Listen
+ public void on(SystemStarted event) {
+ logger.info("Caching build metric info...");
+
+ EntityManagerFactory emf = (EntityManagerFactory)dao.getSession().getEntityManagerFactory();
+ for (EntityType<?> entityType: emf.getMetamodel().getEntities()) {
+ Class<?> entityClass = entityType.getJavaType();
+ if (BuildMetric.class.isAssignableFrom(entityClass)) {
+ String queryString = String.format("select build.%s.id, build.%s, metric.%s from %s metric inner join metric.%s build",
+ Build.PROP_PROJECT, Build.PROP_JOB, BuildMetric.PROP_REPORT, entityClass.getSimpleName(), BuildMetric.PROP_BUILD);
+ Query<?> query = dao.getSession().createQuery(queryString);
+ for (Object[] fields: (List<Object[]>)query.list())
+ populateReportNames(new Key((Long)fields[0], entityClass), (String)fields[1], (String)fields[2]);
+ }
+ }
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityRemoved event) {
+ if (event.getEntity() instanceof Project) {
+ Long projectId = event.getEntity().getId();
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ reportNamesLock.writeLock().lock();
+ try {
+ for (Iterator<Map.Entry<Key, Map<String, Collection<String>>>> it = reportNames.entrySet().iterator(); it.hasNext();) {
+ if (it.next().getKey().projectId.equals(projectId))
+ it.remove();
+ }
+ } finally {
+ reportNamesLock.writeLock().unlock();
+ }
+ }
+ });
+ }
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityPersisted event) {
+ if (event.getEntity() instanceof BuildMetric) {
+ BuildMetric buildMetric = (BuildMetric) event.getEntity();
+ String reportName = buildMetric.getReportName();
+ String jobName = buildMetric.getBuild().getJobName();
+ Key key = new Key(buildMetric.getBuild().getProject().getId(), event.getEntity().getClass());
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ reportNamesLock.writeLock().lock();
+ try {
+ populateReportNames(key, jobName, reportName);
+ } finally {
+ reportNamesLock.writeLock().unlock();
+ }
+ }
+
+ });
+ }
+ }
+
+ private void populateReportNames(Key key, String jobName, String reportName) {
+ Map<String, Collection<String>> reportNamesOfKey = reportNames.get(key);
+ if (reportNamesOfKey == null) {
+ reportNamesOfKey = new HashMap<>();
+ reportNames.put(key, reportNamesOfKey);
+ }
+ Collection<String> reportNamesOfJob = reportNamesOfKey.get(jobName);
+ if (reportNamesOfJob == null) {
+ reportNamesOfJob = new HashSet<>();
+ reportNamesOfKey.put(jobName, reportNamesOfJob);
+ }
+ reportNamesOfJob.add(reportName);
+ }
+
+ private void populateAccessibleReportNames(Map<String, Collection<String>> accessibleReportNames,
+ Map<String, Collection<String>> availableReportNames, Project project, Role role) {
+ for (Map.Entry<String, Collection<String>> entry: availableReportNames.entrySet()) {
+ String jobName = entry.getKey();
+ for (String reportName: entry.getValue()) {
+ if (role.implies(new JobPermission(jobName, new AccessBuildReports(reportName)))) {
+ Collection<String> accessibleReportNamesOfJob = accessibleReportNames.get(jobName);
+ if (accessibleReportNamesOfJob == null) {
+ accessibleReportNamesOfJob = new HashSet<>();
+ accessibleReportNames.put(jobName, accessibleReportNamesOfJob);
+ }
+ accessibleReportNamesOfJob.add(reportName);
+ }
+ }
+ }
+ }
+
+ @Override
+ public Map<String, Collection<String>> getAccessibleReportNames(Project project, Class<?> metricClass) {
+ reportNamesLock.readLock().lock();
+ try {
+ Map<String, Collection<String>> accessibleReportNames = new HashMap<>();
+ Key key = new Key(project.getId(), metricClass);
+ Map<String, Collection<String>> availableReportNames = reportNames.get(key);
+ if (availableReportNames != null) {
+ if (SecurityUtils.isAdministrator()) {
+ for (Map.Entry<String, Collection<String>> entry: availableReportNames.entrySet())
+ accessibleReportNames.put(entry.getKey(), new HashSet<>(entry.getValue()));
+ } else {
+ User user = SecurityUtils.getUser();
+ if (user != null) {
+ for (UserAuthorization authorization: user.getAuthorizations()) {
+ if (project.equals(authorization.getProject())) {
+ populateAccessibleReportNames(accessibleReportNames, availableReportNames,
+ project, authorization.getRole());
+ }
+ }
+ for (Group group: user.getGroups()) {
+ for (GroupAuthorization authorization: group.getAuthorizations()) {
+ if (project.equals(authorization.getProject())) {
+ populateAccessibleReportNames(accessibleReportNames, availableReportNames,
+ project, authorization.getRole());
+ }
+ }
+ }
+ }
+ Group group = groupManager.findAnonymous();
+ if (group != null) {
+ for (GroupAuthorization authorization: group.getAuthorizations()) {
+ if (project.equals(authorization.getProject())) {
+ populateAccessibleReportNames(accessibleReportNames, availableReportNames,
+ project, authorization.getRole());
+ }
+ }
+ }
+ }
+ }
+ return accessibleReportNames;
+ } finally {
+ reportNamesLock.readLock().unlock();
+ }
+ }
+
+ private static class Key {
+
+ private final Long projectId;
+
+ private final Class<?> metricClass;
+
+ public Key(Long projectId, Class<?> metricClass) {
+ this.projectId = projectId;
+ this.metricClass = metricClass;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (!(other instanceof Key))
+ return false;
+ if (this == other)
+ return true;
+ Key otherKey = (Key) other;
+ return new EqualsBuilder()
+ .append(projectId, otherKey.projectId)
+ .append(metricClass, otherKey.metricClass)
+ .isEquals();
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder(17, 37)
+ .append(projectId)
+ .append(metricClass)
+ .toHashCode();
+ }
+
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java
index cf471312d9..2f6636421a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java
@@ -28,11 +28,11 @@ import io.onedev.server.model.Project;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
@Singleton
-public class DefaultBuildParamManager extends AbstractEntityManager<BuildParam> implements BuildParamManager {
+public class DefaultBuildParamManager extends BaseEntityManager<BuildParam> implements BuildParamManager {
private static final Logger logger = LoggerFactory.getLogger(DefaultBuildParamManager.class);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.java
index 36bee885e2..18a9d801ae 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.java
@@ -13,12 +13,12 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
@Singleton
-public class DefaultBuildQuerySettingManager extends AbstractEntityManager<BuildQuerySetting>
+public class DefaultBuildQuerySettingManager extends BaseEntityManager<BuildQuerySetting>
implements BuildQuerySettingManager {
@Inject
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
index 34f91bd2f7..278f45a210 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
@@ -52,7 +52,7 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.Mark;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -64,7 +64,7 @@ import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.util.diff.WhitespaceOption;
@Singleton
-public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment> implements CodeCommentManager {
+public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> implements CodeCommentManager {
private final int MAX_HISTORY_COMMITS_TO_CHECK = 50000;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentQuerySettingManager.java
index 373e597b51..3b3d883841 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentQuerySettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentQuerySettingManager.java
@@ -11,12 +11,12 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
@Singleton
-public class DefaultCodeCommentQuerySettingManager extends AbstractEntityManager<CodeCommentQuerySetting>
+public class DefaultCodeCommentQuerySettingManager extends BaseEntityManager<CodeCommentQuerySetting>
implements CodeCommentQuerySettingManager {
@Inject
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.java
index 3c2e251958..6c97416f06 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.java
@@ -11,11 +11,11 @@ import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.PullRequest;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
@Singleton
-public class DefaultCodeCommentReplyManager extends AbstractEntityManager<CodeCommentReply>
+public class DefaultCodeCommentReplyManager extends BaseEntityManager<CodeCommentReply>
implements CodeCommentReplyManager {
private final ListenerRegistry listenerRegistry;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQuerySettingManager.java
index c4f4a006a7..751a7cdca7 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQuerySettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQuerySettingManager.java
@@ -13,12 +13,12 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
@Singleton
-public class DefaultCommitQuerySettingManager extends AbstractEntityManager<CommitQuerySetting>
+public class DefaultCommitQuerySettingManager extends BaseEntityManager<CommitQuerySetting>
implements CommitQuerySettingManager {
@Inject
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java
index ee1b5ab43f..67ca3b3ee1 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java
@@ -11,11 +11,11 @@ import io.onedev.server.entitymanager.GroupAuthorizationManager;
import io.onedev.server.model.Group;
import io.onedev.server.model.GroupAuthorization;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
@Singleton
-public class DefaultGroupAuthorizationManager extends AbstractEntityManager<GroupAuthorization>
+public class DefaultGroupAuthorizationManager extends BaseEntityManager<GroupAuthorization>
implements GroupAuthorizationManager {
@Inject
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
index 6fc73e3173..e032297c02 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
@@ -22,13 +22,13 @@ import io.onedev.server.model.support.administration.SecuritySetting;
import io.onedev.server.model.support.administration.authenticator.Authenticator;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.util.usage.Usage;
@Singleton
-public class DefaultGroupManager extends AbstractEntityManager<Group> implements GroupManager {
+public class DefaultGroupManager extends BaseEntityManager<Group> implements GroupManager {
private static final Logger logger = LoggerFactory.getLogger(DefaultGroupManager.class);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
index 9ff204326f..592205720f 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
@@ -74,7 +74,7 @@ import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeDat
import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.search.entity.issue.IssueCriteria;
import io.onedev.server.search.entity.issue.IssueQuery;
@@ -93,7 +93,7 @@ import io.onedev.server.util.schedule.SchedulableTask;
import io.onedev.server.util.schedule.TaskScheduler;
@Singleton
-public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange>
+public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
implements IssueChangeManager, SchedulableTask {
private static final Logger logger = LoggerFactory.getLogger(DefaultIssueChangeManager.class);
@@ -558,7 +558,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
criterias.add(new UpdateDateCriteria(
new DateTime().minusDays(trigger.getDays()).toDate(),
- IssueQueryLexer.IsBefore));
+ IssueQueryLexer.IsUntil));
query = new IssueQuery(IssueCriteria.and(criterias), new ArrayList<>());
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java
index 6f20948cfe..4d38242600 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java
@@ -8,11 +8,11 @@ import io.onedev.server.entitymanager.IssueCommentManager;
import io.onedev.server.event.issue.IssueCommented;
import io.onedev.server.model.IssueComment;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
@Singleton
-public class DefaultIssueCommentManager extends AbstractEntityManager<IssueComment>
+public class DefaultIssueCommentManager extends BaseEntityManager<IssueComment>
implements IssueCommentManager {
private final ListenerRegistry listenerRegistry;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java
index 77f4c79170..6b79240051 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java
@@ -17,11 +17,11 @@ import io.onedev.server.model.IssueField;
import io.onedev.server.model.support.issue.fieldspec.FieldSpec;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
@Singleton
-public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField> implements IssueFieldManager {
+public class DefaultIssueFieldManager extends BaseEntityManager<IssueField> implements IssueFieldManager {
@Inject
public DefaultIssueFieldManager(Dao dao) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index 6d4c01d3f8..bb7f5f3699 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -65,7 +65,7 @@ import io.onedev.server.model.support.issue.fieldspec.FieldSpec;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -84,7 +84,7 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValu
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;
@Singleton
-public class DefaultIssueManager extends AbstractEntityManager<Issue> implements IssueManager {
+public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssueManager {
private static final Logger logger = LoggerFactory.getLogger(DefaultIssueManager.class);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQuerySettingManager.java
index bc5c1b68da..9332b3d9da 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQuerySettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQuerySettingManager.java
@@ -13,12 +13,12 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
@Singleton
-public class DefaultIssueQuerySettingManager extends AbstractEntityManager<IssueQuerySetting>
+public class DefaultIssueQuerySettingManager extends BaseEntityManager<IssueQuerySetting>
implements IssueQuerySettingManager {
@Inject
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueVoteManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueVoteManager.java
index e725b019ae..7a8607bb55 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueVoteManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueVoteManager.java
@@ -6,11 +6,11 @@ import javax.inject.Singleton;
import io.onedev.server.entitymanager.IssueVoteManager;
import io.onedev.server.model.IssueVote;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
@Singleton
-public class DefaultIssueVoteManager extends AbstractEntityManager<IssueVote>
+public class DefaultIssueVoteManager extends BaseEntityManager<IssueVote>
implements IssueVoteManager {
@Inject
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.java
index f7f92473f3..f3d1a907b4 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.java
@@ -9,12 +9,12 @@ import io.onedev.server.entitymanager.IssueWatchManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueWatch;
import io.onedev.server.model.User;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
@Singleton
-public class DefaultIssueWatchManager extends AbstractEntityManager<IssueWatch>
+public class DefaultIssueWatchManager extends BaseEntityManager<IssueWatch>
implements IssueWatchManager {
@Inject
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.java
index f0e24c89b0..b508958f9f 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.java
@@ -20,11 +20,11 @@ import io.onedev.server.model.Group;
import io.onedev.server.model.Membership;
import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
@Singleton
-public class DefaultMembershipManager extends AbstractEntityManager<Membership> implements MembershipManager {
+public class DefaultMembershipManager extends BaseEntityManager<Membership> implements MembershipManager {
private static final Logger logger = LoggerFactory.getLogger(DefaultMembershipManager.class);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java
index 7ab37f330f..4c511177ca 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java
@@ -15,12 +15,12 @@ import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
@Singleton
-public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> implements MilestoneManager {
+public class DefaultMilestoneManager extends BaseEntityManager<Milestone> implements MilestoneManager {
private final ProjectManager projectManager;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 54c9fe548e..fcf442079b 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -78,7 +78,7 @@ 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.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -94,7 +94,7 @@ import io.onedev.server.util.usage.Usage;
import io.onedev.server.web.avatar.AvatarManager;
@Singleton
-public class DefaultProjectManager extends AbstractEntityManager<Project>
+public class DefaultProjectManager extends BaseEntityManager<Project>
implements ProjectManager, SchedulableTask {
private static final Logger logger = LoggerFactory.getLogger(DefaultProjectManager.class);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.java
index 68b160104c..c6e190a0d7 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestAssignmentManager.java
@@ -13,12 +13,12 @@ import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestAssigneeAddData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestAssigneeRemoveData;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.security.SecurityUtils;
@Singleton
-public class DefaultPullRequestAssignmentManager extends AbstractEntityManager<PullRequestAssignment>
+public class DefaultPullRequestAssignmentManager extends BaseEntityManager<PullRequestAssignment>
implements PullRequestAssignmentManager {
private final PullRequestChangeManager pullRequestChangeManager;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
index aee7bd8cc0..b09ed5db12 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
@@ -18,12 +18,12 @@ import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescript
import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeStrategyChangeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestTitleChangeData;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.security.SecurityUtils;
@Singleton
-public class DefaultPullRequestChangeManager extends AbstractEntityManager<PullRequestChange>
+public class DefaultPullRequestChangeManager extends BaseEntityManager<PullRequestChange>
implements PullRequestChangeManager {
private final ListenerRegistry listenerRegistry;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java
index 05c1cbddf9..22180ab6a8 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java
@@ -9,11 +9,11 @@ import io.onedev.server.event.pullrequest.PullRequestCommentCreated;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestComment;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
@Singleton
-public class DefaultPullRequestCommentManager extends AbstractEntityManager<PullRequestComment>
+public class DefaultPullRequestCommentManager extends BaseEntityManager<PullRequestComment>
implements PullRequestCommentManager {
private final ListenerRegistry listenerRegistry;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 18c320ba8d..41b3bef48c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -112,7 +112,7 @@ 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.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -130,7 +130,7 @@ import io.onedev.server.util.work.BatchWorkManager;
import io.onedev.server.util.work.BatchWorker;
@Singleton
-public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest> implements PullRequestManager {
+public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> implements PullRequestManager {
private static final Logger logger = LoggerFactory.getLogger(DefaultPullRequestManager.class);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQuerySettingManager.java
index e6bb3659a9..fa03b295fc 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQuerySettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQuerySettingManager.java
@@ -13,12 +13,12 @@ import io.onedev.server.model.PullRequestQuerySetting;
import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
@Singleton
-public class DefaultPullRequestQuerySettingManager extends AbstractEntityManager<PullRequestQuerySetting>
+public class DefaultPullRequestQuerySettingManager extends BaseEntityManager<PullRequestQuerySetting>
implements PullRequestQuerySettingManager {
@Inject
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
index bd5a291ffb..6e3659daf9 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
@@ -29,13 +29,13 @@ import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewer
import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerRemoveData;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.security.SecurityUtils;
@Singleton
-public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullRequestReview>
+public class DefaultPullRequestReviewManager extends BaseEntityManager<PullRequestReview>
implements PullRequestReviewManager {
private final PullRequestManager pullRequestManager;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
index 9bfe5df4ba..5ee9543ca1 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
@@ -19,12 +19,12 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
@Singleton
-public class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullRequestUpdate>
+public class DefaultPullRequestUpdateManager extends BaseEntityManager<PullRequestUpdate>
implements PullRequestUpdateManager {
private final ListenerRegistry listenerRegistry;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.java
index 69d5986281..5b4a8bdd4e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.java
@@ -9,12 +9,12 @@ import io.onedev.server.entitymanager.PullRequestWatchManager;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestWatch;
import io.onedev.server.model.User;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
@Singleton
-public class DefaultPullRequestWatchManager extends AbstractEntityManager<PullRequestWatch>
+public class DefaultPullRequestWatchManager extends BaseEntityManager<PullRequestWatch>
implements PullRequestWatchManager {
@Inject
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
index 690ffe9e67..26b3314b8a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
@@ -25,7 +25,7 @@ import io.onedev.server.model.support.role.NoneIssueFields;
import io.onedev.server.persistence.IdManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.util.usage.Usage;
@@ -33,7 +33,7 @@ import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
@Singleton
-public class DefaultRoleManager extends AbstractEntityManager<Role> implements RoleManager {
+public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleManager {
private final SettingManager settingManager;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
index 5053a4ad6d..c187213d73 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
@@ -29,12 +29,12 @@ import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.model.support.administration.sso.SsoConnector;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
@Singleton
-public class DefaultSettingManager extends AbstractEntityManager<Setting> implements SettingManager {
+public class DefaultSettingManager extends BaseEntityManager<Setting> implements SettingManager {
private final DataManager dataManager;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java
index befcd04602..a1cc2d2724 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java
@@ -25,13 +25,13 @@ import io.onedev.server.model.SshKey;
import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.ssh.SshKeyUtils;
@Singleton
-public class DefaultSshKeyManager extends AbstractEntityManager<SshKey> implements SshKeyManager {
+public class DefaultSshKeyManager extends BaseEntityManager<SshKey> implements SshKeyManager {
private static final Logger logger = LoggerFactory.getLogger(DefaultSshKeyManager.class);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java
index 968a961063..08c51b0032 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java
@@ -12,11 +12,11 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.UserAuthorization;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
@Singleton
-public class DefaultUserAuthorizationManager extends AbstractEntityManager<UserAuthorization>
+public class DefaultUserAuthorizationManager extends BaseEntityManager<UserAuthorization>
implements UserAuthorizationManager {
@Inject
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
index 162b61fac6..14e42b564e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
@@ -32,13 +32,13 @@ import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.persistence.IdManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.util.usage.Usage;
@Singleton
-public class DefaultUserManager extends AbstractEntityManager<User> implements UserManager {
+public class DefaultUserManager extends BaseEntityManager<User> implements UserManager {
private final ProjectManager projectManager;
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index c40924e7c7..81b65ae53c 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -3,6 +3,7 @@ package io.onedev.server.model;
import static io.onedev.server.model.Build.PROP_CANCELLER_NAME;
import static io.onedev.server.model.Build.PROP_COMMIT;
import static io.onedev.server.model.Build.PROP_FINISH_DATE;
+import static io.onedev.server.model.Build.PROP_FINISH_DAY;
import static io.onedev.server.model.Build.PROP_JOB;
import static io.onedev.server.model.Build.PROP_NUMBER;
import static io.onedev.server.model.Build.PROP_PENDING_DATE;
@@ -59,8 +60,8 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
@@ -74,6 +75,7 @@ import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
import io.onedev.server.infomanager.CommitInfoManager;
+import io.onedev.server.model.support.BuildMetric;
import io.onedev.server.model.support.build.JobSecret;
import io.onedev.server.model.support.inputspec.SecretInput;
import io.onedev.server.search.entity.EntityCriteria;
@@ -81,6 +83,7 @@ import io.onedev.server.storage.StorageManager;
import io.onedev.server.util.BeanUtils;
import io.onedev.server.util.CollectionUtils;
import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.Day;
import io.onedev.server.util.Input;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.MatrixRunner;
@@ -107,11 +110,10 @@ import io.onedev.server.web.util.WicketUtils;
@Index(columnList=PROP_STATUS), @Index(columnList=PROP_REF_NAME),
@Index(columnList=PROP_SUBMIT_DATE), @Index(columnList=PROP_PENDING_DATE),
@Index(columnList=PROP_RUNNING_DATE), @Index(columnList=PROP_FINISH_DATE),
- @Index(columnList=PROP_VERSION), @Index(columnList="o_numberScope_id"),
- @Index(columnList="o_project_id, " + PROP_COMMIT)},
+ @Index(columnList=PROP_FINISH_DAY), @Index(columnList=PROP_VERSION),
+ @Index(columnList="o_numberScope_id"), @Index(columnList="o_project_id, " + PROP_COMMIT)},
uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})}
)
-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
public class Build extends AbstractEntity implements Referenceable {
private static final long serialVersionUID = 1L;
@@ -170,6 +172,8 @@ public class Build extends AbstractEntity implements Referenceable {
public static final String PROP_FINISH_DATE = "finishDate";
+ public static final String PROP_FINISH_DAY = "finishDay";
+
public static final String NAME_COMMIT = "Commit";
public static final String NAME_BRANCH = "Branch";
@@ -202,14 +206,17 @@ public class Build extends AbstractEntity implements Referenceable {
public static final Set<String> ALL_FIELDS = Sets.newHashSet(
NAME_PROJECT, NAME_NUMBER, NAME_JOB, NAME_STATUS, NAME_SUBMITTER, NAME_CANCELLER,
- NAME_SUBMIT_DATE, NAME_PENDING_DATE, NAME_RUNNING_DATE, NAME_FINISH_DATE,
+ NAME_SUBMIT_DATE, NAME_PENDING_DATE, NAME_RUNNING_DATE, NAME_FINISH_DATE,
NAME_PULL_REQUEST, NAME_BRANCH, NAME_TAG, NAME_COMMIT, NAME_VERSION, NAME_DEPENDENCIES,
- NAME_DEPENDENTS, NAME_ERROR_MESSAGE, NAME_LOG, NAME_IMAGE);
+ NAME_DEPENDENTS, NAME_ERROR_MESSAGE, NAME_LOG, NAME_IMAGE, BuildMetric.NAME_REPORT);
public static final List<String> QUERY_FIELDS = Lists.newArrayList(
NAME_PROJECT, NAME_JOB, NAME_NUMBER, NAME_BRANCH, NAME_TAG, NAME_VERSION, NAME_PULL_REQUEST,
NAME_COMMIT, NAME_SUBMIT_DATE, NAME_PENDING_DATE, NAME_RUNNING_DATE, NAME_FINISH_DATE);
+ public static final List<String> METRIC_QUERY_FIELDS = Lists.newArrayList(
+ NAME_JOB, NAME_BRANCH, NAME_PULL_REQUEST, BuildMetric.NAME_REPORT);
+
public static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(
NAME_JOB, PROP_JOB,
NAME_STATUS, PROP_STATUS,
@@ -300,6 +307,8 @@ public class Build extends AbstractEntity implements Referenceable {
private Date retryDate;
+ private Integer finishDay;
+
@Column(nullable=false, length=1000)
private String submitReason;
@@ -521,6 +530,11 @@ public class Build extends AbstractEntity implements Referenceable {
public void setFinishDate(Date finishDate) {
this.finishDate = finishDate;
+ if (finishDate != null) {
+ finishDay = new Day(finishDate).getValue();
+ } else {
+ finishDay = null;
+ }
}
public Date getRetryDate() {
@@ -531,6 +545,11 @@ public class Build extends AbstractEntity implements Referenceable {
this.retryDate = retryDate;
}
+ @Nullable
+ public Integer getFinishDay() {
+ return finishDay;
+ }
+
public Collection<BuildParam> getParams() {
return params;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/BuildDependence.java b/server-core/src/main/java/io/onedev/server/model/BuildDependence.java
index fe63e53e8c..9b0e0ca523 100644
--- a/server-core/src/main/java/io/onedev/server/model/BuildDependence.java
+++ b/server-core/src/main/java/io/onedev/server/model/BuildDependence.java
@@ -9,15 +9,11 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-
@Entity
@Table(
indexes={@Index(columnList="o_dependent_id"), @Index(columnList="o_dependency_id")},
uniqueConstraints={@UniqueConstraint(columnNames={"o_dependent_id", "o_dependency_id"})
})
-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
public class BuildDependence extends AbstractEntity {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/model/BuildParam.java b/server-core/src/main/java/io/onedev/server/model/BuildParam.java
index 9e6c0589fa..73d3681757 100644
--- a/server-core/src/main/java/io/onedev/server/model/BuildParam.java
+++ b/server-core/src/main/java/io/onedev/server/model/BuildParam.java
@@ -1,5 +1,8 @@
package io.onedev.server.model;
+import static io.onedev.server.model.BuildParam.PROP_NAME;
+import static io.onedev.server.model.BuildParam.PROP_VALUE;
+
import javax.annotation.Nullable;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -10,11 +13,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-
import com.fasterxml.jackson.annotation.JsonView;
-import static io.onedev.server.model.BuildParam.*;
import io.onedev.server.util.jackson.DefaultView;
@@ -26,7 +25,6 @@ import io.onedev.server.util.jackson.DefaultView;
@Table(
indexes={@Index(columnList="o_build_id"), @Index(columnList=PROP_NAME), @Index(columnList=PROP_VALUE)},
uniqueConstraints={@UniqueConstraint(columnNames={"o_build_id", PROP_NAME, PROP_VALUE})})
-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
public class BuildParam extends AbstractEntity {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index ca874beffe..a27039a684 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -40,8 +40,6 @@ import javax.persistence.UniqueConstraint;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.DynamicUpdate;
import com.fasterxml.jackson.annotation.JsonView;
@@ -54,8 +52,8 @@ import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.infomanager.PullRequestInfoManager;
import io.onedev.server.infomanager.CommitInfoManager;
+import io.onedev.server.infomanager.PullRequestInfoManager;
import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.model.support.LastUpdate;
@@ -84,7 +82,6 @@ import io.onedev.server.web.editable.annotation.Editable;
@Index(columnList=PROP_COMMENT_COUNT), @Index(columnList="o_milestone_id"),
@Index(columnList=LastUpdate.COLUMN_DATE), @Index(columnList="o_numberScope_id")},
uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})})
-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
//use dynamic update in order not to overwrite other edits while background threads change update date
@DynamicUpdate
@Editable
diff --git a/server-core/src/main/java/io/onedev/server/model/JestTestMetric.java b/server-core/src/main/java/io/onedev/server/model/JestTestMetric.java
new file mode 100644
index 0000000000..eeceb9843d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/JestTestMetric.java
@@ -0,0 +1,100 @@
+package io.onedev.server.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import io.onedev.server.model.support.BuildMetric;
+import io.onedev.server.util.MetricIndicator;
+
+@Entity
+@Table(indexes={@Index(columnList="o_build_id"), @Index(columnList=BuildMetric.PROP_REPORT)})
+public class JestTestMetric extends AbstractEntity implements BuildMetric {
+
+ private static final long serialVersionUID = 1L;
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
+ private Build build;
+
+ @Column(nullable=false)
+ private String reportName;
+
+ private int testSuiteSuccessRate;
+
+ private int testCaseSuccessRate;
+
+ private int totalTestDuration;
+
+ private int numOfTestSuites;
+
+ private int numOfTestCases;
+
+ @Override
+ public Build getBuild() {
+ return build;
+ }
+
+ public void setBuild(Build build) {
+ this.build = build;
+ }
+
+ @Override
+ public String getReportName() {
+ return reportName;
+ }
+
+ public void setReportName(String reportName) {
+ this.reportName = reportName;
+ }
+
+ @MetricIndicator(order=100, valueFormatter=BuildMetric.FORMAT_PERCENTAGE, maxValue=100)
+ public int getTestSuiteSuccessRate() {
+ return testSuiteSuccessRate;
+ }
+
+ public void setTestSuiteSuccessRate(int testSuiteSuccessRate) {
+ this.testSuiteSuccessRate = testSuiteSuccessRate;
+ }
+
+ @MetricIndicator(order=200, valueFormatter=BuildMetric.FORMAT_PERCENTAGE, maxValue=100)
+ public int getTestCaseSuccessRate() {
+ return testCaseSuccessRate;
+ }
+
+ public void setTestCaseSuccessRate(int testCaseSuccessRate) {
+ this.testCaseSuccessRate = testCaseSuccessRate;
+ }
+
+ @MetricIndicator(order=300, valueFormatter=BuildMetric.FORMAT_DURATION)
+ public int getTotalTestDuration() {
+ return totalTestDuration;
+ }
+
+ public void setTotalTestDuration(int totalTestDuration) {
+ this.totalTestDuration = totalTestDuration;
+ }
+
+ @MetricIndicator(order=400)
+ public int getNumOfTestSuites() {
+ return numOfTestSuites;
+ }
+
+ public void setNumOfTestSuites(int numOfTestSuites) {
+ this.numOfTestSuites = numOfTestSuites;
+ }
+
+ @MetricIndicator(order=500)
+ public int getNumOfTestCases() {
+ return numOfTestCases;
+ }
+
+ public void setNumOfTestCases(int numOfTestCases) {
+ this.numOfTestCases = numOfTestCases;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 2283703f80..0cf859bf94 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -1069,8 +1069,8 @@ public class Project extends AbstractEntity {
namedCodeCommentQueries = new ArrayList<>();
namedCodeCommentQueries.add(new NamedCodeCommentQuery("All", null));
namedCodeCommentQueries.add(new NamedCodeCommentQuery("Created by me", "created by me"));
- namedCodeCommentQueries.add(new NamedCodeCommentQuery("Created recently", "\"Create Date\" is after \"last week\""));
- namedCodeCommentQueries.add(new NamedCodeCommentQuery("Updated recently", "\"Update Date\" is after \"last week\""));
+ namedCodeCommentQueries.add(new NamedCodeCommentQuery("Created recently", "\"Create Date\" is since \"last week\""));
+ namedCodeCommentQueries.add(new NamedCodeCommentQuery("Updated recently", "\"Update Date\" is since \"last week\""));
}
return namedCodeCommentQueries;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index 90948fbbdf..e6bf736f76 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -44,8 +44,6 @@ import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.Restrictions;
@@ -94,7 +92,6 @@ import io.onedev.server.web.util.WicketUtils;
uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})})
//use dynamic update in order not to overwrite other edits while background threads change update date
@DynamicUpdate
-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
public class PullRequest extends AbstractEntity implements Referenceable, AttachmentStorageSupport {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java b/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java
index d51866e4fa..897fb53cb1 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java
@@ -24,8 +24,6 @@ import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.transport.RefSpec;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
@@ -35,7 +33,6 @@ import io.onedev.server.git.GitUtils;
@Entity
@Table(indexes={@Index(columnList="o_request_id"), @Index(columnList="date")})
-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
public class PullRequestUpdate extends AbstractEntity {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.java
index 4d3b9d36c7..9ea5772037 100644
--- a/server-core/src/main/java/io/onedev/server/model/Role.java
+++ b/server-core/src/main/java/io/onedev/server/model/Role.java
@@ -282,7 +282,7 @@ public class Role extends AbstractEntity implements Permission {
if (jobPrivilege.getAccessibleReports() != null) {
AccessBuildReports accessBuildReports = new AccessBuildReports(jobPrivilege.getAccessibleReports());
permissions.add(new JobPermission(jobPrivilege.getJobNames(), accessBuildReports));
- }
+ }
}
} else {
if (manageProject || managePullRequests || manageCodeComments || codePrivilege != CodePrivilege.NONE)
diff --git a/server-core/src/main/java/io/onedev/server/model/support/BuildMetric.java b/server-core/src/main/java/io/onedev/server/model/support/BuildMetric.java
new file mode 100644
index 0000000000..b3dce1069a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/BuildMetric.java
@@ -0,0 +1,21 @@
+package io.onedev.server.model.support;
+
+import io.onedev.server.model.Build;
+
+public interface BuildMetric {
+
+ static final String PROP_BUILD = "build";
+
+ static final String NAME_REPORT = "Report";
+
+ static final String PROP_REPORT = "reportName";
+
+ static final String FORMAT_PERCENTAGE = "function(value) {return value+'%';}";
+
+ static final String FORMAT_DURATION = "function(seconds) {return onedev.server.formatBriefDuration(seconds);}";
+
+ Build getBuild();
+
+ String getReportName();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java
index 85a51a5d12..657204f0a3 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java
@@ -25,7 +25,7 @@ public class GlobalBuildSetting implements Serializable {
namedQueries.add(new NamedBuildQuery("Running", "running"));
namedQueries.add(new NamedBuildQuery("Waiting", "waiting"));
namedQueries.add(new NamedBuildQuery("Pending", "pending"));
- namedQueries.add(new NamedBuildQuery("Build recently", "\"Submit Date\" is after \"last week\""));
+ namedQueries.add(new NamedBuildQuery("Build recently", "\"Submit Date\" is since \"last week\""));
}
public List<NamedBuildQuery> getNamedQueries() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
index b5b6bfbe15..4e058c5640 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
@@ -253,8 +253,8 @@ public class GlobalIssueSetting implements Serializable {
namedQueries.add(new NamedIssueQuery("Submitted by me & Open", "submitted by me and \"State\" is \"Open\""));
namedQueries.add(new NamedIssueQuery("Assigned to me", "\"Assignees\" is me"));
namedQueries.add(new NamedIssueQuery("Submitted by me", "submitted by me"));
- namedQueries.add(new NamedIssueQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));
- namedQueries.add(new NamedIssueQuery("Updated recently", "\"Update Date\" is after \"last week\""));
+ namedQueries.add(new NamedIssueQuery("Submitted recently", "\"Submit Date\" is since \"last week\""));
+ namedQueries.add(new NamedIssueQuery("Updated recently", "\"Update Date\" is since \"last week\""));
namedQueries.add(new NamedIssueQuery("Open & Critical", "\"State\" is \"Open\" and \"Priority\" is \"Critical\""));
namedQueries.add(new NamedIssueQuery("Open & Unassigned", "\"State\" is \"Open\" and \"Assignees\" is empty"));
namedQueries.add(new NamedIssueQuery("Closed", "\"State\" is \"Closed\""));
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java
index 31ba075b82..7358857749 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java
@@ -21,8 +21,8 @@ public class GlobalPullRequestSetting implements Serializable {
namedQueries.add(new NamedPullRequestQuery("Requested for changes by me", "requested for changes by me"));
namedQueries.add(new NamedPullRequestQuery("Approved by me", "approved by me"));
namedQueries.add(new NamedPullRequestQuery("Submitted by me", "submitted by me"));
- namedQueries.add(new NamedPullRequestQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));
- namedQueries.add(new NamedPullRequestQuery("Updated recently", "\"Update Date\" is after \"last week\""));
+ namedQueries.add(new NamedPullRequestQuery("Submitted recently", "\"Submit Date\" is since \"last week\""));
+ namedQueries.add(new NamedPullRequestQuery("Updated recently", "\"Update Date\" is since \"last week\""));
namedQueries.add(new NamedPullRequestQuery("Closed", "merged or discarded"));
namedQueries.add(new NamedPullRequestQuery("All", null));
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
index 686fedec1d..7d72db490d 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
@@ -14,7 +14,6 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.util.EditContext;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.Patterns;
import io.onedev.server.web.editable.annotation.ShowCondition;
import io.onedev.server.web.util.SuggestionUtils;
@@ -104,7 +103,6 @@ public class JobPrivilege implements Serializable {
+ "Use '*' or '?' for wildcard match. Prefix with '-' to exclude. Leave empty to match all")
@ShowCondition("isAccessLogDisabled")
@Patterns
- @NameOfEmptyValue("All Reports")
@Nullable
public String getAccessibleReports() {
return accessibleReports;
diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java b/server-core/src/main/java/io/onedev/server/persistence/dao/BaseEntityManager.java
similarity index 92%
rename from server-core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java
rename to server-core/src/main/java/io/onedev/server/persistence/dao/BaseEntityManager.java
index 6acb9318c4..1372026633 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/BaseEntityManager.java
@@ -12,7 +12,7 @@ import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Project;
import io.onedev.server.util.ReflectionUtils;
-public abstract class AbstractEntityManager<T extends AbstractEntity> implements EntityManager<T> {
+public abstract class BaseEntityManager<T extends AbstractEntity> implements EntityManager<T> {
private final Class<T> entityClass;
@@ -21,8 +21,8 @@ public abstract class AbstractEntityManager<T extends AbstractEntity> implements
private final Map<Long, AtomicLong> nextNumbers = new HashMap<>();
@SuppressWarnings("unchecked")
- public AbstractEntityManager(Dao dao) {
- List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(AbstractEntityManager.class, getClass());
+ public BaseEntityManager(Dao dao) {
+ List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(BaseEntityManager.class, getClass());
if (typeArguments.size() == 1 && AbstractEntity.class.isAssignableFrom(typeArguments.get(0))) {
entityClass = (Class<T>) typeArguments.get(0);
} else {
@@ -130,4 +130,8 @@ public abstract class AbstractEntityManager<T extends AbstractEntity> implements
return dao.getSession();
}
+ public Class<T> getEntityClass() {
+ return entityClass;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/AndBuildMetricCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/AndBuildMetricCriteria.java
new file mode 100644
index 0000000000..0e6198e393
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/AndBuildMetricCriteria.java
@@ -0,0 +1,34 @@
+package io.onedev.server.search.buildmetric;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+public class AndBuildMetricCriteria extends BuildMetricCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final List<? extends BuildMetricCriteria> criterias;
+
+ public AndBuildMetricCriteria(List<? extends BuildMetricCriteria> criterias) {
+ this.criterias = criterias;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<?> metricRoot, Join<?, ?> buildJoin, CriteriaBuilder builder) {
+ List<Predicate> predicates = new ArrayList<>();
+ for (BuildMetricCriteria criteria: criterias)
+ predicates.add(criteria.getPredicate(metricRoot, buildJoin, builder));
+ return builder.and(predicates.toArray(new Predicate[0]));
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return new AndBuildMetricCriteria(criterias).toStringWithoutParens();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/BranchCriteria.java
new file mode 100644
index 0000000000..a5c73618c2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/BranchCriteria.java
@@ -0,0 +1,37 @@
+package io.onedev.server.search.buildmetric;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.eclipse.jgit.lib.Constants;
+
+import io.onedev.server.model.Build;
+
+public class BranchCriteria extends BuildMetricCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String value;
+
+ public BranchCriteria(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<?> metricRoot, Join<?, ?> buildJoin, CriteriaBuilder builder) {
+ Path<String> attribute = buildJoin.get(Build.PROP_REF_NAME);
+ String normalized = Constants.R_HEADS + value.toLowerCase().replace("*", "%");
+ return builder.like(builder.lower(attribute), normalized);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Build.NAME_BRANCH) + " "
+ + BuildMetricQuery.getRuleName(BuildMetricQueryLexer.Is) + " "
+ + quote(value);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildIsFailedCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildIsFailedCriteria.java
new file mode 100644
index 0000000000..cc47cbfbaa
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildIsFailedCriteria.java
@@ -0,0 +1,26 @@
+package io.onedev.server.search.buildmetric;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Build;
+
+public class BuildIsFailedCriteria extends BuildMetricCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate getPredicate(Root<?> metricRoot, Join<?, ?> buildJoin, CriteriaBuilder builder) {
+ Path<?> attribute = buildJoin.get(Build.PROP_STATUS);
+ return builder.equal(attribute, Build.Status.FAILED);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return BuildMetricQuery.getRuleName(BuildMetricQueryLexer.BuildIsFailed);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildIsSuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildIsSuccessfulCriteria.java
new file mode 100644
index 0000000000..f5d618efa2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildIsSuccessfulCriteria.java
@@ -0,0 +1,26 @@
+package io.onedev.server.search.buildmetric;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Build;
+
+public class BuildIsSuccessfulCriteria extends BuildMetricCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate getPredicate(Root<?> metricRoot, Join<?, ?> buildJoin, CriteriaBuilder builder) {
+ Path<?> attribute = buildJoin.get(Build.PROP_STATUS);
+ return builder.equal(attribute, Build.Status.SUCCESSFUL);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return BuildMetricQuery.getRuleName(BuildMetricQueryLexer.BuildIsSuccessful);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricCriteria.java
new file mode 100644
index 0000000000..b247d10176
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricCriteria.java
@@ -0,0 +1,39 @@
+package io.onedev.server.search.buildmetric;
+
+import java.io.Serializable;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.commons.utils.StringUtils;
+
+public abstract class BuildMetricCriteria implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private boolean withParens;
+
+ public BuildMetricCriteria withParens(boolean withParens) {
+ this.withParens = withParens;
+ return this;
+ }
+
+ public abstract Predicate getPredicate(Root<?> metrixRoot, Join<?, ?> buildJoin, CriteriaBuilder builder);
+
+ public static String quote(String value) {
+ return "\"" + StringUtils.escape(value, "\"") + "\"";
+ }
+
+ @Override
+ public String toString() {
+ if (withParens)
+ return "(" + toStringWithoutParens() + ")";
+ else
+ return toStringWithoutParens();
+ }
+
+ public abstract String toStringWithoutParens();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.g4 b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.g4
new file mode 100644
index 0000000000..d87b5b2ea1
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.g4
@@ -0,0 +1,72 @@
+grammar BuildMetricQuery;
+
+query
+ : WS* criteria WS* EOF
+ ;
+
+criteria
+ : operator=(BuildIsSuccessful|BuildIsFailed) #OperatorCriteria
+ | criteriaField=Quoted WS+ operator=IsEmpty #FieldOperatorCriteria
+ | operator=(Since|Until) WS+ criteriaValue=Quoted #OperatorValueCriteria
+ | criteriaField=Quoted WS+ operator=Is WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
+ | criteria WS+ And WS+ criteria #AndCriteria
+ | criteria WS+ Or WS+ criteria #OrCriteria
+ | Not WS* LParens WS* criteria WS* RParens #NotCriteria
+ | LParens WS* criteria WS* RParens #ParensCriteria
+ ;
+
+BuildIsSuccessful
+ : 'build' WS+ 'is' WS+ 'successful'
+ ;
+
+BuildIsFailed
+ : 'build' WS+ 'is' WS+ 'failed'
+ ;
+
+Is
+ : 'is'
+ ;
+
+IsEmpty
+ : 'is' WS+ 'empty'
+ ;
+
+Since
+ : 'since'
+ ;
+
+Until
+ : 'until'
+ ;
+
+And
+ : 'and'
+ ;
+
+Or
+ : 'or'
+ ;
+
+Not
+ : 'not'
+ ;
+
+LParens
+ : '('
+ ;
+
+RParens
+ : ')'
+ ;
+
+Quoted
+ : '"' ('\\'.|~[\\"])+? '"'
+ ;
+
+WS
+ : ' '
+ ;
+
+Identifier
+ : [a-zA-Z0-9:_/\\+\-;]+
+ ;
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java
new file mode 100644
index 0000000000..a37f9a2991
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java
@@ -0,0 +1,220 @@
+package io.onedev.server.search.buildmetric;
+
+import static io.onedev.server.model.Build.METRIC_QUERY_FIELDS;
+import static io.onedev.server.model.Build.NAME_BRANCH;
+import static io.onedev.server.model.Build.NAME_JOB;
+import static io.onedev.server.model.Build.NAME_PULL_REQUEST;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+
+import io.onedev.commons.codeassist.AntlrUtils;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.BuildParamManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.BuildMetric;
+import io.onedev.server.search.buildmetric.BuildMetricQueryParser.AndCriteriaContext;
+import io.onedev.server.search.buildmetric.BuildMetricQueryParser.CriteriaContext;
+import io.onedev.server.search.buildmetric.BuildMetricQueryParser.FieldOperatorCriteriaContext;
+import io.onedev.server.search.buildmetric.BuildMetricQueryParser.FieldOperatorValueCriteriaContext;
+import io.onedev.server.search.buildmetric.BuildMetricQueryParser.NotCriteriaContext;
+import io.onedev.server.search.buildmetric.BuildMetricQueryParser.OperatorCriteriaContext;
+import io.onedev.server.search.buildmetric.BuildMetricQueryParser.OperatorValueCriteriaContext;
+import io.onedev.server.search.buildmetric.BuildMetricQueryParser.OrCriteriaContext;
+import io.onedev.server.search.buildmetric.BuildMetricQueryParser.ParensCriteriaContext;
+import io.onedev.server.search.buildmetric.BuildMetricQueryParser.QueryContext;
+import io.onedev.server.search.entity.EntityQuery;
+
+public class BuildMetricQuery implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final BuildMetricCriteria criteria;
+
+ public BuildMetricQuery(@Nullable BuildMetricCriteria criteria) {
+ this.criteria = criteria;
+ }
+
+ public BuildMetricQuery() {
+ this(null);
+ }
+
+ public static BuildMetricQuery parse(Project project, @Nullable String queryString) {
+ if (queryString != null) {
+ CharStream is = CharStreams.fromString(queryString);
+ BuildMetricQueryLexer lexer = new BuildMetricQueryLexer(is);
+ lexer.removeErrorListeners();
+ lexer.addErrorListener(new BaseErrorListener() {
+
+ @Override
+ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
+ int charPositionInLine, String msg, RecognitionException e) {
+ throw new RuntimeException("Malformed metric query", e);
+ }
+
+ });
+ CommonTokenStream tokens = new CommonTokenStream(lexer);
+ BuildMetricQueryParser parser = new BuildMetricQueryParser(tokens);
+ parser.removeErrorListeners();
+ parser.setErrorHandler(new BailErrorStrategy());
+ QueryContext queryContext = parser.query();
+ CriteriaContext criteriaContext = queryContext.criteria();
+ BuildMetricCriteria metricCriteria;
+ if (criteriaContext != null) {
+ metricCriteria = new BuildMetricQueryBaseVisitor<BuildMetricCriteria>() {
+
+ @Override
+ public BuildMetricCriteria visitOperatorCriteria(OperatorCriteriaContext ctx) {
+ switch (ctx.operator.getType()) {
+ case BuildMetricQueryLexer.BuildIsSuccessful:
+ return new BuildIsSuccessfulCriteria();
+ case BuildMetricQueryLexer.BuildIsFailed:
+ return new BuildIsFailedCriteria();
+ default:
+ throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());
+ }
+ }
+
+ @Override
+ public BuildMetricCriteria visitParensCriteria(ParensCriteriaContext ctx) {
+ return (BuildMetricCriteria) visit(ctx.criteria()).withParens(true);
+ }
+
+ @Override
+ public BuildMetricCriteria visitFieldOperatorCriteria(FieldOperatorCriteriaContext ctx) {
+ String fieldName = EntityQuery.getValue(ctx.Quoted().getText());
+ int operator = ctx.operator.getType();
+ checkField(project, fieldName, operator);
+ if (fieldName.equals(NAME_PULL_REQUEST))
+ return new PullRequestIsEmptyCriteria();
+ else
+ return new ParamIsEmptyCriteria(fieldName);
+ }
+
+ @Override
+ public BuildMetricCriteria visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {
+ String fieldName = EntityQuery.getValue(ctx.Quoted(0).getText());
+ String value = EntityQuery.getValue(ctx.Quoted(1).getText());
+ int operator = ctx.operator.getType();
+ checkField(project, fieldName, operator);
+
+ switch (operator) {
+ case BuildMetricQueryLexer.Is:
+ switch (fieldName) {
+ case BuildMetric.NAME_REPORT:
+ return new ReportCriteria(value);
+ case NAME_JOB:
+ return new JobCriteria(value);
+ case NAME_BRANCH:
+ return new BranchCriteria(value);
+ default:
+ return new ParamCriteria(fieldName, value);
+ }
+ default:
+ throw new IllegalStateException();
+ }
+ }
+
+ @Override
+ public BuildMetricCriteria visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {
+ int operator = ctx.operator.getType();
+ String value = EntityQuery.getValue(ctx.Quoted().getText());
+ if (operator == BuildMetricQueryLexer.Since || operator == BuildMetricQueryLexer.Until)
+ return new DateCriteria(value, operator);
+ else
+ throw new RuntimeException("Unexpected criteria: " + ctx.operator.getText());
+ }
+
+ @Override
+ public BuildMetricCriteria visitOrCriteria(OrCriteriaContext ctx) {
+ List<BuildMetricCriteria> childCriterias = new ArrayList<>();
+ for (CriteriaContext childCtx: ctx.criteria())
+ childCriterias.add(visit(childCtx));
+ return new OrBuildMetricCriteria(childCriterias);
+ }
+
+ @Override
+ public BuildMetricCriteria visitAndCriteria(AndCriteriaContext ctx) {
+ List<BuildMetricCriteria> childCriterias = new ArrayList<>();
+ for (CriteriaContext childCtx: ctx.criteria())
+ childCriterias.add(visit(childCtx));
+ return new AndBuildMetricCriteria(childCriterias);
+ }
+
+ @Override
+ public BuildMetricCriteria visitNotCriteria(NotCriteriaContext ctx) {
+ return new NotBuildMetricCriteria(visit(ctx.criteria()));
+ }
+
+ }.visit(criteriaContext);
+ } else {
+ metricCriteria = null;
+ }
+
+ return new BuildMetricQuery(metricCriteria);
+ } else {
+ return new BuildMetricQuery();
+ }
+ }
+
+ public static void checkField(Project project, String fieldName, int operator) {
+ Collection<String> paramNames = OneDev.getInstance(BuildParamManager.class).getBuildParamNames(null);
+ if (!METRIC_QUERY_FIELDS.contains(fieldName) && !paramNames.contains(fieldName))
+ throw new ExplicitException("Field not found: " + fieldName);
+ switch (operator) {
+ case BuildMetricQueryLexer.Is:
+ if (!fieldName.equals(NAME_JOB) && !fieldName.equals(NAME_BRANCH)
+ && !fieldName.equals(BuildMetric.NAME_REPORT)
+ && !paramNames.contains(fieldName)) {
+ throw newOperatorException(fieldName, operator);
+ }
+ break;
+ case BuildMetricQueryLexer.IsEmpty:
+ if (!fieldName.equals(NAME_PULL_REQUEST) && !paramNames.contains(fieldName))
+ throw newOperatorException(fieldName, operator);
+ break;
+ }
+ }
+
+ private static ExplicitException newOperatorException(String fieldName, int operator) {
+ return new ExplicitException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");
+ }
+
+ public static String getRuleName(int rule) {
+ return AntlrUtils.getLexerRuleName(BuildMetricQueryLexer.ruleNames, rule);
+ }
+
+ public static int getOperator(String operatorName) {
+ return AntlrUtils.getLexerRule(BuildMetricQueryLexer.ruleNames, operatorName);
+ }
+
+ @Nullable
+ public BuildMetricCriteria getCriteria() {
+ return criteria;
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ if (getCriteria() != null)
+ builder.append(getCriteria().toString());
+ String toStringValue = builder.toString();
+ if (toStringValue.length() == 0)
+ toStringValue = null;
+ return toStringValue;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/DateCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/DateCriteria.java
new file mode 100644
index 0000000000..ada466e84a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/DateCriteria.java
@@ -0,0 +1,44 @@
+package io.onedev.server.search.buildmetric;
+
+import java.util.Date;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+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.search.entity.EntityQuery;
+
+public class DateCriteria extends BuildMetricCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final Date date;
+
+ private final String value;
+
+ public DateCriteria(String value, int operator) {
+ date = EntityQuery.getDateValue(value);
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<?> metricRoot, Join<?, ?> buildJoin, CriteriaBuilder builder) {
+ Path<Date> attribute = buildJoin.get(Build.PROP_FINISH_DATE);
+ if (operator == BuildMetricQueryLexer.Until)
+ return builder.lessThan(attribute, date);
+ else
+ return builder.greaterThan(attribute, date);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return BuildMetricQuery.getRuleName(operator) + " " + quote(value);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/JobCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/JobCriteria.java
new file mode 100644
index 0000000000..fdbbf7e001
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/JobCriteria.java
@@ -0,0 +1,35 @@
+package io.onedev.server.search.buildmetric;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Build;
+
+public class JobCriteria extends BuildMetricCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private String jobName;
+
+ public JobCriteria(String jobName) {
+ this.jobName = jobName;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<?> metricRoot, Join<?, ?> buildJoin, CriteriaBuilder builder) {
+ Path<String> attribute = buildJoin.get(Build.PROP_JOB);
+ String normalized = jobName.toLowerCase().replace("*", "%");
+ return builder.like(builder.lower(attribute), normalized);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Build.NAME_JOB) + " "
+ + BuildMetricQuery.getRuleName(BuildMetricQueryLexer.Is) + " "
+ + quote(jobName);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/NotBuildMetricCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/NotBuildMetricCriteria.java
new file mode 100644
index 0000000000..df126b60b4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/NotBuildMetricCriteria.java
@@ -0,0 +1,28 @@
+package io.onedev.server.search.buildmetric;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+public class NotBuildMetricCriteria extends BuildMetricCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final BuildMetricCriteria criteria;
+
+ public NotBuildMetricCriteria(BuildMetricCriteria criteria) {
+ this.criteria = criteria;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<?> metricRoot, Join<?, ?> buildJoin, CriteriaBuilder builder) {
+ return criteria.getPredicate(metricRoot, buildJoin, builder).not();
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return new NotBuildMetricCriteria(criteria).toStringWithoutParens();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/OrBuildMetricCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/OrBuildMetricCriteria.java
new file mode 100644
index 0000000000..ead1f8d64b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/OrBuildMetricCriteria.java
@@ -0,0 +1,34 @@
+package io.onedev.server.search.buildmetric;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+public class OrBuildMetricCriteria extends BuildMetricCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final List<? extends BuildMetricCriteria> criterias;
+
+ public OrBuildMetricCriteria(List<? extends BuildMetricCriteria> criterias) {
+ this.criterias = criterias;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<?> metricRoot, Join<?, ?> buildJoin, CriteriaBuilder builder) {
+ List<Predicate> predicates = new ArrayList<>();
+ for (BuildMetricCriteria criteria: criterias)
+ predicates.add(criteria.getPredicate(metricRoot, buildJoin, builder));
+ return builder.or(predicates.toArray(new Predicate[0]));
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return new OrBuildMetricCriteria(criterias).toStringWithoutParens();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/ParamCriteria.java
new file mode 100644
index 0000000000..15f5152bf3
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/ParamCriteria.java
@@ -0,0 +1,41 @@
+package io.onedev.server.search.buildmetric;
+
+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.model.Build;
+import io.onedev.server.model.BuildParam;
+
+public class ParamCriteria extends BuildMetricCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private String name;
+
+ private String value;
+
+ public ParamCriteria(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<?> metricRoot, Join<?, ?> buildJoin, CriteriaBuilder builder) {
+ Join<?, ?> paramJoin = buildJoin.join(Build.PROP_PARAMS, JoinType.LEFT);
+ paramJoin.on(builder.and(
+ builder.equal(paramJoin.get(BuildParam.PROP_NAME), name)),
+ builder.equal(paramJoin.get(BuildParam.PROP_VALUE), value));
+ return paramJoin.isNotNull();
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(name) + " "
+ + BuildMetricQuery.getRuleName(BuildMetricQueryLexer.Is) + " "
+ + quote(value);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/ParamIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/ParamIsEmptyCriteria.java
new file mode 100644
index 0000000000..71b4679edf
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/ParamIsEmptyCriteria.java
@@ -0,0 +1,38 @@
+package io.onedev.server.search.buildmetric;
+
+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.model.Build;
+import io.onedev.server.model.BuildParam;
+
+public class ParamIsEmptyCriteria extends BuildMetricCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private String name;
+
+ public ParamIsEmptyCriteria(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<?> metricRoot, Join<?, ?> buildJoin, CriteriaBuilder builder) {
+ Join<?, ?> join1 = buildJoin.join(Build.PROP_PARAMS, JoinType.LEFT);
+ join1.on(builder.and(
+ builder.equal(join1.get(BuildParam.PROP_NAME), name)),
+ builder.isNull(join1.get(BuildParam.PROP_VALUE)));
+ Join<?, ?> join2 = buildJoin.join(Build.PROP_PARAMS, JoinType.LEFT);
+ join2.on(builder.equal(join2.get(BuildParam.PROP_NAME), name));
+ return builder.or(join1.isNotNull(), join2.isNull());
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(name) + " " + BuildMetricQuery.getRuleName(BuildMetricQueryLexer.IsEmpty);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/PullRequestIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/PullRequestIsEmptyCriteria.java
new file mode 100644
index 0000000000..1ab540736f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/PullRequestIsEmptyCriteria.java
@@ -0,0 +1,24 @@
+package io.onedev.server.search.buildmetric;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Build;
+
+public class PullRequestIsEmptyCriteria extends BuildMetricCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate getPredicate(Root<?> metricRoot, Join<?, ?> buildJoin, CriteriaBuilder builder) {
+ return builder.isNull(buildJoin.get(Build.PROP_PULL_REQUEST));
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Build.NAME_PULL_REQUEST) + " " + BuildMetricQuery.getRuleName(BuildMetricQueryLexer.IsEmpty);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/ReportCriteria.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/ReportCriteria.java
new file mode 100644
index 0000000000..a950ea77d2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/ReportCriteria.java
@@ -0,0 +1,35 @@
+package io.onedev.server.search.buildmetric;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.support.BuildMetric;
+
+public class ReportCriteria extends BuildMetricCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String value;
+
+ public ReportCriteria(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<?> metricRoot, Join<?, ?> buildJoin, CriteriaBuilder builder) {
+ Path<String> attribute = metricRoot.get(BuildMetric.PROP_REPORT);
+ String normalized = value.toLowerCase().replace("*", "%");
+ return builder.like(builder.lower(attribute), normalized);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(BuildMetric.PROP_REPORT) + " "
+ + BuildMetricQuery.getRuleName(BuildMetricQueryLexer.Is) + " "
+ + quote(value);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
index 1d45381505..c7c9078b0f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
@@ -10,7 +10,7 @@ criteria
: operator=(Successful|Failed|Cancelled|Running|Waiting|Pending|TimedOut|SubmittedByMe|CancelledByMe) #OperatorCriteria
| criteriaField=Quoted WS+ operator=IsEmpty #FieldOperatorCriteria
| operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf) WS+ criteriaValue=Quoted #OperatorValueCriteria
- | criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsBefore|IsAfter) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
+ | criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsUntil|IsSince) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
| criteria WS+ And WS+ criteria #AndCriteria
| criteria WS+ Or WS+ criteria #OrCriteria
| Not WS* LParens WS* criteria WS* RParens #NotCriteria
@@ -97,12 +97,12 @@ IsLessThan
: 'is' WS+ 'less' WS+ 'than'
;
-IsAfter
- : 'is after'
+IsSince
+ : 'is since'
;
-IsBefore
- : 'is before'
+IsUntil
+ : 'is until'
;
And
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
index 33514a6def..68ffdabd4a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
@@ -184,8 +184,8 @@ public class BuildQuery extends EntityQuery<Build> {
checkField(project, fieldName, operator);
switch (operator) {
- case BuildQueryLexer.IsBefore:
- case BuildQueryLexer.IsAfter:
+ case BuildQueryLexer.IsUntil:
+ case BuildQueryLexer.IsSince:
if (fieldName.equals(NAME_SUBMIT_DATE))
return new SubmitDateCriteria(value, operator);
else if (fieldName.equals(NAME_PENDING_DATE))
@@ -278,8 +278,8 @@ public class BuildQuery extends EntityQuery<Build> {
if (!QUERY_FIELDS.contains(fieldName) && !paramNames.contains(fieldName))
throw new ExplicitException("Field not found: " + fieldName);
switch (operator) {
- case BuildQueryLexer.IsBefore:
- case BuildQueryLexer.IsAfter:
+ case BuildQueryLexer.IsUntil:
+ case BuildQueryLexer.IsSince:
if (!fieldName.equals(NAME_SUBMIT_DATE)
&& !fieldName.equals(NAME_PENDING_DATE)
&& !fieldName.equals(NAME_RUNNING_DATE)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java
index b9a46df186..1dcb7b04bd 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java
@@ -31,7 +31,7 @@ public class FinishDateCriteria extends EntityCriteria<Build> {
@Override
public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {
Path<Date> attribute = root.get(Build.PROP_FINISH_DATE);
- if (operator == BuildQueryLexer.IsBefore)
+ if (operator == BuildQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
return builder.greaterThan(attribute, date);
@@ -39,7 +39,7 @@ public class FinishDateCriteria extends EntityCriteria<Build> {
@Override
public boolean matches(Build build) {
- if (operator == BuildQueryLexer.IsBefore)
+ if (operator == BuildQueryLexer.IsUntil)
return build.getFinishDate().before(date);
else
return build.getFinishDate().after(date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java
index ef721f7a18..3cc531ec6d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java
@@ -31,7 +31,7 @@ public class PendingDateCriteria extends EntityCriteria<Build> {
@Override
public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {
Path<Date> attribute = root.get(Build.PROP_PENDING_DATE);
- if (operator == BuildQueryLexer.IsBefore)
+ if (operator == BuildQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
return builder.greaterThan(attribute, date);
@@ -39,7 +39,7 @@ public class PendingDateCriteria extends EntityCriteria<Build> {
@Override
public boolean matches(Build build) {
- if (operator == BuildQueryLexer.IsBefore)
+ if (operator == BuildQueryLexer.IsUntil)
return build.getPendingDate().before(date);
else
return build.getPendingDate().after(date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java
index 832053e2a5..40195f5bd7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java
@@ -31,7 +31,7 @@ public class RunningDateCriteria extends EntityCriteria<Build> {
@Override
public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {
Path<Date> attribute = root.get(Build.PROP_RUNNING_DATE);
- if (operator == BuildQueryLexer.IsBefore)
+ if (operator == BuildQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
return builder.greaterThan(attribute, date);
@@ -39,7 +39,7 @@ public class RunningDateCriteria extends EntityCriteria<Build> {
@Override
public boolean matches(Build build) {
- if (operator == BuildQueryLexer.IsBefore)
+ if (operator == BuildQueryLexer.IsUntil)
return build.getRunningDate().before(date);
else
return build.getRunningDate().after(date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java
index 5375431be8..acf5d95132 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java
@@ -30,7 +30,7 @@ public class SubmitDateCriteria extends EntityCriteria<Build> {
@Override
public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {
Path<Date> attribute = root.get(Build.PROP_SUBMIT_DATE);
- if (operator == BuildQueryLexer.IsBefore)
+ if (operator == BuildQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
return builder.greaterThan(attribute, date);
@@ -38,7 +38,7 @@ public class SubmitDateCriteria extends EntityCriteria<Build> {
@Override
public boolean matches(Build build) {
- if (operator == BuildQueryLexer.IsBefore)
+ if (operator == BuildQueryLexer.IsUntil)
return build.getSubmitDate().before(date);
else
return build.getSubmitDate().after(date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4
index f5634e304e..354e49014a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4
@@ -9,7 +9,7 @@ query
criteria
: operator=CreatedByMe #OperatorCriteria
| operator=(CreatedBy|OnCommit) WS+ criteriaValue=Quoted #OperatorValueCriteria
- | criteriaField=Quoted WS+ operator=(Is|IsBefore|IsAfter|IsGreaterThan|IsLessThan|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
+ | criteriaField=Quoted WS+ operator=(Is|IsUntil|IsSince|IsGreaterThan|IsLessThan|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
| criteria WS+ And WS+ criteria #AndCriteria
| criteria WS+ Or WS+ criteria #OrCriteria
| Not WS* LParens WS* criteria WS* RParens #NotCriteria
@@ -44,12 +44,12 @@ Contains
: 'contains'
;
-IsAfter
- : 'is' WS+ 'after'
+IsSince
+ : 'is' WS+ 'since'
;
-IsBefore
- : 'is' WS+ 'before'
+IsUntil
+ : 'is' WS+ 'until'
;
IsGreaterThan
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
index 3c1005bf05..69e9a9647c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
@@ -121,8 +121,8 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {
checkField(project, fieldName, operator);
switch (operator) {
- case CodeCommentQueryLexer.IsBefore:
- case CodeCommentQueryLexer.IsAfter:
+ case CodeCommentQueryLexer.IsUntil:
+ case CodeCommentQueryLexer.IsSince:
Date dateValue = getDateValue(value);
switch (fieldName) {
case NAME_CREATE_DATE:
@@ -209,8 +209,8 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {
if (!QUERY_FIELDS.contains(fieldName))
throw new ExplicitException("Field not found: " + fieldName);
switch (operator) {
- case CodeCommentQueryLexer.IsBefore:
- case CodeCommentQueryLexer.IsAfter:
+ case CodeCommentQueryLexer.IsUntil:
+ case CodeCommentQueryLexer.IsSince:
if (!fieldName.equals(NAME_CREATE_DATE) && !fieldName.equals(NAME_UPDATE_DATE))
throw newOperatorException(fieldName, operator);
break;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
index 0d1dfdae82..52b38cf67d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
@@ -29,7 +29,7 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {
@Override
public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {
Path<Date> attribute = root.get(CodeComment.PROP_CREATE_DATE);
- if (operator == CodeCommentQueryLexer.IsBefore)
+ if (operator == CodeCommentQueryLexer.IsUntil)
return builder.lessThan(attribute, value);
else
return builder.greaterThan(attribute, value);
@@ -37,7 +37,7 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {
@Override
public boolean matches(CodeComment comment) {
- if (operator == CodeCommentQueryLexer.IsBefore)
+ if (operator == CodeCommentQueryLexer.IsUntil)
return comment.getCreateDate().before(value);
else
return comment.getCreateDate().after(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
index 4a163ab31e..7d3913ecd8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
@@ -30,7 +30,7 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {
@Override
public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {
Path<Date> attribute = CodeCommentQuery.getPath(root, CodeComment.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);
- if (operator == CodeCommentQueryLexer.IsBefore)
+ if (operator == CodeCommentQueryLexer.IsUntil)
return builder.lessThan(attribute, value);
else
return builder.greaterThan(attribute, value);
@@ -38,7 +38,7 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {
@Override
public boolean matches(CodeComment comment) {
- if (operator == CodeCommentQueryLexer.IsBefore)
+ if (operator == CodeCommentQueryLexer.IsUntil)
return comment.getLastUpdate().getDate().before(value);
else
return comment.getLastUpdate().getDate().after(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
index acab5a5754..5bc85b7d5a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
@@ -30,7 +30,7 @@ public class DateFieldCriteria extends FieldCriteria {
@Override
protected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder) {
- if (operator == IssueQueryLexer.IsBefore)
+ if (operator == IssueQueryLexer.IsUntil)
return builder.lessThan(field.get(IssueField.PROP_ORDINAL), date.getTime());
else
return builder.greaterThan(field.get(IssueField.PROP_ORDINAL), date.getTime());
@@ -39,7 +39,7 @@ public class DateFieldCriteria extends FieldCriteria {
@Override
public boolean matches(Issue issue) {
Date fieldValue = (Date) issue.getFieldValue(getFieldName());
- if (operator == IssueQueryLexer.IsBefore)
+ if (operator == IssueQueryLexer.IsUntil)
return fieldValue != null && fieldValue.before(date);
else
return fieldValue != null && fieldValue.after(date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4
index a6aa223e7c..1c7d629796 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4
@@ -11,7 +11,7 @@ criteria
| operator=(SubmittedBy|FixedInCommit|FixedInBuild|FixedInPullRequest) WS+ criteriaValue=Quoted #OperatorValueCriteria
| FixedBetween WS+ revisionCriteria WS+ And WS+ revisionCriteria #FixedBetweenCriteria
| criteriaField=Quoted WS+ operator=(IsMe|IsEmpty|IsCurrent|IsPrevious) #FieldOperatorCriteria
- | criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsBefore|IsAfter|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
+ | criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsUntil|IsSince|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
| criteria WS+ And WS+ criteria #AndCriteria
| criteria WS+ Or WS+ criteria #OrCriteria
| Not WS* LParens WS* criteria WS* RParens #NotCriteria
@@ -94,12 +94,12 @@ IsLessThan
: 'is' WS+ 'less' WS+ 'than'
;
-IsAfter
- : 'is' WS+ 'after'
+IsSince
+ : 'is' WS+ 'since'
;
-IsBefore
- : 'is' WS+ 'before'
+IsUntil
+ : 'is' WS+ 'until'
;
IsEmpty
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index f2d9ed52ee..55b3f496e6 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
@@ -207,8 +207,8 @@ public class IssueQuery extends EntityQuery<Issue> {
}
switch (operator) {
- case IssueQueryLexer.IsBefore:
- case IssueQueryLexer.IsAfter:
+ case IssueQueryLexer.IsUntil:
+ case IssueQueryLexer.IsSince:
if (fieldName.equals(Issue.NAME_SUBMIT_DATE))
return new SubmitDateCriteria(value, operator);
else if (fieldName.equals(Issue.NAME_UPDATE_DATE))
@@ -376,8 +376,8 @@ public class IssueQuery extends EntityQuery<Issue> {
if (!(fieldSpec instanceof BuildChoiceField && withCurrentBuildCriteria))
throw newOperatorException(fieldName, operator);
break;
- case IssueQueryLexer.IsBefore:
- case IssueQueryLexer.IsAfter:
+ case IssueQueryLexer.IsUntil:
+ case IssueQueryLexer.IsSince:
if (!fieldName.equals(Issue.NAME_SUBMIT_DATE)
&& !fieldName.equals(Issue.NAME_UPDATE_DATE)
&& !(fieldSpec instanceof DateField)) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
index 72901413bc..5d0499410b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
@@ -29,7 +29,7 @@ public class SubmitDateCriteria extends IssueCriteria {
@Override
public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {
Path<Date> attribute = root.get(Issue.PROP_SUBMIT_DATE);
- if (operator == IssueQueryLexer.IsBefore)
+ if (operator == IssueQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
return builder.greaterThan(attribute, date);
@@ -37,7 +37,7 @@ public class SubmitDateCriteria extends IssueCriteria {
@Override
public boolean matches(Issue issue) {
- if (operator == IssueQueryLexer.IsBefore)
+ if (operator == IssueQueryLexer.IsUntil)
return issue.getSubmitDate().before(date);
else
return issue.getSubmitDate().after(date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
index b431a062db..d9868adf10 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
@@ -37,7 +37,7 @@ public class UpdateDateCriteria extends IssueCriteria {
@Override
public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {
Path<Date> attribute = IssueQuery.getPath(root, Issue.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);
- if (operator == IssueQueryLexer.IsBefore)
+ if (operator == IssueQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
return builder.greaterThan(attribute, date);
@@ -45,7 +45,7 @@ public class UpdateDateCriteria extends IssueCriteria {
@Override
public boolean matches(Issue issue) {
- if (operator == IssueQueryLexer.IsBefore)
+ if (operator == IssueQueryLexer.IsUntil)
return issue.getLastUpdate().getDate().before(date);
else
return issue.getLastUpdate().getDate().after(date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4
index 7ef5dc3b86..b548a5195c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4
@@ -9,7 +9,7 @@ query
criteria
: operator=(OwnedByMe|OwnedByNone) #OperatorCriteria
| operator=(OwnedBy|ForksOf) WS+ criteriaValue=Quoted #OperatorValueCriteria
- | criteriaField=Quoted WS+ operator=(Is|Contains|IsBefore|IsAfter) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
+ | criteriaField=Quoted WS+ operator=(Is|Contains|IsUntil|IsSince) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
| criteria WS+ And WS+ criteria #AndCriteria
| criteria WS+ Or WS+ criteria #OrCriteria
| Not WS* LParens WS* criteria WS* RParens #NotCriteria
@@ -40,12 +40,12 @@ OwnedByNone
: 'owned' WS+ 'by' WS+ 'none'
;
-IsAfter
- : 'is' WS+ 'after'
+IsSince
+ : 'is' WS+ 'since'
;
-IsBefore
- : 'is' WS+ 'before'
+IsUntil
+ : 'is' WS+ 'until'
;
Contains
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
index eda4154b5f..0049d4799d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
@@ -121,8 +121,8 @@ public class ProjectQuery extends EntityQuery<Project> {
return new NameCriteria(value);
case ProjectQueryLexer.Contains:
return new DescriptionCriteria(value);
- case ProjectQueryLexer.IsBefore:
- case ProjectQueryLexer.IsAfter:
+ case ProjectQueryLexer.IsUntil:
+ case ProjectQueryLexer.IsSince:
return new UpdateDateCriteria(value, operator);
default:
throw new ExplicitException("Unexpected operator " + getRuleName(operator));
@@ -192,8 +192,8 @@ public class ProjectQuery extends EntityQuery<Project> {
if (!fieldName.equals(Project.NAME_NAME))
throw newOperatorException(fieldName, operator);
break;
- case ProjectQueryLexer.IsBefore:
- case ProjectQueryLexer.IsAfter:
+ case ProjectQueryLexer.IsUntil:
+ case ProjectQueryLexer.IsSince:
if (!fieldName.equals(Project.NAME_UPDATE_DATE))
throw newOperatorException(fieldName, operator);
break;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java
index b526f01c31..9c1124e8e2 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java
@@ -31,7 +31,7 @@ public class UpdateDateCriteria extends EntityCriteria<Project> {
@Override
public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {
Path<Date> attribute = ProjectQuery.getPath(root, Project.PROP_UPDATE_DATE);
- if (operator == ProjectQueryLexer.IsBefore)
+ if (operator == ProjectQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
return builder.greaterThan(attribute, date);
@@ -39,7 +39,7 @@ public class UpdateDateCriteria extends EntityCriteria<Project> {
@Override
public boolean matches(Project project) {
- if (operator == ProjectQueryLexer.IsBefore)
+ if (operator == ProjectQueryLexer.IsUntil)
return project.getUpdateDate().before(date);
else
return project.getUpdateDate().after(date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
index 9ced37cb4b..eb26221f2c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
@@ -31,7 +31,7 @@ public class CloseDateCriteria extends EntityCriteria<PullRequest> {
@Override
public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {
Path<Date> attribute = PullRequestQuery.getPath(root, PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_DATE);
- if (operator == PullRequestQueryLexer.IsBefore)
+ if (operator == PullRequestQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
return builder.greaterThan(attribute, date);
@@ -40,7 +40,7 @@ public class CloseDateCriteria extends EntityCriteria<PullRequest> {
@Override
public boolean matches(PullRequest request) {
if (request.getCloseInfo() != null) {
- if (operator == PullRequestQueryLexer.IsBefore)
+ if (operator == PullRequestQueryLexer.IsUntil)
return request.getCloseInfo().getDate().before(date);
else
return request.getCloseInfo().getDate().after(date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4
index a95999006a..d8b9897767 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4
@@ -9,7 +9,7 @@ query
criteria
: operator=(Open|Merged|Discarded|AssignedToMe|SubmittedByMe|ToBeReviewedByMe|RequestedForChangesByMe|ApprovedByMe|DiscardedByMe|SomeoneRequestedForChanges|HasPendingReviews|HasFailedBuilds|ToBeVerifiedByBuilds|HasMergeConflicts) #OperatorCriteria
| operator=(ToBeReviewedBy|AssignedTo|ApprovedBy|RequestedForChangesBy|SubmittedBy|DiscardedBy|IncludesCommit|IncludesIssue) WS+ criteriaValue=Quoted #OperatorValueCriteria
- | criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsBefore|IsAfter|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
+ | criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsUntil|IsSince|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
| criteria WS+ And WS+ criteria #AndCriteria
| criteria WS+ Or WS+ criteria #OrCriteria
| Not WS* LParens WS* criteria WS* RParens #NotCriteria
@@ -128,12 +128,12 @@ IsLessThan
: 'is' WS+ 'less' WS+ 'than'
;
-IsAfter
- : 'is' WS+ 'after'
+IsSince
+ : 'is' WS+ 'since'
;
-IsBefore
- : 'is' WS+ 'before'
+IsUntil
+ : 'is' WS+ 'until'
;
And
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
index bb750387de..b3972c3887 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
@@ -155,8 +155,8 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
checkField(fieldName, operator);
switch (operator) {
- case PullRequestQueryLexer.IsBefore:
- case PullRequestQueryLexer.IsAfter:
+ case PullRequestQueryLexer.IsUntil:
+ case PullRequestQueryLexer.IsSince:
switch (fieldName) {
case PullRequest.NAME_SUBMIT_DATE:
return new SubmitDateCriteria(value, operator);
@@ -263,8 +263,8 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
if (!PullRequest.QUERY_FIELDS.contains(fieldName))
throw new ExplicitException("Field not found: " + fieldName);
switch (operator) {
- case PullRequestQueryLexer.IsBefore:
- case PullRequestQueryLexer.IsAfter:
+ case PullRequestQueryLexer.IsUntil:
+ case PullRequestQueryLexer.IsSince:
if (!fieldName.equals(PullRequest.NAME_SUBMIT_DATE)
&& !fieldName.equals(PullRequest.NAME_UPDATE_DATE)
&& !fieldName.equals(PullRequest.NAME_CLOSE_DATE)) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
index 60e27d81d8..86f0cb45eb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
@@ -30,7 +30,7 @@ public class SubmitDateCriteria extends EntityCriteria<PullRequest> {
@Override
public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {
Path<Date> attribute = root.get(PullRequest.PROP_SUBMIT_DATE);
- if (operator == PullRequestQueryLexer.IsBefore)
+ if (operator == PullRequestQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
return builder.greaterThan(attribute, date);
@@ -38,7 +38,7 @@ public class SubmitDateCriteria extends EntityCriteria<PullRequest> {
@Override
public boolean matches(PullRequest request) {
- if (operator == PullRequestQueryLexer.IsBefore)
+ if (operator == PullRequestQueryLexer.IsUntil)
return request.getSubmitDate().before(date);
else
return request.getSubmitDate().after(date);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
index b31ccf4144..3719e91193 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
@@ -31,7 +31,7 @@ public class UpdateDateCriteria extends EntityCriteria<PullRequest> {
@Override
public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {
Path<Date> attribute = PullRequestQuery.getPath(root, PullRequest.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);
- if (operator == PullRequestQueryLexer.IsBefore)
+ if (operator == PullRequestQueryLexer.IsUntil)
return builder.lessThan(attribute, date);
else
return builder.greaterThan(attribute, date);
@@ -39,7 +39,7 @@ public class UpdateDateCriteria extends EntityCriteria<PullRequest> {
@Override
public boolean matches(PullRequest request) {
- if (operator == PullRequestQueryLexer.IsBefore)
+ if (operator == PullRequestQueryLexer.IsUntil)
return request.getLastUpdate().getDate().before(date);
else
return request.getLastUpdate().getDate().after(date);
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.java b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.java
index f79c3a033e..eb181047b0 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.java
@@ -9,22 +9,22 @@ public class AccessBuildReports implements Permission {
private final String reportNames;
- private transient PatternSet reportNamesPatternSet;
+ private transient PatternSet reportPatterns;
public AccessBuildReports(String reportNames) {
this.reportNames = reportNames;
}
- private PatternSet getReportNamesPatternSet() {
- if (reportNamesPatternSet == null)
- reportNamesPatternSet = PatternSet.parse(reportNames);
- return reportNamesPatternSet;
+ private PatternSet getReportPatterns() {
+ if (reportPatterns == null)
+ reportPatterns = PatternSet.parse(reportNames);
+ return reportPatterns;
}
@Override
public boolean implies(Permission p) {
if (p instanceof AccessBuildReports) {
AccessBuildReports accessBuildReports = (AccessBuildReports) p;
- return getReportNamesPatternSet().matches(new StringMatcher(), accessBuildReports.reportNames);
+ return getReportPatterns().matches(new StringMatcher(), accessBuildReports.reportNames);
} else {
return new AccessBuild().implies(p);
}
diff --git a/server-core/src/main/java/io/onedev/server/util/BeanUtils.java b/server-core/src/main/java/io/onedev/server/util/BeanUtils.java
index 45b4cc4f9a..af978fe8a5 100644
--- a/server-core/src/main/java/io/onedev/server/util/BeanUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/BeanUtils.java
@@ -1,5 +1,6 @@
package io.onedev.server.util;
+import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -10,6 +11,9 @@ import java.util.Map;
import com.google.common.base.Preconditions;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.WordUtils;
+
public class BeanUtils {
/**
@@ -232,5 +236,18 @@ public class BeanUtils {
}
return setter;
}
+
+ public static String getDisplayName(AnnotatedElement element) {
+ if (element instanceof Class)
+ return WordUtils.uncamel(((Class<?>)element).getSimpleName());
+ else if (element instanceof Field)
+ return WordUtils.uncamel(WordUtils.capitalize(((Field)element).getName()));
+ else if (element instanceof Method)
+ return StringUtils.substringAfter(WordUtils.uncamel(((Method)element).getName()), " ");
+ else if (element instanceof Package)
+ return ((Package)element).getName();
+ else
+ throw new RuntimeException("Invalid element type: " + element.getClass().getName());
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/util/DateUtils.java b/server-core/src/main/java/io/onedev/server/util/DateUtils.java
index aefc9a3397..fe6d58bc75 100644
--- a/server-core/src/main/java/io/onedev/server/util/DateUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/DateUtils.java
@@ -20,7 +20,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
public static final List<String> RELAX_DATE_EXAMPLES = Lists.newArrayList(
"2:30pm", "4-23", "2018-2-3", "one hour ago", "2 hours ago", "3PM", "noon", "today",
"yesterday", "yesterday midnight", "3 days ago", "last week", "last Monday",
- "4 weeks ago", "1 month 2 days ago", "1 year ago");
+ "4 weeks ago", "last month", "1 month 2 days ago", "last year", "1 year ago");
public static String formatAge(Date date) {
return PRETTY_TIME.format(date);
diff --git a/server-core/src/main/java/io/onedev/server/util/Day.java b/server-core/src/main/java/io/onedev/server/util/Day.java
index 64e730be18..ddd88a9935 100644
--- a/server-core/src/main/java/io/onedev/server/util/Day.java
+++ b/server-core/src/main/java/io/onedev/server/util/Day.java
@@ -38,6 +38,10 @@ public class Day implements Serializable, Comparable<Day> {
public int getValue() {
return (year<<16) | (monthOfYear<<8) | dayOfMonth;
}
+
+ public DateTime getDate() {
+ return new DateTime(year, monthOfYear+1, dayOfMonth, 0, 0);
+ }
@Override
public int compareTo(Day day) {
diff --git a/server-core/src/main/java/io/onedev/server/util/MetricIndicator.java b/server-core/src/main/java/io/onedev/server/util/MetricIndicator.java
new file mode 100644
index 0000000000..2f352174a0
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/MetricIndicator.java
@@ -0,0 +1,21 @@
+package io.onedev.server.util;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MetricIndicator {
+
+ String name() default "";
+
+ int maxValue() default Integer.MIN_VALUE;
+
+ int minValue() default Integer.MAX_VALUE;
+
+ String valueFormatter() default "";
+
+ int order() default 100;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/WebApplication.java b/server-core/src/main/java/io/onedev/server/web/WebApplication.java
index 96557d6f5e..efd6a87cb3 100644
--- a/server-core/src/main/java/io/onedev/server/web/WebApplication.java
+++ b/server-core/src/main/java/io/onedev/server/web/WebApplication.java
@@ -65,7 +65,7 @@ import io.onedev.server.util.usage.InUseException;
import io.onedev.server.web.component.svg.SpriteImageResolver;
import io.onedev.server.web.mapper.BaseResourceMapper;
import io.onedev.server.web.page.base.BasePage;
-import io.onedev.server.web.page.layout.UICustomization;
+import io.onedev.server.web.page.layout.MainMenuCustomization;
import io.onedev.server.web.page.simple.error.GeneralErrorPage;
import io.onedev.server.web.page.simple.error.InUseErrorPage;
import io.onedev.server.web.resource.SvgSpriteResourceReference;
@@ -79,11 +79,11 @@ public class WebApplication extends org.apache.wicket.protocol.http.WebApplicati
private final Set<WebApplicationConfigurator> applicationConfigurators;
- private final UICustomization uiCustomization;
+ private final MainMenuCustomization uiCustomization;
@Inject
public WebApplication(Set<WebApplicationConfigurator> applicationConfigurators,
- UICustomization uiCustomization) {
+ MainMenuCustomization uiCustomization) {
this.applicationConfigurators = applicationConfigurators;
this.uiCustomization = uiCustomization;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java
new file mode 100644
index 0000000000..11f3f838b7
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java
@@ -0,0 +1,162 @@
+package io.onedev.server.web.behavior;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.model.IModel;
+
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+
+import edu.emory.mathcs.backport.java.util.Collections;
+import io.onedev.commons.codeassist.FenceAware;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.commons.codeassist.parser.Element;
+import io.onedev.commons.codeassist.parser.ParseExpect;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.BuildParamManager;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.BuildMetric;
+import io.onedev.server.search.buildmetric.BuildMetricQuery;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.buildmetric.BuildMetricQueryParser;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
+import io.onedev.server.web.util.SuggestionUtils;
+
+@SuppressWarnings("serial")
+public class BuildMetricQueryBehavior extends ANTLRAssistBehavior {
+
+ private final IModel<Project> projectModel;
+
+ private final Class<? extends AbstractEntity> metricClass;
+
+ public BuildMetricQueryBehavior(IModel<Project> projectModel, Class<? extends AbstractEntity> metricClass) {
+ super(BuildMetricQueryParser.class, "query", false);
+ this.projectModel = projectModel;
+ this.metricClass = metricClass;
+ }
+
+ @Override
+ public void detach(Component component) {
+ super.detach(component);
+ projectModel.detach();
+ }
+
+ private Project getProject() {
+ return projectModel.getObject();
+ }
+
+ @Override
+ protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
+ if (spec.getRuleName().equals("Quoted")) {
+ return new FenceAware(codeAssist.getGrammar(), '"', '"') {
+
+ @Override
+ protected List<InputSuggestion> match(String matchWith) {
+ Project project = getProject();
+ if ("criteriaField".equals(spec.getLabel())) {
+ List<String> fields = new ArrayList<>(Build.METRIC_QUERY_FIELDS);
+ BuildParamManager buildParamManager = OneDev.getInstance(BuildParamManager.class);
+ List<String> paramNames = new ArrayList<>(buildParamManager.getBuildParamNames(project));
+ Collections.sort(paramNames);
+ fields.addAll(paramNames);
+ return SuggestionUtils.suggest(fields, matchWith);
+ } else if ("criteriaValue".equals(spec.getLabel())) {
+ List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
+ List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);
+ Preconditions.checkState(operatorElements.size() == 1);
+ String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());
+ int operator = BuildMetricQuery.getOperator(operatorName);
+ if (fieldElements.isEmpty()) {
+ List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);
+ return !suggestions.isEmpty()? suggestions: null;
+ } else {
+ String fieldName = EntityQuery.getValue(fieldElements.get(0).getMatchedText());
+ try {
+ BuildMetricQuery.checkField(project, fieldName, operator);
+ if (fieldName.equals(Build.NAME_JOB)) {
+ if (!matchWith.contains("*"))
+ return SuggestionUtils.suggestJobs(project, matchWith);
+ else
+ return null;
+ } else if (fieldName.equals(BuildMetric.NAME_REPORT)) {
+ if (!matchWith.contains("*"))
+ return SuggestionUtils.suggestReports(project, metricClass, matchWith);
+ else
+ return null;
+ } else if (fieldName.equals(Build.NAME_BRANCH)) {
+ if (!matchWith.contains("*"))
+ return SuggestionUtils.suggestBranches(project, matchWith);
+ else
+ return null;
+ } else {
+ return null;
+ }
+ } catch (ExplicitException ex) {
+ }
+ }
+ }
+ return new ArrayList<>();
+ }
+
+ @Override
+ protected String getFencingDescription() {
+ return "quote as literal value";
+ }
+
+ }.suggest(terminalExpect);
+ }
+ }
+ return null;
+ }
+
+ @Override
+ protected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {
+ parseExpect = parseExpect.findExpectByLabel("operator");
+ if (parseExpect != null) {
+ List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);
+ if (!fieldElements.isEmpty()) {
+ String fieldName = EntityQuery.getValue(fieldElements.iterator().next().getMatchedText());
+ try {
+ BuildMetricQuery.checkField(getProject(), fieldName, BuildMetricQuery.getOperator(suggestedLiteral));
+ } catch (ExplicitException e) {
+ return null;
+ }
+ }
+ }
+ return super.describe(parseExpect, suggestedLiteral);
+ }
+
+ @Override
+ protected List<String> getHints(TerminalExpect terminalExpect) {
+ List<String> hints = new ArrayList<>();
+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
+ if ("criteriaValue".equals(spec.getLabel()) && EntityQuery.isInsideQuote(terminalExpect.getUnmatchedText())) {
+ List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
+ if (!fieldElements.isEmpty()) {
+ String fieldName = EntityQuery.getValue(fieldElements.get(0).getMatchedText());
+ if (fieldName.equals(Build.NAME_PROJECT) || fieldName.equals(Build.NAME_VERSION)
+ || fieldName.equals(Build.NAME_JOB)) {
+ hints.add("Use '*' for wildcard match");
+ hints.add("Use '\\' to escape quotes");
+ } else if (fieldName.equals(Build.NAME_BRANCH) || fieldName.equals(Build.NAME_TAG)) {
+ hints.add("Use '*' for wildcard match");
+ }
+ }
+ }
+ }
+ return hints;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
index 4e530cf7be..c998343389 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
@@ -27,7 +27,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.search.entity.build.BuildQueryLexer;
import io.onedev.server.search.entity.build.BuildQueryParser;
-import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
@@ -201,10 +200,10 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
List<String> hints = new ArrayList<>();
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
- if ("criteriaValue".equals(spec.getLabel()) && ProjectQuery.isInsideQuote(terminalExpect.getUnmatchedText())) {
+ if ("criteriaValue".equals(spec.getLabel()) && BuildQuery.isInsideQuote(terminalExpect.getUnmatchedText())) {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
if (!fieldElements.isEmpty()) {
- String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = BuildQuery.getValue(fieldElements.get(0).getMatchedText());
if (fieldName.equals(Build.NAME_PROJECT) || fieldName.equals(Build.NAME_VERSION)
|| fieldName.equals(Build.NAME_JOB)) {
hints.add("Use '*' for wildcard match");
diff --git a/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineChartPanel.html b/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineChartPanel.html
new file mode 100644
index 0000000000..788c773961
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineChartPanel.html
@@ -0,0 +1,3 @@
+<wicket:panel>
+ <div class="line-chart resize-aware"></div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineChartPanel.java b/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineChartPanel.java
new file mode 100644
index 0000000000..e68645864f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineChartPanel.java
@@ -0,0 +1,45 @@
+package io.onedev.server.web.component.chart.line;
+
+import javax.annotation.Nullable;
+
+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.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.onedev.server.OneDev;
+
+@SuppressWarnings("serial")
+public class LineChartPanel extends GenericPanel<LineSeries> {
+
+ public LineChartPanel(String id, IModel<LineSeries> model) {
+ super(id, model);
+ }
+
+ @Nullable
+ private LineSeries getSeries() {
+ return getModelObject();
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new LineChartResourceReference()));
+
+ try {
+ ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
+ String script = String.format("onedev.server.lineChart.onDomReady('%s', %s, %s);",
+ getMarkupId(true), mapper.writeValueAsString(getSeries()),
+ getSeries().getValueFormatter());
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+}
diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineChartResourceReference.java
similarity index 72%
rename from server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportResourceReference.java
rename to server-core/src/main/java/io/onedev/server/web/component/chart/line/LineChartResourceReference.java
index 5f24b30591..c2754c17bf 100644
--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineChartResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.report.jest;
+package io.onedev.server.web.component.chart.line;
import java.util.List;
@@ -10,12 +10,12 @@ import io.onedev.server.web.asset.echarts.EChartsResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
-public class JestReportResourceReference extends BaseDependentResourceReference {
+public class LineChartResourceReference extends BaseDependentResourceReference {
private static final long serialVersionUID = 1L;
- public JestReportResourceReference() {
- super(JestReportResourceReference.class, "jest-report.js");
+ public LineChartResourceReference() {
+ super(LineChartResourceReference.class, "line-chart.js");
}
@Override
@@ -23,7 +23,7 @@ public class JestReportResourceReference extends BaseDependentResourceReference
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(new EChartsResourceReference()));
dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
- JestReportResourceReference.class, "jest-report.css")));
+ LineChartResourceReference.class, "line-chart.css")));
return dependencies;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineSeries.java b/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineSeries.java
new file mode 100644
index 0000000000..8a9276787b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineSeries.java
@@ -0,0 +1,53 @@
+package io.onedev.server.web.component.chart.line;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+public class LineSeries implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String name;
+
+ private final Map<String, Integer> values;
+
+ private final String valueFormatter;
+
+ private final Integer minValue;
+
+ private final Integer maxValue;
+
+ public LineSeries(@Nullable String name, Map<String, Integer> values, String valueFormatter,
+ @Nullable Integer minValue, @Nullable Integer maxValue) {
+ this.name = name;
+ this.values = values;
+ this.valueFormatter = valueFormatter;
+ this.minValue = minValue;
+ this.maxValue = maxValue;
+ }
+
+ public Map<String, Integer> getValues() {
+ return values;
+ }
+
+ public String getValueFormatter() {
+ return valueFormatter;
+ }
+
+ @Nullable
+ public String getName() {
+ return name;
+ }
+
+ public Integer getMinValue() {
+ return minValue;
+ }
+
+ @Nullable
+ public Integer getMaxValue() {
+ return maxValue;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.css b/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.css
new file mode 100644
index 0000000000..44d478fbca
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.css
@@ -0,0 +1,3 @@
+.line-chart {
+ height: 360px;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.js b/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.js
new file mode 100644
index 0000000000..901b663f76
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.js
@@ -0,0 +1,56 @@
+onedev.server.lineChart = {
+ onDomReady: function(containerId, lineSeries, valueFormatter) {
+ var $chart = $("#" + containerId + ">.line-chart");
+
+ if (lineSeries) {
+ var chart = echarts.init($chart[0]);
+ option = {
+ xAxis: {
+ type: 'category',
+ data: []
+ },
+ yAxis: {
+ type: 'value',
+ minInterval: 1
+ },
+ series: [{
+ data: [],
+ type: 'line',
+ lineStyle: {
+ color: '#3699FF'
+ },
+ itemStyle: {
+ color: '#3699FF'
+ }
+ }]
+ };
+ if (lineSeries.name) {
+ option.title = {
+ text: lineSeries.name,
+ left: 'center'
+ }
+ }
+ if (valueFormatter) {
+ option.yAxis.axisLabel = {
+ formatter: valueFormatter
+ }
+ }
+ if (lineSeries.minValue)
+ option.yAxis.min = lineSeries.minValue;
+ if (lineSeries.maxValue)
+ option.yAxis.max = lineSeries.maxValue;
+
+ for (const key in lineSeries.values) {
+ option.xAxis.data.push(key);
+ option.series[0].data.push(lineSeries.values[key]);
+ };
+ chart.setOption(option);
+
+ $chart.on("resized", function() {
+ chart.resize();
+ });
+ } else {
+ $chart.append("No Data").addClass("d-flex align-items-center h1 text-muted justify-content-center");
+ }
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/piechart/PieChartPanel.html b/server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieChartPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/piechart/PieChartPanel.html
rename to server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieChartPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/component/piechart/PieChartPanel.java b/server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieChartPanel.java
similarity index 97%
rename from server-core/src/main/java/io/onedev/server/web/component/piechart/PieChartPanel.java
rename to server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieChartPanel.java
index bb2931d4e2..375f5e97bd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/piechart/PieChartPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieChartPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.component.piechart;
+package io.onedev.server.web.component.chart.pie;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/piechart/PieChartResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieChartResourceReference.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/web/component/piechart/PieChartResourceReference.java
rename to server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieChartResourceReference.java
index 59ef1f56c7..39fc779652 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/piechart/PieChartResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieChartResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.component.piechart;
+package io.onedev.server.web.component.chart.pie;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/piechart/PieSlice.java b/server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieSlice.java
similarity index 92%
rename from server-core/src/main/java/io/onedev/server/web/component/piechart/PieSlice.java
rename to server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieSlice.java
index 089c282cce..b2598556e4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/piechart/PieSlice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieSlice.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.component.piechart;
+package io.onedev.server.web.component.chart.pie;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/piechart/pie-chart.css b/server-core/src/main/java/io/onedev/server/web/component/chart/pie/pie-chart.css
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/piechart/pie-chart.css
rename to server-core/src/main/java/io/onedev/server/web/component/chart/pie/pie-chart.css
diff --git a/server-core/src/main/java/io/onedev/server/web/component/piechart/pie-chart.js b/server-core/src/main/java/io/onedev/server/web/component/chart/pie/pie-chart.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/piechart/pie-chart.js
rename to server-core/src/main/java/io/onedev/server/web/component/chart/pie/pie-chart.js
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
index 2a2fa8a20f..bbe8ec325d 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
@@ -1,14 +1,11 @@
package io.onedev.server.web.editable;
import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import java.util.List;
import javax.annotation.Nullable;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.commons.utils.WordUtils;
+import io.onedev.server.util.BeanUtils;
import io.onedev.server.web.editable.annotation.Editable;
public class EditableUtils {
@@ -27,16 +24,8 @@ public class EditableUtils {
Editable editable = element.getAnnotation(Editable.class);
if (editable != null && editable.name().trim().length() != 0)
return editable.name();
- else if (element instanceof Class)
- return WordUtils.uncamel(((Class<?>)element).getSimpleName());
- else if (element instanceof Field)
- return WordUtils.uncamel(WordUtils.capitalize(((Field)element).getName()));
- else if (element instanceof Method)
- return StringUtils.substringAfter(WordUtils.uncamel(((Method)element).getName()), " ");
- else if (element instanceof Package)
- return ((Package)element).getName();
- else
- throw new RuntimeException("Invalid element type: " + element.getClass().getName());
+ else
+ return BeanUtils.getDisplayName(element);
}
/**
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
index e400166ee2..833f3d3a0c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
@@ -752,6 +752,25 @@ onedev.server = {
});
},
+ formatBriefDuration(seconds) {
+ var intervals = [];
+ var days = Math.floor(seconds/86400);
+ if (days != 0)
+ intervals.push(days + "d");
+ seconds = seconds%86400;
+ var hours = Math.floor(seconds/3600);
+ if (hours != 0)
+ intervals.push(hours + "h");
+ seconds = seconds%3600;
+ var minutes = Math.floor(seconds/60);
+ if (minutes != 0)
+ intervals.push(minutes + "m");
+ seconds = seconds%60;
+ if (seconds != 0)
+ intervals.push(seconds + "s");
+ return intervals.join(" ");
+ },
+
onDomReady: function(icons, popStateCallback) {
onedev.server.icons = icons;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/DefaultUICustomization.java b/server-core/src/main/java/io/onedev/server/web/page/layout/DefaultMainMenuCustomization.java
similarity index 94%
rename from server-core/src/main/java/io/onedev/server/web/page/layout/DefaultUICustomization.java
rename to server-core/src/main/java/io/onedev/server/web/page/layout/DefaultMainMenuCustomization.java
index a300e7eb24..217197ad1d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/DefaultUICustomization.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/DefaultMainMenuCustomization.java
@@ -13,7 +13,7 @@ import io.onedev.server.web.page.project.NewProjectPage;
import io.onedev.server.web.page.project.ProjectListPage;
import io.onedev.server.web.page.pullrequests.PullRequestListPage;
-public class DefaultUICustomization implements UICustomization {
+public class DefaultMainMenuCustomization implements MainMenuCustomization {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 93265b39c2..513c8364fd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -98,7 +98,7 @@ public abstract class LayoutPage extends BasePage {
sidebar.add(AttributeAppender.append("class", "sidebar-minimized"));
add(sidebar);
- UICustomization customization = OneDev.getInstance(UICustomization.class);
+ MainMenuCustomization customization = OneDev.getInstance(MainMenuCustomization.class);
sidebar.add(new BookmarkablePageLink<Void>("brandLink", customization.getHomePage()));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/UICustomization.java b/server-core/src/main/java/io/onedev/server/web/page/layout/MainMenuCustomization.java
similarity index 79%
rename from server-core/src/main/java/io/onedev/server/web/page/layout/UICustomization.java
rename to server-core/src/main/java/io/onedev/server/web/page/layout/MainMenuCustomization.java
index 6624ccd19e..862da54ed4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/UICustomization.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/MainMenuCustomization.java
@@ -5,7 +5,7 @@ import java.util.List;
import io.onedev.server.web.page.base.BasePage;
-public interface UICustomization extends Serializable {
+public interface MainMenuCustomization extends Serializable {
Class<? extends BasePage> getHomePage();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index 8ac89e40b1..6d0f9830a1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.page.project;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -175,15 +176,27 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
ProjectCodeCommentsPage.class, ProjectCodeCommentsPage.paramsOf(getProject(), 0)));
menuItems.add(new SidebarMenuItem.Page("diff", "Code Compare",
RevisionComparePage.class, RevisionComparePage.paramsOf(getProject())));
- List<SidebarMenuItem> statsMenuItems = new ArrayList<>();
+ }
+
+ List<SidebarMenuItem> statsMenuItems = new ArrayList<>();
+
+ if (SecurityUtils.canReadCode(getProject())) {
statsMenuItems.add(new SidebarMenuItem.Page(null, "Contributions",
ProjectContribsPage.class, ProjectContribsPage.paramsOf(getProject())));
statsMenuItems.add(new SidebarMenuItem.Page(null, "Source Lines",
SourceLinesPage.class, SourceLinesPage.paramsOf(getProject())));
-
- menuItems.add(new SidebarMenuItem.SubMenu("statistics", "Statistics", statsMenuItems));
}
+ List<StatisticsMenuContribution> contributions = new ArrayList<>(OneDev.getExtensions(StatisticsMenuContribution.class));
+ contributions.sort(Comparator.comparing(StatisticsMenuContribution::getOrder));
+
+ for (StatisticsMenuContribution contribution: contributions)
+ statsMenuItems.addAll(contribution.getMenuItems(getProject()));
+
+ if (!statsMenuItems.isEmpty())
+ menuItems.add(new SidebarMenuItem.SubMenu("statistics", "Statistics", statsMenuItems));
+
+
if (SecurityUtils.canManage(getProject())) {
List<SidebarMenuItem> settingMenuItems = new ArrayList<>();
settingMenuItems.add(new SidebarMenuItem.Page(null, "General Setting",
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/StatisticsMenuContribution.java b/server-core/src/main/java/io/onedev/server/web/page/project/StatisticsMenuContribution.java
new file mode 100644
index 0000000000..e16b4a68b5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/StatisticsMenuContribution.java
@@ -0,0 +1,14 @@
+package io.onedev.server.web.page.project;
+
+import java.util.List;
+
+import io.onedev.server.model.Project;
+import io.onedev.server.web.page.layout.SidebarMenuItem;
+
+public interface StatisticsMenuContribution {
+
+ List<SidebarMenuItem> getMenuItems(Project project);
+
+ int getOrder();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
index d991e01a48..6bd3205fc4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
@@ -7,7 +7,6 @@
.issue-boards>.body>.feedback>.feedbackPanel {
margin-bottom: 0;
margin-top: 1rem;
- box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1);
}
.issue-boards>.body>.columns>.column>.content {
border: 1px solid var(--secondary);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.html
new file mode 100644
index 0000000000..ff8edb7973
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.html
@@ -0,0 +1,20 @@
+<wicket:extend>
+ <div class="build-metric-stats p-2 p-sm-5">
+ <form wicket:id="form" class="filter mb-5">
+ <div class="clearable-wrapper">
+ <div class="input-group">
+ <input wicket:id="input" class="form-control" spellcheck="false" autocomplete="off" placeholder="Filter...">
+ <span class="input-group-append">
+ <button wicket:id="submit" title="Filter" class="btn btn-icon bg-white btn-outline-secondary btn-hover-primary" type="submit"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
+ </span>
+ </div>
+ </div>
+ <div wicket:id="feedback" class="feedback mt-3"></div>
+ </form>
+ <div wicket:id="content" class="content">
+ <div wicket:id="charts" class="card mb-5">
+ <div wicket:id="chart" class="card-body chart"></div>
+ </div>
+ </div>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java
new file mode 100644
index 0000000000..dbe567e1d5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java
@@ -0,0 +1,232 @@
+package io.onedev.server.web.page.project.stats.buildmetric;
+
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.BuildMetricManager;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.Project;
+import io.onedev.server.search.buildmetric.BuildMetricQuery;
+import io.onedev.server.util.BeanUtils;
+import io.onedev.server.util.Day;
+import io.onedev.server.util.MetricIndicator;
+import io.onedev.server.util.Pair;
+import io.onedev.server.util.ReflectionUtils;
+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.behavior.BuildMetricQueryBehavior;
+import io.onedev.server.web.component.chart.line.LineChartPanel;
+import io.onedev.server.web.component.chart.line.LineSeries;
+import io.onedev.server.web.page.project.ProjectPage;
+
+@SuppressWarnings("serial")
+public abstract class BuildMetricStatsPage<T extends AbstractEntity> extends ProjectPage {
+
+ private static final String PARAM_QUERY = "query";
+
+ private final Class<T> metricClass;
+
+ private String query;
+
+ private BuildMetricQuery parsedQuery;
+
+ private Form<?> form;
+
+ private Component feedback;
+
+ private WebMarkupContainer content;
+
+ @SuppressWarnings("unchecked")
+ public BuildMetricStatsPage(PageParameters params) {
+ super(params);
+
+ metricClass = (Class<T>) ReflectionUtils.getTypeArguments(BuildMetricStatsPage.class, getClass()).get(0);
+
+ query = params.get(PARAM_QUERY).toOptionalString();
+ }
+
+ private void pushState(AjaxRequestTarget target) {
+ CharSequence url = urlFor(getClass(), paramsOf(getProject(), query));
+ pushState(target, url.toString(), query);
+ }
+
+ @Override
+ protected void onPopState(AjaxRequestTarget target, Serializable data) {
+ super.onPopState(target, data);
+ query = (String) data;
+ parseQuery();
+ target.add(form);
+ target.add(content);
+ }
+
+ private void parseQuery() {
+ try {
+ parsedQuery = BuildMetricQuery.parse(getProject(), query);
+ } catch (Exception e) {
+ parsedQuery = null;
+ form.error("Malformed metric query");
+ }
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ form = new Form<Void>("form");
+ TextField<String> input = new TextField<String>("input", new PropertyModel<String>(this, "query"));
+ input.add(new BuildMetricQueryBehavior(projectModel, metricClass));
+ form.add(input);
+
+ input.add(new AjaxFormComponentUpdatingBehavior("clear") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ pushState(target);
+ parseQuery();
+ target.add(feedback);
+ target.add(content);
+ }
+
+ });
+
+ form.add(feedback = new FencedFeedbackPanel("feedback", form));
+ feedback.setOutputMarkupPlaceholderTag(true);
+
+ form.add(new AjaxButton("submit") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(this));
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ pushState(target);
+ parseQuery();
+ target.add(feedback);
+ target.add(content);
+ }
+
+ });
+
+ add(form);
+
+ parseQuery();
+
+ add(content = new WebMarkupContainer("content"));
+ content.setOutputMarkupId(true);
+
+ content.add(new ListView<LineSeries>("charts", new LoadableDetachableModel<List<LineSeries>>() {
+
+ @Override
+ protected List<LineSeries> load() {
+ if (parsedQuery != null) {
+ List<Pair<LineSeries, Integer>> serieses = new ArrayList<>();
+ Map<Integer, T> stats = OneDev.getInstance(BuildMetricManager.class).queryStats(getProject(), metricClass, parsedQuery);
+ for (Method getter: BeanUtils.findGetters(metricClass)) {
+ MetricIndicator indicator = getter.getAnnotation(MetricIndicator.class);
+ if (indicator != null) {
+ Integer maxValue = indicator.maxValue();
+ if (maxValue == Integer.MIN_VALUE)
+ maxValue = null;
+ Integer minValue = indicator.minValue();
+ if (minValue == Integer.MAX_VALUE)
+ minValue = null;
+ String name = indicator.name();
+ if (name.length() == 0)
+ name = BeanUtils.getDisplayName(getter);
+
+ Map<Integer, Integer> discreteValues = new HashMap<>();
+ for (Map.Entry<Integer, T> entry: stats.entrySet()) {
+ try {
+ discreteValues.put(entry.getKey(), (int) getter.invoke(entry.getValue()));
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ Map<String, Integer> completeValues = new LinkedHashMap<>();
+ if (!discreteValues.isEmpty()) {
+ int minDayValue = Collections.min(discreteValues.keySet());
+ int maxDayValue = Collections.max(discreteValues.keySet());
+ int lastValue = 0;
+ int currentDayValue = minDayValue;
+ while (currentDayValue<=maxDayValue) {
+ Integer currentValue = discreteValues.get(currentDayValue);
+ if (currentValue == null)
+ currentValue = lastValue;
+ else
+ lastValue = currentValue;
+ Day currentDay = new Day(currentDayValue);
+ String currentDayLabel = String.format("%s-%s-%s",
+ currentDay.getYear()%100, currentDay.getMonthOfYear()+1, currentDay.getDayOfMonth());
+ completeValues.put(currentDayLabel, currentValue);
+ currentDayValue = new Day(currentDay.getDate().plusDays(1)).getValue();
+ }
+ }
+ String valueFormatter = indicator.valueFormatter();
+ if (valueFormatter.length() == 0)
+ valueFormatter = null;
+ LineSeries series = new LineSeries(name, completeValues, valueFormatter, minValue, maxValue);
+ serieses.add(new Pair<>(series, indicator.order()));
+ }
+ }
+ Collections.sort(serieses, new Comparator<Pair<LineSeries, Integer>>() {
+
+ @Override
+ public int compare(Pair<LineSeries, Integer> o1, Pair<LineSeries, Integer> o2) {
+ return o1.getSecond() - o2.getSecond();
+ }
+
+ });
+ return serieses.stream().map(it->it.getFirst()).collect(Collectors.toList());
+ } else {
+ return new ArrayList<>();
+ }
+ }
+
+ }) {
+
+ @Override
+ protected void populateItem(ListItem<LineSeries> item) {
+ item.add(new LineChartPanel("chart", item.getModel()));
+ }
+
+ });
+ }
+
+ public static PageParameters paramsOf(Project project, @Nullable String query) {
+ PageParameters params = paramsOf(project);
+ if (query != null)
+ params.add(PARAM_QUERY, query);
+ return params;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index b47194918b..795b443f3a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/server-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/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 066be5dd6a..cde09375e6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -1,10 +1,25 @@
package io.onedev.server.web.page.test;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicLong;
+
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 org.joda.time.DateTime;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.BuildParam;
+import io.onedev.server.model.JestTestMetric;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.TransactionManager;
+import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.web.page.base.BasePage;
@SuppressWarnings("serial")
@@ -17,6 +32,86 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
+
+ add(new Link<Void>("test") {
+
+ @Override
+ public void onClick() {
+ Build.Status[] statuses = new Build.Status[] {Build.Status.CANCELLED, Build.Status.FAILED, Build.Status.SUCCESSFUL, Build.Status.TIMED_OUT};
+ String[] branches = new String[] {"master", "dev"};
+ AtomicLong number = new AtomicLong(1L);
+ for (int year=2010; year<=2020; year++) {
+ System.out.println(year);
+ int aYear = year;
+ for (int month=1; month<=12; month++) {
+ System.out.println(month);
+ int aMonth = month;
+ OneDev.getInstance(TransactionManager.class).call(new Callable<Void>() {
+
+ @Override
+ public Void call() throws Exception {
+ Project project = OneDev.getInstance(ProjectManager.class).load(1L);
+ User user = OneDev.getInstance(UserManager.class).load(1L);
+ Dao dao = OneDev.getInstance(Dao.class);
+
+ for (int day=1; day<=7; day++) {
+ for (int hour=1; hour<=4; hour++) {
+ DateTime dateTime = new DateTime(aYear, aMonth, day, hour, 0);
+ for (int job=1; job<=4; job++) {
+ for (int branch=1; branch<=2; branch++) {
+ for (int paramName=1; paramName<=2; paramName++) {
+ for (int paramValue=1; paramValue<=2; paramValue++) {
+ Build build = new Build();
+ build.setCommitHash("24b2fad8533f2cc59ae4d4dad9bcf44db7ba7d84");
+ build.setFinishDate(dateTime.toDate());
+ build.setJobName(String.valueOf(job));
+ build.setPendingDate(dateTime.toDate());
+ build.setProject(project);
+ build.setRefName("refs/heads/" + branches[branch-1]);
+ build.setRunningDate(dateTime.toDate());
+
+ build.setStatus(statuses[hour-1]);
+ build.setSubmitDate(dateTime.toDate());
+ build.setSubmitReason("faked");
+ build.setSubmitter(user);
+ build.setNumber(number.getAndIncrement());
+ build.setNumberScope(project);
+ dao.persist(build);
+
+ BuildParam param = new BuildParam();
+ param.setBuild(build);
+ param.setName(String.valueOf(paramName));
+ param.setValue(String.valueOf(paramValue));
+ param.setType("Text");
+ dao.persist(param);
+
+ for (int report=1; report<=8; report++) {
+ JestTestMetric metric = new JestTestMetric();
+ metric.setBuild(build);
+ metric.setReportName(String.valueOf(report));
+ metric.setNumOfTestSuites(job);
+ metric.setNumOfTestCases(report);
+ if (build.isSuccessful())
+ metric.setTestSuiteSuccessRate(100);
+ else
+ metric.setTestSuiteSuccessRate(50);
+ metric.setTestCaseSuccessRate(paramValue*10);
+ metric.setTotalTestDuration(branch*day);
+ dao.persist(metric);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return null;
+ }
+ });
+ }
+ }
+ }
+ });
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index 93c205820d..299de931cf 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -34,6 +34,7 @@ import io.onedev.server.buildspec.job.JobVariable;
import io.onedev.server.buildspec.job.VariableInterpolator;
import io.onedev.server.buildspec.job.paramspec.ParamSpec;
import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.BuildMetricManager;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.ProjectManager;
@@ -42,6 +43,7 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.git.GitUtils;
import io.onedev.server.infomanager.CommitInfoManager;
+import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
@@ -329,11 +331,26 @@ public class SuggestionUtils {
public static List<InputSuggestion> suggestJobs(Project project, String matchWith) {
List<String> jobNames = new ArrayList<>(OneDev.getInstance(BuildManager.class)
- .getAccessibleJobNames(project).get(project));
+ .getAccessibleJobNames(project));
Collections.sort(jobNames);
return suggest(jobNames, matchWith);
}
+ public static List<InputSuggestion> suggestReports(
+ Project project, Class<? extends AbstractEntity> metricClass, String matchWith) {
+ Map<String, Collection<String>> accessibleReportNames = OneDev.getInstance(BuildMetricManager.class)
+ .getAccessibleReportNames(project, metricClass);
+ Collection<String> setOfReportNames = new HashSet<>();
+
+ for (Map.Entry<String, Collection<String>> entry: accessibleReportNames.entrySet())
+ setOfReportNames.addAll(entry.getValue());
+
+ List<String> listOfReportNames = new ArrayList<>(setOfReportNames);
+ Collections.sort(listOfReportNames);
+
+ return suggest(listOfReportNames, matchWith);
+ }
+
public static List<InputSuggestion> suggestBuildVersions(Project project, String matchWith) {
Collection<String> buildVersions = OneDev.getInstance(BuildManager.class).queryVersions(
project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
diff --git a/server-core/src/test/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryGrammarTest.java b/server-core/src/test/java/io/onedev/server/search/entity/codecomment/CodeCommentQueryGrammarTest.java
similarity index 83%
rename from server-core/src/test/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryGrammarTest.java
rename to server-core/src/test/java/io/onedev/server/search/entity/codecomment/CodeCommentQueryGrammarTest.java
index b90236b042..0b0e93fe19 100644
--- a/server-core/src/test/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryGrammarTest.java
+++ b/server-core/src/test/java/io/onedev/server/search/entity/codecomment/CodeCommentQueryGrammarTest.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.codecomment;
+package io.onedev.server.search.entity.codecomment;
import static org.junit.Assert.assertEquals;
@@ -12,7 +12,6 @@ import io.onedev.commons.codeassist.InputStatus;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
import io.onedev.commons.codeassist.parser.TerminalExpect;
-import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
public class CodeCommentQueryGrammarTest {
@@ -44,9 +43,9 @@ public class CodeCommentQueryGrammarTest {
public void test() {
List<? extends InputStatus> suggestions;
- suggestions = codeAssist.suggest(new InputStatus("\"Date\" is before 2018-09-01 2:30PM", 34), "query");
+ suggestions = codeAssist.suggest(new InputStatus("\"Create Date\" is until 2018-09-01 2:30PM", 40), "query");
assertEquals(1, suggestions.size());
- assertEquals("\"Date\" is before \"2018-09-01 2:30PM\":36", suggestions.get(0).toString());
+ assertEquals("\"Create Date\" is until \"2018-09-01 2:30PM\":42", suggestions.get(0).toString());
suggestions = codeAssist.suggest(new InputStatus("created by me", 13), "query");
assertEquals(3, suggestions.size());
diff --git a/server-core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.java b/server-core/src/test/java/io/onedev/server/search/entity/issue/IssueQueryGrammarTest.java
similarity index 84%
rename from server-core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.java
rename to server-core/src/test/java/io/onedev/server/search/entity/issue/IssueQueryGrammarTest.java
index da2ea5b996..8a198a36c7 100644
--- a/server-core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.java
+++ b/server-core/src/test/java/io/onedev/server/search/entity/issue/IssueQueryGrammarTest.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.issue;
+package io.onedev.server.search.entity.issue;
import static org.junit.Assert.assertEquals;
@@ -12,7 +12,6 @@ import io.onedev.commons.codeassist.InputStatus;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
import io.onedev.commons.codeassist.parser.TerminalExpect;
-import io.onedev.server.search.entity.issue.IssueQueryLexer;
public class IssueQueryGrammarTest {
@@ -44,9 +43,9 @@ public class IssueQueryGrammarTest {
public void test() {
List<? extends InputStatus> suggestions;
- suggestions = codeAssist.suggest(new InputStatus("\"Date\" is before 2018-09-01 2:30PM", 34), "query");
+ suggestions = codeAssist.suggest(new InputStatus("\"Submit Date\" is until 2018-09-01 2:30PM", 40), "query");
assertEquals(1, suggestions.size());
- assertEquals("\"Date\" is before \"2018-09-01 2:30PM\":36", suggestions.get(0).toString());
+ assertEquals("\"Submit Date\" is until \"2018-09-01 2:30PM\":42", suggestions.get(0).toString());
suggestions = codeAssist.suggest(new InputStatus("submitted by me", 15), "query");
assertEquals(3, suggestions.size());
diff --git a/server-core/src/test/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryGrammarTest.java b/server-core/src/test/java/io/onedev/server/search/entity/pullrequest/PullRequestQueryGrammarTest.java
similarity index 83%
rename from server-core/src/test/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryGrammarTest.java
rename to server-core/src/test/java/io/onedev/server/search/entity/pullrequest/PullRequestQueryGrammarTest.java
index 3d67ad6d21..d9babf60d1 100644
--- a/server-core/src/test/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryGrammarTest.java
+++ b/server-core/src/test/java/io/onedev/server/search/entity/pullrequest/PullRequestQueryGrammarTest.java
@@ -1,4 +1,4 @@
-package io.onedev.server.entityquery.pullrequest;
+package io.onedev.server.search.entity.pullrequest;
import static org.junit.Assert.assertEquals;
@@ -12,7 +12,6 @@ import io.onedev.commons.codeassist.InputStatus;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
import io.onedev.commons.codeassist.parser.TerminalExpect;
-import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;
public class PullRequestQueryGrammarTest {
@@ -44,9 +43,9 @@ public class PullRequestQueryGrammarTest {
public void test() {
List<? extends InputStatus> suggestions;
- suggestions = codeAssist.suggest(new InputStatus("\"Date\" is before 2018-09-01 2:30PM", 34), "query");
+ suggestions = codeAssist.suggest(new InputStatus("\"Submit Date\" is until 2018-09-01 2:30PM", 40), "query");
assertEquals(1, suggestions.size());
- assertEquals("\"Date\" is before \"2018-09-01 2:30PM\":36", suggestions.get(0).toString());
+ assertEquals("\"Submit Date\" is until \"2018-09-01 2:30PM\":42", suggestions.get(0).toString());
suggestions = codeAssist.suggest(new InputStatus("open", 4), "query");
assertEquals(3, suggestions.size());
diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java
index de615382c5..feca9e2cc7 100644
--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java
+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java
@@ -14,7 +14,6 @@ import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobReport;
import io.onedev.server.model.Build;
import io.onedev.server.util.SimpleLogger;
-import io.onedev.server.util.validation.annotation.PathSegment;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -27,23 +26,8 @@ public class JobHtmlReport extends JobReport {
public static final String START_PAGE = "$onedev-htmlreport-startpage$";
- private String reportName;
-
private String startPage;
- @Editable(order=1000, description="Specify report name. "
- + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")
- @Interpolative(variableSuggester="suggestVariables")
- @PathSegment
- @NotEmpty
- public String getReportName() {
- return reportName;
- }
-
- public void setReportName(String reportName) {
- this.reportName = reportName;
- }
-
@Editable(order=1100, description="Specify start page of the report relative to <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>, for instance: api/index.html. "
+ "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")
@Interpolative(variableSuggester="suggestVariables")
diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportCssResourceReference.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportCssResourceReference.java
new file mode 100644
index 0000000000..436b61695a
--- /dev/null
+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.plugin.report.jest;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class JestReportCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public JestReportCssResourceReference() {
+ super(JestReportCssResourceReference.class, "jest-report.css");
+ }
+
+}
diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportData.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportData.java
index 88e1052a7f..d88dc53e9a 100644
--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportData.java
+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportData.java
@@ -102,6 +102,50 @@ public class JestReportData implements Serializable {
};
}
+ public int getNumOfTestSuites() {
+ return testSuites.size();
+ }
+
+ public int getNumOfTestCases() {
+ int numOfTestCases = 0;
+ for (TestSuite testSuite: testSuites)
+ numOfTestCases += testSuite.getTestCases().size();
+ return numOfTestCases;
+ }
+
+ public int getTotalTestDuration() {
+ int totalTestDuration = 0;
+ for (TestSuite testSuite: testSuites)
+ totalTestDuration += testSuite.getDuration()/1000;
+ return totalTestDuration;
+ }
+
+ public int getTestSuiteSuccessRate() {
+ int numOfFailed = 0;
+ int numOfPassed = 0;
+ for (TestSuite testSuite: testSuites) {
+ if (testSuite.getStatus() == Status.FAILED)
+ numOfFailed++;
+ else if (testSuite.getStatus() == Status.PASSED)
+ numOfPassed++;
+ }
+ return numOfFailed*100/(numOfPassed+numOfFailed);
+ }
+
+ public int getTestCaseSuccessRate() {
+ int numOfFailed = 0;
+ int numOfPassed = 0;
+ for (TestSuite testSuite: testSuites) {
+ for (TestCase testCase: testSuite.getTestCases()) {
+ if (testCase.getStatus() == Status.FAILED)
+ numOfFailed++;
+ else if (testCase.getStatus() == Status.PASSED)
+ numOfPassed++;
+ }
+ }
+ return numOfFailed*100/(numOfPassed+numOfFailed);
+ }
+
public static class TestSuite implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportModule.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportModule.java
index 60bde6aabb..140ca6ff4b 100644
--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportModule.java
+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportModule.java
@@ -17,13 +17,21 @@ import com.google.common.collect.Sets;
import io.onedev.commons.launcher.loader.AbstractPluginModule;
import io.onedev.commons.launcher.loader.ImplementationProvider;
import io.onedev.commons.utils.LockUtils;
+import io.onedev.server.OneDev;
import io.onedev.server.buildspec.job.JobReport;
+import io.onedev.server.entitymanager.BuildMetricManager;
import io.onedev.server.model.Build;
+import io.onedev.server.model.JestTestMetric;
+import io.onedev.server.model.Project;
+import io.onedev.server.search.buildmetric.BuildMetricQuery;
+import io.onedev.server.search.buildmetric.BuildMetricQueryParser;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.WebApplicationConfigurator;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.tabbable.PageTabHead;
import io.onedev.server.web.mapper.DynamicPathPageMapper;
+import io.onedev.server.web.page.layout.SidebarMenuItem;
+import io.onedev.server.web.page.project.StatisticsMenuContribution;
import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;
import io.onedev.server.web.page.project.builds.detail.BuildTab;
import io.onedev.server.web.page.project.builds.detail.BuildTabContribution;
@@ -81,12 +89,35 @@ public class JestReportModule extends AbstractPluginModule {
});
+ contribute(StatisticsMenuContribution.class, new StatisticsMenuContribution() {
+
+ @Override
+ public List<SidebarMenuItem> getMenuItems(Project project) {
+ List<SidebarMenuItem> menuItems = new ArrayList<>();
+ if (!OneDev.getInstance(BuildMetricManager.class).getAccessibleReportNames(project, JestTestMetric.class).isEmpty()) {
+ String query = String.format("%s \"last month\"",
+ BuildMetricQuery.getRuleName(BuildMetricQueryParser.Since));
+ PageParameters params = JestTestStatsPage.paramsOf(project, query);
+ menuItems.add(new SidebarMenuItem.Page(null, "Jest Test",
+ JestTestStatsPage.class, params));
+ }
+ return menuItems;
+ }
+
+ @Override
+ public int getOrder() {
+ return 100;
+ }
+
+ });
+
contribute(WebApplicationConfigurator.class, new WebApplicationConfigurator() {
@Override
public void configure(WebApplication application) {
application.mount(new DynamicPathPageMapper("projects/${project}/builds/${build}/jest-reports/${report}/test-suites", JestTestSuitesPage.class));
application.mount(new DynamicPathPageMapper("projects/${project}/builds/${build}/jest-reports/${report}/test-cases", JestTestCasesPage.class));
+ application.mount(new DynamicPathPageMapper("projects/${project}/stats/jest-test", JestTestStatsPage.class));
}
});
diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportPage.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportPage.java
index 61017f4dbc..67e050ca47 100644
--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportPage.java
+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestReportPage.java
@@ -9,8 +9,8 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
+import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
@@ -96,7 +96,7 @@ public abstract class JestReportPage extends BuildDetailPage {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new JestReportResourceReference()));
+ response.render(CssHeaderItem.forReference(new JestReportCssResourceReference()));
}
private class JestReportTab extends BuildTab {
diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestCasesPage.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestCasesPage.java
index 94572f9891..b183d6be49 100644
--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestCasesPage.java
+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestCasesPage.java
@@ -55,11 +55,11 @@ import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.PatternSetAssistBehavior;
+import io.onedev.server.web.component.chart.pie.PieChartPanel;
+import io.onedev.server.web.component.chart.pie.PieSlice;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.pagenavigator.HistoryAwarePagingNavigator;
-import io.onedev.server.web.component.piechart.PieChartPanel;
-import io.onedev.server.web.component.piechart.PieSlice;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.util.LoadableDetachableDataProvider;
import io.onedev.server.web.util.SuggestionUtils;
diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestStatsPage.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestStatsPage.java
new file mode 100644
index 0000000000..be21b97c01
--- /dev/null
+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestStatsPage.java
@@ -0,0 +1,22 @@
+package io.onedev.server.plugin.report.jest;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.model.JestTestMetric;
+import io.onedev.server.web.page.project.stats.buildmetric.BuildMetricStatsPage;
+
+@SuppressWarnings("serial")
+public class JestTestStatsPage extends BuildMetricStatsPage<JestTestMetric> {
+
+ public JestTestStatsPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected Component newProjectTitle(String componentId) {
+ return new Label(componentId, "Jest Test Statistics");
+ }
+
+}
diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestSuitesPage.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestSuitesPage.java
index 5abf02b9e8..a220e7ed1d 100644
--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestSuitesPage.java
+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestSuitesPage.java
@@ -56,10 +56,10 @@ import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.PatternSetAssistBehavior;
+import io.onedev.server.web.component.chart.pie.PieChartPanel;
+import io.onedev.server.web.component.chart.pie.PieSlice;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.pagenavigator.HistoryAwarePagingNavigator;
-import io.onedev.server.web.component.piechart.PieChartPanel;
-import io.onedev.server.web.component.piechart.PieSlice;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.util.LoadableDetachableDataProvider;
import io.onedev.server.web.util.SuggestionUtils;
diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JobJestReport.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JobJestReport.java
index a0fe4d86f0..4bb19da16e 100644
--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JobJestReport.java
+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JobJestReport.java
@@ -18,8 +18,9 @@ import io.onedev.server.OneDev;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobReport;
import io.onedev.server.model.Build;
+import io.onedev.server.model.JestTestMetric;
+import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.SimpleLogger;
-import io.onedev.server.util.validation.annotation.PathSegment;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.Patterns;
@@ -31,8 +32,6 @@ public class JobJestReport extends JobReport {
public static final String DIR = "jest-reports";
- private String reportName;
-
@Editable(order=100, description="Specify json file containing Jest test results relative to OneDev workspace. "
+ "It can be generated via Jest option <tt>--json</tt> and <tt>--outputFile</tt>. Use * or ? for pattern match. "
+ "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")
@@ -49,19 +48,6 @@ public class JobJestReport extends JobReport {
super.setFilePatterns(filePatterns);
}
- @Editable(order=1000, description="Specify report name. "
- + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")
- @Interpolative(variableSuggester="suggestVariables")
- @PathSegment
- @NotEmpty
- public String getReportName() {
- return reportName;
- }
-
- public void setReportName(String reportName) {
- this.reportName = reportName;
- }
-
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
return Job.suggestVariables(matchWith);
@@ -72,10 +58,10 @@ public class JobJestReport extends JobReport {
File reportDir = new File(build.getReportDir(DIR), getReportName());
FileUtils.createDir(reportDir);
- LockUtils.write(build.getReportLockKey(DIR), new Callable<Void>() {
+ JestReportData report = LockUtils.write(build.getReportLockKey(DIR), new Callable<JestReportData>() {
@Override
- public Void call() throws Exception {
+ public JestReportData call() throws Exception {
ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
Collection<JsonNode> rootNodes = new ArrayList<>();
@@ -87,12 +73,29 @@ public class JobJestReport extends JobReport {
logger.log("Failed to process Jest report: " + file.getAbsolutePath().substring(baseLen), e);
}
}
- if (!rootNodes.isEmpty())
- new JestReportData(build, rootNodes).writeTo(reportDir);
- return null;
+ if (!rootNodes.isEmpty()) {
+ JestReportData report = new JestReportData(build, rootNodes);
+ report.writeTo(reportDir);
+ return report;
+ } else {
+ return null;
+ }
}
});
+
+ if (report != null) {
+ JestTestMetric metric = new JestTestMetric();
+ metric.setBuild(build);
+ metric.setReportName(getReportName());
+ metric.setTestCaseSuccessRate(report.getTestCaseSuccessRate());
+ metric.setTestSuiteSuccessRate(report.getTestSuiteSuccessRate());
+ metric.setNumOfTestCases(report.getNumOfTestCases());
+ metric.setNumOfTestSuites(report.getNumOfTestSuites());
+ metric.setTotalTestDuration(report.getTotalTestDuration());
+ OneDev.getInstance(Dao.class).persist(metric);
+ }
+
}
}
diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/jest-report.js b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/jest-report.js
deleted file mode 100644
index 60272dea7c..0000000000
--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/jest-report.js
+++ /dev/null
@@ -1,4 +0,0 @@
-onedev.server.jestReport = {
- testSuites: {
- }
-}
diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java
index 59ee3e0515..9678d0d9b7 100644
--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java
+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/JobMarkdownReport.java
@@ -14,7 +14,6 @@ import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobReport;
import io.onedev.server.model.Build;
import io.onedev.server.util.SimpleLogger;
-import io.onedev.server.util.validation.annotation.PathSegment;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -27,23 +26,8 @@ public class JobMarkdownReport extends JobReport {
public static final String START_PAGE = "$onedev-markdownreport-startpage$";
- private String reportName;
-
private String startPage;
- @Editable(order=1000, description="Specify report name. "
- + "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")
- @Interpolative(variableSuggester="suggestVariables")
- @PathSegment
- @NotEmpty
- public String getReportName() {
- return reportName;
- }
-
- public void setReportName(String reportName) {
- this.reportName = reportName;
- }
-
@Editable(order=1100, description="Specify start page of the report relative to <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>, for instance: <tt>manual/index.md</tt>. "
+ "<b>Note:</b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")
@Interpolative(variableSuggester="suggestVariables")