Skip to content

The Unified and Autonomous Development Platform

feat: Trivy integration to scan distribution files and docker images for vulnerabilities (#1841)

Robin Shen6a25f5d23028
diff --git a/pom.xml b/pom.xml
index 6055e23ef3..d57697309f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -630,8 +630,8 @@
</repository>
</repositories>
<properties>
- <commons.version>2.9.2</commons.version>
- <agent.version>1.12.1</agent.version>
+ <commons.version>2.9.3</commons.version>
+ <agent.version>1.12.2</agent.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.4.14</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchCriteria.java
index 8e954742d5..fb7d2d46d6 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.buildspec.job.action.condition;
import io.onedev.server.model.Build;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.PathMatcher;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -10,7 +10,6 @@ import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
-import static io.onedev.server.buildspec.job.action.condition.ActionConditionLexer.Is;
import static io.onedev.server.model.Build.NAME_BRANCH;
public class BranchCriteria extends Criteria<Build> {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchEmptyCriteria.java
index 16e8d693fc..5decd44baa 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/BranchEmptyCriteria.java
@@ -2,7 +2,6 @@ package io.onedev.server.buildspec.job.action.condition;
import io.onedev.server.model.Build;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.PathMatcher;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagCriteria.java
index 507cd495f0..fafe4deaee 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TagCriteria.java
@@ -2,8 +2,7 @@ package io.onedev.server.buildspec.job.action.condition;
import io.onedev.server.model.Build;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.PathMatcher;
-import io.onedev.server.util.match.StringMatcher;
+import io.onedev.commons.utils.match.PathMatcher;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -11,7 +10,6 @@ import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
import static io.onedev.server.buildspec.job.action.condition.ActionCondition.getRuleName;
-import static io.onedev.server.buildspec.job.action.condition.ActionConditionLexer.Is;
import static io.onedev.server.model.Build.NAME_TAG;
public class TagCriteria extends Criteria<Build> {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java
index 5a6ba03fa7..0c78a7e832 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java
@@ -11,8 +11,8 @@ import io.onedev.server.event.project.ProjectEvent;
import io.onedev.server.event.project.RefUpdated;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.util.SuggestionUtils;
import org.eclipse.jgit.lib.ObjectId;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
index 21d1f7dab1..36b5cb42a3 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
@@ -11,8 +11,8 @@ import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.event.project.ProjectEvent;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.util.SuggestionUtils;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
index 28a75491a8..42adb4591d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
@@ -9,8 +9,8 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.util.SuggestionUtils;
import org.eclipse.jgit.lib.Repository;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java
index 8ee89da603..820dd2e12d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java
@@ -10,8 +10,8 @@ import io.onedev.server.event.project.ProjectEvent;
import io.onedev.server.event.project.ScheduledTimeReaches;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.util.SuggestionUtils;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java
index 62af7206be..92cf2320b4 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java
@@ -9,7 +9,7 @@ import io.onedev.server.event.project.ProjectEvent;
import io.onedev.server.event.project.RefUpdated;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.util.SuggestionUtils;
import org.eclipse.jgit.lib.ObjectId;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java
index 62f432fe27..e1b0b712cf 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java
@@ -23,8 +23,7 @@ import static io.onedev.server.buildspec.step.StepGroup.DOCKER_IMAGE;
import static java.util.stream.Collectors.toList;
@Editable(order=200, name="Build Docker Image (Kaniko)", group = DOCKER_IMAGE, description="Build and publish docker image with Kaniko. " +
- "This step can be executed by server docker executor, remote docker executor, or Kubernetes executor, " +
- "without the need to mount docker sock")
+ "This step needs to be executed by server docker executor, remote docker executor, or Kubernetes executor")
public class BuildImageWithKanikoStep extends CommandStep {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java
index a7280ce223..5bca7b2593 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java
@@ -30,7 +30,7 @@ import io.onedev.server.git.command.LfsFetchCommand;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.java
index 48673cf72b..92acd36c18 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.java
@@ -3,13 +3,15 @@ package io.onedev.server.buildspec.step;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.k8shelper.SetupCacheFacade;
import io.onedev.k8shelper.StepFacade;
-import io.onedev.server.annotation.*;
+import io.onedev.server.annotation.ChoiceProvider;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Interpolative;
+import io.onedev.server.annotation.ProjectChoice;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
-import io.onedev.server.util.EditContext;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@@ -17,7 +19,6 @@ import javax.validation.constraints.Size;
import java.util.ArrayList;
import java.util.List;
-import static io.onedev.k8shelper.SetupCacheFacade.UploadStrategy.NEVER_UPLOAD;
import static io.onedev.k8shelper.SetupCacheFacade.UploadStrategy.UPLOAD_IF_NOT_HIT;
import static java.util.stream.Collectors.toList;
@@ -36,6 +37,8 @@ public class SetupCacheStep extends Step {
private SetupCacheFacade.UploadStrategy uploadStrategy = UPLOAD_IF_NOT_HIT;
+ private String changeDetectionExcludes;
+
private String uploadProjectPath;
private String uploadAccessTokenSecret;
@@ -83,10 +86,10 @@ public class SetupCacheStep extends Step {
this.paths = paths;
}
- @Editable(order=400, description = "Specify cache upload strategy after build succeeds. " +
+ @Editable(order=400, description = "Specify cache upload strategy. " +
"<var>Upload If Not Hit</var> means to upload when cache is not found with " +
- "cache key, and <var>Upload If Not Found</var> means cache is not found with both " +
- "cache key and load keys")
+ "cache key, and <var>Upload If Changed</var> means to upload if some files " +
+ "in cache path are changed")
@NotNull
public SetupCacheFacade.UploadStrategy getUploadStrategy() {
return uploadStrategy;
@@ -96,10 +99,19 @@ public class SetupCacheStep extends Step {
this.uploadStrategy = uploadStrategy;
}
+ @Editable(order=425)
+ @Interpolative(variableSuggester="suggestStaticVariables")
+ public String getChangeDetectionExcludes() {
+ return changeDetectionExcludes;
+ }
+
+ public void setChangeDetectionExcludes(String changeDetectionExcludes) {
+ this.changeDetectionExcludes = changeDetectionExcludes;
+ }
+
@Editable(order=450, placeholder = "Current project", description = "In case cache needs to be uploaded, this property " +
"specifies target project for the upload. Leave empty for current project")
@ProjectChoice
- @ShowCondition("isMayUpload")
public String getUploadProjectPath() {
return uploadProjectPath;
}
@@ -116,7 +128,6 @@ public class SetupCacheStep extends Step {
"for above project. Note that this property is not required if upload cache to current or child project " +
"and build commit is reachable from default branch")
@ChoiceProvider("getAccessTokenSecretChoices")
- @ShowCondition("isMayUpload")
public String getUploadAccessTokenSecret() {
return uploadAccessTokenSecret;
}
@@ -124,10 +135,6 @@ public class SetupCacheStep extends Step {
public void setUploadAccessTokenSecret(String uploadAccessTokenSecret) {
this.uploadAccessTokenSecret = uploadAccessTokenSecret;
}
-
- private static boolean isMayUpload() {
- return EditContext.get().getInputValue("uploadStrategy") != NEVER_UPLOAD;
- }
private static List<String> getAccessTokenSecretChoices() {
return Project.get().getHierarchyJobSecrets()
@@ -141,7 +148,8 @@ public class SetupCacheStep extends Step {
uploadAccessToken = build.getJobAuthorizationContext().getSecretValue(getUploadAccessTokenSecret());
else
uploadAccessToken = null;
- return new SetupCacheFacade(key, loadKeys, paths, uploadStrategy, uploadProjectPath, uploadAccessToken);
+ return new SetupCacheFacade(getKey(), getLoadKeys(), getPaths(), getUploadStrategy(),
+ getChangeDetectionExcludes(), getUploadProjectPath(), uploadAccessToken);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java
index 3a7b2ba002..8587cf8412 100755
--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java
@@ -16,8 +16,8 @@ import io.onedev.server.buildspec.param.spec.choiceparam.ChoiceParam;
import io.onedev.server.model.Project;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.usage.Usage;
import io.onedev.server.validation.Validatable;
diff --git a/server-core/src/main/java/io/onedev/server/codequality/CodeProblem.java b/server-core/src/main/java/io/onedev/server/codequality/CodeProblem.java
index 314504b39e..1dc7abb5c3 100644
--- a/server-core/src/main/java/io/onedev/server/codequality/CodeProblem.java
+++ b/server-core/src/main/java/io/onedev/server/codequality/CodeProblem.java
@@ -13,13 +13,32 @@ import static java.util.Comparator.comparingInt;
public class CodeProblem implements Serializable {
private static final long serialVersionUID = 1L;
-
- public enum Severity {CRITICAL, HIGH, MEDIUM, LOW};
+
+ public static final String NON_REPO_FILE_PREFIX = ":";
+
+ public enum Severity {
+ CRITICAL,
+ HIGH,
+ MEDIUM,
+ LOW;
+
+ public static Severity ofCvssScore(double cvssScore) {
+ if (cvssScore >= 9.0)
+ return CRITICAL;
+ else if (cvssScore >= 7.0)
+ return HIGH;
+ else if (cvssScore >= 4.0)
+ return MEDIUM;
+ else
+ return LOW;
+ }
+
+ };
private final Severity severity;
private final String blobPath;
-
+
private final PlanarRange range;
private final String message;
@@ -30,7 +49,7 @@ public class CodeProblem implements Serializable {
this.range = range;
this.message = message;
}
-
+
public Severity getSeverity() {
return severity;
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
index 7cae9a8f65..482c04d43b 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
@@ -34,9 +34,9 @@ import io.onedev.server.util.Input;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
-import io.onedev.server.util.match.StringMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
+import io.onedev.commons.utils.match.StringMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.taskschedule.SchedulableTask;
import io.onedev.server.taskschedule.TaskScheduler;
diff --git a/server-core/src/main/java/io/onedev/server/git/command/FileChange.java b/server-core/src/main/java/io/onedev/server/git/command/FileChange.java
index 1ef2784d3e..5079872757 100644
--- a/server-core/src/main/java/io/onedev/server/git/command/FileChange.java
+++ b/server-core/src/main/java/io/onedev/server/git/command/FileChange.java
@@ -8,8 +8,8 @@ import java.util.Set;
import javax.annotation.Nullable;
import io.onedev.server.util.FileExtension;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
@SuppressWarnings("serial")
diff --git a/server-core/src/main/java/io/onedev/server/job/ServerCacheHelper.java b/server-core/src/main/java/io/onedev/server/job/ServerCacheHelper.java
index 3c99c87a03..133878dd9b 100644
--- a/server-core/src/main/java/io/onedev/server/job/ServerCacheHelper.java
+++ b/server-core/src/main/java/io/onedev/server/job/ServerCacheHelper.java
@@ -1,11 +1,11 @@
package io.onedev.server.job;
import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.k8shelper.CacheHelper;
import io.onedev.k8shelper.KubernetesHelper;
+import io.onedev.k8shelper.SetupCacheFacade;
import io.onedev.server.OneDev;
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.entitymanager.JobCacheManager;
@@ -17,7 +17,6 @@ import io.onedev.server.security.SecurityUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.glassfish.jersey.client.ClientProperties;
-import javax.annotation.Nullable;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.Entity;
@@ -31,9 +30,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-import static io.onedev.server.util.IOUtils.BUFFER_SIZE;
-import static org.apache.commons.io.IOUtils.copy;
-
public class ServerCacheHelper extends CacheHelper {
private final JobContext jobContext;
@@ -98,8 +94,11 @@ public class ServerCacheHelper extends CacheHelper {
}
@Override
- protected boolean uploadCache(String cacheKey, List<String> cachePaths, List<File> cacheDirs,
- @Nullable String projectPath, @Nullable String accessToken) {
+ protected boolean uploadCache(SetupCacheFacade cacheConfig, List<File> cacheDirs) {
+ var cacheKey = cacheConfig.getKey();
+ var projectPath = cacheConfig.getUploadProjectPath();
+ var accessToken = cacheConfig.getUploadAccessToken();
+ var cachePaths = cacheConfig.getPaths();
var projectId = getSessionManager().call(() -> {
Project project;
if (projectPath != null) {
diff --git a/server-core/src/main/java/io/onedev/server/job/match/JobCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/JobCriteria.java
index acf6355def..d6d756b339 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/JobCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/JobCriteria.java
@@ -3,7 +3,7 @@ package io.onedev.server.job.match;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Build;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
diff --git a/server-core/src/main/java/io/onedev/server/job/match/OnBranchCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/OnBranchCriteria.java
index 033bde48c8..cbab29d4db 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/OnBranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/OnBranchCriteria.java
@@ -7,7 +7,7 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import static io.onedev.server.util.match.WildcardUtils.matchPath;
+import static io.onedev.commons.utils.match.WildcardUtils.matchPath;
public class OnBranchCriteria extends Criteria<JobMatchContext> {
diff --git a/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java
index b8633d843f..daea94fb8a 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java
@@ -2,7 +2,7 @@ package io.onedev.server.job.match;
import io.onedev.commons.utils.PathUtils;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index 444849d17a..afdd50df07 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -1028,9 +1028,6 @@ public class Build extends ProjectBelonging
@Nullable
public String getBlobPath(String filePath) {
- if (checkoutPaths.isEmpty())
- throw new ExplicitException("No checkout path detected");
-
filePath = filePath.replace('\\', '/');
filePath = Paths.get(filePath).normalize().toString();
filePath = filePath.replace('\\', '/');
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index d131f9202a..d347b53550 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -43,9 +43,9 @@ import io.onedev.server.util.EditContext;
import io.onedev.server.util.StatusInfo;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.util.facade.ProjectFacade;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
-import io.onedev.server.util.match.StringMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
+import io.onedev.commons.utils.match.StringMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.usermatch.UserMatch;
import io.onedev.server.web.UrlManager;
@@ -80,7 +80,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import static io.onedev.server.model.Project.PROP_NAME;
-import static io.onedev.server.util.match.WildcardUtils.matchPath;
+import static io.onedev.commons.utils.match.WildcardUtils.matchPath;
@Entity
@Table(
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
index 75161de47c..60944ceaf0 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
@@ -16,13 +16,12 @@ import io.onedev.server.model.support.issue.field.spec.choicefield.defaultvaluep
import io.onedev.server.model.support.issue.field.spec.choicefield.defaultvalueprovider.SpecifiedDefaultValue;
import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;
import io.onedev.server.model.support.issue.transitiontrigger.BranchUpdateTrigger;
-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.StateTransitionTrigger;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryParseOption;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.usage.Usage;
import io.onedev.server.web.component.issue.workflowreconcile.*;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/IssueCreationSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/IssueCreationSetting.java
index 363679b782..8754a9d095 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/IssueCreationSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/IssueCreationSetting.java
@@ -16,7 +16,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.issue.field.instance.FieldInstance;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SenderAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SenderAuthorization.java
index 73e5b82e99..feda6ba37d 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SenderAuthorization.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SenderAuthorization.java
@@ -12,7 +12,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.RoleManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.Role;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.Patterns;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java
index ecfc28d13a..3c00da2e9a 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java
@@ -17,9 +17,9 @@ import io.onedev.commons.utils.PathUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
-import io.onedev.server.util.match.StringMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
+import io.onedev.commons.utils.match.StringMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.usage.Usage;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java
index 572bd98017..8b09bd3cb3 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java
@@ -7,9 +7,8 @@ import java.util.List;
import javax.validation.constraints.Size;
import io.onedev.k8shelper.ServiceFacade;
-import io.onedev.server.buildspec.Service;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.Patterns;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java
index 0ee579372c..5279acc7f2 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java
@@ -12,7 +12,7 @@ import io.onedev.server.model.Build.Status;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.util.EditContext;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.reviewrequirement.ReviewRequirement;
import io.onedev.server.util.usage.Usage;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java
index d44562856c..c85bdf8ffc 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java
@@ -1,8 +1,8 @@
package io.onedev.server.model.support.issue.field.spec.choicefield.defaultmultivalueprovider;
import io.onedev.server.model.Project;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.OmitName;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/SpecifiedDefaultValue.java
index 67b0103a1f..f85ddfb49c 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/SpecifiedDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/SpecifiedDefaultValue.java
@@ -1,8 +1,8 @@
package io.onedev.server.model.support.issue.field.spec.choicefield.defaultvalueprovider;
import io.onedev.server.model.Project;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.OmitName;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java
index dcaa6e0a10..6fd2fb9e8d 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java
@@ -3,8 +3,8 @@ package io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultm
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.OmitName;
import io.onedev.server.model.Project;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import javax.validation.constraints.Size;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/SpecifiedDefaultValue.java
index c33af10b2f..8e3cc793bf 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/SpecifiedDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/userchoicefield/defaultvalueprovider/SpecifiedDefaultValue.java
@@ -3,8 +3,8 @@ package io.onedev.server.model.support.issue.field.spec.userchoicefield.defaultv
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.OmitName;
import io.onedev.server.model.Project;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import javax.validation.constraints.Size;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java
index 694eccc547..0fd41213b3 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java
@@ -25,8 +25,8 @@ import io.onedev.server.util.IndexResult;
import io.onedev.server.util.concurrent.BatchWorkManager;
import io.onedev.server.util.concurrent.BatchWorker;
import io.onedev.server.util.concurrent.Prioritized;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang.SerializationUtils;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java
index f65f8797ac..2660fa3898 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/FileQueryOption.java
@@ -2,7 +2,7 @@ package io.onedev.server.search.code.query;
import com.google.common.base.Preconditions;
import io.onedev.commons.utils.LinearRange;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.web.component.codequeryoption.FileQueryOptionEditor;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause;
@@ -15,7 +15,7 @@ import javax.annotation.Nullable;
import java.util.Optional;
import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;
-import static io.onedev.server.util.match.WildcardUtils.rangeOfMatch;
+import static io.onedev.commons.utils.match.WildcardUtils.rangeOfMatch;
import static java.util.Optional.ofNullable;
public class FileQueryOption implements QueryOption {
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java
index f1a20482a2..d5ad4caa7d 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQueryOption.java
@@ -4,11 +4,8 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import io.onedev.commons.jsymbol.Symbol;
import io.onedev.commons.utils.LinearRange;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.component.codequeryoption.SymbolQueryOptionEditor;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.WildcardQuery;
import org.apache.wicket.markup.html.form.FormComponentPanel;
@@ -20,8 +17,8 @@ import java.util.ArrayList;
import java.util.List;
import static io.onedev.server.search.code.FieldConstants.*;
-import static io.onedev.server.util.match.WildcardUtils.matchString;
-import static io.onedev.server.util.match.WildcardUtils.rangeOfMatch;
+import static io.onedev.commons.utils.match.WildcardUtils.matchString;
+import static io.onedev.commons.utils.match.WildcardUtils.rangeOfMatch;
import static org.apache.lucene.search.BooleanClause.Occur.MUST;
import static org.apache.lucene.search.BooleanClause.Occur.SHOULD;
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitCriteria.java
index 54afb932db..6cb048b3dc 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitCriteria.java
@@ -2,14 +2,11 @@ package io.onedev.server.search.commit;
import java.io.Serializable;
-import org.eclipse.jgit.lib.PersonIdent;
-
import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.event.project.RefUpdated;
import io.onedev.server.git.command.RevListOptions;
import io.onedev.server.model.Project;
-import io.onedev.server.util.match.WildcardUtils;
public abstract class CommitCriteria implements Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/FuzzyCriteria.java
index 2a57348e07..5824cbf02a 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/FuzzyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/FuzzyCriteria.java
@@ -10,7 +10,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
import java.util.ArrayList;
import java.util.List;
-import static io.onedev.server.util.match.WildcardUtils.matchString;
+import static io.onedev.commons.utils.match.WildcardUtils.matchString;
public class FuzzyCriteria extends CommitCriteria {
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/MessageCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/MessageCriteria.java
index 6e445e4f87..f855b2155d 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/MessageCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/MessageCriteria.java
@@ -11,7 +11,7 @@ import com.google.common.base.Preconditions;
import io.onedev.server.event.project.RefUpdated;
import io.onedev.server.git.command.RevListOptions;
import io.onedev.server.model.Project;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class MessageCriteria extends CommitCriteria {
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/PathCriteria.java
index a1b325d5d8..2bf867d829 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/PathCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/PathCriteria.java
@@ -16,8 +16,8 @@ import io.onedev.server.event.project.RefUpdated;
import io.onedev.server.git.command.RevListOptions;
import io.onedev.server.git.service.GitService;
import io.onedev.server.model.Project;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
public class PathCriteria extends CommitCriteria {
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java
index 6b031fd622..b810b3eedf 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java
@@ -8,7 +8,7 @@ import io.onedev.server.model.EmailAddress;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.PersonIdent;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java
index e8c4665a30..d8cffdb3b5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Agent;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class IpAddressCriteria extends Criteria<Agent> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java
index b72e568bcf..cb4cb8ff37 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Agent;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class NameCriteria extends Criteria<Agent> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java
index c2e8532482..27d0e9a859 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Agent;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class OsArchCriteria extends Criteria<Agent> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java
index 18e2475a38..81ecebbd50 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Agent;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class OsVersionCriteria extends Criteria<Agent> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java
index 84889d8bba..e72af0cf89 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BranchCriteria.java
@@ -10,7 +10,7 @@ import org.eclipse.jgit.lib.Constants;
import io.onedev.server.model.Build;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class BranchCriteria extends Criteria<Build> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java
index 6a073e1f4c..7ffed5bb51 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class JobCriteria extends Criteria<Build> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java
index 6ddd862c40..99c5aa41bb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java
@@ -10,7 +10,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Build;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class ProjectCriteria extends Criteria<Build> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java
index 63d6f78bf7..9e9aced16f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/TagCriteria.java
@@ -10,7 +10,7 @@ import org.eclipse.jgit.lib.Constants;
import io.onedev.server.model.Build;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class TagCriteria extends Criteria<Build> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java
index 9a9f083f99..96055a2feb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class VersionCriteria extends Criteria<Build> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
index 6a37670ba3..f2d16b96dd 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.CodeComment;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class ContentCriteria extends Criteria<CodeComment> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
index 96340e4349..c1bb7d86c8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
@@ -9,7 +9,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.support.Mark;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class PathCriteria extends Criteria<CodeComment> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
index 692e3c0c24..ab2625d4d5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
@@ -3,13 +3,12 @@ package io.onedev.server.search.entity.codecomment;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
import javax.persistence.criteria.*;
import java.util.ArrayList;
import java.util.List;
-import static io.onedev.server.util.match.WildcardUtils.matchString;
+import static io.onedev.commons.utils.match.WildcardUtils.matchString;
public class ReplyCriteria extends Criteria<CodeComment> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
index 8374ebcaf7..d13e1b69d8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
@@ -3,13 +3,12 @@ package io.onedev.server.search.entity.issue;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueComment;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
import javax.persistence.criteria.*;
import java.util.ArrayList;
import java.util.List;
-import static io.onedev.server.util.match.WildcardUtils.matchString;
+import static io.onedev.commons.utils.match.WildcardUtils.matchString;
public class CommentCriteria extends Criteria<Issue> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
index 941703dc05..8929238e91 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class DescriptionCriteria extends Criteria<Issue> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
index 982909d807..a6d6572b4a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
@@ -13,7 +13,7 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueSchedule;
import io.onedev.server.model.Milestone;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class MilestoneCriteria extends Criteria<Issue> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java
index dd2eeee526..f5c333a221 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java
@@ -5,7 +5,7 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
import javax.persistence.criteria.*;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
index 06ef82f35f..2b6718661e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class TitleCriteria extends Criteria<Issue> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/NameCriteria.java
index e7961a9c76..1c52b3a063 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/NameCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/NameCriteria.java
@@ -5,7 +5,7 @@ import io.onedev.server.util.criteria.Criteria;
import javax.persistence.criteria.*;
-import static io.onedev.server.util.match.WildcardUtils.matchString;
+import static io.onedev.commons.utils.match.WildcardUtils.matchString;
public class NameCriteria extends Criteria<Pack> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/ProjectCriteria.java
index e770d193e1..a6cb5e24a3 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/ProjectCriteria.java
@@ -4,7 +4,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Pack;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
import javax.persistence.criteria.*;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByProjectCriteria.java
index 59e0808963..a91b5fa27f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByProjectCriteria.java
@@ -5,7 +5,7 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Pack;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
import javax.persistence.criteria.*;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/VersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/VersionCriteria.java
index db3bd31138..c9ce566ffb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/VersionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/VersionCriteria.java
@@ -5,7 +5,7 @@ import io.onedev.server.util.criteria.Criteria;
import javax.persistence.criteria.*;
-import static io.onedev.server.util.match.WildcardUtils.matchString;
+import static io.onedev.commons.utils.match.WildcardUtils.matchString;
public class VersionCriteria extends Criteria<Pack> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java
index 26a46addf7..59a88b5158 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java
@@ -11,7 +11,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class ChildrenOfCriteria extends Criteria<Project> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java
index 73d02d2df1..7e689abf80 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class DescriptionCriteria extends Criteria<Project> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java
index fc916af9e7..0cded73921 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java
@@ -11,7 +11,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class ForksOfCriteria extends Criteria<Project> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java
index b4c31942c7..cf904fce39 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class NameCriteria extends Criteria<Project> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java
index 3125a7a4bd..5b0f21d609 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/PathCriteria.java
@@ -6,7 +6,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class PathCriteria extends Criteria<Project> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskNameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskNameCriteria.java
index 0ccb06cbab..b82d79d228 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskNameCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ServiceDeskNameCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class ServiceDeskNameCriteria extends Criteria<Project> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
index a2875b47b3..9c6f3fded5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.*;
import java.util.ArrayList;
import java.util.List;
-import static io.onedev.server.util.match.WildcardUtils.matchString;
+import static io.onedev.commons.utils.match.WildcardUtils.matchString;
public class CommentCriteria extends Criteria<PullRequest> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
index e42ac1a8fe..6e665197b5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class DescriptionCriteria extends Criteria<PullRequest> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
index 38fa855c27..2be5c5d813 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class SourceBranchCriteria extends Criteria<PullRequest> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
index b2c216b32d..f225ad022a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
@@ -11,7 +11,7 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class SourceProjectCriteria extends Criteria<PullRequest> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
index 1b58ebb67b..a66376d35a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class TargetBranchCriteria extends Criteria<PullRequest> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java
index 00f545e2e2..a6d602359e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java
@@ -12,7 +12,7 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class TargetProjectCriteria extends Criteria<PullRequest> {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
index 34df2d65ce..ebd4923288 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
public class TitleCriteria extends Criteria<PullRequest> {
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.java b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.java
index 5dd8279e1c..e215b7c3b9 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.java
@@ -1,7 +1,7 @@
package io.onedev.server.security.permission;
import io.onedev.server.util.facade.UserFacade;
-import io.onedev.server.util.match.StringMatcher;
+import io.onedev.commons.utils.match.StringMatcher;
import io.onedev.server.util.patternset.PatternSet;
import org.apache.shiro.authz.Permission;
import org.jetbrains.annotations.Nullable;
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.java b/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.java
index cad08f15cc..6c9bc43ac1 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/JobPermission.java
@@ -1,7 +1,7 @@
package io.onedev.server.security.permission;
import io.onedev.server.util.facade.UserFacade;
-import io.onedev.server.util.match.StringMatcher;
+import io.onedev.commons.utils.match.StringMatcher;
import io.onedev.server.util.patternset.PatternSet;
import org.apache.shiro.authz.Permission;
import org.jetbrains.annotations.Nullable;
diff --git a/server-core/src/main/java/io/onedev/server/util/HtmlUtils.java b/server-core/src/main/java/io/onedev/server/util/HtmlUtils.java
index 99c2d6bc7d..3b429172bc 100644
--- a/server-core/src/main/java/io/onedev/server/util/HtmlUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/HtmlUtils.java
@@ -1,18 +1,13 @@
package io.onedev.server.util;
-import java.util.Collection;
-import java.util.regex.Matcher;
-
+import com.google.common.collect.Lists;
import org.jsoup.Jsoup;
-import org.jsoup.nodes.Attribute;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.nodes.Node;
-import org.jsoup.nodes.TextNode;
+import org.jsoup.nodes.*;
import org.jsoup.safety.Cleaner;
import org.jsoup.safety.Safelist;
-import com.google.common.collect.Lists;
+import java.util.Collection;
+import java.util.regex.Matcher;
public class HtmlUtils {
@@ -110,4 +105,8 @@ public class HtmlUtils {
return sanitize(parse(html)).body().html();
}
+ public static String getText(String html) {
+ return Jsoup.parse(html).text();
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java b/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java
index a4b5c1fcd3..02f778e19f 100644
--- a/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java
@@ -6,14 +6,14 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.util.MapProxy;
import io.onedev.server.util.Similarities;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import javax.annotation.Nullable;
import java.io.Serializable;
import java.util.*;
-import static io.onedev.server.util.match.WildcardUtils.matchPath;
+import static io.onedev.commons.utils.match.WildcardUtils.matchPath;
import static java.util.Comparator.comparing;
import static java.util.stream.Collectors.toSet;
diff --git a/server-core/src/main/java/io/onedev/server/util/match/Matcher.java b/server-core/src/main/java/io/onedev/server/util/match/Matcher.java
deleted file mode 100644
index 75220d8388..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/match/Matcher.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.onedev.server.util.match;
-
-public interface Matcher {
- boolean matches(String pattern, String value);
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/match/PathMatcher.java b/server-core/src/main/java/io/onedev/server/util/match/PathMatcher.java
deleted file mode 100644
index 2cd11dba04..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/match/PathMatcher.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package io.onedev.server.util.match;
-
-import io.onedev.commons.utils.StringUtils;
-
-/**
- * <p>PathMatcher implementation for Ant-style path patterns.
- * Examples are provided below.</p>
- *
- * <p>Part of this mapping code has been kindly borrowed from
- * <a href="http://ant.apache.org">Apache Ant</a>.
- *
- * <p>The mapping matches URLs using the following rules:<br>
- * <ul>
- * <li>? matches one character</li>
- * <li>* matches zero or more characters</li>
- * <li>** matches zero or more 'directories' in a path</li>
- * </ul>
- *
- * <p>Some examples:<br>
- * <ul>
- * <li><code>com/t?st.jsp</code> - matches <code>com/test.jsp</code> but also
- * <code>com/tast.jsp</code> or <code>com/txst.jsp</code></li>
- * <li><code>com/*.jsp</code> - matches all <code>.jsp</code> files in the
- * <code>com</code> directory</li>
- * <li><code>com/&#42;&#42;/test.jsp</code> - matches all <code>test.jsp</code>
- * files underneath the <code>com</code> path</li>
- * <li><code>org/apache/shiro/&#42;&#42;/*.jsp</code> - matches all <code>.jsp</code>
- * files underneath the <code>org/apache/shiro</code> path</li>
- * <li><code>org/&#42;&#42;/servlet/bla.jsp</code> - matches
- * <code>org/apache/shiro/servlet/bla.jsp</code> but also
- * <code>org/apache/shiro/testing/servlet/bla.jsp</code> and
- * <code>org/servlet/bla.jsp</code></li>
- * </ul>
- *
- * <p><b>N.B.</b>: This class was borrowed (with much appreciation) from the
- * <a href="http://www.springframework.org">Spring Framework</a> with modifications. We didn't want to reinvent the
- * wheel of great work they've done, but also didn't want to force every Shiro user to depend on Spring</p>
- *
- * <p>As per the Apache 2.0 license, the original copyright notice and all author and copyright information have
- * remained in tact.</p>
- *
- * @since 16.07.2003
- */
-public class PathMatcher implements Matcher {
-
- private static final Matcher STRING_MATCHER = new StringMatcher();
-
- //TODO - complete JavaDoc
-
- /**
- * Default path separator: "/"
- */
- public static final String DEFAULT_PATH_SEPARATOR = "/";
-
- private String pathSeparator = DEFAULT_PATH_SEPARATOR;
-
-
- /**
- * Set the path separator to use for pattern parsing.
- * Default is "/", as in Ant.
- */
- public void setPathSeparator(String pathSeparator) {
- this.pathSeparator = (pathSeparator != null ? pathSeparator : DEFAULT_PATH_SEPARATOR);
- }
-
-
- public static boolean isPattern(String path) {
- return (path.indexOf('*') != -1 || path.indexOf('?') != -1);
- }
-
- @Override
- public boolean matches(String pattern, String str) {
- if (pattern.endsWith("/"))
- pattern += "**";
- return doMatch(pattern, str, true);
- }
-
- public boolean matchStart(String pattern, String str) {
- return doMatch(pattern, str, false);
- }
-
- /**
- * Actually match the given <code>path</code> against the given <code>pattern</code>.
- *
- * @param pattern the pattern to match against
- * @param path the path String to test
- * @param fullMatch whether a full pattern match is required
- * (else a pattern match as far as the given base path goes is sufficient)
- * @return <code>true</code> if the supplied <code>path</code> matched,
- * <code>false</code> if it didn't
- */
- protected boolean doMatch(String pattern, String str, boolean fullMatch) {
- if (str.startsWith(this.pathSeparator) != pattern.startsWith(this.pathSeparator)) {
- return false;
- }
-
- String[] pattDirs = StringUtils.tokenizeToStringArray(pattern, this.pathSeparator);
- String[] pathDirs = StringUtils.tokenizeToStringArray(str, this.pathSeparator);
-
- int pattIdxStart = 0;
- int pattIdxEnd = pattDirs.length - 1;
- int pathIdxStart = 0;
- int pathIdxEnd = pathDirs.length - 1;
-
- // Match all elements up to the first **
- while (pattIdxStart <= pattIdxEnd && pathIdxStart <= pathIdxEnd) {
- String patDir = pattDirs[pattIdxStart];
- if ("**".equals(patDir)) {
- break;
- }
- if (!STRING_MATCHER.matches(patDir, pathDirs[pathIdxStart])) {
- return false;
- }
- pattIdxStart++;
- pathIdxStart++;
- }
-
- if (pathIdxStart > pathIdxEnd) {
- // Path is exhausted, only match if rest of pattern is * or **'s
- if (pattIdxStart > pattIdxEnd) {
- return (pattern.endsWith(this.pathSeparator) ?
- str.endsWith(this.pathSeparator) : !str.endsWith(this.pathSeparator));
- }
- if (!fullMatch) {
- return true;
- }
- if (pattIdxStart == pattIdxEnd && pattDirs[pattIdxStart].equals("*") &&
- str.endsWith(this.pathSeparator)) {
- return true;
- }
- for (int i = pattIdxStart; i <= pattIdxEnd; i++) {
- if (!pattDirs[i].equals("**")) {
- return false;
- }
- }
- return true;
- } else if (pattIdxStart > pattIdxEnd) {
- // String not exhausted, but pattern is. Failure.
- return false;
- } else if (!fullMatch && "**".equals(pattDirs[pattIdxStart])) {
- // Path start definitely matches due to "**" part in pattern.
- return true;
- }
-
- // up to last '**'
- while (pattIdxStart <= pattIdxEnd && pathIdxStart <= pathIdxEnd) {
- String patDir = pattDirs[pattIdxEnd];
- if (patDir.equals("**")) {
- break;
- }
- if (!STRING_MATCHER.matches(patDir, pathDirs[pathIdxEnd])) {
- return false;
- }
- pattIdxEnd--;
- pathIdxEnd--;
- }
- if (pathIdxStart > pathIdxEnd) {
- // String is exhausted
- for (int i = pattIdxStart; i <= pattIdxEnd; i++) {
- if (!pattDirs[i].equals("**")) {
- return false;
- }
- }
- return true;
- }
-
- while (pattIdxStart != pattIdxEnd && pathIdxStart <= pathIdxEnd) {
- int patIdxTmp = -1;
- for (int i = pattIdxStart + 1; i <= pattIdxEnd; i++) {
- if (pattDirs[i].equals("**")) {
- patIdxTmp = i;
- break;
- }
- }
- if (patIdxTmp == pattIdxStart + 1) {
- // '**/**' situation, so skip one
- pattIdxStart++;
- continue;
- }
- // Find the pattern between padIdxStart & padIdxTmp in str between
- // strIdxStart & strIdxEnd
- int patLength = (patIdxTmp - pattIdxStart - 1);
- int strLength = (pathIdxEnd - pathIdxStart + 1);
- int foundIdx = -1;
-
- strLoop:
- for (int i = 0; i <= strLength - patLength; i++) {
- for (int j = 0; j < patLength; j++) {
- String subPat = (String) pattDirs[pattIdxStart + j + 1];
- String subStr = (String) pathDirs[pathIdxStart + i + j];
- if (!STRING_MATCHER.matches(subPat, subStr)) {
- continue strLoop;
- }
- }
- foundIdx = pathIdxStart + i;
- break;
- }
-
- if (foundIdx == -1) {
- return false;
- }
-
- pattIdxStart = patIdxTmp;
- pathIdxStart = foundIdx + patLength;
- }
-
- for (int i = pattIdxStart; i <= pattIdxEnd; i++) {
- if (!pattDirs[i].equals("**")) {
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * Given a pattern and a full path, determine the pattern-mapped part.
- * <p>For example:
- * <ul>
- * <li>'<code>/docs/cvs/commit.html</code>' and '<code>/docs/cvs/commit.html</code> -> ''</li>
- * <li>'<code>/docs/*</code>' and '<code>/docs/cvs/commit</code> -> '<code>cvs/commit</code>'</li>
- * <li>'<code>/docs/cvs/*.html</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>commit.html</code>'</li>
- * <li>'<code>/docs/**</code>' and '<code>/docs/cvs/commit</code> -> '<code>cvs/commit</code>'</li>
- * <li>'<code>/docs/**\/*.html</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>cvs/commit.html</code>'</li>
- * <li>'<code>/*.html</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>docs/cvs/commit.html</code>'</li>
- * <li>'<code>*.html</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>/docs/cvs/commit.html</code>'</li>
- * <li>'<code>*</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>/docs/cvs/commit.html</code>'</li>
- * </ul>
- * <p>Assumes that {@link #match} returns <code>true</code> for '<code>pattern</code>'
- * and '<code>path</code>', but does <strong>not</strong> enforce this.
- */
- public String extractPathWithinPattern(String pattern, String path) {
- String[] patternParts = StringUtils.tokenizeToStringArray(pattern, this.pathSeparator);
- String[] pathParts = StringUtils.tokenizeToStringArray(path, this.pathSeparator);
-
- StringBuilder buffer = new StringBuilder();
-
- // Add any path parts that have a wildcarded pattern part.
- int puts = 0;
- for (int i = 0; i < patternParts.length; i++) {
- String patternPart = patternParts[i];
- if ((patternPart.indexOf('*') > -1 || patternPart.indexOf('?') > -1) && pathParts.length >= i + 1) {
- if (puts > 0 || (i == 0 && !pattern.startsWith(this.pathSeparator))) {
- buffer.append(this.pathSeparator);
- }
- buffer.append(pathParts[i]);
- puts++;
- }
- }
-
- // Append any trailing path parts.
- for (int i = patternParts.length; i < pathParts.length; i++) {
- if (puts > 0 || i > 0) {
- buffer.append(this.pathSeparator);
- }
- buffer.append(pathParts[i]);
- }
-
- return buffer.toString();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/match/PatternApplied.java b/server-core/src/main/java/io/onedev/server/util/match/PatternApplied.java
deleted file mode 100644
index 0d763b561d..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/match/PatternApplied.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.onedev.server.util.match;
-
-import java.io.Serializable;
-
-import io.onedev.commons.utils.LinearRange;
-
-public class PatternApplied implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private final String text;
-
- private final LinearRange match;
-
- public PatternApplied(String text, LinearRange match) {
- this.text = text;
- this.match = match;
- }
-
- public String getText() {
- return text;
- }
-
- public LinearRange getMatch() {
- return match;
- }
-
- @Override
- public String toString() {
- return text + ":" + match;
- }
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/match/StringMatcher.java b/server-core/src/main/java/io/onedev/server/util/match/StringMatcher.java
deleted file mode 100644
index 05df731af0..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/match/StringMatcher.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package io.onedev.server.util.match;
-
-public class StringMatcher implements Matcher {
-
- @Override
- public boolean matches(String pattern, String str) {
- char[] patArr = pattern.toCharArray();
- char[] strArr = str.toCharArray();
- int patIdxStart = 0;
- int patIdxEnd = patArr.length - 1;
- int strIdxStart = 0;
- int strIdxEnd = strArr.length - 1;
- char ch;
-
- boolean containsStar = false;
- for (char aPatArr : patArr) {
- if (aPatArr == '*') {
- containsStar = true;
- break;
- }
- }
-
- if (!containsStar) {
- // No '*'s, so we make a shortcut
- if (patIdxEnd != strIdxEnd) {
- return false; // Pattern and string do not have the same size
- }
- for (int i = 0; i <= patIdxEnd; i++) {
- ch = patArr[i];
- if (ch != '?') {
- if (ch != strArr[i]) {
- return false;// Character mismatch
- }
- }
- }
- return true; // String matches against pattern
- }
-
- if (patIdxEnd == 0) {
- return true; // Pattern contains only '*', which matches anything
- }
-
- // Process characters before first star
- while ((ch = patArr[patIdxStart]) != '*' && strIdxStart <= strIdxEnd) {
- if (ch != '?') {
- if (ch != strArr[strIdxStart]) {
- return false;// Character mismatch
- }
- }
- patIdxStart++;
- strIdxStart++;
- }
- if (strIdxStart > strIdxEnd) {
- // All characters in the string are used. Check if only '*'s are
- // left in the pattern. If so, we succeeded. Otherwise failure.
- for (int i = patIdxStart; i <= patIdxEnd; i++) {
- if (patArr[i] != '*') {
- return false;
- }
- }
- return true;
- }
-
- // Process characters after last star
- while ((ch = patArr[patIdxEnd]) != '*' && strIdxStart <= strIdxEnd) {
- if (ch != '?') {
- if (ch != strArr[strIdxEnd]) {
- return false;// Character mismatch
- }
- }
- patIdxEnd--;
- strIdxEnd--;
- }
- if (strIdxStart > strIdxEnd) {
- // All characters in the string are used. Check if only '*'s are
- // left in the pattern. If so, we succeeded. Otherwise failure.
- for (int i = patIdxStart; i <= patIdxEnd; i++) {
- if (patArr[i] != '*') {
- return false;
- }
- }
- return true;
- }
-
- // process pattern between stars. padIdxStart and patIdxEnd point
- // always to a '*'.
- while (patIdxStart != patIdxEnd && strIdxStart <= strIdxEnd) {
- int patIdxTmp = -1;
- for (int i = patIdxStart + 1; i <= patIdxEnd; i++) {
- if (patArr[i] == '*') {
- patIdxTmp = i;
- break;
- }
- }
- if (patIdxTmp == patIdxStart + 1) {
- // Two stars next to each other, skip the first one.
- patIdxStart++;
- continue;
- }
- // Find the pattern between padIdxStart & padIdxTmp in str between
- // strIdxStart & strIdxEnd
- int patLength = (patIdxTmp - patIdxStart - 1);
- int strLength = (strIdxEnd - strIdxStart + 1);
- int foundIdx = -1;
- strLoop: for (int i = 0; i <= strLength - patLength; i++) {
- for (int j = 0; j < patLength; j++) {
- ch = patArr[patIdxStart + j + 1];
- if (ch != '?') {
- if (ch != strArr[strIdxStart + i + j]) {
- continue strLoop;
- }
- }
- }
-
- foundIdx = strIdxStart + i;
- break;
- }
-
- if (foundIdx == -1) {
- return false;
- }
-
- patIdxStart = patIdxTmp;
- strIdxStart = foundIdx + patLength;
- }
-
- // All characters in the string are used. Check if only '*'s are left
- // in the pattern. If so, we succeeded. Otherwise failure.
- for (int i = patIdxStart; i <= patIdxEnd; i++) {
- if (patArr[i] != '*') {
- return false;
- }
- }
-
- return true;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/match/WildcardUtils.java b/server-core/src/main/java/io/onedev/server/util/match/WildcardUtils.java
deleted file mode 100644
index bdcd437502..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/match/WildcardUtils.java
+++ /dev/null
@@ -1,314 +0,0 @@
-package io.onedev.server.util.match;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.google.common.base.CharMatcher;
-import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-
-import io.onedev.commons.utils.LinearRange;
-
-public class WildcardUtils {
-
- private static final PathMatcher PATH_MATCHER = new PathMatcher();
-
- private static final StringMatcher STRING_MATCHER = new StringMatcher();
-
- /**
- * Tests whether or not a given path matches a given pattern using of
- * <a href="http://ant.apache.org/manual/dirtasks.html">Ant path pattern</a>.
- *
- * @param pattern
- * the pattern to match against. Must not be null
- * @param path
- * the path to match, as a String. Must not be null
- *
- * @return
- * true if the pattern matches the string, or false otherwise
- *
- */
- public static boolean matchPath(String pattern, String path) {
- return PATH_MATCHER.matches(pattern, path);
- }
-
- /**
- * Tests whether or not a string matches specified pattern, which may contain
- * two special characters:<br>
- * '*' means zero or more characters<br>
- * '?' means one and only one character
- *
- * @param pattern
- * the pattern to match against. Must not be null.
- * @param string
- * the string which must be matched against the pattern. Must not be null.
- * @return
- * true if the string matches against the pattern, or false otherwise.
- */
- public static boolean matchString(String pattern, String string) {
- return STRING_MATCHER.matches(pattern, string);
- }
-
- private static int indexOf(String string, String substring, int index) {
- if (index >= string.length()) {
- return (substring.length() == 0 ? string.length(): -1);
- }
- if (index < 0) {
- index = 0;
- }
- if (substring.length() == 0) {
- return index;
- }
-
- char first = substring.charAt(0);
- int max = (string.length() - substring.length());
-
- for (int i = index; i <= max; i++) {
- /* Look for first character. */
- if ('?' != first && string.charAt(i) != first) {
- while (++i <= max && '?' != first && string.charAt(i) != first);
- }
-
- /* Found first character, now look at the rest of v2 */
- if (i <= max) {
- int j = i + 1;
- int end = j + substring.length() - 1;
- for (int k = 1; j < end && ('?' == substring.charAt(k) || string.charAt(j) == substring.charAt(k)); j++, k++);
-
- if (j == end) {
- /* Found whole string. */
- return i;
- }
- }
- }
- return -1;
- }
-
- public static List<LinearRange> getLiteralRanges(String pattern) {
- List<LinearRange> literalRanges = new ArrayList<>();
- int pos = 0;
- int index = pattern.indexOf('*');
- while (index != -1) {
- if (index>pos)
- literalRanges.add(new LinearRange(pos, index));
- pos = index+1;
- index = pattern.indexOf('*', pos);
- }
- if (pattern.length() > pos)
- literalRanges.add(new LinearRange(pos, pattern.length()));
- return literalRanges;
- }
-
- /**
- * Check the unit test for explanation.
- *
- * @param string
- * @param pattern
- * @param caseSensitive
- * @return
- */
- @Nullable
- public static PatternApplied applyStringPattern(String pattern, String string, boolean caseSensitive) {
- String normalizedText;
- String normalizedPattern;
- if (caseSensitive) {
- normalizedText = string;
- normalizedPattern = pattern;
- } else {
- normalizedText = string.toLowerCase();
- normalizedPattern = pattern.toLowerCase();
- }
- List<LinearRange> literalRanges = getLiteralRanges(normalizedPattern);
-
- StringBuilder appliedText = new StringBuilder(pattern);
- int first = -1;
- int last = 0;
- int pos = 0;
- for (LinearRange literalRange: literalRanges) {
- String literal = normalizedPattern.substring(literalRange.getFrom(), literalRange.getTo());
- int index = indexOf(normalizedText, literal, pos);
- if (index != -1) {
- if (first == -1)
- first = index;
- pos = index+literal.length();
- last = pos;
-
- String temp = appliedText.toString();
- appliedText = new StringBuilder(appliedText.substring(0, literalRange.getFrom()));
- for (int i=0; i<literal.length(); i++) {
- if (literal.charAt(i) == '?')
- appliedText.append('?');
- else
- appliedText.append(string.charAt(index+i));
- }
- appliedText.append(temp.substring(literalRange.getTo()));
- } else {
- return null;
- }
- }
- if (first != -1 && pattern.charAt(0) != '*')
- appliedText = new StringBuilder(string.substring(0, first) + appliedText.toString());
- else
- first = 0;
- if (pattern.length() == 0 || pattern.charAt(pattern.length()-1) != '*') {
- String suffix = string.substring(last);
- last = appliedText.length();
- appliedText.append(suffix);
- } else {
- last = appliedText.length();
- }
- return new PatternApplied(appliedText.toString(), new LinearRange(first, last));
- }
-
- @Nullable
- public static PatternApplied applyPathPattern(String pattern, String path, boolean caseSensitive) {
- String normalizedPattern = pattern;
- String normalizedPath = path;
- if (!caseSensitive) {
- normalizedPattern = pattern.toLowerCase();
- normalizedPath = path.toLowerCase();
- }
- Iterable<String> literals = Splitter.on(new CharMatcher() {
-
- @Override
- public boolean matches(char c) {
- return c=='/' || c=='?' || c=='*';
- }
-
- }).split(normalizedPattern);
-
- // fast pass
- for (String literal: literals) {
- if (!normalizedPath.contains(literal))
- return null;
- }
-
- if (pattern.equals("**") && path.startsWith("/"))
- return null;
- else if (pattern.length() == 0)
- return new PatternApplied(path, new LinearRange(0, 0));
-
- List<String> patternSegments = Splitter.on("/").splitToList(pattern);
- List<String> pathSegments = Splitter.on("/").splitToList(path);
-
- if (patternSegments.iterator().next().equals("**")) {
- return applyPathPattern(patternSegments, pathSegments, true, caseSensitive);
- } else {
- for (int i=0; i<pathSegments.size(); i++) {
- PatternApplied patternApplied = applyPathPattern(patternSegments,
- pathSegments.subList(i, pathSegments.size()), true, caseSensitive);
- if (patternApplied != null) {
- if (i == 0) {
- return patternApplied;
- } else {
- String prefix = Joiner.on("/").join(pathSegments.subList(0, i));
- LinearRange match = patternApplied.getMatch();
- LinearRange newMatch = new LinearRange(
- match.getFrom() + prefix.length() + 1,
- match.getTo() + prefix.length() + 1);
- return new PatternApplied(prefix + "/" + patternApplied.getText(), newMatch);
- }
- }
- }
-
- return null;
- }
- }
-
- @Nullable
- private static PatternApplied applyPathPattern(List<String> patternSegments, List<String> pathSegments,
- boolean firstSegment, boolean caseSensitive) {
- String patternSegment = patternSegments.get(0);
- if (patternSegment.equals("**")) {
- if (patternSegments.size() == 1)
- return new PatternApplied("**", new LinearRange(0, 2));
- for (int pathIndex = 0; pathIndex < pathSegments.size(); pathIndex++) {
- PatternApplied patternApplied = applyPathPattern(
- patternSegments.subList(1, patternSegments.size()),
- pathSegments.subList(pathIndex, pathSegments.size()),
- false, caseSensitive);
- if (patternApplied != null) {
- LinearRange newMatch = new LinearRange(0, patternApplied.getMatch().getTo()+3);
- return new PatternApplied("**/" + patternApplied.getText(), newMatch);
- }
- }
- return null;
- } else if (pathSegments.isEmpty()) {
- return null;
- } else {
- String pathSegment = pathSegments.get(0);
- PatternApplied patternApplied;
- if (firstSegment && patternSegments.size() != 1) {
- patternApplied = applyStringPattern(
- StringUtils.reverse(patternSegment), StringUtils.reverse(pathSegment), caseSensitive);
- if (patternApplied != null) {
- String text = patternApplied.getText();
- LinearRange match = patternApplied.getMatch();
- patternApplied = new PatternApplied(
- StringUtils.reverse(text),
- new LinearRange(text.length()-match.getTo(), text.length()-match.getFrom()));
- }
- } else {
- patternApplied = applyStringPattern(patternSegment, pathSegment, caseSensitive);
- }
- if (patternApplied != null) {
- LinearRange match = patternApplied.getMatch();
- if (!firstSegment && match.getFrom() != 0
- || patternSegments.size() != 1 && match.getTo() != patternApplied.getText().length()) {
- return null;
- }
- if (patternSegments.size() == 1) {
- if (pathSegments.size() == 1)
- return patternApplied;
- else {
- String suffix = Joiner.on("/").join(pathSegments.subList(1, pathSegments.size()));
- return new PatternApplied(
- patternApplied.getText() + "/" + suffix,
- patternApplied.getMatch());
- }
- } else {
- PatternApplied leftOverPatternApplied = applyPathPattern(
- patternSegments.subList(1, patternSegments.size()),
- pathSegments.subList(1, pathSegments.size()),
- false,
- caseSensitive);
- if (leftOverPatternApplied != null) {
- LinearRange leftOverRange = leftOverPatternApplied.getMatch();
- LinearRange newRange = new LinearRange(
- patternApplied.getMatch().getFrom(),
- leftOverRange.getTo() + patternApplied.getText().length() + 1);
- return new PatternApplied(
- patternApplied.getText() + "/" + leftOverPatternApplied.getText(),
- newRange);
- }
- }
- }
- return null;
- }
- }
-
- @Nullable
- public static LinearRange rangeOfMatch(String pattern, String string) {
- List<LinearRange> literalRanges = getLiteralRanges(pattern);
-
- int first = -1;
- int pos = 0;
- for (LinearRange literalRange: literalRanges) {
- String literal = pattern.substring(literalRange.getFrom(), literalRange.getTo());
- int index = indexOf(string, literal, pos);
- if (index != -1) {
- if (first == -1)
- first = index;
- pos = index+literal.length();
- } else {
- return null;
- }
- }
- return new LinearRange(first, pos);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java
index 31dcf7af76..35119786c3 100644
--- a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java
+++ b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java
@@ -2,7 +2,7 @@ package io.onedev.server.util.patternset;
import io.onedev.commons.codeassist.FenceAware;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.util.match.Matcher;
+import io.onedev.commons.utils.match.Matcher;
import io.onedev.server.util.patternset.PatternSetParser.PatternContext;
import io.onedev.server.util.patternset.PatternSetParser.PatternsContext;
import org.antlr.v4.runtime.*;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
index 507e66f58d..5edadf14a9 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
@@ -25,8 +25,8 @@ import io.onedev.server.model.Project;
import io.onedev.server.search.commit.CommitQueryParser;
import io.onedev.server.util.Constants;
import io.onedev.server.util.NameAndEmail;
-import io.onedev.server.util.match.PatternApplied;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.PatternApplied;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java
index e59d5f3b88..cbb406fb3a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java
@@ -9,7 +9,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ReflectionUtils;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.WebApplication;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index e87d90a29c..2c4c656fd8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -30,8 +30,8 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Pair;
import io.onedev.server.util.PathComparator;
import io.onedev.server.util.diff.WhitespaceOption;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.java b/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.java
index 8109000d12..dbf1857616 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/typeselect/TypeSelectPanel.java
@@ -1,12 +1,14 @@
package io.onedev.server.web.component.typeselect;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
+import io.onedev.commons.loader.AppLoader;
+import io.onedev.commons.loader.ImplementationRegistry;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.util.ReflectionUtils;
+import io.onedev.server.util.Similarities;
+import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;
+import io.onedev.server.web.behavior.OnTypingDoneBehavior;
+import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
+import io.onedev.server.web.editable.EditableUtils;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.wicket.Component;
@@ -30,16 +32,12 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import io.onedev.commons.loader.AppLoader;
-import io.onedev.commons.loader.ImplementationRegistry;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.util.ReflectionUtils;
-import io.onedev.server.util.Similarities;
-import io.onedev.server.web.asset.selectbytyping.SelectByTypingResourceReference;
-import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
-import io.onedev.server.web.editable.EditableUtils;
-import org.unbescape.html.HtmlEscape;
+import java.io.Serializable;
+import java.util.*;
+
+import static io.onedev.server.util.HtmlUtils.getText;
+import static io.onedev.server.web.editable.EditableUtils.getDescription;
+import static org.apache.commons.lang3.StringUtils.substringBefore;
@SuppressWarnings("serial")
public abstract class TypeSelectPanel<T extends Serializable> extends Panel {
@@ -249,12 +247,13 @@ public abstract class TypeSelectPanel<T extends Serializable> extends Panel {
}
fragment.add(link);
- String description = StringUtils.trimToNull(StringUtils.substringBefore(
- EditableUtils.getDescription(typeNode.type), "."));
- if (description != null)
- link.add(new Label("description", description).setEscapeModelStrings(false));
- else
+ var description = getDescription(typeNode.type);
+ if (description != null) {
+ description = substringBefore(getText(description), ".");
+ link.add(new Label("description", description));
+ } else {
link.add(new WebMarkupContainer("description").setVisible(false));
+ }
return fragment;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/blobchoice/BlobChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/blobchoice/BlobChoiceEditor.java
index 8bad224b9c..d9dd1c4d5e 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/blobchoice/BlobChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/blobchoice/BlobChoiceEditor.java
@@ -10,7 +10,7 @@ import io.onedev.server.git.BlobIdentFilter;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.ReflectionUtils;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.component.blob.BlobPicker;
import io.onedev.server.web.editable.PropertyDescriptor;
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index ee4f001fd9..5793521cfc 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -24,8 +24,8 @@ import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.util.facade.UserCache;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.interpolative.VariableInterpolator;
-import io.onedev.server.util.match.PatternApplied;
-import io.onedev.server.util.match.WildcardUtils;
+import io.onedev.commons.utils.match.PatternApplied;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.xodus.CommitInfoManager;
diff --git a/server-core/src/test/java/io/onedev/server/util/match/WildcardUtilsTest.java b/server-core/src/test/java/io/onedev/server/util/match/WildcardUtilsTest.java
deleted file mode 100644
index 84ba4729dd..0000000000
--- a/server-core/src/test/java/io/onedev/server/util/match/WildcardUtilsTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package io.onedev.server.util.match;
-
-import static io.onedev.server.util.match.WildcardUtils.*;
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-public class WildcardUtilsTest {
-
- @Test
- public void shouldMatchPath() {
- assertTrue(matchPath("**//*.java", "com/example/Test.java"));
- assertFalse(matchPath("**/*.java", "com/example/test.c"));
- assertFalse(matchPath("com/*.java", "com/example/Test.java"));
- assertTrue(matchPath("com/**//*.java", "com/example/Test.java"));
- assertTrue(matchPath("com/*.java", "com/Test.java"));
- assertTrue(matchPath("src///**/*.java", "src/com/example/Test.java"));
- assertFalse(matchPath("/src/**/*.java", "src/com/example/Test.java"));
- assertFalse(matchPath("src/**////*.java", "resource/com/example/Test.java"));
- }
-
- @Test
- public void shouldMatchString() {
- assertTrue(matchString("hello?world", "hello world"));
- assertFalse(matchString("hello?world", "hello world"));
- assertTrue(matchString("hello*world", "hello world"));
- assertTrue(matchString("**/*.java", "com/example/Test.java"));
- assertFalse(matchString("**/*.java", "com/example/test.c"));
- assertTrue(matchString("com/*.java", "com/example/Test.java"));
- assertTrue(matchString("com/**/*.java", "com/example/Test.java"));
- assertTrue(matchString("com/*.java", "com/Test.java"));
- assertTrue(matchString("src/**/*.java", "src/com/example/Test.java"));
- assertFalse(matchString("src/**/*.java", "resource/com/example/Test.java"));
- }
-
- @Test
- public void testRangeOfMatch() {
- assertEquals("1-3", rangeOfMatch("el", "hello").toString());
- assertEquals(null, rangeOfMatch("tu", "hello"));
- assertEquals("3-8", rangeOfMatch("lo*wo", "hello world").toString());
- assertEquals("3-9", rangeOfMatch("lo*w?r", "hello world").toString());
- assertEquals("12-37", rangeOfMatch("this*my*program", "hello world this is my first program").toString());
- }
-
- @Test
- public void shouldApplyStringPattern() {
- assertEquals("he*?lo:1-5", applyStringPattern("E*?l", "hello", false).toString());
- assertEquals(null, applyStringPattern("*he ?d", "hello world", false));
- assertEquals("*he*ld 2:0-6", applyStringPattern("*hE*ld", "hello world 2", false).toString());
- assertEquals("hello:0-0", applyStringPattern("", "hello", false).toString());
- assertEquals("*:0-1", applyStringPattern("*", "hello", false).toString());
- assertEquals("**:0-2", applyStringPattern("**", "hello", false).toString());
- assertEquals("he*:0-3", applyStringPattern("he*", "hello", false).toString());
- }
-
- @Test
- public void shouldApplyPathPattern() {
- assertEquals(null, applyPathPattern("ir/**/c/*.java", "dir/a/b/file.java", false));
- assertEquals("dir/file:4-7", applyPathPattern("fil", "dir/file", false).toString());
- assertEquals("dir/file:3-4", applyPathPattern("/", "dir/file", false).toString());
- assertEquals("dir/**/c*/*.java:1-16", applyPathPattern("ir/**/c*/*.java", "dir/a/b/c5/file.java", false).toString());
- assertEquals("dir/**/*.java:1-13", applyPathPattern("ir/**/*.java", "dir/a/b/file.java", false).toString());
- assertEquals("dir/**/file:0-11", applyPathPattern("dir/**/file", "dir/file", false).toString());
- assertEquals("dir/**/file:0-11", applyPathPattern("dir/**/file", "dir/a/b/file", false).toString());
- assertEquals("**/file:0-7", applyPathPattern("**/file", "dir/a/b/file", false).toString());
- assertEquals("**/file:0-7", applyPathPattern("**/file", "file", false).toString());
- assertEquals("dir/**:0-6", applyPathPattern("dir/**", "dir/subdir/file", false).toString());
- assertEquals("dir/**:0-6", applyPathPattern("dir/**", "dir/", false).toString());
- assertEquals("dir/**:0-6", applyPathPattern("dir/**", "dir", false).toString());
- assertEquals("di*/file:1-4", applyPathPattern("i*/", "dir/file", false).toString());
- assertEquals("dir/file:1-4", applyPathPattern("ir/", "dir/file", false).toString());
- assertEquals(null, applyPathPattern("**", "/file", false));
- assertEquals("*:0-1", applyPathPattern("*", "dir", false).toString());
- assertEquals("*/file:0-1", applyPathPattern("*", "dir/file", false).toString());
- assertEquals("**:0-2", applyPathPattern("**", "dir/file", false).toString());
- }
-
-}
diff --git a/server-ee b/server-ee
index efc37fd778..521d146676 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit efc37fd778f38626601eb1941658ba3f52fcc8c7
+Subproject commit 521d1466760e92a65907f1f540f283175378054f
diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
index 91d4c922e3..855a16ea39 100644
--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
@@ -534,8 +534,7 @@ public class ServerDockerExecutor extends JobExecutor implements RegistryLoginAw
}, new ArrayList<>());
- if (successful)
- cacheHelper.buildSuccessful();
+ cacheHelper.buildFinished();
return successful;
} finally {
diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
index e5ecdaf296..26134911b9 100644
--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
@@ -244,8 +244,8 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
}, new ArrayList<>());
- if (successful)
- cacheHelper.buildSuccessful();
+ cacheHelper.buildFinished();
+
return successful;
} finally {
// Fix https://code.onedev.io/onedev/server/~issues/597
diff --git a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportPage.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportPage.java
index e491f56c8d..754cfc2c5a 100644
--- a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportPage.java
+++ b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportPage.java
@@ -11,8 +11,8 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.exception.ExceptionUtils;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Build;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.StringMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.StringMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemFile.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemFile.java
index 845c4edb71..aa9eff755c 100644
--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemFile.java
+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemFile.java
@@ -3,7 +3,6 @@ package io.onedev.server.plugin.report.problem;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
import io.onedev.server.codequality.CodeProblem;
@@ -13,16 +12,28 @@ public class ProblemFile implements Serializable {
private final String blobPath;
+ private final boolean inRepo;
+
private final Collection<CodeProblem> problems = new ArrayList<>();
public ProblemFile(String blobPath) {
- this.blobPath = blobPath;
+ if (blobPath.startsWith(CodeProblem.NON_REPO_FILE_PREFIX)) {
+ this.blobPath = blobPath.substring(CodeProblem.NON_REPO_FILE_PREFIX.length());
+ inRepo = false;
+ } else {
+ this.blobPath = blobPath;
+ inRepo = true;
+ }
}
public String getBlobPath() {
return blobPath;
}
+ public boolean isInRepo() {
+ return inRepo;
+ }
+
public Collection<CodeProblem> getProblems() {
return problems;
}
diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
index e16f0a6d50..3f9389a682 100644
--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
@@ -6,6 +6,8 @@ import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.PlanarRange;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.OneDev;
import io.onedev.server.cluster.ClusterTask;
import io.onedev.server.codequality.CodeProblem;
@@ -15,15 +17,12 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.exception.ExceptionUtils;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Build;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.PatternSetAssistBehavior;
import io.onedev.server.web.component.NoRecordsPlaceholder;
import io.onedev.server.web.component.pagenavigator.OnePagingNavigator;
-import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderer;
import io.onedev.server.web.page.project.builds.detail.report.BuildReportPage;
@@ -229,6 +228,7 @@ public class ProblemReportPage extends BuildReportPage {
};
toggleLink.add(new Label("label", filePath));
+
toggleLink.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
@Override
@@ -245,7 +245,7 @@ public class ProblemReportPage extends BuildReportPage {
FileMode.REGULAR_FILE.getBits());
state.problemReport = getReportName();
PageParameters params = ProjectBlobPage.paramsOf(getProject(), state);
- item.add(new BookmarkablePageLink<Void>("view", ProjectBlobPage.class, params));
+ item.add(new BookmarkablePageLink<Void>("view", ProjectBlobPage.class, params).setVisible(file.isInRepo()));
item.add(new Label("tooManyProblems",
"Too many problems, displaying first " + MAX_PROBLEMS_TO_DISPLAY) {
diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReport.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReport.java
index 38662e0cbf..2a0ea85d5a 100644
--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReport.java
+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReport.java
@@ -2,8 +2,8 @@ package io.onedev.server.plugin.report.unittest;
import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.model.Build;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.util.patternset.PatternSet;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.wicket.Component;