The Unified and Autonomous Development Platform
Remove obsolete build and configuration
Robin Shenca2a7778a763
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex 90bd476419..e0070827c4 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -99,9 +99,8 @@ import io.onedev.server.command.RestoreDBCommand;import io.onedev.server.command.UpgradeCommand;import io.onedev.server.data.DataManager;import io.onedev.server.data.DefaultDataManager;-import io.onedev.server.entitymanager.Build2Manager;-import io.onedev.server.entitymanager.BuildDependenceManager;import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.BuildDependenceManager;import io.onedev.server.entitymanager.BuildParamManager;import io.onedev.server.entitymanager.BuildQuerySettingManager;import io.onedev.server.entitymanager.CodeCommentManager;@@ -109,7 +108,6 @@ import io.onedev.server.entitymanager.CodeCommentQuerySettingManager;import io.onedev.server.entitymanager.CodeCommentRelationManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;import io.onedev.server.entitymanager.CommitQuerySettingManager;-import io.onedev.server.entitymanager.ConfigurationManager;import io.onedev.server.entitymanager.GroupAuthorizationManager;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.IssueChangeManager;@@ -134,9 +132,8 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.entitymanager.UserAuthorizationManager;import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.entitymanager.impl.DefaultBuild2Manager;-import io.onedev.server.entitymanager.impl.DefaultBuildDependenceManager;import io.onedev.server.entitymanager.impl.DefaultBuildManager;+import io.onedev.server.entitymanager.impl.DefaultBuildDependenceManager;import io.onedev.server.entitymanager.impl.DefaultBuildParamManager;import io.onedev.server.entitymanager.impl.DefaultBuildQuerySettingManager;import io.onedev.server.entitymanager.impl.DefaultCodeCommentManager;@@ -144,7 +141,6 @@ import io.onedev.server.entitymanager.impl.DefaultCodeCommentQuerySettingManagerimport io.onedev.server.entitymanager.impl.DefaultCodeCommentRelationManager;import io.onedev.server.entitymanager.impl.DefaultCodeCommentReplyManager;import io.onedev.server.entitymanager.impl.DefaultCommitQuerySettingManager;-import io.onedev.server.entitymanager.impl.DefaultConfigurationManager;import io.onedev.server.entitymanager.impl.DefaultGroupAuthorizationManager;import io.onedev.server.entitymanager.impl.DefaultGroupManager;import io.onedev.server.entitymanager.impl.DefaultIssueChangeManager;@@ -326,12 +322,10 @@ public class CoreModule extends AbstractPluginModule {bind(UserManager.class).to(DefaultUserManager.class);bind(PullRequestReviewManager.class).to(DefaultPullRequestReviewManager.class);bind(BuildManager.class).to(DefaultBuildManager.class);- bind(Build2Manager.class).to(DefaultBuild2Manager.class);bind(BuildDependenceManager.class).to(DefaultBuildDependenceManager.class);bind(JobScheduler.class).to(DefaultJobScheduler.class);bind(LogManager.class).to(DefaultLogManager.class);bind(PullRequestBuildManager.class).to(DefaultPullRequestBuildManager.class);- bind(ConfigurationManager.class).to(DefaultConfigurationManager.class);bind(MailManager.class).to(DefaultMailManager.class);bind(IssueManager.class).to(DefaultIssueManager.class);bind(IssueFieldEntityManager.class).to(DefaultIssueFieldEntityManager.class);diff --git a/core/src/main/java/io/onedev/server/cache/CacheManager.java b/core/src/main/java/io/onedev/server/cache/CacheManager.javaindex f77f85d39d..98488349de 100644--- a/core/src/main/java/io/onedev/server/cache/CacheManager.java+++ b/core/src/main/java/io/onedev/server/cache/CacheManager.java@@ -5,7 +5,6 @@ import java.util.Map;import javax.annotation.Nullable;-import io.onedev.server.util.facade.ConfigurationFacade;import io.onedev.server.util.facade.GroupAuthorizationFacade;import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.util.facade.MembershipFacade;@@ -27,8 +26,6 @@ public interface CacheManager {Map<Long, MembershipFacade> getMemberships();- Map<Long, ConfigurationFacade> getConfigurations();-@NullableProjectFacade getProject(Long id);@@ -47,12 +44,6 @@ public interface CacheManager {@NullableLong getUserIdByEmail(String email);- @Nullable- UserAuthorizationFacade getUserAuthorization(Long id);-- @Nullable- GroupAuthorizationFacade getGroupAuthorization(Long id);-@NullableLong getGroupIdByName(String name);@@ -65,8 +56,6 @@ public interface CacheManager {Collection<Long> getBuildIdsByProject(Long projectId);- Collection<Long> getBuildIdsByConfiguration(Long configurationId);-Collection<Long> filterBuildIds(Long projectId, Collection<String> commitHashes);}diff --git a/core/src/main/java/io/onedev/server/cache/DefaultBuildInfoManager.java b/core/src/main/java/io/onedev/server/cache/DefaultBuildInfoManager.javaindex 8fcdaf5c2b..1ca91ebf3f 100644--- a/core/src/main/java/io/onedev/server/cache/DefaultBuildInfoManager.java+++ b/core/src/main/java/io/onedev/server/cache/DefaultBuildInfoManager.java@@ -137,10 +137,8 @@ public class DefaultBuildInfoManager extends AbstractEnvironmentManager implemen@Overridepublic void execute(Transaction txn) {- ByteIterable configurationKey = new LongByteIterable(build.getConfiguration().getId());- Collection<ObjectId> lastCommits = readCommits(lastCommitsStore, txn, configurationKey);- if (lastCommits.isEmpty() && build.getConfiguration().getBaseCommit() != null)- lastCommits.add(ObjectId.fromString(build.getConfiguration().getBaseCommit()));+ ByteIterable jobKey = new StringByteIterable(build.getProject().getId() + ":" + build.getJobName());+ Collection<ObjectId> lastCommits = readCommits(lastCommitsStore, txn, jobKey);writeCommits(prevCommitsStore, txn, new LongByteIterable(build.getId()), lastCommits);ObjectId buildCommit = ObjectId.fromString(build.getCommitHash());@@ -156,7 +154,7 @@ public class DefaultBuildInfoManager extends AbstractEnvironmentManager implemen}if (addCommit)lastCommits.add(buildCommit);- writeCommits(lastCommitsStore, txn, configurationKey, lastCommits);+ writeCommits(lastCommitsStore, txn, jobKey, lastCommits);defaultStore.put(txn, LAST_BUILD_KEY, new LongByteIterable(build.getId()));}@@ -192,7 +190,7 @@ public class DefaultBuildInfoManager extends AbstractEnvironmentManager implemen@Listenpublic void on(EntityPersisted event) {if (event.isNew() && event.getEntity() instanceof Build) {- Long projectId = ((Build) event.getEntity()).getConfiguration().getProject().getId();+ Long projectId = ((Build) event.getEntity()).getProject().getId();transactionManager.runAfterCommit(new Runnable() {@Overridediff --git a/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java b/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.javaindex b4ecb09853..d3f506ecc9 100644--- a/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java+++ b/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java@@ -24,7 +24,6 @@ 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.Build;-import io.onedev.server.model.Configuration;import io.onedev.server.model.Group;import io.onedev.server.model.GroupAuthorization;import io.onedev.server.model.Issue;@@ -37,7 +36,6 @@ 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.util.facade.BuildFacade;-import io.onedev.server.util.facade.ConfigurationFacade;import io.onedev.server.util.facade.EntityFacade;import io.onedev.server.util.facade.GroupAuthorizationFacade;import io.onedev.server.util.facade.GroupFacade;@@ -80,10 +78,6 @@ public class DefaultCacheManager implements CacheManager {private final ReadWriteLock membershipsLock = new ReentrantReadWriteLock();- private final Map<Long, ConfigurationFacade> configurations = new HashMap<>();-- private final ReadWriteLock configurationsLock = new ReentrantReadWriteLock();-private final Map<Long, BuildFacade> builds= new HashMap<>();private final ReadWriteLock buildsLock = new ReentrantReadWriteLock();@@ -129,10 +123,7 @@ public class DefaultCacheManager implements CacheManager {for (Membership membership: dao.query(Membership.class))memberships.put(membership.getId(), membership.getFacade());- for (Configuration configuration: dao.query(Configuration.class))- configurations.put(configuration.getId(), configuration.getFacade());-- Query<?> query = dao.getSessionManager().getSession().createQuery("select id, configuration.id, commitHash from Build");+ Query<?> query = dao.getSessionManager().getSession().createQuery("select id, project.id, commitHash from Build");for (Object[] fields: (List<Object[]>)query.list()) {Long buildId = (Long) fields[0];builds.put(buildId, new BuildFacade(buildId, (Long)fields[1], (String)fields[2]));@@ -167,8 +158,6 @@ public class DefaultCacheManager implements CacheManager {facade = ((Build)event.getEntity()).getFacade();} else if (event.getEntity() instanceof Issue) {facade = ((Issue)event.getEntity()).getFacade();- } else if (event.getEntity() instanceof Configuration) {- facade = ((Configuration)event.getEntity()).getFacade();} else if (event.getEntity() instanceof UserAuthorization) {facade = ((UserAuthorization) event.getEntity()).getFacade();} else if (event.getEntity() instanceof GroupAuthorization) {@@ -210,14 +199,6 @@ public class DefaultCacheManager implements CacheManager {} finally {groupsLock.writeLock().unlock();}- } else if (facade instanceof ConfigurationFacade) {- ConfigurationFacade configuration = (ConfigurationFacade) facade;- configurationsLock.writeLock().lock();- try {- configurations.put(configuration.getId(), configuration);- } finally {- configurationsLock.writeLock().unlock();- }} else if (facade instanceof IssueFacade) {IssueFacade issue = (IssueFacade) facade;issuesLock.writeLock().lock();@@ -301,26 +282,6 @@ public class DefaultCacheManager implements CacheManager {} finally {groupAuthorizationsLock.writeLock().unlock();}- configurationsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, ConfigurationFacade>> it = configurations.entrySet().iterator(); it.hasNext();) {- ConfigurationFacade configuration = it.next().getValue();- if (configuration.getProjectId().equals(id)) {- it.remove();- buildsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, BuildFacade>> it2 = builds.entrySet().iterator(); it2.hasNext();) {- if (it2.next().getValue().getConfigurationId().equals(configuration.getId()))- it2.remove();- }- } finally {- buildsLock.writeLock().unlock();- }- }- }- } finally {- configurationsLock.writeLock().unlock();- }issuesLock.writeLock().lock();try {for (Iterator<Map.Entry<Long, IssueFacade>> it = issues.entrySet().iterator(); it.hasNext();) {@@ -384,22 +345,6 @@ public class DefaultCacheManager implements CacheManager {} finally {membershipsLock.writeLock().unlock();}- } else if (Configuration.class.isAssignableFrom(clazz)) {- configurationsLock.writeLock().lock();- try {- configurations.remove(id);- } finally {- configurationsLock.writeLock().unlock();- }- buildsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, BuildFacade>> it = builds.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getConfigurationId().equals(id))- it.remove();- }- } finally {- buildsLock.writeLock().unlock();- }} else if (Build.class.isAssignableFrom(clazz)) {buildsLock.writeLock().lock();try {@@ -587,66 +532,35 @@ public class DefaultCacheManager implements CacheManager {@Overridepublic Collection<Long> getBuildIdsByProject(Long projectId) {buildsLock.readLock().lock();- configurationsLock.readLock().lock();try {Collection<Long> buildIds = new HashSet<>();for (BuildFacade build: builds.values()) {- ConfigurationFacade configuration = configurations.get(build.getConfigurationId());- if (configuration != null && configuration.getProjectId().equals(projectId))+ if (build.getProjectId().equals(projectId))buildIds.add(build.getId());}return buildIds;} finally {- configurationsLock.readLock().unlock();buildsLock.readLock().unlock();}}- @Override- public Collection<Long> getBuildIdsByConfiguration(Long configurationId) {- buildsLock.readLock().lock();- try {- Collection<Long> buildIds = new HashSet<>();- for (BuildFacade build: builds.values()) {- if (build.getConfigurationId().equals(configurationId))- buildIds.add(build.getId());- }- return buildIds;- } finally {- buildsLock.readLock().unlock();- }- }-@Overridepublic Collection<Long> filterBuildIds(Long projectId, Collection<String> commitHashes) {buildsLock.readLock().lock();- configurationsLock.readLock().lock();try {Collection<Long> buildIds = new HashSet<>();for (BuildFacade build: builds.values()) {- ConfigurationFacade configuration = configurations.get(build.getConfigurationId());- if (configuration != null && configuration.getProjectId().equals(projectId)+ if (build.getProjectId().equals(projectId)&& commitHashes.contains(build.getCommitHash())) {buildIds.add(build.getId());}}return buildIds;} finally {- configurationsLock.readLock().unlock();buildsLock.readLock().unlock();}}- @Override- public Map<Long, ConfigurationFacade> getConfigurations() {- configurationsLock.readLock().lock();- try {- return new HashMap<>(configurations);- } finally {- configurationsLock.readLock().unlock();- }- }-@Overridepublic Map<Long, UserAuthorizationFacade> getUserAuthorizations() {userAuthorizationsLock.readLock().lock();@@ -667,24 +581,4 @@ public class DefaultCacheManager implements CacheManager {}}- @Override- public UserAuthorizationFacade getUserAuthorization(Long id) {- userAuthorizationsLock.readLock().lock();- try {- return userAuthorizations.get(id);- } finally {- userAuthorizationsLock.readLock().unlock();- }- }-- @Override- public GroupAuthorizationFacade getGroupAuthorization(Long id) {- groupAuthorizationsLock.readLock().lock();- try {- return groupAuthorizations.get(id);- } finally {- groupAuthorizationsLock.readLock().unlock();- }- }-}diff --git a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.javaindex 863b6ae02e..14e3487ef1 100644--- a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java+++ b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java@@ -41,7 +41,7 @@ import io.onedev.server.ci.job.outcome.DependencyPopulator;import io.onedev.server.ci.job.outcome.JobOutcome;import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.ci.job.trigger.JobTrigger;-import io.onedev.server.entitymanager.Build2Manager;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;@@ -55,7 +55,7 @@ import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;import io.onedev.server.exception.OneException;-import io.onedev.server.model.Build2;+import io.onedev.server.model.Build;import io.onedev.server.model.BuildDependence;import io.onedev.server.model.BuildParam;import io.onedev.server.model.Project;@@ -84,7 +84,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableTprivate final ProjectManager projectManager;- private final Build2Manager buildManager;+ private final BuildManager buildManager;private final UserManager userManager;@@ -111,7 +111,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableTprivate volatile Status status;@Inject- public DefaultJobScheduler(ProjectManager projectManager, Build2Manager buildManager,+ public DefaultJobScheduler(ProjectManager projectManager, BuildManager buildManager,UserManager userManager, ListenerRegistry listenerRegistry, SettingManager settingManager,TransactionManager transactionManager, LogManager logManager, ExecutorService executorService,SessionManager sessionManager, Set<DependencyPopulator> dependencyPopulators,@@ -176,16 +176,16 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableTreturn paramMatrix;}- private List<Build2> submit(Project project, @Nullable User user, String commitHash, String jobName,+ private List<Build> submit(Project project, @Nullable User user, String commitHash, String jobName,Map<String, String> paramMap, List<String> dependencyChain) {- List<Build2> builds = buildManager.query(project, commitHash, jobName, paramMap);+ List<Build> builds = buildManager.query(project, commitHash, jobName, paramMap);if (builds.isEmpty()) {- Build2 build = new Build2();+ Build build = new Build();build.setProject(project);build.setCommitHash(commitHash);build.setJobName(jobName);build.setSubmitDate(new Date());- build.setStatus(Build2.Status.WAITING);+ build.setStatus(Build.Status.WAITING);build.setUser(user);builds.add(build);@@ -229,9 +229,9 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT@Overridepublic void run(Map<String, String> params) {- List<Build2> dependencyBuilds = submit(project, null, commitHash, dependency.getJobName(),+ List<Build> dependencyBuilds = submit(project, null, commitHash, dependency.getJobName(),params, new ArrayList<>(dependencyChain));- for (Build2 dependencyBuild: dependencyBuilds) {+ for (Build dependencyBuild: dependencyBuilds) {BuildDependence dependence = new BuildDependence();dependence.setDependency(dependencyBuild);dependence.setDependent(build);@@ -257,7 +257,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableTreturn null;}- private void run(Build2 build) {+ private void run(Build build) {ObjectId commitId = ObjectId.fromString(build.getCommitHash());try {CISpec ciSpec = build.getProject().getCISpec(commitId);@@ -267,7 +267,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableTJobExecutor executor = getJobExecutor(build.getProject(), commitId, job.getName(), job.getEnvironment());if (executor != null) {if (executor.hasCapacity()) {- build.setStatus(Build2.Status.RUNNING);+ build.setStatus(Build.Status.RUNNING);build.setRunningDate(new Date());buildManager.save(build);listenerRegistry.post(new BuildRunning(build));@@ -296,7 +296,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT@Overridepublic void run() {- Build2 build = buildManager.load(buildId);+ Build build = buildManager.load(buildId);logger.info("Populating dependencies...");for (BuildDependence dependence: build.getDependencies()) {for (DependencyPopulator populator: dependencyPopulators)@@ -327,7 +327,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT@Overridepublic void run() {logger.info("Collecting job outcomes...");- Build2 build = buildManager.load(buildId);+ Build build = buildManager.load(buildId);for (JobOutcome outcome: job.getOutcomes())outcome.process(build, workspace, logger);}@@ -365,8 +365,8 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT}}- private void markBuildError(Build2 build, String errorMessage) {- build.setStatus(Build2.Status.IN_ERROR, errorMessage);+ private void markBuildError(Build build, String errorMessage) {+ build.setStatus(Build.Status.IN_ERROR, errorMessage);build.setFinishDate(new Date());listenerRegistry.post(new BuildFinished(build));}@@ -397,12 +397,12 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT@Transactional@Override- public void resubmit(Build2 build) {+ public void resubmit(Build build) {for (BuildDependence dependence: build.getDependents())resubmit(dependence.getDependent());if (build.isFinished()) {- build.setStatus(Build2.Status.WAITING);+ build.setStatus(Build.Status.WAITING);build.setFinishDate(null);build.setPendingDate(null);build.setRunningDate(null);@@ -417,7 +417,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT@Sessional@Override- public void cancel(Build2 build) {+ public void cancel(Build build) {JobExecution execution = jobExecutions.get(build.getId());if (execution != null)execution.getFuture().cancel(true);@@ -470,11 +470,11 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT@Overridepublic Boolean call() {- for (Build2 build: buildManager.queryUnfinished()) {- if (build.getStatus() == Build2.Status.PENDING) {+ for (Build build: buildManager.queryUnfinished()) {+ if (build.getStatus() == Build.Status.QUEUEING) {if (status == Status.STARTED)run(build);- } else if (build.getStatus() == Build2.Status.RUNNING) {+ } else if (build.getStatus() == Build.Status.RUNNING) {JobExecution execution = jobExecutions.get(build.getId());if (execution != null) {if (System.currentTimeMillis() - build.getRunningDate().getTime() > execution.getTimeout())@@ -482,14 +482,14 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT} else {markBuildError(build, "Stopped for unknown reason");}- } else if (build.getStatus() == Build2.Status.WAITING) {+ } else if (build.getStatus() == Build.Status.WAITING) {boolean hasUnsuccessful = false;boolean hasUnfinished = false;for (BuildDependence dependence: build.getDependencies()) {- Build2 dependency = dependence.getDependency();+ Build dependency = dependence.getDependency();- if (dependency.getStatus() == Build2.Status.SUCCESSFUL)+ if (dependency.getStatus() == Build.Status.SUCCESSFUL)continue;else if (dependency.isFinished())hasUnsuccessful = true;@@ -500,7 +500,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableTif (hasUnsuccessful) {markBuildError(build, "There are failed dependency jobs");} else if (!hasUnfinished) {- build.setStatus(Build2.Status.PENDING);+ build.setStatus(Build.Status.QUEUEING);build.setPendingDate(new Date());listenerRegistry.post(new BuildPending(build));}@@ -508,20 +508,20 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT}for (Iterator<Map.Entry<Long, JobExecution>> it = jobExecutions.entrySet().iterator(); it.hasNext();) {Map.Entry<Long, JobExecution> entry = it.next();- Build2 build = buildManager.get(entry.getKey());+ Build build = buildManager.get(entry.getKey());JobExecution execution = entry.getValue();- if (build == null || build.getStatus() != Build2.Status.RUNNING) {+ if (build == null || build.getStatus() != Build.Status.RUNNING) {it.remove();execution.getFuture().cancel(true);} else if (execution.getFuture().isDone()) {it.remove();try {execution.getFuture().get();- build.setStatus(Build2.Status.SUCCESSFUL);+ build.setStatus(Build.Status.SUCCESSFUL);} catch (CancellationException e) {- build.setStatus(Build2.Status.CANCELLED);+ build.setStatus(Build.Status.CANCELLED);} catch (Exception e) {- build.setStatus(Build2.Status.FAILED, e.getMessage());+ build.setStatus(Build.Status.FAILED, e.getMessage());} finally {build.setFinishDate(new Date());listenerRegistry.post(new BuildFinished(build));diff --git a/core/src/main/java/io/onedev/server/ci/job/JobScheduler.java b/core/src/main/java/io/onedev/server/ci/job/JobScheduler.javaindex c94a77a15e..0620cf7924 100644--- a/core/src/main/java/io/onedev/server/ci/job/JobScheduler.java+++ b/core/src/main/java/io/onedev/server/ci/job/JobScheduler.java@@ -3,15 +3,15 @@ package io.onedev.server.ci.job;import java.util.List;import java.util.Map;-import io.onedev.server.model.Build2;+import io.onedev.server.model.Build;import io.onedev.server.model.Project;public interface JobScheduler {void submit(Project project, String commitHash, String jobName, Map<String, List<String>> paramMatrix);- void resubmit(Build2 build);+ void resubmit(Build build);- void cancel(Build2 build);+ void cancel(Build build);}diff --git a/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java b/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.javaindex 46a6cc7c03..64bef8956d 100644--- a/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java+++ b/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java@@ -37,7 +37,7 @@ import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.server.event.build2.BuildFinished;-import io.onedev.server.model.Build2;+import io.onedev.server.model.Build;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.storage.StorageManager;import io.onedev.server.web.websocket.WebSocketManager;@@ -115,7 +115,7 @@ public class DefaultLogManager implements LogManager {}}- webSocketManager.notifyObservableChange(Build2.getLogWebSocketObservable(buildId), null);+ webSocketManager.notifyObservableChange(Build.getLogWebSocketObservable(buildId), null);}} finally {lock.unlock();@@ -186,7 +186,7 @@ public class DefaultLogManager implements LogManager {@Sessional@Override- public List<LogEntry> readLogEntries(Build2 build, int from, int count) {+ public List<LogEntry> readLogEntries(Build build, int from, int count) {Lock lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).readLock();lock.lock();try {@@ -214,7 +214,7 @@ public class DefaultLogManager implements LogManager {@Sessional@Override- public LogSnippet readLogSnippetReversely(Build2 build, int count) {+ public LogSnippet readLogSnippetReversely(Build build, int count) {Lock lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).readLock();lock.lock();try {@@ -261,7 +261,7 @@ public class DefaultLogManager implements LogManager {@Sessional@Listenpublic void on(BuildFinished event) {- Build2 build = event.getBuild();+ Build build = event.getBuild();Lock lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).writeLock();lock.lock();try {@@ -281,7 +281,7 @@ public class DefaultLogManager implements LogManager {}@Override- public InputStream openLogStream(Build2 build) {+ public InputStream openLogStream(Build build) {return new LogStream(build);}@@ -297,7 +297,7 @@ public class DefaultLogManager implements LogManager {private int pos = 0;- public LogStream(Build2 build) {+ public LogStream(Build build) {lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).readLock();lock.lock();try {diff --git a/core/src/main/java/io/onedev/server/ci/job/log/LogManager.java b/core/src/main/java/io/onedev/server/ci/job/log/LogManager.javaindex f3ba601b38..f6e7304b95 100644--- a/core/src/main/java/io/onedev/server/ci/job/log/LogManager.java+++ b/core/src/main/java/io/onedev/server/ci/job/log/LogManager.java@@ -5,7 +5,7 @@ import java.util.List;import org.slf4j.Logger;-import io.onedev.server.model.Build2;+import io.onedev.server.model.Build;public interface LogManager {@@ -25,7 +25,7 @@ public interface LogManager {* log entries. Number of entries may be less than required count if there is no* enough log entries*/- List<LogEntry> readLogEntries(Build2 build, int offset, int count);+ List<LogEntry> readLogEntries(Build build, int offset, int count);/*** Read specified number of log entries starting from end of the log@@ -38,8 +38,8 @@ public interface LogManager {* log entries with normal order. Number of entries may be less than required count* if there is no enough log entries*/- LogSnippet readLogSnippetReversely(Build2 build, int count);+ LogSnippet readLogSnippetReversely(Build build, int count);- InputStream openLogStream(Build2 build);+ InputStream openLogStream(Build build);}diff --git a/core/src/main/java/io/onedev/server/ci/job/outcome/DependencyPopulator.java b/core/src/main/java/io/onedev/server/ci/job/outcome/DependencyPopulator.javaindex 498818246c..4c825999f7 100644--- a/core/src/main/java/io/onedev/server/ci/job/outcome/DependencyPopulator.java+++ b/core/src/main/java/io/onedev/server/ci/job/outcome/DependencyPopulator.java@@ -4,10 +4,10 @@ import java.io.File;import org.slf4j.Logger;-import io.onedev.server.model.Build2;+import io.onedev.server.model.Build;public interface DependencyPopulator {- void populate(Build2 dependency, File workspace, Logger logger);+ void populate(Build dependency, File workspace, Logger logger);}diff --git a/core/src/main/java/io/onedev/server/ci/job/outcome/JobOutcome.java b/core/src/main/java/io/onedev/server/ci/job/outcome/JobOutcome.javaindex cb33383a04..aba0b17da2 100644--- a/core/src/main/java/io/onedev/server/ci/job/outcome/JobOutcome.java+++ b/core/src/main/java/io/onedev/server/ci/job/outcome/JobOutcome.java@@ -7,7 +7,7 @@ import org.hibernate.validator.constraints.NotEmpty;import org.slf4j.Logger;import io.onedev.server.OneDev;-import io.onedev.server.model.Build2;+import io.onedev.server.model.Build;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.annotation.Editable;@@ -39,13 +39,13 @@ public abstract class JobOutcome implements Serializable {return patternSet;}- public abstract void process(Build2 build, File workspace, Logger logger);+ public abstract void process(Build build, File workspace, Logger logger);- public static String getLockKey(Build2 build, String outcomeDir) {+ public static String getLockKey(Build build, String outcomeDir) {return "job-outcome:" + build.getId() + ":" + outcomeDir;}- public static File getOutcomeDir(Build2 build, String outcomeDir) {+ public static File getOutcomeDir(Build build, String outcomeDir) {File buildDir = OneDev.getInstance(StorageManager.class).getBuildDir(build.getProject().getId(), build.getId());return new File(buildDir, outcomeDir);diff --git a/core/src/main/java/io/onedev/server/ci/job/outcome/artifact/ArtifactsPopulator.java b/core/src/main/java/io/onedev/server/ci/job/outcome/artifact/ArtifactsPopulator.javaindex 68ddda7d9e..dd69e7490d 100644--- a/core/src/main/java/io/onedev/server/ci/job/outcome/artifact/ArtifactsPopulator.java+++ b/core/src/main/java/io/onedev/server/ci/job/outcome/artifact/ArtifactsPopulator.java@@ -9,12 +9,12 @@ import org.slf4j.Logger;import io.onedev.commons.utils.LockUtils;import io.onedev.server.ci.job.outcome.DependencyPopulator;import io.onedev.server.ci.job.outcome.JobOutcome;-import io.onedev.server.model.Build2;+import io.onedev.server.model.Build;public class ArtifactsPopulator implements DependencyPopulator {@Override- public void populate(Build2 dependency, File workspace, Logger logger) {+ public void populate(Build dependency, File workspace, Logger logger) {File outcomeDir = JobOutcome.getOutcomeDir(dependency, JobArtifacts.DIR);LockUtils.read(JobOutcome.getLockKey(dependency, JobArtifacts.DIR), new Callable<Void>() {diff --git a/core/src/main/java/io/onedev/server/ci/job/outcome/artifact/JobArtifacts.java b/core/src/main/java/io/onedev/server/ci/job/outcome/artifact/JobArtifacts.javaindex 77e605212f..9e1124ccf0 100644--- a/core/src/main/java/io/onedev/server/ci/job/outcome/artifact/JobArtifacts.java+++ b/core/src/main/java/io/onedev/server/ci/job/outcome/artifact/JobArtifacts.java@@ -9,7 +9,7 @@ import org.slf4j.Logger;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.server.ci.job.outcome.JobOutcome;-import io.onedev.server.model.Build2;+import io.onedev.server.model.Build;import io.onedev.server.web.editable.annotation.Editable;@Editable(name="Artifacts")@@ -20,7 +20,7 @@ public class JobArtifacts extends JobOutcome {public static final String DIR = "artifacts";@Override- public void process(Build2 build, File workspace, Logger logger) {+ public void process(Build build, File workspace, Logger logger) {File outcomeDir = getOutcomeDir(build, DIR);FileUtils.createDir(outcomeDir);diff --git a/core/src/main/java/io/onedev/server/ci/job/outcome/htmlreport/JobHtmlReport.java b/core/src/main/java/io/onedev/server/ci/job/outcome/htmlreport/JobHtmlReport.javaindex a31168d433..3a3ba0bdc3 100644--- a/core/src/main/java/io/onedev/server/ci/job/outcome/htmlreport/JobHtmlReport.java+++ b/core/src/main/java/io/onedev/server/ci/job/outcome/htmlreport/JobHtmlReport.java@@ -12,7 +12,7 @@ import org.slf4j.Logger;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.server.ci.job.outcome.JobOutcome;-import io.onedev.server.model.Build2;+import io.onedev.server.model.Build;import io.onedev.server.web.editable.annotation.Editable;@Editable(name="Html Report")@@ -49,7 +49,7 @@ public class JobHtmlReport extends JobOutcome {}@Override- public void process(Build2 build, File workspace, Logger logger) {+ public void process(Build build, File workspace, Logger logger) {File outcomeDir = getOutcomeDir(build, DIR);FileUtils.createDir(outcomeDir);diff --git a/core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java b/core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.javaindex a515049aee..6c3d14f8bc 100644--- a/core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java+++ b/core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java@@ -5,8 +5,8 @@ import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.event.ProjectEvent;import io.onedev.server.event.build2.BuildFinished;-import io.onedev.server.model.Build2;-import io.onedev.server.model.Build2.Status;+import io.onedev.server.model.Build;+import io.onedev.server.model.Build.Status;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=500, name="When dependency jobs finished successfully")@@ -18,7 +18,7 @@ public class DependencyBuiltTrigger extends JobTrigger {public boolean matches(ProjectEvent event, Job job) {if (event instanceof BuildFinished) {BuildFinished buildFinished = (BuildFinished) event;- Build2 build = buildFinished.getBuild();+ Build build = buildFinished.getBuild();if (build.getStatus() == Status.SUCCESSFUL) {for (Dependency dependency: job.getDependencies()) {if (dependency.getJobName().equals(build.getJobName())) {diff --git a/core/src/main/java/io/onedev/server/entitymanager/Build2Manager.java b/core/src/main/java/io/onedev/server/entitymanager/Build2Manager.javadeleted file mode 100644index e8a5a247bd..0000000000--- a/core/src/main/java/io/onedev/server/entitymanager/Build2Manager.java+++ /dev/null@@ -1,26 +0,0 @@-package io.onedev.server.entitymanager;--import java.util.List;-import java.util.Map;--import javax.annotation.Nullable;--import io.onedev.server.model.Build2;-import io.onedev.server.model.Project;-import io.onedev.server.persistence.dao.EntityManager;--public interface Build2Manager extends EntityManager<Build2> {-- @Nullable- Build2 find(Project project, long number);-- List<Build2> query(Project project, String commitHash, String jobName, Map<String, String> params);-- void create(Build2 build);-- @Nullable- Build2 find(String runInstanceId);-- List<Build2> queryUnfinished();--}diff --git a/core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/BuildManager.javaindex 2b9dada348..4748463ecf 100644--- a/core/src/main/java/io/onedev/server/entitymanager/BuildManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/BuildManager.java@@ -1,11 +1,11 @@package io.onedev.server.entitymanager;import java.util.List;+import java.util.Map;import javax.annotation.Nullable;import io.onedev.server.model.Build;-import io.onedev.server.model.Configuration;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityManager;@@ -14,17 +14,17 @@ import io.onedev.server.search.entity.EntityQuery;public interface BuildManager extends EntityManager<Build> {- List<Build> query(Project project, String commitHash);+ @Nullable+ Build find(Project project, long number);++ List<Build> query(Project project, String commitHash, @Nullable String jobName, Map<String, String> params);- @Nullable- Build findByCommit(Configuration configuration, String commitHash);+ List<Build> query(Project project, String commitHash);- @Nullable- Build findByVersion(Configuration configuration, String name);-- @Nullable- Build findByFQN(Project project, String fqn);+ void create(Build build);+ List<Build> queryUnfinished();+List<Build> query(Project project, String term, int count);List<Build> queryAfter(Project project, Long afterBuildId, int count);@@ -33,6 +33,4 @@ public interface BuildManager extends EntityManager<Build> {int count(Project project, User user, EntityCriteria<Build> buildCriteria);- void cleanupBuilds(Configuration configuration);-}diff --git a/core/src/main/java/io/onedev/server/entitymanager/ConfigurationManager.java b/core/src/main/java/io/onedev/server/entitymanager/ConfigurationManager.javadeleted file mode 100644index 00fc813cdf..0000000000--- a/core/src/main/java/io/onedev/server/entitymanager/ConfigurationManager.java+++ /dev/null@@ -1,16 +0,0 @@-package io.onedev.server.entitymanager;--import javax.annotation.Nullable;--import io.onedev.server.model.Configuration;-import io.onedev.server.model.Project;-import io.onedev.server.persistence.dao.EntityManager;--public interface ConfigurationManager extends EntityManager<Configuration> {-- @Nullable- Configuration find(Project project, String name);-- void save(Configuration configuration, @Nullable String oldName);--}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuild2Manager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuild2Manager.javadeleted file mode 100644index 1dfbb7d2f1..0000000000--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuild2Manager.java+++ /dev/null@@ -1,128 +0,0 @@-package io.onedev.server.entitymanager.impl;--import java.util.ArrayList;-import java.util.List;-import java.util.Map;--import javax.inject.Inject;-import javax.inject.Singleton;-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 org.hibernate.criterion.Restrictions;-import org.hibernate.query.Query;--import com.google.common.base.Preconditions;--import io.onedev.commons.launcher.loader.Listen;-import io.onedev.commons.utils.FileUtils;-import io.onedev.server.entitymanager.Build2Manager;-import io.onedev.server.entitymanager.BuildDependenceManager;-import io.onedev.server.entitymanager.BuildParamManager;-import io.onedev.server.event.build2.BuildSubmitted;-import io.onedev.server.model.Build2;-import io.onedev.server.model.Build2.Status;-import io.onedev.server.model.BuildDependence;-import io.onedev.server.model.BuildParam;-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.Dao;-import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.storage.StorageManager;--@Singleton-public class DefaultBuild2Manager extends AbstractEntityManager<Build2> implements Build2Manager {-- private final BuildParamManager buildParamManager;-- private final BuildDependenceManager buildDependenceManager;-- private final StorageManager storageManager;-- @Inject- public DefaultBuild2Manager(Dao dao, BuildParamManager buildParamManager,- BuildDependenceManager buildDependenceManager,- StorageManager storageManager) {- super(dao);- this.buildParamManager = buildParamManager;- this.buildDependenceManager = buildDependenceManager;- this.storageManager = storageManager;- }-- @Sessional- @Override- public Build2 find(Project project, long number) {- EntityCriteria<Build2> criteria = newCriteria();- criteria.add(Restrictions.eq("project", project));- criteria.add(Restrictions.eq("number", number));- criteria.setCacheable(true);- return find(criteria);- }-- @Sessional- @Override- public List<Build2> query(Project project, String commitHash, String jobName, Map<String, String> params) {- CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<Build2> query = builder.createQuery(Build2.class);- Root<Build2> root = query.from(Build2.class);-- List<Predicate> restrictions = new ArrayList<>();- restrictions.add(builder.equal(root.get("project"), project));- restrictions.add(builder.equal(root.get("commitHash"), commitHash));- restrictions.add(builder.equal(root.get("jobName"), jobName));-- for (Map.Entry<String, String> entry: params.entrySet()) {- Join<?, ?> join = root.join("params", JoinType.INNER);- restrictions.add(builder.equal(join.get("name"), entry.getKey()));- restrictions.add(builder.equal(join.get("value"), entry.getValue()));- }- return getSession().createQuery(query.where(restrictions.toArray(new Predicate[0]))).list();- }-- @Sessional- @Override- public Build2 find(String runInstanceId) {- EntityCriteria<Build2> criteria = newCriteria();- criteria.add(Restrictions.eq("runInstanceId", runInstanceId));- return find(criteria);- }-- @Sessional- @Override- public List<Build2> queryUnfinished() {- EntityCriteria<Build2> criteria = newCriteria();- criteria.add(Restrictions.or(- Restrictions.eq("status", Status.PENDING),- Restrictions.eq("status", Status.RUNNING),- Restrictions.eq("status", Status.WAITING)));- criteria.setCacheable(true);- return query(criteria);- }-- @Transactional- @Override- public void create(Build2 build) {- Preconditions.checkArgument(build.isNew());- Query<?> query = getSession().createQuery("select max(number) from Build2 where project=:project");- query.setParameter("project", build.getProject());- build.setNumber(getNextNumber(build.getProject(), query));- save(build);-- for (BuildParam param: build.getParams())- buildParamManager.save(param);- for (BuildDependence dependence: build.getDependencies())- buildDependenceManager.save(dependence);- }-- @Listen- public void on(BuildSubmitted event) {- Build2 build = event.getBuild();- FileUtils.deleteDir(storageManager.getBuildDir(build.getProject().getId(), build.getId()));- }-}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex f9f87facf8..6a9079d7b4 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -1,258 +1,256 @@-package io.onedev.server.entitymanager.impl;--import java.util.ArrayList;-import java.util.List;--import javax.inject.Inject;-import javax.inject.Singleton;-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 org.apache.commons.lang3.StringUtils;-import org.hibernate.Criteria;-import org.hibernate.Session;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;-import org.hibernate.query.Query;-import org.quartz.CronScheduleBuilder;-import org.quartz.ScheduleBuilder;--import io.onedev.commons.launcher.loader.Listen;-import io.onedev.commons.launcher.loader.ListenerRegistry;-import io.onedev.commons.utils.schedule.SchedulableTask;-import io.onedev.commons.utils.schedule.TaskScheduler;-import io.onedev.server.OneDev;-import io.onedev.server.cache.CacheManager;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entitymanager.ConfigurationManager;-import io.onedev.server.event.build.BuildFinished;-import io.onedev.server.event.build.BuildStarted;-import io.onedev.server.event.system.SystemStarted;-import io.onedev.server.event.system.SystemStopping;-import io.onedev.server.model.Build;-import io.onedev.server.model.Configuration;-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.Dao;-import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.search.entity.EntitySort;-import io.onedev.server.search.entity.EntitySort.Direction;-import io.onedev.server.search.entity.QueryBuildContext;-import io.onedev.server.search.entity.build.BuildQuery;-import io.onedev.server.search.entity.build.BuildQueryBuildContext;-import io.onedev.server.util.BuildConstants;--@Singleton-public class DefaultBuildManager extends AbstractEntityManager<Build> implements BuildManager, SchedulableTask {-- private final TaskScheduler taskScheduler;-- private final ListenerRegistry listenerRegistry;-- private final ConfigurationManager configurationManager;-- private String taskId;-- @Inject- public DefaultBuildManager(Dao dao, ListenerRegistry listenerRegistry, TaskScheduler taskScheduler,- ConfigurationManager configurationManager) {- super(dao);- this.listenerRegistry = listenerRegistry;- this.taskScheduler = taskScheduler;- this.configurationManager = configurationManager;- }-- @Transactional- @Override- public void delete(Build build) {- Query<?> query = getSession().createQuery("update PullRequestBuild set build=null where build=:build");- query.setParameter("build", build);- query.executeUpdate();-- super.delete(build);- }-- @Sessional- @Override- public List<Build> query(Project project, String commitHash) {- EntityCriteria<Build> criteria = newCriteria();- criteria.createCriteria("configuration").add(Restrictions.eq("project", project));- criteria.add(Restrictions.eq("commitHash", commitHash));- criteria.addOrder(Order.asc("id"));- return query(criteria);- }-- @Override- public Build findByCommit(Configuration configuration, String commitHash) {- EntityCriteria<Build> criteria = newCriteria();- criteria.add(Restrictions.eq("configuration", configuration));- criteria.add(Restrictions.eq("commitHash", commitHash));- return find(criteria);- }-- @Override- public void save(Build build) {- super.save(build);-- if (build.getStatus() == Build.Status.RUNNING)- listenerRegistry.post(new BuildStarted(build));- else- listenerRegistry.post(new BuildFinished(build));- }-- @Sessional- @Override- public Build findByVersion(Configuration configuration, String version) {- EntityCriteria<Build> criteria = newCriteria();- criteria.add(Restrictions.eq("configuration", configuration));- criteria.add(Restrictions.eq("version", version));- criteria.addOrder(Order.desc("id"));- return find(criteria);- }-- @Sessional- @Override- public List<Build> query(Project project, String term, int count) {- List<Build> builds = new ArrayList<>();-- EntityCriteria<Build> criteria = newCriteria();- Criteria configurationCriteria = criteria.createCriteria("configuration");- configurationCriteria.add(Restrictions.eq("project", project));- if (term != null) {- if (term.contains(Build.FQN_SEPARATOR)) {- String configurationTerm = StringUtils.substringBefore(term, Build.FQN_SEPARATOR);- String versionTerm = StringUtils.substringAfter(term, Build.FQN_SEPARATOR);- configurationCriteria.add(Restrictions.ilike("name", "%" + configurationTerm + "%"));- criteria.add(Restrictions.ilike("version", "%" + versionTerm + "%"));- } else {- criteria.add(Restrictions.ilike("version", "%" + term + "%"));- }- }- criteria.addOrder(Order.desc("id"));- builds.addAll(query(criteria, 0, count-builds.size()));- return builds;- }-- @Override- public List<Build> queryAfter(Project project, Long afterBuildId, int count) {- EntityCriteria<Build> criteria = newCriteria();- criteria.createCriteria("configuration").add(Restrictions.eq("project", project));- criteria.addOrder(Order.asc("id"));- if (afterBuildId != null)- criteria.add(Restrictions.gt("id", afterBuildId));- return query(criteria, 0, count);- }-- @Sessional- @Override- public Build findByFQN(Project project, String fqn) {- String configurationName = StringUtils.substringBefore(fqn, Build.FQN_SEPARATOR);- String buildVersion = StringUtils.substringAfter(fqn, Build.FQN_SEPARATOR);- Configuration configuration = OneDev.getInstance(ConfigurationManager.class).find(project, configurationName);- if (configuration != null)- return OneDev.getInstance(BuildManager.class).findByVersion(configuration, buildVersion);- else- return null;- }-- private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Build> criteria, Project project,- QueryBuildContext<Build> context, User user) {- List<Predicate> predicates = new ArrayList<>();- Join<?, ?> join = context.getRoot().join(BuildConstants.ATTR_CONFIGURATION, JoinType.INNER);- join.on(context.getBuilder().equal(join.get(Configuration.ATTR_PROJECT), project));- if (criteria != null)- predicates.add(criteria.getPredicate(project, context, user));- return predicates.toArray(new Predicate[0]);- }-- private CriteriaQuery<Build> buildCriteriaQuery(Session session, Project project, EntityQuery<Build> buildQuery, User user) {- CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<Build> query = builder.createQuery(Build.class);- Root<Build> root = query.from(Build.class);- query.select(root).distinct(true);-- QueryBuildContext<Build> context = new BuildQueryBuildContext(root, builder);- query.where(getPredicates(buildQuery.getCriteria(), project, context, user));-- List<javax.persistence.criteria.Order> orders = new ArrayList<>();- for (EntitySort sort: buildQuery.getSorts()) {- if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(BuildQuery.getPath(root, BuildConstants.ORDER_FIELDS.get(sort.getField()))));- else- orders.add(builder.desc(BuildQuery.getPath(root, BuildConstants.ORDER_FIELDS.get(sort.getField()))));- }-- if (orders.isEmpty())- orders.add(builder.desc(root.get("id")));- query.orderBy(orders);-- return query;- }-- @Sessional- @Override- public List<Build> query(Project project, User user, EntityQuery<Build> buildQuery, int firstResult,- int maxResults) {- CriteriaQuery<Build> criteriaQuery = buildCriteriaQuery(getSession(), project, buildQuery, user);- Query<Build> query = getSession().createQuery(criteriaQuery);- query.setFirstResult(firstResult);- query.setMaxResults(maxResults);- return query.getResultList();- }-- @Sessional- @Override- public int count(Project project, User user, io.onedev.server.search.entity.EntityCriteria<Build> buildCriteria) {- CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);- Root<Build> root = criteriaQuery.from(Build.class);-- QueryBuildContext<Build> context = new BuildQueryBuildContext(root, builder);- criteriaQuery.where(getPredicates(buildCriteria, project, context, user));-- criteriaQuery.select(builder.countDistinct(root));- return getSession().createQuery(criteriaQuery).uniqueResult().intValue();- }-- @Transactional- @Override- public void cleanupBuilds(Configuration configuration) {- configuration.getBuildCleanupRule().cleanup(configuration, getSession());- }-- @Listen- public void on(SystemStarted event) {- taskId = taskScheduler.schedule(this);- }-- @Listen- public void on(SystemStopping event) {- taskScheduler.unschedule(taskId);- }-- @Override- public void execute() {- for (Long configurationId: OneDev.getInstance(CacheManager.class).getConfigurations().keySet())- cleanup(configurationId);- }-- @Transactional- protected void cleanup(Long configurationId) {- Configuration configuration = configurationManager.load(configurationId);- cleanupBuilds(configuration);- }-- @Override- public ScheduleBuilder<?> getScheduleBuilder() {- return CronScheduleBuilder.cronSchedule("0 0 1 * * ?");- }--}+package io.onedev.server.entitymanager.impl;++import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import javax.inject.Inject;+import javax.inject.Singleton;+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 org.apache.commons.lang3.StringUtils;+import org.hibernate.Session;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;+import org.hibernate.query.Query;++import com.google.common.base.Preconditions;++import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.utils.FileUtils;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.BuildDependenceManager;+import io.onedev.server.entitymanager.BuildParamManager;+import io.onedev.server.event.build2.BuildSubmitted;+import io.onedev.server.model.Build;+import io.onedev.server.model.Build.Status;+import io.onedev.server.model.BuildDependence;+import io.onedev.server.model.BuildParam;+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.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.search.entity.EntitySort;+import io.onedev.server.search.entity.EntitySort.Direction;+import io.onedev.server.search.entity.QueryBuildContext;+import io.onedev.server.search.entity.build.BuildQuery;+import io.onedev.server.search.entity.build.BuildQueryBuildContext;+import io.onedev.server.storage.StorageManager;+import io.onedev.server.util.BuildConstants;++@Singleton+public class DefaultBuildManager extends AbstractEntityManager<Build> implements BuildManager {++ private final BuildParamManager buildParamManager;++ private final BuildDependenceManager buildDependenceManager;++ private final StorageManager storageManager;++ @Inject+ public DefaultBuildManager(Dao dao, BuildParamManager buildParamManager,+ BuildDependenceManager buildDependenceManager,+ StorageManager storageManager) {+ super(dao);+ this.buildParamManager = buildParamManager;+ this.buildDependenceManager = buildDependenceManager;+ this.storageManager = storageManager;+ }++ @Transactional+ @Override+ public void delete(Build build) {+ Query<?> query = getSession().createQuery("update PullRequestBuild set build=null where build=:build");+ query.setParameter("build", build);+ query.executeUpdate();++ super.delete(build);+ }++ @Sessional+ @Override+ public Build find(Project project, long number) {+ EntityCriteria<Build> criteria = newCriteria();+ criteria.add(Restrictions.eq("project", project));+ criteria.add(Restrictions.eq("number", number));+ criteria.setCacheable(true);+ return find(criteria);+ }++ @Sessional+ @Override+ public List<Build> query(Project project, String commitHash) {+ return query(project, commitHash, null, new HashMap<>());+ }++ @Sessional+ @Override+ public List<Build> query(Project project, String commitHash, String jobName, Map<String, String> params) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<Build> query = builder.createQuery(Build.class);+ Root<Build> root = query.from(Build.class);++ List<Predicate> restrictions = new ArrayList<>();+ restrictions.add(builder.equal(root.get("project"), project));+ restrictions.add(builder.equal(root.get("commitHash"), commitHash));+ if (jobName != null)+ restrictions.add(builder.equal(root.get("jobName"), jobName));++ for (Map.Entry<String, String> entry: params.entrySet()) {+ Join<?, ?> join = root.join("params", JoinType.INNER);+ restrictions.add(builder.equal(join.get("name"), entry.getKey()));+ restrictions.add(builder.equal(join.get("value"), entry.getValue()));+ }+ return getSession().createQuery(query.where(restrictions.toArray(new Predicate[0]))).list();+ }++ @Sessional+ @Override+ public List<Build> queryUnfinished() {+ EntityCriteria<Build> criteria = newCriteria();+ criteria.add(Restrictions.or(+ Restrictions.eq("status", Status.QUEUEING),+ Restrictions.eq("status", Status.RUNNING),+ Restrictions.eq("status", Status.WAITING)));+ criteria.setCacheable(true);+ return query(criteria);+ }++ @Sessional+ @Override+ public List<Build> query(Project project, String term, int count) {+ List<Build> builds = new ArrayList<>();++ Long number = null;+ String numberStr = term;+ if (numberStr != null) {+ numberStr = numberStr.trim();+ if (numberStr.startsWith("#"))+ numberStr = numberStr.substring(1);+ if (StringUtils.isNumeric(numberStr))+ number = Long.valueOf(numberStr);+ }++ if (number != null) {+ Build build = find(project, number);+ if (build != null)+ builds.add(build);+ EntityCriteria<Build> criteria = newCriteria();+ criteria.add(Restrictions.eq("project", project));+ criteria.add(Restrictions.and(+ Restrictions.ilike("numberStr", term + "%"),+ Restrictions.ne("number", number)+ ));+ criteria.addOrder(Order.desc("number"));+ builds.addAll(query(criteria, 0, count-builds.size()));+ } else {+ EntityCriteria<Build> criteria = newCriteria();+ criteria.add(Restrictions.eq("project", project));+ if (StringUtils.isNotBlank(term)) {+ criteria.add(Restrictions.ilike("numberStr", (term.startsWith("#")? term.substring(1): term) + "%"));+ }+ criteria.addOrder(Order.desc("number"));+ builds.addAll(query(criteria, 0, count));+ }+ return builds;+ }++ @Override+ public List<Build> queryAfter(Project project, Long afterBuildId, int count) {+ EntityCriteria<Build> criteria = newCriteria();+ criteria.add(Restrictions.eq("project", project));+ criteria.addOrder(Order.asc("id"));+ if (afterBuildId != null)+ criteria.add(Restrictions.gt("id", afterBuildId));+ return query(criteria, 0, count);+ }++ @Transactional+ @Override+ public void create(Build build) {+ Preconditions.checkArgument(build.isNew());+ Query<?> query = getSession().createQuery("select max(number) from Build2 where project=:project");+ query.setParameter("project", build.getProject());+ build.setNumber(getNextNumber(build.getProject(), query));+ save(build);++ for (BuildParam param: build.getParams())+ buildParamManager.save(param);+ for (BuildDependence dependence: build.getDependencies())+ buildDependenceManager.save(dependence);+ }++ private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Build> criteria, Project project,+ QueryBuildContext<Build> context, User user) {+ List<Predicate> predicates = new ArrayList<>();+ predicates.add(context.getBuilder().equal(context.getRoot().get(BuildConstants.ATTR_PROJECT), project));+ if (criteria != null)+ predicates.add(criteria.getPredicate(project, context, user));+ return predicates.toArray(new Predicate[0]);+ }++ private CriteriaQuery<Build> buildCriteriaQuery(Session session, Project project, EntityQuery<Build> buildQuery, User user) {+ CriteriaBuilder builder = session.getCriteriaBuilder();+ CriteriaQuery<Build> query = builder.createQuery(Build.class);+ Root<Build> root = query.from(Build.class);+ query.select(root).distinct(true);++ QueryBuildContext<Build> context = new BuildQueryBuildContext(root, builder);+ query.where(getPredicates(buildQuery.getCriteria(), project, context, user));++ List<javax.persistence.criteria.Order> orders = new ArrayList<>();+ for (EntitySort sort: buildQuery.getSorts()) {+ if (sort.getDirection() == Direction.ASCENDING)+ orders.add(builder.asc(BuildQuery.getPath(root, BuildConstants.ORDER_FIELDS.get(sort.getField()))));+ else+ orders.add(builder.desc(BuildQuery.getPath(root, BuildConstants.ORDER_FIELDS.get(sort.getField()))));+ }++ if (orders.isEmpty())+ orders.add(builder.desc(root.get("id")));+ query.orderBy(orders);++ return query;+ }++ @Sessional+ @Override+ public List<Build> query(Project project, User user, EntityQuery<Build> buildQuery, int firstResult,+ int maxResults) {+ CriteriaQuery<Build> criteriaQuery = buildCriteriaQuery(getSession(), project, buildQuery, user);+ Query<Build> query = getSession().createQuery(criteriaQuery);+ query.setFirstResult(firstResult);+ query.setMaxResults(maxResults);+ return query.getResultList();+ }++ @Sessional+ @Override+ public int count(Project project, User user, io.onedev.server.search.entity.EntityCriteria<Build> buildCriteria) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);+ Root<Build> root = criteriaQuery.from(Build.class);++ QueryBuildContext<Build> context = new BuildQueryBuildContext(root, builder);+ criteriaQuery.where(getPredicates(buildCriteria, project, context, user));++ criteriaQuery.select(builder.countDistinct(root));+ return getSession().createQuery(criteriaQuery).uniqueResult().intValue();+ }++ @Listen+ public void on(BuildSubmitted event) {+ Build build = event.getBuild();+ FileUtils.deleteDir(storageManager.getBuildDir(build.getProject().getId(), build.getId()));+ }+}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultConfigurationManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultConfigurationManager.javadeleted file mode 100644index 0f981f73c9..0000000000--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultConfigurationManager.java+++ /dev/null@@ -1,64 +0,0 @@-package io.onedev.server.entitymanager.impl;--import javax.inject.Inject;-import javax.inject.Singleton;--import org.hibernate.criterion.Restrictions;--import io.onedev.server.entitymanager.ConfigurationManager;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.Configuration;-import io.onedev.server.model.Project;-import io.onedev.server.model.support.BranchProtection;-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.Dao;-import io.onedev.server.persistence.dao.EntityCriteria;--@Singleton-public class DefaultConfigurationManager extends AbstractEntityManager<Configuration>- implements ConfigurationManager {-- private final ProjectManager projectManager;-- @Inject- public DefaultConfigurationManager(Dao dao, ProjectManager projectManager) {- super(dao);- this.projectManager = projectManager;- }-- @Sessional- @Override- public Configuration find(Project project, String name) {- EntityCriteria<Configuration> criteria = newCriteria();- criteria.add(Restrictions.eq("project", project));- criteria.add(Restrictions.eq("name", name));- return find(criteria);- }-- @Transactional- @Override- public void save(Configuration configuration, String oldName) {- super.save(configuration);- if (oldName != null && !oldName.equals(configuration.getName())) {- for (Project project: projectManager.query()) {- for (BranchProtection protection: project.getBranchProtections())- protection.onRenameConfiguration(oldName, configuration.getName());- project.getIssueSetting().onRenameConfiguration(oldName, configuration.getName());- }- }- }-- @Transactional- @Override- public void delete(Configuration configuration) {- super.delete(configuration);- for (Project project: projectManager.query()) {- for (BranchProtection protection: project.getBranchProtections())- protection.onDeleteConfiguration(configuration.getName());- project.getIssueSetting().onDeleteConfiguration(configuration.getName());- }- }--}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex d82d3b023d..a893bbf5cb 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -22,7 +22,7 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueFieldEntityManager;import io.onedev.server.entitymanager.IssueManager;-import io.onedev.server.event.build.BuildEvent;+import io.onedev.server.event.build2.BuildEvent;import io.onedev.server.event.issue.IssueChangeEvent;import io.onedev.server.event.issue.IssueCommitted;import io.onedev.server.event.pullrequest.PullRequestChangeEvent;@@ -205,11 +205,11 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange@Transactional@Listenpublic void on(BuildEvent event) {- for (TransitionSpec transition: event.getBuild().getConfiguration().getProject().getIssueSetting().getTransitionSpecs(true)) {+ for (TransitionSpec transition: event.getBuild().getProject().getIssueSetting().getTransitionSpecs(true)) {if (transition.getTrigger() instanceof BuildSuccessfulTrigger) {BuildSuccessfulTrigger trigger = (BuildSuccessfulTrigger) transition.getTrigger();- if (trigger.getConfiguration().equals(event.getBuild().getConfiguration().getName())- && event.getBuild().getStatus() == Build.Status.SUCCESS) {+ if (trigger.getJobName().equals(event.getBuild().getJobName())+ && event.getBuild().getStatus() == Build.Status.SUCCESSFUL) {Long buildId = event.getBuild().getId();/*@@ -229,7 +229,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangeCollection<Long> fixedIssueNumbers = build.getFixedIssueNumbers();if (fixedIssueNumbers != null) {for (Long issueNumber: fixedIssueNumbers) {- Issue issue = issueManager.find(build.getConfiguration().getProject(), issueNumber);+ Issue issue = issueManager.find(build.getProject(), issueNumber);if (issue != null && transition.getFromStates().contains(issue.getState())) {issue.removeFields(transition.getRemoveFields());changeState(issue, transition.getToState(), new HashMap<>(), null, null);diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 2d27dc890d..823d262386 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -334,7 +334,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemif (branchProtection != null) {if (!ReviewRequirement.fromString(branchProtection.getReviewRequirement()).satisfied(user))return true;- if (!branchProtection.getConfigurations().isEmpty())+ if (!branchProtection.getJobNames().isEmpty())return true;if (file != null) {@@ -357,8 +357,8 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemreturn true;List<Build> builds = buildManager.query(project, newObjectId.name());- if (!builds.stream().map(it->it.getConfiguration().getName()).collect(Collectors.toSet())- .containsAll(branchProtection.getConfigurations())) {+ if (!builds.stream().map(it->it.getJobName()).collect(Collectors.toSet())+ .containsAll(branchProtection.getJobNames())) {return true;}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 31d823ae53..f28c930e6b 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -59,7 +59,6 @@ import io.onedev.commons.utils.concurrent.Prioritized;import io.onedev.server.OneDev;import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entitymanager.ConfigurationManager;import io.onedev.server.entitymanager.PullRequestBuildManager;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.entitymanager.PullRequestManager;@@ -67,7 +66,7 @@ import io.onedev.server.entitymanager.PullRequestReviewManager;import io.onedev.server.entitymanager.PullRequestUpdateManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.RefUpdated;-import io.onedev.server.event.build.BuildEvent;+import io.onedev.server.event.build2.BuildEvent;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.pullrequest.PullRequestBuildEvent;import io.onedev.server.event.pullrequest.PullRequestChangeEvent;@@ -80,7 +79,6 @@ import io.onedev.server.exception.OneException;import io.onedev.server.git.GitUtils;import io.onedev.server.git.command.FileChange;import io.onedev.server.model.Build;-import io.onedev.server.model.Configuration;import io.onedev.server.model.Group;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;@@ -156,8 +154,6 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestprivate final PullRequestChangeManager pullRequestChangeManager;- private final ConfigurationManager configurationManager;-private final BuildManager buildManager;private final TransactionManager transactionManager;@@ -168,8 +164,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestMarkdownManager markdownManager, BatchWorkManager batchWorkManager,ListenerRegistry listenerRegistry, SessionManager sessionManager,PullRequestChangeManager pullRequestChangeManager, BuildManager buildManager,- ConfigurationManager configurationManager, PullRequestBuildManager pullRequestBuildManager,- TransactionManager transactionManager) {+ PullRequestBuildManager pullRequestBuildManager, TransactionManager transactionManager) {super(dao);this.pullRequestUpdateManager = pullRequestUpdateManager;@@ -181,7 +176,6 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestthis.sessionManager = sessionManager;this.listenerRegistry = listenerRegistry;this.pullRequestChangeManager = pullRequestChangeManager;- this.configurationManager = configurationManager;this.pullRequestBuildManager = pullRequestBuildManager;}@@ -637,7 +631,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestBuild build = event.getBuild();for (PullRequest request: queryOpenByCommit(build.getCommitHash())) {listenerRegistry.post(new PullRequestBuildEvent(request, build));- if (build.getStatus() != Build.Status.RUNNING)+ if (build.isFinished())checkAsync(request);}}@@ -686,8 +680,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestif (branchProtection != null) {checkReviews(ReviewRequirement.fromString(branchProtection.getReviewRequirement()), request.getLatestUpdate());- if (branchProtection.getConfigurations() != null)- checkBuilds(request, branchProtection.getConfigurations(), branchProtection.isBuildMerges());+ if (branchProtection.getJobNames() != null)+ checkBuilds(request, branchProtection.getJobNames(), branchProtection.isBuildMerges());Set<FileProtection> checkedFileProtections = new HashSet<>();for (int i=request.getSortedUpdates().size()-1; i>=0; i--) {@@ -714,7 +708,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest}}- private void checkBuilds(PullRequest request, List<String> configurationNames, boolean buildMerges) {+ private void checkBuilds(PullRequest request, List<String> jobNames, boolean buildMerges) {String commit;if (buildMerges) {MergePreview preview = request.getMergePreview();@@ -726,33 +720,24 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestcommit = request.getHeadCommitHash();}- Map<Configuration, Build> builds = new HashMap<>();+ Map<String, Build> builds = new HashMap<>();if (commit != null) {for (Build build: buildManager.query(request.getTargetProject(), commit))- builds.put(build.getConfiguration(), build);+ builds.put(build.getJobName(), build);}- Collection<Configuration> configurations = new HashSet<>();- for (String configurationName: configurationNames) {- Configuration configuration = configurationManager.find(request.getTargetProject(), configurationName);- if (configuration != null) {- configurations.add(configuration);- PullRequestBuild pullRequestBuild = request.getBuild(configuration);- if (pullRequestBuild == null) {- pullRequestBuild = new PullRequestBuild();- pullRequestBuild.setConfiguration(configuration);- pullRequestBuild.setRequest(request);- request.getBuilds().add(pullRequestBuild);- }- pullRequestBuild.setBuild(builds.get(configuration));- } else {- String errorMessage = String.format("Unable to find configuration (project: %s, name: %s)",- request.getTargetProject().getName(), configurationName);- throw new OneException(errorMessage);+ for (String jobName: jobNames) {+ PullRequestBuild pullRequestBuild = request.getBuild(jobName);+ if (pullRequestBuild == null) {+ pullRequestBuild = new PullRequestBuild();+ pullRequestBuild.setJobName(jobName);+ pullRequestBuild.setRequest(request);+ request.getBuilds().add(pullRequestBuild);}+ pullRequestBuild.setBuild(builds.get(jobName));}for (Iterator<PullRequestBuild> it = request.getBuilds().iterator(); it.hasNext();) {- if (!configurations.contains(it.next().getConfiguration()))+ if (!jobNames.contains(it.next().getJobName()))it.remove();}}diff --git a/core/src/main/java/io/onedev/server/event/build/BuildEvent.java b/core/src/main/java/io/onedev/server/event/build/BuildEvent.javadeleted file mode 100644index 029f3a30e2..0000000000--- a/core/src/main/java/io/onedev/server/event/build/BuildEvent.java+++ /dev/null@@ -1,19 +0,0 @@-package io.onedev.server.event.build;--import io.onedev.server.event.ProjectEvent;-import io.onedev.server.model.Build;--public abstract class BuildEvent extends ProjectEvent {-- private final Build build;-- public BuildEvent(Build build) {- super(null, build.getDate(), build.getConfiguration().getProject());- this.build = build;- }-- public Build getBuild() {- return build;- }--}diff --git a/core/src/main/java/io/onedev/server/event/build/BuildFinished.java b/core/src/main/java/io/onedev/server/event/build/BuildFinished.javadeleted file mode 100644index 48bbfdc1b3..0000000000--- a/core/src/main/java/io/onedev/server/event/build/BuildFinished.java+++ /dev/null@@ -1,11 +0,0 @@-package io.onedev.server.event.build;--import io.onedev.server.model.Build;--public class BuildFinished extends BuildEvent {-- public BuildFinished(Build build) {- super(build);- }--}diff --git a/core/src/main/java/io/onedev/server/event/build/BuildStarted.java b/core/src/main/java/io/onedev/server/event/build/BuildStarted.javadeleted file mode 100644index b8e7edd0c3..0000000000--- a/core/src/main/java/io/onedev/server/event/build/BuildStarted.java+++ /dev/null@@ -1,11 +0,0 @@-package io.onedev.server.event.build;--import io.onedev.server.model.Build;--public class BuildStarted extends BuildEvent {-- public BuildStarted(Build build) {- super(build);- }--}diff --git a/core/src/main/java/io/onedev/server/event/build2/BuildEvent.java b/core/src/main/java/io/onedev/server/event/build2/BuildEvent.javaindex f79d0ea2a6..3bdb55e369 100644--- a/core/src/main/java/io/onedev/server/event/build2/BuildEvent.java+++ b/core/src/main/java/io/onedev/server/event/build2/BuildEvent.java@@ -6,23 +6,23 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.event.CommitAware;import io.onedev.server.event.ProjectEvent;-import io.onedev.server.model.Build2;+import io.onedev.server.model.Build;import io.onedev.server.model.User;public class BuildEvent extends ProjectEvent implements CommitAware {- private Build2 build;+ private Build build;- public BuildEvent(User user, Date date, Build2 build) {+ public BuildEvent(User user, Date date, Build build) {super(user, date, build.getProject());this.build = build;}- public Build2 getBuild() {+ public Build getBuild() {return build;}- public void setBuild(Build2 build) {+ public void setBuild(Build build) {this.build = build;}diff --git a/core/src/main/java/io/onedev/server/event/build2/BuildFinished.java b/core/src/main/java/io/onedev/server/event/build2/BuildFinished.javaindex cac2b4e440..e51ef1f88e 100644--- a/core/src/main/java/io/onedev/server/event/build2/BuildFinished.java+++ b/core/src/main/java/io/onedev/server/event/build2/BuildFinished.java@@ -1,10 +1,10 @@package io.onedev.server.event.build2;-import io.onedev.server.model.Build2;+import io.onedev.server.model.Build;public class BuildFinished extends BuildEvent {- public BuildFinished(Build2 build) {+ public BuildFinished(Build build) {super(null, build.getFinishDate(), build);}diff --git a/core/src/main/java/io/onedev/server/event/build2/BuildPending.java b/core/src/main/java/io/onedev/server/event/build2/BuildPending.javaindex c013b0e2b7..72fee3c5f9 100644--- a/core/src/main/java/io/onedev/server/event/build2/BuildPending.java+++ b/core/src/main/java/io/onedev/server/event/build2/BuildPending.java@@ -1,10 +1,10 @@package io.onedev.server.event.build2;-import io.onedev.server.model.Build2;+import io.onedev.server.model.Build;public class BuildPending extends BuildEvent {- public BuildPending(Build2 build) {+ public BuildPending(Build build) {super(null, build.getPendingDate(), build);}diff --git a/core/src/main/java/io/onedev/server/event/build2/BuildRunning.java b/core/src/main/java/io/onedev/server/event/build2/BuildRunning.javaindex 16de17bcb8..3a34dd7cf1 100644--- a/core/src/main/java/io/onedev/server/event/build2/BuildRunning.java+++ b/core/src/main/java/io/onedev/server/event/build2/BuildRunning.java@@ -1,10 +1,10 @@package io.onedev.server.event.build2;-import io.onedev.server.model.Build2;+import io.onedev.server.model.Build;public class BuildRunning extends BuildEvent {- public BuildRunning(Build2 build) {+ public BuildRunning(Build build) {super(null, build.getRunningDate(), build);}diff --git a/core/src/main/java/io/onedev/server/event/build2/BuildSubmitted.java b/core/src/main/java/io/onedev/server/event/build2/BuildSubmitted.javaindex 2ebe9c0813..08de4ace18 100644--- a/core/src/main/java/io/onedev/server/event/build2/BuildSubmitted.java+++ b/core/src/main/java/io/onedev/server/event/build2/BuildSubmitted.java@@ -1,10 +1,10 @@package io.onedev.server.event.build2;-import io.onedev.server.model.Build2;+import io.onedev.server.model.Build;public class BuildSubmitted extends BuildEvent {- public BuildSubmitted(Build2 build) {+ public BuildSubmitted(Build build) {super(build.getUser(), build.getSubmitDate(), build);}diff --git a/core/src/main/java/io/onedev/server/model/Build.java b/core/src/main/java/io/onedev/server/model/Build.javaindex a02850eee3..1008dbc4b7 100644--- a/core/src/main/java/io/onedev/server/model/Build.java+++ b/core/src/main/java/io/onedev/server/model/Build.java@@ -1,171 +1,293 @@-package io.onedev.server.model;--import java.io.IOException;-import java.util.Collection;-import java.util.Date;-import java.util.HashSet;--import javax.annotation.Nullable;-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 javax.persistence.UniqueConstraint;--import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.Repository;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevWalk;--import com.google.common.base.Optional;--import io.onedev.server.OneDev;-import io.onedev.server.cache.BuildInfoManager;-import io.onedev.server.util.IssueUtils;-import io.onedev.server.util.facade.BuildFacade;--@Entity-@Table(- indexes={@Index(columnList="o_configuration_id"), @Index(columnList="commitHash"), @Index(columnList="version")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_configuration_id", "commitHash"})}-)-public class Build extends AbstractEntity {-- private static final long serialVersionUID = 1L;-- public static final String FQN_SEPARATOR = ":";-- public static final String STATUS = "status";-- public enum Status {- SUCCESS("Successful"),- FAILURE("Failed"),- ERROR("In error"),- RUNNING("Running");-- private final String description;-- Status(String description) {- this.description = description;- }-- public String getDescription() {- return description;- }-- };-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private Configuration configuration;-- @Column(nullable=false)- private String version;-- @Column(nullable=false)- private String commitHash;-- @Column(nullable=false)- private Status status;-- @Column(nullable=false)- private Date date;-- @Column(nullable=false)- private String url;-- private transient Optional<Collection<Long>> fixedIssueNumbers;-- public Configuration getConfiguration() {- return configuration;- }-- public void setConfiguration(Configuration configuration) {- this.configuration = configuration;- }-- public String getVersion() {- return version;- }-- public void setVersion(String version) {- this.version = version;- }-- public String getCommitHash() {- return commitHash;- }-- public void setCommitHash(String commitHash) {- this.commitHash = commitHash;- }-- public Status getStatus() {- return status;- }-- public void setStatus(Status status) {- this.status = status;- }-- public Date getDate() {- return date;- }-- public void setDate(Date date) {- this.date = date;- }-- public String getUrl() {- return url;- }-- public void setUrl(String url) {- this.url = url;- }-- public String getFQN() {- return getConfiguration().getName() + FQN_SEPARATOR + getVersion();- }-- /**- * Get fixed issue numbers- *- * @return- * <tt>null</tt> if fixed issue numbers information is not available yet- */- @Nullable- public Collection<Long> getFixedIssueNumbers() {- if (fixedIssueNumbers == null) {- Project project = getConfiguration().getProject();- Collection<ObjectId> prevCommits = OneDev.getInstance(BuildInfoManager.class).getPrevCommits(project, getId());- if (prevCommits != null) {- fixedIssueNumbers = Optional.of(new HashSet<>());- if (!prevCommits.isEmpty()) {- Repository repository = project.getRepository();- try (RevWalk revWalk = new RevWalk(repository)) {- revWalk.markStart(revWalk.parseCommit(ObjectId.fromString(getCommitHash())));- for (ObjectId prevCommit: prevCommits)- revWalk.markUninteresting(revWalk.parseCommit(prevCommit));-- RevCommit commit;- while ((commit = revWalk.next()) != null)- fixedIssueNumbers.get().addAll(IssueUtils.parseFixedIssues(project, commit.getFullMessage()));- } catch (IOException e) {- throw new RuntimeException(e);- }- }- } else {- fixedIssueNumbers = Optional.absent();- }- }- return fixedIssueNumbers.orNull();- }-- public BuildFacade getFacade() {- return new BuildFacade(getId(), getConfiguration().getId(), getCommitHash());- }-}+package io.onedev.server.model;++import java.io.IOException;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Date;+import java.util.HashMap;+import java.util.HashSet;+import java.util.Map;++import javax.annotation.Nullable;+import javax.persistence.CascadeType;+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.OneToMany;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++import org.apache.commons.lang3.StringUtils;+import org.eclipse.jgit.lib.ObjectId;+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 com.fasterxml.jackson.annotation.JsonView;+import com.google.common.base.Optional;++import io.onedev.server.OneDev;+import io.onedev.server.cache.BuildInfoManager;+import io.onedev.server.util.IssueUtils;+import io.onedev.server.util.facade.BuildFacade;+import io.onedev.server.util.jackson.DefaultView;++@Entity+@Table(+ indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id"), @Index(columnList="commitHash"),+ @Index(columnList="number"), @Index(columnList="jobName"), @Index(columnList="numberStr"),+ @Index(columnList="status"), @Index(columnList="submitDate"), @Index(columnList="pendingDate"),+ @Index(columnList="runningDate"), @Index(columnList="finishDate")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})}+)+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+public class Build extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ public static final String STATUS = "status";++ private static final int MAX_STATUS_MESSAGE = 1024;++ public enum Status {+ WAITING, QUEUEING, RUNNING, SUCCESSFUL, FAILED, IN_ERROR, CANCELLED+ };++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Project project;++ @ManyToOne(fetch=FetchType.LAZY)+ private User user;++ @Column(nullable=false)+ private String jobName;++ private long number;++ // used for number search in markdown editor+ @Column(nullable=false)+ @JsonView(DefaultView.class)+ private String numberStr;++ @Column(nullable=false)+ private String commitHash;++ @Column(nullable=false)+ private Status status;++ @Column(nullable=false)+ private Date submitDate;++ private Date pendingDate;++ private Date runningDate;++ private Date finishDate;++ @Column(length=MAX_STATUS_MESSAGE)+ private String statusMessage;++ @OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)+ private Collection<BuildParam> params = new ArrayList<>();++ @OneToMany(mappedBy="dependent", cascade=CascadeType.REMOVE)+ private Collection<BuildDependence> dependencies = new ArrayList<>();++ @OneToMany(mappedBy="dependency", cascade=CascadeType.REMOVE)+ private Collection<BuildDependence> dependents= new ArrayList<>();++ private transient Map<String, String> paramMap;++ private transient Optional<Collection<Long>> fixedIssueNumbers;++ public Project getProject() {+ return project;+ }++ public void setProject(Project project) {+ this.project = project;+ }++ @Nullable+ public User getUser() {+ return user;+ }++ public void setUser(User user) {+ this.user = user;+ }++ public String getJobName() {+ return jobName;+ }++ public void setJobName(String jobName) {+ this.jobName = jobName;+ }++ public long getNumber() {+ return number;+ }++ public void setNumber(long number) {+ this.number = number;+ numberStr = String.valueOf(number);+ }++ public String getNumberStr() {+ return numberStr;+ }++ public void setNumberStr(String numberStr) {+ this.numberStr = numberStr;+ }++ public String getCommitHash() {+ return commitHash;+ }++ public void setCommitHash(String commitHash) {+ this.commitHash = commitHash;+ }++ public Status getStatus() {+ return status;+ }++ public void setStatus(Status status) {+ setStatus(status, null);+ }++ public void setStatus(Status status, @Nullable String statusMessage) {+ this.status = status;+ setStatusMessage(statusMessage);+ }++ public boolean isFinished() {+ return status == Status.IN_ERROR || status == Status.FAILED+ || status == Status.CANCELLED || status == Status.SUCCESSFUL;+ }++ public Date getSubmitDate() {+ return submitDate;+ }++ public void setSubmitDate(Date submitDate) {+ this.submitDate = submitDate;+ }++ public Date getPendingDate() {+ return pendingDate;+ }++ public void setPendingDate(Date pendingDate) {+ this.pendingDate = pendingDate;+ }++ public Date getRunningDate() {+ return runningDate;+ }++ public void setRunningDate(Date runningDate) {+ this.runningDate = runningDate;+ }++ public Date getFinishDate() {+ return finishDate;+ }++ public void setFinishDate(Date finishDate) {+ this.finishDate = finishDate;+ }++ public Collection<BuildParam> getParams() {+ return params;+ }++ public void setParams(Collection<BuildParam> params) {+ this.params = params;+ }++ public Collection<BuildDependence> getDependencies() {+ return dependencies;+ }++ public void setDependencies(Collection<BuildDependence> dependencies) {+ this.dependencies = dependencies;+ }++ public Collection<BuildDependence> getDependents() {+ return dependents;+ }++ public void setDependents(Collection<BuildDependence> dependents) {+ this.dependents = dependents;+ }++ public String getStatusMessage() {+ return statusMessage;+ }++ public void setStatusMessage(String statusMessage) {+ if (statusMessage != null)+ statusMessage = StringUtils.abbreviate(statusMessage, MAX_STATUS_MESSAGE);+ this.statusMessage = statusMessage;+ }++ public Map<String, String> getParamMap() {+ if (paramMap == null) {+ paramMap = new HashMap<>();+ for (BuildParam param: getParams())+ paramMap.put(param.getName(), param.getValue());+ }+ return paramMap;+ }++ /**+ * Get fixed issue numbers+ *+ * @return+ * <tt>null</tt> if fixed issue numbers information is not available yet+ */+ @Nullable+ public Collection<Long> getFixedIssueNumbers() {+ if (fixedIssueNumbers == null) {+ Collection<ObjectId> prevCommits = OneDev.getInstance(BuildInfoManager.class).getPrevCommits(project, getId());+ if (prevCommits != null) {+ fixedIssueNumbers = Optional.of(new HashSet<>());+ if (!prevCommits.isEmpty()) {+ Repository repository = project.getRepository();+ try (RevWalk revWalk = new RevWalk(repository)) {+ revWalk.markStart(revWalk.parseCommit(ObjectId.fromString(getCommitHash())));+ for (ObjectId prevCommit: prevCommits)+ revWalk.markUninteresting(revWalk.parseCommit(prevCommit));++ RevCommit commit;+ while ((commit = revWalk.next()) != null)+ fixedIssueNumbers.get().addAll(IssueUtils.parseFixedIssues(project, commit.getFullMessage()));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ } else {+ fixedIssueNumbers = Optional.absent();+ }+ }+ return fixedIssueNumbers.orNull();+ }++ public BuildFacade getFacade() {+ return new BuildFacade(getId(), getProject().getId(), getCommitHash());+ }++ public static String getLogWebSocketObservable(Long buildId) {+ return "build-log:" + buildId;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/Build2.java b/core/src/main/java/io/onedev/server/model/Build2.javadeleted file mode 100644index 363ea02efa..0000000000--- a/core/src/main/java/io/onedev/server/model/Build2.java+++ /dev/null@@ -1,243 +0,0 @@-package io.onedev.server.model;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Date;-import java.util.HashMap;-import java.util.Map;--import javax.annotation.Nullable;-import javax.persistence.CascadeType;-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.OneToMany;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;--import org.apache.commons.lang3.StringUtils;-import org.hibernate.annotations.Cache;-import org.hibernate.annotations.CacheConcurrencyStrategy;--import com.fasterxml.jackson.annotation.JsonView;--import io.onedev.server.util.jackson.DefaultView;--@Entity-@Table(- indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id"), @Index(columnList="commitHash"),- @Index(columnList="number"), @Index(columnList="jobName"), @Index(columnList="numberStr"),- @Index(columnList="status"), @Index(columnList="submitDate"), @Index(columnList="pendingDate"),- @Index(columnList="runningDate"), @Index(columnList="finishDate")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})}-)-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)-public class Build2 extends AbstractEntity {-- private static final long serialVersionUID = 1L;-- public static final String STATUS = "status";-- private static final int MAX_STATUS_MESSAGE = 1024;-- public enum Status {- WAITING, PENDING, RUNNING, SUCCESSFUL, FAILED, IN_ERROR, CANCELLED- };-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private Project project;-- @ManyToOne(fetch=FetchType.LAZY)- private User user;-- @Column(nullable=false)- private String jobName;-- private long number;-- // used for number search in markdown editor- @Column(nullable=false)- @JsonView(DefaultView.class)- private String numberStr;-- @Column(nullable=false)- private String commitHash;-- @Column(nullable=false)- private Status status;-- @Column(nullable=false)- private Date submitDate;-- private Date pendingDate;-- private Date runningDate;-- private Date finishDate;-- @Column(length=MAX_STATUS_MESSAGE)- private String statusMessage;-- @OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)- private Collection<BuildParam> params = new ArrayList<>();-- @OneToMany(mappedBy="dependent", cascade=CascadeType.REMOVE)- private Collection<BuildDependence> dependencies = new ArrayList<>();-- @OneToMany(mappedBy="dependency", cascade=CascadeType.REMOVE)- private Collection<BuildDependence> dependents= new ArrayList<>();-- private transient Map<String, String> paramMap;-- public Project getProject() {- return project;- }-- public void setProject(Project project) {- this.project = project;- }-- @Nullable- public User getUser() {- return user;- }-- public void setUser(User user) {- this.user = user;- }-- public String getJobName() {- return jobName;- }-- public void setJobName(String jobName) {- this.jobName = jobName;- }-- public long getNumber() {- return number;- }-- public void setNumber(long number) {- this.number = number;- numberStr = String.valueOf(number);- }-- public String getNumberStr() {- return numberStr;- }-- public void setNumberStr(String numberStr) {- this.numberStr = numberStr;- }-- public String getCommitHash() {- return commitHash;- }-- public void setCommitHash(String commitHash) {- this.commitHash = commitHash;- }-- public Status getStatus() {- return status;- }-- public void setStatus(Status status) {- setStatus(status, null);- }-- public void setStatus(Status status, @Nullable String statusMessage) {- this.status = status;- setStatusMessage(statusMessage);- }-- public boolean isFinished() {- return status == Status.IN_ERROR || status == Status.FAILED- || status == Status.CANCELLED || status == Status.SUCCESSFUL;- }-- public Date getSubmitDate() {- return submitDate;- }-- public void setSubmitDate(Date submitDate) {- this.submitDate = submitDate;- }-- public Date getPendingDate() {- return pendingDate;- }-- public void setPendingDate(Date pendingDate) {- this.pendingDate = pendingDate;- }-- public Date getRunningDate() {- return runningDate;- }-- public void setRunningDate(Date runningDate) {- this.runningDate = runningDate;- }-- public Date getFinishDate() {- return finishDate;- }-- public void setFinishDate(Date finishDate) {- this.finishDate = finishDate;- }-- public Collection<BuildParam> getParams() {- return params;- }-- public void setParams(Collection<BuildParam> params) {- this.params = params;- }-- public Collection<BuildDependence> getDependencies() {- return dependencies;- }-- public void setDependencies(Collection<BuildDependence> dependencies) {- this.dependencies = dependencies;- }-- public Collection<BuildDependence> getDependents() {- return dependents;- }-- public void setDependents(Collection<BuildDependence> dependents) {- this.dependents = dependents;- }-- public String getStatusMessage() {- return statusMessage;- }-- public void setStatusMessage(String statusMessage) {- if (statusMessage != null)- statusMessage = StringUtils.abbreviate(statusMessage, MAX_STATUS_MESSAGE);- this.statusMessage = statusMessage;- }-- public Map<String, String> getParamMap() {- if (paramMap == null) {- paramMap = new HashMap<>();- for (BuildParam param: getParams())- paramMap.put(param.getName(), param.getValue());- }- return paramMap;- }-- public static String getLogWebSocketObservable(Long buildId) {- return "build-log:" + buildId;- }--}diff --git a/core/src/main/java/io/onedev/server/model/BuildDependence.java b/core/src/main/java/io/onedev/server/model/BuildDependence.javaindex 3367e44ef7..e068a9a73c 100644--- a/core/src/main/java/io/onedev/server/model/BuildDependence.java+++ b/core/src/main/java/io/onedev/server/model/BuildDependence.java@@ -19,25 +19,25 @@ public class BuildDependence extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)- private Build2 dependent;+ private Build dependent;@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)- private Build2 dependency;+ private Build dependency;- public Build2 getDependent() {+ public Build getDependent() {return dependent;}- public void setDependent(Build2 dependent) {+ public void setDependent(Build dependent) {this.dependent = dependent;}- public Build2 getDependency() {+ public Build getDependency() {return dependency;}- public void setDependency(Build2 dependency) {+ public void setDependency(Build dependency) {this.dependency = dependency;}diff --git a/core/src/main/java/io/onedev/server/model/BuildParam.java b/core/src/main/java/io/onedev/server/model/BuildParam.javaindex b5b2cfaccf..70f56ea663 100644--- a/core/src/main/java/io/onedev/server/model/BuildParam.java+++ b/core/src/main/java/io/onedev/server/model/BuildParam.java@@ -19,7 +19,7 @@ public class BuildParam extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)- private Build2 build;+ private Build build;@Column(nullable=false)private String name;@@ -27,11 +27,11 @@ public class BuildParam extends AbstractEntity {@Column(nullable=false)private String value;- public Build2 getBuild() {+ public Build getBuild() {return build;}- public void setBuild(Build2 build) {+ public void setBuild(Build build) {this.build = build;}diff --git a/core/src/main/java/io/onedev/server/model/Configuration.java b/core/src/main/java/io/onedev/server/model/Configuration.javadeleted file mode 100644index 19498b0453..0000000000--- a/core/src/main/java/io/onedev/server/model/Configuration.java+++ /dev/null@@ -1,118 +0,0 @@-package io.onedev.server.model;--import java.util.ArrayList;-import java.util.Collection;--import javax.persistence.CascadeType;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;-import javax.validation.constraints.NotNull;--import org.hibernate.annotations.Cache;-import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.hibernate.validator.constraints.NotEmpty;--import io.onedev.server.model.support.configuration.BuildCleanupRule;-import io.onedev.server.model.support.configuration.DoNotCleanup;-import io.onedev.server.util.facade.ConfigurationFacade;-import io.onedev.server.util.validation.annotation.CommitHash;-import io.onedev.server.util.validation.annotation.ConfigurationName;-import io.onedev.server.web.editable.annotation.Editable;--@Entity-@Table(- indexes={@Index(columnList="o_project_id"), @Index(columnList="name")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "name"})}-)-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)-@Editable-public class Configuration extends AbstractEntity {-- private static final long serialVersionUID = 1L;-- public static final String ATTR_PROJECT = "project";-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private Project project;-- private String name;-- private String baseCommit;-- private BuildCleanupRule buildCleanupRule = new DoNotCleanup();-- @OneToMany(mappedBy="configuration", cascade=CascadeType.REMOVE)- private Collection<PullRequestBuild> pullRequestBuilds = new ArrayList<>();-- @OneToMany(mappedBy="configuration", cascade=CascadeType.REMOVE)- private Collection<Build> builds = new ArrayList<>();-- public Project getProject() {- return project;- }-- public void setProject(Project project) {- this.project = project;- }-- @Editable(order=100)- @ConfigurationName- @NotEmpty- public String getName() {- return name;- }-- public void setName(String name) {- this.name = name;- }-- @Editable(order=200, description="Optionally specify a base commit to calculate changes for the first build in "- + "the configuration")- @CommitHash- public String getBaseCommit() {- return baseCommit;- }-- public void setBaseCommit(String baseCommit) {- this.baseCommit = baseCommit;- }-- @Editable(order=300, description="Optionally specify build cleanup strategy to improvement OneDev performance. "- + "Note that this cleanup will not affect builds at build server side")- @NotNull- public BuildCleanupRule getBuildCleanupRule() {- return buildCleanupRule;- }-- public void setBuildCleanupRule(BuildCleanupRule buildCleanupRule) {- this.buildCleanupRule = buildCleanupRule;- }-- public Collection<PullRequestBuild> getPullRequestBuilds() {- return pullRequestBuilds;- }-- public void setPullRequestBuilds(Collection<PullRequestBuild> pullRequestBuilds) {- this.pullRequestBuilds = pullRequestBuilds;- }-- public Collection<Build> getBuilds() {- return builds;- }-- public void setBuilds(Collection<Build> builds) {- this.builds = builds;- }-- public ConfigurationFacade getFacade() {- return new ConfigurationFacade(this);- }--}diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex f54a1cbd3e..9b24a76b38 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -153,10 +153,7 @@ public class Project extends AbstractEntity {private long version;@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<Configuration> configurations = new ArrayList<>();-- @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<Build2> build2s = new ArrayList<>();+ private Collection<Build> build2s = new ArrayList<>();@Lob@Column(nullable=false, length=65535)@@ -425,14 +422,6 @@ public class Project extends AbstractEntity {return getRefInfos(Constants.R_TAGS);}- public Collection<Configuration> getConfigurations() {- return configurations;- }-- public void setConfigurations(Collection<Configuration> configurations) {- this.configurations = configurations;- }-public List<RefInfo> getRefInfos(String prefix) {try (RevWalk revWalk = new RevWalk(getRepository())) {List<Ref> refs = new ArrayList<Ref>(getRepository().getRefDatabase().getRefsByPrefix(prefix));@@ -672,6 +661,17 @@ public class Project extends AbstractEntity {return ciSpecOpt.orNull();}+ public List<String> getJobNames() {+ CISpec ciSpec = getCISpec(getObjectId(getDefaultBranch()));+ if (ciSpec != null) {+ List<String> jobNames = new ArrayList<>(ciSpec.getJobMap().keySet());+ Collections.sort(jobNames);+ return jobNames;+ } else {+ return new ArrayList<>();+ }+ }+public LastCommitsOfChildren getLastCommitsOfChildren(String revision, @Nullable String path) {if (path == null)path = "";diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.javaindex bc742d060a..46f468ae21 100644--- a/core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java@@ -713,9 +713,9 @@ public class PullRequest extends AbstractEntity implements Referenceable {}@Nullable- public PullRequestBuild getBuild(Configuration configuration) {+ public PullRequestBuild getBuild(String jobName) {for (PullRequestBuild build: getBuilds()) {- if (build.getConfiguration().equals(configuration))+ if (build.getJobName().equals(jobName))return build;}return null;@@ -821,7 +821,7 @@ public class PullRequest extends AbstractEntity implements Referenceable {public boolean isAllBuildsSuccessful() {for (PullRequestBuild build: getBuilds()) {- if (build.getBuild() == null || build.getBuild().getStatus() != Build.Status.SUCCESS) {+ if (build.getBuild() == null || build.getBuild().getStatus() != Build.Status.SUCCESSFUL) {return false;}}diff --git a/core/src/main/java/io/onedev/server/model/PullRequestBuild.java b/core/src/main/java/io/onedev/server/model/PullRequestBuild.javaindex a0b97e290a..92a000556f 100644--- a/core/src/main/java/io/onedev/server/model/PullRequestBuild.java+++ b/core/src/main/java/io/onedev/server/model/PullRequestBuild.java@@ -10,8 +10,8 @@ import javax.persistence.UniqueConstraint;@Entity@Table(- indexes={@Index(columnList="o_request_id"), @Index(columnList="o_configuration_id")},- uniqueConstraints={@UniqueConstraint(columnNames={"o_configuration_id", "o_request_id"})}+ indexes={@Index(columnList="o_request_id"), @Index(columnList="o_job_name")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_job_name", "o_request_id"})})public class PullRequestBuild extends AbstractEntity {@@ -21,7 +21,7 @@ public class PullRequestBuild extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)- private Configuration configuration;+ private String jobName;@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)@@ -30,12 +30,12 @@ public class PullRequestBuild extends AbstractEntity {@ManyToOne(fetch=FetchType.LAZY)private Build build;- public Configuration getConfiguration() {- return configuration;+ public String getJobName() {+ return jobName;}- public void setConfiguration(Configuration configuration) {- this.configuration = configuration;+ public void setJobName(String jobName) {+ this.jobName = jobName;}public Build getBuild() {diff --git a/core/src/main/java/io/onedev/server/model/User.java b/core/src/main/java/io/onedev/server/model/User.javaindex 623c69d86a..9c7aa0bb0a 100644--- a/core/src/main/java/io/onedev/server/model/User.java+++ b/core/src/main/java/io/onedev/server/model/User.java@@ -82,7 +82,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {private Collection<IssueQuerySetting> issueQuerySettings = new ArrayList<>();@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<Build2> build2s = new ArrayList<>();+ private Collection<Build> build2s = new ArrayList<>();@Overridepublic PrincipalCollection getPrincipals() {diff --git a/core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/core/src/main/java/io/onedev/server/model/support/BranchProtection.javaindex bfc6dbf438..7edc1fedd3 100644--- a/core/src/main/java/io/onedev/server/model/support/BranchProtection.java+++ b/core/src/main/java/io/onedev/server/model/support/BranchProtection.java@@ -17,7 +17,7 @@ import io.onedev.server.util.reviewrequirement.ReviewRequirement;import io.onedev.server.util.usermatcher.Anyone;import io.onedev.server.util.usermatcher.UserMatcher;import io.onedev.server.web.editable.annotation.BranchPatterns;-import io.onedev.server.web.editable.annotation.ConfigurationChoice;+import io.onedev.server.web.editable.annotation.JobChoice;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@@ -40,7 +40,7 @@ public class BranchProtection implements Serializable {private String reviewRequirement;- private List<String> configurations = new ArrayList<>();+ private List<String> jobNames = new ArrayList<>();private boolean buildMerges;@@ -117,14 +117,14 @@ public class BranchProtection implements Serializable {}@Editable(order=500, name="Required Builds", description="Optionally choose required builds")- @ConfigurationChoice+ @JobChoice@NameOfEmptyValue("No any")- public List<String> getConfigurations() {- return configurations;+ public List<String> getJobNames() {+ return jobNames;}- public void setConfigurations(List<String> configurations) {- this.configurations = configurations;+ public void setJobNames(List<String> jobNames) {+ this.jobNames = jobNames;}@Editable(order=600, name="Build Merged Commits", description="If checked, builds of merged commits "@@ -183,16 +183,6 @@ public class BranchProtection implements Serializable {return false;}- public void onRenameConfiguration(String oldName, String newName) {- int index = getConfigurations().indexOf(oldName);- if (index != -1)- getConfigurations().set(index, newName);- }-- public void onDeleteConfiguration(String configurationName) {- getConfigurations().remove(configurationName);- }-public void onRenameUser(Project project, String oldName, String newName) {submitter = UserMatcher.onRenameUser(submitter, oldName, newName);reviewRequirement = ReviewRequirement.onRenameUser(reviewRequirement, oldName, newName);diff --git a/core/src/main/java/io/onedev/server/model/support/WebHook.java b/core/src/main/java/io/onedev/server/model/support/WebHook.javaindex d2d120df1e..532b98d24b 100644--- a/core/src/main/java/io/onedev/server/model/support/WebHook.java+++ b/core/src/main/java/io/onedev/server/model/support/WebHook.java@@ -10,7 +10,7 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.event.Event;import io.onedev.server.event.RefUpdated;-import io.onedev.server.event.build.BuildEvent;+import io.onedev.server.event.build2.BuildEvent;import io.onedev.server.event.codecomment.CodeCommentEvent;import io.onedev.server.event.issue.IssueEvent;import io.onedev.server.event.pullrequest.PullRequestEvent;diff --git a/core/src/main/java/io/onedev/server/model/support/configuration/BuildCleanupRule.java b/core/src/main/java/io/onedev/server/model/support/configuration/BuildCleanupRule.javadeleted file mode 100644index 4827ea6933..0000000000--- a/core/src/main/java/io/onedev/server/model/support/configuration/BuildCleanupRule.java+++ /dev/null@@ -1,15 +0,0 @@-package io.onedev.server.model.support.configuration;--import java.io.Serializable;--import org.hibernate.Session;--import io.onedev.server.model.Configuration;-import io.onedev.server.web.editable.annotation.Editable;--@Editable-public interface BuildCleanupRule extends Serializable {-- void cleanup(Configuration configuration, Session session);--}diff --git a/core/src/main/java/io/onedev/server/model/support/configuration/DoNotCleanup.java b/core/src/main/java/io/onedev/server/model/support/configuration/DoNotCleanup.javadeleted file mode 100644index 7420e2c59b..0000000000--- a/core/src/main/java/io/onedev/server/model/support/configuration/DoNotCleanup.java+++ /dev/null@@ -1,17 +0,0 @@-package io.onedev.server.model.support.configuration;--import org.hibernate.Session;--import io.onedev.server.model.Configuration;-import io.onedev.server.web.editable.annotation.Editable;--@Editable(order=50, name="Do not clean up")-public class DoNotCleanup implements BuildCleanupRule {-- private static final long serialVersionUID = 1L;-- @Override- public void cleanup(Configuration configuration, Session session) {- }--}diff --git a/core/src/main/java/io/onedev/server/model/support/configuration/KeepByCount.java b/core/src/main/java/io/onedev/server/model/support/configuration/KeepByCount.javadeleted file mode 100644index 5ac88713bb..0000000000--- a/core/src/main/java/io/onedev/server/model/support/configuration/KeepByCount.java+++ /dev/null@@ -1,50 +0,0 @@-package io.onedev.server.model.support.configuration;--import java.util.ArrayList;-import java.util.List;--import javax.validation.constraints.Min;--import org.hibernate.Session;--import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.server.OneDev;-import io.onedev.server.cache.BuildInfoManager;-import io.onedev.server.cache.CacheManager;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.model.Build;-import io.onedev.server.model.Configuration;-import io.onedev.server.web.editable.annotation.Editable;--@Editable(order=200, name="Keep builds by count")-public class KeepByCount implements BuildCleanupRule {-- private static final long serialVersionUID = 1L;-- private int count = 1000;-- @Editable(name="Number of Builds to Keep")- @Min(value=1, message="Should keep at least one build")- public int getCount() {- return count;- }-- public void setCount(int count) {- this.count = count;- }-- @Override- public void cleanup(Configuration configuration, Session session) {- List<Long> buildIds = new ArrayList<>(OneDev.getInstance(CacheManager.class).getBuildIdsByConfiguration(configuration.getId()));- Collections.sort(buildIds);- BuildManager buildManager = OneDev.getInstance(BuildManager.class);- BuildInfoManager buildInfoManager = OneDev.getInstance(BuildInfoManager.class);- for (int i=0; i<buildIds.size()-count; i++) {- Long buildId = buildIds.get(i);- Build build = buildManager.load(buildId);- buildManager.delete(build);- buildInfoManager.delete(configuration.getProject(), build.getId());- }- }--}diff --git a/core/src/main/java/io/onedev/server/model/support/configuration/KeepByDays.java b/core/src/main/java/io/onedev/server/model/support/configuration/KeepByDays.javadeleted file mode 100644index 1bf5d27ac0..0000000000--- a/core/src/main/java/io/onedev/server/model/support/configuration/KeepByDays.java+++ /dev/null@@ -1,51 +0,0 @@-package io.onedev.server.model.support.configuration;--import java.util.Date;-import java.util.List;--import javax.validation.constraints.Min;--import org.hibernate.Session;-import org.hibernate.query.Query;-import org.joda.time.DateTime;--import io.onedev.server.OneDev;-import io.onedev.server.cache.BuildInfoManager;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.model.Build;-import io.onedev.server.model.Configuration;-import io.onedev.server.web.editable.annotation.Editable;--@Editable(order=100, name="Keep builds by days")-public class KeepByDays implements BuildCleanupRule {-- private static final long serialVersionUID = 1L;-- private int count = 30;-- @Editable(name="Number of Days to Keep")- @Min(value=1, message="Should keep at least one day")- public int getCount() {- return count;- }-- public void setCount(int count) {- this.count = count;- }-- @SuppressWarnings("unchecked")- @Override- public void cleanup(Configuration configuration, Session session) {- Date keepDate = new DateTime().minusDays(count).toDate();- Query<?> query = session.createQuery("from Build where configuration=:configuration and date<:date");- query.setParameter("configuration", configuration);- query.setParameter("date", keepDate);- BuildManager buildManager = OneDev.getInstance(BuildManager.class);- BuildInfoManager buildInfoManager = OneDev.getInstance(BuildInfoManager.class);- for (Build build: (List<Build>)query.list()) {- buildManager.delete(build);- buildInfoManager.delete(configuration.getProject(), build.getId());- }- }--}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.javaindex b304eff1c3..0b284e897a 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java@@ -155,22 +155,6 @@ public class IssueSetting implements Serializable {}}- public void onRenameConfiguration(String oldName, String newName) {- if (transitionSpecs != null) {- for (TransitionSpec transition: transitionSpecs)- transition.onRenameConfiguration(oldName, newName);- }- }-- public void onDeleteConfiguration(String configurationName) {- if (transitionSpecs != null) {- for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {- if (it.next().onDeleteConfiguration(configurationName))- it.remove();- }- }- }-public Collection<String> getUndefinedFields(Project project) {Set<String> undefinedFields = new HashSet<>();if (listFields != null) {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.javaindex add1e53448..b1104e10d1 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java@@ -21,7 +21,6 @@ import io.onedev.server.model.support.issue.transitionprerequisite.TransitionPreimport io.onedev.server.model.support.issue.transitionprerequisite.ValueIsNotAnyOf;import io.onedev.server.model.support.issue.transitionprerequisite.ValueIsOneOf;import io.onedev.server.model.support.issue.transitionprerequisite.ValueMatcher;-import io.onedev.server.model.support.issue.transitiontrigger.BuildSuccessfulTrigger;import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.model.support.issue.transitiontrigger.TransitionTrigger;import io.onedev.server.model.support.setting.GlobalIssueSetting;@@ -146,25 +145,6 @@ public class TransitionSpec implements Serializable {return false;}- public boolean onDeleteConfiguration(String configurationName) {- TransitionTrigger trigger = getTrigger();- if (trigger instanceof BuildSuccessfulTrigger) {- BuildSuccessfulTrigger buildSuccessfulTrigger = (BuildSuccessfulTrigger) trigger;- if (buildSuccessfulTrigger.getConfiguration().equals(configurationName))- return true;- }- return false;- }-- public void onRenameConfiguration(String oldName, String newName) {- TransitionTrigger trigger = getTrigger();- if (trigger instanceof BuildSuccessfulTrigger) {- BuildSuccessfulTrigger buildSuccessfulTrigger = (BuildSuccessfulTrigger) trigger;- if (buildSuccessfulTrigger.getConfiguration().equals(oldName))- buildSuccessfulTrigger.setConfiguration(newName);- }- }-public void onRenameGroup(String oldName, String newName) {TransitionTrigger trigger = getTrigger();if (trigger instanceof PressButtonTrigger) {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.javaindex 2697019732..17e0f41f50 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java@@ -2,25 +2,25 @@ package io.onedev.server.model.support.issue.transitiontrigger;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.web.editable.annotation.ConfigurationChoice;+import io.onedev.server.web.editable.annotation.JobChoice;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=400, name="Build is successful")+@Editable(order=400, name="Build fixing the issue is successful")public class BuildSuccessfulTrigger implements TransitionTrigger {private static final long serialVersionUID = 1L;- private String configuration;+ private String jobName;- @Editable(order=100, description="Specify the build configuration")- @ConfigurationChoice+ @Editable(order=100, description="Specify job of the build")+ @JobChoice@NotEmpty- public String getConfiguration() {- return configuration;+ public String getJobName() {+ return jobName;}- public void setConfiguration(String configuration) {- this.configuration = configuration;+ public void setJobName(String jobName) {+ this.jobName = jobName;}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequest.java b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequest.javaindex c7e8742f0d..4825748a08 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequest.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequest.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.issue.transitiontrigger;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=300, name="Pull request is discarded")+@Editable(order=300, name="Pull request fixing the issue is discarded")public class DiscardPullRequest extends PullRequestTrigger {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequest.java b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequest.javaindex f79bd52d30..d0039270df 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequest.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequest.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.issue.transitiontrigger;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=250, name="Pull request is merged")+@Editable(order=250, name="Pull request fixing the issue is merged")public class MergePullRequest extends PullRequestTrigger {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequest.java b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequest.javaindex a95424e290..5bdef77520 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequest.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequest.java@@ -2,7 +2,7 @@ package io.onedev.server.model.support.issue.transitiontrigger;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=200, name="Pull request is opened")+@Editable(order=200, name="Pull request fixing the issue is opened")public class OpenPullRequest extends PullRequestTrigger {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.javaindex 101fa692b0..c0f6c1b0e4 100644--- a/core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java+++ b/core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java@@ -172,7 +172,9 @@ public class PullRequestNotificationManager implements PersistListener {notifiedUsers.add(request.getSubmitter());} else if (event instanceof PullRequestBuildEvent) {Build build = ((PullRequestBuildEvent) event).getBuild();- if (build.getStatus() == Build.Status.ERROR || build.getStatus() == Build.Status.FAILURE) {+ if (build.getStatus() == Build.Status.IN_ERROR+ || build.getStatus() == Build.Status.FAILED+ || build.getStatus() == Build.Status.CANCELLED) {String subject = String.format("Failed to build pull request #%d - %s",request.getNumber(), request.getTitle());String url = urlManager.urlFor(request);diff --git a/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java b/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.javaindex 72b971d2e8..f740b1c8eb 100644--- a/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java+++ b/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java@@ -333,8 +333,8 @@ public class DefaultPersistManager implements PersistManager {/*** @return hibernate entity types ordered using foreign key dependency- * information. For example, Build type comes before Configuration- * type as it has Build has foreign key reference to Configuration.+ * information. For example, Build type comes before Project+ * type as Build has foreign key reference to Project*/private List<Class<?>> getEntityTypes(SessionFactory sessionFactory) {List<Class<?>> entityTypes = new ArrayList<>();diff --git a/core/src/main/java/io/onedev/server/rest/BuildResource.java b/core/src/main/java/io/onedev/server/rest/BuildResource.javaindex eecf53d155..5173f0e228 100644--- a/core/src/main/java/io/onedev/server/rest/BuildResource.java+++ b/core/src/main/java/io/onedev/server/rest/BuildResource.java@@ -39,16 +39,16 @@ public class BuildResource {@ValidQueryParams@GET- public Response query(@QueryParam("configuration") Long configurationId, @QueryParam("commit") String commit,- @QueryParam("name") String name, @QueryParam("offset") Integer offset, @QueryParam("count") Integer count,- @Context UriInfo uriInfo) {+ public Response query(@QueryParam("job") String jobName, @QueryParam("commit") String commit,+ @QueryParam("number") Long number, @QueryParam("offset") Integer offset,+ @QueryParam("count") Integer count, @Context UriInfo uriInfo) {EntityCriteria<Build> criteria = buildManager.newCriteria();- if (configurationId != null)- criteria.add(Restrictions.eq("configuration.id", configurationId));+ if (jobName != null)+ criteria.add(Restrictions.eq("jobName", jobName));if (commit != null)criteria.add(Restrictions.eq("commit", commit));- if (name != null)- criteria.add(Restrictions.eq("name", name));+ if (number != null)+ criteria.add(Restrictions.eq("number", number));if (offset == null)offset = 0;@@ -58,8 +58,8 @@ public class BuildResource {Collection<Build> builds = buildManager.query(criteria, offset, count);for (Build build: builds) {- if (!SecurityUtils.canReadIssues(build.getConfiguration().getProject().getFacade()))- throw new UnauthorizedException("Unable to access project '" + build.getConfiguration().getProject().getName() + "'");+ if (!SecurityUtils.canReadIssues(build.getProject().getFacade()))+ throw new UnauthorizedException("Unable to access project '" + build.getProject().getName() + "'");}return Response.ok(builds, RestConstants.JSON_UTF8).build();@@ -70,8 +70,8 @@ public class BuildResource {@GETpublic Build get(@PathParam("buildId") Long buildId) {Build build = buildManager.load(buildId);- if (!SecurityUtils.canReadIssues(build.getConfiguration().getProject().getFacade()))- throw new UnauthorizedException("Unauthorized access to project " + build.getConfiguration().getProject().getName());+ if (!SecurityUtils.canReadIssues(build.getProject().getFacade()))+ throw new UnauthorizedException("Unauthorized access to project " + build.getProject().getName());elsereturn build;}diff --git a/core/src/main/java/io/onedev/server/rest/ConfigurationResource.java b/core/src/main/java/io/onedev/server/rest/ConfigurationResource.javadeleted file mode 100644index 5956036493..0000000000--- a/core/src/main/java/io/onedev/server/rest/ConfigurationResource.java+++ /dev/null@@ -1,76 +0,0 @@-package io.onedev.server.rest;--import java.util.Collection;--import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.GET;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.Context;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.UriInfo;--import org.apache.shiro.authz.UnauthorizedException;-import org.hibernate.criterion.Restrictions;--import io.onedev.server.entitymanager.ConfigurationManager;-import io.onedev.server.model.Configuration;-import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.rest.jersey.ValidQueryParams;-import io.onedev.server.security.SecurityUtils;--@Path("/configurations")-@Consumes(MediaType.WILDCARD)-@Produces(MediaType.APPLICATION_JSON)-@Singleton-public class ConfigurationResource {-- private final ConfigurationManager configurationManager;-- @Inject- public ConfigurationResource(ConfigurationManager configurationManager) {- this.configurationManager = configurationManager;- }-- @ValidQueryParams- @GET- public Response query(@QueryParam("project") Long projectId, @QueryParam("name") String name,- @QueryParam("offset") Integer offset, @QueryParam("count") Integer count, @Context UriInfo uriInfo) {- EntityCriteria<Configuration> criteria = configurationManager.newCriteria();- if (projectId != null)- criteria.add(Restrictions.eq("project.id", projectId));- if (name != null)- criteria.add(Restrictions.eq("name", name));-- if (offset == null)- offset = 0;-- if (count == null || count > RestConstants.PAGE_SIZE)- count = RestConstants.PAGE_SIZE;-- Collection<Configuration> configurations = configurationManager.query(criteria, offset, count);- for (Configuration configuration: configurations) {- if (!SecurityUtils.canReadIssues(configuration.getProject().getFacade()))- throw new UnauthorizedException("Unable to access project '" + configuration.getProject().getName() + "'");- }-- return Response.ok(configurations, RestConstants.JSON_UTF8).build();-- }-- @Path("/{configurationId}")- @GET- public Configuration get(@PathParam("configurationId") Long configurationId) {- Configuration configuration = configurationManager.load(configurationId);- if (!SecurityUtils.canReadIssues(configuration.getProject().getFacade()))- throw new UnauthorizedException("Unauthorized access to project " + configuration.getProject().getName());- else- return configuration;- }--}diff --git a/core/src/main/java/io/onedev/server/rest/github/CommitStatusResource.java b/core/src/main/java/io/onedev/server/rest/github/CommitStatusResource.javadeleted file mode 100644index 498ea75031..0000000000--- a/core/src/main/java/io/onedev/server/rest/github/CommitStatusResource.java+++ /dev/null@@ -1,136 +0,0 @@-package io.onedev.server.rest.github;--import java.io.IOException;-import java.util.Date;-import java.util.Map;--import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.Context;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.MultivaluedMap;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.Response.Status;-import javax.ws.rs.core.UriBuilder;-import javax.ws.rs.core.UriInfo;--import org.apache.commons.lang3.math.NumberUtils;-import org.eclipse.jgit.lib.ObjectId;--import com.fasterxml.jackson.databind.ObjectMapper;--import io.onedev.commons.utils.StringUtils;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entitymanager.ConfigurationManager;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.Build;-import io.onedev.server.model.Configuration;-import io.onedev.server.model.Project;-import io.onedev.server.rest.RestConstants;-import io.onedev.server.security.SecurityUtils;--@Path("/repos/projects")-@Consumes(MediaType.WILDCARD)-@Produces(MediaType.WILDCARD)-@Singleton-public class CommitStatusResource {-- private final ProjectManager projectManager;-- private final BuildManager buildManager;-- private final ConfigurationManager configurationManager;-- private final ObjectMapper objectMapper;-- @Inject- public CommitStatusResource(ProjectManager projectManager, BuildManager buildManager,- ConfigurationManager configurationManager, ObjectMapper objectMapper) {- this.projectManager = projectManager;- this.buildManager = buildManager;- this.objectMapper = objectMapper;- this.configurationManager = configurationManager;- }-- @Consumes(MediaType.APPLICATION_JSON)- @Path("/{projectName}/statuses/{commit}")- @POST- public Response save(@PathParam("projectName") String projectName, @PathParam("commit") String commitHash,- Map<String, String> commitStatus, @Context UriInfo uriInfo) {-- Project project = projectManager.find(projectName);- if (project == null)- return GithubUtils.buildErrorResponse(Status.NOT_FOUND, "Unable to find project: " + projectName);-- if (!SecurityUtils.canWriteCode(project.getFacade()))- return GithubUtils.buildErrorResponse(Status.FORBIDDEN, "Code write permission is desired to update commit status");-- String context = commitStatus.get("context");- if (context == null)- context = "default";-- Configuration configuration = configurationManager.find(project, context);- if (configuration == null) {- String message = String.format("Unable to find configuration (project: %s, name: %s)", project.getName(), context);- return GithubUtils.buildErrorResponse(Status.NOT_FOUND, message);- }-- ObjectId commit = ObjectId.fromString(commitHash);- String status = commitStatus.get("state").toUpperCase();- if (status.equals("PENDING"))- status = "RUNNING";- Build build = buildManager.findByCommit(configuration, commit.name());- if (build == null) {- build = new Build();- build.setConfiguration(configuration);- build.setCommitHash(commit.name());- }- String version;- String description = commitStatus.get("description");- String url = commitStatus.get("target_url");- if (url.endsWith("/display/redirect")) { // Jenkins- version = description.substring("Build ".length());- if (version.contains(" succeeded "))- version = StringUtils.substringBefore(version, " succeeded ");- else if (version.contains(" failed "))- version = StringUtils.substringBefore(version, " failed ");- else if (version.contains(" in progress"))- version = StringUtils.substringBefore(version, " in progress");- } else {- version = StringUtils.substringBefore(commitStatus.get("description"), ":");- }- if (NumberUtils.isDigits(version))- version = "#" + version;- build.setVersion(version);-- build.setStatus(Build.Status.valueOf(status));- build.setDate(new Date());- build.setUrl(url);- buildManager.save(build);- UriBuilder uriBuilder = uriInfo.getAbsolutePathBuilder();- uriBuilder.path(context);- commitStatus.put("id", build.getId().toString());-- return Response.created(uriBuilder.build()).entity(commitStatus).type(RestConstants.JSON_UTF8).build();- }-- @Consumes(MediaType.APPLICATION_FORM_URLENCODED)- @Path("/{projectName}/statuses/{commit}")- @POST- public Response save(@PathParam("projectName") String projectName, @PathParam("commit") String commit,- MultivaluedMap<String, String> map, @Context UriInfo uriInfo) {- try {- @SuppressWarnings("unchecked")- Map<String, String> commitStatus = objectMapper.readValue(map.keySet().iterator().next(), Map.class);- return save(projectName, commit, commitStatus, uriInfo);- } catch (IOException e) {- throw new RuntimeException(e);- }- }--}diff --git a/core/src/main/java/io/onedev/server/rest/github/GithubUtils.java b/core/src/main/java/io/onedev/server/rest/github/GithubUtils.javadeleted file mode 100644index 0ecc4c3fa1..0000000000--- a/core/src/main/java/io/onedev/server/rest/github/GithubUtils.java+++ /dev/null@@ -1,20 +0,0 @@-package io.onedev.server.rest.github;--import java.util.HashMap;-import java.util.Map;--import javax.ws.rs.core.Response;-import javax.ws.rs.core.Response.Status;--import io.onedev.server.rest.RestConstants;--public class GithubUtils {-- public static Response buildErrorResponse(Status status, String message) {- Map<String, String> entity = new HashMap<>();- entity.put("error", message);- entity.put("message", message);- return Response.status(status).entity(entity).type(RestConstants.JSON_UTF8).build();- }--}diff --git a/core/src/main/java/io/onedev/server/rest/github/IssueCommentResource.java b/core/src/main/java/io/onedev/server/rest/github/IssueCommentResource.javadeleted file mode 100644index c91ac51299..0000000000--- a/core/src/main/java/io/onedev/server/rest/github/IssueCommentResource.java+++ /dev/null@@ -1,39 +0,0 @@-package io.onedev.server.rest.github;--import java.util.ArrayList;--import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.Context;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.UriInfo;--import io.onedev.server.rest.RestConstants;--@Path("/repos/projects")-@Consumes(MediaType.WILDCARD)-@Produces(MediaType.WILDCARD)-@Singleton-public class IssueCommentResource {-- @Path("/{projectName}/issues/{issueNumber}/comments")- @POST- public Response save(@PathParam("projectName") String projectName,- @PathParam("issueNumber") Long issueNumber, @Context UriInfo uriInfo) {- return Response.created(uriInfo.getAbsolutePath()).build();- }-- @Path("/{projectName}/issues/{issueNumber}/comments")- @GET- public Response list(@PathParam("projectName") String projectName,- @PathParam("issueNumber") Long issueNumber, @Context UriInfo uriInfo) {- return Response.ok(new ArrayList<>(), RestConstants.JSON_UTF8).build();- }--}diff --git a/core/src/main/java/io/onedev/server/rest/github/PullRequestResource.java b/core/src/main/java/io/onedev/server/rest/github/PullRequestResource.javadeleted file mode 100644index 3db15ddd31..0000000000--- a/core/src/main/java/io/onedev/server/rest/github/PullRequestResource.java+++ /dev/null@@ -1,226 +0,0 @@-package io.onedev.server.rest.github;--import java.text.SimpleDateFormat;-import java.util.ArrayList;-import java.util.Date;-import java.util.HashMap;-import java.util.List;-import java.util.Map;--import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.GET;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;-import javax.ws.rs.core.Context;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.Response.Status;-import javax.ws.rs.core.UriInfo;--import org.eclipse.jgit.revwalk.RevCommit;-import org.hibernate.criterion.Restrictions;--import com.google.common.base.Preconditions;--import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.PullRequestManager;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.support.pullrequest.MergePreview;-import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.rest.PageUtils;-import io.onedev.server.rest.RestConstants;-import io.onedev.server.security.SecurityUtils;--@Path("/repos/projects")-@Consumes(MediaType.WILDCARD)-@Produces(MediaType.WILDCARD)-@Singleton-public class PullRequestResource {-- private final ProjectManager projectManager;-- private final PullRequestManager pullRequestManager;-- @Inject- public PullRequestResource(ProjectManager projectManager, PullRequestManager pullRequestManager) {- this.projectManager = projectManager;- this.pullRequestManager = pullRequestManager;- }-- @Path("/{name}/pulls/{pullRequestNumber}")- @GET- public Response getPullRequest(@PathParam("name") String projectName,- @PathParam("pullRequestNumber") Long pullRequestNumber, @Context UriInfo uriInfo) {- Project project = projectManager.find(projectName);- if (project == null)- return GithubUtils.buildErrorResponse(Status.NOT_FOUND, "Unable to find project '" + projectName + "'");-- if (!SecurityUtils.canReadCode(project.getFacade()))- return GithubUtils.buildErrorResponse(Status.FORBIDDEN, "Unauthorized access to project '" + projectName + "'");-- PullRequest request = Preconditions.checkNotNull(pullRequestManager.find(project, pullRequestNumber));-- Map<String, Object> entity = getRequestMap(request, uriInfo);- return Response.ok(entity, RestConstants.JSON_UTF8).build();- }-- @Path("/{name}/pulls/{pullRequestNumber}/commits")- @GET- public Response getCommits(@PathParam("name") String projectName,- @PathParam("pullRequestNumber") Long pullRequestNumber) {- Project project = projectManager.find(projectName);- if (project == null)- return GithubUtils.buildErrorResponse(Status.NOT_FOUND, "Unable to find project '" + projectName + "'");-- if (!SecurityUtils.canReadCode(project.getFacade()))- return GithubUtils.buildErrorResponse(Status.FORBIDDEN, "Unauthorized access to project '" + projectName + "'");-- PullRequest request = pullRequestManager.find(project, pullRequestNumber);- List<Map<String, Object>> entity = new ArrayList<>();- for (RevCommit commit: request.getCommits()) {- Map<String, Object> commitMap = new HashMap<>();- commitMap.put("sha", commit.name());-- Map<String, Object> commitDetailMap = new HashMap<>();- Map<String, String> authorMap = new HashMap<>();- authorMap.put("name", commit.getAuthorIdent().getName());- authorMap.put("email", commit.getAuthorIdent().getEmailAddress());- authorMap.put("date", new SimpleDateFormat(RestConstants.DATE_FORMAT).format(commit.getAuthorIdent().getWhen()));- commitDetailMap.put("author", authorMap);-- Map<String, String> committerMap = new HashMap<>();- committerMap.put("name", commit.getCommitterIdent().getName());- committerMap.put("email", commit.getCommitterIdent().getEmailAddress());- committerMap.put("date", new SimpleDateFormat(RestConstants.DATE_FORMAT).format(commit.getCommitterIdent().getWhen()));- commitDetailMap.put("committer", authorMap);-- commitMap.put("commit", commitDetailMap);-- entity.add(commitMap);- }- return Response.ok(entity, RestConstants.JSON_UTF8).build();- }-- private Map<String, Object> getRequestMap(PullRequest request, UriInfo uriInfo) {- Map<String, Object> requestMap = new HashMap<>();- requestMap.put("number", String.valueOf(request.getNumber()));- if (request.isOpen())- requestMap.put("state", "open");- else- requestMap.put("state", "closed");- requestMap.put("title", request.getTitle());- MergePreview preview = request.getMergePreview();- if (preview != null && preview.getMerged() != null) {- requestMap.put("merge_commit_sha", preview.getMerged());- if (request.isOpen())- requestMap.put("mergeable", "true");- } else {- requestMap.put("mergeable", "false");- }- if (request.isMerged()) {- requestMap.put("merged", "true");- } else {- requestMap.put("merged", "false");- }-- Map<String, Object> headMap = new HashMap<>();- if (request.getSourceBranch() != null) {- headMap.put("ref", request.getSourceBranch());- headMap.put("label", request.getSourceBranch());- }- headMap.put("sha", request.getHeadCommitHash());- if (request.getSourceProject() != null) {- Map<String, Object> repoMap = new HashMap<>();- repoMap.put("id", "1000000");- repoMap.put("name", request.getSourceProject().getName());- headMap.put("repo", repoMap);- }- requestMap.put("head", headMap);-- Map<String, Object> baseMap = new HashMap<>();- baseMap.put("ref", request.getTargetBranch());- baseMap.put("sha", request.getBaseCommitHash());- Map<String, Object> repoMap = new HashMap<>();- repoMap.put("id", "1000000");- repoMap.put("name", request.getTargetProject().getName());- baseMap.put("repo", repoMap);-- requestMap.put("base", baseMap);-- if (request.getSubmitter() != null) {- Map<String, Object> userMap = new HashMap<>();- userMap.put("name", request.getSubmitter().getFullName());- userMap.put("login", request.getSubmitter().getName());- userMap.put("id", "1000000");- userMap.put("type", "User");- userMap.put("site_admin", SecurityUtils.isAdministrator());- userMap.put("created_at", new SimpleDateFormat(RestConstants.DATE_FORMAT).format(new Date()));- requestMap.put("user", userMap);- }-- String url = uriInfo.getBaseUriBuilder()- .path("repos").path("projects")- .path(request.getTargetProject().getName())- .path("pulls").path(String.valueOf(request.getNumber()))- .build().toString();- requestMap.put("url", url);-- SimpleDateFormat sdf = new SimpleDateFormat(RestConstants.DATE_FORMAT);- requestMap.put("created_at", sdf.format(request.getSortedUpdates().get(0).getDate()));- requestMap.put("updated_at", sdf.format(request.getLatestUpdate().getDate()));-- if (!request.isOpen()) {- requestMap.put("closed_at", sdf.format(request.getCloseInfo().getDate()));- }-- return requestMap;- }-- @Path("/{name}/pulls")- @GET- public Response query(- @PathParam("name") String projectName, @QueryParam("base") String branch,- @QueryParam("state") String state, @QueryParam("per_page") Integer perPage,- @QueryParam("page") Integer page, @Context UriInfo uriInfo) {- Project project = projectManager.find(projectName);- if (project == null)- return GithubUtils.buildErrorResponse(Status.NOT_FOUND, "Unable to find project '" + projectName + "'");-- if (!SecurityUtils.canReadCode(project.getFacade()))- return GithubUtils.buildErrorResponse(Status.FORBIDDEN, "Unauthorized access to project '" + projectName + "'");-- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);- criteria.add(PullRequest.CriterionHelper.ofTargetProject(project));- if ("closed".equals(state))- criteria.add(PullRequest.CriterionHelper.ofClosed());- else if (state == null || state.equals("open"))- criteria.add(PullRequest.CriterionHelper.ofOpen());-- if (branch != null)- criteria.add(Restrictions.eq("targetBranch", branch));-- if (page == null)- page = 1;-- if (perPage == null || perPage > RestConstants.PAGE_SIZE)- perPage = RestConstants.PAGE_SIZE;-- int totalCount = pullRequestManager.count(criteria);-- List<Map<String, Object>> entity = new ArrayList<>();- for (PullRequest request: pullRequestManager.query(criteria, (page-1)*perPage, perPage)) {- entity.add(getRequestMap(request, uriInfo));- }-- return Response- .ok(entity, RestConstants.JSON_UTF8)- .links(PageUtils.getNavLinks(uriInfo, totalCount, perPage, page))- .build();- }--}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/rest/github/RepositoryResource.java b/core/src/main/java/io/onedev/server/rest/github/RepositoryResource.javadeleted file mode 100644index 97de403f13..0000000000--- a/core/src/main/java/io/onedev/server/rest/github/RepositoryResource.java+++ /dev/null@@ -1,62 +0,0 @@-package io.onedev.server.rest.github;--import java.util.HashMap;-import java.util.Map;--import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.GET;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.Response.Status;--import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.Project;-import io.onedev.server.rest.RestConstants;-import io.onedev.server.security.SecurityUtils;--@Path("/repos/projects")-@Consumes(MediaType.WILDCARD)-@Produces(MediaType.WILDCARD)-@Singleton-public class RepositoryResource {-- private final ProjectManager projectManager;-- @Inject- public RepositoryResource(ProjectManager projectManager) {- this.projectManager = projectManager;- }-- @Path("/{name}")- @GET- public Response get(@PathParam("name") String name) {- Project project = projectManager.find(name);- if (project == null)- return GithubUtils.buildErrorResponse(Status.NOT_FOUND, "Unable to find project '" + name + "'");-- if (!SecurityUtils.canReadCode(project.getFacade()))- return GithubUtils.buildErrorResponse(Status.FORBIDDEN, "Unauthorized access to project '" + name + "'");-- Map<String, Object> entity = new HashMap<>();- Map<String, String> permissionsMap = new HashMap<>();- entity.put("name", project.getName());- permissionsMap.put("admin", String.valueOf(SecurityUtils.canAdministrate(project.getFacade())));- permissionsMap.put("push", String.valueOf(SecurityUtils.canWriteCode(project.getFacade())));- permissionsMap.put("pull", "true");- entity.put("permissions", permissionsMap);-- Map<String, String> ownerMap = new HashMap<>();- ownerMap.put("login", "projects");- ownerMap.put("id", "1000000");-- entity.put("owner", ownerMap);-- return Response.ok(entity, RestConstants.JSON_UTF8).build();- }--}diff --git a/core/src/main/java/io/onedev/server/rest/github/UserResource.java b/core/src/main/java/io/onedev/server/rest/github/UserResource.javadeleted file mode 100644index 29753128ff..0000000000--- a/core/src/main/java/io/onedev/server/rest/github/UserResource.java+++ /dev/null@@ -1,57 +0,0 @@-package io.onedev.server.rest.github;--import java.io.IOException;-import java.text.SimpleDateFormat;-import java.util.Date;-import java.util.HashMap;-import java.util.Map;--import javax.inject.Inject;-import javax.inject.Singleton;-import javax.ws.rs.Consumes;-import javax.ws.rs.GET;-import javax.ws.rs.Path;-import javax.ws.rs.Produces;-import javax.ws.rs.core.Context;-import javax.ws.rs.core.MediaType;-import javax.ws.rs.core.Response;-import javax.ws.rs.core.UriInfo;--import com.fasterxml.jackson.core.JsonParseException;-import com.fasterxml.jackson.databind.JsonMappingException;--import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.User;-import io.onedev.server.rest.RestConstants;-import io.onedev.server.security.SecurityUtils;--@Path("/user")-@Consumes(MediaType.WILDCARD)-@Produces(MediaType.WILDCARD)-@Singleton-public class UserResource {-- private final UserManager userManager;-- @Inject- public UserResource(UserManager userManager) {- this.userManager = userManager;- }-- @GET- public Response get(@Context UriInfo uriInfo) throws JsonParseException, JsonMappingException, IOException {- Map<String, Object> entity = new HashMap<>();-- User user = userManager.getCurrent();- entity.put("name", user.getFullName());- entity.put("login", user.getName());- entity.put("id", "1000000");- entity.put("type", "User");- entity.put("url", uriInfo.getBaseUri().toString() + "/users/" + user.getName());- entity.put("site_admin", SecurityUtils.isAdministrator());- entity.put("created_at", new SimpleDateFormat(RestConstants.DATE_FORMAT).format(new Date()));-- return Response.ok(entity, RestConstants.JSON_UTF8).build();- }--}diff --git a/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java b/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.javaindex 3183dcd9b2..b9c43fa20d 100644--- a/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java+++ b/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java@@ -15,6 +15,7 @@ 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 org.apache.commons.lang.math.NumberUtils;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.PersonIdent;import org.eclipse.jgit.lib.Ref;@@ -118,11 +119,18 @@ public class CommitQueryUtils {elserevision.value = unescape(removeParens(criteria.revisionCriteria().Value().getText()));if (criteria.revisionCriteria().BUILD() != null) {- Build build = OneDev.getInstance(BuildManager.class).findByFQN(project, revision.value);- if (build == null)- throw new OneException("Unable to find build with FQN: " + revision.value);- else- revision.value = build.getCommitHash();+ String numberStr = revision.value;+ if (numberStr.startsWith("#"))+ numberStr = numberStr.substring(1);+ if (NumberUtils.isDigits(numberStr)) {+ Build build = OneDev.getInstance(BuildManager.class).find(project, Long.parseLong(numberStr));+ if (build == null)+ throw new OneException("Unable to find build: #" + revision.value);+ else+ revision.value = build.getCommitHash();+ } else {+ throw new OneException("Invalid build number: " + numberStr);+ }}if (criteria.revisionCriteria().SINCE() != null)revision.since = true;diff --git a/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/core/src/main/java/io/onedev/server/search/entity/EntityQuery.javaindex f047dbb3ee..39e9b724b7 100644--- a/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java+++ b/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java@@ -16,13 +16,11 @@ import com.google.common.base.Splitter;import io.onedev.commons.utils.WordUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entitymanager.ConfigurationManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.exception.OneException;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Build;-import io.onedev.server.model.Configuration;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;@@ -91,14 +89,6 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa}}- public static Configuration getConfiguration(Project project, String name) {- Configuration configuration = OneDev.getInstance(ConfigurationManager.class).find(project, name);- if (configuration != null)- return configuration;- else- throw new OneException("Unable to find configuration: " + name);- }-public static Issue getIssue(Project project, String numberStr) {if (numberStr.startsWith("#"))numberStr = numberStr.substring(1);@@ -109,12 +99,12 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializathrow new OneException("Unable to find issue: #" + numberStr);}- public static Build getBuild(Project project, String fqn) {- Build build = OneDev.getInstance(BuildManager.class).findByFQN(project, fqn);+ public static Build getBuild(Project project, String numberStr) {+ Build build = OneDev.getInstance(BuildManager.class).find(project, getLongValue(numberStr));if (build != null)return build;else- throw new OneException("Unable to find build with FQN: " + fqn);+ throw new OneException("Unable to find build: #" + numberStr);}public boolean needsLogin() {diff --git a/core/src/main/java/io/onedev/server/search/entity/build/BuildDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/BuildDateCriteria.javaindex 0af9a4b681..adef702153 100644--- a/core/src/main/java/io/onedev/server/search/entity/build/BuildDateCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/build/BuildDateCriteria.java@@ -41,9 +41,9 @@ public class BuildDateCriteria extends EntityCriteria<Build> {@Overridepublic boolean matches(Build build, User user) {if (operator == CodeCommentQueryLexer.IsBefore)- return build.getDate().before(value);+ return build.getSubmitDate().before(value);else- return build.getDate().after(value);+ return build.getSubmitDate().after(value);}@Overridediff --git a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4 b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4index 7bf89aa4ec..a5c18dc181 100644--- a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4+++ b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4@@ -7,9 +7,9 @@ query;criteria- : operator=(Successful|Failed|InError|Running) #OperatorCriteria+ : operator=(Successful|Failed|InError|Cancelled|Running|Waiting|Queueing) #OperatorCriteria| operator=FixedIssue WS+ criteriaValue=Quoted #OperatorValueCriteria- | criteriaField=Quoted WS+ operator=(Is|IsBefore|IsAfter|Matches) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ | criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsBefore|IsAfter) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria| Not WS* LParens WS* criteria WS* RParens #NotCriteria@@ -36,9 +36,21 @@ InError: 'in' WS+ 'error';+Cancelled+ : 'cancelled'+ ;+Running: 'running';++Waiting+ : 'waiting'+ ;++Queueing+ : 'queueing'+ ;FixedIssue: 'fixed' WS+ 'issue'@@ -52,10 +64,14 @@ Is: 'is';-Matches- : 'matches'+IsGreaterThan+ : 'is' WS+ 'greater' WS+ 'than';+IsLessThan+ : 'is' WS+ 'less' WS+ 'than'+ ;+IsAfter: 'is after';diff --git a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.javaindex 03ba0e97e5..c752f3bbc7 100644--- a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java+++ b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java@@ -2,8 +2,8 @@ package io.onedev.server.search.entity.build;import static io.onedev.server.util.BuildConstants.FIELD_BUILD_DATE;import static io.onedev.server.util.BuildConstants.FIELD_COMMIT;-import static io.onedev.server.util.BuildConstants.FIELD_CONFIGURATION;-import static io.onedev.server.util.BuildConstants.FIELD_VERSION;+import static io.onedev.server.util.BuildConstants.FIELD_JOB;+import static io.onedev.server.util.BuildConstants.FIELD_NUMBER;import java.util.ArrayList;import java.util.Date;@@ -97,8 +97,14 @@ public class BuildQuery extends EntityQuery<Build> {return new SuccessfulCriteria();case BuildQueryLexer.Failed:return new FailedCriteria();+ case BuildQueryLexer.Cancelled:+ return new CancelledCriteria();case BuildQueryLexer.InError:return new InErrorCriteria();+ case BuildQueryLexer.Waiting:+ return new WaitingCriteria();+ case BuildQueryLexer.Queueing:+ return new QueueingCriteria();case BuildQueryLexer.Running:return new RunningCriteria();default:@@ -133,20 +139,20 @@ public class BuildQuery extends EntityQuery<Build> {return new BuildDateCriteria(dateValue, value, operator);elsethrow new IllegalStateException();- case BuildQueryLexer.Matches:- if (fieldName.equals(FIELD_VERSION))- return new VersionCriteria(value);- else- throw new IllegalStateException();case BuildQueryLexer.Is:switch (fieldName) {case FIELD_COMMIT:return new CommitCriteria(getCommitId(project, value));- case FIELD_CONFIGURATION:- return new ConfigurationCriteria(getConfiguration(project, value));+ case FIELD_JOB:+ return new JobCriteria(value);+ case FIELD_NUMBER:+ return new NumberCriteria(getIntValue(value), operator);default:throw new IllegalStateException();}+ case BuildQueryLexer.IsLessThan:+ case BuildQueryLexer.IsGreaterThan:+ return new NumberCriteria(getIntValue(value), operator);default:throw new IllegalStateException();}@@ -208,12 +214,13 @@ public class BuildQuery extends EntityQuery<Build> {if (!fieldName.equals(BuildConstants.FIELD_BUILD_DATE))throw newOperatorException(fieldName, operator);break;- case BuildQueryLexer.Matches:- if (!fieldName.equals(FIELD_VERSION))+ case BuildQueryLexer.Is:+ if (!fieldName.equals(FIELD_COMMIT) && !fieldName.equals(FIELD_JOB) && !fieldName.equals(FIELD_NUMBER))throw newOperatorException(fieldName, operator);break;- case BuildQueryLexer.Is:- if (!fieldName.equals(FIELD_COMMIT) && !fieldName.equals(FIELD_CONFIGURATION))+ case BuildQueryLexer.IsLessThan:+ case BuildQueryLexer.IsGreaterThan:+ if (!fieldName.equals(FIELD_NUMBER))throw newOperatorException(fieldName, operator);break;}diff --git a/core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.javasimilarity index 54%rename from core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.javarename to core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.javaindex 9e9b51e7e4..76a0af80e8 100644--- a/core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java@@ -10,26 +10,19 @@ import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.QueryBuildContext;import io.onedev.server.util.BuildConstants;-public class VersionCriteria extends EntityCriteria<Build> {+public class CancelledCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;- private final String value;-- public VersionCriteria(String value) {- this.value = value;- }-@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {- Path<String> attribute = context.getRoot().get(BuildConstants.ATTR_VERSION);- String normalized = value.toLowerCase().replace("*", "%");- return context.getBuilder().like(context.getBuilder().lower(attribute), normalized);+ Path<?> attribute = context.getRoot().get(BuildConstants.ATTR_STATUS);+ return context.getBuilder().equal(attribute, Build.Status.CANCELLED);}@Overridepublic boolean matches(Build build, User user) {- return build.getVersion().toLowerCase().contains(value.toLowerCase());+ return build.getStatus() == Build.Status.CANCELLED;}@Override@@ -39,7 +32,7 @@ public class VersionCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.quote(BuildConstants.FIELD_VERSION) + " " + BuildQuery.getRuleName(BuildQueryLexer.Matches) + " " + BuildQuery.quote(value);+ return BuildQuery.getRuleName(BuildQueryLexer.Cancelled);}}diff --git a/core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.javaindex 11029ccc6f..7eea1c1280 100644--- a/core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java@@ -17,12 +17,12 @@ public class FailedCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {Path<?> attribute = context.getRoot().get(BuildConstants.ATTR_STATUS);- return context.getBuilder().equal(attribute, Build.Status.FAILURE);+ return context.getBuilder().equal(attribute, Build.Status.FAILED);}@Overridepublic boolean matches(Build build, User user) {- return build.getStatus() == Build.Status.FAILURE;+ return build.getStatus() == Build.Status.FAILED;}@Overridediff --git a/core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.javaindex 06dda67e42..55d711595d 100644--- a/core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java@@ -48,10 +48,10 @@ public class FixedIssueCriteria extends EntityCriteria<Build> {@Overridepublic boolean matches(Build build, User user) {- Collection<ObjectId> fixCommits = getCommitInfoManager().getFixCommits(build.getConfiguration().getProject(), value.getNumber());+ Collection<ObjectId> fixCommits = getCommitInfoManager().getFixCommits(build.getProject(), value.getNumber());for (ObjectId commit: fixCommits) {ObjectId buildCommit = ObjectId.fromString(build.getCommitHash());- if (GitUtils.isMergedInto(build.getConfiguration().getProject().getRepository(), null, commit, buildCommit))+ if (GitUtils.isMergedInto(build.getProject().getRepository(), null, commit, buildCommit))return true;}return false;diff --git a/core/src/main/java/io/onedev/server/search/entity/build/InErrorCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/InErrorCriteria.javaindex 110b1158e2..9bd148979d 100644--- a/core/src/main/java/io/onedev/server/search/entity/build/InErrorCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/build/InErrorCriteria.java@@ -17,12 +17,12 @@ public class InErrorCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {Path<?> attribute = context.getRoot().get(BuildConstants.ATTR_STATUS);- return context.getBuilder().equal(attribute, Build.Status.ERROR);+ return context.getBuilder().equal(attribute, Build.Status.IN_ERROR);}@Overridepublic boolean matches(Build build, User user) {- return build.getStatus() == Build.Status.ERROR;+ return build.getStatus() == Build.Status.IN_ERROR;}@Overridediff --git a/core/src/main/java/io/onedev/server/search/entity/build/ConfigurationCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.javasimilarity index 67%rename from core/src/main/java/io/onedev/server/search/entity/build/ConfigurationCriteria.javarename to core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.javaindex be0696bfde..532d9f2497 100644--- a/core/src/main/java/io/onedev/server/search/entity/build/ConfigurationCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java@@ -4,32 +4,31 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Build;-import io.onedev.server.model.Configuration;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.QueryBuildContext;import io.onedev.server.util.BuildConstants;-public class ConfigurationCriteria extends EntityCriteria<Build> {+public class JobCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;- private Configuration value;+ private String value;- public ConfigurationCriteria(Configuration value) {+ public JobCriteria(String value) {this.value = value;}@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {- Path<?> attribute = context.getRoot().get(BuildConstants.ATTR_CONFIGURATION);+ Path<?> attribute = context.getRoot().get(BuildConstants.ATTR_JOB);return context.getBuilder().equal(attribute, value);}@Overridepublic boolean matches(Build build, User user) {- return build.getConfiguration().equals(value);+ return build.getJobName().equals(value);}@Override@@ -39,7 +38,7 @@ public class ConfigurationCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.quote(BuildConstants.FIELD_CONFIGURATION) + " " + BuildQuery.getRuleName(BuildQueryLexer.Is) + " " + BuildQuery.quote(value.getName());+ return BuildQuery.quote(BuildConstants.FIELD_JOB) + " " + BuildQuery.getRuleName(BuildQueryLexer.Is) + " " + BuildQuery.quote(value);}}diff --git a/core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.javanew file mode 100644index 0000000000..ee86a7cf33--- /dev/null+++ b/core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java@@ -0,0 +1,58 @@+package io.onedev.server.search.entity.build;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.search.entity.QueryBuildContext;+import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.IssueConstants;++public class NumberCriteria extends EntityCriteria<Build> {++ private static final long serialVersionUID = 1L;++ private final int operator;++ private final long value;++ public NumberCriteria(long value, int operator) {+ this.operator = operator;+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {+ Path<Long> attribute = context.getRoot().get(IssueConstants.ATTR_NUMBER);+ if (operator == BuildQueryLexer.Is)+ return context.getBuilder().equal(attribute, value);+ else if (operator == BuildQueryLexer.IsGreaterThan)+ return context.getBuilder().greaterThan(attribute, value);+ else+ return context.getBuilder().lessThan(attribute, value);+ }++ @Override+ public boolean matches(Build build, User user) {+ if (operator == BuildQueryLexer.Is)+ return build.getNumber() == value;+ else if (operator == BuildQueryLexer.IsGreaterThan)+ return build.getNumber() > value;+ else+ return build.getNumber() < value;+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return BuildQuery.quote(BuildConstants.FIELD_NUMBER) + " " + BuildQuery.getRuleName(operator) + " " + BuildQuery.quote(String.valueOf(value));+ }++}diff --git a/core/src/main/java/io/onedev/server/search/entity/build/QueueingCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/QueueingCriteria.javanew file mode 100644index 0000000000..43f8b10102--- /dev/null+++ b/core/src/main/java/io/onedev/server/search/entity/build/QueueingCriteria.java@@ -0,0 +1,38 @@+package io.onedev.server.search.entity.build;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.search.entity.QueryBuildContext;+import io.onedev.server.util.BuildConstants;++public class QueueingCriteria extends EntityCriteria<Build> {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {+ Path<?> attribute = context.getRoot().get(BuildConstants.ATTR_STATUS);+ return context.getBuilder().equal(attribute, Build.Status.QUEUEING);+ }++ @Override+ public boolean matches(Build build, User user) {+ return build.getStatus() == Build.Status.QUEUEING;+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return BuildQuery.getRuleName(BuildQueryLexer.Queueing);+ }++}diff --git a/core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.javaindex 77345d612d..4e05963f60 100644--- a/core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java@@ -17,12 +17,12 @@ public class SuccessfulCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {Path<?> attribute = context.getRoot().get(BuildConstants.ATTR_STATUS);- return context.getBuilder().equal(attribute, Build.Status.SUCCESS);+ return context.getBuilder().equal(attribute, Build.Status.SUCCESSFUL);}@Overridepublic boolean matches(Build build, User user) {- return build.getStatus() == Build.Status.SUCCESS;+ return build.getStatus() == Build.Status.SUCCESSFUL;}@Overridediff --git a/core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.javanew file mode 100644index 0000000000..82192e76e4--- /dev/null+++ b/core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java@@ -0,0 +1,38 @@+package io.onedev.server.search.entity.build;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.search.entity.QueryBuildContext;+import io.onedev.server.util.BuildConstants;++public class WaitingCriteria extends EntityCriteria<Build> {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {+ Path<?> attribute = context.getRoot().get(BuildConstants.ATTR_STATUS);+ return context.getBuilder().equal(attribute, Build.Status.WAITING);+ }++ @Override+ public boolean matches(Build build, User user) {+ return build.getStatus() == Build.Status.WAITING;+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return BuildQuery.getRuleName(BuildQueryLexer.Waiting);+ }++}diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.javaindex 05a9ec3c72..308e8f5aba 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java@@ -42,7 +42,7 @@ public class FixedInCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.getRuleName(IssueQueryLexer.FixedInBuild) + " " + IssueQuery.quote(build.getVersion());+ return IssueQuery.getRuleName(IssueQueryLexer.FixedInBuild) + IssueQuery.quote("#" + build.getNumberStr());}}diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.javaindex 647f383561..a77af953e7 100644--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java@@ -22,15 +22,18 @@ public class HasFailedBuildsCriteria extends PullRequestCriteria {Path<?> status = join.get(Build.STATUS);return context.getBuilder().or(- context.getBuilder().equal(status, Build.Status.ERROR),- context.getBuilder().equal(status, Build.Status.FAILURE));+ context.getBuilder().equal(status, Build.Status.IN_ERROR),+ context.getBuilder().equal(status, Build.Status.FAILED),+ context.getBuilder().equal(status, Build.Status.CANCELLED));}@Overridepublic boolean matches(PullRequest request, User user) {for (PullRequestBuild build: request.getBuilds()) {if (build.getBuild() != null &&- (build.getBuild().getStatus() == Build.Status.ERROR || build.getBuild().getStatus() == Build.Status.FAILURE)) {+ (build.getBuild().getStatus() == Build.Status.IN_ERROR+ || build.getBuild().getStatus() == Build.Status.FAILED+ || build.getBuild().getStatus() == Build.Status.CANCELLED)) {return true;}}diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.javaindex 02fdc2aca5..96f4bc31c5 100644--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java@@ -23,14 +23,20 @@ public class HasPendingBuildsCriteria extends PullRequestCriteria {return context.getBuilder().or(context.getBuilder().isNull(status),- context.getBuilder().equal(status, Build.Status.RUNNING));+ context.getBuilder().equal(status, Build.Status.RUNNING),+ context.getBuilder().equal(status, Build.Status.QUEUEING),+ context.getBuilder().equal(status, Build.Status.WAITING));}@Overridepublic boolean matches(PullRequest request, User user) {for (PullRequestBuild build: request.getBuilds()) {- if (build.getBuild() == null || build.getBuild().getStatus() == Build.Status.RUNNING)+ if (build.getBuild() == null+ || build.getBuild().getStatus() == Build.Status.RUNNING+ || build.getBuild().getStatus() == Build.Status.QUEUEING+ || build.getBuild().getStatus() == Build.Status.WAITING) {return true;+ }}return false;}diff --git a/core/src/main/java/io/onedev/server/util/BuildConstants.java b/core/src/main/java/io/onedev/server/util/BuildConstants.javaindex fd427940fe..cde981ce1a 100644--- a/core/src/main/java/io/onedev/server/util/BuildConstants.java+++ b/core/src/main/java/io/onedev/server/util/BuildConstants.java@@ -9,18 +9,20 @@ import jersey.repackaged.com.google.common.collect.Lists;public class BuildConstants {public static final String ATTR_ID = "id";++ public static final String FIELD_NUMBER = "Number";- public static final String FIELD_CONFIGURATION = "Configuration";+ public static final String ATTR_NUMBER = "number";- public static final String ATTR_CONFIGURATION = "configuration";+ public static final String ATTR_PROJECT = "project";- public static final String FIELD_STATUS = "Status";+ public static final String FIELD_JOB = "Job";- public static final String ATTR_STATUS = "status";+ public static final String ATTR_JOB = "jobName";- public static final String FIELD_VERSION = "Version";+ public static final String FIELD_STATUS = "Status";- public static final String ATTR_VERSION = "version";+ public static final String ATTR_STATUS = "status";public static final String FIELD_BUILD_DATE = "Build Date";@@ -31,14 +33,14 @@ public class BuildConstants {public static final String ATTR_COMMIT = "commitHash";public static final List<String> QUERY_FIELDS = Lists.newArrayList(- FIELD_CONFIGURATION, FIELD_VERSION, FIELD_BUILD_DATE, FIELD_COMMIT);+ FIELD_JOB, FIELD_NUMBER, FIELD_BUILD_DATE, FIELD_COMMIT);public static final Map<String, String> ORDER_FIELDS = new LinkedHashMap<>();static {- ORDER_FIELDS.put(FIELD_CONFIGURATION, ATTR_CONFIGURATION);+ ORDER_FIELDS.put(FIELD_JOB, ATTR_JOB);ORDER_FIELDS.put(FIELD_STATUS, ATTR_STATUS);- ORDER_FIELDS.put(FIELD_VERSION, ATTR_VERSION);+ ORDER_FIELDS.put(FIELD_NUMBER, ATTR_NUMBER);ORDER_FIELDS.put(FIELD_BUILD_DATE, ATTR_BUILD_DATE);ORDER_FIELDS.put(FIELD_COMMIT, ATTR_COMMIT);}diff --git a/core/src/main/java/io/onedev/server/util/facade/BuildFacade.java b/core/src/main/java/io/onedev/server/util/facade/BuildFacade.javaindex 77140aebee..9665ffec15 100644--- a/core/src/main/java/io/onedev/server/util/facade/BuildFacade.java+++ b/core/src/main/java/io/onedev/server/util/facade/BuildFacade.java@@ -4,18 +4,18 @@ public class BuildFacade extends EntityFacade {private static final long serialVersionUID = 1L;- private final Long configurationId;+ private final Long projectId;private final String commitHash;- public BuildFacade(Long buildId, Long configurationId, String commitHash) {+ public BuildFacade(Long buildId, Long projectId, String commitHash) {super(buildId);- this.configurationId = configurationId;+ this.projectId = projectId;this.commitHash = commitHash;}- public Long getConfigurationId() {- return configurationId;+ public Long getProjectId() {+ return projectId;}public String getCommitHash() {diff --git a/core/src/main/java/io/onedev/server/util/facade/ConfigurationFacade.java b/core/src/main/java/io/onedev/server/util/facade/ConfigurationFacade.javadeleted file mode 100644index a0ad34e523..0000000000--- a/core/src/main/java/io/onedev/server/util/facade/ConfigurationFacade.java+++ /dev/null@@ -1,27 +0,0 @@-package io.onedev.server.util.facade;--import io.onedev.server.model.Configuration;--public class ConfigurationFacade extends EntityFacade {-- private static final long serialVersionUID = 1L;-- private final Long projectId;-- private final String name;-- public ConfigurationFacade(Configuration configuration) {- super(configuration.getId());- projectId = configuration.getProject().getId();- name = configuration.getName();- }-- public Long getProjectId() {- return projectId;- }-- public String getName() {- return name;- }--}diff --git a/core/src/main/java/io/onedev/server/util/validation/ConfigurationNameValidator.java b/core/src/main/java/io/onedev/server/util/validation/ConfigurationNameValidator.javadeleted file mode 100644index 150322f4b7..0000000000--- a/core/src/main/java/io/onedev/server/util/validation/ConfigurationNameValidator.java+++ /dev/null@@ -1,37 +0,0 @@-package io.onedev.server.util.validation;--import java.util.regex.Pattern;--import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;--import io.onedev.server.util.validation.annotation.ConfigurationName;--public class ConfigurationNameValidator implements ConstraintValidator<ConfigurationName, String> {-- private static final Pattern PATTERN = Pattern.compile("[^:]+");-- @Override- public void initialize(ConfigurationName constaintAnnotation) {- }-- @Override- public boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null) {- return true;- } else if (!PATTERN.matcher(value).matches()) {- constraintContext.disableDefaultConstraintViolation();- String message = "Colon is not allowed";- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;- } else if (value.equals("new")) {- constraintContext.disableDefaultConstraintViolation();- String message = "'new' is reserved and can not be used as configuration name";- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;- } else {- return true;- }- }--}diff --git a/core/src/main/java/io/onedev/server/util/validation/annotation/ConfigurationName.java b/core/src/main/java/io/onedev/server/util/validation/annotation/ConfigurationName.javadeleted file mode 100644index cf4c953914..0000000000--- a/core/src/main/java/io/onedev/server/util/validation/annotation/ConfigurationName.java+++ /dev/null@@ -1,23 +0,0 @@-package io.onedev.server.util.validation.annotation;--import java.lang.annotation.ElementType;-import java.lang.annotation.Retention;-import java.lang.annotation.RetentionPolicy;-import java.lang.annotation.Target;--import javax.validation.Constraint;-import javax.validation.Payload;--import io.onedev.server.util.validation.ConfigurationNameValidator;--@Target({ElementType.METHOD, ElementType.FIELD})-@Retention(RetentionPolicy.RUNTIME)-@Constraint(validatedBy=ConfigurationNameValidator.class)-public @interface ConfigurationName {-- String message() default "";-- Class<?>[] groups() default {};-- Class<? extends Payload>[] payload() default {};-}diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex 8f52dbb801..aab37b52eb 100644--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -70,9 +70,6 @@ import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizatimport io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;import io.onedev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage;-import io.onedev.server.web.page.project.setting.configuration.ConfigurationEditPage;-import io.onedev.server.web.page.project.setting.configuration.ConfigurationListPage;-import io.onedev.server.web.page.project.setting.configuration.NewConfigurationPage;import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;import io.onedev.server.web.page.project.setting.issue.PromptFieldsUponIssueOpenSettingPage;import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;@@ -246,9 +243,6 @@ public class OneUrlMapper extends CompoundRequestMapper {PromptFieldsUponIssueOpenSettingPage.class));add(new OnePageMapper("projects/${project}/settings/commit-message-transform", CommitMessageTransformPage.class));add(new OnePageMapper("projects/${project}/settings/web-hooks", WebHooksPage.class));- add(new OnePageMapper("projects/${project}/settings/configurations", ConfigurationListPage.class));- add(new OnePageMapper("projects/${project}/settings/configurations/new", NewConfigurationPage.class));- add(new OnePageMapper("projects/${project}/settings/configurations/${configuration}", ConfigurationEditPage.class));add(new OnePageMapper("projects/${project}/no-commits", NoCommitsPage.class));}diff --git a/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex 987bffe7ec..740ff41823 100644--- a/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -90,10 +90,10 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES,unfencedLowerCaseMatchWith));CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));- } else if (fieldName.equals(BuildConstants.FIELD_CONFIGURATION)) {- suggestions.addAll(escape(SuggestionUtils.suggestConfigurations(projectModel.getObject(), unfencedLowerCaseMatchWith)));- } else if (fieldName.equals(BuildConstants.FIELD_VERSION)) {- suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedLowerCaseMatchWith, false)));+ } else if (fieldName.equals(BuildConstants.FIELD_JOB)) {+ suggestions.addAll(escape(SuggestionUtils.suggestJobs(projectModel.getObject(), unfencedLowerCaseMatchWith)));+ } else if (fieldName.equals(BuildConstants.FIELD_NUMBER)) {+ suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedLowerCaseMatchWith)));} else {return null;}@@ -132,21 +132,4 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {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())) {- String unmatched = terminalExpect.getUnmatchedText();- if (unmatched.indexOf('"') == unmatched.lastIndexOf('"')) { // only when we input criteria value- List<Element> elements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);- if (!elements.isEmpty() && elements.get(0).getFirstMatchedToken().getType() == BuildQueryParser.Matches)- hints.add("Use * to match any part of version");- }- }- }- return hints;- }-}diff --git a/core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.javaindex b8d44096c3..565dcf923c 100644--- a/core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java@@ -83,7 +83,7 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {suggestions.addAll(escape(SuggestionUtils.suggestTags(project, unfencedMatchWith)));break;case CommitQueryParser.BUILD:- suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedMatchWith, true)));+ suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedMatchWith)));break;case CommitQueryParser.AUTHOR:case CommitQueryParser.COMMITTER:diff --git a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex 3504be8331..f2ce3b3e16 100644--- a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -139,7 +139,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {break;case "build":if (getProject() != null)- suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedLowerCaseMatchWith, true)));+ suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedLowerCaseMatchWith)));break;}} else if ("criteriaValue".equals(spec.getLabel())) {@@ -152,7 +152,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {if (operator == IssueQueryLexer.SubmittedBy)suggestions.addAll(escape(SuggestionUtils.suggestUsers(unfencedLowerCaseMatchWith)));else- suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedLowerCaseMatchWith, true)));+ suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedLowerCaseMatchWith)));} else {String fieldName = IssueQuery.getValue(fieldElements.get(0).getMatchedText());@@ -174,7 +174,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {} else if (fieldSpec instanceof BuildChoiceInput) {List<Build> builds = OneDev.getInstance(BuildManager.class).query(project, unfencedLowerCaseMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);for (Build build: builds) {- InputSuggestion suggestion = new InputSuggestion(build.getVersion(), null, null);+ InputSuggestion suggestion = new InputSuggestion("#" + build.getNumber(), null, null);suggestions.add(suggestion);}} else if (fieldSpec instanceof PullRequestChoiceInput) {diff --git a/core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.javaindex 7fa0bcb8f1..75bb79d401 100644--- a/core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java+++ b/core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java@@ -6,7 +6,6 @@ import java.util.List;import org.apache.wicket.model.IModel;import org.json.JSONException;import org.json.JSONWriter;-import org.unbescape.html.HtmlEscape;import com.google.common.collect.Lists;@@ -39,8 +38,7 @@ public class BuildChoiceProvider extends ChoiceProvider<Build> {public void toJson(Build choice, JSONWriter writer) throws JSONException {writer.key("id").value(choice.getId())- .key("version").value(choice.getVersion())- .key("configuration").value(HtmlEscape.escapeHtml5(choice.getConfiguration().getName()));+ .key("number").value(choice.getNumber());}@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js b/core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.jsindex d0f431717d..6b0f936abc 100644--- a/core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js+++ b/core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js@@ -1,10 +1,10 @@onedev.server.buildChoiceFormatter = {formatSelection: function(build) {- return build.configuration + ":" + build.name;+ return "#" + build.number;},formatResult: function(build) {- return "<div class='build'>" + build.configuration + ":" + build.name + "</div>";+ return "<div class='build'>#" + build.number + "</div>";},escapeMarkup: function(m) {diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.htmlindex 7335545b24..10ee842929 100644--- a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html@@ -20,7 +20,7 @@<div class="help-block"><i class="fa fa-info-circle"></i> This page lists builds containig recent commits fixing the issue</div></div></div>- <wicket:fragment wicket:id="versionFrag">+ <wicket:fragment wicket:id="numberFrag"><span wicket:id="status"></span><a wicket:id="link"><span wicket:id="label"></span></a></wicket:fragment>diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 46df5099a0..61563df3c6 100644--- a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -24,7 +24,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.ExternalLink;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.GenericPanel;@@ -55,6 +55,7 @@ import io.onedev.server.web.component.build.status.BuildStatusIcon;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.page.project.builds2.detail.BuildDetailPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.savedquery.SavedQueriesClosed;import io.onedev.server.web.page.project.savedquery.SavedQueriesOpened;@@ -257,34 +258,35 @@ public abstract class BuildListPanel extends GenericPanel<String> {List<IColumn<Build, Void>> columns = new ArrayList<>();- columns.add(new AbstractColumn<Build, Void>(Model.of(BuildConstants.FIELD_CONFIGURATION)) {+ columns.add(new AbstractColumn<Build, Void>(Model.of(BuildConstants.FIELD_JOB)) {@Overridepublic String getCssClass() {- return "configuration";+ return "job";}@Overridepublic void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,IModel<Build> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getConfiguration().getName()));+ cellItem.add(new Label(componentId, rowModel.getObject().getJobName()));}});- columns.add(new AbstractColumn<Build, Void>(Model.of(BuildConstants.FIELD_VERSION)) {+ columns.add(new AbstractColumn<Build, Void>(Model.of(BuildConstants.FIELD_NUMBER)) {@Overridepublic String getCssClass() {- return "version";+ return "number";}@Overridepublic void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,IModel<Build> rowModel) {- Fragment fragment = new Fragment(componentId, "versionFrag", BuildListPanel.this);+ Fragment fragment = new Fragment(componentId, "numberFrag", BuildListPanel.this);fragment.add(new BuildStatusIcon("status", rowModel));- ExternalLink link = new ExternalLink("link", rowModel.getObject().getUrl());- link.add(new Label("label", rowModel.getObject().getVersion()));+ Build build = rowModel.getObject();+ Link<Void> link = new BookmarkablePageLink<Void>("link", BuildDetailPage.class, BuildDetailPage.paramsOf(build));+ link.add(new Label("label", build.getNumber()));fragment.add(link);cellItem.add(fragment);}@@ -325,7 +327,7 @@ public abstract class BuildListPanel extends GenericPanel<String> {@Overridepublic void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,IModel<Build> rowModel) {- cellItem.add(new Label(componentId, DateUtils.formatAge(rowModel.getObject().getDate())));+ cellItem.add(new Label(componentId, DateUtils.formatAge(rowModel.getObject().getSubmitDate())));}});diff --git a/core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java b/core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.javaindex f2f95675e0..b777b3f7d1 100644--- a/core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java@@ -18,17 +18,17 @@ import io.onedev.server.OneDev;import io.onedev.server.ci.job.log.LogEntry;import io.onedev.server.ci.job.log.LogManager;import io.onedev.server.ci.job.log.LogSnippet;-import io.onedev.server.model.Build2;+import io.onedev.server.model.Build;import io.onedev.server.web.behavior.WebSocketObserver;@SuppressWarnings("serial")-public class BuildLogPanel extends GenericPanel<Build2> {+public class BuildLogPanel extends GenericPanel<Build> {private static final int MAX_LOG_ENTRIES = 5000;private int nextOffset;- public BuildLogPanel(String id, IModel<Build2> model) {+ public BuildLogPanel(String id, IModel<Build> model) {super(id, model);}@@ -62,7 +62,7 @@ public class BuildLogPanel extends GenericPanel<Build2> {@Overridepublic Collection<String> getObservables() {- return Sets.newHashSet(Build2.getLogWebSocketObservable(getBuild().getId()));+ return Sets.newHashSet(Build.getLogWebSocketObservable(getBuild().getId()));}});@@ -98,7 +98,7 @@ public class BuildLogPanel extends GenericPanel<Build2> {response.render(OnDomReadyHeaderItem.forScript(script));}- private Build2 getBuild() {+ private Build getBuild() {return getModelObject();}}diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildDetailPanel.html b/core/src/main/java/io/onedev/server/web/component/build/status/BuildDetailPanel.htmlindex 8d8ed084f0..9468bc64c2 100644--- a/core/src/main/java/io/onedev/server/web/component/build/status/BuildDetailPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/build/status/BuildDetailPanel.html@@ -5,11 +5,11 @@<td class="status"><span wicket:id="status" class="build-status"></span></td>- <td class="configuration">- <span wicket:id="configuration"></span>+ <td class="job">+ <span wicket:id="job"></span></td>- <td class="version">- <a wicket:id="version"><span wicket:id="label"></span></a>+ <td class="number">+ <a wicket:id="number"><span wicket:id="label"></span></a></td></tr></table>diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildDetailPanel.java b/core/src/main/java/io/onedev/server/web/component/build/status/BuildDetailPanel.javaindex e5f1cf8840..3d606a68a8 100644--- a/core/src/main/java/io/onedev/server/web/component/build/status/BuildDetailPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/status/BuildDetailPanel.java@@ -5,13 +5,15 @@ import java.util.List;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.ExternalLink;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import io.onedev.server.model.Build;+import io.onedev.server.web.page.project.builds2.detail.BuildDetailPage;@SuppressWarnings("serial")public class BuildDetailPanel extends GenericPanel<List<Build>> {@@ -26,10 +28,10 @@ public class BuildDetailPanel extends GenericPanel<List<Build>> {item.add(new BuildStatusIcon("status", item.getModel()));Build build = item.getModelObject();- item.add(new Label("configuration", build.getConfiguration().getName()));+ item.add(new Label("job", build.getJobName()));- ExternalLink link = new ExternalLink("version", build.getUrl());- link.add(new Label("label", build.getVersion()));+ Link<Void> link = new BookmarkablePageLink<Void>("number", BuildDetailPage.class, BuildDetailPage.paramsOf(build));+ link.add(new Label("label", "#" + build.getNumber()));item.add(link);}diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java b/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.javaindex 42cc29f7eb..a12465ccbc 100644--- a/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java+++ b/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java@@ -28,18 +28,27 @@ public class BuildStatusIcon extends GenericPanel<Build> {super.onComponentTag(tag);Build build = getModelObject();- if (build.getStatus() == Status.ERROR) {+ if (build.getStatus() == Status.WAITING) {+ tag.put("class", "build-status waiting fa fa-clock-o");+ tag.put("title", "Build is waiting");+ } else if (build.getStatus() == Status.QUEUEING) {+ tag.put("class", "build-status queueing fa fa-hourglass-1");+ tag.put("title", "Build is queueing");+ } else if (build.getStatus() == Status.IN_ERROR) {tag.put("class", "build-status error fa fa-warning");tag.put("title", "Build is in error");- } else if (build.getStatus() == Status.FAILURE) {+ } else if (build.getStatus() == Status.FAILED) {tag.put("class", "build-status failure fa fa-times");tag.put("title", "Build is failed");} else if (build.getStatus() == Status.RUNNING) {tag.put("class", "build-status running fa fa-circle");tag.put("title", "Build is running");- } else if (build.getStatus() == Status.SUCCESS) {+ } else if (build.getStatus() == Status.SUCCESSFUL) {tag.put("class", "build-status success fa fa-check");tag.put("title", "Build is successful");+ } else if (build.getStatus() == Status.CANCELLED) {+ tag.put("class", "build-status cancelled fa fa-ban");+ tag.put("title", "Build is cancelled");}}diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildsStatusPanel.java b/core/src/main/java/io/onedev/server/web/component/build/status/BuildsStatusPanel.javaindex 672f507383..042e28d76b 100644--- a/core/src/main/java/io/onedev/server/web/component/build/status/BuildsStatusPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/status/BuildsStatusPanel.java@@ -58,16 +58,25 @@ public class BuildsStatusPanel extends GenericPanel<List<Build>> {super.onComponentTag(tag);Collection<Build> builds = BuildsStatusPanel.this.getModelObject();- if (hasStatus(builds, Status.ERROR)) {+ if (hasStatus(builds, Status.IN_ERROR)) {tag.put("class", "build-status error fa fa-warning");tag.put("title", "Some builds are in error, click for details");- } else if (hasStatus(builds, Status.FAILURE)) {+ } else if (hasStatus(builds, Status.FAILED)) {tag.put("class", "build-status failure fa fa-times");tag.put("title", "Some builds are failed, click for details");+ } else if (hasStatus(builds, Status.CANCELLED)) {+ tag.put("class", "build-status failure fa fa-ban");+ tag.put("title", "Some builds are cancelled, click for details");+ } else if (hasStatus(builds, Status.WAITING)) {+ tag.put("class", "build-status waiting fa fa-clock-o");+ tag.put("title", "Some builds are waiting, click for details");+ } else if (hasStatus(builds, Status.QUEUEING)) {+ tag.put("class", "build-status queueing fa fa-hourglass-1");+ tag.put("title", "Some builds are queueing, click for details");} else if (hasStatus(builds, Status.RUNNING)) {tag.put("class", "build-status running fa fa-circle");tag.put("title", "Some builds are running, click for details");- } else if (hasStatus(builds, Status.SUCCESS)) {+ } else if (hasStatus(builds, Status.SUCCESSFUL)) {tag.put("class", "build-status success fa fa-check");tag.put("title", "Builds are successful, click for details");}diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildsPanel.html b/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildsPanel.htmlindex 99a9407061..8aa2b6026c 100644--- a/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildsPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildsPanel.html@@ -4,11 +4,11 @@<td class="status"><span wicket:id="status" class="build-status"></span></td>- <td class="configuration">- <span wicket:id="configuration"></span>+ <td class="job">+ <span wicket:id="job"></span></td>- <td class="version">- <a wicket:id="version"><span wicket:id="label"></span></a>+ <td class="number">+ <a wicket:id="number"><span wicket:id="label"></span></a></td></tr></table>diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildsPanel.java b/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildsPanel.javaindex 4e5a47dd84..2adc221ec5 100644--- a/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildsPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildsPanel.java@@ -11,7 +11,8 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.ExternalLink;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.GenericPanel;@@ -22,6 +23,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestBuild;+import io.onedev.server.web.page.project.builds2.detail.BuildDetailPage;import io.onedev.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")@@ -70,7 +72,7 @@ public class PullRequestBuildsPanel extends GenericPanel<PullRequest> {@Overrideprotected void populateItem(ListItem<PullRequestBuild> item) {PullRequestBuild build = item.getModelObject();- item.add(new Label("configuration", build.getConfiguration().getName()));+ item.add(new Label("job", build.getJobName()));if (build.getBuild() != null) {item.add(new BuildStatusIcon("status", new AbstractReadOnlyModel<Build>() {@@ -82,13 +84,13 @@ public class PullRequestBuildsPanel extends GenericPanel<PullRequest> {}));- ExternalLink link = new ExternalLink("version", build.getBuild().getUrl());- link.add(new Label("label", build.getBuild().getVersion()));+ Link<Void> link = new BookmarkablePageLink<Void>("number", BuildDetailPage.class, BuildDetailPage.paramsOf(build.getBuild()));+ link.add(new Label("label", "#" + build.getBuild().getNumber()));item.add(link);} else {WebMarkupContainer status = new WebMarkupContainer("status");- status.add(AttributeAppender.append("class", "awaiting fa fa-clock-o"));- status.add(AttributeAppender.append("title", "Waiting for build"));+ status.add(AttributeAppender.append("class", "pending fa fa-clock-o"));+ status.add(AttributeAppender.append("title", "Build pending"));item.add(status);WebMarkupContainer description = new WebMarkupContainer("version");description.add(new WebMarkupContainer("label"));diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/build.css b/core/src/main/java/io/onedev/server/web/component/build/status/build.cssindex bdd46b4282..84fb1b9416 100644--- a/core/src/main/java/io/onedev/server/web/component/build/status/build.css+++ b/core/src/main/java/io/onedev/server/web/component/build/status/build.css@@ -12,20 +12,20 @@ a.build {.build-detail table td.status {padding-right: 4px;}-.build-detail table td.configuration {+.build-detail table td.job {padding-left: 0;}-.build-status.success {+.build-status.successful {color: #06BC06 !important;}-.build-status.failure, .build-status.error {+.build-status.failed, .build-status.in_error, .build-status.cancelled {color: red !important;}-.build-status.running, .build-status.awaiting {+.build-status.running, .build-status.waiting, .build-status.queueing {color: #D2A906 !important;}-.pullrequest-builds .build-status.failure, .pullrequest-builds .build-status.running {+.pullrequest-builds .build-status.failed, .pullrequest-builds .build-status.running {padding-top: 2px;vertical-align: text-top;}@@ -40,7 +40,7 @@ a.build {font-size: 16px;width: 12px;}-.pullrequest-builds td.configuration {+.pullrequest-builds td.job {padding-left: 0;}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex f87c4e912b..fed3af23c9 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -2,13 +2,11 @@ package io.onedev.server.web.component.issue.fieldvalues;import javax.annotation.Nullable;-import org.apache.commons.lang.StringUtils;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.ExternalLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;@@ -40,14 +38,13 @@ import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.builds2.detail.BuildDetailPage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;@SuppressWarnings("serial")public abstract class FieldValuesPanel extends Panel implements EditContext {- private static final int MAX_BUILD_NAME_LEN = 30;-public FieldValuesPanel(String id) {super(id);}@@ -87,8 +84,8 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {Build build = OneDev.getInstance(BuildManager.class).get(Long.valueOf(value));if (build != null) {Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);- ExternalLink link = new ExternalLink("link", build.getUrl());- link.add(new Label("label", StringUtils.abbreviate(build.getVersion(), MAX_BUILD_NAME_LEN)));+ Link<Void> link = new BookmarkablePageLink<Void>("link", BuildDetailPage.class, BuildDetailPage.paramsOf(build));+ link.add(new Label("label", "#" + build.getNumber()));linkFrag.add(link);item.add(linkFrag);} else {diff --git a/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationMultiChoice.java b/core/src/main/java/io/onedev/server/web/component/jobchoice/JobMultiChoice.javasimilarity index 67%rename from core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationMultiChoice.javarename to core/src/main/java/io/onedev/server/web/component/jobchoice/JobMultiChoice.javaindex 42012de800..12e3cc4324 100644--- a/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationMultiChoice.java+++ b/core/src/main/java/io/onedev/server/web/component/jobchoice/JobMultiChoice.java@@ -1,11 +1,9 @@-package io.onedev.server.web.component.configuration;+package io.onedev.server.web.component.jobchoice;import java.util.Collection;-import java.util.Collections;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import java.util.stream.Collectors;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;@@ -15,11 +13,11 @@ import io.onedev.server.web.component.stringchoice.StringChoiceProvider;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.util.WicketUtils;-public class ConfigurationMultiChoice extends Select2MultiChoice<String> {+public class JobMultiChoice extends Select2MultiChoice<String> {private static final long serialVersionUID = 1L;- public ConfigurationMultiChoice(String id, IModel<Collection<String>> model) {+ public JobMultiChoice(String id, IModel<Collection<String>> model) {super(id, model, new StringChoiceProvider(new LoadableDetachableModel<Map<String, String>>() {private static final long serialVersionUID = 1L;@@ -29,11 +27,9 @@ public class ConfigurationMultiChoice extends Select2MultiChoice<String> {Map<String, String> choices = new LinkedHashMap<>();if (WicketUtils.getPage() instanceof ProjectPage) {ProjectPage projectPage = (ProjectPage) WicketUtils.getPage();- List<String> configurations = projectPage.getProject().getConfigurations()- .stream().map(it->it.getName()).collect(Collectors.toList());- Collections.sort(configurations);- for (String configuration: configurations)- choices.put(configuration, configuration);+ List<String> jobNames = projectPage.getProject().getJobNames();+ for (String jobName: jobNames)+ choices.put(jobName, jobName);}return choices;}@@ -45,7 +41,7 @@ public class ConfigurationMultiChoice extends Select2MultiChoice<String> {protected void onInitialize() {super.onInitialize();if (isRequired())- getSettings().setPlaceholder("Choose configurations...");+ getSettings().setPlaceholder("Choose jobs...");getSettings().setFormatResult("onedev.server.choiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.choiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.choiceFormatter.escapeMarkup");diff --git a/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationSingleChoice.java b/core/src/main/java/io/onedev/server/web/component/jobchoice/JobSingleChoice.javasimilarity index 67%rename from core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationSingleChoice.javarename to core/src/main/java/io/onedev/server/web/component/jobchoice/JobSingleChoice.javaindex 96642b59ef..c4a92fddfc 100644--- a/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationSingleChoice.java+++ b/core/src/main/java/io/onedev/server/web/component/jobchoice/JobSingleChoice.java@@ -1,10 +1,8 @@-package io.onedev.server.web.component.configuration;+package io.onedev.server.web.component.jobchoice;-import java.util.Collections;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import java.util.stream.Collectors;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;@@ -14,11 +12,11 @@ import io.onedev.server.web.component.stringchoice.StringChoiceProvider;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.util.WicketUtils;-public class ConfigurationSingleChoice extends Select2Choice<String> {+public class JobSingleChoice extends Select2Choice<String> {private static final long serialVersionUID = 1L;- public ConfigurationSingleChoice(String id, IModel<String> model) {+ public JobSingleChoice(String id, IModel<String> model) {super(id, model, new StringChoiceProvider(new LoadableDetachableModel<Map<String, String>>() {private static final long serialVersionUID = 1L;@@ -28,11 +26,9 @@ public class ConfigurationSingleChoice extends Select2Choice<String> {Map<String, String> choices = new LinkedHashMap<>();if (WicketUtils.getPage() instanceof ProjectPage) {ProjectPage projectPage = (ProjectPage) WicketUtils.getPage();- List<String> configurations = projectPage.getProject().getConfigurations()- .stream().map(it->it.getName()).collect(Collectors.toList());- Collections.sort(configurations);- for (String configuration: configurations)- choices.put(configuration, configuration);+ List<String> jobNames = projectPage.getProject().getJobNames();+ for (String jobName: jobNames)+ choices.put(jobName, jobName);}return choices;}@@ -44,7 +40,7 @@ public class ConfigurationSingleChoice extends Select2Choice<String> {protected void onInitialize() {super.onInitialize();if (isRequired())- getSettings().setPlaceholder("Choose configuration...");+ getSettings().setPlaceholder("Choose job...");getSettings().setFormatResult("onedev.server.choiceFormatter.formatResult");getSettings().setFormatSelection("onedev.server.choiceFormatter.formatSelection");getSettings().setEscapeMarkup("onedev.server.choiceFormatter.escapeMarkup");diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/ConfigurationChoice.java b/core/src/main/java/io/onedev/server/web/editable/annotation/JobChoice.javasimilarity index 87%rename from core/src/main/java/io/onedev/server/web/editable/annotation/ConfigurationChoice.javarename to core/src/main/java/io/onedev/server/web/editable/annotation/JobChoice.javaindex 5f9b2cbc70..924edbb1f3 100644--- a/core/src/main/java/io/onedev/server/web/editable/annotation/ConfigurationChoice.java+++ b/core/src/main/java/io/onedev/server/web/editable/annotation/JobChoice.java@@ -7,5 +7,5 @@ import java.lang.annotation.Target;@Target(ElementType.METHOD)@Retention(RetentionPolicy.RUNTIME)-public @interface ConfigurationChoice {+public @interface JobChoice {}diff --git a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationMultiChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationMultiChoiceEditor.htmldeleted file mode 100644index f1c90cbe9e..0000000000--- a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationMultiChoiceEditor.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:panel>- <input wicket:id="input" type="hidden"></input>-</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationSingleChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationSingleChoiceEditor.htmldeleted file mode 100644index f1c90cbe9e..0000000000--- a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationSingleChoiceEditor.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:panel>- <input wicket:id="input" type="hidden"></input>-</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobChoiceEditSupport.javasimilarity index 71%rename from core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationEditSupport.javarename to core/src/main/java/io/onedev/server/web/editable/jobchoice/JobChoiceEditSupport.javaindex dabfe7c14d..f7e9a3f2f8 100644--- a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobChoiceEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.configuration;+package io.onedev.server.web.editable.jobchoice;import java.lang.reflect.Method;import java.util.List;@@ -15,16 +15,16 @@ import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyViewer;-import io.onedev.server.web.editable.annotation.ConfigurationChoice;+import io.onedev.server.web.editable.annotation.JobChoice;@SuppressWarnings("serial")-public class ConfigurationEditSupport implements EditSupport {+public class JobChoiceEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {Method propertyGetter = descriptor.getPropertyGetter();- ConfigurationChoice configurationChoice = propertyGetter.getAnnotation(ConfigurationChoice.class);- if (configurationChoice != null) {+ JobChoice jobChoice = propertyGetter.getAnnotation(JobChoice.class);+ if (jobChoice != null) {if (List.class.isAssignableFrom(propertyGetter.getReturnType())&& ReflectionUtils.getCollectionElementType(propertyGetter.getGenericReturnType()) == String.class) {return new PropertyContext<List<String>>(descriptor) {@@ -35,9 +35,9 @@ public class ConfigurationEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- List<String> configurations = model.getObject();- if (configurations != null && !configurations.isEmpty()) {- return new Label(id, StringUtils.join(configurations, ", " ));+ List<String> jobNames = model.getObject();+ if (jobNames != null && !jobNames.isEmpty()) {+ return new Label(id, StringUtils.join(jobNames, ", " ));} else {return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}@@ -48,7 +48,7 @@ public class ConfigurationEditSupport implements EditSupport {@Overridepublic PropertyEditor<List<String>> renderForEdit(String componentId, IModel<List<String>> model) {- return new ConfigurationMultiChoiceEditor(componentId, descriptor, model);+ return new JobMultiChoiceEditor(componentId, descriptor, model);}};@@ -61,9 +61,9 @@ public class ConfigurationEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- String configurationName = model.getObject();- if (configurationName != null) {- return new Label(id, configurationName);+ String jobName = model.getObject();+ if (jobName != null) {+ return new Label(id, jobName);} else {return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}@@ -74,12 +74,12 @@ public class ConfigurationEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new ConfigurationSingleChoiceEditor(componentId, descriptor, model);+ return new JobSingleChoiceEditor(componentId, descriptor, model);}};} else {- throw new RuntimeException("Annotation 'ConfigurationChoice' should be applied to property with type "+ throw new RuntimeException("Annotation 'JobChoice' should be applied to property with type "+ "'List<String> or String'");}} else {diff --git a/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobMultiChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobMultiChoiceEditor.htmlnew file mode 100644index 0000000000..3817227265--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobMultiChoiceEditor.html@@ -0,0 +1,3 @@+<wicket:panel>+ <input wicket:id="input" type="hidden">+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobMultiChoiceEditor.javasimilarity index 68%rename from core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationMultiChoiceEditor.javarename to core/src/main/java/io/onedev/server/web/editable/jobchoice/JobMultiChoiceEditor.javaindex 9df166c18e..24cc530243 100644--- a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobMultiChoiceEditor.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.configuration;+package io.onedev.server.web.editable.jobchoice;import java.util.ArrayList;import java.util.Collection;@@ -8,18 +8,18 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import io.onedev.server.web.component.configuration.ConfigurationMultiChoice;+import io.onedev.server.web.component.jobchoice.JobMultiChoice;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@SuppressWarnings("serial")-public class ConfigurationMultiChoiceEditor extends PropertyEditor<List<String>> {+public class JobMultiChoiceEditor extends PropertyEditor<List<String>> {- private ConfigurationMultiChoice input;+ private JobMultiChoice input;- public ConfigurationMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor,+ public JobMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor,IModel<List<String>> propertyModel) {super(id, propertyDescriptor, propertyModel);}@@ -28,13 +28,13 @@ public class ConfigurationMultiChoiceEditor extends PropertyEditor<List<String>>protected void onInitialize() {super.onInitialize();- List<String> configurations;+ List<String> jobNames;if (getModelObject() != null)- configurations = getModelObject();+ jobNames = getModelObject();else- configurations = new ArrayList<>();+ jobNames = new ArrayList<>();- input = new ConfigurationMultiChoice("input", Model.of(configurations));+ input = new JobMultiChoice("input", Model.of(jobNames));input.setConvertEmptyInputStringToNull(true);input.setLabel(Model.of(getDescriptor().getDisplayName(this)));diff --git a/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobSingleChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobSingleChoiceEditor.htmlnew file mode 100644index 0000000000..3817227265--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobSingleChoiceEditor.html@@ -0,0 +1,3 @@+<wicket:panel>+ <input wicket:id="input" type="hidden">+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobSingleChoiceEditor.javasimilarity index 68%rename from core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationSingleChoiceEditor.javarename to core/src/main/java/io/onedev/server/web/editable/jobchoice/JobSingleChoiceEditor.javaindex 265f5a4bfe..375969a260 100644--- a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobSingleChoiceEditor.java@@ -1,21 +1,21 @@-package io.onedev.server.web.editable.configuration;+package io.onedev.server.web.editable.jobchoice;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import io.onedev.server.web.component.configuration.ConfigurationSingleChoice;+import io.onedev.server.web.component.jobchoice.JobSingleChoice;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@SuppressWarnings("serial")-public class ConfigurationSingleChoiceEditor extends PropertyEditor<String> {+public class JobSingleChoiceEditor extends PropertyEditor<String> {- private ConfigurationSingleChoice input;+ private JobSingleChoice input;- public ConfigurationSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,+ public JobSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,IModel<String> propertyModel) {super(id, propertyDescriptor, propertyModel);}@@ -24,7 +24,7 @@ public class ConfigurationSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- input = new ConfigurationSingleChoice("input", Model.of(getModelObject()));+ input = new JobSingleChoice("input", Model.of(getModelObject()));input.setConvertEmptyInputStringToNull(true);input.setLabel(Model.of(getDescriptor().getDisplayName(this)));diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex ceda4d4a37..799dc50b06 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -45,8 +45,6 @@ import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.branches.ProjectBranchesPage;import io.onedev.server.web.page.project.builds.BuildListPage;-import io.onedev.server.web.page.project.builds2.detail.BuildDetailPage;-import io.onedev.server.web.page.project.builds2.list.BuildListPage2;import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;@@ -66,9 +64,6 @@ import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizatimport io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;import io.onedev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage;-import io.onedev.server.web.page.project.setting.configuration.ConfigurationEditPage;-import io.onedev.server.web.page.project.setting.configuration.ConfigurationListPage;-import io.onedev.server.web.page.project.setting.configuration.NewConfigurationPage;import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;import io.onedev.server.web.page.project.setting.issue.PromptFieldsUponIssueOpenSettingPage;import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;@@ -282,21 +277,6 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {});- tabs.add(new ProjectTab(Model.of("Builds2"), "fa fa-fw fa-cubes", 0, BuildListPage2.class, BuildDetailPage.class) {-- @Override- public Component render(String componentId) {- return new ProjectTabLink(componentId, this) {-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, BuildListPage2.class, BuildListPage2.paramsOf(getProject()));- }- };- }-- });-if (SecurityUtils.canReadCode(getProject().getFacade())) {tabs.add(new ProjectTab(Model.of("Code Comments"), "fa fa-fw fa-comments",0, ProjectCodeCommentsPage.class) {@@ -382,8 +362,6 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {tabs.add(new ProjectSettingTab("Issue Setting", "fa fa-fw fa-bug", StateTransitionsPage.class, PromptFieldsUponIssueOpenSettingPage.class));tabs.add(new ProjectSettingTab("Commit Message Transform", "fa fa-fw fa-comments", CommitMessageTransformPage.class));tabs.add(new ProjectSettingTab("Web Hooks", "fa fa-fw fa-volume-up", WebHooksPage.class));- tabs.add(new ProjectSettingTab("Build Configurations", "fa fa-fw fa-cube", ConfigurationListPage.class,- NewConfigurationPage.class, ConfigurationEditPage.class));return tabs;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds2/detail/BuildDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/builds2/detail/BuildDetailPage.javaindex c9e4cf864f..333e61f6df 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds2/detail/BuildDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/builds2/detail/BuildDetailPage.java@@ -8,8 +8,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.Build2Manager;-import io.onedev.server.model.Build2;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.model.Build;import io.onedev.server.web.component.build.log.BuildLogPanel;import io.onedev.server.web.page.project.ProjectPage;@@ -18,17 +18,17 @@ public class BuildDetailPage extends ProjectPage {public static final String PARAM_BUILD = "build";- private final IModel<Build2> buildModel;+ private final IModel<Build> buildModel;public BuildDetailPage(PageParameters params) {super(params);- buildModel = new LoadableDetachableModel<Build2>() {+ buildModel = new LoadableDetachableModel<Build>() {@Override- protected Build2 load() {+ protected Build load() {Long buildNumber = params.get(PARAM_BUILD).toLong();- Build2 build = OneDev.getInstance(Build2Manager.class).find(getProject(), buildNumber);+ Build build = OneDev.getInstance(BuildManager.class).find(getProject(), buildNumber);if (build == null)throw new EntityNotFoundException("Unable to find build #" + buildNumber + " in project " + getProject());return build;@@ -45,7 +45,7 @@ public class BuildDetailPage extends ProjectPage {add(new BuildLogPanel("log", buildModel));}- private Build2 getBuild() {+ private Build getBuild() {return buildModel.getObject();}@@ -55,7 +55,7 @@ public class BuildDetailPage extends ProjectPage {super.onDetach();}- public static PageParameters paramsOf(Build2 build) {+ public static PageParameters paramsOf(Build build) {PageParameters params = ProjectPage.paramsOf(build.getProject());params.add(PARAM_BUILD, build.getNumber());return params;diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds2/list/BuildListPage2.html b/core/src/main/java/io/onedev/server/web/page/project/builds2/list/BuildListPage2.htmldeleted file mode 100644index 3480d57028..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/builds2/list/BuildListPage2.html+++ /dev/null@@ -1,10 +0,0 @@-<wicket:extend>- <table wicket:id="builds" class="table table-hover"></table>- <wicket:fragment wicket:id="linkFrag">- <a wicket:id="link"><span wicket:id="label"></span></a>- </wicket:fragment>- <wicket:fragment wicket:id="actionsFrag">- <a wicket:id="rebuild">rebuild</a>- <a wicket:id="cancel">cancel</a>- </wicket:fragment>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/builds2/list/BuildListPage2.java b/core/src/main/java/io/onedev/server/web/page/project/builds2/list/BuildListPage2.javadeleted file mode 100644index ddd6fdbe24..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/builds2/list/BuildListPage2.java+++ /dev/null@@ -1,198 +0,0 @@-package io.onedev.server.web.page.project.builds2.list;--import java.util.ArrayList;-import java.util.Iterator;-import java.util.List;--import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DefaultDataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;--import io.onedev.commons.utils.StringUtils;-import io.onedev.server.OneDev;-import io.onedev.server.ci.job.JobScheduler;-import io.onedev.server.entitymanager.Build2Manager;-import io.onedev.server.model.Build2;-import io.onedev.server.model.BuildDependence;-import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.web.WebConstants;-import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;-import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.builds2.detail.BuildDetailPage;--@SuppressWarnings("serial")-public class BuildListPage2 extends ProjectPage {-- public BuildListPage2(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- List<IColumn<Build2, Void>> columns = new ArrayList<>();-- columns.add(new AbstractColumn<Build2, Void>(Model.of("#")) {-- @Override- public void populateItem(Item<ICellPopulator<Build2>> cellItem, String componentId,- IModel<Build2> rowModel) {- Build2 build = rowModel.getObject();- Fragment fragment = new Fragment(componentId, "linkFrag", BuildListPage2.this);- Link<Void> link = new BookmarkablePageLink<Void>("link", BuildDetailPage.class,- BuildDetailPage.paramsOf(build));- link.add(new Label("label", build.getNumber()));- fragment.add(link);- cellItem.add(fragment);- }- });-- columns.add(new AbstractColumn<Build2, Void>(Model.of("Status")) {-- @Override- public void populateItem(Item<ICellPopulator<Build2>> cellItem, String componentId,- IModel<Build2> rowModel) {- Build2 build = rowModel.getObject();- cellItem.add(new Label(componentId, build.getStatus()));- }- });-- columns.add(new AbstractColumn<Build2, Void>(Model.of("Error Message")) {-- @Override- public void populateItem(Item<ICellPopulator<Build2>> cellItem, String componentId,- IModel<Build2> rowModel) {- Build2 build = rowModel.getObject();- cellItem.add(new Label(componentId, build.getStatusMessage()));- }- });-- columns.add(new AbstractColumn<Build2, Void>(Model.of("Commit")) {-- @Override- public void populateItem(Item<ICellPopulator<Build2>> cellItem, String componentId,- IModel<Build2> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getCommitHash()));- }- });-- columns.add(new AbstractColumn<Build2, Void>(Model.of("Job")) {-- @Override- public void populateItem(Item<ICellPopulator<Build2>> cellItem, String componentId,- IModel<Build2> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getJobName()));- }- });-- columns.add(new AbstractColumn<Build2, Void>(Model.of("Params")) {-- @Override- public void populateItem(Item<ICellPopulator<Build2>> cellItem, String componentId,- IModel<Build2> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getParamMap().toString()));- }- });-- columns.add(new AbstractColumn<Build2, Void>(Model.of("Dependencies")) {-- @Override- public void populateItem(Item<ICellPopulator<Build2>> cellItem, String componentId,- IModel<Build2> rowModel) {- List<String> dependencyIds = new ArrayList<>();- for (BuildDependence dependence: rowModel.getObject().getDependencies())- dependencyIds.add(dependence.getDependency().getNumberStr());- cellItem.add(new Label(componentId, StringUtils.join(dependencyIds, ", ")));- }- });-- columns.add(new AbstractColumn<Build2, Void>(Model.of("Actions")) {-- @Override- public void populateItem(Item<ICellPopulator<Build2>> cellItem, String componentId,- IModel<Build2> rowModel) {- Fragment fragment = new Fragment(componentId, "actionsFrag", BuildListPage2.this);- fragment.add(new Link<Void>("rebuild") {-- @Override- public void onClick() {- OneDev.getInstance(JobScheduler.class).resubmit(rowModel.getObject());- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(rowModel.getObject().isFinished());- }-- });- fragment.add(new Link<Void>("cancel") {-- @Override- public void onClick() {- OneDev.getInstance(JobScheduler.class).cancel(rowModel.getObject());- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!rowModel.getObject().isFinished());- }-- });- cellItem.add(fragment);- }- });-- SortableDataProvider<Build2, Void> dataProvider = new LoadableDetachableDataProvider<Build2, Void>() {-- @Override- public Iterator<? extends Build2> iterator(long first, long count) {- EntityCriteria<Build2> criteria = getCriteria();- criteria.addOrder(Order.desc("number"));- return OneDev.getInstance(Build2Manager.class).query(criteria, (int)first, (int)count).iterator();- }-- private EntityCriteria<Build2> getCriteria() {- EntityCriteria<Build2> criteria = EntityCriteria.of(Build2.class);- criteria.add(Restrictions.eq("project", getProject()));- return criteria;- }-- @Override- public long calcSize() {- return OneDev.getInstance(Build2Manager.class).count(getCriteria());- }-- @Override- public IModel<Build2> model(Build2 object) {- Long id = object.getId();- return new LoadableDetachableModel<Build2>() {-- @Override- protected Build2 load() {- return OneDev.getInstance(Build2Manager.class).load(id);- }-- };- }- };-- add(new DefaultDataTable<Build2, Void>("builds", columns, dataProvider, WebConstants.PAGE_SIZE));- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 6b9478457d..a7790c6ab2 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -453,7 +453,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {fragment.add(new ReviewListPanel("reviews", requestModel));BranchProtection protection = request.getTargetProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());- if (protection != null && !protection.getConfigurations().isEmpty() && protection.isBuildMerges()) {+ if (protection != null && !protection.getJobNames().isEmpty() && protection.isBuildMerges()) {fragment.add(new Label("buildsTitle", "Builds (On Merged Commit)"));} else {fragment.add(new Label("buildsTitle", "Builds"));diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.htmldeleted file mode 100644index 7f413b6cce..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.html+++ /dev/null@@ -1,10 +0,0 @@-<wicket:extend>- <div class="page-title">Edit Configuration</div>- <form wicket:id="form" class="leave-confirm">- <div wicket:id="editor"></div>- <div class="actions clearfix">- <input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit">- <a wicket:id="delete" class="delete btn btn-danger pull-right">Delete</a>- </div>- </form>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.javadeleted file mode 100644index d1ae1f80d0..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.java+++ /dev/null@@ -1,89 +0,0 @@-package io.onedev.server.web.page.project.setting.configuration;--import org.apache.wicket.Session;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ConfigurationManager;-import io.onedev.server.model.Configuration;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;-import io.onedev.server.web.page.project.setting.ProjectSettingPage;-import io.onedev.server.web.util.ConfirmOnClick;--@SuppressWarnings("serial")-public class ConfigurationEditPage extends ProjectSettingPage {-- private static final String PARAM_CONFIGURATION = "configuration";-- private final Long configurationId;-- private final String oldName;-- public ConfigurationEditPage(PageParameters params) {- super(params);-- configurationId = params.get(PARAM_CONFIGURATION).toLong();- oldName = getConfiguration().getName();- }-- private ConfigurationManager getConfigurationManager() {- return OneDev.getInstance(ConfigurationManager.class);- }-- private Configuration getConfiguration() {- return getConfigurationManager().load(configurationId);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Configuration configuration = getConfiguration();- BeanEditor editor = BeanContext.editBean("editor", configuration);-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- Configuration configurationWithSameName = getConfigurationManager().find(getProject(), configuration.getName());- if (configurationWithSameName != null && !configurationWithSameName.equals(configuration)) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another configuration in the project");- }- if (!editor.hasErrors(true)) {- Configuration reloaded = getConfiguration();- editor.getBeanDescriptor().copyProperties(configuration, reloaded);- getConfigurationManager().save(reloaded, oldName);- setResponsePage(ConfigurationListPage.class, ConfigurationListPage.paramsOf(getProject()));- Session.get().success("Configuration updated");- }- }-- };- form.add(editor);-- form.add(new Link<Void>("delete") {-- @Override- public void onClick() {- getConfigurationManager().delete(getConfiguration());- setResponsePage(ConfigurationListPage.class, ConfigurationListPage.paramsOf(getProject()));- }-- }.add(new ConfirmOnClick("Do you really want to delete this configuration?")));-- add(form);- }-- public static PageParameters paramsOf(Configuration configuration) {- PageParameters params = paramsOf(configuration.getProject());- params.add(PARAM_CONFIGURATION, configuration.getId());- return params;- }-}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.htmldeleted file mode 100644index 2ba7fb194a..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.html+++ /dev/null@@ -1,23 +0,0 @@-<wicket:extend>- <div class="page-title">Build Configurations</div>- <div class="configuration list">- <div class="head clearfix">- <div class="pull-left clearable-wrapper">- <input wicket:id="filterConfigurations" class="form-control search" placeholder="Filter by name">- </div>- <div class="pull-left">- <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Create</a>- </div>- </div>- <div class="body">- <table wicket:id="configurations" class="configurations table table-hover"></table>- </div>- </div>- <wicket:fragment wicket:id="nameFrag">- <a wicket:id="link"><span wicket:id="label"></span></a>- </wicket:fragment>- <wicket:fragment wicket:id="actionFrag">- <a wicket:id="delete" title="Delete this configuration"><i class="fa fa-trash"></i></a>- <a wicket:id="cleanup" title="Cleanup builds according to build cleanup strategy"><i class="fa fa-eraser"></i></a>- </wicket:fragment>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.javadeleted file mode 100644index 90e970c148..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.java+++ /dev/null@@ -1,236 +0,0 @@-package io.onedev.server.web.page.project.setting.configuration;--import java.util.ArrayList;-import java.util.Iterator;-import java.util.List;--import javax.annotation.Nullable;--import org.apache.commons.lang.StringUtils;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entitymanager.ConfigurationManager;-import io.onedev.server.model.Configuration;-import io.onedev.server.model.Project;-import io.onedev.server.model.support.configuration.DoNotCleanup;-import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.WebConstants;-import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;-import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;-import io.onedev.server.web.page.project.setting.ProjectSettingPage;-import io.onedev.server.web.util.ConfirmOnClick;-import io.onedev.server.web.util.PagingHistorySupport;-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;--@SuppressWarnings("serial")-public class ConfigurationListPage extends ProjectSettingPage {-- private static final String PARAM_CURRENT_PAGE = "currentPage";-- private static final String PARAM_QUERY = "query";-- private DataTable<Configuration, Void> configurationsTable;-- private String query;-- public ConfigurationListPage(PageParameters params) {- super(params);- query = params.get(PARAM_QUERY).toString();- }-- private EntityCriteria<Configuration> getCriteria() {- EntityCriteria<Configuration> criteria = EntityCriteria.of(Configuration.class);- criteria.add(Restrictions.eq("project", getProject()));- if (query != null)- criteria.add(Restrictions.ilike("name", query, MatchMode.ANYWHERE));- return criteria;- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.isAdministrator();- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;- add(searchField = new TextField<String>("filterConfigurations", Model.of(query)));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- query = searchField.getInput();- if (StringUtils.isBlank(query))- query = null;- target.add(configurationsTable);- }-- });-- add(new Link<Void>("addNew") {-- @Override- public void onClick() {- setResponsePage(NewConfigurationPage.class, NewConfigurationPage.paramsOf(getProject()));- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.isAdministrator());- }-- });-- List<IColumn<Configuration, Void>> columns = new ArrayList<>();-- columns.add(new AbstractColumn<Configuration, Void>(Model.of("Name")) {-- @Override- public void populateItem(Item<ICellPopulator<Configuration>> cellItem, String componentId,- IModel<Configuration> rowModel) {- Fragment fragment = new Fragment(componentId, "nameFrag", ConfigurationListPage.this);- Configuration configuration = rowModel.getObject();- Link<Void> link = new BookmarkablePageLink<Void>("link", ConfigurationEditPage.class,- ConfigurationEditPage.paramsOf(configuration));- link.add(new Label("label", configuration.getName()));- fragment.add(link);- cellItem.add(fragment);- }-- });-- columns.add(new AbstractColumn<Configuration, Void>(Model.of("Actions")) {-- @Override- public void populateItem(Item<ICellPopulator<Configuration>> cellItem, String componentId, IModel<Configuration> rowModel) {- Fragment fragment = new Fragment(componentId, "actionFrag", ConfigurationListPage.this);-- Configuration configuration = rowModel.getObject();-- fragment.add(new Link<Void>("delete") {-- @Override- public void onClick() {- OneDev.getInstance(ConfigurationManager.class).delete(rowModel.getObject());- setResponsePage(ConfigurationListPage.class, ConfigurationListPage.paramsOf(getProject()));- }-- }.add(new ConfirmOnClick("Do you really want to delete configuration '" + configuration.getName() + "'?")));-- fragment.add(new AjaxLink<Void>("cleanup") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- String message = "Do you really want to clean up builds of configuration '" + configuration.getName() + "'?";- attributes.getAjaxCallListeners().add(new ConfirmListener(message));- }-- @Override- public void onClick(AjaxRequestTarget target) {- OneDev.getInstance(BuildManager.class).cleanupBuilds(rowModel.getObject());- Session.get().success("Builds cleaned up");- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!(rowModel.getObject().getBuildCleanupRule() instanceof DoNotCleanup));- }-- });-- cellItem.add(fragment);- }-- @Override- public String getCssClass() {- return "actions";- }-- });-- SortableDataProvider<Configuration, Void> dataProvider = new LoadableDetachableDataProvider<Configuration, Void>() {-- @Override- public Iterator<? extends Configuration> iterator(long first, long count) {- EntityCriteria<Configuration> criteria = getCriteria();- criteria.addOrder(Order.asc("name"));- return OneDev.getInstance(ConfigurationManager.class).query(criteria, (int)first, (int)count).iterator();- }-- @Override- public long calcSize() {- return OneDev.getInstance(ConfigurationManager.class).count(getCriteria());- }-- @Override- public IModel<Configuration> model(Configuration object) {- Long id = object.getId();- return new LoadableDetachableModel<Configuration>() {-- @Override- protected Configuration load() {- return OneDev.getInstance(ConfigurationManager.class).load(id);- }-- };- }- };-- PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {-- @Override- public PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(getProject(), query);- params.add(PARAM_CURRENT_PAGE, currentPage+1);- return params;- }-- @Override- public int getCurrentPage() {- return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;- }-- };-- add(configurationsTable = new HistoryAwareDataTable<Configuration, Void>("configurations", columns, dataProvider,- WebConstants.PAGE_SIZE, pagingHistorySupport));- }-- 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/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/NewConfigurationPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/NewConfigurationPage.htmldeleted file mode 100644index 8692412269..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/NewConfigurationPage.html+++ /dev/null@@ -1,11 +0,0 @@-<wicket:extend>- <div class="page-title">New Configuration</div>- <div id="new-configuration">- <form wicket:id="form" class="leave-confirm">- <div wicket:id="editor"></div>- <div class="actions">- <input class="btn btn-primary dirty-aware pull-left" value="Save" type="submit">- </div>- </form>- </div>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/NewConfigurationPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/NewConfigurationPage.javadeleted file mode 100644index f29c715432..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/NewConfigurationPage.java+++ /dev/null@@ -1,61 +0,0 @@-package io.onedev.server.web.page.project.setting.configuration;--import org.apache.wicket.Session;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ConfigurationManager;-import io.onedev.server.model.Configuration;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathElement;-import io.onedev.server.web.page.project.setting.ProjectSettingPage;--@SuppressWarnings("serial")-public class NewConfigurationPage extends ProjectSettingPage {-- private Configuration configuration = new Configuration();-- public NewConfigurationPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- BeanEditor editor = BeanContext.editBean("editor", configuration);-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- ConfigurationManager configurationManager = OneDev.getInstance(ConfigurationManager.class);- Configuration configurationWithSameName = configurationManager.find(getProject(), configuration.getName());- if (configurationWithSameName != null) {- editor.getErrorContext(new PathElement.Named("name"))- .addError("This name has already been used by another configuration in the project");- }- if (!editor.hasErrors(true)) {- configuration.setProject(getProject());- configurationManager.save(configuration, null);- Session.get().success("Configuration created");- setResponsePage(ConfigurationListPage.class, ConfigurationListPage.paramsOf(getProject()));- }- }-- };- form.add(editor);- add(form);- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.isAdministrator();- }--}diff --git a/core/src/main/java/io/onedev/server/web/stream/BuildLogStreamResource.java b/core/src/main/java/io/onedev/server/web/stream/BuildLogStreamResource.javaindex 55dcc1fb8d..58c5e3aed8 100644--- a/core/src/main/java/io/onedev/server/web/stream/BuildLogStreamResource.java+++ b/core/src/main/java/io/onedev/server/web/stream/BuildLogStreamResource.java@@ -18,9 +18,9 @@ import com.google.common.base.Charsets;import io.onedev.server.OneDev;import io.onedev.server.ci.job.log.LogManager;-import io.onedev.server.entitymanager.Build2Manager;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.Build2;+import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;@@ -53,7 +53,7 @@ public class BuildLogStreamResource extends AbstractResource {if (buildNumber == null)throw new IllegalArgumentException("build number has to be specified");- Build2 build = OneDev.getInstance(Build2Manager.class).find(project, buildNumber);+ Build build = OneDev.getInstance(BuildManager.class).find(project, buildNumber);if (build == null) {String message = String.format("Unable to find build (project: %s, build number: %d)",diff --git a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex 115b4b4f13..0e8dc492d6 100644--- a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -1,7 +1,6 @@package io.onedev.server.web.util;import java.util.ArrayList;-import java.util.Comparator;import java.util.HashMap;import java.util.HashSet;import java.util.LinkedHashMap;@@ -9,11 +8,8 @@ import java.util.List;import java.util.Map;import java.util.Set;-import org.apache.commons.lang3.StringUtils;-import com.google.common.base.Preconditions;-import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.Range;import io.onedev.commons.utils.stringmatch.PatternApplied;@@ -34,7 +30,6 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.facade.ConfigurationFacade;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;@@ -116,24 +111,15 @@ public class SuggestionUtils {return suggestions;}- public static List<InputSuggestion> suggestBuilds(Project project, String matchWith, boolean withConfiguration) {+ public static List<InputSuggestion> suggestBuilds(Project project, String matchWith) {matchWith = matchWith.toLowerCase();+ if (matchWith.startsWith("#"))+ matchWith = matchWith.substring(1);List<InputSuggestion> suggestions = new ArrayList<>();for (Build build: OneDev.getInstance(BuildManager.class).query(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS)) {InputSuggestion suggestion;- if (withConfiguration) {- if (matchWith.contains(Build.FQN_SEPARATOR))- matchWith = StringUtils.substringAfter(matchWith, Build.FQN_SEPARATOR);- Range match = Range.match(build.getVersion(), matchWith, true, false, true);- if (match != null) {- int offset = build.getConfiguration().getName().length()+1;- match = new Range(match.getFrom() + offset, match.getTo() + offset);- }- suggestion = new InputSuggestion(build.getFQN(), null, match);- } else {- Range match = Range.match(build.getVersion(), matchWith, true, false, true);- suggestion = new InputSuggestion(build.getVersion(), null, match);- }+ Range match = Range.match(build.getNumberStr(), matchWith, true, false, true);+ suggestion = new InputSuggestion(build.getNumberStr(), null, match);suggestions.add(suggestion);}return suggestions;@@ -171,24 +157,13 @@ public class SuggestionUtils {return suggestPaths(commitInfoManager.getFiles(project), matchWith);}- public static List<InputSuggestion> suggestConfigurations(Project project, String matchWith) {+ public static List<InputSuggestion> suggestJobs(Project project, String matchWith) {matchWith = matchWith.toLowerCase();List<InputSuggestion> suggestions = new ArrayList<>();- List<ConfigurationFacade> configurations = new ArrayList<>(OneDev.getInstance(CacheManager.class).getConfigurations().values());- Collections.sort(configurations, new Comparator<ConfigurationFacade>() {-- @Override- public int compare(ConfigurationFacade o1, ConfigurationFacade o2) {- return o1.getName().compareTo(o2.getName());- }-- });- for (ConfigurationFacade configuration: configurations) {- if (matchWith.contains(Build.FQN_SEPARATOR))- matchWith = StringUtils.substringAfter(matchWith, Build.FQN_SEPARATOR);- Range match = Range.match(configuration.getName(), matchWith, true, false, true);+ for (String jobName: project.getJobNames()) {+ Range match = Range.match(jobName, matchWith, true, false, true);if (match != null)- suggestions.add(new InputSuggestion(configuration.getName(), null, match));+ suggestions.add(new InputSuggestion(jobName, null, match));}return suggestions;}