Skip to content

The Unified and Autonomous Development Platform

Add patterns editing support

Robin Shend8385ae968db
diff --git a/core/pom.xml b/core/pom.xml
index c1723a61a1..5d9c558d7f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -4,8 +4,8 @@
<artifactId>server-core</artifactId>
<parent>
<groupId>io.onedev</groupId>
- <artifactId>server-parent</artifactId>
- <version>2.0.6</version>
+ <artifactId>server</artifactId>
+ <version>2.1.2</version>
</parent>
<build>
<plugins>
@@ -22,16 +22,26 @@
<dependencies>
<dependency>
<groupId>io.onedev</groupId>
- <artifactId>launcher-loader</artifactId>
- <version>${launcher.version}</version>
+ <artifactId>commons-launcher-loader</artifactId>
</dependency>
<dependency>
<groupId>io.onedev</groupId>
- <artifactId>launcher-loader</artifactId>
- <version>${launcher.version}</version>
+ <artifactId>commons-launcher-loader</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-codeassist</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-jsymbol</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-jsyntax</artifactId>
+ </dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -228,11 +238,6 @@
<artifactId>httpclient</artifactId>
<version>4.5.6</version>
</dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>codeassist</artifactId>
- <version>1.0.2</version>
- </dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>guice-bridge</artifactId>
@@ -362,16 +367,6 @@
<artifactId>juniversalchardet</artifactId>
<version>1.0.3</version>
</dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>jsymbol</artifactId>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>jsyntax</artifactId>
- <version>1.0.2</version>
- </dependency>
<dependency>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark</artifactId>
@@ -428,11 +423,9 @@
<groovy.version>2.4.14</groovy.version>
<wicket.version>7.10.0</wicket.version>
<wicketbootstrap.version>0.10.17</wicketbootstrap.version>
- <launcher.version>1.0.3</launcher.version>
<jersey.version>2.13</jersey.version>
<jetty.version>9.3.24.v20180605</jetty.version>
<jackson.version>2.9.8</jackson.version>
<servlet.version>3.1.0</servlet.version>
- <antlr.version>4.5.1-1</antlr.version>
</properties>
</project>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.java
index 6abcdfc04b..857846866a 100644
--- a/core/src/main/java/io/onedev/server/CoreModule.java
+++ b/core/src/main/java/io/onedev/server/CoreModule.java
@@ -64,9 +64,12 @@ import com.thoughtworks.xstream.core.JVM;
import com.thoughtworks.xstream.mapper.MapperWrapper;
import com.vladsch.flexmark.Extension;
-import io.onedev.launcher.bootstrap.Bootstrap;
-import io.onedev.launcher.loader.AbstractPlugin;
-import io.onedev.launcher.loader.AbstractPluginModule;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.loader.AbstractPlugin;
+import io.onedev.commons.launcher.loader.AbstractPluginModule;
+import io.onedev.commons.utils.ClassUtils;
+import io.onedev.commons.utils.schedule.DefaultTaskScheduler;
+import io.onedev.commons.utils.schedule.TaskScheduler;
import io.onedev.server.command.ApplyDBConstraintsCommand;
import io.onedev.server.command.BackupDBCommand;
import io.onedev.server.command.CheckDataVersionCommand;
@@ -250,9 +253,6 @@ import io.onedev.server.web.websocket.IssueEventBroadcaster;
import io.onedev.server.web.websocket.PullRequestEventBroadcaster;
import io.onedev.server.web.websocket.WebSocketManager;
import io.onedev.server.web.websocket.WebSocketPolicyProvider;
-import io.onedev.utils.ClassUtils;
-import io.onedev.utils.schedule.DefaultTaskScheduler;
-import io.onedev.utils.schedule.TaskScheduler;
/**
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
diff --git a/core/src/main/java/io/onedev/server/OneDev.java b/core/src/main/java/io/onedev/server/OneDev.java
index a3b2c66da3..141859f498 100644
--- a/core/src/main/java/io/onedev/server/OneDev.java
+++ b/core/src/main/java/io/onedev/server/OneDev.java
@@ -15,11 +15,14 @@ import org.apache.shiro.util.ThreadContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.launcher.bootstrap.Bootstrap;
-import io.onedev.launcher.loader.AbstractPlugin;
-import io.onedev.launcher.loader.AppLoader;
-import io.onedev.launcher.loader.ListenerRegistry;
-import io.onedev.launcher.loader.ManagedSerializedForm;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.loader.AbstractPlugin;
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.commons.launcher.loader.ManagedSerializedForm;
+import io.onedev.commons.utils.init.InitStage;
+import io.onedev.commons.utils.init.ManualConfig;
+import io.onedev.commons.utils.schedule.TaskScheduler;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStarting;
import io.onedev.server.event.system.SystemStopped;
@@ -33,9 +36,6 @@ import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.util.jetty.JettyRunner;
import io.onedev.server.util.serverconfig.ServerConfig;
import io.onedev.server.web.websocket.WebSocketManager;
-import io.onedev.utils.init.InitStage;
-import io.onedev.utils.init.ManualConfig;
-import io.onedev.utils.schedule.TaskScheduler;
public class OneDev extends AbstractPlugin implements Serializable {
diff --git a/core/src/main/java/io/onedev/server/ci/Dependency.java b/core/src/main/java/io/onedev/server/ci/Dependency.java
index 0e5337a1f9..778aad37ae 100644
--- a/core/src/main/java/io/onedev/server/ci/Dependency.java
+++ b/core/src/main/java/io/onedev/server/ci/Dependency.java
@@ -10,6 +10,7 @@ import io.onedev.server.ci.jobparam.JobParam;
import io.onedev.server.util.OneContext;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.Multiline;
import io.onedev.server.web.page.project.blob.render.renderers.cispec.dependencies.DependencyEditPanel;
@Editable
@@ -34,7 +35,8 @@ public class Dependency implements Serializable {
this.job = job;
}
- @Editable(order=200)
+ @Editable(order=200, description="Specify parameters of the dependency job. Dependency is satisfied only when "
+ + "there are builds of the job with same set of parameters specified here")
public List<JobParam> getParams() {
return params;
}
@@ -43,7 +45,9 @@ public class Dependency implements Serializable {
this.params = params;
}
- @Editable(order=200)
+ @Editable(order=300, description="Optionally specify space-separated artifact paths to retrieve. Path is relative to "
+ + "build artifacts directory. Use * or ? for wildcard match")
+ @Multiline
public String getArtifacts() {
return artifacts;
}
diff --git a/core/src/main/java/io/onedev/server/ci/Job.java b/core/src/main/java/io/onedev/server/ci/Job.java
index 474836f4f0..f48385cc0a 100644
--- a/core/src/main/java/io/onedev/server/ci/Job.java
+++ b/core/src/main/java/io/onedev/server/ci/Job.java
@@ -10,6 +10,7 @@ import io.onedev.server.ci.jobtrigger.JobTrigger;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Horizontal;
+import io.onedev.server.web.editable.annotation.PathPatterns;
@Editable
@Horizontal
@@ -41,7 +42,8 @@ public class Job implements Serializable {
this.name = name;
}
- @Editable(order=200)
+ @Editable(order=200, name="Prompt Parameters", description="Specify parameters to prompt when the job "
+ + "is triggered manually")
public List<InputSpec> getParams() {
return params;
}
@@ -59,7 +61,8 @@ public class Job implements Serializable {
this.steps = steps;
}
- @Editable(order=400)
+ @Editable(name="Dependency Jobs", order=400, description="Job dependencies determines the order and "
+ + "concurrency when run different jobs")
public List<Dependency> getDependencies() {
return dependencies;
}
@@ -68,7 +71,8 @@ public class Job implements Serializable {
this.dependencies = dependencies;
}
- @Editable(order=500)
+ @Editable(order=500, description="Use triggers to run the job automatically under certain conditions. "
+ + "The condition will be checked in order and the first matching trigger will take effect")
public List<JobTrigger> getTriggers() {
return triggers;
}
@@ -77,7 +81,9 @@ public class Job implements Serializable {
this.triggers = triggers;
}
- @Editable(order=500)
+ @Editable(order=600, description="Optionally specify space-separated artifact paths to publish. "
+ + "Artifact path is relative to job workspace. Use * or ? for wildcard match")
+ @PathPatterns
public String getArtifacts() {
return artifacts;
}
@@ -86,7 +92,7 @@ public class Job implements Serializable {
this.artifacts = artifacts;
}
- @Editable(order=600, description="Timeout in seconds")
+ @Editable(order=600, description="Specify timeout in seconds")
public long getTimeout() {
return timeout;
}
diff --git a/core/src/main/java/io/onedev/server/ci/jobparam/JobParam.java b/core/src/main/java/io/onedev/server/ci/jobparam/JobParam.java
index 255c98bfc9..d6280b4036 100644
--- a/core/src/main/java/io/onedev/server/ci/jobparam/JobParam.java
+++ b/core/src/main/java/io/onedev/server/ci/jobparam/JobParam.java
@@ -27,7 +27,8 @@ public class JobParam implements Serializable {
this.name = name;
}
- @Editable(order=200, name="Values")
+ @Editable(order=200, name="Values", description="Specify parameter values here. Multiple values tell "
+ + "the job to run multiple times, each time with one value")
@NotNull
public ValueProvider getValueProvider() {
return valueProvider;
diff --git a/core/src/main/java/io/onedev/server/ci/jobparam/ScriptingValues.java b/core/src/main/java/io/onedev/server/ci/jobparam/ScriptingValues.java
index 09f3a5875e..f2f818bd0f 100644
--- a/core/src/main/java/io/onedev/server/ci/jobparam/ScriptingValues.java
+++ b/core/src/main/java/io/onedev/server/ci/jobparam/ScriptingValues.java
@@ -11,15 +11,15 @@ import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.Script;
-@Editable(order=200, name="Evaluate script to get choices")
+@Editable(order=200, name="Evaluate script to get values")
public class ScriptingValues implements ValueProvider {
private static final long serialVersionUID = 1L;
private String script;
- @Editable(description="Groovy script to be evaluated. The return value should be a list of string to "
- + "be used as param values")
+ @Editable(description="Groovy script to be evaluated. The return value should be a list of string with "
+ + "each item representing a separate value")
@NotEmpty
@Script
@OmitName
diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java
index 4705121f9f..3fe898b7ee 100644
--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java
+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java
@@ -1,40 +1,46 @@
package io.onedev.server.ci.jobtrigger;
import java.util.Collection;
+import java.util.List;
import org.eclipse.jgit.lib.ObjectId;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.utils.PathUtils;
import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.Job;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.GitUtils;
-import io.onedev.server.web.editable.annotation.BranchPattern;
+import io.onedev.server.util.OneContext;
+import io.onedev.server.web.editable.annotation.BranchPatterns;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.PathPattern;
-import io.onedev.utils.PathUtils;
+import io.onedev.server.web.editable.annotation.PathPatterns;
+import io.onedev.server.web.util.SuggestionUtils;
@Editable(order=100, name="When pushes to branches")
public class BranchPushedTrigger extends JobTrigger {
private static final long serialVersionUID = 1L;
- private String branches;
+ private String branch;
private String path;
- @Editable(order=100)
- @BranchPattern
- public String getBranches() {
- return branches;
+ @Editable(order=100,
+ description="Optionally specify branch to match. Wildcard character * and ? may be used")
+ @BranchPatterns
+ public String getBranch() {
+ return branch;
}
- public void setBranches(String branches) {
- this.branches = branches;
+ public void setBranch(String branch) {
+ this.branch = branch;
}
- @Editable(order=200)
- @PathPattern
+ @Editable(name="File", order=200,
+ description="Optionally specify file to match. Wildcard character * and ? may be used")
+ @PathPatterns("getPathSuggestions")
public String getPath() {
return path;
}
@@ -42,26 +48,41 @@ public class BranchPushedTrigger extends JobTrigger {
public void setPath(String path) {
this.path = path;
}
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> getPathSuggestions(String matchWith) {
+ return SuggestionUtils.suggestBlobs(OneContext.get().getProject(), matchWith);
+ }
+ private boolean touchedFile(RefUpdated refUpdated) {
+ if (getPath() != null) {
+ if (refUpdated.getOldCommitId().equals(ObjectId.zeroId())) {
+ return true;
+ } else if (refUpdated.getNewCommitId().equals(ObjectId.zeroId())) {
+ return false;
+ } else {
+ Collection<String> changedFiles = GitUtils.getChangedFiles(refUpdated.getProject().getRepository(),
+ refUpdated.getOldCommitId(), refUpdated.getNewCommitId());
+ for (String changedFile: changedFiles) {
+ if (PathUtils.matchChildAware(getPath(), changedFile))
+ return true;
+ }
+ return false;
+ }
+ } else {
+ return true;
+ }
+ }
+
@Override
protected boolean matches(ProjectEvent event, CISpec ciSpec, Job job) {
if (event instanceof RefUpdated) {
RefUpdated refUpdated = (RefUpdated) event;
- String branch = GitUtils.ref2branch(refUpdated.getRefName());
- if (branch != null && PathUtils.matchChildAware(getBranches(), branch)) {
- if (refUpdated.getOldCommitId().equals(ObjectId.zeroId())) {
+ String pushedBranch = GitUtils.ref2branch(refUpdated.getRefName());
+ if (pushedBranch != null) {
+ if ((getBranch() == null || PathUtils.matchChildAware(getBranch(), pushedBranch))
+ && touchedFile(refUpdated)) {
return true;
- } else if (!refUpdated.getNewCommitId().equals(ObjectId.zeroId())) {
- if (getPath() != null) {
- Collection<String> changedFiles = GitUtils.getChangedFiles(event.getProject().getRepository(),
- refUpdated.getOldCommitId(), refUpdated.getNewCommitId());
- for (String changedFile: changedFiles) {
- if (PathUtils.matchChildAware(getPath(), changedFile))
- return true;
- }
- } else {
- return true;
- }
}
}
}
@@ -70,14 +91,19 @@ public class BranchPushedTrigger extends JobTrigger {
@Override
public String getDescription() {
- if (getBranches() != null && getPath() != null)
- return "When push to branches '" + getBranches() + "' on path '" + getPath() + "'";
- else if (getBranches() != null)
- return "When push to branches '" + getBranches() + "'";
+ String condition;
+ if (getBranch() != null && getPath() != null)
+ condition = String.format("when push to branch %s and touch file %s", getBranch(), getPath());
+ else if (getBranch() != null)
+ condition = String.format("when push to branch %s", getBranch());
else if (getPath() != null)
- return "When push to branches '" + getPath() + "'";
+ condition = String.format("when push to branch %s", getBranch());
+ else
+ condition = "when push to branches";
+ if (isIgnore())
+ return "Do not trigger " + condition;
else
- return "When push to branches";
+ return "Trigger " + condition;
}
}
diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java
index 7ddc3d5a35..22f398e195 100644
--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java
+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java
@@ -8,16 +8,32 @@ import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.Job;
import io.onedev.server.ci.jobparam.JobParam;
import io.onedev.server.event.ProjectEvent;
+import io.onedev.server.util.OneContext;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.ShowCondition;
@Editable
public abstract class JobTrigger implements Serializable {
private static final long serialVersionUID = 1L;
+ private boolean ignore;
+
private List<JobParam> params = new ArrayList<>();
+ @Editable(order=900, description="Check to ignore triggering of the job. This is normally used to "
+ + "exclude a specific condition from triggering the job, while there is a more general "
+ + "condition below to trigger the job")
+ public boolean isIgnore() {
+ return ignore;
+ }
+
+ public void setIgnore(boolean ignore) {
+ this.ignore = ignore;
+ }
+
@Editable(order=1000)
+ @ShowCondition("isParamsVisible")
public List<JobParam> getParams() {
return params;
}
@@ -26,6 +42,11 @@ public abstract class JobTrigger implements Serializable {
this.params = params;
}
+ @SuppressWarnings("unused")
+ private static boolean isParamsVisible() {
+ return !(boolean) OneContext.get().getEditContext().getInputValue("ignore");
+ }
+
protected abstract boolean matches(ProjectEvent event, CISpec ciSpec, Job job);
public abstract String getDescription();
diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java
index a44049341b..e90619c836 100644
--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java
+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java
@@ -1,52 +1,62 @@
package io.onedev.server.ci.jobtrigger;
+import io.onedev.commons.utils.PathUtils;
import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.Job;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.event.pullrequest.PullRequestOpened;
import io.onedev.server.event.pullrequest.PullRequestUpdated;
-import io.onedev.server.web.editable.annotation.BranchPattern;
+import io.onedev.server.web.editable.annotation.BranchPatterns;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.utils.PathUtils;
@Editable(order=300, name="When pull requests are created/updated")
public class PullRequestTrigger extends JobTrigger {
private static final long serialVersionUID = 1L;
- private String targetBranches;
+ private String targetBranch;
- @Editable(order=100)
- @BranchPattern
- public String getTargetBranches() {
- return targetBranches;
+ @Editable(order=100, description="Optionally specify target branch of the pull request to match. "
+ + "Wildcard character * and ? may be used")
+ @BranchPatterns
+ public String getTargetBranch() {
+ return targetBranch;
}
- public void setTargetBranches(String targetBranches) {
- this.targetBranches = targetBranches;
+ public void setTargetBranch(String targetBranch) {
+ this.targetBranch = targetBranch;
}
-
+
@Override
protected boolean matches(ProjectEvent event, CISpec ciSpec, Job job) {
if (event instanceof PullRequestOpened) {
PullRequestOpened pullRequestOpened = (PullRequestOpened) event;
- if (PathUtils.matchChildAware(getTargetBranches(), pullRequestOpened.getRequest().getTargetBranch()))
+ if (getTargetBranch() == null
+ || PathUtils.matchChildAware(getTargetBranch(), pullRequestOpened.getRequest().getTargetBranch())) {
return true;
+ }
}
if (event instanceof PullRequestUpdated) {
PullRequestUpdated pullRequestUpdated = (PullRequestUpdated) event;
- if (PathUtils.matchChildAware(getTargetBranches(), pullRequestUpdated.getRequest().getTargetBranch()))
+ if (getTargetBranch() == null
+ || PathUtils.matchChildAware(getTargetBranch(), pullRequestUpdated.getRequest().getTargetBranch())) {
return true;
+ }
}
return false;
}
@Override
public String getDescription() {
- if (getTargetBranches() != null)
- return "When pull requests targeting branch '" + getTargetBranches() + "'are created/updated";
+ String condition;
+ if (getTargetBranch() != null)
+ condition = String.format("when pull requests to branch %s are created/updated", getTargetBranch());
+ else
+ condition = "when pull requests are created/updated";
+ if (isIgnore())
+ return "Do not trigger " + condition;
else
- return "When pull requests are created/updated";
+ return "Trigger " + condition;
}
}
diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java
index 8defdbe89d..d6a501c247 100644
--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java
+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java
@@ -2,39 +2,39 @@ package io.onedev.server.ci.jobtrigger;
import org.eclipse.jgit.lib.ObjectId;
+import io.onedev.commons.utils.PathUtils;
import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.Job;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.GitUtils;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.TagPattern;
-import io.onedev.utils.PathUtils;
+import io.onedev.server.web.editable.annotation.TagPatterns;
@Editable(order=200, name="When tags are created")
public class TagCreatedTrigger extends JobTrigger {
private static final long serialVersionUID = 1L;
- private String tags;
+ private String tag;
- @Editable(order=100)
- @TagPattern
- public String getTags() {
- return tags;
+ @Editable(order=100, description="Optionally specify tag to match. Wildcard character * and ? may be used")
+ @TagPatterns
+ public String getTag() {
+ return tag;
}
- public void setTags(String tags) {
- this.tags = tags;
+ public void setTag(String tag) {
+ this.tag = tag;
}
@Override
protected boolean matches(ProjectEvent event, CISpec ciSpec, Job job) {
if (event instanceof RefUpdated) {
RefUpdated refUpdated = (RefUpdated) event;
- String tag = GitUtils.ref2tag(refUpdated.getRefName());
- if (tag != null && !refUpdated.getNewCommitId().equals(ObjectId.zeroId())
- && PathUtils.matchChildAware(getTags(), tag)) {
+ String pushedTag = GitUtils.ref2tag(refUpdated.getRefName());
+ if (pushedTag != null && !refUpdated.getNewCommitId().equals(ObjectId.zeroId())
+ && (getTag() == null || PathUtils.matchChildAware(getTag(), pushedTag))) {
return true;
}
}
@@ -43,10 +43,16 @@ public class TagCreatedTrigger extends JobTrigger {
@Override
public String getDescription() {
- if (getTags() != null)
- return "When tags '" + getTags() + "' are created ";
+ String condition;
+ if (getTag() != null)
+ condition = String.format("when tag %s is created", getTag());
else
- return "When tags are created";
+ condition = "when tags are created";
+
+ if (isIgnore())
+ return "Do not trigger " + condition;
+ else
+ return "Trigger " + condition;
}
}
diff --git a/core/src/main/java/io/onedev/server/command/ApplyDBConstraintsCommand.java b/core/src/main/java/io/onedev/server/command/ApplyDBConstraintsCommand.java
index 02826d6383..1889d6d5fb 100644
--- a/core/src/main/java/io/onedev/server/command/ApplyDBConstraintsCommand.java
+++ b/core/src/main/java/io/onedev/server/command/ApplyDBConstraintsCommand.java
@@ -14,7 +14,7 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
import io.onedev.server.persistence.DefaultPersistManager;
import io.onedev.server.persistence.HibernateProperties;
import io.onedev.server.persistence.IdManager;
diff --git a/core/src/main/java/io/onedev/server/command/BackupDBCommand.java b/core/src/main/java/io/onedev/server/command/BackupDBCommand.java
index d6053d1e90..0c75ce560c 100644
--- a/core/src/main/java/io/onedev/server/command/BackupDBCommand.java
+++ b/core/src/main/java/io/onedev/server/command/BackupDBCommand.java
@@ -11,15 +11,15 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.ZipUtils;
import io.onedev.server.persistence.DefaultPersistManager;
import io.onedev.server.persistence.HibernateProperties;
import io.onedev.server.persistence.IdManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.validation.EntityValidator;
-import io.onedev.utils.ExceptionUtils;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.ZipUtils;
@Singleton
public class BackupDBCommand extends DefaultPersistManager {
diff --git a/core/src/main/java/io/onedev/server/command/CheckDataVersionCommand.java b/core/src/main/java/io/onedev/server/command/CheckDataVersionCommand.java
index 17df6da585..d2e2378576 100644
--- a/core/src/main/java/io/onedev/server/command/CheckDataVersionCommand.java
+++ b/core/src/main/java/io/onedev/server/command/CheckDataVersionCommand.java
@@ -9,7 +9,7 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
import io.onedev.server.persistence.DefaultPersistManager;
import io.onedev.server.persistence.HibernateProperties;
import io.onedev.server.persistence.IdManager;
diff --git a/core/src/main/java/io/onedev/server/command/CleanDBCommand.java b/core/src/main/java/io/onedev/server/command/CleanDBCommand.java
index da840274a4..0990ce754a 100644
--- a/core/src/main/java/io/onedev/server/command/CleanDBCommand.java
+++ b/core/src/main/java/io/onedev/server/command/CleanDBCommand.java
@@ -10,7 +10,7 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
import io.onedev.server.persistence.DefaultPersistManager;
import io.onedev.server.persistence.HibernateProperties;
import io.onedev.server.persistence.IdManager;
diff --git a/core/src/main/java/io/onedev/server/command/ResetAdminPasswordCommand.java b/core/src/main/java/io/onedev/server/command/ResetAdminPasswordCommand.java
index 9b55771bd3..76cc48ba4c 100644
--- a/core/src/main/java/io/onedev/server/command/ResetAdminPasswordCommand.java
+++ b/core/src/main/java/io/onedev/server/command/ResetAdminPasswordCommand.java
@@ -10,7 +10,7 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.User;
import io.onedev.server.persistence.DefaultPersistManager;
diff --git a/core/src/main/java/io/onedev/server/command/RestoreDBCommand.java b/core/src/main/java/io/onedev/server/command/RestoreDBCommand.java
index 5321e0cc38..95dc0d0272 100644
--- a/core/src/main/java/io/onedev/server/command/RestoreDBCommand.java
+++ b/core/src/main/java/io/onedev/server/command/RestoreDBCommand.java
@@ -11,15 +11,15 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.launcher.bootstrap.Bootstrap;
-import io.onedev.launcher.bootstrap.Command;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.bootstrap.Command;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.ZipUtils;
import io.onedev.server.persistence.DefaultPersistManager;
import io.onedev.server.persistence.HibernateProperties;
import io.onedev.server.persistence.IdManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.validation.EntityValidator;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.ZipUtils;
@Singleton
public class RestoreDBCommand extends DefaultPersistManager {
diff --git a/core/src/main/java/io/onedev/server/command/UpgradeCommand.java b/core/src/main/java/io/onedev/server/command/UpgradeCommand.java
index f055f02eb1..46fabd4ef8 100644
--- a/core/src/main/java/io/onedev/server/command/UpgradeCommand.java
+++ b/core/src/main/java/io/onedev/server/command/UpgradeCommand.java
@@ -20,8 +20,12 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Charsets;
-import io.onedev.launcher.bootstrap.Bootstrap;
-import io.onedev.launcher.loader.PluginManager;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.loader.PluginManager;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.server.migration.DatabaseMigrator;
import io.onedev.server.migration.MigrationHelper;
import io.onedev.server.persistence.DefaultPersistManager;
@@ -29,10 +33,6 @@ import io.onedev.server.persistence.HibernateProperties;
import io.onedev.server.persistence.IdManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.validation.EntityValidator;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.StringUtils;
-import io.onedev.utils.command.Commandline;
-import io.onedev.utils.command.LineConsumer;
@Singleton
public class UpgradeCommand extends DefaultPersistManager {
@@ -75,8 +75,10 @@ public class UpgradeCommand extends DefaultPersistManager {
bootstrapClass = "com.gitplex.launcher.bootstrap.Bootstrap";
} else if (version.startsWith("1.0.1")) {
bootstrapClass = "com.turbodev.launcher.bootstrap.Bootstrap";
- } else {
+ } else if (version.startsWith("2.0.")){
bootstrapClass = "io.onedev.launcher.bootstrap.Bootstrap";
+ } else {
+ bootstrapClass = "io.onedev.commons.launcher.bootstrap.Bootstrap";
}
Commandline cmdline= new Commandline(System.getProperty("java.home") + "/bin/java");
cmdline.addArgs("-Xmx" + Runtime.getRuntime().maxMemory()/1024/1024 + "m", "-classpath", "*", bootstrapClass,
@@ -446,11 +448,13 @@ public class UpgradeCommand extends DefaultPersistManager {
File wrapperConfFile = new File(upgradeDir, "conf/wrapper.conf");
String wrapperConf = FileUtils.readFileToString(wrapperConfFile, Charsets.UTF_8);
wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.commons.bootstrap.Bootstrap",
- "io.onedev.launcher.bootstrap.Bootstrap");
+ "io.onedev.commons.launcher.bootstrap.Bootstrap");
wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.launcher.bootstrap.Bootstrap",
- "io.onedev.launcher.bootstrap.Bootstrap");
+ "io.onedev.commons.launcher.bootstrap.Bootstrap");
wrapperConf = StringUtils.replace(wrapperConf, "com.turbodev.launcher.bootstrap.Bootstrap",
- "io.onedev.launcher.bootstrap.Bootstrap");
+ "io.onedev.commons.launcher.bootstrap.Bootstrap");
+ wrapperConf = StringUtils.replace(wrapperConf, "io.onedev.launcher.bootstrap.Bootstrap",
+ "io.onedev.commons.launcher.bootstrap.Bootstrap");
FileUtils.writeStringToFile(wrapperConfFile, wrapperConf, Charsets.UTF_8);
File hibernatePropsFile = new File(upgradeDir, "conf/hibernate.properties");
diff --git a/core/src/main/java/io/onedev/server/git/BlameBlock.java b/core/src/main/java/io/onedev/server/git/BlameBlock.java
index f0c09be50d..2e3299c002 100644
--- a/core/src/main/java/io/onedev/server/git/BlameBlock.java
+++ b/core/src/main/java/io/onedev/server/git/BlameBlock.java
@@ -4,7 +4,7 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils;
-import io.onedev.utils.Range;
+import io.onedev.commons.utils.Range;
public class BlameBlock {
diff --git a/core/src/main/java/io/onedev/server/git/BlobChange.java b/core/src/main/java/io/onedev/server/git/BlobChange.java
index 1aa3bd170a..c4d350364c 100644
--- a/core/src/main/java/io/onedev/server/git/BlobChange.java
+++ b/core/src/main/java/io/onedev/server/git/BlobChange.java
@@ -13,7 +13,7 @@ import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import com.google.common.base.Preconditions;
-import io.onedev.jsyntax.Tokenized;
+import io.onedev.commons.jsyntax.Tokenized;
import io.onedev.server.util.diff.DiffBlock;
import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.util.diff.WhitespaceOption;
diff --git a/core/src/main/java/io/onedev/server/git/GitFilter.java b/core/src/main/java/io/onedev/server/git/GitFilter.java
index f841f1d862..0df8122216 100644
--- a/core/src/main/java/io/onedev/server/git/GitFilter.java
+++ b/core/src/main/java/io/onedev/server/git/GitFilter.java
@@ -25,6 +25,7 @@ import org.eclipse.jgit.transport.PacketLineOut;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import io.onedev.commons.utils.concurrent.PrioritizedRunnable;
import io.onedev.server.OneDev;
import io.onedev.server.git.command.AdvertiseReceiveRefsCommand;
import io.onedev.server.git.command.AdvertiseUploadRefsCommand;
@@ -40,7 +41,6 @@ import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.serverconfig.ServerConfig;
-import io.onedev.utils.concurrent.PrioritizedRunnable;
@Singleton
public class GitFilter implements Filter {
diff --git a/core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java b/core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java
index 2c90a3a7b4..a061686967 100644
--- a/core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java
+++ b/core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java
@@ -18,13 +18,13 @@ import org.eclipse.jgit.lib.RefUpdate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.persistence.UnitOfWork;
-import io.onedev.utils.StringUtils;
import com.google.common.base.Preconditions;
diff --git a/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java b/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java
index 4bbf8088b8..9368970ff3 100644
--- a/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java
+++ b/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java
@@ -21,6 +21,7 @@ import org.eclipse.jgit.lib.ObjectId;
import com.google.common.base.Preconditions;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.Project;
@@ -32,7 +33,6 @@ import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.security.permission.ProjectPrivilege;
import io.onedev.server.util.PullRequestConstants;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
@Singleton
diff --git a/core/src/main/java/io/onedev/server/git/GitUtils.java b/core/src/main/java/io/onedev/server/git/GitUtils.java
index 35dd45a35c..bc8ef758e6 100644
--- a/core/src/main/java/io/onedev/server/git/GitUtils.java
+++ b/core/src/main/java/io/onedev/server/git/GitUtils.java
@@ -53,13 +53,13 @@ import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.google.common.collect.Iterables;
+import io.onedev.commons.utils.LockUtils;
+import io.onedev.commons.utils.PathUtils;
import io.onedev.server.git.command.FetchCommand;
import io.onedev.server.git.command.IsAncestorCommand;
import io.onedev.server.git.exception.ObsoleteCommitException;
import io.onedev.server.git.exception.RefUpdateException;
import io.onedev.server.util.diff.WhitespaceOption;
-import io.onedev.utils.LockUtils;
-import io.onedev.utils.PathUtils;
public class GitUtils {
diff --git a/core/src/main/java/io/onedev/server/git/GitVersion.java b/core/src/main/java/io/onedev/server/git/GitVersion.java
index 28980cd458..b4cf0c6a23 100644
--- a/core/src/main/java/io/onedev/server/git/GitVersion.java
+++ b/core/src/main/java/io/onedev/server/git/GitVersion.java
@@ -6,7 +6,7 @@ import java.util.List;
import org.apache.commons.lang3.math.NumberUtils;
-import io.onedev.utils.StringUtils;
+import io.onedev.commons.utils.StringUtils;
public class GitVersion implements Comparable<GitVersion> {
diff --git a/core/src/main/java/io/onedev/server/git/command/AdvertiseReceiveRefsCommand.java b/core/src/main/java/io/onedev/server/git/command/AdvertiseReceiveRefsCommand.java
index a923da37b1..c0628cbd80 100644
--- a/core/src/main/java/io/onedev/server/git/command/AdvertiseReceiveRefsCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/AdvertiseReceiveRefsCommand.java
@@ -8,8 +8,8 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-import io.onedev.utils.command.Commandline;
-import io.onedev.utils.command.LineConsumer;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
public class AdvertiseReceiveRefsCommand extends GitCommand<Void> {
diff --git a/core/src/main/java/io/onedev/server/git/command/AdvertiseUploadRefsCommand.java b/core/src/main/java/io/onedev/server/git/command/AdvertiseUploadRefsCommand.java
index 786b46e876..ea5d85e95b 100644
--- a/core/src/main/java/io/onedev/server/git/command/AdvertiseUploadRefsCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/AdvertiseUploadRefsCommand.java
@@ -8,8 +8,8 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-import io.onedev.utils.command.Commandline;
-import io.onedev.utils.command.LineConsumer;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
public class AdvertiseUploadRefsCommand extends GitCommand<Void> {
diff --git a/core/src/main/java/io/onedev/server/git/command/BlameCommand.java b/core/src/main/java/io/onedev/server/git/command/BlameCommand.java
index 494c419957..0a117e9180 100644
--- a/core/src/main/java/io/onedev/server/git/command/BlameCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/BlameCommand.java
@@ -20,13 +20,13 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
+import io.onedev.commons.utils.Range;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.ExecuteResult;
+import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.server.git.BlameBlock;
import io.onedev.server.git.BlameCommit;
import io.onedev.server.git.GitUtils;
-import io.onedev.utils.Range;
-import io.onedev.utils.command.Commandline;
-import io.onedev.utils.command.ExecuteResult;
-import io.onedev.utils.command.LineConsumer;
public class BlameCommand extends GitCommand<Collection<BlameBlock>> {
diff --git a/core/src/main/java/io/onedev/server/git/command/CloneCommand.java b/core/src/main/java/io/onedev/server/git/command/CloneCommand.java
index 7a7646054a..e30ce33765 100644
--- a/core/src/main/java/io/onedev/server/git/command/CloneCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/CloneCommand.java
@@ -7,8 +7,8 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-import io.onedev.utils.command.Commandline;
-import io.onedev.utils.command.LineConsumer;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
public class CloneCommand extends GitCommand<Void> {
diff --git a/core/src/main/java/io/onedev/server/git/command/FetchCommand.java b/core/src/main/java/io/onedev/server/git/command/FetchCommand.java
index 4be2ab54cf..ffc3d6209e 100644
--- a/core/src/main/java/io/onedev/server/git/command/FetchCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/FetchCommand.java
@@ -7,8 +7,8 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-import io.onedev.utils.command.Commandline;
-import io.onedev.utils.command.LineConsumer;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
public class FetchCommand extends GitCommand<Void> {
diff --git a/core/src/main/java/io/onedev/server/git/command/GitCommand.java b/core/src/main/java/io/onedev/server/git/command/GitCommand.java
index 59551a8291..a327e702bd 100644
--- a/core/src/main/java/io/onedev/server/git/command/GitCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/GitCommand.java
@@ -10,12 +10,12 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.server.git.GitVersion;
import io.onedev.server.git.config.GitConfig;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.command.Commandline;
-import io.onedev.utils.command.LineConsumer;
public abstract class GitCommand<V> implements Callable<V> {
diff --git a/core/src/main/java/io/onedev/server/git/command/IsAncestorCommand.java b/core/src/main/java/io/onedev/server/git/command/IsAncestorCommand.java
index 8eec36bb17..f849003f14 100644
--- a/core/src/main/java/io/onedev/server/git/command/IsAncestorCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/IsAncestorCommand.java
@@ -8,9 +8,9 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-import io.onedev.utils.command.Commandline;
-import io.onedev.utils.command.ExecuteResult;
-import io.onedev.utils.command.LineConsumer;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.ExecuteResult;
+import io.onedev.commons.utils.command.LineConsumer;
public class IsAncestorCommand extends GitCommand<Boolean> {
diff --git a/core/src/main/java/io/onedev/server/git/command/ListChangedFilesCommand.java b/core/src/main/java/io/onedev/server/git/command/ListChangedFilesCommand.java
index 5a414a1b71..9a1ed6c4fd 100644
--- a/core/src/main/java/io/onedev/server/git/command/ListChangedFilesCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/ListChangedFilesCommand.java
@@ -12,8 +12,8 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-import io.onedev.utils.command.Commandline;
-import io.onedev.utils.command.LineConsumer;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
public class ListChangedFilesCommand extends GitCommand<Collection<String>> {
diff --git a/core/src/main/java/io/onedev/server/git/command/ListFileChangesCommand.java b/core/src/main/java/io/onedev/server/git/command/ListFileChangesCommand.java
index cf8df29fe9..738d4b689e 100644
--- a/core/src/main/java/io/onedev/server/git/command/ListFileChangesCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/ListFileChangesCommand.java
@@ -11,8 +11,8 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-import io.onedev.utils.command.Commandline;
-import io.onedev.utils.command.LineConsumer;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
public class ListFileChangesCommand extends GitCommand<Collection<FileChange>> {
diff --git a/core/src/main/java/io/onedev/server/git/command/LogCommand.java b/core/src/main/java/io/onedev/server/git/command/LogCommand.java
index eaebfa22ac..daffb4ee8b 100644
--- a/core/src/main/java/io/onedev/server/git/command/LogCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/LogCommand.java
@@ -14,9 +14,9 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.server.git.GitUtils;
-import io.onedev.utils.command.Commandline;
-import io.onedev.utils.command.LineConsumer;
public abstract class LogCommand extends GitCommand<Void> {
diff --git a/core/src/main/java/io/onedev/server/git/command/ReceiveCommand.java b/core/src/main/java/io/onedev/server/git/command/ReceiveCommand.java
index e4792b29d4..44cef5f5ff 100644
--- a/core/src/main/java/io/onedev/server/git/command/ReceiveCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/ReceiveCommand.java
@@ -10,8 +10,8 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-import io.onedev.utils.command.Commandline;
-import io.onedev.utils.command.LineConsumer;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
public class ReceiveCommand extends GitCommand<Void> {
diff --git a/core/src/main/java/io/onedev/server/git/command/RevListCommand.java b/core/src/main/java/io/onedev/server/git/command/RevListCommand.java
index aeee5bd0f1..36b8f46ace 100644
--- a/core/src/main/java/io/onedev/server/git/command/RevListCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/RevListCommand.java
@@ -9,8 +9,8 @@ import org.apache.commons.lang3.time.DateFormatUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.utils.command.Commandline;
-import io.onedev.utils.command.LineConsumer;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
public class RevListCommand extends GitCommand<List<String>> {
diff --git a/core/src/main/java/io/onedev/server/git/command/UploadCommand.java b/core/src/main/java/io/onedev/server/git/command/UploadCommand.java
index 4719bc2363..44e894233b 100644
--- a/core/src/main/java/io/onedev/server/git/command/UploadCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/UploadCommand.java
@@ -10,8 +10,8 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-import io.onedev.utils.command.Commandline;
-import io.onedev.utils.command.LineConsumer;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
public class UploadCommand extends GitCommand<Void> {
diff --git a/core/src/main/java/io/onedev/server/git/config/CurlConfig.java b/core/src/main/java/io/onedev/server/git/config/CurlConfig.java
index b51c424c0a..ff7bd2fe5c 100644
--- a/core/src/main/java/io/onedev/server/git/config/CurlConfig.java
+++ b/core/src/main/java/io/onedev/server/git/config/CurlConfig.java
@@ -8,11 +8,11 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.utils.command.Commandline;
-import io.onedev.utils.command.LineConsumer;
/**
* Git relevant settings.
diff --git a/core/src/main/java/io/onedev/server/manager/BatchWorkManager.java b/core/src/main/java/io/onedev/server/manager/BatchWorkManager.java
index e0a36c60b2..19ce934661 100644
--- a/core/src/main/java/io/onedev/server/manager/BatchWorkManager.java
+++ b/core/src/main/java/io/onedev/server/manager/BatchWorkManager.java
@@ -1,7 +1,7 @@
package io.onedev.server.manager;
+import io.onedev.commons.utils.concurrent.Prioritized;
import io.onedev.server.util.BatchWorker;
-import io.onedev.utils.concurrent.Prioritized;
public interface BatchWorkManager {
diff --git a/core/src/main/java/io/onedev/server/manager/DataManager.java b/core/src/main/java/io/onedev/server/manager/DataManager.java
index 686e6f2ced..5e21a26c79 100644
--- a/core/src/main/java/io/onedev/server/manager/DataManager.java
+++ b/core/src/main/java/io/onedev/server/manager/DataManager.java
@@ -4,8 +4,8 @@ import java.util.List;
import javax.annotation.Nullable;
+import io.onedev.commons.utils.init.ManualConfig;
import io.onedev.server.model.support.setting.BackupSetting;
-import io.onedev.utils.init.ManualConfig;
public interface DataManager {
diff --git a/core/src/main/java/io/onedev/server/manager/WorkExecutor.java b/core/src/main/java/io/onedev/server/manager/WorkExecutor.java
index e0664964bf..c9b1af5b92 100644
--- a/core/src/main/java/io/onedev/server/manager/WorkExecutor.java
+++ b/core/src/main/java/io/onedev/server/manager/WorkExecutor.java
@@ -7,8 +7,8 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import io.onedev.utils.concurrent.PrioritizedCallable;
-import io.onedev.utils.concurrent.PrioritizedRunnable;
+import io.onedev.commons.utils.concurrent.PrioritizedCallable;
+import io.onedev.commons.utils.concurrent.PrioritizedRunnable;
/**
* This executor is intended to run resource intensive long running tasks
diff --git a/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java b/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java
index 6f10ccf0a8..45db8e60b8 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java
@@ -14,9 +14,9 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.ObjectId;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.utils.FileUtils;
import io.onedev.server.event.system.SystemStopping;
-import io.onedev.utils.FileUtils;
import com.google.common.base.Charsets;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultAttachmentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultAttachmentManager.java
index e42481848e..47602eacd1 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultAttachmentManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultAttachmentManager.java
@@ -11,7 +11,10 @@ import org.quartz.ScheduleBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.schedule.SchedulableTask;
+import io.onedev.commons.utils.schedule.TaskScheduler;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.system.SystemStarted;
@@ -25,9 +28,6 @@ import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.facade.ProjectFacade;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.schedule.SchedulableTask;
-import io.onedev.utils.schedule.TaskScheduler;
@Singleton
public class DefaultAttachmentManager implements AttachmentManager, SchedulableTask {
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultBatchWorkManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultBatchWorkManager.java
index 84daf3b005..d111754833 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultBatchWorkManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultBatchWorkManager.java
@@ -15,14 +15,14 @@ import javax.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.utils.concurrent.Prioritized;
+import io.onedev.commons.utils.concurrent.PrioritizedRunnable;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.manager.BatchWorkManager;
import io.onedev.server.manager.WorkExecutor;
import io.onedev.server.util.BatchWorker;
-import io.onedev.utils.concurrent.Prioritized;
-import io.onedev.utils.concurrent.PrioritizedRunnable;
@Singleton
public class DefaultBatchWorkManager implements BatchWorkManager, Runnable {
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildInfoManager.java
index a37c43dd1d..b6ac2443c7 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildInfoManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildInfoManager.java
@@ -13,7 +13,9 @@ import org.eclipse.jgit.lib.ObjectId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.concurrent.Prioritized;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.system.SystemStarted;
@@ -30,8 +32,6 @@ import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.BatchWorker;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.concurrent.Prioritized;
import jetbrains.exodus.ByteIterable;
import jetbrains.exodus.env.Environment;
import jetbrains.exodus.env.Store;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java
index 399112f5ee..7fee958743 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java
@@ -21,8 +21,10 @@ import org.hibernate.query.Query;
import org.quartz.CronScheduleBuilder;
import org.quartz.ScheduleBuilder;
-import io.onedev.launcher.loader.Listen;
-import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.commons.utils.schedule.SchedulableTask;
+import io.onedev.commons.utils.schedule.TaskScheduler;
import io.onedev.server.OneDev;
import io.onedev.server.event.build.BuildFinished;
import io.onedev.server.event.build.BuildStarted;
@@ -47,8 +49,6 @@ import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.search.entity.build.BuildQueryBuildContext;
import io.onedev.server.util.BuildConstants;
-import io.onedev.utils.schedule.SchedulableTask;
-import io.onedev.utils.schedule.TaskScheduler;
@Singleton
public class DefaultBuildManager extends AbstractEntityManager<Build> implements BuildManager, SchedulableTask {
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java
index 11ed459c3b..5c1bfc66fc 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java
@@ -19,7 +19,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.system.SystemStarted;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java
index 78b81e6b55..db2f8a5f9d 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java
@@ -36,8 +36,8 @@ import org.hibernate.query.Query;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import io.onedev.launcher.loader.Listen;
-import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.server.event.codecomment.CodeCommentCreated;
import io.onedev.server.event.codecomment.CodeCommentDeleted;
import io.onedev.server.event.codecomment.CodeCommentEvent;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentNotificationManager.java
index 176233ca35..10c31f1c6f 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentNotificationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentNotificationManager.java
@@ -6,7 +6,7 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.event.codecomment.CodeCommentCreated;
import io.onedev.server.event.codecomment.CodeCommentDeleted;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java
index aed9f58237..18a4eefd5b 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java
@@ -18,7 +18,9 @@ import org.eclipse.jgit.lib.ObjectId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.concurrent.Prioritized;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.system.SystemStarted;
@@ -41,8 +43,6 @@ import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.BatchWorker;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.concurrent.Prioritized;
import jetbrains.exodus.ArrayByteIterable;
import jetbrains.exodus.ByteIterable;
import jetbrains.exodus.env.Environment;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.java
index c1f94c835a..0b6672043a 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.java
@@ -5,8 +5,8 @@ import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
-import io.onedev.launcher.loader.Listen;
-import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.server.event.codecomment.CodeCommentCreated;
import io.onedev.server.event.codecomment.CodeCommentReplied;
import io.onedev.server.event.pullrequest.PullRequestCodeCommentCreated;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java
index 46c68ceb7c..0ea82282d0 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java
@@ -3,7 +3,7 @@ package io.onedev.server.manager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
-import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.server.event.codecomment.CodeCommentReplied;
import io.onedev.server.manager.CodeCommentReplyManager;
import io.onedev.server.model.CodeComment;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java
index f16b239e28..68828f5a1b 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java
@@ -39,8 +39,13 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Charsets;
import com.google.common.base.Splitter;
-import io.onedev.launcher.loader.Listen;
-import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.PathUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.concurrent.Prioritized;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.issue.IssueCommitted;
@@ -68,11 +73,6 @@ import io.onedev.server.util.Day;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.facade.UserFacade;
-import io.onedev.utils.ExceptionUtils;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.PathUtils;
-import io.onedev.utils.StringUtils;
-import io.onedev.utils.concurrent.Prioritized;
import jetbrains.exodus.ArrayByteIterable;
import jetbrains.exodus.ByteIterable;
import jetbrains.exodus.backup.BackupStrategy;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitNotificationManager.java
index e52577a765..ab2e6d88a4 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitNotificationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitNotificationManager.java
@@ -12,7 +12,7 @@ import javax.inject.Singleton;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.manager.MailManager;
import io.onedev.server.manager.UrlManager;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java
index 855804c0f0..1e8da861e8 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java
@@ -21,9 +21,16 @@ import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import io.onedev.launcher.bootstrap.Bootstrap;
-import io.onedev.launcher.loader.Listen;
-import io.onedev.launcher.loader.ManagedSerializedForm;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.ManagedSerializedForm;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.ZipUtils;
+import io.onedev.commons.utils.init.ManualConfig;
+import io.onedev.commons.utils.init.Skippable;
+import io.onedev.commons.utils.schedule.SchedulableTask;
+import io.onedev.commons.utils.schedule.TaskScheduler;
import io.onedev.server.OneDev;
import io.onedev.server.event.system.SystemStarting;
import io.onedev.server.manager.DataManager;
@@ -42,13 +49,6 @@ import io.onedev.server.persistence.IdManager;
import io.onedev.server.persistence.PersistManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.utils.ExceptionUtils;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.ZipUtils;
-import io.onedev.utils.init.ManualConfig;
-import io.onedev.utils.init.Skippable;
-import io.onedev.utils.schedule.SchedulableTask;
-import io.onedev.utils.schedule.TaskScheduler;
@Singleton
public class DefaultDataManager implements DataManager, Serializable {
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultEntityReferenceManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultEntityReferenceManager.java
index de5ea06492..4c9d498502 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultEntityReferenceManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultEntityReferenceManager.java
@@ -8,7 +8,7 @@ import javax.inject.Singleton;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.event.codecomment.CodeCommentCreated;
import io.onedev.server.event.codecomment.CodeCommentUpdated;
import io.onedev.server.event.entity.EntityPersisted;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java
index 6ab857af87..f980e0793f 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java
@@ -16,8 +16,8 @@ import org.apache.wicket.util.lang.Objects;
import com.google.common.base.Optional;
-import io.onedev.launcher.loader.Listen;
-import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.server.event.build.BuildEvent;
import io.onedev.server.event.issue.IssueChangeEvent;
import io.onedev.server.event.issue.IssueCommitted;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.java
index 19b8407261..465fe8b4b9 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.java
@@ -3,7 +3,7 @@ package io.onedev.server.manager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
-import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.server.event.issue.IssueCommented;
import io.onedev.server.manager.IssueCommentManager;
import io.onedev.server.model.IssueComment;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
index 512737db93..01373ec134 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
@@ -26,8 +26,8 @@ import org.hibernate.query.Query;
import com.google.common.base.Preconditions;
-import io.onedev.launcher.loader.Listen;
-import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.server.event.issue.IssueCommitted;
import io.onedev.server.event.issue.IssueDeleted;
import io.onedev.server.event.issue.IssueEvent;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java
index 04c7898f11..e8700cbe78 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java
@@ -9,7 +9,7 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.event.issue.IssueChangeEvent;
import io.onedev.server.event.issue.IssueCommented;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultMailManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultMailManager.java
index 2cb9cb1631..f96e676eff 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultMailManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultMailManager.java
@@ -14,8 +14,8 @@ import org.apache.commons.mail.HtmlEmail;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.launcher.bootstrap.Bootstrap;
import io.onedev.server.manager.SettingManager;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
import io.onedev.server.manager.MailManager;
import io.onedev.server.model.support.setting.MailSetting;
import io.onedev.server.persistence.annotation.Sessional;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultMarkdownManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultMarkdownManager.java
index 184a8191da..98c1a04a4e 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultMarkdownManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultMarkdownManager.java
@@ -26,10 +26,10 @@ import com.vladsch.flexmark.parser.ParserEmulationProfile;
import com.vladsch.flexmark.util.options.MutableDataHolder;
import com.vladsch.flexmark.util.options.MutableDataSet;
+import io.onedev.commons.utils.HtmlUtils;
import io.onedev.server.manager.MarkdownManager;
import io.onedev.server.model.Project;
import io.onedev.server.util.markdown.MarkdownProcessor;
-import io.onedev.utils.HtmlUtils;
@Singleton
public class DefaultMarkdownManager implements MarkdownManager {
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java
index 1692a2aedb..67ee3a38d5 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java
@@ -12,7 +12,8 @@ import org.hibernate.query.Query;
import com.google.common.base.Preconditions;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.issue.IssueChangeEvent;
import io.onedev.server.event.issue.IssueOpened;
@@ -31,7 +32,6 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.utils.StringUtils;
@Singleton
public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> implements MilestoneManager {
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java
index 3281d64684..56c50f9220 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java
@@ -29,7 +29,10 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
@@ -59,9 +62,6 @@ import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.facade.UserAuthorizationFacade;
import io.onedev.server.util.reviewrequirement.ReviewRequirement;
import io.onedev.server.web.util.avatar.AvatarManager;
-import io.onedev.utils.ExceptionUtils;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.StringUtils;
@Singleton
public class DefaultProjectManager extends AbstractEntityManager<Project> implements ProjectManager {
@@ -331,8 +331,10 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
if (file != null) {
FileProtection fileProtection = branchProtection.getFileProtection(file);
- if (fileProtection != null && !ReviewRequirement.fromString(fileProtection.getReviewRequirement()).satisfied(user))
+ if (fileProtection != null
+ && !ReviewRequirement.fromString(fileProtection.getReviewRequirement()).satisfied(user)) {
return true;
+ }
}
}
return false;
@@ -354,8 +356,10 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
for (String changedFile: getChangedFiles(project, oldObjectId, newObjectId, gitEnvs)) {
FileProtection fileProtection = branchProtection.getFileProtection(changedFile);
- if (fileProtection != null && !ReviewRequirement.fromString(fileProtection.getReviewRequirement()).satisfied(user))
+ if (fileProtection != null
+ && !ReviewRequirement.fromString(fileProtection.getReviewRequirement()).satisfied(user)) {
return true;
+ }
}
}
return false;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestChangeManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestChangeManager.java
index b282ed34f6..5231189a7b 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestChangeManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestChangeManager.java
@@ -8,7 +8,7 @@ import javax.inject.Singleton;
import com.google.common.base.Objects;
-import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
import io.onedev.server.manager.PullRequestChangeManager;
import io.onedev.server.model.PullRequest;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java
index d223f49cd4..244cafdb9e 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java
@@ -3,7 +3,7 @@ package io.onedev.server.manager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
-import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.server.event.pullrequest.PullRequestCommentCreated;
import io.onedev.server.manager.PullRequestCommentManager;
import io.onedev.server.model.PullRequest;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
index e21f3821cd..58f7b7df64 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
@@ -52,8 +52,10 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-import io.onedev.launcher.loader.Listen;
-import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.concurrent.Prioritized;
import io.onedev.server.OneDev;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.event.build.BuildEvent;
@@ -125,8 +127,6 @@ import io.onedev.server.util.PullRequestConstants;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.reviewrequirement.ReviewRequirement;
-import io.onedev.utils.ExceptionUtils;
-import io.onedev.utils.concurrent.Prioritized;
@Singleton
public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest> implements PullRequestManager {
@@ -678,7 +678,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
PullRequestUpdate update = request.getSortedUpdates().get(i);
for (String file: update.getChangedFiles()) {
FileProtection fileProtection = branchProtection.getFileProtection(file);
- if (fileProtection != null && !checkedFileProtections.contains(fileProtection)) {
+ if (fileProtection != null
+ && !checkedFileProtections.contains(fileProtection)) {
checkedFileProtections.add(fileProtection);
checkReviews(ReviewRequirement.fromString(fileProtection.getReviewRequirement()), update);
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java
index a77f5ae5bb..7dec362db7 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java
@@ -15,7 +15,7 @@ import org.hibernate.type.Type;
import com.google.common.collect.Lists;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
import io.onedev.server.event.pullrequest.PullRequestBuildEvent;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java
index 9b1ef23cc9..8f7ca0fa1f 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java
@@ -11,7 +11,8 @@ import org.eclipse.jgit.transport.RefSpec;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
-import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.server.event.pullrequest.PullRequestUpdated;
import io.onedev.server.git.GitUtils;
import io.onedev.server.manager.PullRequestCommentManager;
@@ -25,7 +26,6 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.utils.ExceptionUtils;
@Singleton
public class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullRequestUpdate>
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultStorageManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultStorageManager.java
index 5c128f3d07..1cdea487a7 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultStorageManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultStorageManager.java
@@ -9,7 +9,8 @@ import javax.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.utils.FileUtils;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.system.SystemStarting;
import io.onedev.server.manager.SettingManager;
@@ -18,7 +19,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.utils.FileUtils;
@Singleton
public class DefaultStorageManager implements StorageManager {
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java
index e805fc36c9..53fc937a64 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java
@@ -10,7 +10,7 @@ import org.joda.time.DateTime;
import com.google.common.collect.Lists;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.event.codecomment.CodeCommentDeleted;
import io.onedev.server.event.codecomment.CodeCommentEvent;
import io.onedev.server.event.entity.EntityRemoved;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java
index 19565ece17..722c9322e1 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java
@@ -10,8 +10,9 @@ import org.eclipse.jgit.lib.PersonIdent;
import org.hibernate.ReplicationMode;
import org.hibernate.query.Query;
-import io.onedev.launcher.loader.Listen;
-import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.manager.CacheManager;
@@ -27,7 +28,6 @@ import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.utils.StringUtils;
@Singleton
public class DefaultUserManager extends AbstractEntityManager<User> implements UserManager {
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultWebHookManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultWebHookManager.java
index e8b7be8237..89c7500ee0 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultWebHookManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultWebHookManager.java
@@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.model.support.WebHook;
import io.onedev.server.persistence.annotation.Sessional;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultWorkExecutor.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultWorkExecutor.java
index dd0861fa13..081a0c5f29 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultWorkExecutor.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultWorkExecutor.java
@@ -9,12 +9,12 @@ import java.util.concurrent.TimeoutException;
import javax.inject.Singleton;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.utils.concurrent.PrioritizedCallable;
+import io.onedev.commons.utils.concurrent.PrioritizedExecutor;
+import io.onedev.commons.utils.concurrent.PrioritizedRunnable;
import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.manager.WorkExecutor;
-import io.onedev.utils.concurrent.PrioritizedCallable;
-import io.onedev.utils.concurrent.PrioritizedExecutor;
-import io.onedev.utils.concurrent.PrioritizedRunnable;
@Singleton
public class DefaultWorkExecutor implements WorkExecutor {
diff --git a/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java
index ae456aa340..60a8caee68 100644
--- a/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java
+++ b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java
@@ -15,8 +15,8 @@ import org.dom4j.Element;
import com.google.common.base.Charsets;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.StringUtils;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.StringUtils;
@Singleton
@SuppressWarnings("unused")
diff --git a/core/src/main/java/io/onedev/server/migration/JpaConverter.java b/core/src/main/java/io/onedev/server/migration/JpaConverter.java
index 65b518b85a..0ef3368fea 100644
--- a/core/src/main/java/io/onedev/server/migration/JpaConverter.java
+++ b/core/src/main/java/io/onedev/server/migration/JpaConverter.java
@@ -23,13 +23,13 @@ import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import com.thoughtworks.xstream.mapper.Mapper;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.utils.ClassUtils;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.ReflectionUtils;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.utils.ClassUtils;
-import io.onedev.utils.ExceptionUtils;
-import io.onedev.utils.ReflectionUtils;
-import io.onedev.utils.StringUtils;
@SuppressWarnings({"rawtypes", "unchecked"})
public class JpaConverter extends ReflectionConverter {
diff --git a/core/src/main/java/io/onedev/server/migration/MigrationHelper.java b/core/src/main/java/io/onedev/server/migration/MigrationHelper.java
index 0124518fa0..24fb94c897 100644
--- a/core/src/main/java/io/onedev/server/migration/MigrationHelper.java
+++ b/core/src/main/java/io/onedev/server/migration/MigrationHelper.java
@@ -15,8 +15,8 @@ import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.utils.ExceptionUtils;
-import io.onedev.utils.StringUtils;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.StringUtils;
public class MigrationHelper {
diff --git a/core/src/main/java/io/onedev/server/migration/VersionedDocument.java b/core/src/main/java/io/onedev/server/migration/VersionedDocument.java
index c70a05a425..fa1611c32b 100644
--- a/core/src/main/java/io/onedev/server/migration/VersionedDocument.java
+++ b/core/src/main/java/io/onedev/server/migration/VersionedDocument.java
@@ -44,10 +44,10 @@ import com.thoughtworks.xstream.io.xml.Dom4JReader;
import com.thoughtworks.xstream.io.xml.Dom4JWriter;
import com.thoughtworks.xstream.mapper.CannotResolveClassException;
-import io.onedev.launcher.loader.AppLoader;
-import io.onedev.utils.ClassUtils;
-import io.onedev.utils.ExceptionUtils;
-import io.onedev.utils.FileUtils;
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.utils.ClassUtils;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.FileUtils;
public final class VersionedDocument implements Document, Externalizable {
diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.java
index b2c2a17882..4a4a91cb22 100644
--- a/core/src/main/java/io/onedev/server/model/Project.java
+++ b/core/src/main/java/io/onedev/server/model/Project.java
@@ -63,7 +63,13 @@ import com.fasterxml.jackson.annotation.JsonView;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.LockUtils;
+import io.onedev.commons.utils.Range;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;
import io.onedev.server.OneDev;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.BlameBlock;
@@ -99,16 +105,11 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.DefaultPrivilege;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.jackson.DefaultView;
+import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.validation.annotation.ProjectName;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Markdown;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
-import io.onedev.utils.ExceptionUtils;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.LockUtils;
-import io.onedev.utils.PathUtils;
-import io.onedev.utils.Range;
-import io.onedev.utils.StringUtils;
@Entity
@Table(indexes={@Index(columnList="o_forkedFrom_id")})
@@ -1124,8 +1125,8 @@ public class Project extends AbstractEntity {
public TagProtection getTagProtection(String tagName, User user) {
for (TagProtection protection: tagProtections) {
if (protection.isEnabled()
- && PathUtils.matchChildAware(protection.getTag(), tagName)
- && protection.getSubmitter().matches(this, user)) {
+ && protection.getSubmitter().matches(this, user)
+ && PatternSet.fromString(protection.getTags()).matches(new ChildAwareMatcher(), tagName)) {
return protection;
}
}
@@ -1136,8 +1137,8 @@ public class Project extends AbstractEntity {
public BranchProtection getBranchProtection(String branchName, @Nullable User user) {
for (BranchProtection protection: branchProtections) {
if (protection.isEnabled()
- && PathUtils.matchChildAware(protection.getBranch(), branchName)
- && protection.getSubmitter().matches(this, user)) {
+ && protection.getSubmitter().matches(this, user)
+ && PatternSet.fromString(protection.getBranches()).matches(new ChildAwareMatcher(), branchName)) {
return protection;
}
}
diff --git a/core/src/main/java/io/onedev/server/model/User.java b/core/src/main/java/io/onedev/server/model/User.java
index d1103a029d..8c44a8e762 100644
--- a/core/src/main/java/io/onedev/server/model/User.java
+++ b/core/src/main/java/io/onedev/server/model/User.java
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.annotation.JsonView;
import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.jackson.DefaultView;
import io.onedev.server.util.validation.annotation.UserName;
diff --git a/core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/core/src/main/java/io/onedev/server/model/support/BranchProtection.java
index 47a873ff7d..9403bc22a7 100644
--- a/core/src/main/java/io/onedev/server/model/support/BranchProtection.java
+++ b/core/src/main/java/io/onedev/server/model/support/BranchProtection.java
@@ -10,6 +10,7 @@ import javax.validation.constraints.NotNull;
import org.hibernate.validator.constraints.NotEmpty;
+import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;
import io.onedev.server.model.Group;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
@@ -17,12 +18,12 @@ import io.onedev.server.model.support.usermatcher.Anyone;
import io.onedev.server.model.support.usermatcher.SpecifiedGroup;
import io.onedev.server.model.support.usermatcher.SpecifiedUser;
import io.onedev.server.model.support.usermatcher.UserMatcher;
+import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.reviewrequirement.ReviewRequirement;
-import io.onedev.server.web.editable.annotation.BranchPattern;
+import io.onedev.server.web.editable.annotation.BranchPatterns;
import io.onedev.server.web.editable.annotation.ConfigurationChoice;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
-import io.onedev.utils.PathUtils;
@Editable
public class BranchProtection implements Serializable {
@@ -31,7 +32,7 @@ public class BranchProtection implements Serializable {
private boolean enabled = true;
- private String branch;
+ private String branches;
private UserMatcher submitter = new Anyone();
@@ -57,16 +58,15 @@ public class BranchProtection implements Serializable {
this.enabled = enabled;
}
- @Editable(order=100, description="Specify branch to be protected. Wildcard may be used to "
- + "specify multiple branches")
- @BranchPattern
+ @Editable(order=100, description="Specify space-separated branches to be protected. Use * or ? for wildcard match")
+ @BranchPatterns
@NotEmpty
- public String getBranch() {
- return branch;
+ public String getBranches() {
+ return branches;
}
- public void setBranch(String branch) {
- this.branch = branch;
+ public void setBranches(String branches) {
+ this.branches = branches;
}
@Editable(order=150, name="If Submitted By", description="This protection rule will apply "
@@ -154,7 +154,7 @@ public class BranchProtection implements Serializable {
@Nullable
public FileProtection getFileProtection(String file) {
for (FileProtection protection: fileProtections) {
- if (PathUtils.matchChildAware(protection.getPath(), file))
+ if (PatternSet.fromString(protection.getPaths()).matches(new ChildAwareMatcher(), file))
return protection;
}
return null;
@@ -268,7 +268,11 @@ public class BranchProtection implements Serializable {
}
public boolean onBranchDeleted(String branchName) {
- return branchName.equals(getBranch());
+ PatternSet patternSet = PatternSet.fromString(getBranches());
+ patternSet.getIncludes().remove(branchName);
+ patternSet.getExcludes().remove(branchName);
+ setBranches(patternSet.toString());
+ return getBranches().length() == 0;
}
}
diff --git a/core/src/main/java/io/onedev/server/model/support/FileProtection.java b/core/src/main/java/io/onedev/server/model/support/FileProtection.java
index ab8e7ce317..8276d08bbf 100644
--- a/core/src/main/java/io/onedev/server/model/support/FileProtection.java
+++ b/core/src/main/java/io/onedev/server/model/support/FileProtection.java
@@ -1,34 +1,42 @@
package io.onedev.server.model.support;
import java.io.Serializable;
+import java.util.List;
import org.hibernate.validator.constraints.NotEmpty;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.server.util.OneContext;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.PathPattern;
+import io.onedev.server.web.editable.annotation.PathPatterns;
+import io.onedev.server.web.util.SuggestionUtils;
@Editable
public class FileProtection implements Serializable {
private static final long serialVersionUID = 1L;
- private String path;
+ private String paths;
private String reviewRequirement;
- @Editable(order=100, description="Specify path to be protected. Wildcard can be used in the path "
- + "to match multiple files")
- @PathPattern
+ @Editable(order=100, description="Specify space-separated paths to be protected. Use * or ? for wildcard match")
+ @PathPatterns("getPathSuggestions")
@NotEmpty
- public String getPath() {
- return path;
+ public String getPaths() {
+ return paths;
}
- public void setPath(String path) {
- this.path = path;
+ public void setPaths(String paths) {
+ this.paths = paths;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> getPathSuggestions(String matchWith) {
+ return SuggestionUtils.suggestBlobs(OneContext.get().getProject(), matchWith);
}
- @Editable(order=200, name="Reviewers", description="Optionally specify required reviewers if specified path is "
+ @Editable(order=200, name="Reviewers", description="Specify required reviewers if specified path is "
+ "changed. Note that the user submitting the change is considered to reviewed the change automatically")
@io.onedev.server.web.editable.annotation.ReviewRequirement
@NotEmpty
diff --git a/core/src/main/java/io/onedev/server/model/support/TagProtection.java b/core/src/main/java/io/onedev/server/model/support/TagProtection.java
index c35bb13b38..85526b4939 100644
--- a/core/src/main/java/io/onedev/server/model/support/TagProtection.java
+++ b/core/src/main/java/io/onedev/server/model/support/TagProtection.java
@@ -10,8 +10,9 @@ import io.onedev.server.model.support.usermatcher.Anyone;
import io.onedev.server.model.support.usermatcher.SpecifiedGroup;
import io.onedev.server.model.support.usermatcher.SpecifiedUser;
import io.onedev.server.model.support.usermatcher.UserMatcher;
+import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.TagPattern;
+import io.onedev.server.web.editable.annotation.TagPatterns;
@Editable
public class TagProtection implements Serializable {
@@ -20,7 +21,7 @@ public class TagProtection implements Serializable {
private boolean enabled = true;
- private String tag;
+ private String tags;
private UserMatcher submitter = new Anyone();
@@ -38,15 +39,15 @@ public class TagProtection implements Serializable {
this.enabled = enabled;
}
- @Editable(order=100, description="Specify tag to be protected. Wildcard can be used to match multiple tags")
- @TagPattern
+ @Editable(order=100, description="Specify space-separated tags to be protected. Use * or ? for wildcard match")
+ @TagPatterns
@NotEmpty
- public String getTag() {
- return tag;
+ public String getTags() {
+ return tags;
}
- public void setTag(String tag) {
- this.tag = tag;
+ public void setTags(String tags) {
+ this.tags = tags;
}
@Editable(order=150, name="If Performed By", description="This protection rule will apply "
@@ -122,7 +123,11 @@ public class TagProtection implements Serializable {
}
public boolean onTagDeleted(String tagName) {
- return tagName.equals(getTag());
+ PatternSet patternSet = PatternSet.fromString(getTags());
+ patternSet.getIncludes().remove(tagName);
+ patternSet.getExcludes().remove(tagName);
+ setTags(patternSet.toString());
+ return getTags().length() == 0;
}
}
diff --git a/core/src/main/java/io/onedev/server/model/support/TextRange.java b/core/src/main/java/io/onedev/server/model/support/TextRange.java
index 3267674528..2ef62bc8f3 100644
--- a/core/src/main/java/io/onedev/server/model/support/TextRange.java
+++ b/core/src/main/java/io/onedev/server/model/support/TextRange.java
@@ -8,7 +8,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-import io.onedev.jsymbol.TokenPosition;
+import io.onedev.commons.jsymbol.TokenPosition;
public class TextRange implements Serializable {
diff --git a/core/src/main/java/io/onedev/server/model/support/authenticator/ldap/LdapAuthenticator.java b/core/src/main/java/io/onedev/server/model/support/authenticator/ldap/LdapAuthenticator.java
index 28141e5170..f0dc6508c8 100644
--- a/core/src/main/java/io/onedev/server/model/support/authenticator/ldap/LdapAuthenticator.java
+++ b/core/src/main/java/io/onedev/server/model/support/authenticator/ldap/LdapAuthenticator.java
@@ -28,11 +28,11 @@ import org.hibernate.validator.constraints.NotEmpty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.model.support.authenticator.Authenticated;
import io.onedev.server.model.support.authenticator.Authenticator;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Password;
-import io.onedev.utils.StringUtils;
@Editable(name="Generic LDAP", order=200)
public class LdapAuthenticator extends Authenticator {
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
index 7dcd8d6ed1..6bb21fcf01 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
@@ -13,6 +13,7 @@ import javax.validation.constraints.Size;
import org.hibernate.validator.constraints.NotEmpty;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Issue;
@@ -38,7 +39,6 @@ import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldRe
import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution.FixType;
import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;
-import io.onedev.utils.StringUtils;
@Editable
public class TransitionSpec implements Serializable {
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java
index a4402ad242..f47a8d92c5 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java
@@ -6,12 +6,12 @@ import java.util.Map;
import org.apache.wicket.Component;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.model.Group;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.User;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
-import io.onedev.utils.StringUtils;
public class IssueDescriptionChangeData implements IssueChangeData {
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
index 09db82c6af..ace034e92d 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
@@ -8,6 +8,7 @@ import java.util.Map;
import org.apache.wicket.Component;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.GroupManager;
import io.onedev.server.manager.UserManager;
@@ -18,7 +19,6 @@ import io.onedev.server.util.CommentSupport;
import io.onedev.server.util.IssueField;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
-import io.onedev.utils.StringUtils;
public class IssueFieldChangeData implements IssueChangeData {
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/CloseInfo.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/CloseInfo.java
index 24431aca0c..d07d6c1b49 100644
--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/CloseInfo.java
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/CloseInfo.java
@@ -11,8 +11,8 @@ import javax.persistence.ManyToOne;
import org.hibernate.annotations.OptimisticLock;
+import io.onedev.commons.utils.WordUtils;
import io.onedev.server.model.User;
-import io.onedev.utils.WordUtils;
@Embeddable
public class CloseInfo implements Serializable {
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java
index 295256ef24..c6da3af8ec 100644
--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java
@@ -6,10 +6,10 @@ import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Repository;
+import io.onedev.commons.utils.WordUtils;
import io.onedev.server.OneDev;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.PullRequest;
-import io.onedev.utils.WordUtils;
public enum MergeStrategy {
CREATE_MERGE_COMMIT("Add all commits from source branch to target branch with a merge commit.") {
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java
index c129259857..c24e5ce45e 100644
--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java
@@ -4,10 +4,10 @@ import java.util.List;
import org.apache.wicket.Component;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
-import io.onedev.utils.StringUtils;
public class PullRequestDescriptionChangeData implements PullRequestChangeData {
diff --git a/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java b/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java
index d3403acf43..87dc91d5d6 100644
--- a/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java
+++ b/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java
@@ -47,6 +47,10 @@ import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import com.google.inject.Singleton;
+import io.onedev.commons.utils.BeanUtils;
+import io.onedev.commons.utils.ClassUtils;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.FileUtils;
import io.onedev.server.migration.DatabaseMigrator;
import io.onedev.server.migration.MigrationHelper;
import io.onedev.server.migration.VersionedDocument;
@@ -55,10 +59,6 @@ import io.onedev.server.model.ModelVersion;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.validation.EntityValidator;
-import io.onedev.utils.BeanUtils;
-import io.onedev.utils.ClassUtils;
-import io.onedev.utils.ExceptionUtils;
-import io.onedev.utils.FileUtils;
@Singleton
public class DefaultPersistManager implements PersistManager {
diff --git a/core/src/main/java/io/onedev/server/persistence/DefaultUnitOfWork.java b/core/src/main/java/io/onedev/server/persistence/DefaultUnitOfWork.java
index 5757fc882a..ceb2cf7510 100644
--- a/core/src/main/java/io/onedev/server/persistence/DefaultUnitOfWork.java
+++ b/core/src/main/java/io/onedev/server/persistence/DefaultUnitOfWork.java
@@ -11,8 +11,8 @@ import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-import io.onedev.utils.ExceptionUtils;
-import io.onedev.utils.ObjectReference;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.ObjectReference;
@Singleton
public class DefaultUnitOfWork implements UnitOfWork {
diff --git a/core/src/main/java/io/onedev/server/persistence/IdGenerator.java b/core/src/main/java/io/onedev/server/persistence/IdGenerator.java
index 1525f1531a..b1ad916fd6 100644
--- a/core/src/main/java/io/onedev/server/persistence/IdGenerator.java
+++ b/core/src/main/java/io/onedev/server/persistence/IdGenerator.java
@@ -11,7 +11,7 @@ import org.hibernate.id.IdentifierGenerator;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.type.Type;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
public class IdGenerator implements IdentifierGenerator, Configurable {
diff --git a/core/src/main/java/io/onedev/server/persistence/TransactionInterceptor.java b/core/src/main/java/io/onedev/server/persistence/TransactionInterceptor.java
index 8d1919232e..be0c474a64 100644
--- a/core/src/main/java/io/onedev/server/persistence/TransactionInterceptor.java
+++ b/core/src/main/java/io/onedev/server/persistence/TransactionInterceptor.java
@@ -8,7 +8,7 @@ import org.hibernate.resource.transaction.spi.TransactionStatus;
import com.google.inject.Inject;
-import io.onedev.utils.ExceptionUtils;
+import io.onedev.commons.utils.ExceptionUtils;
public class TransactionInterceptor implements MethodInterceptor {
diff --git a/core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java b/core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java
index 62cdc1331d..02361e44b3 100644
--- a/core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java
+++ b/core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java
@@ -8,9 +8,9 @@ import java.util.concurrent.atomic.AtomicLong;
import org.hibernate.Session;
import org.hibernate.query.Query;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Project;
-import io.onedev.utils.ReflectionUtils;
public abstract class AbstractEntityManager<T extends AbstractEntity> implements EntityManager<T> {
diff --git a/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java b/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java
index dbd507bf99..c485befd05 100644
--- a/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java
+++ b/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java
@@ -13,15 +13,15 @@ import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.criterion.Projections;
-import io.onedev.launcher.loader.ListenerRegistry;
-import io.onedev.launcher.loader.ManagedSerializedForm;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.commons.launcher.loader.ManagedSerializedForm;
+import io.onedev.commons.utils.ClassUtils;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.persistence.UnitOfWork;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.utils.ClassUtils;
@Singleton
@SuppressWarnings("unchecked")
diff --git a/core/src/main/java/io/onedev/server/rest/github/CommitStatusResource.java b/core/src/main/java/io/onedev/server/rest/github/CommitStatusResource.java
index 48ca275ad2..0e2f8443ab 100644
--- a/core/src/main/java/io/onedev/server/rest/github/CommitStatusResource.java
+++ b/core/src/main/java/io/onedev/server/rest/github/CommitStatusResource.java
@@ -24,6 +24,7 @@ import org.eclipse.jgit.lib.ObjectId;
import com.fasterxml.jackson.databind.ObjectMapper;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.manager.BuildManager;
import io.onedev.server.manager.ConfigurationManager;
import io.onedev.server.manager.ProjectManager;
@@ -32,7 +33,6 @@ import io.onedev.server.model.Configuration;
import io.onedev.server.model.Project;
import io.onedev.server.rest.RestConstants;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.utils.StringUtils;
@Path("/repos/projects")
@Consumes(MediaType.WILDCARD)
diff --git a/core/src/main/java/io/onedev/server/rest/jersey/JerseyApplication.java b/core/src/main/java/io/onedev/server/rest/jersey/JerseyApplication.java
index 9c4f0e37b6..21a846c196 100644
--- a/core/src/main/java/io/onedev/server/rest/jersey/JerseyApplication.java
+++ b/core/src/main/java/io/onedev/server/rest/jersey/JerseyApplication.java
@@ -16,7 +16,7 @@ import com.fasterxml.jackson.jaxrs.base.JsonMappingExceptionMapper;
import com.fasterxml.jackson.jaxrs.base.JsonParseExceptionMapper;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
public class JerseyApplication extends ResourceConfig {
diff --git a/core/src/main/java/io/onedev/server/rest/jersey/UnauthenticatedExceptionMapper.java b/core/src/main/java/io/onedev/server/rest/jersey/UnauthenticatedExceptionMapper.java
index a2709c0e0c..bef049f60e 100644
--- a/core/src/main/java/io/onedev/server/rest/jersey/UnauthenticatedExceptionMapper.java
+++ b/core/src/main/java/io/onedev/server/rest/jersey/UnauthenticatedExceptionMapper.java
@@ -8,7 +8,7 @@ import javax.ws.rs.ext.Provider;
import org.apache.shiro.authz.UnauthenticatedException;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
@Provider
public class UnauthenticatedExceptionMapper implements ExceptionMapper<UnauthenticatedException> {
diff --git a/core/src/main/java/io/onedev/server/rest/jersey/UnauthorizedExceptionMapper.java b/core/src/main/java/io/onedev/server/rest/jersey/UnauthorizedExceptionMapper.java
index 0342160ba6..fe2d857c3f 100644
--- a/core/src/main/java/io/onedev/server/rest/jersey/UnauthorizedExceptionMapper.java
+++ b/core/src/main/java/io/onedev/server/rest/jersey/UnauthorizedExceptionMapper.java
@@ -9,7 +9,7 @@ import javax.ws.rs.ext.Provider;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.UnauthorizedException;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
@Provider
public class UnauthorizedExceptionMapper implements ExceptionMapper<UnauthorizedException> {
diff --git a/core/src/main/java/io/onedev/server/rest/jersey/ValidationConfigurationContextResolver.java b/core/src/main/java/io/onedev/server/rest/jersey/ValidationConfigurationContextResolver.java
index 471a4262d8..e32bd0aac0 100644
--- a/core/src/main/java/io/onedev/server/rest/jersey/ValidationConfigurationContextResolver.java
+++ b/core/src/main/java/io/onedev/server/rest/jersey/ValidationConfigurationContextResolver.java
@@ -5,7 +5,7 @@ import javax.ws.rs.ext.ContextResolver;
import org.glassfish.jersey.server.validation.ValidationConfig;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
public class ValidationConfigurationContextResolver implements ContextResolver<ValidationConfig> {
diff --git a/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java b/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java
index fb35128edc..4d82c9f963 100644
--- a/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java
+++ b/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java
@@ -66,11 +66,15 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-import io.onedev.jsymbol.Symbol;
-import io.onedev.jsymbol.SymbolExtractor;
-import io.onedev.jsymbol.SymbolExtractorRegistry;
-import io.onedev.launcher.loader.Listen;
-import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.commons.jsymbol.Symbol;
+import io.onedev.commons.jsymbol.SymbolExtractor;
+import io.onedev.commons.jsymbol.SymbolExtractorRegistry;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.concurrent.Prioritized;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.git.GitUtils;
@@ -83,10 +87,6 @@ import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.util.BatchWorker;
import io.onedev.server.util.ContentDetector;
import io.onedev.server.util.IndexResult;
-import io.onedev.utils.ExceptionUtils;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.StringUtils;
-import io.onedev.utils.concurrent.Prioritized;
@Singleton
public class DefaultIndexManager implements IndexManager {
diff --git a/core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.java b/core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.java
index 628de59a44..0403131bb8 100644
--- a/core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.java
+++ b/core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.java
@@ -39,9 +39,10 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.jsymbol.Symbol;
-import io.onedev.jsymbol.SymbolExtractorRegistry;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.jsymbol.Symbol;
+import io.onedev.commons.jsymbol.SymbolExtractorRegistry;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.manager.StorageManager;
@@ -49,7 +50,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.server.search.code.query.BlobQuery;
-import io.onedev.utils.ExceptionUtils;
import jersey.repackaged.com.google.common.base.Preconditions;
@Singleton
diff --git a/core/src/main/java/io/onedev/server/search/code/IndexManager.java b/core/src/main/java/io/onedev/server/search/code/IndexManager.java
index 56fbedc38e..0d6a040219 100644
--- a/core/src/main/java/io/onedev/server/search/code/IndexManager.java
+++ b/core/src/main/java/io/onedev/server/search/code/IndexManager.java
@@ -4,8 +4,8 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.ObjectId;
-import io.onedev.jsymbol.Symbol;
-import io.onedev.jsymbol.SymbolExtractor;
+import io.onedev.commons.jsymbol.Symbol;
+import io.onedev.commons.jsymbol.SymbolExtractor;
import io.onedev.server.model.Project;
public interface IndexManager {
diff --git a/core/src/main/java/io/onedev/server/search/code/SearchManager.java b/core/src/main/java/io/onedev/server/search/code/SearchManager.java
index 0de3fe8635..ae6e315343 100644
--- a/core/src/main/java/io/onedev/server/search/code/SearchManager.java
+++ b/core/src/main/java/io/onedev/server/search/code/SearchManager.java
@@ -7,7 +7,7 @@ import javax.annotation.Nullable;
import org.apache.lucene.search.IndexSearcher;
import org.eclipse.jgit.lib.ObjectId;
-import io.onedev.jsymbol.Symbol;
+import io.onedev.commons.jsymbol.Symbol;
import io.onedev.server.model.Project;
import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.server.search.code.query.BlobQuery;
diff --git a/core/src/main/java/io/onedev/server/search/code/hit/FileHit.java b/core/src/main/java/io/onedev/server/search/code/hit/FileHit.java
index c3422d5778..0d88d7a8b2 100644
--- a/core/src/main/java/io/onedev/server/search/code/hit/FileHit.java
+++ b/core/src/main/java/io/onedev/server/search/code/hit/FileHit.java
@@ -7,9 +7,9 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.request.resource.PackageResourceReference;
-import io.onedev.jsymbol.util.HighlightableLabel;
-import io.onedev.jsymbol.util.NoAntiCacheImage;
-import io.onedev.utils.Range;
+import io.onedev.commons.jsymbol.util.HighlightableLabel;
+import io.onedev.commons.jsymbol.util.NoAntiCacheImage;
+import io.onedev.commons.utils.Range;
public class FileHit extends QueryHit {
diff --git a/core/src/main/java/io/onedev/server/search/code/hit/PathHit.java b/core/src/main/java/io/onedev/server/search/code/hit/PathHit.java
index b293586571..a4e66e2426 100644
--- a/core/src/main/java/io/onedev/server/search/code/hit/PathHit.java
+++ b/core/src/main/java/io/onedev/server/search/code/hit/PathHit.java
@@ -6,9 +6,9 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.request.resource.PackageResourceReference;
-import io.onedev.jsymbol.util.HighlightableLabel;
-import io.onedev.jsymbol.util.NoAntiCacheImage;
-import io.onedev.utils.Range;
+import io.onedev.commons.jsymbol.util.HighlightableLabel;
+import io.onedev.commons.jsymbol.util.NoAntiCacheImage;
+import io.onedev.commons.utils.Range;
public class PathHit extends QueryHit {
diff --git a/core/src/main/java/io/onedev/server/search/code/hit/QueryHit.java b/core/src/main/java/io/onedev/server/search/code/hit/QueryHit.java
index 50432ea196..dd56003a82 100644
--- a/core/src/main/java/io/onedev/server/search/code/hit/QueryHit.java
+++ b/core/src/main/java/io/onedev/server/search/code/hit/QueryHit.java
@@ -7,7 +7,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.image.Image;
-import io.onedev.jsymbol.TokenPosition;
+import io.onedev.commons.jsymbol.TokenPosition;
public abstract class QueryHit implements Serializable {
diff --git a/core/src/main/java/io/onedev/server/search/code/hit/SymbolHit.java b/core/src/main/java/io/onedev/server/search/code/hit/SymbolHit.java
index f1c75264c0..f4c48a64ab 100644
--- a/core/src/main/java/io/onedev/server/search/code/hit/SymbolHit.java
+++ b/core/src/main/java/io/onedev/server/search/code/hit/SymbolHit.java
@@ -5,8 +5,8 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.image.Image;
-import io.onedev.jsymbol.Symbol;
-import io.onedev.utils.Range;
+import io.onedev.commons.jsymbol.Symbol;
+import io.onedev.commons.utils.Range;
public class SymbolHit extends QueryHit {
diff --git a/core/src/main/java/io/onedev/server/search/code/hit/TextHit.java b/core/src/main/java/io/onedev/server/search/code/hit/TextHit.java
index 2eedf80bb0..12d0761ae6 100644
--- a/core/src/main/java/io/onedev/server/search/code/hit/TextHit.java
+++ b/core/src/main/java/io/onedev/server/search/code/hit/TextHit.java
@@ -5,10 +5,10 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.request.resource.PackageResourceReference;
-import io.onedev.jsymbol.TokenPosition;
-import io.onedev.jsymbol.util.HighlightableLabel;
-import io.onedev.jsymbol.util.NoAntiCacheImage;
-import io.onedev.utils.Range;
+import io.onedev.commons.jsymbol.TokenPosition;
+import io.onedev.commons.jsymbol.util.HighlightableLabel;
+import io.onedev.commons.jsymbol.util.NoAntiCacheImage;
+import io.onedev.commons.utils.Range;
public class TextHit extends QueryHit {
diff --git a/core/src/main/java/io/onedev/server/search/code/query/FileQuery.java b/core/src/main/java/io/onedev/server/search/code/query/FileQuery.java
index f7da9a7e3b..f03639dd03 100644
--- a/core/src/main/java/io/onedev/server/search/code/query/FileQuery.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/FileQuery.java
@@ -15,10 +15,10 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import com.google.common.base.Preconditions;
+import io.onedev.commons.utils.Range;
+import io.onedev.commons.utils.stringmatch.WildcardUtils;
import io.onedev.server.search.code.hit.FileHit;
import io.onedev.server.search.code.hit.QueryHit;
-import io.onedev.utils.Range;
-import io.onedev.utils.stringmatch.WildcardUtils;
public class FileQuery extends BlobQuery {
diff --git a/core/src/main/java/io/onedev/server/search/code/query/PathQuery.java b/core/src/main/java/io/onedev/server/search/code/query/PathQuery.java
index 27b58d5702..b727c2efe3 100644
--- a/core/src/main/java/io/onedev/server/search/code/query/PathQuery.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/PathQuery.java
@@ -13,10 +13,10 @@ import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.WildcardQuery;
import org.eclipse.jgit.treewalk.TreeWalk;
+import io.onedev.commons.utils.PathUtils;
+import io.onedev.commons.utils.Range;
import io.onedev.server.search.code.hit.PathHit;
import io.onedev.server.search.code.hit.QueryHit;
-import io.onedev.utils.PathUtils;
-import io.onedev.utils.Range;
public class PathQuery extends BlobQuery {
diff --git a/core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java b/core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java
index 1423da77da..655364bbba 100644
--- a/core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java
@@ -16,13 +16,13 @@ import org.apache.lucene.search.WildcardQuery;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.treewalk.TreeWalk;
-import io.onedev.jsymbol.Symbol;
+import io.onedev.commons.jsymbol.Symbol;
+import io.onedev.commons.utils.Range;
+import io.onedev.commons.utils.stringmatch.WildcardUtils;
import io.onedev.server.OneDev;
import io.onedev.server.search.code.SearchManager;
import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.server.search.code.hit.SymbolHit;
-import io.onedev.utils.Range;
-import io.onedev.utils.stringmatch.WildcardUtils;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
diff --git a/core/src/main/java/io/onedev/server/search/code/query/TextQuery.java b/core/src/main/java/io/onedev/server/search/code/query/TextQuery.java
index 8789477ac5..22137335d8 100644
--- a/core/src/main/java/io/onedev/server/search/code/query/TextQuery.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/TextQuery.java
@@ -20,13 +20,13 @@ import org.apache.lucene.search.WildcardQuery;
import org.eclipse.jgit.lib.ObjectLoader;
import org.eclipse.jgit.treewalk.TreeWalk;
-import io.onedev.jsymbol.TokenPosition;
+import io.onedev.commons.jsymbol.TokenPosition;
+import io.onedev.commons.utils.Range;
import io.onedev.server.search.code.IndexConstants;
import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.server.search.code.hit.TextHit;
import io.onedev.server.search.code.query.regex.RegexLiterals;
import io.onedev.server.util.ContentDetector;
-import io.onedev.utils.Range;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
diff --git a/core/src/main/java/io/onedev/server/search/code/query/regex/RegexLiterals.java b/core/src/main/java/io/onedev/server/search/code/query/regex/RegexLiterals.java
index b26e543afd..bfd22ac7a4 100644
--- a/core/src/main/java/io/onedev/server/search/code/query/regex/RegexLiterals.java
+++ b/core/src/main/java/io/onedev/server/search/code/query/regex/RegexLiterals.java
@@ -4,8 +4,9 @@ import static io.onedev.server.search.code.IndexConstants.NGRAM_SIZE;
import java.util.List;
-import org.antlr.v4.runtime.ANTLRInputStream;
import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
@@ -27,7 +28,7 @@ public class RegexLiterals {
private final List<List<LeafLiterals>> rows;
public RegexLiterals(String regex) {
- ANTLRInputStream stream = new ANTLRInputStream(regex);
+ CharStream stream = CharStreams.fromString(regex);
PCRELexer lexer = new PCRELexer(stream);
lexer.removeErrorListeners();
lexer.addErrorListener(ErrorListener.INSTANCE);
diff --git a/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java b/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java
index 3e8ce2736c..882a679b58 100644
--- a/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java
+++ b/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java
@@ -8,9 +8,10 @@ import java.util.List;
import javax.annotation.Nullable;
-import org.antlr.v4.runtime.ANTLRInputStream;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
@@ -21,6 +22,8 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.stringmatch.WildcardUtils;
import io.onedev.server.OneDev;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.exception.OneException;
@@ -34,8 +37,6 @@ import io.onedev.server.search.commit.CommitQueryParser.CriteriaContext;
import io.onedev.server.search.commit.CommitQueryParser.QueryContext;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
-import io.onedev.utils.StringUtils;
-import io.onedev.utils.stringmatch.WildcardUtils;
public class CommitQueryUtils {
@@ -44,7 +45,7 @@ public class CommitQueryUtils {
@Nullable
public static QueryContext parse(@Nullable String queryString) {
if (queryString != null) {
- ANTLRInputStream is = new ANTLRInputStream(queryString);
+ CharStream is = CharStreams.fromString(queryString);
CommitQueryLexer lexer = new CommitQueryLexer(is);
lexer.removeErrorListeners();
lexer.addErrorListener(new BaseErrorListener() {
diff --git a/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
index 2fdab56721..6469c80ac4 100644
--- a/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
@@ -13,6 +13,7 @@ import org.unbescape.java.JavaEscape;
import com.google.common.base.Splitter;
+import io.onedev.commons.utils.WordUtils;
import io.onedev.server.OneDev;
import io.onedev.server.exception.OneException;
import io.onedev.server.manager.BuildManager;
@@ -26,7 +27,6 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.util.DateUtils;
-import io.onedev.utils.WordUtils;
public abstract class EntityQuery<T extends AbstractEntity> implements Serializable {
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
index 5a2d1776e5..03ba0e97e5 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
@@ -11,9 +11,10 @@ import java.util.List;
import javax.annotation.Nullable;
-import org.antlr.v4.runtime.ANTLRInputStream;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
@@ -59,7 +60,7 @@ public class BuildQuery extends EntityQuery<Build> {
public static BuildQuery parse(Project project, @Nullable String queryString, boolean validate) {
if (queryString != null) {
- ANTLRInputStream is = new ANTLRInputStream(queryString);
+ CharStream is = CharStreams.fromString(queryString);
BuildQueryLexer lexer = new BuildQueryLexer(is);
lexer.removeErrorListeners();
lexer.addErrorListener(new BaseErrorListener() {
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
index bc069ce9be..07e10316eb 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
@@ -13,9 +13,10 @@ import java.util.List;
import javax.annotation.Nullable;
-import org.antlr.v4.runtime.ANTLRInputStream;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
@@ -61,7 +62,7 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {
public static CodeCommentQuery parse(Project project, @Nullable String queryString, boolean validate) {
if (queryString != null) {
- ANTLRInputStream is = new ANTLRInputStream(queryString);
+ CharStream is = CharStreams.fromString(queryString);
CodeCommentQueryLexer lexer = new CodeCommentQueryLexer(is);
lexer.removeErrorListeners();
lexer.addErrorListener(new BaseErrorListener() {
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
index 41b953a1cd..e3ca356036 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
@@ -5,12 +5,12 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
import io.onedev.server.util.CodeCommentConstants;
+import io.onedev.commons.utils.stringmatch.WildcardUtils;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
-import io.onedev.utils.stringmatch.WildcardUtils;
public class PathCriteria extends EntityCriteria<CodeComment> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index 66689a5b7c..8586816ae3 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
@@ -24,9 +24,10 @@ import java.util.Set;
import javax.annotation.Nullable;
-import org.antlr.v4.runtime.ANTLRInputStream;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
@@ -101,7 +102,7 @@ public class IssueQuery extends EntityQuery<Issue> {
public static IssueQuery parse(@Nullable Project project, @Nullable String queryString, boolean validate) {
if (queryString != null) {
- ANTLRInputStream is = new ANTLRInputStream(queryString);
+ CharStream is = CharStreams.fromString(queryString);
IssueQueryLexer lexer = new IssueQueryLexer(is);
lexer.removeErrorListeners();
lexer.addErrorListener(new BaseErrorListener() {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
index 13c73a012a..d0fad5f9a8 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
@@ -6,9 +6,10 @@ import java.util.List;
import javax.annotation.Nullable;
-import org.antlr.v4.runtime.ANTLRInputStream;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
@@ -53,7 +54,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
public static PullRequestQuery parse(Project project, @Nullable String queryString, boolean validate) {
if (queryString != null) {
- ANTLRInputStream is = new ANTLRInputStream(queryString);
+ CharStream is = CharStreams.fromString(queryString);
PullRequestQueryLexer lexer = new PullRequestQueryLexer(is);
lexer.removeErrorListeners();
lexer.addErrorListener(new BaseErrorListener() {
diff --git a/core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.java b/core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.java
index c533b5441c..3466c0af05 100644
--- a/core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.java
+++ b/core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.java
@@ -22,9 +22,9 @@ import org.apache.shiro.subject.Subject;
import org.apache.shiro.web.filter.PathMatchingFilter;
import org.apache.shiro.web.util.WebUtils;
-import io.onedev.launcher.loader.PluginManager;
-import io.onedev.utils.ExceptionUtils;
-import io.onedev.utils.StringUtils;
+import io.onedev.commons.launcher.loader.PluginManager;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.StringUtils;
@Singleton
public class BasicAuthenticationFilter extends PathMatchingFilter {
diff --git a/core/src/main/java/io/onedev/server/security/FilterChainConfigurator.java b/core/src/main/java/io/onedev/server/security/FilterChainConfigurator.java
index d7cd47cca8..02fe201f53 100644
--- a/core/src/main/java/io/onedev/server/security/FilterChainConfigurator.java
+++ b/core/src/main/java/io/onedev/server/security/FilterChainConfigurator.java
@@ -2,7 +2,7 @@ package io.onedev.server.security;
import org.apache.shiro.web.filter.mgt.FilterChainManager;
-import io.onedev.launcher.loader.ExtensionPoint;
+import io.onedev.commons.launcher.loader.ExtensionPoint;
@ExtensionPoint
public interface FilterChainConfigurator {
diff --git a/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java b/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java
index df90c409d2..75dce0d1c2 100644
--- a/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java
+++ b/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java
@@ -21,7 +21,9 @@ import org.apache.shiro.subject.PrincipalCollection;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.manager.GroupManager;
import io.onedev.server.manager.MembershipManager;
@@ -44,8 +46,6 @@ import io.onedev.server.util.facade.MembershipFacade;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.facade.UserAuthorizationFacade;
import io.onedev.server.util.facade.UserFacade;
-import io.onedev.utils.ExceptionUtils;
-import io.onedev.utils.StringUtils;
@Singleton
public class OneAuthorizingRealm extends AuthorizingRealm {
diff --git a/core/src/main/java/io/onedev/server/security/OnePasswordService.java b/core/src/main/java/io/onedev/server/security/OnePasswordService.java
index e36f4ae1f6..3874022c06 100644
--- a/core/src/main/java/io/onedev/server/security/OnePasswordService.java
+++ b/core/src/main/java/io/onedev/server/security/OnePasswordService.java
@@ -6,7 +6,7 @@ import org.apache.shiro.authc.credential.PasswordService;
import com.pmease.security.shiro.bcrypt.BCryptPasswordService;
-import io.onedev.utils.StringUtils;
+import io.onedev.commons.utils.StringUtils;
@Singleton
public class OnePasswordService implements PasswordService {
diff --git a/core/src/main/java/io/onedev/server/util/BatchWorker.java b/core/src/main/java/io/onedev/server/util/BatchWorker.java
index e636b7c019..1cb68a5dcd 100644
--- a/core/src/main/java/io/onedev/server/util/BatchWorker.java
+++ b/core/src/main/java/io/onedev/server/util/BatchWorker.java
@@ -7,7 +7,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
import com.google.common.base.Preconditions;
-import io.onedev.utils.concurrent.Prioritized;
+import io.onedev.commons.utils.concurrent.Prioritized;
public abstract class BatchWorker {
diff --git a/core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java b/core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java
index d5a1005ae3..258a5857eb 100644
--- a/core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java
+++ b/core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java
@@ -17,6 +17,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.unbescape.html.HtmlEscape;
+import io.onedev.commons.utils.Transformer;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.ProjectManager;
@@ -28,7 +29,6 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.CommitMessageTransform;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
-import io.onedev.utils.Transformer;
public class CommitMessageTransformer implements Transformer<String> {
diff --git a/core/src/main/java/io/onedev/server/util/OneContext.java b/core/src/main/java/io/onedev/server/util/OneContext.java
index d5d6745aac..f8b2e4ff5b 100644
--- a/core/src/main/java/io/onedev/server/util/OneContext.java
+++ b/core/src/main/java/io/onedev/server/util/OneContext.java
@@ -8,7 +8,7 @@ import org.apache.wicket.Component;
import com.google.common.base.Preconditions;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.model.Project;
import io.onedev.server.util.inputspec.InputContext;
diff --git a/core/src/main/java/io/onedev/server/util/diff/DiffUtils.java b/core/src/main/java/io/onedev/server/util/diff/DiffUtils.java
index 4810d07fe5..d434f093fd 100644
--- a/core/src/main/java/io/onedev/server/util/diff/DiffUtils.java
+++ b/core/src/main/java/io/onedev/server/util/diff/DiffUtils.java
@@ -13,16 +13,16 @@ import javax.annotation.Nullable;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
-import io.onedev.jsyntax.TextToken;
-import io.onedev.jsyntax.TokenTypes;
-import io.onedev.jsyntax.TokenUtils;
-import io.onedev.jsyntax.Tokenized;
-import io.onedev.jsyntax.Tokenizer;
-import io.onedev.jsyntax.TokenizerRegistry;
+import io.onedev.commons.jsyntax.TextToken;
+import io.onedev.commons.jsyntax.TokenTypes;
+import io.onedev.commons.jsyntax.TokenUtils;
+import io.onedev.commons.jsyntax.Tokenized;
+import io.onedev.commons.jsyntax.Tokenizer;
+import io.onedev.commons.jsyntax.TokenizerRegistry;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.model.support.TextRange;
import io.onedev.server.util.diff.DiffMatchPatch.Diff;
import io.onedev.server.util.diff.DiffMatchPatch.Operation;
-import io.onedev.utils.StringUtils;
public class DiffUtils {
diff --git a/core/src/main/java/io/onedev/server/util/diff/LineDiff.java b/core/src/main/java/io/onedev/server/util/diff/LineDiff.java
index 2ed9cb9a81..a8a567b034 100644
--- a/core/src/main/java/io/onedev/server/util/diff/LineDiff.java
+++ b/core/src/main/java/io/onedev/server/util/diff/LineDiff.java
@@ -3,7 +3,7 @@ package io.onedev.server.util.diff;
import java.io.Serializable;
import java.util.List;
-import io.onedev.jsyntax.TextToken;
+import io.onedev.commons.jsyntax.TextToken;
public class LineDiff implements Serializable {
diff --git a/core/src/main/java/io/onedev/server/util/facade/UserFacade.java b/core/src/main/java/io/onedev/server/util/facade/UserFacade.java
index ba53f95b39..a37fb6b75a 100644
--- a/core/src/main/java/io/onedev/server/util/facade/UserFacade.java
+++ b/core/src/main/java/io/onedev/server/util/facade/UserFacade.java
@@ -2,8 +2,8 @@ package io.onedev.server.util.facade;
import javax.annotation.Nullable;
+import io.onedev.commons.utils.matchscore.MatchScoreUtils;
import io.onedev.server.model.User;
-import io.onedev.utils.matchscore.MatchScoreUtils;
public class UserFacade extends EntityFacade {
diff --git a/core/src/main/java/io/onedev/server/util/jackson/JsonOptions.java b/core/src/main/java/io/onedev/server/util/jackson/JsonOptions.java
index 0deb0c44e9..4a54ed9360 100644
--- a/core/src/main/java/io/onedev/server/util/jackson/JsonOptions.java
+++ b/core/src/main/java/io/onedev/server/util/jackson/JsonOptions.java
@@ -5,7 +5,7 @@ import java.util.LinkedHashMap;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
@SuppressWarnings("serial")
public class JsonOptions extends LinkedHashMap<String, String> {
diff --git a/core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneDeserializer.java b/core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneDeserializer.java
index 459639bdf7..8b38572c3e 100644
--- a/core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneDeserializer.java
+++ b/core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneDeserializer.java
@@ -7,7 +7,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.persistence.dao.Dao;
diff --git a/core/src/main/java/io/onedev/server/util/jetty/AssetServlet.java b/core/src/main/java/io/onedev/server/util/jetty/AssetServlet.java
index 4403dc3c35..245e39859d 100644
--- a/core/src/main/java/io/onedev/server/util/jetty/AssetServlet.java
+++ b/core/src/main/java/io/onedev/server/util/jetty/AssetServlet.java
@@ -19,7 +19,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletMapping;
import org.eclipse.jetty.util.resource.Resource;
-import io.onedev.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
/**
* Asset servlet to serve static web assets with some default parameters.
diff --git a/core/src/main/java/io/onedev/server/util/jetty/DefaultJettyRunner.java b/core/src/main/java/io/onedev/server/util/jetty/DefaultJettyRunner.java
index d2d11716f2..fb26d28473 100644
--- a/core/src/main/java/io/onedev/server/util/jetty/DefaultJettyRunner.java
+++ b/core/src/main/java/io/onedev/server/util/jetty/DefaultJettyRunner.java
@@ -18,8 +18,8 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
import com.google.inject.servlet.GuiceFilter;
-import io.onedev.launcher.bootstrap.Bootstrap;
-import io.onedev.utils.ExceptionUtils;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.utils.ExceptionUtils;
@Singleton
public class DefaultJettyRunner implements JettyRunner, Provider<ServletContextHandler> {
diff --git a/core/src/main/java/io/onedev/server/util/jetty/ServerConfigurator.java b/core/src/main/java/io/onedev/server/util/jetty/ServerConfigurator.java
index 151f400290..5b2a449d88 100644
--- a/core/src/main/java/io/onedev/server/util/jetty/ServerConfigurator.java
+++ b/core/src/main/java/io/onedev/server/util/jetty/ServerConfigurator.java
@@ -2,7 +2,7 @@ package io.onedev.server.util.jetty;
import org.eclipse.jetty.server.Server;
-import io.onedev.launcher.loader.ExtensionPoint;
+import io.onedev.commons.launcher.loader.ExtensionPoint;
@ExtensionPoint
public interface ServerConfigurator {
diff --git a/core/src/main/java/io/onedev/server/util/jetty/ServletConfigurator.java b/core/src/main/java/io/onedev/server/util/jetty/ServletConfigurator.java
index 119ec4544b..23eb971c00 100644
--- a/core/src/main/java/io/onedev/server/util/jetty/ServletConfigurator.java
+++ b/core/src/main/java/io/onedev/server/util/jetty/ServletConfigurator.java
@@ -2,7 +2,7 @@ package io.onedev.server.util.jetty;
import org.eclipse.jetty.servlet.ServletContextHandler;
-import io.onedev.launcher.loader.ExtensionPoint;
+import io.onedev.commons.launcher.loader.ExtensionPoint;
@ExtensionPoint
public interface ServletConfigurator {
diff --git a/core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.java b/core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.java
index 15695175d9..a16722ee62 100644
--- a/core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.java
+++ b/core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.java
@@ -4,7 +4,7 @@ import javax.annotation.Nullable;
import org.jsoup.nodes.Document;
-import io.onedev.launcher.loader.ExtensionPoint;
+import io.onedev.commons.launcher.loader.ExtensionPoint;
import io.onedev.server.model.Project;
@ExtensionPoint
diff --git a/core/src/main/java/io/onedev/server/util/markdown/MentionParser.java b/core/src/main/java/io/onedev/server/util/markdown/MentionParser.java
index caf13d6fb8..be8e6e7770 100644
--- a/core/src/main/java/io/onedev/server/util/markdown/MentionParser.java
+++ b/core/src/main/java/io/onedev/server/util/markdown/MentionParser.java
@@ -12,11 +12,11 @@ import org.jsoup.select.NodeTraversor;
import com.google.common.collect.ImmutableSet;
+import io.onedev.commons.utils.HtmlUtils;
+import io.onedev.commons.utils.TextNodeVisitor;
import io.onedev.server.OneDev;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.User;
-import io.onedev.utils.HtmlUtils;
-import io.onedev.utils.TextNodeVisitor;
public class MentionParser {
diff --git a/core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java b/core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java
index 2fa6046145..007c1137d3 100644
--- a/core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java
+++ b/core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java
@@ -15,16 +15,16 @@ import org.jsoup.select.NodeTraversor;
import com.google.common.collect.ImmutableSet;
+import io.onedev.commons.utils.HtmlUtils;
+import io.onedev.commons.utils.ReflectionUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.TextNodeVisitor;
+import io.onedev.commons.utils.WordUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Project;
import io.onedev.server.util.Referenceable;
-import io.onedev.utils.HtmlUtils;
-import io.onedev.utils.ReflectionUtils;
-import io.onedev.utils.StringUtils;
-import io.onedev.utils.TextNodeVisitor;
-import io.onedev.utils.WordUtils;
public abstract class ReferenceParser<T extends Referenceable> {
diff --git a/core/src/main/java/io/onedev/server/util/patternset/PatternSet.g4 b/core/src/main/java/io/onedev/server/util/patternset/PatternSet.g4
new file mode 100644
index 0000000000..2605d052ae
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/patternset/PatternSet.g4
@@ -0,0 +1,14 @@
+grammar PatternSet;
+
+patterns: WS* pattern (WS+ pattern)* WS* EOF;
+
+pattern: Excluded? (Quoted|NQuoted);
+
+Quoted: '"' (ESCAPE|~["\\])+? '"';
+NQuoted: ~[-" ]~[" ]*;
+Excluded: '-';
+
+WS: ' ';
+
+fragment
+ESCAPE: '\\'["\\];
diff --git a/core/src/main/java/io/onedev/server/util/patternset/PatternSet.java b/core/src/main/java/io/onedev/server/util/patternset/PatternSet.java
new file mode 100644
index 0000000000..198c9468da
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/patternset/PatternSet.java
@@ -0,0 +1,133 @@
+package io.onedev.server.util.patternset;
+
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+import org.apache.commons.lang3.StringUtils;
+import org.unbescape.java.JavaEscape;
+
+import io.onedev.commons.utils.stringmatch.Matcher;
+import io.onedev.server.exception.OneException;
+import io.onedev.server.util.patternset.PatternSetParser.PatternContext;
+import io.onedev.server.util.patternset.PatternSetParser.PatternsContext;
+
+public class PatternSet implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String ESCAPE_CHARS = "\\\"";
+
+ private final Set<String> includes;
+
+ private final Set<String> excludes;
+
+ public PatternSet(Set<String> includes, Set<String> excludes) {
+ this.includes = includes;
+ this.excludes = excludes;
+ }
+
+ public Set<String> getIncludes() {
+ return includes;
+ }
+
+ public Set<String> getExcludes() {
+ return excludes;
+ }
+
+ public boolean matches(Matcher matcher, String value) {
+ for (String exclude: excludes) {
+ if (matcher.matches(exclude, value))
+ return false;
+ }
+ for (String include: includes) {
+ if (matcher.matches(include, value))
+ return true;
+ }
+ return false;
+ }
+
+ public static PatternSet fromString(String patternSetString) {
+ Set<String> includes = new HashSet<>();
+ Set<String> excludes = new HashSet<>();
+
+ if (patternSetString != null) {
+ PatternsContext patterns = parse(patternSetString);
+
+ for (PatternContext pattern: patterns.pattern()) {
+ String value;
+ if (pattern.Quoted() != null)
+ value = unescape(pattern.Quoted().getText());
+ else
+ value = pattern.NQuoted().getText();
+ if (pattern.Excluded() != null) {
+ excludes.add(value);
+ } else {
+ includes.add(value);
+ }
+ }
+ }
+
+ return new PatternSet(includes, excludes);
+ }
+
+ public static String unescape(String quoted) {
+ return JavaEscape.unescapeJava(quoted.substring(1, quoted.length()-1));
+ }
+
+ public static PatternsContext parse(String patternSetString) {
+ CharStream is = CharStreams.fromString(patternSetString);
+ PatternSetLexer lexer = new PatternSetLexer(is);
+ lexer.removeErrorListeners();
+ lexer.addErrorListener(new BaseErrorListener() {
+
+ @Override
+ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
+ int charPositionInLine, String msg, RecognitionException e) {
+ throw new OneException("Malformed patterns");
+ }
+
+ });
+ CommonTokenStream tokens = new CommonTokenStream(lexer);
+ PatternSetParser parser = new PatternSetParser(tokens);
+ parser.removeErrorListeners();
+ parser.setErrorHandler(new BailErrorStrategy());
+ return parser.patterns();
+ }
+
+ public static String quoteIfNecessary(String pattern) {
+ if (StringUtils.containsAny(pattern, " \"") || pattern.startsWith("-"))
+ return "\"" + escape(pattern) + "\"";
+ else
+ return pattern;
+ }
+
+ public static String escape(String pattern) {
+ StringBuilder builder = new StringBuilder();
+ for (int i=0; i<pattern.length(); i++) {
+ char ch = pattern.charAt(i);
+ if (ESCAPE_CHARS.indexOf(ch) != -1)
+ builder.append("\\");
+ builder.append(ch);
+ }
+ return builder.toString();
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ for (String include: getIncludes())
+ builder.append(include).append(" ");
+ for (String exclude: getExcludes())
+ builder.append("-").append(exclude).append(" ");
+ return builder.toString().trim();
+ }
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
index 1de61179bf..4778755d68 100644
--- a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
+++ b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
@@ -7,9 +7,13 @@ import java.util.Map;
import javax.annotation.Nullable;
-import org.antlr.v4.runtime.ANTLRInputStream;
import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
import org.antlr.v4.runtime.tree.TerminalNode;
import io.onedev.server.OneDev;
@@ -81,9 +85,18 @@ public class ReviewRequirement {
}
public static RequirementContext parse(String requirementString) {
- ANTLRInputStream is = new ANTLRInputStream(requirementString);
+ CharStream is = CharStreams.fromString(requirementString);
ReviewRequirementLexer lexer = new ReviewRequirementLexer(is);
lexer.removeErrorListeners();
+ lexer.addErrorListener(new BaseErrorListener() {
+
+ @Override
+ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
+ int charPositionInLine, String msg, RecognitionException e) {
+ throw new OneException("Malformed review requirement");
+ }
+
+ });
CommonTokenStream tokens = new CommonTokenStream(lexer);
ReviewRequirementParser parser = new ReviewRequirementParser(tokens);
parser.removeErrorListeners();
diff --git a/core/src/main/java/io/onedev/server/util/validation/BranchPatternsValidator.java b/core/src/main/java/io/onedev/server/util/validation/BranchPatternsValidator.java
new file mode 100644
index 0000000000..647de0b6f2
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/validation/BranchPatternsValidator.java
@@ -0,0 +1,35 @@
+package io.onedev.server.util.validation;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import org.apache.commons.lang3.StringUtils;
+
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.web.editable.annotation.BranchPatterns;
+
+public class BranchPatternsValidator implements ConstraintValidator<BranchPatterns, String> {
+
+ @Override
+ public void initialize(BranchPatterns constaintAnnotation) {
+ }
+
+ @Override
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value == null) {
+ return true;
+ } else {
+ try {
+ PatternSet.fromString(value);
+ return true;
+ } catch (Exception e) {
+ constraintContext.disableDefaultConstraintViolation();
+ if (StringUtils.isNotBlank(e.getMessage()))
+ constraintContext.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();
+ else
+ constraintContext.buildConstraintViolationWithTemplate("Malformed branch patterns").addConstraintViolation();
+ return false;
+ }
+ }
+ }
+}
diff --git a/core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.java b/core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.java
index c8c49e97ff..c9a398fd56 100644
--- a/core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.java
+++ b/core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.java
@@ -3,10 +3,10 @@ package io.onedev.server.util.validation;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.model.Project;
import io.onedev.server.util.OneContext;
import io.onedev.server.web.editable.annotation.BuildQuery;
-import io.onedev.utils.StringUtils;
public class BuildQueryValidator implements ConstraintValidator<BuildQuery, String> {
diff --git a/core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java b/core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java
index ce4ce11508..1e59e9495a 100644
--- a/core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java
+++ b/core/src/main/java/io/onedev/server/util/validation/CodeCommentQueryValidator.java
@@ -3,10 +3,10 @@ package io.onedev.server.util.validation;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.model.Project;
import io.onedev.server.util.OneContext;
import io.onedev.server.web.editable.annotation.CodeCommentQuery;
-import io.onedev.utils.StringUtils;
public class CodeCommentQueryValidator implements ConstraintValidator<CodeCommentQuery, String> {
diff --git a/core/src/main/java/io/onedev/server/util/validation/CommitQueryValidator.java b/core/src/main/java/io/onedev/server/util/validation/CommitQueryValidator.java
index 85722e85ce..b407989f92 100644
--- a/core/src/main/java/io/onedev/server/util/validation/CommitQueryValidator.java
+++ b/core/src/main/java/io/onedev/server/util/validation/CommitQueryValidator.java
@@ -3,9 +3,9 @@ package io.onedev.server.util.validation;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.search.commit.CommitQueryUtils;
import io.onedev.server.web.editable.annotation.CommitQuery;
-import io.onedev.utils.StringUtils;
public class CommitQueryValidator implements ConstraintValidator<CommitQuery, String> {
diff --git a/core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java b/core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java
index 3921da7084..989acba8a7 100644
--- a/core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java
+++ b/core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java
@@ -5,9 +5,9 @@ import java.io.File;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
-import io.onedev.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.utils.FileUtils;
import io.onedev.server.util.validation.annotation.Directory;
-import io.onedev.utils.FileUtils;
public class DirectoryValidator implements ConstraintValidator<Directory, String> {
diff --git a/core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java b/core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java
index 0dd0c30881..dd7560e623 100644
--- a/core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java
+++ b/core/src/main/java/io/onedev/server/util/validation/IssueQueryValidator.java
@@ -3,10 +3,10 @@ package io.onedev.server.util.validation;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.model.Project;
import io.onedev.server.util.OneContext;
import io.onedev.server.web.editable.annotation.IssueQuery;
-import io.onedev.utils.StringUtils;
public class IssueQueryValidator implements ConstraintValidator<IssueQuery, String> {
diff --git a/core/src/main/java/io/onedev/server/util/validation/PathPatternsValidator.java b/core/src/main/java/io/onedev/server/util/validation/PathPatternsValidator.java
new file mode 100644
index 0000000000..6e6fed7b15
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/validation/PathPatternsValidator.java
@@ -0,0 +1,35 @@
+package io.onedev.server.util.validation;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import org.apache.commons.lang3.StringUtils;
+
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.web.editable.annotation.PathPatterns;
+
+public class PathPatternsValidator implements ConstraintValidator<PathPatterns, String> {
+
+ @Override
+ public void initialize(PathPatterns constaintAnnotation) {
+ }
+
+ @Override
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value == null) {
+ return true;
+ } else {
+ try {
+ PatternSet.fromString(value);
+ return true;
+ } catch (Exception e) {
+ constraintContext.disableDefaultConstraintViolation();
+ if (StringUtils.isNotBlank(e.getMessage()))
+ constraintContext.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();
+ else
+ constraintContext.buildConstraintViolationWithTemplate("Malformed path patterns").addConstraintViolation();
+ return false;
+ }
+ }
+ }
+}
diff --git a/core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java b/core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java
index 7533e5093e..6fece1b8a1 100644
--- a/core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java
+++ b/core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java
@@ -3,10 +3,10 @@ package io.onedev.server.util.validation;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.model.Project;
import io.onedev.server.util.OneContext;
import io.onedev.server.web.editable.annotation.PullRequestQuery;
-import io.onedev.utils.StringUtils;
public class PullRequestQueryValidator implements ConstraintValidator<PullRequestQuery, String> {
diff --git a/core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.java b/core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.java
index 5cb96ae989..0a3f0db043 100644
--- a/core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.java
+++ b/core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.java
@@ -3,7 +3,8 @@ package io.onedev.server.util.validation;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
-import io.onedev.server.exception.OneException;
+import org.apache.commons.lang3.StringUtils;
+
import io.onedev.server.web.editable.annotation.ReviewRequirement;
public class ReviewRequirementValidator implements ConstraintValidator<ReviewRequirement, String> {
@@ -20,9 +21,12 @@ public class ReviewRequirementValidator implements ConstraintValidator<ReviewReq
try {
io.onedev.server.util.reviewrequirement.ReviewRequirement.fromString(value);
return true;
- } catch (OneException e) {
+ } catch (Exception e) {
constraintContext.disableDefaultConstraintViolation();
- constraintContext.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();
+ if (StringUtils.isNotBlank(e.getMessage()))
+ constraintContext.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();
+ else
+ constraintContext.buildConstraintViolationWithTemplate("Malformed review requirement").addConstraintViolation();
return false;
}
}
diff --git a/core/src/main/java/io/onedev/server/util/validation/TagPatternsValidator.java b/core/src/main/java/io/onedev/server/util/validation/TagPatternsValidator.java
new file mode 100644
index 0000000000..dc1cc8499a
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/validation/TagPatternsValidator.java
@@ -0,0 +1,35 @@
+package io.onedev.server.util.validation;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import org.apache.commons.lang3.StringUtils;
+
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.web.editable.annotation.TagPatterns;
+
+public class TagPatternsValidator implements ConstraintValidator<TagPatterns, String> {
+
+ @Override
+ public void initialize(TagPatterns constaintAnnotation) {
+ }
+
+ @Override
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value == null) {
+ return true;
+ } else {
+ try {
+ PatternSet.fromString(value);
+ return true;
+ } catch (Exception e) {
+ constraintContext.disableDefaultConstraintViolation();
+ if (StringUtils.isNotBlank(e.getMessage()))
+ constraintContext.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();
+ else
+ constraintContext.buildConstraintViolationWithTemplate("Malformed tag patterns").addConstraintViolation();
+ return false;
+ }
+ }
+ }
+}
diff --git a/core/src/main/java/io/onedev/server/web/ExpectedExceptionContribution.java b/core/src/main/java/io/onedev/server/web/ExpectedExceptionContribution.java
index ea6e57c2c9..10a14d27df 100644
--- a/core/src/main/java/io/onedev/server/web/ExpectedExceptionContribution.java
+++ b/core/src/main/java/io/onedev/server/web/ExpectedExceptionContribution.java
@@ -2,7 +2,7 @@ package io.onedev.server.web;
import java.util.Collection;
-import io.onedev.launcher.loader.ExtensionPoint;
+import io.onedev.commons.launcher.loader.ExtensionPoint;
@ExtensionPoint
public interface ExpectedExceptionContribution {
diff --git a/core/src/main/java/io/onedev/server/web/OneWebApplication.java b/core/src/main/java/io/onedev/server/web/OneWebApplication.java
index 44b6969204..d027a4c705 100644
--- a/core/src/main/java/io/onedev/server/web/OneWebApplication.java
+++ b/core/src/main/java/io/onedev/server/web/OneWebApplication.java
@@ -50,8 +50,8 @@ import org.apache.wicket.util.IProvider;
import org.apache.wicket.util.time.Duration;
import de.agilecoders.wicket.core.settings.BootstrapSettings;
-import io.onedev.launcher.bootstrap.Bootstrap;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.error.ErrorPage;
import io.onedev.server.web.page.project.ProjectListPage;
diff --git a/core/src/main/java/io/onedev/server/web/ResourcePackScopeContribution.java b/core/src/main/java/io/onedev/server/web/ResourcePackScopeContribution.java
index a72b8208b2..f06d2f3fae 100644
--- a/core/src/main/java/io/onedev/server/web/ResourcePackScopeContribution.java
+++ b/core/src/main/java/io/onedev/server/web/ResourcePackScopeContribution.java
@@ -2,7 +2,7 @@ package io.onedev.server.web;
import java.util.Collection;
-import io.onedev.launcher.loader.ExtensionPoint;
+import io.onedev.commons.launcher.loader.ExtensionPoint;
@ExtensionPoint
public interface ResourcePackScopeContribution {
diff --git a/core/src/main/java/io/onedev/server/web/WebPlugin.java b/core/src/main/java/io/onedev/server/web/WebPlugin.java
index ac78af883a..05fc57b267 100644
--- a/core/src/main/java/io/onedev/server/web/WebPlugin.java
+++ b/core/src/main/java/io/onedev/server/web/WebPlugin.java
@@ -2,7 +2,7 @@ package io.onedev.server.web;
import javax.inject.Inject;
-import io.onedev.launcher.loader.AbstractPlugin;
+import io.onedev.commons.launcher.loader.AbstractPlugin;
import io.onedev.server.web.websocket.WebSocketManager;
public class WebPlugin extends AbstractPlugin {
diff --git a/core/src/main/java/io/onedev/server/web/asset/codemirror/ModeUrlResourceReference.java b/core/src/main/java/io/onedev/server/web/asset/codemirror/ModeUrlResourceReference.java
index 042b2af5cc..f10bb4b6fd 100644
--- a/core/src/main/java/io/onedev/server/web/asset/codemirror/ModeUrlResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/asset/codemirror/ModeUrlResourceReference.java
@@ -9,7 +9,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
-import io.onedev.utils.StringUtils;
+import io.onedev.commons.utils.StringUtils;
public class ModeUrlResourceReference extends JavaScriptResourceReference {
diff --git a/core/src/main/java/io/onedev/server/web/behavior/BranchPatternAssistBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/BranchPatternAssistBehavior.java
deleted file mode 100644
index 11077f4320..0000000000
--- a/core/src/main/java/io/onedev/server/web/behavior/BranchPatternAssistBehavior.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.onedev.server.web.behavior;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-
-import com.google.common.collect.Lists;
-
-import io.onedev.codeassist.InputCompletion;
-import io.onedev.codeassist.InputStatus;
-import io.onedev.codeassist.InputSuggestion;
-import io.onedev.server.model.Project;
-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
-import io.onedev.server.web.util.SuggestionUtils;
-import io.onedev.utils.Range;
-
-@SuppressWarnings("serial")
-public class BranchPatternAssistBehavior extends InputAssistBehavior {
-
- private final IModel<Project> projectModel;
-
- public BranchPatternAssistBehavior(IModel<Project> projectModel) {
- this.projectModel = projectModel;
- }
-
- @Override
- public void detach(Component component) {
- super.detach(component);
- projectModel.detach();
- }
-
- @Override
- protected List<InputCompletion> getSuggestions(InputStatus inputStatus) {
- List<InputCompletion> completions = new ArrayList<>();
- for (InputSuggestion suggestion: SuggestionUtils.suggestBranch(projectModel.getObject(),
- inputStatus.getContentBeforeCaret().trim(), null)) {
- int caret = suggestion.getCaret();
- if (caret == -1)
- caret = suggestion.getContent().length();
- completions.add(new InputCompletion(suggestion.getContent(), suggestion.getContent(), caret, null, suggestion.getMatch()));
- }
- return completions;
- }
-
- @Override
- protected List<String> getHints(InputStatus inputStatus) {
- return Lists.newArrayList("Use * to match any part of the branch");
- }
-
- @Override
- protected List<Range> getErrors(String inputContent) {
- return null;
- }
-
- @Override
- protected int getAnchor(String content) {
- for (int i=0; i<content.length(); i++) {
- if (!Character.isWhitespace(content.charAt(i)))
- return i;
- }
- return content.length();
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
index 2d5b8fefc7..987bffe7ec 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.behavior;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -11,12 +12,12 @@ import org.apache.wicket.model.IModel;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import io.onedev.codeassist.FenceAware;
-import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
-import io.onedev.codeassist.parser.Element;
-import io.onedev.codeassist.parser.ParseExpect;
-import io.onedev.codeassist.parser.TerminalExpect;
+import io.onedev.commons.codeassist.FenceAware;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.commons.codeassist.parser.Element;
+import io.onedev.commons.codeassist.parser.ParseExpect;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.server.exception.OneException;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.build.BuildQuery;
@@ -52,6 +53,10 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
return projectModel.getObject();
}
+ private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {
+ return suggestions.stream().map(it->it.escape(ESCAPE_CHARS)).collect(Collectors.toList());
+ }
+
@Override
protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
@@ -66,14 +71,13 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
Project project = getProject();
if ("criteriaField".equals(spec.getLabel())) {
- suggestions.addAll(SuggestionUtils.suggest(BuildConstants.QUERY_FIELDS, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggest(BuildConstants.QUERY_FIELDS, unfencedLowerCaseMatchWith)));
} else if ("orderField".equals(spec.getLabel())) {
- suggestions.addAll(SuggestionUtils.suggest(new ArrayList<>(BuildConstants.ORDER_FIELDS.keySet()),
- unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggest(new ArrayList<>(BuildConstants.ORDER_FIELDS.keySet()), unfencedLowerCaseMatchWith)));
} else if ("criteriaValue".equals(spec.getLabel())) {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
if (fieldElements.isEmpty()) {
- suggestions.addAll(SuggestionUtils.suggestIssue(project, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggestIssues(project, unfencedLowerCaseMatchWith)));
} else {
String fieldName = BuildQuery.getValue(fieldElements.get(0).getMatchedText());
List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);
@@ -84,13 +88,12 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
BuildQuery.checkField(project, fieldName, operator);
if (fieldName.equals(BuildConstants.FIELD_BUILD_DATE)) {
suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES,
- unfencedLowerCaseMatchWith, null));
+ unfencedLowerCaseMatchWith));
CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));
} else if (fieldName.equals(BuildConstants.FIELD_CONFIGURATION)) {
- suggestions.addAll(SuggestionUtils.suggestConfiguration(projectModel.getObject(),
- unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggestConfigurations(projectModel.getObject(), unfencedLowerCaseMatchWith)));
} else if (fieldName.equals(BuildConstants.FIELD_VERSION)) {
- suggestions.addAll(SuggestionUtils.suggestBuild(project, unfencedLowerCaseMatchWith, false, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedLowerCaseMatchWith, false)));
} else {
return null;
}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
index b805efa07c..6d2e39cbff 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.behavior;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -11,12 +12,12 @@ import org.apache.wicket.model.IModel;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import io.onedev.codeassist.FenceAware;
-import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
-import io.onedev.codeassist.parser.Element;
-import io.onedev.codeassist.parser.ParseExpect;
-import io.onedev.codeassist.parser.TerminalExpect;
+import io.onedev.commons.codeassist.FenceAware;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.commons.codeassist.parser.Element;
+import io.onedev.commons.codeassist.parser.ParseExpect;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.server.exception.OneException;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
@@ -53,6 +54,10 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {
return projectModel.getObject();
}
+ private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {
+ return suggestions.stream().map(it->it.escape(ESCAPE_CHARS)).collect(Collectors.toList());
+ }
+
@Override
protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
@@ -67,10 +72,9 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {
Project project = getProject();
if ("criteriaField".equals(spec.getLabel())) {
- suggestions.addAll(SuggestionUtils.suggest(CodeCommentConstants.QUERY_FIELDS, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggest(CodeCommentConstants.QUERY_FIELDS, unfencedLowerCaseMatchWith)));
} else if ("orderField".equals(spec.getLabel())) {
- suggestions.addAll(SuggestionUtils.suggest(new ArrayList<>(CodeCommentConstants.ORDER_FIELDS.keySet()),
- unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggest(new ArrayList<>(CodeCommentConstants.ORDER_FIELDS.keySet()), unfencedLowerCaseMatchWith)));
} else if ("criteriaValue".equals(spec.getLabel())) {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);
@@ -78,19 +82,20 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {
String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());
int operator = CodeCommentQuery.getOperator(operatorName);
if (fieldElements.isEmpty()) {
- if (operator == CodeCommentQueryLexer.CreatedBy )
- suggestions.addAll(SuggestionUtils.suggestUser(unfencedLowerCaseMatchWith, ESCAPE_CHARS));
- else
+ if (operator == CodeCommentQueryLexer.CreatedBy) {
+ suggestions.addAll(SuggestionUtils.suggestUsers(unfencedLowerCaseMatchWith));
+ } else {
return null;
+ }
} else {
String fieldName = CodeCommentQuery.getValue(fieldElements.get(0).getMatchedText());
try {
CodeCommentQuery.checkField(project, fieldName, operator);
if (fieldName.equals(CodeCommentConstants.FIELD_CREATE_DATE) || fieldName.equals(CodeCommentConstants.FIELD_UPDATE_DATE)) {
- suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, unfencedLowerCaseMatchWith, null));
+ suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, unfencedLowerCaseMatchWith));
CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));
} else if (fieldName.equals(CodeCommentConstants.FIELD_PATH)) {
- suggestions.addAll(SuggestionUtils.suggestPath(projectModel.getObject(), unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggestBlobs(projectModel.getObject(), unfencedLowerCaseMatchWith)));
} else {
return null;
}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index ae56681a41..f61a24d02c 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -24,12 +24,12 @@ import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import io.onedev.codeassist.FenceAware;
-import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
-import io.onedev.codeassist.parser.Element;
-import io.onedev.codeassist.parser.ParseExpect;
-import io.onedev.codeassist.parser.TerminalExpect;
+import io.onedev.commons.codeassist.FenceAware;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.commons.codeassist.parser.Element;
+import io.onedev.commons.codeassist.parser.ParseExpect;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.server.OneDev;
import io.onedev.server.exception.OneException;
import io.onedev.server.manager.BuildManager;
@@ -94,6 +94,10 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
return projectModel.getObject();
}
+ private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {
+ return suggestions.stream().map(it->it.escape(ESCAPE_CHARS)).collect(Collectors.toList());
+ }
+
@Override
protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
@@ -113,29 +117,29 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
List<String> candidates = new ArrayList<>(IssueConstants.QUERY_FIELDS);
for (InputSpec field: issueSetting.getFieldSpecs())
candidates.add(field.getName());
- suggestions.addAll(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
} else if ("orderField".equals(spec.getLabel())) {
List<String> candidates = new ArrayList<>(IssueConstants.ORDER_FIELDS.keySet());
for (InputSpec field: issueSetting.getFieldSpecs()) {
if (field instanceof NumberInput || field instanceof ChoiceInput || field instanceof DateInput)
candidates.add(field.getName());
}
- suggestions.addAll(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
} else if ("revisionValue".equals(spec.getLabel())) {
String revisionType = terminalExpect.getState()
.findMatchedElementsByLabel("revisionType", true).iterator().next().getMatchedText();
switch (revisionType) {
case "branch":
if (getProject() != null)
- suggestions.addAll(SuggestionUtils.suggestBranch(project, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggestBranches(project, unfencedLowerCaseMatchWith)));
break;
case "tag":
if (getProject() != null)
- suggestions.addAll(SuggestionUtils.suggestTag(project, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggestTags(project, unfencedLowerCaseMatchWith)));
break;
case "build":
if (getProject() != null)
- suggestions.addAll(SuggestionUtils.suggestBuild(project, unfencedLowerCaseMatchWith, true, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedLowerCaseMatchWith, true)));
break;
}
} else if ("criteriaValue".equals(spec.getLabel())) {
@@ -146,9 +150,9 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
int operator = IssueQuery.getOperator(operatorName);
if (fieldElements.isEmpty()) {
if (operator == IssueQueryLexer.SubmittedBy)
- suggestions.addAll(SuggestionUtils.suggestUser(unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggestUsers(unfencedLowerCaseMatchWith)));
else
- suggestions.addAll(SuggestionUtils.suggestBuild(project, unfencedLowerCaseMatchWith, true, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedLowerCaseMatchWith, true)));
} else {
String fieldName = IssueQuery.getValue(fieldElements.get(0).getMatchedText());
@@ -157,10 +161,10 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
InputSpec fieldSpec = issueSetting.getFieldSpec(fieldName);
if (fieldSpec instanceof DateInput || fieldName.equals(FIELD_SUBMIT_DATE)
|| fieldName.equals(FIELD_UPDATE_DATE)) {
- suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, unfencedLowerCaseMatchWith, null));
+ suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, unfencedLowerCaseMatchWith));
CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));
} else if (fieldSpec instanceof UserChoiceInput) {
- suggestions.addAll(SuggestionUtils.suggestUser(unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggestUsers(unfencedLowerCaseMatchWith)));
} else if (fieldSpec instanceof IssueChoiceInput) {
List<Issue> issues = OneDev.getInstance(IssueManager.class).query(project, unfencedLowerCaseMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);
for (Issue issue: issues) {
@@ -180,24 +184,24 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
suggestions.add(suggestion);
}
} else if (fieldSpec instanceof BooleanInput) {
- suggestions.addAll(SuggestionUtils.suggest(Lists.newArrayList("true", "false"), unfencedLowerCaseMatchWith, null));
+ suggestions.addAll(SuggestionUtils.suggest(Lists.newArrayList("true", "false"), unfencedLowerCaseMatchWith));
} else if (fieldSpec instanceof GroupChoiceInput) {
List<String> candidates = OneDev.getInstance(GroupManager.class).query().stream().map(it->it.getName()).collect(Collectors.toList());
- suggestions.addAll(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
} else if (fieldName.equals(FIELD_STATE)) {
List<String> candidates = issueSetting.getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());
- suggestions.addAll(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
} else if (fieldSpec instanceof ChoiceInput) {
OneContext.push(newOneContext());
try {
List<String> candidates = new ArrayList<>(((ChoiceInput)fieldSpec).getChoiceProvider().getChoices(true).keySet());
- suggestions.addAll(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
} finally {
OneContext.pop();
}
} else if (fieldName.equals(FIELD_MILESTONE)) {
List<String> candidates = project.getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());
- suggestions.addAll(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
} else if (fieldName.equals(FIELD_TITLE) || fieldName.equals(FIELD_DESCRIPTION)
|| fieldName.equals(FIELD_COMMENT) || fieldName.equals(FIELD_VOTE_COUNT)
|| fieldName.equals(FIELD_COMMENT_COUNT) || fieldName.equals(FIELD_NUMBER)
diff --git a/core/src/main/java/io/onedev/server/web/behavior/MultilineAssistBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/MultilineAssistBehavior.java
new file mode 100644
index 0000000000..7172fa7b19
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/behavior/MultilineAssistBehavior.java
@@ -0,0 +1,55 @@
+package io.onedev.server.web.behavior;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.onedev.commons.codeassist.InputCompletion;
+import io.onedev.commons.codeassist.InputStatus;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.utils.Range;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
+
+@SuppressWarnings("serial")
+public abstract class MultilineAssistBehavior extends InputAssistBehavior {
+
+ @Override
+ protected List<InputCompletion> getSuggestions(InputStatus inputStatus) {
+ List<InputCompletion> completions = new ArrayList<>();
+ String contentBeforeCaret = inputStatus.getContentBeforeCaret();
+ int lineStart = contentBeforeCaret.lastIndexOf('\n') + 1;
+ for (InputSuggestion suggestion: getLineSuggestions(contentBeforeCaret.substring(lineStart).trim())) {
+ int caret = suggestion.getCaret();
+ if (caret == -1)
+ caret = suggestion.getContent().length();
+ caret += lineStart;
+ completions.add(new InputCompletion(
+ suggestion.getContent(),
+ contentBeforeCaret.substring(0, lineStart) + suggestion.getContent(),
+ caret,
+ suggestion.getDescription(),
+ suggestion.getMatch()
+ ));
+ }
+
+ return completions;
+ }
+
+ protected abstract List<InputSuggestion> getLineSuggestions(String matchWith);
+
+ @Override
+ protected List<Range> getErrors(String inputContent) {
+ return null;
+ }
+
+ @Override
+ protected int getAnchor(String content) {
+ int lineStart = content.lastIndexOf('\n') + 1;
+ String line = content.substring(0, lineStart);
+ for (int i=0; i<line.length(); i++) {
+ if (!Character.isWhitespace(line.charAt(i)))
+ return i + lineStart;
+ }
+ return content.length() + lineStart;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/PathPatternAssistBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/PathPatternAssistBehavior.java
deleted file mode 100644
index 1adf9e669c..0000000000
--- a/core/src/main/java/io/onedev/server/web/behavior/PathPatternAssistBehavior.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.onedev.server.web.behavior;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-
-import com.google.common.collect.Lists;
-
-import io.onedev.codeassist.InputCompletion;
-import io.onedev.codeassist.InputStatus;
-import io.onedev.codeassist.InputSuggestion;
-import io.onedev.server.model.Project;
-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
-import io.onedev.server.web.util.SuggestionUtils;
-import io.onedev.utils.Range;
-
-@SuppressWarnings("serial")
-public class PathPatternAssistBehavior extends InputAssistBehavior {
-
- private final IModel<Project> projectModel;
-
- public PathPatternAssistBehavior(IModel<Project> projectModel) {
- this.projectModel = projectModel;
- }
-
- @Override
- public void detach(Component component) {
- super.detach(component);
- projectModel.detach();
- }
-
- @Override
- protected List<InputCompletion> getSuggestions(InputStatus inputStatus) {
- List<InputCompletion> completions = new ArrayList<>();
- for (InputSuggestion suggestion: SuggestionUtils.suggestPath(projectModel.getObject(),
- inputStatus.getContentBeforeCaret().trim(), null)) {
- int caret = suggestion.getCaret();
- if (caret == -1)
- caret = suggestion.getContent().length();
- completions.add(new InputCompletion(suggestion.getContent(), suggestion.getContent(), caret, null, suggestion.getMatch()));
- }
- return completions;
- }
-
- @Override
- protected List<String> getHints(InputStatus inputStatus) {
- return Lists.newArrayList("Use * to match any part of the path");
- }
-
- @Override
- protected List<Range> getErrors(String inputContent) {
- return null;
- }
-
- @Override
- protected int getAnchor(String content) {
- for (int i=0; i<content.length(); i++) {
- if (!Character.isWhitespace(content.charAt(i)))
- return i;
- }
- return content.length();
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java
new file mode 100644
index 0000000000..85d32cd72f
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java
@@ -0,0 +1,110 @@
+package io.onedev.server.web.behavior;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.antlr.v4.runtime.Token;
+import org.apache.commons.lang3.StringUtils;
+
+import com.google.common.base.Optional;
+
+import io.onedev.commons.codeassist.FenceAware;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.commons.codeassist.parser.ParseExpect;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
+import io.onedev.commons.utils.Range;
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.util.patternset.PatternSetLexer;
+import io.onedev.server.util.patternset.PatternSetParser;
+import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
+
+@SuppressWarnings("serial")
+public abstract class PatternSetAssistBehavior extends ANTLRAssistBehavior {
+
+ public PatternSetAssistBehavior() {
+ super(PatternSetParser.class, "patterns", false);
+ }
+
+ @Override
+ protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
+
+ Set<String> matches = new HashSet<>();
+ for (Token token: terminalExpect.getRoot().getState().getMatchedTokens()) {
+ if (token.getType() == PatternSetLexer.Quoted)
+ matches.add(PatternSet.unescape(token.getText()));
+ else if (token.getType() == PatternSetLexer.NQuoted)
+ matches.add(token.getText());
+ }
+
+ if (spec.getRuleName().equals("NQuoted")) {
+ return suggest(terminalExpect.getUnmatchedText())
+ .stream()
+ .filter(it->!matches.contains(it.getContent()))
+ .map(it->{
+ if (StringUtils.containsAny(it.getContent(), " \"") || it.getContent().startsWith("-")) {
+ InputSuggestion suggestion = it.escape(PatternSet.ESCAPE_CHARS);
+ suggestion = new InputSuggestion("\"" + suggestion.getContent() + "\"",
+ suggestion.getCaret()!=-1? suggestion.getCaret()+1: -1,
+ suggestion.getDescription(),
+ new Range(suggestion.getMatch().getFrom()+1, suggestion.getMatch().getTo()+1));
+ return suggestion;
+ } else {
+ return it;
+ }
+ })
+ .collect(Collectors.toList());
+ } else if (spec.getRuleName().equals("Quoted") && terminalExpect.getUnmatchedText().startsWith("\"")) {
+ return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {
+
+ @Override
+ protected List<InputSuggestion> match(String unfencedMatchWith) {
+ List<InputSuggestion> suggestions = PatternSetAssistBehavior.this.suggest(unfencedMatchWith)
+ .stream()
+ .filter(it->!matches.contains(it.getContent()))
+ .collect(Collectors.toList());
+ if (unfencedMatchWith.length() != 0
+ && !matches.contains(unfencedMatchWith)
+ && suggestions.isEmpty()) {
+ return null;
+ } else {
+ return suggestions.stream().map(it->it.escape(PatternSet.ESCAPE_CHARS)).collect(Collectors.toList());
+ }
+ }
+
+ @Override
+ protected String getFencingDescription() {
+ return null;
+ }
+
+ }.suggest(terminalExpect);
+ }
+ }
+ return null;
+ }
+
+ @Override
+ protected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {
+ String description;
+ switch (suggestedLiteral) {
+ case "-":
+ description = "exclude";
+ break;
+ case " ":
+ description = "space";
+ break;
+ case "\"":
+ return null;
+ default:
+ description = null;
+ }
+ return Optional.fromNullable(description);
+ }
+
+ protected abstract List<InputSuggestion> suggest(String matchWith);
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
index deb63facf0..978dfa002e 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.behavior;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -11,12 +12,12 @@ import org.apache.wicket.model.IModel;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import io.onedev.codeassist.FenceAware;
-import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
-import io.onedev.codeassist.parser.Element;
-import io.onedev.codeassist.parser.ParseExpect;
-import io.onedev.codeassist.parser.TerminalExpect;
+import io.onedev.commons.codeassist.FenceAware;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.commons.codeassist.parser.Element;
+import io.onedev.commons.codeassist.parser.ParseExpect;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.server.OneDev;
import io.onedev.server.exception.OneException;
import io.onedev.server.git.GitUtils;
@@ -58,6 +59,10 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
return projectModel.getObject();
}
+ private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {
+ return suggestions.stream().map(it->it.escape(ESCAPE_CHARS)).collect(Collectors.toList());
+ }
+
@Override
protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
@@ -72,10 +77,10 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
Project project = getProject();
if ("criteriaField".equals(spec.getLabel())) {
- suggestions.addAll(SuggestionUtils.suggest(PullRequestConstants.QUERY_FIELDS, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggest(PullRequestConstants.QUERY_FIELDS, unfencedLowerCaseMatchWith)));
} else if ("orderField".equals(spec.getLabel())) {
- suggestions.addAll(SuggestionUtils.suggest(new ArrayList<>(PullRequestConstants.ORDER_FIELDS.keySet()),
- unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggest(new ArrayList<>(PullRequestConstants.ORDER_FIELDS.keySet()),
+ unfencedLowerCaseMatchWith)));
} else if ("criteriaValue".equals(spec.getLabel())) {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);
@@ -84,9 +89,9 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
int operator = PullRequestQuery.getOperator(operatorName);
if (fieldElements.isEmpty()) {
if (operator == PullRequestQueryLexer.IncludesIssue)
- suggestions.addAll(SuggestionUtils.suggestIssue(project, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggestIssues(project, unfencedLowerCaseMatchWith)));
else if (operator != PullRequestQueryLexer.IncludesCommit)
- suggestions.addAll(SuggestionUtils.suggestUser(unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggestUsers(unfencedLowerCaseMatchWith)));
else
return null;
} else {
@@ -96,24 +101,24 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
if (fieldName.equals(PullRequestConstants.FIELD_SUBMIT_DATE)
|| fieldName.equals(PullRequestConstants.FIELD_UPDATE_DATE)
|| fieldName.equals(PullRequestConstants.FIELD_CLOSE_DATE)) {
- suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, unfencedLowerCaseMatchWith, null));
+ suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, unfencedLowerCaseMatchWith));
CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));
} else if (fieldName.equals(PullRequestConstants.FIELD_SOURCE_PROJECT)) {
List<String> candidates = new ArrayList<>();
for (Project each: OneDev.getInstance(ProjectManager.class).query())
candidates.add(each.getName());
- suggestions.addAll(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
} else if (fieldName.equals(PullRequestConstants.FIELD_TARGET_BRANCH)
|| fieldName.equals(PullRequestConstants.FIELD_SOURCE_BRANCH)) {
List<String> candidates = new ArrayList<>();
for (RefInfo refInfo: project.getBranches())
candidates.add(GitUtils.ref2branch(refInfo.getRef().getName()));
- suggestions.addAll(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
} else if (fieldName.equals(PullRequestConstants.FIELD_MERGE_STRATEGY)) {
List<String> candidates = new ArrayList<>();
for (MergeStrategy strategy: MergeStrategy.values())
candidates.add(strategy.toString());
- suggestions.addAll(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
} else if (fieldName.equals(PullRequestConstants.FIELD_TITLE)
|| fieldName.equals(PullRequestConstants.FIELD_DESCRIPTION)
|| fieldName.equals(PullRequestConstants.FIELD_NUMBER)
diff --git a/core/src/main/java/io/onedev/server/web/behavior/TagPatternAssistBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/TagPatternAssistBehavior.java
deleted file mode 100644
index d66b230e78..0000000000
--- a/core/src/main/java/io/onedev/server/web/behavior/TagPatternAssistBehavior.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.onedev.server.web.behavior;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-
-import com.google.common.collect.Lists;
-
-import io.onedev.codeassist.InputCompletion;
-import io.onedev.codeassist.InputStatus;
-import io.onedev.codeassist.InputSuggestion;
-import io.onedev.server.model.Project;
-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
-import io.onedev.server.web.util.SuggestionUtils;
-import io.onedev.utils.Range;
-
-@SuppressWarnings("serial")
-public class TagPatternAssistBehavior extends InputAssistBehavior {
-
- private final IModel<Project> projectModel;
-
- public TagPatternAssistBehavior(IModel<Project> projectModel) {
- this.projectModel = projectModel;
- }
-
- @Override
- public void detach(Component component) {
- super.detach(component);
- projectModel.detach();
- }
-
- @Override
- protected List<InputCompletion> getSuggestions(InputStatus inputStatus) {
- List<InputCompletion> completions = new ArrayList<>();
- for (InputSuggestion suggestion: SuggestionUtils.suggestTag(projectModel.getObject(),
- inputStatus.getContentBeforeCaret().trim(), null)) {
- int caret = suggestion.getCaret();
- if (caret == -1)
- caret = suggestion.getContent().length();
- completions.add(new InputCompletion(suggestion.getContent(), suggestion.getContent(), caret, null, suggestion.getMatch()));
- }
- return completions;
- }
-
- @Override
- protected List<String> getHints(InputStatus inputStatus) {
- return Lists.newArrayList("Use * to match any part of the tag");
- }
-
- @Override
- protected List<Range> getErrors(String inputContent) {
- return null;
- }
-
- @Override
- protected int getAnchor(String content) {
- for (int i=0; i<content.length(); i++) {
- if (!Character.isWhitespace(content.charAt(i)))
- return i;
- }
- return content.length();
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java
index dac3f2bf7e..19da81453e 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java
@@ -8,9 +8,9 @@ import java.util.List;
import javax.annotation.Nullable;
-import org.antlr.v4.runtime.ANTLRInputStream;
import org.antlr.v4.runtime.BaseErrorListener;
import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonToken;
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.Lexer;
@@ -22,15 +22,15 @@ import org.antlr.v4.runtime.TokenStream;
import com.google.common.base.Optional;
-import io.onedev.codeassist.AntlrUtils;
-import io.onedev.codeassist.CodeAssist;
-import io.onedev.codeassist.InputCompletion;
-import io.onedev.codeassist.InputStatus;
-import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.parser.TerminalExpect;
-import io.onedev.codeassist.parser.ParseExpect;
-import io.onedev.utils.Range;
-import io.onedev.utils.StringUtils;
+import io.onedev.commons.codeassist.AntlrUtils;
+import io.onedev.commons.codeassist.CodeAssist;
+import io.onedev.commons.codeassist.InputCompletion;
+import io.onedev.commons.codeassist.InputStatus;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.parser.ParseExpect;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
+import io.onedev.commons.utils.Range;
+import io.onedev.commons.utils.StringUtils;
@SuppressWarnings("serial")
public abstract class ANTLRAssistBehavior extends InputAssistBehavior {
@@ -135,7 +135,7 @@ public abstract class ANTLRAssistBehavior extends InputAssistBehavior {
Lexer lexer;
try {
- lexer = getLexerCtor().newInstance(new ANTLRInputStream(inputContent));
+ lexer = getLexerCtor().newInstance(CharStreams.fromString(inputContent));
} catch (InstantiationException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException e) {
throw new RuntimeException(e);
diff --git a/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html b/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html
index 3f864a99bc..58aafc62b0 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html
+++ b/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html
@@ -5,7 +5,7 @@
<tr wicket:id="suggestions">
<td class="suggestion">
<a wicket:id="link">
- <wicket:link><img src="bullet.gif"></img></wicket:link>
+ <wicket:link><img src="bullet.gif"></wicket:link>
<span wicket:id="label"></span>
</a>
</td>
diff --git a/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java b/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java
index 3ca0a1d6a6..de8c2cd58f 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java
@@ -11,10 +11,10 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.RepeatingView;
-import io.onedev.codeassist.InputCompletion;
-import io.onedev.codeassist.InputStatus;
+import io.onedev.commons.codeassist.InputCompletion;
+import io.onedev.commons.codeassist.InputStatus;
+import io.onedev.commons.utils.Range;
import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;
-import io.onedev.utils.Range;
@SuppressWarnings("serial")
class AssistPanel extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java
index 4a4dabf059..6e69323de2 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java
@@ -22,17 +22,17 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
-import io.onedev.codeassist.InputCompletion;
-import io.onedev.codeassist.InputStatus;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.codeassist.InputCompletion;
+import io.onedev.commons.codeassist.InputStatus;
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.utils.Range;
+import io.onedev.commons.utils.RangeUtils;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.floating.AlignPlacement;
import io.onedev.server.web.component.floating.AlignTarget;
import io.onedev.server.web.component.floating.Alignment;
import io.onedev.server.web.component.floating.ComponentTarget;
import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.utils.Range;
-import io.onedev.utils.RangeUtils;
@SuppressWarnings("serial")
public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {
diff --git a/core/src/main/java/io/onedev/server/web/component/avatarupload/AvatarUploadField.java b/core/src/main/java/io/onedev/server/web/component/avatarupload/AvatarUploadField.java
index 6163c1aa62..3c0f2ae4c7 100644
--- a/core/src/main/java/io/onedev/server/web/component/avatarupload/AvatarUploadField.java
+++ b/core/src/main/java/io/onedev/server/web/component/avatarupload/AvatarUploadField.java
@@ -23,9 +23,9 @@ import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public class AvatarUploadField extends FormComponentPanel<String> {
diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index 27733a21cd..a81687c5e5 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -38,6 +38,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.git.GitUtils;
import io.onedev.server.manager.BuildManager;
@@ -60,7 +61,6 @@ import io.onedev.server.web.page.project.savedquery.SavedQueriesOpened;
import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QuerySaveSupport;
import io.onedev.server.web.util.VisibleVisitor;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public abstract class BuildListPanel extends GenericPanel<String> {
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index 33750c6e77..2dd7d38ae3 100644
--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -37,6 +37,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.CodeCommentManager;
import io.onedev.server.model.CodeComment;
@@ -59,7 +60,6 @@ import io.onedev.server.web.page.project.savedquery.SavedQueriesOpened;
import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QuerySaveSupport;
import io.onedev.server.web.util.VisibleVisitor;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public abstract class CodeCommentListPanel extends GenericPanel<String> {
diff --git a/core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java b/core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java
index a0c06ee47e..24f76372dc 100644
--- a/core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java
@@ -18,12 +18,12 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.revwalk.RevCommit;
+import io.onedev.commons.utils.Highlighter;
+import io.onedev.commons.utils.Transformer;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
import io.onedev.server.util.CommitMessageTransformer;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
-import io.onedev.utils.Highlighter;
-import io.onedev.utils.Transformer;
@SuppressWarnings("serial")
public class CommitMessagePanel extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.java b/core/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.java
index 378766b76d..0995ff79f4 100644
--- a/core/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.java
+++ b/core/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.java
@@ -7,7 +7,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.hibernate.criterion.Order;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
diff --git a/core/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.java b/core/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.java
index 18077c7399..4341f5a3b2 100644
--- a/core/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.java
+++ b/core/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.java
@@ -5,7 +5,7 @@ import javax.annotation.Nullable;
import org.apache.tika.mime.MediaType;
import org.apache.wicket.markup.html.panel.Panel;
-import io.onedev.launcher.loader.ExtensionPoint;
+import io.onedev.commons.launcher.loader.ExtensionPoint;
import io.onedev.server.git.BlobChange;
import io.onedev.server.web.component.diff.revision.DiffViewMode;
diff --git a/core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.java
index fcce38326c..3f15696989 100644
--- a/core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.java
@@ -8,11 +8,11 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.request.resource.DynamicImageResource;
import org.apache.wicket.request.resource.PackageResourceReference;
+import io.onedev.commons.utils.Provider;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobChange;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
-import io.onedev.utils.Provider;
@SuppressWarnings("serial")
public class ImageDiffPanel extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/MarkAwareDiffBlock.java b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/MarkAwareDiffBlock.java
index 4b248201c9..324f272add 100644
--- a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/MarkAwareDiffBlock.java
+++ b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/MarkAwareDiffBlock.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.component.diff.blob.text;
import java.io.Serializable;
import java.util.List;
-import io.onedev.jsyntax.Tokenized;
+import io.onedev.commons.jsyntax.Tokenized;
public class MarkAwareDiffBlock implements Serializable {
diff --git a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
index 92695c1815..820504d8d0 100644
--- a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
@@ -38,9 +38,12 @@ import org.unbescape.javascript.JavaScriptEscape;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import io.onedev.jsyntax.TextToken;
-import io.onedev.jsyntax.TokenUtils;
-import io.onedev.jsyntax.Tokenized;
+import io.onedev.commons.jsyntax.TextToken;
+import io.onedev.commons.jsyntax.TokenUtils;
+import io.onedev.commons.jsyntax.Tokenized;
+import io.onedev.commons.utils.Range;
+import io.onedev.commons.utils.RangeUtils;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.git.BlameBlock;
import io.onedev.server.git.BlameCommit;
@@ -77,9 +80,6 @@ import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;
import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePreviewPage;
-import io.onedev.utils.Range;
-import io.onedev.utils.RangeUtils;
-import io.onedev.utils.StringUtils;
import com.google.common.base.Preconditions;
diff --git a/core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffPanel.java
index 0c6113c07f..12fc271f27 100644
--- a/core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/diff/plain/PlainDiffPanel.java
@@ -19,9 +19,10 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
-import io.onedev.jsyntax.TextToken;
-import io.onedev.jsyntax.TokenUtils;
-import io.onedev.jsyntax.Tokenized;
+import io.onedev.commons.jsyntax.TextToken;
+import io.onedev.commons.jsyntax.TokenUtils;
+import io.onedev.commons.jsyntax.Tokenized;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.diff.DiffBlock;
import io.onedev.server.util.diff.DiffMatchPatch.Operation;
import io.onedev.server.util.diff.DiffUtils;
@@ -29,7 +30,6 @@ import io.onedev.server.util.diff.LineDiff;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public class PlainDiffPanel extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html
index bdbae30318..fda557ffa4 100644
--- a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html
@@ -18,14 +18,15 @@
<td class="path-filter">
<form wicket:id="pathFilter">
<div class="input-group">
- <input wicket:id="input" class="form-control no-autofocus" spellcheck="false" autocomplete="off" placeholder="Filter by path" type="text">
+ <input wicket:id="input" class="form-control no-autofocus" spellcheck="false" autocomplete="off" placeholder="Filter by path" type="text">
<span class="input-group-btn">
<button wicket:id="submit" title="Filter" class="btn btn-default" type="submit"><i class="fa fa-search"></i></button>
</span>
</div>
</form>
</td>
- </tr>
+ </tr>
+ <tr wicket:id="invalidPathFilter" class="invalid-path-filter"><td colspan="3"><div class="alert alert-danger">Malformed path filter</div></td></tr>
</table>
<div wicket:id="body" class="body">
<div class="title">
@@ -49,7 +50,7 @@
<div class="ui-resizable-handle ui-resizable-e"></div>
<div class="content">
<div wicket:id="head" class="head clearfix">
- <a wicket:id="context" class="pull-left context close" title="Show this comment by comparing with specified revision"><i class="fa fa-ext fa-file-diff"></i></a>
+ <a wicket:id="context" class="pull-left context close" title="Compare with another revision"><i class="fa fa-ext fa-file-diff"></i></a>
<a wicket:id="locate" class="pull-left locate close"><i class="fa fa-hand-o-right"></i></a>
<a wicket:id="close" class="pull-left close" title="Hide comment"><i class="fa fa-times"></i></a>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index 9eaeacc6e3..373150e947 100644
--- a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -58,10 +58,14 @@ import com.google.common.base.Objects;
import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.codeassist.InputCompletion;
-import io.onedev.codeassist.InputStatus;
-import io.onedev.codeassist.InputSuggestion;
-import io.onedev.jsymbol.util.NoAntiCacheImage;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
+import io.onedev.commons.jsymbol.util.NoAntiCacheImage;
+import io.onedev.commons.utils.PathComparator;
+import io.onedev.commons.utils.Range;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.stringmatch.Matcher;
+import io.onedev.commons.utils.stringmatch.WildcardUtils;
import io.onedev.server.OneDev;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobChange;
@@ -79,8 +83,9 @@ import io.onedev.server.search.code.IndexManager;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.util.diff.WhitespaceOption;
+import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.WebConstants;
-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
+import io.onedev.server.web.behavior.PatternSetAssistBehavior;
import io.onedev.server.web.component.codecomment.CodeCommentPanel;
import io.onedev.server.web.component.diff.blob.BlobDiffPanel;
import io.onedev.server.web.component.diff.blob.SourceAware;
@@ -96,10 +101,6 @@ import io.onedev.server.web.util.ProjectAttachmentSupport;
import io.onedev.server.web.util.SuggestionUtils;
import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.websocket.PageDataChanged;
-import io.onedev.utils.PathComparator;
-import io.onedev.utils.Range;
-import io.onedev.utils.StringUtils;
-import io.onedev.utils.stringmatch.WildcardUtils;
/**
* Make sure to add only one revision diff panel on a page
@@ -152,7 +153,7 @@ public class RevisionDiffPanel extends Panel {
List<DiffEntry> diffEntries = diffEntriesModel.getObject();
Set<String> changedPaths = new HashSet<>();
- List<BlobChange> allChanges = new ArrayList<>();
+ List<BlobChange> changes = new ArrayList<>();
for (DiffEntry entry: diffEntries) {
BlobChange change = new BlobChange(oldRev, newRev, entry, whitespaceOptionModel.getObject()) {
@@ -162,7 +163,7 @@ public class RevisionDiffPanel extends Panel {
}
};
- allChanges.add(change);
+ changes.add(change);
changedPaths.addAll(change.getPaths());
}
@@ -172,7 +173,7 @@ public class RevisionDiffPanel extends Panel {
&& !markedPaths.contains(comment.getMarkPos().getPath())) {
BlobIdent oldBlobIdent = new BlobIdent(oldRev, comment.getMarkPos().getPath(), FileMode.TYPE_FILE);
BlobIdent newBlobIdent = new BlobIdent(newRev, comment.getMarkPos().getPath(), FileMode.TYPE_FILE);
- allChanges.add(new BlobChange(null, oldBlobIdent, newBlobIdent, whitespaceOptionModel.getObject()) {
+ changes.add(new BlobChange(null, oldBlobIdent, newBlobIdent, whitespaceOptionModel.getObject()) {
@Override
public Blob getBlob(BlobIdent blobIdent) {
@@ -188,7 +189,7 @@ public class RevisionDiffPanel extends Panel {
if (mark != null && !changedPaths.contains(mark.getPath()) && !markedPaths.contains(mark.getPath())) {
BlobIdent oldBlobIdent = new BlobIdent(oldRev, mark.getPath(), FileMode.TYPE_FILE);
BlobIdent newBlobIdent = new BlobIdent(newRev, mark.getPath(), FileMode.TYPE_FILE);
- allChanges.add(new BlobChange(null, oldBlobIdent, newBlobIdent, whitespaceOptionModel.getObject()) {
+ changes.add(new BlobChange(null, oldBlobIdent, newBlobIdent, whitespaceOptionModel.getObject()) {
@Override
public Blob getBlob(BlobIdent blobIdent) {
@@ -199,48 +200,41 @@ public class RevisionDiffPanel extends Panel {
markedPaths.add(mark.getPath());
}
- List<BlobChange> filterChanges;
- String matchWith = pathFilterModel.getObject();
- if (StringUtils.isNotBlank(matchWith)) {
- matchWith = matchWith.toLowerCase().trim();
- boolean exclude = false;
- if (matchWith.startsWith("-")) {
- matchWith = matchWith.substring(1).trim();
- exclude = true;
- }
- matchWith = StringUtils.stripStart(matchWith, "/");
- matchWith = StringUtils.stripEnd(matchWith, "/");
-
- List<BlobChange> matchChanges = new ArrayList<>();
- for (BlobChange change: allChanges) {
- String oldPath = change.getOldBlobIdent().path;
- if (oldPath == null)
- oldPath = "";
- else
- oldPath = oldPath.toLowerCase();
- String newPath = change.getNewBlobIdent().path;
- if (newPath == null)
- newPath = "";
- else
- newPath = newPath.toLowerCase();
- if (matchWith.equals(oldPath) || matchWith.equals(newPath)) {
- matchChanges.add(change);
- } else if (oldPath.startsWith(matchWith + "/") || newPath.startsWith(matchWith + "/")) {
- matchChanges.add(change);
- } else if (WildcardUtils.matchString(matchWith, oldPath)
- || WildcardUtils.matchString(matchWith, newPath)){
- matchChanges.add(change);
- }
- }
-
- if (exclude) {
- filterChanges = new ArrayList<>(allChanges);
- filterChanges.removeAll(matchChanges);
- } else {
- filterChanges = matchChanges;
+ List<BlobChange> filteredChanges = new ArrayList<>();
+ String patternSetString = pathFilterModel.getObject();
+ if (StringUtils.isNotBlank(patternSetString)) {
+ try {
+ PatternSet patternSet = PatternSet.fromString(patternSetString);
+ Matcher matcher = new Matcher() {
+
+ @Override
+ public boolean matches(String pattern, String value) {
+ pattern = pattern.toLowerCase();
+ pattern = StringUtils.stripStart(pattern, "/");
+ pattern = StringUtils.stripEnd(pattern, "/");
+ return pattern.equals(value) || value.startsWith(pattern + "/") || WildcardUtils.matchString(pattern, value);
+ }
+
+ };
+ for (BlobChange change: changes) {
+ String oldPath = change.getOldBlobIdent().path;
+ if (oldPath == null)
+ oldPath = "";
+ else
+ oldPath = oldPath.toLowerCase();
+ String newPath = change.getNewBlobIdent().path;
+ if (newPath == null)
+ newPath = "";
+ else
+ newPath = newPath.toLowerCase();
+ if (patternSet.matches(matcher, oldPath) || patternSet.matches(matcher, newPath)) {
+ filteredChanges.add(change);
+ }
+ }
+ } catch (Exception e) {
}
} else {
- filterChanges = new ArrayList<>(allChanges);
+ filteredChanges.addAll(changes);
}
// for some unknown reason, some paths in the diff entries is DELETE/ADD
@@ -248,7 +242,7 @@ public class RevisionDiffPanel extends Panel {
// MODIFICATION entry
Map<String, BlobIdent> deleted = new HashMap<>();
Map<String, BlobIdent> added = new HashMap<>();
- for (BlobChange change: filterChanges) {
+ for (BlobChange change: filteredChanges) {
if (change.getType() == ChangeType.DELETE)
deleted.put(change.getPath(), change.getOldBlobIdent());
else if (change.getType() == ChangeType.ADD)
@@ -256,7 +250,7 @@ public class RevisionDiffPanel extends Panel {
}
List<BlobChange> normalizedChanges = new ArrayList<>();
- for (BlobChange change: filterChanges) {
+ for (BlobChange change: filteredChanges) {
BlobIdent oldBlobIdent = deleted.get(change.getPath());
BlobIdent newBlobIdent = added.get(change.getPath());
if (oldBlobIdent != null && newBlobIdent != null) {
@@ -614,50 +608,40 @@ public class RevisionDiffPanel extends Panel {
List<String> listOfInvolvedPaths = new ArrayList<>(setOfInvolvedPaths);
listOfInvolvedPaths.sort(new PathComparator());
- filterInput.add(new InputAssistBehavior() {
-
- @Override
- protected List<InputCompletion> getSuggestions(InputStatus inputStatus) {
- List<InputCompletion> completions = new ArrayList<>();
- String matchWith = inputStatus.getContentBeforeCaret().trim();
- boolean exclude = false;
- if (matchWith.startsWith("-")) {
- matchWith = matchWith.substring(1).trim();
- exclude = true;
- }
-
- for (InputSuggestion suggestion: SuggestionUtils.suggestPath(listOfInvolvedPaths, matchWith, null)) {
- int caret = suggestion.getCaret();
- if (caret == -1)
- caret = suggestion.getContent().length();
- String suggestedContent = suggestion.getContent();
- if (exclude)
- suggestedContent = "-" + suggestedContent;
- completions.add(new InputCompletion(suggestedContent, suggestedContent, caret, null, suggestion.getMatch()));
- }
- return completions;
- }
-
+ filterInput.add(new PatternSetAssistBehavior() {
+
@Override
- protected List<String> getHints(InputStatus inputStatus) {
- return Lists.newArrayList("Use '*' to match any part of the path", "Prefix path with '-' to exclude");
+ protected List<InputSuggestion> suggest(String matchWith) {
+ return SuggestionUtils.suggestPaths(listOfInvolvedPaths, matchWith);
}
@Override
- protected List<Range> getErrors(String inputContent) {
- return null;
+ protected List<String> getHints(TerminalExpect terminalExpect) {
+ return Lists.newArrayList(
+ "Path containing spaces or starting with dash needs to be quoted",
+ "Use * or ? for wildcard match"
+ );
}
+ });
+
+ WebMarkupContainer invalidPathFilter;
+ add(invalidPathFilter = new WebMarkupContainer("invalidPathFilter") {
+
@Override
- protected int getAnchor(String content) {
- for (int i=0; i<content.length(); i++) {
- if (!Character.isWhitespace(content.charAt(i)))
- return i;
+ protected void onConfigure() {
+ super.onConfigure();
+ try {
+ if (StringUtils.isNotBlank(pathFilterModel.getObject()))
+ PatternSet.fromString(pathFilterModel.getObject());
+ setVisible(false);
+ } catch (Exception e) {
+ setVisible(true);
}
- return content.length();
}
});
+ invalidPathFilter.setOutputMarkupPlaceholderTag(true);
pathFilterForm.add(new AjaxButton("submit") {
@@ -672,11 +656,12 @@ public class RevisionDiffPanel extends Panel {
super.onSubmit(target, form);
body.replace(commentContainer = newCommentContainer());
target.add(body);
+ target.add(invalidPathFilter);
}
});
add(pathFilterForm);
-
+
body.add(commentContainer = newCommentContainer());
Component totalFilesLink;
diff --git a/core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css b/core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css
index e4b0ccf278..243311f2c7 100644
--- a/core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css
+++ b/core/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css
@@ -29,6 +29,10 @@
.revision-diff>.head td.whitespace-option {
width: 140px;
}
+.revision-diff>.head .invalid-path-filter .alert {
+ margin-top: 20px;
+ margin-bottom: 0;
+}
.revision-diff>.body>.title {
font-size: 16px;
margin-bottom: 16px;
diff --git a/core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java b/core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java
index bf5bf859e6..ff0a6f062d 100644
--- a/core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java
@@ -14,13 +14,13 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.protocol.http.WebSession;
+import io.onedev.commons.utils.ReflectionUtils;
+import io.onedev.commons.utils.WordUtils;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.QueryPositionSupport;
-import io.onedev.utils.ReflectionUtils;
-import io.onedev.utils.WordUtils;
@SuppressWarnings("serial")
public abstract class EntityNavPanel<T extends AbstractEntity> extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java
index 74ee5beda6..449d6fe7ce 100644
--- a/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java
+++ b/core/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java
@@ -4,12 +4,12 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
+import io.onedev.commons.utils.matchscore.MatchScoreProvider;
+import io.onedev.commons.utils.matchscore.MatchScoreUtils;
import io.onedev.server.util.facade.GroupFacade;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.select2.Response;
import io.onedev.server.web.component.select2.ResponseFiller;
-import io.onedev.utils.matchscore.MatchScoreProvider;
-import io.onedev.utils.matchscore.MatchScoreUtils;
public class GroupChoiceProvider extends AbstractGroupChoiceProvider {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java b/core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java
index 6156ca74e1..1aa3778952 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java
@@ -4,11 +4,11 @@ import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
+import io.onedev.commons.utils.ColorUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.support.issue.StateSpec;
-import io.onedev.utils.ColorUtils;
@SuppressWarnings("serial")
public class IssueStateLabel extends Label {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
index 612e6e5e6a..df37d5d5ea 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
@@ -16,6 +16,7 @@ import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
import org.unbescape.html.HtmlEscape;
+import io.onedev.commons.utils.ColorUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.BuildManager;
import io.onedev.server.manager.IssueManager;
@@ -41,7 +42,6 @@ import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
-import io.onedev.utils.ColorUtils;
@SuppressWarnings("serial")
public abstract class FieldValuesPanel extends Panel implements EditContext {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 84a7330ea2..4dbfc66d77 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -45,6 +45,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.ProjectManager;
@@ -79,7 +80,6 @@ import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.QuerySaveSupport;
import io.onedev.server.web.util.VisibleVisitor;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public abstract class IssueListPanel extends GenericPanel<String> {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
index 60824b9999..2d89d51405 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
@@ -29,6 +29,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import com.google.common.collect.Lists;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.manager.SettingManager;
@@ -53,7 +54,6 @@ import io.onedev.server.web.component.project.comment.CommentInput;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.util.ProjectAttachmentSupport;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public abstract class IssueOperationsPanel extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java
index 8759cc7c0a..235574ace8 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java
@@ -31,6 +31,7 @@ import org.apache.wicket.model.Model;
import com.google.common.base.Preconditions;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.model.support.issue.TransitionSpec;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
@@ -41,7 +42,6 @@ import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.page.layout.SideFloating;
import io.onedev.server.web.util.ConfirmOnClick;
import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
-import io.onedev.utils.StringUtils;
import jersey.repackaged.com.google.common.collect.Sets;
@SuppressWarnings("serial")
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java b/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
index 8b49f36a54..b906483882 100644
--- a/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
@@ -44,6 +44,9 @@ import org.eclipse.jgit.lib.ObjectId;
import com.google.common.base.Preconditions;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.commons.utils.PathUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.UrlUtils;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.BlobIdentFilter;
import io.onedev.server.model.Project;
@@ -55,9 +58,6 @@ import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.page.project.blob.render.BlobUploadException;
-import io.onedev.utils.PathUtils;
-import io.onedev.utils.StringUtils;
-import io.onedev.utils.UrlUtils;
@SuppressWarnings("serial")
abstract class InsertUrlPanel extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
index 6d6ee0d16a..a6b74ee2f2 100644
--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
@@ -46,7 +46,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.manager.MarkdownManager;
import io.onedev.server.manager.ProjectManager;
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
index 515cecafd5..6eaa15af7f 100644
--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
@@ -20,7 +20,9 @@ import org.hibernate.StaleStateException;
import org.unbescape.javascript.JavaScriptEscape;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.utils.ColorUtils;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.MarkdownManager;
@@ -37,8 +39,6 @@ import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.util.avatar.AvatarManager;
-import io.onedev.utils.ColorUtils;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public class MarkdownViewer extends GenericPanel<String> {
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiOnes.java b/core/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiOnes.java
index d5fcc5b860..62df09d8e0 100644
--- a/core/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiOnes.java
+++ b/core/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiOnes.java
@@ -14,7 +14,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Splitter;
-import io.onedev.utils.ExceptionUtils;
+import io.onedev.commons.utils.ExceptionUtils;
public class EmojiOnes {
diff --git a/core/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.java b/core/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.java
index 8703859e02..5767324eb6 100644
--- a/core/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.java
+++ b/core/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.java
@@ -28,11 +28,11 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.TreeWalk;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Project;
import io.onedev.server.web.component.BlobIcon;
import io.onedev.server.web.component.link.PreventDefaultAjaxLink;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public abstract class PathSelector extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java b/core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java
index d5d4de63c2..bcd3e9a282 100644
--- a/core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java
+++ b/core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java
@@ -9,6 +9,9 @@ import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.matchscore.MatchScoreProvider;
+import io.onedev.commons.utils.matchscore.MatchScoreUtils;
import io.onedev.server.OneDev;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
@@ -21,9 +24,6 @@ import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.component.markdown.MarkdownEditor;
import io.onedev.server.web.component.markdown.AtWhoReferenceSupport;
import io.onedev.server.web.component.markdown.UserMentionSupport;
-import io.onedev.utils.StringUtils;
-import io.onedev.utils.matchscore.MatchScoreProvider;
-import io.onedev.utils.matchscore.MatchScoreUtils;
@SuppressWarnings("serial")
public abstract class CommentInput extends MarkdownEditor {
diff --git a/core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.java b/core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.java
index b04261ed0e..bf3cdb7527 100644
--- a/core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.java
@@ -13,6 +13,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import io.onedev.commons.utils.WordUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.manager.UserManager;
@@ -23,7 +24,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.security.permission.DefaultPrivilege;
import io.onedev.server.security.permission.ProjectPrivilege;
-import io.onedev.utils.WordUtils;
@SuppressWarnings("serial")
public class PrivilegeSourcePanel extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java b/core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java
index 57475dcf52..0aae016c21 100644
--- a/core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java
+++ b/core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java
@@ -25,6 +25,8 @@ import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import io.onedev.commons.utils.matchscore.MatchScoreProvider;
+import io.onedev.commons.utils.matchscore.MatchScoreUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.Project;
@@ -33,8 +35,6 @@ import io.onedev.server.web.behavior.InputChangeBehavior;
import io.onedev.server.web.component.link.PreventDefaultAjaxLink;
import io.onedev.server.web.component.project.avatar.ProjectAvatar;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.utils.matchscore.MatchScoreProvider;
-import io.onedev.utils.matchscore.MatchScoreUtils;
@SuppressWarnings("serial")
public abstract class ProjectSelector extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java b/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java
index 3f35657428..d28754bf8d 100644
--- a/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java
@@ -23,6 +23,7 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import io.onedev.commons.utils.HtmlUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.MarkdownManager;
import io.onedev.server.manager.PullRequestManager;
@@ -38,7 +39,6 @@ import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
import io.onedev.server.web.websocket.PageDataChanged;
-import io.onedev.utils.HtmlUtils;
@SuppressWarnings("serial")
public class ReviewListPanel extends GenericPanel<PullRequest> {
diff --git a/core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementAssistBehavior.java b/core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementAssistBehavior.java
index 9eea68fdb0..739ca76bca 100644
--- a/core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementAssistBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementAssistBehavior.java
@@ -3,18 +3,19 @@ package io.onedev.server.web.component.review;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.stream.Collectors;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import com.google.common.base.Optional;
-import io.onedev.codeassist.FenceAware;
-import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
-import io.onedev.codeassist.grammar.RuleRefElementSpec;
-import io.onedev.codeassist.parser.ParseExpect;
-import io.onedev.codeassist.parser.TerminalExpect;
+import io.onedev.commons.codeassist.FenceAware;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.commons.codeassist.grammar.RuleRefElementSpec;
+import io.onedev.commons.codeassist.parser.ParseExpect;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.server.model.Project;
import io.onedev.server.security.permission.ProjectPrivilege;
import io.onedev.server.util.reviewrequirement.ReviewRequirementParser;
@@ -43,6 +44,10 @@ public class ReviewRequirementAssistBehavior extends ANTLRAssistBehavior {
projectModel.detach();
}
+ private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {
+ return suggestions.stream().map(it->it.escape(ESCAPE_CHARS)).collect(Collectors.toList());
+ }
+
@Override
protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
@@ -54,10 +59,10 @@ public class ReviewRequirementAssistBehavior extends ANTLRAssistBehavior {
protected List<InputSuggestion> match(String unfencedMatchWith) {
Project project = projectModel.getObject();
if (terminalExpect.findExpectByRule("userCriteria") != null) {
- return SuggestionUtils.suggestUser(project, ProjectPrivilege.CODE_READ,
- unfencedMatchWith, ESCAPE_CHARS);
+ return escape(SuggestionUtils.suggestUsers(project, ProjectPrivilege.CODE_READ,
+ unfencedMatchWith));
} else {
- return SuggestionUtils.suggestGroup(unfencedMatchWith, ESCAPE_CHARS);
+ return escape(SuggestionUtils.suggestGroups(unfencedMatchWith));
}
}
diff --git a/core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementInput.java b/core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementInput.java
index a352d973e1..4831560d80 100644
--- a/core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementInput.java
+++ b/core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementInput.java
@@ -1,17 +1,9 @@
package io.onedev.server.web.component.review;
-import java.io.Serializable;
-
-import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.validation.IErrorMessageSource;
-import org.apache.wicket.validation.IValidatable;
-import org.apache.wicket.validation.IValidationError;
-import org.apache.wicket.validation.IValidator;
import io.onedev.server.model.Project;
-import io.onedev.server.util.reviewrequirement.ReviewRequirement;
@SuppressWarnings("serial")
public class ReviewRequirementInput extends TextField<String> {
@@ -29,28 +21,6 @@ public class ReviewRequirementInput extends TextField<String> {
super.onInitialize();
add(new ReviewRequirementAssistBehavior(projectModel));
- add(new IValidator<String>() {
-
- @Override
- public void validate(IValidatable<String> validatable) {
- try {
- ReviewRequirement.parse(validatable.getValue());
- } catch (Exception e) {
- validatable.error(new IValidationError() {
-
- @Override
- public Serializable getErrorMessage(IErrorMessageSource messageSource) {
- if (StringUtils.isNotBlank(e.getMessage()))
- return e.getMessage();
- else
- return "Syntax error";
- }
-
- });
- }
- }
-
- });
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java b/core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java
index 424e0c5fd4..8371de2806 100644
--- a/core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java
+++ b/core/src/main/java/io/onedev/server/web/component/review/ReviewerProvider.java
@@ -7,6 +7,8 @@ import java.util.List;
import org.apache.wicket.model.IModel;
+import io.onedev.commons.utils.matchscore.MatchScoreProvider;
+import io.onedev.commons.utils.matchscore.MatchScoreUtils;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.security.SecurityUtils;
@@ -15,8 +17,6 @@ import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.select2.Response;
import io.onedev.server.web.component.user.choice.AbstractUserChoiceProvider;
-import io.onedev.utils.matchscore.MatchScoreProvider;
-import io.onedev.utils.matchscore.MatchScoreUtils;
public class ReviewerProvider extends AbstractUserChoiceProvider {
diff --git a/core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java b/core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
index 6a2582bb4b..ceea667e64 100644
--- a/core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
+++ b/core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java
@@ -40,6 +40,7 @@ import org.unbescape.html.HtmlEscape;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
+import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
import io.onedev.server.model.Project;
@@ -54,7 +55,6 @@ import io.onedev.server.web.component.tabbable.AjaxActionTab;
import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.utils.ExceptionUtils;
@SuppressWarnings("serial")
public abstract class RevisionSelector extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java b/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
index 18850957bb..b2fd46b850 100644
--- a/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
@@ -29,7 +29,7 @@ import org.apache.wicket.request.resource.ResourceReference;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
-import io.onedev.jsymbol.Symbol;
+import io.onedev.commons.jsymbol.Symbol;
import io.onedev.server.OneDev;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
diff --git a/core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceProvider.java
index 91da0a3bde..2b175e7f25 100644
--- a/core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceProvider.java
+++ b/core/src/main/java/io/onedev/server/web/component/user/choice/UserChoiceProvider.java
@@ -4,12 +4,12 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
+import io.onedev.commons.utils.matchscore.MatchScoreProvider;
+import io.onedev.commons.utils.matchscore.MatchScoreUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.select2.Response;
import io.onedev.server.web.component.select2.ResponseFiller;
-import io.onedev.utils.matchscore.MatchScoreProvider;
-import io.onedev.utils.matchscore.MatchScoreUtils;
public class UserChoiceProvider extends AbstractUserChoiceProvider {
diff --git a/core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java b/core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java
index 990d1ac048..98934fef7b 100644
--- a/core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java
@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.User;
diff --git a/core/src/main/java/io/onedev/server/web/component/wizard/ManualConfigStep.java b/core/src/main/java/io/onedev/server/web/component/wizard/ManualConfigStep.java
index 3884ac2e71..a7be3e2a7b 100644
--- a/core/src/main/java/io/onedev/server/web/component/wizard/ManualConfigStep.java
+++ b/core/src/main/java/io/onedev/server/web/component/wizard/ManualConfigStep.java
@@ -4,8 +4,8 @@ import java.io.Serializable;
import org.apache.wicket.markup.html.form.FormComponent;
+import io.onedev.commons.utils.init.ManualConfig;
import io.onedev.server.web.editable.BeanContext;
-import io.onedev.utils.init.ManualConfig;
@SuppressWarnings("serial")
public class ManualConfigStep implements WizardStep {
diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanContext.java b/core/src/main/java/io/onedev/server/web/editable/BeanContext.java
index c7d9f53db2..7a8341e0db 100644
--- a/core/src/main/java/io/onedev/server/web/editable/BeanContext.java
+++ b/core/src/main/java/io/onedev/server/web/editable/BeanContext.java
@@ -11,8 +11,8 @@ import org.apache.wicket.model.Model;
import com.google.common.collect.Sets;
+import io.onedev.commons.utils.ClassUtils;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.utils.ClassUtils;
@SuppressWarnings("serial")
public class BeanContext implements Serializable {
diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
index 6a794540d0..1eb0666d06 100644
--- a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
@@ -12,9 +12,9 @@ import javax.annotation.Nullable;
import com.google.common.collect.Sets;
+import io.onedev.commons.utils.BeanUtils;
import io.onedev.server.exception.OneException;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.utils.BeanUtils;
@SuppressWarnings("serial")
public class BeanDescriptor implements Serializable {
diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
index f4ec83bac3..c169cd7798 100644
--- a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
@@ -30,14 +30,14 @@ import org.apache.wicket.util.visit.IVisitor;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.OneContext;
import io.onedev.server.web.editable.PathSegment.Property;
import io.onedev.server.web.editable.annotation.Horizontal;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.Vertical;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public class BeanEditor extends ValueEditor<Serializable> {
diff --git a/core/src/main/java/io/onedev/server/web/editable/BranchPatternsEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/BranchPatternsEditSupport.java
new file mode 100644
index 0000000000..49282c32b5
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/BranchPatternsEditSupport.java
@@ -0,0 +1,76 @@
+package io.onedev.server.web.editable;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.apache.wicket.model.IModel;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
+import io.onedev.server.model.Project;
+import io.onedev.server.web.behavior.PatternSetAssistBehavior;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
+import io.onedev.server.web.editable.annotation.BranchPatterns;
+import io.onedev.server.web.editable.string.StringPropertyEditor;
+import io.onedev.server.web.editable.string.StringPropertyViewer;
+import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.util.SuggestionUtils;
+
+@SuppressWarnings("serial")
+public class BranchPatternsEditSupport implements EditSupport {
+
+ @Override
+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
+ Method propertyGetter = descriptor.getPropertyGetter();
+ if (propertyGetter.getAnnotation(BranchPatterns.class) != null) {
+ if (propertyGetter.getReturnType() == String.class) {
+ return new PropertyContext<String>(descriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, IModel<String> model) {
+ return new StringPropertyViewer(componentId, descriptor, model.getObject());
+ }
+
+ @Override
+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
+ return new StringPropertyEditor(componentId, descriptor, model) {
+
+ @Override
+ protected InputAssistBehavior getInputAssistBehavior() {
+ return new PatternSetAssistBehavior() {
+
+ @Override
+ protected List<InputSuggestion> suggest(String matchWith) {
+ Project project = ((ProjectPage)getPage()).getProject();
+ return SuggestionUtils.suggestBranches(project, matchWith);
+ }
+
+ @Override
+ protected List<String> getHints(TerminalExpect terminalExpect) {
+ return Lists.newArrayList("Use * or ? for wildcard match");
+ }
+
+ };
+ }
+
+ };
+ }
+
+ };
+ } else {
+ throw new RuntimeException("Annotation 'BranchPatterns' should be applied to property "
+ + "of type 'String'");
+ }
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public int getPriority() {
+ return DEFAULT_PRIORITY;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/EditSupport.java b/core/src/main/java/io/onedev/server/web/editable/EditSupport.java
index dcf46d3e7b..c3488cf7e8 100644
--- a/core/src/main/java/io/onedev/server/web/editable/EditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/EditSupport.java
@@ -2,7 +2,7 @@ package io.onedev.server.web.editable;
import java.io.Serializable;
-import io.onedev.launcher.loader.ExtensionPoint;
+import io.onedev.commons.launcher.loader.ExtensionPoint;
@ExtensionPoint
public interface EditSupport extends Serializable {
diff --git a/core/src/main/java/io/onedev/server/web/editable/EditableModule.java b/core/src/main/java/io/onedev/server/web/editable/EditableModule.java
index 4d3123d87c..32062c6da8 100644
--- a/core/src/main/java/io/onedev/server/web/editable/EditableModule.java
+++ b/core/src/main/java/io/onedev/server/web/editable/EditableModule.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.editable;
-import io.onedev.launcher.loader.AbstractPluginModule;
+import io.onedev.commons.launcher.loader.AbstractPluginModule;
/**
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
diff --git a/core/src/main/java/io/onedev/server/web/editable/EditableUtils.java b/core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
index b1884a3d3b..4ce0989385 100644
--- a/core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
+++ b/core/src/main/java/io/onedev/server/web/editable/EditableUtils.java
@@ -4,20 +4,18 @@ import java.io.Serializable;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
import java.util.List;
import javax.annotation.Nullable;
import javax.validation.Validator;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.utils.BeanUtils;
+import io.onedev.commons.utils.ClassUtils;
+import io.onedev.commons.utils.ReflectionUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.WordUtils;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.utils.BeanUtils;
-import io.onedev.utils.ClassUtils;
-import io.onedev.utils.ReflectionUtils;
-import io.onedev.utils.StringUtils;
-import io.onedev.utils.WordUtils;
public class EditableUtils {
@@ -122,23 +120,6 @@ public class EditableUtils {
annotatedElements.sort((element1, element2) -> getOrder(element1) - getOrder(element2));
}
- public static Class<?> getElementClass(Type listType) {
- if (listType instanceof ParameterizedType) {
- ParameterizedType parameterizedType = (ParameterizedType)listType;
- Type rawType = parameterizedType.getRawType();
- if (rawType instanceof Class<?>) {
- Class<?> rawClazz = (Class<?>) rawType;
- if (List.class.isAssignableFrom(rawClazz)) {
- Type elementType = parameterizedType.getActualTypeArguments()[0];
- if (elementType instanceof Class<?>) {
- return (Class<?>) elementType;
- }
- }
- }
- }
- return null;
- }
-
public static boolean hasEditableProperties(Class<?> beanClass) {
for (Method getter: BeanUtils.findGetters(ClassUtils.unproxy(beanClass))) {
Method setter = BeanUtils.findSetter(getter);
diff --git a/core/src/main/java/io/onedev/server/web/editable/PathPatternsEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/PathPatternsEditSupport.java
new file mode 100644
index 0000000000..c5f8182dd9
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/PathPatternsEditSupport.java
@@ -0,0 +1,90 @@
+package io.onedev.server.web.editable;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.apache.wicket.model.IModel;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
+import io.onedev.commons.utils.ReflectionUtils;
+import io.onedev.server.util.OneContext;
+import io.onedev.server.web.behavior.PatternSetAssistBehavior;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
+import io.onedev.server.web.editable.annotation.PathPatterns;
+import io.onedev.server.web.editable.string.StringPropertyEditor;
+import io.onedev.server.web.editable.string.StringPropertyViewer;
+
+@SuppressWarnings("serial")
+public class PathPatternsEditSupport implements EditSupport {
+
+ @Override
+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
+ Method propertyGetter = descriptor.getPropertyGetter();
+ PathPatterns pathPatterns = propertyGetter.getAnnotation(PathPatterns.class);
+ if (pathPatterns != null) {
+ if (propertyGetter.getReturnType() == String.class) {
+ return new PropertyContext<String>(descriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, IModel<String> model) {
+ return new StringPropertyViewer(componentId, descriptor, model.getObject());
+ }
+
+ @Override
+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
+ return new StringPropertyEditor(componentId, descriptor, model) {
+
+ @Override
+ protected InputAssistBehavior getInputAssistBehavior() {
+ return new PatternSetAssistBehavior() {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected List<InputSuggestion> suggest(String matchWith) {
+ String suggestionMethod = pathPatterns.value();
+ if (suggestionMethod.length() != 0) {
+ OneContext.push(new OneContext(getComponent()));
+ try {
+ return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(
+ descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});
+ } finally {
+ OneContext.pop();
+ }
+ } else {
+ return Lists.newArrayList();
+ }
+ }
+
+ @Override
+ protected List<String> getHints(TerminalExpect terminalExpect) {
+ return Lists.newArrayList(
+ "Path containing spaces or starting with dash needs to be quoted",
+ "Use * or ? for wildcard match"
+ );
+ }
+
+ };
+ }
+
+ };
+ }
+
+ };
+ } else {
+ throw new RuntimeException("Annotation 'PathPatterns' should be applied to property "
+ + "of type 'String'");
+ }
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public int getPriority() {
+ return DEFAULT_PRIORITY;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyContext.java b/core/src/main/java/io/onedev/server/web/editable/PropertyContext.java
index ab01223173..0a911c3003 100644
--- a/core/src/main/java/io/onedev/server/web/editable/PropertyContext.java
+++ b/core/src/main/java/io/onedev/server/web/editable/PropertyContext.java
@@ -9,9 +9,9 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.utils.ClassUtils;
import io.onedev.server.util.OneContext;
-import io.onedev.utils.ClassUtils;
import jersey.repackaged.com.google.common.collect.Lists;
@SuppressWarnings("serial")
diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
index 31b846f0a8..069704b0ef 100644
--- a/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
@@ -14,14 +14,14 @@ import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.hibernate.validator.constraints.NotEmpty;
+import io.onedev.commons.utils.BeanUtils;
+import io.onedev.commons.utils.HtmlUtils;
+import io.onedev.commons.utils.ReflectionUtils;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.util.OneContext;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.ShowCondition;
-import io.onedev.utils.BeanUtils;
-import io.onedev.utils.HtmlUtils;
-import io.onedev.utils.ReflectionUtils;
-import io.onedev.utils.StringUtils;
public class PropertyDescriptor implements Serializable {
diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
index 8eb46ebdf8..ef8a6f35c5 100644
--- a/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
@@ -14,7 +14,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.validation.INullAcceptingValidator;
import org.apache.wicket.validation.IValidatable;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.util.OneContext;
@SuppressWarnings("serial")
diff --git a/core/src/main/java/io/onedev/server/web/editable/ReviewRequirementEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/ReviewRequirementEditSupport.java
new file mode 100644
index 0000000000..e27acc97d9
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/ReviewRequirementEditSupport.java
@@ -0,0 +1,64 @@
+package io.onedev.server.web.editable;
+
+import java.lang.reflect.Method;
+
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+
+import io.onedev.server.model.Project;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
+import io.onedev.server.web.component.review.ReviewRequirementAssistBehavior;
+import io.onedev.server.web.editable.annotation.ReviewRequirement;
+import io.onedev.server.web.editable.string.StringPropertyEditor;
+import io.onedev.server.web.editable.string.StringPropertyViewer;
+import io.onedev.server.web.page.project.ProjectPage;
+
+@SuppressWarnings("serial")
+public class ReviewRequirementEditSupport implements EditSupport {
+
+ @Override
+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
+ Method propertyGetter = descriptor.getPropertyGetter();
+ if (propertyGetter.getAnnotation(ReviewRequirement.class) != null) {
+ if (propertyGetter.getReturnType() != String.class) {
+ throw new RuntimeException("Annotation 'ReviewRequirement' should be applied to property "
+ + "of type 'String'.");
+ }
+ return new PropertyContext<String>(descriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, IModel<String> model) {
+ return new StringPropertyViewer(componentId, descriptor, model.getObject());
+ }
+
+ @Override
+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
+ return new StringPropertyEditor(componentId, descriptor, model) {
+
+ @Override
+ protected InputAssistBehavior getInputAssistBehavior() {
+ return new ReviewRequirementAssistBehavior(new AbstractReadOnlyModel<Project>() {
+
+ @Override
+ public Project getObject() {
+ return ((ProjectPage) getPage()).getProject();
+ }
+
+ });
+ }
+
+ };
+ }
+
+ };
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public int getPriority() {
+ return DEFAULT_PRIORITY;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/TagPatternsEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/TagPatternsEditSupport.java
new file mode 100644
index 0000000000..b31decb97c
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/TagPatternsEditSupport.java
@@ -0,0 +1,76 @@
+package io.onedev.server.web.editable;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.apache.wicket.model.IModel;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
+import io.onedev.server.model.Project;
+import io.onedev.server.web.behavior.PatternSetAssistBehavior;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
+import io.onedev.server.web.editable.annotation.TagPatterns;
+import io.onedev.server.web.editable.string.StringPropertyEditor;
+import io.onedev.server.web.editable.string.StringPropertyViewer;
+import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.util.SuggestionUtils;
+
+@SuppressWarnings("serial")
+public class TagPatternsEditSupport implements EditSupport {
+
+ @Override
+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
+ Method propertyGetter = descriptor.getPropertyGetter();
+ if (propertyGetter.getAnnotation(TagPatterns.class) != null) {
+ if (propertyGetter.getReturnType() == String.class) {
+ return new PropertyContext<String>(descriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, IModel<String> model) {
+ return new StringPropertyViewer(componentId, descriptor, model.getObject());
+ }
+
+ @Override
+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
+ return new StringPropertyEditor(componentId, descriptor, model) {
+
+ @Override
+ protected InputAssistBehavior getInputAssistBehavior() {
+ return new PatternSetAssistBehavior() {
+
+ @Override
+ protected List<InputSuggestion> suggest(String matchWith) {
+ Project project = ((ProjectPage)getPage()).getProject();
+ return SuggestionUtils.suggestTags(project, matchWith);
+ }
+
+ @Override
+ protected List<String> getHints(TerminalExpect terminalExpect) {
+ return Lists.newArrayList("Use * or ? for wildcard match");
+ }
+
+ };
+ }
+
+ };
+ }
+
+ };
+ } else {
+ throw new RuntimeException("Annotation 'TagPatterns' should be applied to property "
+ + "with type 'List<String>' or 'String'");
+ }
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public int getPriority() {
+ return DEFAULT_PRIORITY;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/BranchPattern.java b/core/src/main/java/io/onedev/server/web/editable/annotation/BranchPattern.java
deleted file mode 100644
index 5a1b19b514..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/annotation/BranchPattern.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.onedev.server.web.editable.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface BranchPattern {
-}
diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/BranchPatterns.java b/core/src/main/java/io/onedev/server/web/editable/annotation/BranchPatterns.java
new file mode 100644
index 0000000000..75f10d5ffd
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/annotation/BranchPatterns.java
@@ -0,0 +1,24 @@
+package io.onedev.server.web.editable.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import io.onedev.server.util.validation.BranchPatternsValidator;
+
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy=BranchPatternsValidator.class)
+public @interface BranchPatterns {
+
+ String message() default "Malformed branch patterns";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/PathPattern.java b/core/src/main/java/io/onedev/server/web/editable/annotation/PathPattern.java
deleted file mode 100644
index eb4b7dc20c..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/annotation/PathPattern.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.onedev.server.web.editable.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PathPattern {
-}
diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/PathPatterns.java b/core/src/main/java/io/onedev/server/web/editable/annotation/PathPatterns.java
new file mode 100644
index 0000000000..0fca6a80e3
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/annotation/PathPatterns.java
@@ -0,0 +1,26 @@
+package io.onedev.server.web.editable.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import io.onedev.server.util.validation.PathPatternsValidator;
+
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy=PathPatternsValidator.class)
+public @interface PathPatterns {
+
+ String message() default "Malformed path patterns";
+
+ String value() default "";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/TagPattern.java b/core/src/main/java/io/onedev/server/web/editable/annotation/TagPattern.java
deleted file mode 100644
index f197abd291..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/annotation/TagPattern.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.onedev.server.web.editable.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface TagPattern {
-}
diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/TagPatterns.java b/core/src/main/java/io/onedev/server/web/editable/annotation/TagPatterns.java
new file mode 100644
index 0000000000..26f542de72
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/annotation/TagPatterns.java
@@ -0,0 +1,24 @@
+package io.onedev.server.web.editable.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import io.onedev.server.util.validation.TagPatternsValidator;
+
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy=TagPatternsValidator.class)
+public @interface TagPatterns {
+
+ String message() default "Malformed tag patterns";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/bean/BeanEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/bean/BeanEditSupport.java
index f0b422171a..f10ea66bf5 100644
--- a/core/src/main/java/io/onedev/server/web/editable/bean/BeanEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/bean/BeanEditSupport.java
@@ -5,6 +5,7 @@ import java.io.Serializable;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+import io.onedev.commons.utils.ClassUtils;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EmptyValueLabel;
@@ -13,7 +14,6 @@ import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyViewer;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.utils.ClassUtils;
@SuppressWarnings("serial")
public class BeanEditSupport implements EditSupport {
diff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.java
index 6dffd5720e..b3fdbd64e7 100644
--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.java
@@ -6,15 +6,15 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+import io.onedev.commons.utils.ClassUtils;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.web.editable.EditSupport;
-import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyViewer;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.utils.ClassUtils;
@SuppressWarnings("serial")
public class BeanListEditSupport implements EditSupport {
@@ -22,7 +22,7 @@ public class BeanListEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {
- final Class<?> elementClass = EditableUtils.getElementClass(descriptor.getPropertyGetter().getGenericReturnType());
+ final Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());
if (elementClass != null && ClassUtils.isConcrete(elementClass)
&& elementClass.getAnnotation(Editable.class) != null) {
return new PropertyContext<List<Serializable>>(descriptor) {
diff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
index e192a2b07b..50740f1ebb 100644
--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
@@ -24,6 +24,8 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
+import io.onedev.commons.utils.ClassUtils;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.editable.BeanDescriptor;
@@ -35,7 +37,6 @@ import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyUpdating;
-import io.onedev.utils.ClassUtils;
@SuppressWarnings("serial")
public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
@@ -51,7 +52,7 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
public BeanListPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
super(id, propertyDescriptor, model);
- elementClass = EditableUtils.getElementClass(propertyDescriptor.getPropertyGetter().getGenericReturnType());
+ elementClass = ReflectionUtils.getCollectionElementType(propertyDescriptor.getPropertyGetter().getGenericReturnType());
propertyContexts = new ArrayList<>();
diff --git a/core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java
index e7bc370ad4..d5e36b39b6 100644
--- a/core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java
@@ -6,6 +6,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
@@ -13,7 +14,6 @@ import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyViewer;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public class BooleanEditSupport implements EditSupport {
diff --git a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.java
index 048241c493..f8f079a275 100644
--- a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.java
@@ -9,8 +9,8 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.eclipse.jgit.util.StringUtils;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.web.editable.EditSupport;
-import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -26,7 +26,7 @@ public class BranchEditSupport implements EditSupport {
Method propertyGetter = descriptor.getPropertyGetter();
if (propertyGetter.getAnnotation(BranchChoice.class) != null) {
if (List.class.isAssignableFrom(propertyGetter.getReturnType())
- && EditableUtils.getElementClass(propertyGetter.getGenericReturnType()) == String.class) {
+ && ReflectionUtils.getCollectionElementType(propertyGetter.getGenericReturnType()) == String.class) {
return new PropertyContext<List<String>>(descriptor) {
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.html b/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.html
deleted file mode 100644
index 1b6893780c..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<wicket:panel>
- <div class="clearable-wrapper">
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.java b/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.java
deleted file mode 100644
index b465d1ad03..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.onedev.server.web.editable.branchpattern;
-
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.util.convert.ConversionException;
-
-import io.onedev.server.model.Project;
-import io.onedev.server.web.behavior.BranchPatternAssistBehavior;
-import io.onedev.server.web.editable.ErrorContext;
-import io.onedev.server.web.editable.PathSegment;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.web.page.project.ProjectPage;
-
-@SuppressWarnings("serial")
-public class BranchPatternEditor extends PropertyEditor<String> {
-
- private TextField<String> input;
-
- public BranchPatternEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
- super(id, propertyDescriptor, propertyModel);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- input = new TextField<String>("input", getModel());
- input.add(new BranchPatternAssistBehavior(new AbstractReadOnlyModel<Project>() {
-
- @Override
- public Project getObject() {
- return ((ProjectPage)getPage()).getProject();
- }
-
- }));
- input.setLabel(Model.of(getDescriptor().getDisplayName(this)));
-
- add(input);
- }
-
- @Override
- public ErrorContext getErrorContext(PathSegment pathSegment) {
- return null;
- }
-
- @Override
- protected String convertInputToValue() throws ConversionException {
- return input.getConvertedInput();
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java
index d3e01d0c56..ee11e5fb52 100644
--- a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java
@@ -14,6 +14,7 @@ import org.apache.wicket.util.convert.ConversionException;
import com.google.common.base.Preconditions;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.util.OneContext;
import io.onedev.server.web.component.select2.Select2MultiChoice;
import io.onedev.server.web.component.stringchoice.StringMultiChoice;
@@ -21,7 +22,6 @@ import io.onedev.server.web.editable.ErrorContext;
import io.onedev.server.web.editable.PathSegment;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.utils.ReflectionUtils;
@SuppressWarnings("serial")
public class MultiChoiceEditor extends PropertyEditor<List<String>> {
diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java
index 88ec911e71..7af07d8530 100644
--- a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java
@@ -13,13 +13,13 @@ import org.apache.wicket.util.convert.ConversionException;
import com.google.common.base.Preconditions;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.util.OneContext;
import io.onedev.server.web.component.stringchoice.StringSingleChoice;
import io.onedev.server.web.editable.ErrorContext;
import io.onedev.server.web.editable.PathSegment;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.utils.ReflectionUtils;
@SuppressWarnings("serial")
public class SingleChoiceEditor extends PropertyEditor<String> {
diff --git a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationEditSupport.java
index 7d950cadba..dabfe7c14d 100644
--- a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationEditSupport.java
@@ -8,8 +8,8 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.eclipse.jgit.util.StringUtils;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.web.editable.EditSupport;
-import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -26,7 +26,7 @@ public class ConfigurationEditSupport implements EditSupport {
ConfigurationChoice configurationChoice = propertyGetter.getAnnotation(ConfigurationChoice.class);
if (configurationChoice != null) {
if (List.class.isAssignableFrom(propertyGetter.getReturnType())
- && EditableUtils.getElementClass(propertyGetter.getGenericReturnType()) == String.class) {
+ && ReflectionUtils.getCollectionElementType(propertyGetter.getGenericReturnType()) == String.class) {
return new PropertyContext<List<String>>(descriptor) {
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java
index 358398012c..009a7a611a 100644
--- a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java
@@ -4,13 +4,13 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyViewer;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public class EnumEditSupport implements EditSupport {
diff --git a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.java
index af48d3391f..cfcb377fd4 100644
--- a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListEditSupport.java
@@ -6,8 +6,8 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.web.editable.EditSupport;
-import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -20,7 +20,7 @@ public class EnumListEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {
- final Class<?> elementClass = EditableUtils.getElementClass(descriptor.getPropertyGetter().getGenericReturnType());
+ final Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());
if (elementClass != null && Enum.class.isAssignableFrom(elementClass)) {
return new PropertyContext<List<Enum<?>>>(descriptor) {
diff --git a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java
index 04e8971878..5391d567e8 100644
--- a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java
@@ -14,9 +14,9 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.web.component.select2.Select2MultiChoice;
import io.onedev.server.web.component.stringchoice.StringMultiChoice;
-import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.ErrorContext;
import io.onedev.server.web.editable.PathSegment;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -31,7 +31,7 @@ public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {
public EnumListPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<Enum<?>>> propertyModel) {
super(id, propertyDescriptor, propertyModel);
- enumClass = (Class<Enum>) EditableUtils.getElementClass(propertyDescriptor.getPropertyGetter().getGenericReturnType());
+ enumClass = (Class<Enum>) ReflectionUtils.getCollectionElementType(propertyDescriptor.getPropertyGetter().getGenericReturnType());
}
private String getDisplayValue(String choice) {
diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java
index 611611fc0b..ad27c298ac 100644
--- a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java
@@ -8,8 +8,8 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.eclipse.jgit.util.StringUtils;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.web.editable.EditSupport;
-import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -25,7 +25,7 @@ public class GroupEditSupport implements EditSupport {
Method propertyGetter = descriptor.getPropertyGetter();
if (propertyGetter.getAnnotation(GroupChoice.class) != null) {
if (Collection.class.isAssignableFrom(propertyGetter.getReturnType())
- && EditableUtils.getElementClass(propertyGetter.getGenericReturnType()) == String.class) {
+ && ReflectionUtils.getCollectionElementType(propertyGetter.getGenericReturnType()) == String.class) {
return new PropertyContext<Collection<String>>(descriptor) {
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java
index 38aef7894b..88cec828d8 100644
--- a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java
@@ -13,6 +13,7 @@ import org.apache.wicket.util.convert.ConversionException;
import com.google.common.base.Preconditions;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.manager.GroupManager;
@@ -25,7 +26,6 @@ import io.onedev.server.web.editable.PathSegment;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.annotation.GroupChoice;
-import io.onedev.utils.ReflectionUtils;
@SuppressWarnings("serial")
public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {
diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java
index 43725f6fdc..15a4e7b16d 100644
--- a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java
@@ -11,6 +11,7 @@ import org.apache.wicket.util.convert.ConversionException;
import com.google.common.base.Preconditions;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.manager.GroupManager;
@@ -23,7 +24,6 @@ import io.onedev.server.web.editable.PathSegment;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.annotation.GroupChoice;
-import io.onedev.utils.ReflectionUtils;
@SuppressWarnings("serial")
public class GroupSingleChoiceEditor extends PropertyEditor<String> {
diff --git a/core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java
index fca202509e..abfe26db98 100644
--- a/core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java
@@ -7,13 +7,13 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.editable.ErrorContext;
import io.onedev.server.web.editable.PathSegment;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.annotation.Password;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public class ConfirmativePasswordPropertyEditor extends PropertyEditor<String> {
diff --git a/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java
index 6552c5f84e..cd94728044 100644
--- a/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java
@@ -7,13 +7,13 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.editable.ErrorContext;
import io.onedev.server.web.editable.PathSegment;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.annotation.Password;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public class PasswordPropertyEditor extends PropertyEditor<String> {
diff --git a/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditSupport.java
deleted file mode 100644
index 101b97427d..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditSupport.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package io.onedev.server.web.editable.pathpattern;
-
-import java.lang.reflect.Method;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.model.IModel;
-
-import io.onedev.server.web.editable.EditSupport;
-import io.onedev.server.web.editable.EmptyValueLabel;
-import io.onedev.server.web.editable.PropertyContext;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.web.editable.PropertyViewer;
-import io.onedev.server.web.editable.annotation.PathPattern;
-
-@SuppressWarnings("serial")
-public class PathPatternEditSupport implements EditSupport {
-
- @Override
- public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
- Method propertyGetter = descriptor.getPropertyGetter();
- if (propertyGetter.getAnnotation(PathPattern.class) != null) {
- if (propertyGetter.getReturnType() != String.class) {
- throw new RuntimeException("Annotation 'PathPattern' should be applied to property "
- + "with type 'String'.");
- }
- return new PropertyContext<String>(descriptor) {
-
- @Override
- public PropertyViewer renderForView(String componentId, final IModel<String> model) {
- return new PropertyViewer(componentId, descriptor) {
-
- @Override
- protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
- String refMatch = model.getObject();
- if (refMatch != null) {
- return new Label(id, refMatch);
- } else {
- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
- }
- }
-
- };
- }
-
- @Override
- public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
- return new PathPatternEditor(componentId, descriptor, model);
- }
-
- };
- } else {
- return null;
- }
- }
-
- @Override
- public int getPriority() {
- return DEFAULT_PRIORITY;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.html b/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.html
deleted file mode 100644
index 1b6893780c..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<wicket:panel>
- <div class="clearable-wrapper">
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.java b/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.java
deleted file mode 100644
index 98fab18245..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package io.onedev.server.web.editable.pathpattern;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.util.convert.ConversionException;
-
-import io.onedev.server.model.Project;
-import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.behavior.PathPatternAssistBehavior;
-import io.onedev.server.web.editable.ErrorContext;
-import io.onedev.server.web.editable.PathSegment;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.web.page.project.ProjectPage;
-
-@SuppressWarnings("serial")
-public class PathPatternEditor extends PropertyEditor<String> {
-
- private TextField<String> input;
-
- public PathPatternEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
- super(id, propertyDescriptor, propertyModel);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- input = new TextField<String>("input", getModel());
- input.add(new PathPatternAssistBehavior(new AbstractReadOnlyModel<Project>() {
-
- @Override
- public Project getObject() {
- return ((ProjectPage) getPage()).getProject();
- }
-
- }));
- input.setLabel(Model.of(getDescriptor().getDisplayName(this)));
-
- add(input);
- input.add(new OnTypingDoneBehavior() {
-
- @Override
- protected void onTypingDone(AjaxRequestTarget target) {
- onPropertyUpdating(target);
- }
-
- });
- }
-
- @Override
- public ErrorContext getErrorContext(PathSegment pathSegment) {
- return null;
- }
-
- @Override
- protected String convertInputToValue() throws ConversionException {
- return input.getConvertedInput();
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.java b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.java
index 3117d47c4c..cb370c138b 100644
--- a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.java
@@ -5,6 +5,7 @@ import java.io.Serializable;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+import io.onedev.commons.utils.ClassUtils;
import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
@@ -12,7 +13,6 @@ import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyViewer;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.utils.ClassUtils;
@SuppressWarnings("serial")
public class PolymorphicEditSuport implements EditSupport {
diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java
index 86550aa195..c1993aedd4 100644
--- a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java
@@ -19,8 +19,8 @@ import org.apache.wicket.util.convert.ConversionException;
import com.google.common.base.Preconditions;
-import io.onedev.launcher.loader.AppLoader;
-import io.onedev.launcher.loader.ImplementationRegistry;
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.ImplementationRegistry;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.BeanUpdating;
diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListEditSupport.java
index ce203b6d19..a9b6534110 100644
--- a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListEditSupport.java
@@ -6,15 +6,15 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+import io.onedev.commons.utils.ClassUtils;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.web.editable.EditSupport;
-import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyViewer;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.utils.ClassUtils;
@SuppressWarnings("serial")
public class PolymorphicListEditSupport implements EditSupport {
@@ -22,7 +22,7 @@ public class PolymorphicListEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {
- final Class<?> elementClass = EditableUtils.getElementClass(descriptor.getPropertyGetter().getGenericReturnType());
+ final Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());
if (elementClass != null && !ClassUtils.isConcrete(elementClass)
&& elementClass.getAnnotation(Editable.class) != null) {
return new PropertyContext<List<Serializable>>(descriptor) {
diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java
index c2be05ee6c..ff01e47773 100644
--- a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java
@@ -23,8 +23,10 @@ import org.apache.wicket.util.convert.ConversionException;
import com.google.common.base.Preconditions;
-import io.onedev.launcher.loader.AppLoader;
-import io.onedev.launcher.loader.ImplementationRegistry;
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.ImplementationRegistry;
+import io.onedev.commons.utils.ClassUtils;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.editable.BeanContext;
@@ -35,7 +37,6 @@ import io.onedev.server.web.editable.ErrorContext;
import io.onedev.server.web.editable.PathSegment;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.utils.ClassUtils;
@SuppressWarnings("serial")
public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializable>> {
@@ -52,7 +53,7 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa
super(id, propertyDescriptor, model);
implementations = new ArrayList<>();
- baseClass = EditableUtils.getElementClass(propertyDescriptor.getPropertyGetter().getGenericReturnType());
+ baseClass = ReflectionUtils.getCollectionElementType(propertyDescriptor.getPropertyGetter().getGenericReturnType());
Preconditions.checkNotNull(baseClass);
ImplementationRegistry registry = AppLoader.getInstance(ImplementationRegistry.class);
diff --git a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java
deleted file mode 100644
index c501f489ac..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package io.onedev.server.web.editable.reviewrequirementspec;
-
-import java.lang.reflect.Method;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.model.IModel;
-
-import io.onedev.server.web.editable.EditSupport;
-import io.onedev.server.web.editable.EmptyValueLabel;
-import io.onedev.server.web.editable.PropertyContext;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.web.editable.PropertyViewer;
-import io.onedev.server.web.editable.annotation.ReviewRequirement;
-
-@SuppressWarnings("serial")
-public class ReviewRequirementSpecEditSupport implements EditSupport {
-
- @Override
- public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
- Method propertyGetter = descriptor.getPropertyGetter();
- if (propertyGetter.getAnnotation(ReviewRequirement.class) != null) {
- if (propertyGetter.getReturnType() != String.class) {
- throw new RuntimeException("Annotation 'ReviewRequirementSpec' should be applied to property "
- + "with type 'String'.");
- }
- return new PropertyContext<String>(descriptor) {
-
- @Override
- public PropertyViewer renderForView(String componentId, final IModel<String> model) {
- return new PropertyViewer(componentId, descriptor) {
-
- @Override
- protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
- String expr = model.getObject();
- if (expr != null) {
- return new Label(id, expr);
- } else {
- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
- }
- }
-
- };
- }
-
- @Override
- public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
- return new ReviewRequirementSpecEditor(componentId, descriptor, model);
- }
-
- };
- } else {
- return null;
- }
- }
-
- @Override
- public int getPriority() {
- return DEFAULT_PRIORITY;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html
deleted file mode 100644
index 4e1cf34a3b..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<wicket:panel>
- <div class="clearable-wrapper">
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control">
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java
deleted file mode 100644
index ccb7aeeca9..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package io.onedev.server.web.editable.reviewrequirementspec;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.util.convert.ConversionException;
-
-import io.onedev.server.model.Project;
-import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.component.review.ReviewRequirementInput;
-import io.onedev.server.web.editable.ErrorContext;
-import io.onedev.server.web.editable.PathSegment;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.web.page.project.ProjectPage;
-
-@SuppressWarnings("serial")
-public class ReviewRequirementSpecEditor extends PropertyEditor<String> {
-
- private ReviewRequirementInput input;
-
- public ReviewRequirementSpecEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
- super(id, propertyDescriptor, propertyModel);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- input = new ReviewRequirementInput("input", new AbstractReadOnlyModel<Project>() {
-
- @Override
- public Project getObject() {
- return ((ProjectPage) getPage()).getProject();
- }
-
- }, getModel());
-
- input.setLabel(Model.of(getDescriptor().getDisplayName(this)));
-
- add(input);
-
- input.add(new OnTypingDoneBehavior() {
-
- @Override
- protected void onTypingDone(AjaxRequestTarget target) {
- onPropertyUpdating(target);
- }
-
- });
- }
-
- @Override
- public ErrorContext getErrorContext(PathSegment pathSegment) {
- return null;
- }
-
- @Override
- protected String convertInputToValue() throws ConversionException {
- return input.getConvertedInput();
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java
index 2f3a9a31f1..c66a6e3e6b 100644
--- a/core/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java
@@ -1,29 +1,12 @@
package io.onedev.server.web.editable.string;
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.editable.EditSupport;
-import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyViewer;
-import io.onedev.server.web.editable.annotation.BranchPattern;
-import io.onedev.server.web.editable.annotation.ChoiceProvider;
-import io.onedev.server.web.editable.annotation.Color;
-import io.onedev.server.web.editable.annotation.GroupChoice;
-import io.onedev.server.web.editable.annotation.IssueQuery;
-import io.onedev.server.web.editable.annotation.Markdown;
-import io.onedev.server.web.editable.annotation.Multiline;
-import io.onedev.server.web.editable.annotation.Password;
-import io.onedev.server.web.editable.annotation.PathPattern;
-import io.onedev.server.web.editable.annotation.ReviewRequirement;
-import io.onedev.server.web.editable.annotation.Script;
-import io.onedev.server.web.editable.annotation.TagPattern;
-import io.onedev.server.web.editable.annotation.UserChoice;
@SuppressWarnings("serial")
public class StringEditSupport implements EditSupport {
@@ -31,39 +14,12 @@ public class StringEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
Class<?> propertyClass = descriptor.getPropertyGetter().getReturnType();
- if (propertyClass == String.class
- && descriptor.getPropertyGetter().getAnnotation(ChoiceProvider.class) == null
- && descriptor.getPropertyGetter().getAnnotation(Markdown.class) == null
- && descriptor.getPropertyGetter().getAnnotation(Script.class) == null
- && descriptor.getPropertyGetter().getAnnotation(Color.class) == null
- && descriptor.getPropertyGetter().getAnnotation(Password.class) == null
- && descriptor.getPropertyGetter().getAnnotation(BranchPattern.class) == null
- && descriptor.getPropertyGetter().getAnnotation(TagPattern.class) == null
- && descriptor.getPropertyGetter().getAnnotation(IssueQuery.class) == null
- && descriptor.getPropertyGetter().getAnnotation(GroupChoice.class) == null
- && descriptor.getPropertyGetter().getAnnotation(UserChoice.class) == null
- && descriptor.getPropertyGetter().getAnnotation(PathPattern.class) == null
- && descriptor.getPropertyGetter().getAnnotation(ReviewRequirement.class) == null) {
+ if (propertyClass == String.class) {
return new PropertyContext<String>(descriptor) {
@Override
public PropertyViewer renderForView(String componentId, final IModel<String> model) {
- return new PropertyViewer(componentId, descriptor) {
-
- @Override
- protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
- if (model.getObject() != null) {
- if (propertyDescriptor.getPropertyGetter().getAnnotation(Multiline.class) != null) {
- return new MultilineLabel(id, model.getObject());
- } else {
- return new Label(id, model.getObject());
- }
- } else {
- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
- }
- }
-
- };
+ return new StringPropertyViewer(componentId, descriptor, model.getObject());
}
@Override
@@ -80,7 +36,7 @@ public class StringEditSupport implements EditSupport {
@Override
public int getPriority() {
- return DEFAULT_PRIORITY;
+ return DEFAULT_PRIORITY*2;
}
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java
index 3eeae8c761..f5a4f869c9 100644
--- a/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java
@@ -2,8 +2,11 @@ package io.onedev.server.web.editable.string;
import java.lang.reflect.Method;
+import javax.annotation.Nullable;
+
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.form.TextField;
@@ -13,6 +16,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.ErrorContext;
import io.onedev.server.web.editable.PathSegment;
@@ -48,6 +52,13 @@ public class StringPropertyEditor extends PropertyEditor<String> {
}
input.setLabel(Model.of(getDescriptor().getDisplayName(this)));
+ InputAssistBehavior inputAssistBehavior = getInputAssistBehavior();
+ if (inputAssistBehavior != null) {
+ input.add(inputAssistBehavior);
+ input.add(AttributeAppender.append("spellcheck", "false"));
+ input.add(AttributeAppender.append("autocomplete", "off"));
+ }
+
input.add(new OnTypingDoneBehavior() {
@Override
@@ -71,4 +82,9 @@ public class StringPropertyEditor extends PropertyEditor<String> {
return input.getConvertedInput();
}
+ @Nullable
+ protected InputAssistBehavior getInputAssistBehavior() {
+ return null;
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyViewer.java b/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyViewer.java
new file mode 100644
index 0000000000..aac7919fbc
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyViewer.java
@@ -0,0 +1,29 @@
+package io.onedev.server.web.editable.string;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.web.component.MultilineLabel;
+import io.onedev.server.web.editable.EmptyValueLabel;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyViewer;
+
+@SuppressWarnings("serial")
+public class StringPropertyViewer extends PropertyViewer {
+
+ private final String value;
+
+ public StringPropertyViewer(String id, PropertyDescriptor descriptor, String value) {
+ super(id, descriptor);
+ this.value = value;
+ }
+
+ @Override
+ protected Component newContent(String id, PropertyDescriptor descriptor) {
+ if (value != null) {
+ return new MultilineLabel(id, value);
+ } else {
+ return new EmptyValueLabel(id, descriptor.getPropertyGetter());
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListEditSupport.java
similarity index 58%
rename from core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditSupport.java
rename to core/src/main/java/io/onedev/server/web/editable/stringlist/StringListEditSupport.java
index 0722e405f0..60b25121db 100644
--- a/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListEditSupport.java
@@ -1,42 +1,44 @@
-package io.onedev.server.web.editable.branchpattern;
+package io.onedev.server.web.editable.stringlist;
import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
+import io.onedev.commons.utils.ReflectionUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyViewer;
-import io.onedev.server.web.editable.annotation.BranchPattern;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
@SuppressWarnings("serial")
-public class BranchPatternEditSupport implements EditSupport {
+public class StringListEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
Method propertyGetter = descriptor.getPropertyGetter();
- if (propertyGetter.getAnnotation(BranchPattern.class) != null) {
- if (propertyGetter.getReturnType() != String.class) {
- throw new RuntimeException("Annotation 'BranchPattern' should be applied to property "
- + "with type 'String'.");
- }
- return new PropertyContext<String>(descriptor) {
+ Class<?> returnType = propertyGetter.getReturnType();
+ Type genericReturnType = propertyGetter.getGenericReturnType();
+ if (returnType == List.class && ReflectionUtils.getCollectionElementType(genericReturnType) == String.class) {
+ return new PropertyContext<List<String>>(descriptor) {
@Override
- public PropertyViewer renderForView(String componentId, final IModel<String> model) {
+ public PropertyViewer renderForView(String componentId, final IModel<List<String>> model) {
return new PropertyViewer(componentId, descriptor) {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
- String refMatch = model.getObject();
- if (refMatch != null) {
- return new Label(id, refMatch);
+ List<String> tags = model.getObject();
+ if (tags != null && !tags.isEmpty()) {
+ return new MultilineLabel(id, StringUtils.join(tags, "\n"));
} else {
NameOfEmptyValue nameOfEmptyValue = propertyDescriptor.getPropertyGetter().getAnnotation(NameOfEmptyValue.class);
if (nameOfEmptyValue != null)
@@ -50,8 +52,8 @@ public class BranchPatternEditSupport implements EditSupport {
}
@Override
- public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
- return new BranchPatternEditor(componentId, descriptor, model);
+ public PropertyEditor<List<String>> renderForEdit(String componentId, IModel<List<String>> model) {
+ return new StringListPropertyEditor(componentId, descriptor, model);
}
};
@@ -62,7 +64,7 @@ public class BranchPatternEditSupport implements EditSupport {
@Override
public int getPriority() {
- return DEFAULT_PRIORITY;
+ return DEFAULT_PRIORITY * 2;
}
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListPropertyEditor.html
new file mode 100644
index 0000000000..f1455f96cc
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListPropertyEditor.html
@@ -0,0 +1,5 @@
+<wicket:panel>
+ <div class="clearable-wrapper">
+ <textarea wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></textarea>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListPropertyEditor.java
new file mode 100644
index 0000000000..c0c86ac185
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListPropertyEditor.java
@@ -0,0 +1,87 @@
+package io.onedev.server.web.editable.stringlist;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
+import com.google.common.base.Splitter;
+
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.web.behavior.OnTypingDoneBehavior;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
+import io.onedev.server.web.editable.EditableUtils;
+import io.onedev.server.web.editable.ErrorContext;
+import io.onedev.server.web.editable.PathSegment;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.annotation.OmitName;
+
+@SuppressWarnings("serial")
+public class StringListPropertyEditor extends PropertyEditor<List<String>> {
+
+ private TextArea<String> input;
+
+ public StringListPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<String>> propertyModel) {
+ super(id, propertyDescriptor, propertyModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ String content;
+ if (getModelObject() != null)
+ content = StringUtils.join(getModelObject(), "\n");
+ else
+ content = "";
+ input = new TextArea<String>("input", Model.of(content));
+
+ InputAssistBehavior inputAssistBehavior = getInputAssistBehavior();
+ if (inputAssistBehavior != null)
+ input.add(inputAssistBehavior);
+
+ input.setLabel(Model.of(getDescriptor().getDisplayName(this)));
+
+ add(input);
+ input.add(new OnTypingDoneBehavior() {
+
+ @Override
+ protected void onTypingDone(AjaxRequestTarget target) {
+ onPropertyUpdating(target);
+ }
+
+ });
+
+ Method getter = getDescriptor().getPropertyGetter();
+ if (getter.getAnnotation(OmitName.class) != null)
+ input.add(AttributeModifier.replace("placeholder", EditableUtils.getDisplayName(getter)));
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathSegment pathSegment) {
+ return null;
+ }
+
+ @Override
+ protected List<String> convertInputToValue() throws ConversionException {
+ if (input.getConvertedInput() != null)
+ return Splitter.on("\n").trimResults().omitEmptyStrings().splitToList(input.getConvertedInput());
+ else
+ return new ArrayList<>();
+ }
+
+ @Nullable
+ protected InputAssistBehavior getInputAssistBehavior() {
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListPropertyViewer.java b/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListPropertyViewer.java
new file mode 100644
index 0000000000..6f3ad4b638
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListPropertyViewer.java
@@ -0,0 +1,38 @@
+package io.onedev.server.web.editable.stringlist;
+
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.web.component.MultilineLabel;
+import io.onedev.server.web.editable.EmptyValueLabel;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyViewer;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
+
+@SuppressWarnings("serial")
+public class StringListPropertyViewer extends PropertyViewer {
+
+ private final List<String> value;
+
+ public StringListPropertyViewer(String id, PropertyDescriptor descriptor, List<String> value) {
+ super(id, descriptor);
+ this.value = value;
+ }
+
+ @Override
+ protected Component newContent(String id, PropertyDescriptor descriptor) {
+ if (value != null && !value.isEmpty()) {
+ return new MultilineLabel(id, StringUtils.join(value, "\n"));
+ } else {
+ NameOfEmptyValue nameOfEmptyValue = descriptor.getPropertyGetter().getAnnotation(NameOfEmptyValue.class);
+ if (nameOfEmptyValue != null)
+ return new Label(id, nameOfEmptyValue.value());
+ else
+ return new EmptyValueLabel(id, descriptor.getPropertyGetter());
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditSupport.java
deleted file mode 100644
index b0bda82339..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditSupport.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package io.onedev.server.web.editable.tagpattern;
-
-import java.lang.reflect.Method;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.model.IModel;
-
-import io.onedev.server.web.editable.EditSupport;
-import io.onedev.server.web.editable.EmptyValueLabel;
-import io.onedev.server.web.editable.PropertyContext;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.web.editable.PropertyViewer;
-import io.onedev.server.web.editable.annotation.TagPattern;
-
-@SuppressWarnings("serial")
-public class TagPatternEditSupport implements EditSupport {
-
- @Override
- public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
- Method propertyGetter = descriptor.getPropertyGetter();
- if (propertyGetter.getAnnotation(TagPattern.class) != null) {
- if (propertyGetter.getReturnType() != String.class) {
- throw new RuntimeException("Annotation 'TagPattern' should be applied to property "
- + "with type 'String'.");
- }
- return new PropertyContext<String>(descriptor) {
-
- @Override
- public PropertyViewer renderForView(String componentId, final IModel<String> model) {
- return new PropertyViewer(componentId, descriptor) {
-
- @Override
- protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
- String refMatch = model.getObject();
- if (refMatch != null) {
- return new Label(id, refMatch);
- } else {
- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
- }
- }
-
- };
- }
-
- @Override
- public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
- return new TagPatternEditor(componentId, descriptor, model);
- }
-
- };
- } else {
- return null;
- }
- }
-
- @Override
- public int getPriority() {
- return DEFAULT_PRIORITY;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.html b/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.html
deleted file mode 100644
index 1b6893780c..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<wicket:panel>
- <div class="clearable-wrapper">
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.java b/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.java
deleted file mode 100644
index cd54ccce23..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.onedev.server.web.editable.tagpattern;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.util.convert.ConversionException;
-
-import io.onedev.server.model.Project;
-import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.behavior.TagPatternAssistBehavior;
-import io.onedev.server.web.editable.ErrorContext;
-import io.onedev.server.web.editable.PathSegment;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.web.page.project.ProjectPage;
-
-@SuppressWarnings("serial")
-public class TagPatternEditor extends PropertyEditor<String> {
-
- private TextField<String> input;
-
- public TagPatternEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
- super(id, propertyDescriptor, propertyModel);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- input = new TextField<String>("input", getModel());
- input.setLabel(Model.of(getDescriptor().getDisplayName(this)));
-
- input.add(new TagPatternAssistBehavior(new AbstractReadOnlyModel<Project>() {
-
- @Override
- public Project getObject() {
- return ((ProjectPage) getPage()).getProject();
- }
-
- }));
-
- add(input);
-
- input.add(new OnTypingDoneBehavior() {
-
- @Override
- protected void onTypingDone(AjaxRequestTarget target) {
- onPropertyUpdating(target);
- }
-
- });
- }
-
- @Override
- public ErrorContext getErrorContext(PathSegment pathSegment) {
- return null;
- }
-
- @Override
- protected String convertInputToValue() throws ConversionException {
- return input.getConvertedInput();
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.java
index 8233cfe07f..e1098d4a7e 100644
--- a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.java
@@ -8,8 +8,8 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.eclipse.jgit.util.StringUtils;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.web.editable.EditSupport;
-import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -26,7 +26,7 @@ public class UserEditSupport implements EditSupport {
UserChoice userChoice = propertyGetter.getAnnotation(UserChoice.class);
if (userChoice != null) {
if (List.class.isAssignableFrom(propertyGetter.getReturnType())
- && EditableUtils.getElementClass(propertyGetter.getGenericReturnType()) == String.class) {
+ && ReflectionUtils.getCollectionElementType(propertyGetter.getGenericReturnType()) == String.class) {
return new PropertyContext<List<String>>(descriptor) {
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java
index 7e714043eb..0e051edd8c 100644
--- a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java
@@ -13,6 +13,7 @@ import org.apache.wicket.util.convert.ConversionException;
import com.google.common.base.Preconditions;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.manager.UserManager;
@@ -26,7 +27,6 @@ import io.onedev.server.web.editable.PathSegment;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.annotation.UserChoice;
-import io.onedev.utils.ReflectionUtils;
@SuppressWarnings("serial")
public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {
diff --git a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
index a2026505bd..1cb0fa1785 100644
--- a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
@@ -11,6 +11,7 @@ import org.apache.wicket.util.convert.ConversionException;
import com.google.common.base.Preconditions;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.manager.UserManager;
@@ -24,7 +25,6 @@ import io.onedev.server.web.editable.PathSegment;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.annotation.UserChoice;
-import io.onedev.utils.ReflectionUtils;
@SuppressWarnings("serial")
public class UserSingleChoiceEditor extends PropertyEditor<String> {
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java b/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java
index 4a21267213..d5edde0999 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java
@@ -21,6 +21,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Joiner;
+import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.support.authenticator.Authenticated;
@@ -33,7 +34,6 @@ import io.onedev.server.web.editable.PropertyUpdating;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.page.admin.AdministrationPage;
-import io.onedev.utils.ExceptionUtils;
@SuppressWarnings("serial")
public class AuthenticatorPage extends AdministrationPage {
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java b/core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java
index 6d62a8bec7..ac16af5d05 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java
@@ -10,14 +10,14 @@ import org.apache.wicket.markup.html.link.ResourceLink;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.AbstractResource;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.ZipUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.SettingManager;
import io.onedev.server.manager.StorageManager;
import io.onedev.server.persistence.PersistManager;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.admin.AdministrationPage;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.ZipUtils;
@SuppressWarnings("serial")
public class DatabaseBackupPage extends AdministrationPage {
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java
index b9d603acde..50295ca40e 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java
@@ -34,6 +34,9 @@ import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
+import io.onedev.commons.utils.WordUtils;
+import io.onedev.commons.utils.matchscore.MatchScoreProvider;
+import io.onedev.commons.utils.matchscore.MatchScoreUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.manager.GroupAuthorizationManager;
@@ -57,9 +60,6 @@ import io.onedev.server.web.component.select2.ResponseFiller;
import io.onedev.server.web.component.select2.SelectToAddChoice;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.util.PagingHistorySupport;
-import io.onedev.utils.WordUtils;
-import io.onedev.utils.matchscore.MatchScoreProvider;
-import io.onedev.utils.matchscore.MatchScoreUtils;
@SuppressWarnings("serial")
public class GroupAuthorizationsPage extends GroupPage {
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java
index 934a827914..bfdbe54b95 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java
@@ -33,6 +33,8 @@ import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
+import io.onedev.commons.utils.matchscore.MatchScoreProvider;
+import io.onedev.commons.utils.matchscore.MatchScoreUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.manager.MembershipManager;
@@ -56,8 +58,6 @@ import io.onedev.server.web.component.user.choice.UserChoiceResourceReference;
import io.onedev.server.web.page.admin.user.UserProfilePage;
import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.util.userident.UserIdent;
-import io.onedev.utils.matchscore.MatchScoreProvider;
-import io.onedev.utils.matchscore.MatchScoreUtils;
@SuppressWarnings("serial")
public class GroupMembershipsPage extends GroupPage {
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java
index ce6a317323..f5beb57d01 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java
@@ -27,6 +27,7 @@ import org.unbescape.html.HtmlEscape;
import com.google.common.base.Preconditions;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.support.issue.BoardSpec;
@@ -40,7 +41,6 @@ import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.layout.SideFloating;
import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
-import io.onedev.utils.StringUtils;
import jersey.repackaged.com.google.common.collect.Sets;
@SuppressWarnings("serial")
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java
index c93e396a16..f8e6b75388 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java
@@ -26,6 +26,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Preconditions;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
@@ -38,7 +39,6 @@ import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.page.layout.SideFloating;
import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
-import io.onedev.utils.StringUtils;
import jersey.repackaged.com.google.common.collect.Sets;
@SuppressWarnings("serial")
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java b/core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
index a98a35014f..aed47bc342 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
@@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.Sets;
+import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.SettingManager;
import io.onedev.server.manager.MailManager;
@@ -24,7 +25,6 @@ import io.onedev.server.web.editable.BeanUpdating;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.page.admin.AdministrationPage;
-import io.onedev.utils.ExceptionUtils;
@SuppressWarnings("serial")
public class MailSettingPage extends AdministrationPage {
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java b/core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java
index 017024476c..c16429a99a 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java
@@ -9,9 +9,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.progress.ProgressBar;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.progress.ProgressBar.Type;
+import io.onedev.commons.utils.FileUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.page.admin.AdministrationPage;
-import io.onedev.utils.FileUtils;
@SuppressWarnings("serial")
public class ServerInformationPage extends AdministrationPage {
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.java
index 268a79b213..cba2f05ad1 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.java
@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.User;
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java
index 49035be63d..576344a9b3 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java
@@ -35,6 +35,9 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import io.onedev.commons.utils.WordUtils;
+import io.onedev.commons.utils.matchscore.MatchScoreProvider;
+import io.onedev.commons.utils.matchscore.MatchScoreUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.manager.ProjectManager;
@@ -62,9 +65,6 @@ import io.onedev.server.web.component.select2.ResponseFiller;
import io.onedev.server.web.component.select2.SelectToAddChoice;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.util.PagingHistorySupport;
-import io.onedev.utils.WordUtils;
-import io.onedev.utils.matchscore.MatchScoreProvider;
-import io.onedev.utils.matchscore.MatchScoreUtils;
@SuppressWarnings("serial")
public class UserAuthorizationsPage extends UserPage {
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java
index ed027c85f5..304cfd9605 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java
@@ -33,6 +33,8 @@ import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
+import io.onedev.commons.utils.matchscore.MatchScoreProvider;
+import io.onedev.commons.utils.matchscore.MatchScoreUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.manager.GroupManager;
@@ -52,8 +54,6 @@ import io.onedev.server.web.component.select2.ResponseFiller;
import io.onedev.server.web.component.select2.SelectToAddChoice;
import io.onedev.server.web.page.admin.group.GroupProfilePage;
import io.onedev.server.web.util.PagingHistorySupport;
-import io.onedev.utils.matchscore.MatchScoreProvider;
-import io.onedev.utils.matchscore.MatchScoreUtils;
@SuppressWarnings("serial")
public class UserMembershipsPage extends UserPage {
diff --git a/core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/core/src/main/java/io/onedev/server/web/page/base/BasePage.java
index e48763e20c..15ba8a0d7a 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/BasePage.java
+++ b/core/src/main/java/io/onedev/server/web/page/base/BasePage.java
@@ -40,7 +40,7 @@ import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import org.eclipse.jetty.servlet.ServletContextHandler;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.User;
diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.js b/core/src/main/java/io/onedev/server/web/page/base/base.js
index 6e655180c9..55bbeaffc1 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/base.js
+++ b/core/src/main/java/io/onedev/server/web/page/base/base.js
@@ -634,7 +634,7 @@ onedev.server = {
function installClearer($container) {
$container.find(".clearable-wrapper").each(function() {
var $wrapper = $(this);
- var $input = $wrapper.find("input[type=text]:visible, input:not([type]):visible");
+ var $input = $wrapper.find("input[type=text]:visible, input:not([type]):visible, textarea:visible");
if (!$input.hasClass("clearable")) {
$input.addClass("clearable");
var $clear = $("<a class='input-clear'>x</a>");
diff --git a/core/src/main/java/io/onedev/server/web/page/error/ErrorPage.java b/core/src/main/java/io/onedev/server/web/page/error/ErrorPage.java
index b47ed8bae5..eed39d049c 100644
--- a/core/src/main/java/io/onedev/server/web/page/error/ErrorPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/error/ErrorPage.java
@@ -15,13 +15,13 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Throwables;
+import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.server.OneDev;
import io.onedev.server.web.ExpectedExceptionContribution;
import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.ProjectListPage;
-import io.onedev.utils.ExceptionUtils;
@SuppressWarnings("serial")
public class ErrorPage extends BasePage {
diff --git a/core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java b/core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java
index 6d0ae320f2..6feea46a02 100644
--- a/core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java
@@ -12,6 +12,9 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import io.onedev.commons.utils.init.InitStage;
+import io.onedev.commons.utils.init.ManualConfig;
+import io.onedev.commons.utils.init.Skippable;
import io.onedev.server.OneDev;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.User;
@@ -21,9 +24,6 @@ import io.onedev.server.web.component.wizard.ManualConfigStep;
import io.onedev.server.web.component.wizard.Wizard;
import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.ProjectListPage;
-import io.onedev.utils.init.InitStage;
-import io.onedev.utils.init.ManualConfig;
-import io.onedev.utils.init.Skippable;
@SuppressWarnings("serial")
public class ServerInitPage extends BasePage {
diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 3e79ae35eb..751bc2d708 100644
--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -19,8 +19,8 @@ import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.protocol.http.request.WebClientInfo;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.launcher.loader.AppLoader;
-import io.onedev.launcher.loader.Plugin;
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.Plugin;
import io.onedev.server.OneDev;
import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.User;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
index d53a85107a..af836c40ea 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
@@ -21,6 +21,8 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import io.onedev.commons.utils.matchscore.MatchScoreProvider;
+import io.onedev.commons.utils.matchscore.MatchScoreUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.manager.ProjectManager;
@@ -33,8 +35,6 @@ import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.project.list.ProjectListPanel;
import io.onedev.server.web.page.layout.LayoutPage;
import io.onedev.server.web.util.PagingHistorySupport;
-import io.onedev.utils.matchscore.MatchScoreProvider;
-import io.onedev.utils.matchscore.MatchScoreUtils;
@SuppressWarnings("serial")
public class ProjectListPage extends LayoutPage {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index 2ba0d905e5..98a35f0c6b 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -50,9 +50,9 @@ import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
-import io.onedev.jsymbol.TokenPosition;
-import io.onedev.jsymbol.util.NoAntiCacheImage;
-import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.commons.jsymbol.TokenPosition;
+import io.onedev.commons.jsymbol.util.NoAntiCacheImage;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.server.OneDev;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.BlobContent;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java b/core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
index f39da15692..0d96810620 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
@@ -38,6 +38,7 @@ import org.eclipse.jgit.lib.FileMode;
import com.google.common.base.Splitter;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.BlobIdentFilter;
import io.onedev.server.git.GitUtils;
@@ -50,7 +51,6 @@ import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public class BlobNavigator extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
index 50161308b2..30fdf466c7 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
@@ -10,7 +10,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.eclipse.jgit.revwalk.RevCommit;
-import io.onedev.jsymbol.TokenPosition;
+import io.onedev.commons.jsymbol.TokenPosition;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.CodeComment;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererContribution.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererContribution.java
index c2fa23a06a..a33a9ab4d1 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererContribution.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererContribution.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import javax.annotation.Nullable;
-import io.onedev.launcher.loader.ExtensionPoint;
+import io.onedev.commons.launcher.loader.ExtensionPoint;
import io.onedev.server.web.PrioritizedComponentRenderer;
@ExtensionPoint
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
index 5b22e2c60a..16c15c2d44 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
@@ -42,6 +42,7 @@ import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.commons.utils.Provider;
import io.onedev.server.OneDev;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.Blob;
@@ -69,7 +70,6 @@ import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.util.ajaxlistener.TrackViewStateListener;
-import io.onedev.utils.Provider;
@SuppressWarnings("serial")
public class CommitOptionPanel extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java
index 2cd862c6bb..b361d65140 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java
@@ -26,6 +26,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;
+import io.onedev.commons.utils.Provider;
import io.onedev.server.util.ContentDetector;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
@@ -35,7 +36,6 @@ import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
import io.onedev.server.web.page.project.blob.render.commitoption.CommitOptionPanel;
import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditSupport;
import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.utils.Provider;
@SuppressWarnings("serial")
public abstract class BlobEditPanel extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java
index c2bac29156..d7963b3f99 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java
@@ -19,6 +19,7 @@ import org.apache.wicket.model.Model;
import com.google.common.base.Charsets;
import com.google.common.base.Throwables;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.Job;
import io.onedev.server.migration.VersionedDocument;
@@ -27,7 +28,6 @@ import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public class CISpecEditPanel extends FormComponentPanel<byte[]> {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java
index 4743cb06be..d3499afd46 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java
@@ -30,6 +30,7 @@ import io.onedev.server.ci.Dependency;
import io.onedev.server.ci.Job;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
+import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.editable.BeanEditor;
@@ -139,7 +140,7 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>
@Override
public void populateItem(Item<ICellPopulator<Dependency>> cellItem, String componentId, IModel<Dependency> rowModel) {
if (StringUtils.isNotBlank(rowModel.getObject().getArtifacts()))
- cellItem.add(new Label(componentId, rowModel.getObject().getArtifacts()));
+ cellItem.add(new MultilineLabel(componentId, rowModel.getObject().getArtifacts()));
else
cellItem.add(new Label(componentId, "<i>Not specified</i>").setEscapeModelStrings(false));
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditSupport.java
index b3412cd118..c7a27ceaf7 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditSupport.java
@@ -6,10 +6,10 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.ci.Dependency;
import io.onedev.server.ci.Job;
import io.onedev.server.web.editable.EditSupport;
-import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -22,7 +22,7 @@ public class DependencyListEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
if (descriptor.getBeanClass() == Job.class && List.class.isAssignableFrom(descriptor.getPropertyClass())) {
- final Class<?> elementClass = EditableUtils.getElementClass(descriptor.getPropertyGetter().getGenericReturnType());
+ final Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());
if (elementClass == Dependency.class) {
return new PropertyContext<List<Serializable>>(descriptor) {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java
index 0b6c39188e..c4860a994c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java
@@ -25,6 +25,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import io.onedev.server.ci.Dependency;
+import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.layout.SideFloating;
import jersey.repackaged.com.google.common.collect.Sets;
@@ -72,7 +73,7 @@ public class DependencyListViewPanel extends Panel {
protected Component newLabel(String componentId) {
String artifacts = rowModel.getObject().getArtifacts();
if (StringUtils.isNotBlank(artifacts))
- return new Label(componentId, artifacts);
+ return new MultilineLabel(componentId, artifacts);
else
return new Label(componentId, "<i>Not specified</i>").setEscapeModelStrings(false);
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditPanel.java
index 6ef89f1c13..c2257cb04f 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditPanel.java
@@ -24,6 +24,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
@@ -35,7 +36,6 @@ import io.onedev.server.web.editable.PathSegment;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyUpdating;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditSupport.java
index f9c9e3f3b0..e1f3020897 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditSupport.java
@@ -6,10 +6,10 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.ci.Job;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.EditSupport;
-import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -22,7 +22,7 @@ public class ParamListEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
if (descriptor.getBeanClass() == Job.class && List.class.isAssignableFrom(descriptor.getPropertyClass())) {
- final Class<?> elementClass = EditableUtils.getElementClass(descriptor.getPropertyGetter().getGenericReturnType());
+ final Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());
if (elementClass == InputSpec.class) {
return new PropertyContext<List<Serializable>>(descriptor) {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListViewPanel.java
index 067b7f178d..0e3683db55 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListViewPanel.java
@@ -23,11 +23,11 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.page.layout.SideFloating;
-import io.onedev.utils.StringUtils;
import jersey.repackaged.com.google.common.collect.Sets;
@SuppressWarnings("serial")
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditSupport.java
index d22eaaab35..6d7d00038b 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditSupport.java
@@ -6,10 +6,10 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+import io.onedev.commons.utils.ReflectionUtils;
import io.onedev.server.ci.Job;
import io.onedev.server.ci.jobtrigger.JobTrigger;
import io.onedev.server.web.editable.EditSupport;
-import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -22,7 +22,7 @@ public class TriggerListEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
if (descriptor.getBeanClass() == Job.class && List.class.isAssignableFrom(descriptor.getPropertyClass())) {
- final Class<?> elementClass = EditableUtils.getElementClass(descriptor.getPropertyGetter().getGenericReturnType());
+ final Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());
if (elementClass == JobTrigger.class) {
return new PropertyContext<List<Serializable>>(descriptor) {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
index b8ba228f1e..f4baaaf917 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
@@ -10,13 +10,13 @@ import org.apache.wicket.model.Model;
import com.google.common.base.Charsets;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.MarkdownManager;
import io.onedev.server.util.ContentDetector;
import io.onedev.server.web.component.markdown.MarkdownEditor;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
abstract class MarkdownBlobEditor extends FormComponentPanel<byte[]> {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java
index aa8f395914..c092c82f65 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java
@@ -8,8 +8,8 @@ import org.apache.wicket.model.Model;
import com.google.common.base.Charsets;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.ContentDetector;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
class SourceFormComponent extends FormComponentPanel<byte[]> {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html
index c8d569e820..1680acc44f 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html
@@ -4,7 +4,7 @@
<div class="ui-resizable-handle ui-resizable-e"></div>
<div class="content">
<div wicket:id="head" class="head clearfix">
- <a wicket:id="context" class="pull-left context close" title="Show this comment by comparing with specified revision"><i class="fa fa-ext fa-file-diff"></i></a>
+ <a wicket:id="context" class="pull-left context close" title="Compare with another revision"><i class="fa fa-ext fa-file-diff"></i></a>
<a wicket:id="locate" class="pull-left locate close" title="Locate marked text of this comment"><i class="fa fa-hand-o-right"></i></a>
<a wicket:id="close" class="pull-left close" title="Hide comment"><i class="fa fa-times"></i></a>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
index 02a7cd6367..31925acaff 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
@@ -56,10 +56,14 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.jsymbol.Symbol;
-import io.onedev.jsymbol.SymbolExtractor;
-import io.onedev.jsymbol.SymbolExtractorRegistry;
-import io.onedev.jsymbol.TokenPosition;
+import io.onedev.commons.jsymbol.Symbol;
+import io.onedev.commons.jsymbol.SymbolExtractor;
+import io.onedev.commons.jsymbol.SymbolExtractorRegistry;
+import io.onedev.commons.jsymbol.TokenPosition;
+import io.onedev.commons.utils.Range;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.matchscore.MatchScoreProvider;
+import io.onedev.commons.utils.matchscore.MatchScoreUtils;
import io.onedev.server.OneDev;
import io.onedev.server.git.BlameBlock;
import io.onedev.server.git.Blob;
@@ -79,6 +83,7 @@ import io.onedev.server.search.code.SearchManager;
import io.onedev.server.search.code.hit.QueryHit;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior;
import io.onedev.server.web.component.codecomment.CodeCommentPanel;
@@ -104,10 +109,6 @@ import io.onedev.server.web.util.ProjectAttachmentSupport;
import io.onedev.server.web.util.WicketUtils;
import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.websocket.PageDataChanged;
-import io.onedev.utils.Range;
-import io.onedev.utils.StringUtils;
-import io.onedev.utils.matchscore.MatchScoreProvider;
-import io.onedev.utils.matchscore.MatchScoreUtils;
/**
* Make sure to add only one source view panel per page
@@ -763,7 +764,8 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe
private CompareContext getCompareContext() {
CompareContext compareContext = new CompareContext();
compareContext.setCompareCommit(context.getCommit().name());
- compareContext.setPathFilter(context.getBlobIdent().path);
+ if (context.getBlobIdent().path != null)
+ compareContext.setPathFilter(PatternSet.quoteIfNecessary(context.getBlobIdent().path));
return compareContext;
}
@@ -843,7 +845,8 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe
blameInfo.abbreviatedHash = GitUtils.abbreviateSHA(blame.getCommit().getHash(), 7);
CommitDetailPage.State state = new CommitDetailPage.State();
state.revision = blame.getCommit().getHash();
- state.pathFilter = context.getBlobIdent().path;
+ if (context.getBlobIdent().path != null)
+ state.pathFilter = PatternSet.quoteIfNecessary(context.getBlobIdent().path);
PageParameters params = CommitDetailPage.paramsOf(context.getProject(), state);
blameInfo.url = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();
blameInfo.ranges = blame.getRanges();
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java
index bc1326c8f7..288bf6d0b9 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java
@@ -14,13 +14,13 @@ import org.eclipse.jgit.revwalk.RevTree;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.TreeWalk;
+import io.onedev.commons.utils.PathUtils;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;
-import io.onedev.utils.PathUtils;
@SuppressWarnings("serial")
public class SymbolLinkPanel extends BlobViewPanel {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
index 71094d2c86..d6209bf013 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
@@ -23,6 +23,7 @@ import org.apache.wicket.model.Model;
import com.google.common.base.Preconditions;
+import io.onedev.commons.utils.FileUtils;
import io.onedev.server.OneDev;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.manager.ProjectManager;
@@ -37,7 +38,6 @@ import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.util.ajaxlistener.TrackViewStateListener;
import io.onedev.server.web.util.resource.RawBlobResource;
import io.onedev.server.web.util.resource.RawBlobResourceReference;
-import io.onedev.utils.FileUtils;
@SuppressWarnings("serial")
public abstract class BlobViewPanel extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java
index dcf4cb6a9b..e80443337c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java
@@ -35,6 +35,7 @@ import org.apache.wicket.validation.IValidationError;
import org.eclipse.jgit.lib.ObjectId;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Project;
@@ -51,7 +52,6 @@ import io.onedev.server.web.component.tabbable.AjaxActionTab;
import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel;
-import io.onedev.utils.StringUtils;
import jersey.repackaged.com.google.common.base.Throwables;
@SuppressWarnings("serial")
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java
index e31135e1f5..4c33a1a267 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java
@@ -32,6 +32,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Project;
@@ -48,7 +49,6 @@ import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel;
import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public abstract class QuickSearchPanel extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/MatchedBlob.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/MatchedBlob.java
index 78d4d8ef7e..6d4de5f190 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/MatchedBlob.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/MatchedBlob.java
@@ -3,8 +3,8 @@ package io.onedev.server.web.page.project.blob.search.result;
import java.io.Serializable;
import java.util.List;
+import io.onedev.commons.utils.Range;
import io.onedev.server.search.code.hit.QueryHit;
-import io.onedev.utils.Range;
public class MatchedBlob implements Serializable {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
index 63df5dab5e..c7aba9fdf2 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
@@ -28,8 +28,9 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.FileMode;
-import io.onedev.jsymbol.TokenPosition;
-import io.onedev.jsymbol.util.HighlightableLabel;
+import io.onedev.commons.jsymbol.TokenPosition;
+import io.onedev.commons.jsymbol.util.HighlightableLabel;
+import io.onedev.commons.utils.Range;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.support.TextRange;
import io.onedev.server.search.code.hit.FileHit;
@@ -38,7 +39,6 @@ import io.onedev.server.search.code.hit.TextHit;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
-import io.onedev.utils.Range;
@SuppressWarnings("serial")
public abstract class SearchResultPanel extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.java b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.java
index 2da1a81018..fe9225ec72 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.wicket.Component;
@@ -12,11 +13,15 @@ import org.apache.wicket.model.IModel;
import com.google.common.base.Optional;
import com.google.common.collect.Lists;
-import io.onedev.codeassist.FenceAware;
-import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
-import io.onedev.codeassist.parser.TerminalExpect;
-import io.onedev.codeassist.parser.ParseExpect;
+import io.onedev.commons.codeassist.FenceAware;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.commons.codeassist.parser.ParseExpect;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
+import io.onedev.commons.utils.Range;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.stringmatch.PatternApplied;
+import io.onedev.commons.utils.stringmatch.WildcardUtils;
import io.onedev.server.OneDev;
import io.onedev.server.git.NameAndEmail;
import io.onedev.server.manager.CommitInfoManager;
@@ -25,10 +30,6 @@ import io.onedev.server.search.commit.CommitQueryParser;
import io.onedev.server.util.Constants;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
-import io.onedev.utils.Range;
-import io.onedev.utils.StringUtils;
-import io.onedev.utils.stringmatch.PatternApplied;
-import io.onedev.utils.stringmatch.WildcardUtils;
@SuppressWarnings("serial")
public class CommitQueryBehavior extends ANTLRAssistBehavior {
@@ -57,6 +58,10 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
projectModel.detach();
}
+ private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {
+ return suggestions.stream().map(it->it.escape(ESCAPE_CHARS)).collect(Collectors.toList());
+ }
+
@Override
protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
@@ -72,13 +77,13 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
Project project = projectModel.getObject();
switch (tokenType) {
case CommitQueryParser.BRANCH:
- suggestions.addAll(SuggestionUtils.suggestBranch(project, unfencedMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggestBranches(project, unfencedMatchWith)));
break;
case CommitQueryParser.TAG:
- suggestions.addAll(SuggestionUtils.suggestTag(project, unfencedMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggestTags(project, unfencedMatchWith)));
break;
case CommitQueryParser.BUILD:
- suggestions.addAll(SuggestionUtils.suggestBuild(project, unfencedMatchWith, true, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedMatchWith, true)));
break;
case CommitQueryParser.AUTHOR:
case CommitQueryParser.COMMITTER:
@@ -106,11 +111,11 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
List<String> candidates = new ArrayList<>(DATE_EXAMPLES);
candidates.add(Constants.DATETIME_FORMATTER.print(System.currentTimeMillis()));
candidates.add(Constants.DATE_FORMATTER.print(System.currentTimeMillis()));
- suggestions.addAll(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith, null));
+ suggestions.addAll(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith));
CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));
break;
case CommitQueryParser.PATH:
- suggestions.addAll(SuggestionUtils.suggestPath(projectModel.getObject(), unfencedMatchWith, ESCAPE_CHARS));
+ suggestions.addAll(escape(SuggestionUtils.suggestBlobs(projectModel.getObject(), unfencedMatchWith)));
break;
default:
return null;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
index 2de5b57cf7..95d536e6a7 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
@@ -46,6 +46,7 @@ import com.google.common.base.Optional;
import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.exception.OneException;
import io.onedev.server.git.BlobIdent;
@@ -65,6 +66,7 @@ import io.onedev.server.search.commit.CommitQueryParser.QueryContext;
import io.onedev.server.search.commit.CommitQueryUtils;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Constants;
+import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.build.status.BuildsStatusPanel;
import io.onedev.server.web.component.commit.graph.CommitGraphResourceReference;
@@ -84,7 +86,6 @@ import io.onedev.server.web.page.project.savedquery.SavedQueriesOpened;
import io.onedev.server.web.page.project.savedquery.SavedQueriesPanel;
import io.onedev.server.web.util.VisibleVisitor;
import io.onedev.server.web.util.model.CommitRefsModel;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public class ProjectCommitsPage extends ProjectPage {
@@ -609,7 +610,8 @@ public class ProjectCommitsPage extends ProjectPage {
RevisionComparePage.State compareState = new RevisionComparePage.State();
compareState.leftSide = new ProjectAndRevision(getProject(), commit.name());
compareState.rightSide = new ProjectAndRevision(getProject(), state.compareWith);
- compareState.pathFilter = path;
+ if (path != null)
+ compareState.pathFilter = PatternSet.quoteIfNecessary(path);
compareState.tabPanel = RevisionComparePage.TabPanel.CHANGES;
params = RevisionComparePage.paramsOf(getProject(), compareState);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
index 6732374bf7..c06c82b054 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
@@ -40,6 +40,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.manager.PullRequestManager;
@@ -68,7 +69,6 @@ import io.onedev.server.web.page.project.savedquery.SavedQueriesPanel;
import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.VisibleVisitor;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public class PullRequestListPage extends ProjectPage {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java
index ce1f3edd57..cd61662722 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java
@@ -37,6 +37,9 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import io.onedev.commons.utils.WordUtils;
+import io.onedev.commons.utils.matchscore.MatchScoreProvider;
+import io.onedev.commons.utils.matchscore.MatchScoreUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.manager.UserAuthorizationManager;
@@ -68,9 +71,6 @@ import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.page.project.setting.ProjectSettingPage;
import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.util.userident.UserIdent;
-import io.onedev.utils.WordUtils;
-import io.onedev.utils.matchscore.MatchScoreProvider;
-import io.onedev.utils.matchscore.MatchScoreUtils;
@SuppressWarnings("serial")
public class ProjectAuthorizationsPage extends ProjectSettingPage {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
index 712502d98f..5a5fe4a950 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
@@ -34,6 +34,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevTag;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
@@ -60,7 +61,6 @@ import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
-import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public class ProjectTagsPage extends ProjectPage {
diff --git a/core/src/main/java/io/onedev/server/web/page/security/ForgetPage.java b/core/src/main/java/io/onedev/server/web/page/security/ForgetPage.java
index c2c6b4c300..0f18736f86 100644
--- a/core/src/main/java/io/onedev/server/web/page/security/ForgetPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/security/ForgetPage.java
@@ -14,7 +14,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.manager.SettingManager;
import io.onedev.server.manager.MailManager;
diff --git a/core/src/main/java/io/onedev/server/web/page/security/LoginPage.java b/core/src/main/java/io/onedev/server/web/page/security/LoginPage.java
index 74c4de5395..1a59659d1d 100644
--- a/core/src/main/java/io/onedev/server/web/page/security/LoginPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/security/LoginPage.java
@@ -19,7 +19,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.manager.MailManager;
import io.onedev.server.manager.SettingManager;
diff --git a/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java b/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java
index 516096b4ec..8aae69d663 100644
--- a/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java
@@ -8,7 +8,7 @@ import org.apache.wicket.markup.html.form.SubmitLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.manager.SettingManager;
import io.onedev.server.manager.UserManager;
diff --git a/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java b/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java
index e8e08c9864..6301b887dd 100644
--- a/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java
+++ b/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java
@@ -12,6 +12,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Preconditions;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.manager.AttachmentManager;
import io.onedev.server.manager.ProjectManager;
@@ -22,9 +25,6 @@ import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.util.resource.AttachmentResource;
import io.onedev.server.web.util.resource.AttachmentResourceReference;
-import io.onedev.utils.ExceptionUtils;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.StringUtils;
public class ProjectAttachmentSupport implements AttachmentSupport {
diff --git a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index 0a724ee20f..86ba3bd1e9 100644
--- a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -9,14 +9,15 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nullable;
-
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Preconditions;
import edu.emory.mathcs.backport.java.util.Collections;
-import io.onedev.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.utils.Range;
+import io.onedev.commons.utils.stringmatch.PatternApplied;
+import io.onedev.commons.utils.stringmatch.WildcardUtils;
import io.onedev.server.OneDev;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
@@ -34,64 +35,47 @@ import io.onedev.server.security.permission.ProjectPrivilege;
import io.onedev.server.util.facade.ConfigurationFacade;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
-import io.onedev.utils.Range;
-import io.onedev.utils.stringmatch.PatternApplied;
-import io.onedev.utils.stringmatch.WildcardUtils;
public class SuggestionUtils {
- public static List<InputSuggestion> suggest(List<String> candidates, String matchWith, @Nullable String escapeChars) {
+ public static List<InputSuggestion> suggest(List<String> candidates, String matchWith) {
matchWith = matchWith.toLowerCase();
List<InputSuggestion> suggestions = new ArrayList<>();
for (String candidate: candidates) {
- Range match = Range.match(candidate, matchWith, true, false, true);
- if (match != null) {
- InputSuggestion suggestion = new InputSuggestion(candidate, null, match);
- if (escapeChars != null)
- suggestion = suggestion.escape(escapeChars);
- suggestions.add(suggestion);
- }
+ Range match = Range.match(candidate, matchWith, true, false, false);
+ if (match != null)
+ suggestions.add(new InputSuggestion(candidate, null, match));
}
return suggestions;
}
- public static List<InputSuggestion> suggestBranch(Project project, String matchWith, @Nullable String escapeChars) {
+ public static List<InputSuggestion> suggestBranches(Project project, String matchWith) {
matchWith = matchWith.toLowerCase();
int numSuggestions = 0;
List<InputSuggestion> suggestions = new ArrayList<>();
for (RefInfo ref: project.getBranches()) {
String branch = GitUtils.ref2branch(ref.getRef().getName());
int index = branch.toLowerCase().indexOf(matchWith);
- if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS) {
- Range match = new Range(index, index+matchWith.length());
- InputSuggestion suggestion = new InputSuggestion(branch, match);
- if (escapeChars != null)
- suggestion = suggestion.escape(escapeChars);
- suggestions.add(suggestion);
- }
+ if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS)
+ suggestions.add(new InputSuggestion(branch, new Range(index, index+matchWith.length())));
}
return suggestions;
}
- public static List<InputSuggestion> suggestTag(Project project, String matchWith, @Nullable String escapeChars) {
+ public static List<InputSuggestion> suggestTags(Project project, String matchWith) {
matchWith = matchWith.toLowerCase();
int numSuggestions = 0;
List<InputSuggestion> suggestions = new ArrayList<>();
for (RefInfo ref: project.getTags()) {
String tag = GitUtils.ref2tag(ref.getRef().getName());
int index = tag.toLowerCase().indexOf(matchWith);
- if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS) {
- Range match = new Range(index, index+matchWith.length());
- InputSuggestion suggestion = new InputSuggestion(tag, match);
- if (escapeChars != null)
- suggestions.add(suggestion.escape(escapeChars));
- suggestions.add(suggestion);
- }
+ if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS)
+ suggestions.add(new InputSuggestion(tag, new Range(index, index+matchWith.length())));
}
return suggestions;
}
- public static List<InputSuggestion> suggestUser(String matchWith, @Nullable String escapeChars) {
+ public static List<InputSuggestion> suggestUsers(String matchWith) {
matchWith = matchWith.toLowerCase();
List<InputSuggestion> suggestions = new ArrayList<>();
for (UserFacade user: OneDev.getInstance(CacheManager.class).getUsers().values()) {
@@ -102,21 +86,21 @@ public class SuggestionUtils {
description = user.getDisplayName();
else
description = null;
- suggestions.add(new InputSuggestion(user.getName(), description, match).escape(escapeChars));
+ suggestions.add(new InputSuggestion(user.getName(), description, match));
}
}
return suggestions;
}
- public static List<InputSuggestion> suggestIssue(Project project, String matchWith, @Nullable String escapeChars) {
+ public static List<InputSuggestion> suggestIssues(Project project, String matchWith) {
matchWith = matchWith.toLowerCase();
List<InputSuggestion> suggestions = new ArrayList<>();
for (Issue issue: OneDev.getInstance(IssueManager.class).query(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS))
- suggestions.add(new InputSuggestion("#" + issue.getNumber(), issue.getTitle(), null).escape(escapeChars));
+ suggestions.add(new InputSuggestion("#" + issue.getNumber(), issue.getTitle(), null));
return suggestions;
}
- public static List<InputSuggestion> suggestBuild(Project project, String matchWith, boolean withConfiguration, @Nullable String escapeChars) {
+ public static List<InputSuggestion> suggestBuilds(Project project, String matchWith, boolean withConfiguration) {
matchWith = matchWith.toLowerCase();
List<InputSuggestion> suggestions = new ArrayList<>();
for (Build build: OneDev.getInstance(BuildManager.class).query(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS)) {
@@ -134,15 +118,12 @@ public class SuggestionUtils {
Range match = Range.match(build.getVersion(), matchWith, true, false, true);
suggestion = new InputSuggestion(build.getVersion(), null, match);
}
- if (escapeChars != null)
- suggestion = suggestion.escape(escapeChars);
suggestions.add(suggestion);
}
return suggestions;
}
- public static List<InputSuggestion> suggestUser(Project project, ProjectPrivilege privilege, String matchWith,
- @Nullable String escapeChars) {
+ public static List<InputSuggestion> suggestUsers(Project project, ProjectPrivilege privilege, String matchWith) {
matchWith = matchWith.toLowerCase();
int numSuggestions = 0;
List<InputSuggestion> suggestions = new ArrayList<>();
@@ -151,38 +132,30 @@ public class SuggestionUtils {
int index = name.toLowerCase().indexOf(matchWith);
if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS) {
Range match = new Range(index, index+matchWith.length());
- InputSuggestion suggestion = new InputSuggestion(name, user.getDisplayName(), match);
- if (escapeChars != null)
- suggestion = suggestion.escape(escapeChars);
- suggestions.add(suggestion);
+ suggestions.add(new InputSuggestion(name, user.getDisplayName(), match));
}
}
return suggestions;
}
- public static List<InputSuggestion> suggestGroup(String matchWith, @Nullable String escapeChars) {
+ public static List<InputSuggestion> suggestGroups(String matchWith) {
matchWith = matchWith.toLowerCase();
List<InputSuggestion> suggestions = new ArrayList<>();
for (Group group: OneDev.getInstance(GroupManager.class).query()) {
String name = group.getName();
int index = name.toLowerCase().indexOf(matchWith);
- if (index != -1) {
- Range match = new Range(index, index+matchWith.length());
- InputSuggestion suggestion = new InputSuggestion(name, match);
- if (escapeChars != null)
- suggestion = suggestion.escape(escapeChars);
- suggestions.add(suggestion);
- }
+ if (index != -1)
+ suggestions.add(new InputSuggestion(name, new Range(index, index+matchWith.length())));
}
return suggestions;
}
- public static List<InputSuggestion> suggestPath(Project project, String matchWith, @Nullable String escapeChars) {
+ public static List<InputSuggestion> suggestBlobs(Project project, String matchWith) {
CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);
- return suggestPath(commitInfoManager.getFiles(project), matchWith, escapeChars);
+ return suggestPaths(commitInfoManager.getFiles(project), matchWith);
}
- public static List<InputSuggestion> suggestConfiguration(Project project, String matchWith, @Nullable String escapeChars) {
+ public static List<InputSuggestion> suggestConfigurations(Project project, String matchWith) {
matchWith = matchWith.toLowerCase();
List<InputSuggestion> suggestions = new ArrayList<>();
List<ConfigurationFacade> configurations = new ArrayList<>(OneDev.getInstance(CacheManager.class).getConfigurations().values());
@@ -198,12 +171,8 @@ public class SuggestionUtils {
if (matchWith.contains(Build.FQN_SEPARATOR))
matchWith = StringUtils.substringAfter(matchWith, Build.FQN_SEPARATOR);
Range match = Range.match(configuration.getName(), matchWith, true, false, true);
- if (match != null) {
- InputSuggestion suggestion = new InputSuggestion(configuration.getName(), null, match);
- if (escapeChars != null)
- suggestion = suggestion.escape(escapeChars);
- suggestions.add(suggestion);
- }
+ if (match != null)
+ suggestions.add(new InputSuggestion(configuration.getName(), null, match));
}
return suggestions;
}
@@ -223,7 +192,7 @@ public class SuggestionUtils {
return children;
}
- public static List<InputSuggestion> suggestPath(List<String> files, String matchWith, @Nullable String escapeChars) {
+ public static List<InputSuggestion> suggestPaths(List<String> files, String matchWith) {
matchWith = matchWith.toLowerCase();
List<InputSuggestion> suggestions = new ArrayList<>();
@@ -275,10 +244,7 @@ public class SuggestionUtils {
caret = text.length();
else
caret = -1;
- InputSuggestion suggestion = new InputSuggestion(text, caret, null, entry.getValue());
- if (escapeChars != null)
- suggestion = suggestion.escape(escapeChars);
- suggestions.add(suggestion);
+ suggestions.add(new InputSuggestion(text, caret, null, entry.getValue()));
}
return suggestions;
diff --git a/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java b/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java
index 3d8d745815..cd63d6b6ed 100644
--- a/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java
+++ b/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java
@@ -15,7 +15,10 @@ import org.apache.commons.codec.binary.Hex;
import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
-import io.onedev.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.LockUtils;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.manager.SettingManager;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.User;
@@ -27,9 +30,6 @@ import io.onedev.server.util.userident.RemovedUserIdent;
import io.onedev.server.util.userident.SystemUserIdent;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.component.avatarupload.AvatarUploadField;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.LockUtils;
-import io.onedev.utils.StringUtils;
@Singleton
public class DefaultAvatarManager implements AvatarManager {
diff --git a/core/src/main/java/io/onedev/server/web/util/markdown/CommitProcessor.java b/core/src/main/java/io/onedev/server/web/util/markdown/CommitProcessor.java
index a5240ceb74..841e3265df 100644
--- a/core/src/main/java/io/onedev/server/web/util/markdown/CommitProcessor.java
+++ b/core/src/main/java/io/onedev/server/web/util/markdown/CommitProcessor.java
@@ -12,12 +12,12 @@ import org.jsoup.select.NodeTraversor;
import com.google.common.collect.ImmutableSet;
+import io.onedev.commons.utils.HtmlUtils;
+import io.onedev.commons.utils.TextNodeVisitor;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
import io.onedev.server.util.markdown.MarkdownProcessor;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
-import io.onedev.utils.HtmlUtils;
-import io.onedev.utils.TextNodeVisitor;
public class CommitProcessor implements MarkdownProcessor {
diff --git a/core/src/main/java/io/onedev/server/web/util/markdown/UrlProcessor.java b/core/src/main/java/io/onedev/server/web/util/markdown/UrlProcessor.java
index 967f99a89b..4d7fa3d7da 100644
--- a/core/src/main/java/io/onedev/server/web/util/markdown/UrlProcessor.java
+++ b/core/src/main/java/io/onedev/server/web/util/markdown/UrlProcessor.java
@@ -17,6 +17,8 @@ import org.jsoup.select.NodeVisitor;
import com.google.common.base.Charsets;
+import io.onedev.commons.utils.PathUtils;
+import io.onedev.commons.utils.UrlUtils;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
@@ -25,8 +27,6 @@ import io.onedev.server.util.markdown.MarkdownProcessor;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
-import io.onedev.utils.PathUtils;
-import io.onedev.utils.UrlUtils;
public class UrlProcessor implements MarkdownProcessor {
diff --git a/core/src/main/java/io/onedev/server/web/util/model/EntityModel.java b/core/src/main/java/io/onedev/server/web/util/model/EntityModel.java
index eb6e412a92..b0b1b74aa3 100644
--- a/core/src/main/java/io/onedev/server/web/util/model/EntityModel.java
+++ b/core/src/main/java/io/onedev/server/web/util/model/EntityModel.java
@@ -4,10 +4,10 @@ import javax.annotation.Nullable;
import org.apache.wicket.model.LoadableDetachableModel;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.utils.ClassUtils;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.utils.ClassUtils;
public class EntityModel<T extends AbstractEntity> extends LoadableDetachableModel<T> {
diff --git a/core/src/main/java/io/onedev/server/web/util/resource/ServerLogResource.java b/core/src/main/java/io/onedev/server/web/util/resource/ServerLogResource.java
index e1726712ba..451f6e077f 100644
--- a/core/src/main/java/io/onedev/server/web/util/resource/ServerLogResource.java
+++ b/core/src/main/java/io/onedev/server/web/util/resource/ServerLogResource.java
@@ -11,9 +11,9 @@ import org.apache.shiro.authz.UnauthorizedException;
import org.apache.tika.mime.MimeTypes;
import org.apache.wicket.request.resource.AbstractResource;
-import io.onedev.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.utils.FileUtils;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.utils.FileUtils;
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
diff --git a/core/src/main/java/io/onedev/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java b/core/src/main/java/io/onedev/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java
index 52694aa5a9..90c6cd6311 100644
--- a/core/src/main/java/io/onedev/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java
+++ b/core/src/main/java/io/onedev/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java
@@ -15,7 +15,7 @@ import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.request.resource.ResourceReference.Key;
import org.apache.wicket.resource.bundles.ConcatResourceBundleReference;
-import io.onedev.utils.PathUtils;
+import io.onedev.commons.utils.PathUtils;
/*
* When css is bundled, and its access url can be changed (unless its resource is annotated with @ResourceBundle),
diff --git a/core/src/main/java/io/onedev/server/web/util/resourcebundle/ResourceBundleReferences.java b/core/src/main/java/io/onedev/server/web/util/resourcebundle/ResourceBundleReferences.java
index 765e5605bf..8bdae23daa 100644
--- a/core/src/main/java/io/onedev/server/web/util/resourcebundle/ResourceBundleReferences.java
+++ b/core/src/main/java/io/onedev/server/web/util/resourcebundle/ResourceBundleReferences.java
@@ -25,9 +25,9 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.resource.bundles.ConcatResourceBundleReference;
-import io.onedev.utils.ClassUtils;
-import io.onedev.utils.DependencyAware;
-import io.onedev.utils.DependencyUtils;
+import io.onedev.commons.utils.ClassUtils;
+import io.onedev.commons.utils.DependencyAware;
+import io.onedev.commons.utils.DependencyUtils;
public class ResourceBundleReferences {
diff --git a/core/src/main/java/io/onedev/server/web/websocket/CodeCommentEventBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/CodeCommentEventBroadcaster.java
index a0bcc5e385..14ac8b663d 100644
--- a/core/src/main/java/io/onedev/server/web/websocket/CodeCommentEventBroadcaster.java
+++ b/core/src/main/java/io/onedev/server/web/websocket/CodeCommentEventBroadcaster.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.websocket;
import javax.inject.Inject;
import javax.inject.Singleton;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.event.codecomment.CodeCommentEvent;
import io.onedev.server.model.CodeComment;
import io.onedev.server.web.util.WicketUtils;
diff --git a/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java
index 71998078e6..239e01e65b 100644
--- a/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java
+++ b/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.websocket;
import javax.inject.Inject;
import javax.inject.Singleton;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.search.code.CommitIndexed;
@Singleton
diff --git a/core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java
index 93e76d19e8..03f59b379d 100644
--- a/core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java
+++ b/core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.websocket;
import javax.inject.Inject;
import javax.inject.Singleton;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.event.issue.IssueDeleted;
import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.model.Issue;
diff --git a/core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java
index 634c0c2ff5..ce1a862700 100644
--- a/core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java
+++ b/core/src/main/java/io/onedev/server/web/websocket/PullRequestEventBroadcaster.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.websocket;
import javax.inject.Inject;
import javax.inject.Singleton;
-import io.onedev.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.event.pullrequest.PullRequestDeleted;
import io.onedev.server.event.pullrequest.PullRequestEvent;
import io.onedev.server.model.PullRequest;
diff --git a/core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java b/core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java
index 1ea9e83889..94695e4aaa 100644
--- a/core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java
+++ b/core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java
@@ -27,7 +27,7 @@ import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.persistence.UnitOfWork;
diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java b/core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java
index 5c978384a5..3c3b94a238 100644
--- a/core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java
@@ -27,9 +27,9 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.eclipse.jgit.util.RawParseUtils;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.git.GitUtils;
-import io.onedev.utils.ExceptionUtils;
-import io.onedev.utils.StringUtils;
/**
* This class calculates last commits of children of a git tree.
diff --git a/core/src/test/java/io/onedev/server/entityquery/codecomment/TestCodeCommentQueryGrammar.java b/core/src/test/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryGrammarTest.java
similarity index 81%
rename from core/src/test/java/io/onedev/server/entityquery/codecomment/TestCodeCommentQueryGrammar.java
rename to core/src/test/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryGrammarTest.java
index b2bae52fb9..f6beb417b3 100644
--- a/core/src/test/java/io/onedev/server/entityquery/codecomment/TestCodeCommentQueryGrammar.java
+++ b/core/src/test/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryGrammarTest.java
@@ -6,15 +6,15 @@ import java.util.List;
import org.junit.Test;
-import io.onedev.codeassist.CodeAssist;
-import io.onedev.codeassist.FenceAware;
-import io.onedev.codeassist.InputStatus;
-import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
-import io.onedev.codeassist.parser.TerminalExpect;
+import io.onedev.commons.codeassist.CodeAssist;
+import io.onedev.commons.codeassist.FenceAware;
+import io.onedev.commons.codeassist.InputStatus;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
-public class TestCodeCommentQueryGrammar {
+public class CodeCommentQueryGrammarTest {
private CodeAssist codeAssist = new CodeAssist(CodeCommentQueryLexer.class, false) {
diff --git a/core/src/test/java/io/onedev/server/entityquery/issue/TestIssueQueryGrammar.java b/core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.java
similarity index 81%
rename from core/src/test/java/io/onedev/server/entityquery/issue/TestIssueQueryGrammar.java
rename to core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.java
index d5f8521c74..c0ddfd5353 100644
--- a/core/src/test/java/io/onedev/server/entityquery/issue/TestIssueQueryGrammar.java
+++ b/core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.java
@@ -6,15 +6,15 @@ import java.util.List;
import org.junit.Test;
-import io.onedev.codeassist.CodeAssist;
-import io.onedev.codeassist.FenceAware;
-import io.onedev.codeassist.InputStatus;
-import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
-import io.onedev.codeassist.parser.TerminalExpect;
+import io.onedev.commons.codeassist.CodeAssist;
+import io.onedev.commons.codeassist.FenceAware;
+import io.onedev.commons.codeassist.InputStatus;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.server.search.entity.issue.IssueQueryLexer;
-public class TestIssueQueryGrammar {
+public class IssueQueryGrammarTest {
private CodeAssist codeAssist = new CodeAssist(IssueQueryLexer.class, false) {
diff --git a/core/src/test/java/io/onedev/server/entityquery/pullrequest/TestPullRequestQueryGrammar.java b/core/src/test/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryGrammarTest.java
similarity index 80%
rename from core/src/test/java/io/onedev/server/entityquery/pullrequest/TestPullRequestQueryGrammar.java
rename to core/src/test/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryGrammarTest.java
index 39b0219806..626ef6f93f 100644
--- a/core/src/test/java/io/onedev/server/entityquery/pullrequest/TestPullRequestQueryGrammar.java
+++ b/core/src/test/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryGrammarTest.java
@@ -6,15 +6,15 @@ import java.util.List;
import org.junit.Test;
-import io.onedev.codeassist.CodeAssist;
-import io.onedev.codeassist.FenceAware;
-import io.onedev.codeassist.InputStatus;
-import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
-import io.onedev.codeassist.parser.TerminalExpect;
+import io.onedev.commons.codeassist.CodeAssist;
+import io.onedev.commons.codeassist.FenceAware;
+import io.onedev.commons.codeassist.InputStatus;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;
-public class TestPullRequestQueryGrammar {
+public class PullRequestQueryGrammarTest {
private CodeAssist codeAssist = new CodeAssist(PullRequestQueryLexer.class, false) {
diff --git a/core/src/test/java/io/onedev/server/git/AbstractGitTest.java b/core/src/test/java/io/onedev/server/git/AbstractGitTest.java
index d45cbf3e62..3abdebaed9 100644
--- a/core/src/test/java/io/onedev/server/git/AbstractGitTest.java
+++ b/core/src/test/java/io/onedev/server/git/AbstractGitTest.java
@@ -16,12 +16,12 @@ import org.eclipse.jgit.lib.RefUpdate;
import org.junit.Assert;
import org.mockito.Mockito;
-import io.onedev.launcher.loader.AppLoader;
-import io.onedev.launcher.loader.AppLoaderMocker;
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.AppLoaderMocker;
+import io.onedev.commons.utils.FileUtils;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.command.GitCommand;
import io.onedev.server.git.config.GitConfig;
-import io.onedev.utils.FileUtils;
public abstract class AbstractGitTest extends AppLoaderMocker {
diff --git a/core/src/test/java/io/onedev/server/git/command/BlameCommandTest.java b/core/src/test/java/io/onedev/server/git/command/BlameCommandTest.java
index b264d79b5c..ffb4a6c0ff 100644
--- a/core/src/test/java/io/onedev/server/git/command/BlameCommandTest.java
+++ b/core/src/test/java/io/onedev/server/git/command/BlameCommandTest.java
@@ -6,10 +6,10 @@ import java.util.Collection;
import org.junit.Test;
+import io.onedev.commons.utils.Range;
import io.onedev.server.git.AbstractGitTest;
import io.onedev.server.git.BlameBlock;
import io.onedev.server.git.command.BlameCommand;
-import io.onedev.utils.Range;
public class BlameCommandTest extends AbstractGitTest {
diff --git a/core/src/test/java/io/onedev/server/util/patternset/PatternSetGrammarTest.java b/core/src/test/java/io/onedev/server/util/patternset/PatternSetGrammarTest.java
new file mode 100644
index 0000000000..a63573e55f
--- /dev/null
+++ b/core/src/test/java/io/onedev/server/util/patternset/PatternSetGrammarTest.java
@@ -0,0 +1,20 @@
+package io.onedev.server.util.patternset;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import com.google.common.collect.Sets;
+
+public class PatternSetGrammarTest {
+
+ @Test
+ public void test() {
+ PatternSet expected = new PatternSet(Sets.newHashSet("file1", "file2", "file4 with space", "-file5", "file7 with \"", "file8\""),
+ Sets.newHashSet("file3", "-file6"));
+ PatternSet actual = PatternSet.fromString("file1 file2 -file3 \"file4 with space\" \"-file5\" -\"-file6\" \"file7 with \\\"\" file8\"");
+ assertEquals(expected.getIncludes(), actual.getIncludes());
+ assertEquals(expected.getExcludes(), actual.getExcludes());
+ }
+
+}
diff --git a/pom.xml b/pom.xml
index c1cfa6179b..8d8d2ab9aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,16 +3,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.onedev</groupId>
- <artifactId>launcher</artifactId>
- <version>1.0.3</version>
- <relativePath>../launcher</relativePath>
+ <artifactId>parent</artifactId>
+ <version>1.0.2</version>
</parent>
- <artifactId>server-parent</artifactId>
- <version>2.0.6</version>
+ <artifactId>server</artifactId>
+ <version>2.1.2</version>
<packaging>pom</packaging>
- <build>
- <pluginManagement>
- <plugins>
+ <build>
+ <finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
+ <pluginManagement>
+ <plugins>
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
@@ -30,8 +30,117 @@
<visitor>true</visitor>
</configuration>
</plugin>
- </plugins>
- </pluginManagement>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>io.onedev</groupId>
+ <artifactId>plugin-maven</artifactId>
+ <versionRange>[1.0.3,]</versionRange>
+ <goals>
+ <goal>generate-artifact-descriptor</goal>
+ <goal>generate-plugin-descriptor</goal>
+ <goal>generate-product-descriptor</goal>
+ <goal>copy-product-resources</goal>
+ <goal>create-product-sandbox</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute>
+ <runOnIncremental>true</runOnIncremental>
+ <runOnConfiguration>true</runOnConfiguration>
+ </execute>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <versionRange>[2.0,]</versionRange>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute>
+ <runOnIncremental>true</runOnIncremental>
+ <runOnConfiguration>true</runOnConfiguration>
+ </execute>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <versionRange>[1.0.0,]</versionRange>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore/>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.0.2</version>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <phase>never</phase>
+ <configuration>
+ <finalName>unwanted</finalName>
+ <classifier>unwanted</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>io.onedev</groupId>
+ <artifactId>plugin-maven</artifactId>
+ <version>1.0.3</version>
+ <executions>
+ <execution>
+ <id>generate-artifact-descriptor</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>generate-artifact-descriptor</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>generate-plugin-descriptor</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>generate-plugin-descriptor</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>create-product-sandbox</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>create-product-sandbox</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>package-artifact</id>
+ <phase>package</phase>
+ <goals>
+ <goal>package-artifact</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<resources>
<resource>
<directory>src/main/java</directory>
@@ -49,11 +158,41 @@
</includes>
</resource>
</resources>
- </build>
+ </build>
<modules>
<module>core</module>
<module>product</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-launcher-loader</artifactId>
+ <version>${commons.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-launcher-loader</artifactId>
+ <type>test-jar</type>
+ <version>${commons.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-codeassist</artifactId>
+ <version>${commons.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-jsymbol</artifactId>
+ <version>${commons.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-jsyntax</artifactId>
+ <version>${commons.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<repositories>
<repository>
<id>pmeaseRepo</id>
@@ -70,4 +209,8 @@
</snapshots>
</repository>
</repositories>
+ <properties>
+ <commons.version>1.0.7</commons.version>
+ <antlr.version>4.7.2</antlr.version>
+ </properties>
</project>
\ No newline at end of file
diff --git a/product/pom.xml b/product/pom.xml
index 01b3dbfd08..4702ba1cb7 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -4,8 +4,8 @@
<artifactId>server-product</artifactId>
<parent>
<groupId>io.onedev</groupId>
- <artifactId>server-parent</artifactId>
- <version>2.0.6</version>
+ <artifactId>server</artifactId>
+ <version>2.1.2</version>
</parent>
<build>
<plugins>
@@ -13,6 +13,13 @@
<groupId>io.onedev</groupId>
<artifactId>plugin-maven</artifactId>
<executions>
+ <execution>
+ <id>generate-product-descriptor</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>generate-product-descriptor</goal>
+ </goals>
+ </execution>
<execution>
<id>copy-product-resources</id>
<phase>compile</phase>
@@ -87,12 +94,12 @@
<dependency>
<groupId>io.onedev</groupId>
<artifactId>server-core</artifactId>
- <version>2.0.6</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<properties>
<executables>bin/*.sh, boot/wrapper-*</executables>
- <bootstrapClass>io.onedev.launcher.bootstrap.Bootstrap</bootstrapClass>
+ <bootstrapClass>io.onedev.commons.launcher.bootstrap.Bootstrap</bootstrapClass>
<moduleClass>io.onedev.server.product.ProductModule</moduleClass>
<aggregation>true</aggregation>
</properties>
diff --git a/product/src/main/java/io/onedev/server/product/DefaultServerConfig.java b/product/src/main/java/io/onedev/server/product/DefaultServerConfig.java
index 881b0f12b7..2692567238 100644
--- a/product/src/main/java/io/onedev/server/product/DefaultServerConfig.java
+++ b/product/src/main/java/io/onedev/server/product/DefaultServerConfig.java
@@ -5,8 +5,8 @@ import java.io.File;
import javax.inject.Inject;
import javax.inject.Singleton;
-import io.onedev.launcher.bootstrap.Bootstrap;
-import io.onedev.utils.StringUtils;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.serverconfig.ServerConfig;
import io.onedev.server.util.serverconfig.SslConfig;
diff --git a/product/src/main/java/io/onedev/server/product/ProductModule.java b/product/src/main/java/io/onedev/server/product/ProductModule.java
index 922f07497d..c704ae615a 100644
--- a/product/src/main/java/io/onedev/server/product/ProductModule.java
+++ b/product/src/main/java/io/onedev/server/product/ProductModule.java
@@ -4,10 +4,10 @@ import java.io.File;
import org.hibernate.cfg.Environment;
-import io.onedev.launcher.loader.AbstractPluginModule;
-import io.onedev.launcher.bootstrap.Bootstrap;
-import io.onedev.utils.FileUtils;
-import io.onedev.utils.StringUtils;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.loader.AbstractPluginModule;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.persistence.HibernateProperties;
import io.onedev.server.util.jetty.ServerConfigurator;
import io.onedev.server.util.jetty.ServletConfigurator;
diff --git a/product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java b/product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
index a2eedc922a..a84c5d471d 100644
--- a/product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
+++ b/product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
@@ -16,7 +16,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.glassfish.jersey.servlet.ServletContainer;
-import io.onedev.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
import io.onedev.server.git.GitFilter;
import io.onedev.server.git.GitPostReceiveCallback;
import io.onedev.server.git.GitPreReceiveCallback;