The Unified and Autonomous Development Platform
Fix issue #988 - Excluding dependencies from Contributions?
Robin Shen77f247528c6c
diff --git a/server-core/src/main/java/io/onedev/server/git/command/FileChange.java b/server-core/src/main/java/io/onedev/server/git/command/FileChange.javaindex d2ac50eb14..1ef2784d3e 100644--- a/server-core/src/main/java/io/onedev/server/git/command/FileChange.java+++ b/server-core/src/main/java/io/onedev/server/git/command/FileChange.java@@ -8,6 +8,9 @@ import java.util.Set;import javax.annotation.Nullable;import io.onedev.server.util.FileExtension;+import io.onedev.server.util.match.Matcher;+import io.onedev.server.util.match.PathMatcher;+import io.onedev.server.util.patternset.PatternSet;@SuppressWarnings("serial")public class FileChange implements Serializable {@@ -64,4 +67,10 @@ public class FileChange implements Serializable {return paths;}+ public boolean matches(PatternSet patterns) {+ Matcher matcher = new PathMatcher();+ return oldPath != null && patterns.matches(matcher, oldPath)+ || newPath != null && patterns.matches(matcher, newPath);+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/git/command/GitCommit.java b/server-core/src/main/java/io/onedev/server/git/command/GitCommit.javaindex 0ba4adbb18..70b93695f5 100644--- a/server-core/src/main/java/io/onedev/server/git/command/GitCommit.java+++ b/server-core/src/main/java/io/onedev/server/git/command/GitCommit.java@@ -12,6 +12,7 @@ import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.lib.PersonIdent;import io.onedev.server.git.GitUtils;+import io.onedev.server.util.patternset.PatternSet;public class GitCommit implements Serializable {@@ -95,20 +96,20 @@ public class GitCommit implements Serializable {public Date getCommitDate() {return commitDate;}-- public int getAdditions() {++ public int getAdditions(@Nullable PatternSet patterns) {int additions = 0;for (FileChange change: fileChanges) {- if (change.getAdditions() > 0)+ if (change.getAdditions() > 0 && change.matches(patterns))additions += change.getAdditions();}return additions;}- public int getDeletions() {+ public int getDeletions(@Nullable PatternSet patterns) {int deletions = 0;for (FileChange change: fileChanges) {- if (change.getDeletions() > 0)+ if (change.getDeletions() > 0 && change.matches(patterns))deletions += change.getDeletions();}return deletions;diff --git a/server-core/src/main/java/io/onedev/server/git/command/ListNumStatsCommand.java b/server-core/src/main/java/io/onedev/server/git/command/ListNumStatsCommand.javaindex 2b5229e13a..e12b2bda24 100644--- a/server-core/src/main/java/io/onedev/server/git/command/ListNumStatsCommand.java+++ b/server-core/src/main/java/io/onedev/server/git/command/ListNumStatsCommand.java@@ -21,10 +21,13 @@ public class ListNumStatsCommand {private final String toRev;- public ListNumStatsCommand(File workingDir, String fromRev, String toRev) {+ private final boolean noRenames;++ public ListNumStatsCommand(File workingDir, String fromRev, String toRev, boolean noRenames) {this.workingDir = workingDir;this.fromRev = fromRev;this.toRev = toRev;+ this.noRenames = noRenames;}protected Commandline newGit() {@@ -35,9 +38,13 @@ public class ListNumStatsCommand {List<FileChange> fileChanges = new ArrayList<>();Commandline git = newGit().workingDir(workingDir);-- git.addArgs("-c", "diff.renameLimit=1000", "diff", "--numstat",- "--find-renames", fromRev + ".." + toRev);++ if (noRenames) {+ git.addArgs("diff", "--numstat", "--no-renames", fromRev + ".." + toRev);+ } else {+ git.addArgs("-c", "diff.renameLimit=1000", "diff", "--numstat",+ "--find-renames", fromRev + ".." + toRev);+ }git.execute(new LineConsumer() {diff --git a/server-core/src/main/java/io/onedev/server/git/command/LogCommand.java b/server-core/src/main/java/io/onedev/server/git/command/LogCommand.javaindex 5cd8097c94..5432b8709e 100644--- a/server-core/src/main/java/io/onedev/server/git/command/LogCommand.java+++ b/server-core/src/main/java/io/onedev/server/git/command/LogCommand.java@@ -34,6 +34,8 @@ public abstract class LogCommand {private boolean firstParent;+ private boolean noRenames;+private EnumSet<Field> fields = EnumSet.noneOf(Field.class);public LogCommand(File workingDir, List<String> revisions) {@@ -51,6 +53,11 @@ public abstract class LogCommand {this.firstParent = firstParent;return this;}++ public LogCommand noRenames(boolean noRenames) {+ this.noRenames = noRenames;+ return this;+ }protected Commandline newGit() {return CommandUtils.newGit();@@ -83,12 +90,21 @@ public abstract class LogCommand {if (fields.contains(Field.BODY))format += "body:%b" + BODY_END + "%n";- if (fields.contains(Field.LINE_CHANGES))- cmd.addArgs("-c", "diff.renameLimit=1000", "log", "--numstat", "--find-renames");- else if (fields.contains(Field.FILE_CHANGES))- cmd.addArgs("-c", "diff.renameLimit=1000", "log", "--name-status", "--find-renames");- else- cmd.addArgs("log");+ if (noRenames) {+ if (fields.contains(Field.LINE_CHANGES))+ cmd.addArgs("log", "--numstat", "--no-renames");+ else if (fields.contains(Field.FILE_CHANGES))+ cmd.addArgs("log", "--name-status", "--no-renames");+ else+ cmd.addArgs("log");+ } else {+ if (fields.contains(Field.LINE_CHANGES))+ cmd.addArgs("-c", "diff.renameLimit=1000", "log", "--numstat", "--find-renames");+ else if (fields.contains(Field.FILE_CHANGES))+ cmd.addArgs("-c", "diff.renameLimit=1000", "log", "--name-status", "--find-renames");+ else+ cmd.addArgs("log");+ }cmd.addArgs("--format=" + format, "--date=raw");if (firstParent) {diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.javaindex aaf6d4dd15..51116daf30 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java@@ -89,6 +89,7 @@ import io.onedev.server.util.concurrent.BatchWorker;import io.onedev.server.util.concurrent.Prioritized;import io.onedev.server.util.facade.EmailAddressFacade;import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.patternset.PatternSet;import jetbrains.exodus.ArrayByteIterable;import jetbrains.exodus.ByteIterable;import jetbrains.exodus.backup.BackupStrategy;@@ -480,6 +481,7 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManagerStore dailyContributionsStore = getStore(env, DAILY_CONTRIBUTIONS_STORE);Repository repository = projectManager.getRepository(project.getId());+ PatternSet filePatterns = project.findCodeAnalysisPatterns();ObjectId lastCommitId = env.computeInTransaction(new TransactionalComputable<ObjectId>() {@@ -545,7 +547,7 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManagerpublic void process(GitCommit currentCommit) {if (currentCommit.getCommitDate() != null && currentCommit.getParentHashes().size() <= 1) {int dayValue = new Day(currentCommit.getCommitDate()).getValue();- updateContribution(overallContributions, dayValue, currentCommit);+ updateContribution(overallContributions, dayValue, currentCommit, filePatterns);if (currentCommit.getAuthor() != null) {NameAndEmail author = new NameAndEmail(currentCommit.getAuthor());@@ -559,7 +561,7 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManagerdailyContributionsStore, txn, new IntByteIterable(dayValue)));dailyContributionsCache.put(dayValue, contributionsOnDay);}- updateContribution(contributionsOnDay, userIndex, currentCommit);+ updateContribution(contributionsOnDay, userIndex, currentCommit, filePatterns);}}}@@ -695,6 +697,7 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManager});+ PatternSet filePatterns = project.findCodeAnalysisPatterns();if (lastCommitId == null) {env.executeInTransaction(new TransactionalExecutable() {@@ -720,12 +723,12 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManagerconsumer.accept(commit);}- }.firstParent(true).fields(fields).run();+ }.firstParent(true).noRenames(true).fields(fields).run();}@Overridepublic void process(GitCommit currentCommit) {- updateLineStats(txn, currentCommit, lineStats);+ updateLineStats(txn, currentCommit, lineStats, filePatterns);}}.pump();@@ -754,13 +757,13 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManagerListNumStatsCommand command = new ListNumStatsCommand(storageManager.getProjectGitDir(project.getId()),- lastCommitId.name(), commitId.name());+ lastCommitId.name(), commitId.name(), true);List<FileChange> fileChanges = command.run();RevCommit revCommit = project.getRevCommit(commitId, true);GitCommit gitCommit = new GitCommit(revCommit.name(), null, null, revCommit.getAuthorIdent(),revCommit.getCommitterIdent().getWhen(), null, null, fileChanges);- updateLineStats(txn, gitCommit, lineStats);+ updateLineStats(txn, gitCommit, lineStats, filePatterns);bytesOfLineStats = SerializationUtils.serialize((Serializable) lineStats);defaultStore.put(txn, LINE_STATS_KEY, new ArrayByteIterable(bytesOfLineStats));@@ -825,7 +828,8 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManager}}- private void updateLineStats(Transaction txn, GitCommit currentCommit, Map<Integer, Map<String, Integer>> lineStats) {+ private void updateLineStats(Transaction txn, GitCommit currentCommit, Map<Integer, Map<String, Integer>> lineStats,+ PatternSet filePatterns) {int dayValue = new Day(currentCommit.getCommitDate()).getValue();Map<String, Integer> lineStatsOnDay = lineStats.get(dayValue);@@ -836,14 +840,16 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManagerMap<String, Integer> languageLines = new HashMap<>();for (FileChange change: currentCommit.getFileChanges()) {- int lines = change.getAdditions() - change.getDeletions();- if (lines != 0 && !change.getNewExtension().equals("")) {- String language = ProgrammingLanguageDetector.getLanguageForExtension(change.getNewExtension());- if (language != null) {- Integer accumulatedLines = languageLines.get(language);- if (accumulatedLines != null)- lines += accumulatedLines;- languageLines.put(language, lines);+ if (change.matches(filePatterns)) {+ int lines = change.getAdditions() - change.getDeletions();+ if (lines != 0 && StringUtils.isNotBlank(change.getNewExtension())) {+ String language = ProgrammingLanguageDetector.getLanguageForExtension(change.getNewExtension());+ if (language != null) {+ Integer accumulatedLines = languageLines.get(language);+ if (accumulatedLines != null)+ lines += accumulatedLines;+ languageLines.put(language, lines);+ }}}}@@ -987,9 +993,8 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManagerbyte[] bytes = readBytes(store, txn, LINE_STATS_KEY);if (bytes != null) {@SuppressWarnings("unchecked")- Map<Integer, Map<String, Integer>> storedMap =- (Map<Integer, Map<String, Integer>>) SerializationUtils.deserialize(bytes);- for (Map.Entry<Integer, Map<String, Integer>> entry: storedMap.entrySet())+ var storedMap = (Map<Integer, Map<String, Integer>>) SerializationUtils.deserialize(bytes);+ for (var entry: storedMap.entrySet())lineIncrements.put(new Day(entry.getKey()), entry.getValue());}return lineIncrements;@@ -1002,15 +1007,17 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManager}- private void updateContribution(Map<Integer, GitContribution> contributions, int key, GitCommit commit) {+ private void updateContribution(Map<Integer, GitContribution> contributions, int key, GitCommit commit,+ PatternSet filePatterns) {GitContribution contribution = contributions.get(key);if (contribution != null) {contribution = new GitContribution(contribution.getCommits()+1,- contribution.getAdditions()+commit.getAdditions(),- contribution.getDeletions()+commit.getDeletions());+ contribution.getAdditions()+commit.getAdditions(filePatterns),+ contribution.getDeletions()+commit.getDeletions(filePatterns));} else {- contribution = new GitContribution(1, commit.getAdditions(), commit.getDeletions());+ contribution = new GitContribution(+ 1, commit.getAdditions(filePatterns), commit.getDeletions(filePatterns));}contributions.put(key, contribution);}diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex 5184e3975a..68f6a7e153 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -4426,6 +4426,8 @@ public class DataMigrator {updateElement.addElement("id").setText(projectId);updateElement.addElement("date").setText(updateDateElement.getText().trim());updateDateElement.detach();++ element.addElement("codeAnalysisSetting");}dom.writeToFile(file, false);} else if (file.getName().startsWith("Settings.xml")) {diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 4ac4df99a2..ef26bacccc 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -88,6 +88,7 @@ import io.onedev.server.git.signature.SignatureVerified;import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Build.Status;import io.onedev.server.model.support.BranchProtection;+import io.onedev.server.model.support.CodeAnalysisSetting;import io.onedev.server.model.support.FileProtection;import io.onedev.server.model.support.LabelSupport;import io.onedev.server.model.support.NamedCodeCommentQuery;@@ -316,6 +317,8 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelprivate boolean issueManagement = true;+ private CodeAnalysisSetting codeAnalysisSetting = new CodeAnalysisSetting();+// SQL Server does not allow duplicate null values for unique column. So we use// special prefix to indicate null@JsonIgnore@@ -884,7 +887,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelpublic void setCodeManagement(boolean codeManagement) {this.codeManagement = codeManagement;}-+@Editable(order=300, description="Whether or not to enable issue management for the project")public boolean isIssueManagement() {return issueManagement;@@ -909,6 +912,14 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelthis.serviceDeskName = NULL_SERVICE_DESK_PREFIX + UUID.randomUUID().toString();}+ public CodeAnalysisSetting getCodeAnalysisSetting() {+ return codeAnalysisSetting;+ }++ public void setCodeAnalysisSetting(CodeAnalysisSetting codeAnalysisSetting) {+ this.codeAnalysisSetting = codeAnalysisSetting;+ }+public ProjectIssueSetting getIssueSetting() {return issueSetting;}@@ -1602,4 +1613,15 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelreturn null;}+ public PatternSet findCodeAnalysisPatterns() {+ Project current = this;+ do {+ if (current.getCodeAnalysisSetting().getAnalyzeFiles() != null)+ return PatternSet.parse(current.getCodeAnalysisSetting().getAnalyzeFiles());+ current = current.getParent();+ } while (current != null);++ return PatternSet.parse("**");+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/CodeAnalysisSetting.java b/server-core/src/main/java/io/onedev/server/model/support/CodeAnalysisSetting.javanew file mode 100644index 0000000000..55ab1501b4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/CodeAnalysisSetting.java@@ -0,0 +1,32 @@+package io.onedev.server.model.support;++import java.io.Serializable;++import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Patterns;++@Editable+public class CodeAnalysisSetting implements Serializable {++ private static final long serialVersionUID = 1L;++ private String analysisFiles;++ @Editable(order=100, name="Files to Be Analyzed", placeholder="Inherit from parent", rootProjectPlaceholder="All files", description="OneDev analyzes repository files for code search, "+ + "line statistics, and code contribution statistics. This setting tells which files should be analyzed, and expects space-separated "+ + "<a href='$docRoot/pages/path-wildcard.md' target='_blank'>path patterns</a>. A pattern can be excluded by prefixing with '-', for "+ + "instance <code>-**/vendors/**</code> will exclude all files with vendors in path. <b>NOTE: </b> Changing this setting only affects new "+ + "commits. To apply the change to history commits, please stop the server and delete folder <code>index</code> and "+ + "<code>info/commit</code> under <a href='$docRoot/pages/concepts.md#project-storage' target='_blank'>project's storage directory</a>. The "+ + "repository will be re-analyzed when server is started"+ )+ @Patterns+ public String getAnalyzeFiles() {+ return analysisFiles;+ }++ public void setAnalyzeFiles(String analyzeFiles) {+ this.analysisFiles = analyzeFiles;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.javaindex 460cf3f98a..28144febb3 100644--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java@@ -91,6 +91,9 @@ import io.onedev.server.util.IndexResult;import io.onedev.server.util.concurrent.BatchWorkManager;import io.onedev.server.util.concurrent.BatchWorker;import io.onedev.server.util.concurrent.Prioritized;+import io.onedev.server.util.match.Matcher;+import io.onedev.server.util.match.PathMatcher;+import io.onedev.server.util.patternset.PatternSet;@Singletonpublic class DefaultCodeIndexManager implements CodeIndexManager, Serializable {@@ -153,8 +156,8 @@ public class DefaultCodeIndexManager implements CodeIndexManager, Serializable {return indexVersion.get();}- private IndexResult index(Repository repository, AnyObjectId commitId,- IndexWriter writer, final IndexSearcher searcher) throws Exception {+ private IndexResult index(Repository repository, AnyObjectId commitId, IndexWriter writer,+ IndexSearcher searcher, PatternSet filePatterns) throws Exception {try ( RevWalk revWalk = new RevWalk(repository);TreeWalk treeWalk = new TreeWalk(repository)) {treeWalk.addTree(revWalk.parseCommit(commitId).getTree());@@ -176,58 +179,63 @@ public class DefaultCodeIndexManager implements CodeIndexManager, Serializable {}}+ Matcher matcher = new PathMatcher();int indexed = 0;int checked = 0;while (treeWalk.next()) {if ((treeWalk.getRawMode(0) & FileMode.TYPE_MASK) == FileMode.TYPE_FILE&& (treeWalk.getTreeCount() == 1 || !treeWalk.idEqual(0, 1))) {- ObjectId blobId = treeWalk.getObjectId(0);String blobPath = treeWalk.getPathString();- String blobName = treeWalk.getNameString();- BooleanQuery.Builder builder = new BooleanQuery.Builder();- builder.add(BLOB_HASH.getTermQuery(blobId.name()), Occur.MUST);- builder.add(BLOB_PATH.getTermQuery(blobPath), Occur.MUST);- BooleanQuery query = builder.build();-- final AtomicReference<String> blobIndexVersionRef = new AtomicReference<>(null);- if (searcher != null) {- searcher.search(query, new SimpleCollector() {-- private LeafReaderContext context;-- @Override- public void collect(int doc) throws IOException {- blobIndexVersionRef.set(searcher.doc(context.docBase+doc).get(BLOB_INDEX_VERSION.name()));- }-- @Override- protected void doSetNextReader(LeafReaderContext context) throws IOException {- this.context = context;- }-- @Override- public ScoreMode scoreMode() {- return ScoreMode.COMPLETE_NO_SCORES;+ if (filePatterns.matches(matcher, blobPath)) {+ ObjectId blobId = treeWalk.getObjectId(0);+ String blobName = treeWalk.getNameString();++ BooleanQuery.Builder builder = new BooleanQuery.Builder();+ builder.add(BLOB_HASH.getTermQuery(blobId.name()), Occur.MUST);+ builder.add(BLOB_PATH.getTermQuery(blobPath), Occur.MUST);+ BooleanQuery query = builder.build();++ final AtomicReference<String> blobIndexVersionRef = new AtomicReference<>(null);+ if (searcher != null) {+ searcher.search(query, new SimpleCollector() {++ private LeafReaderContext context;++ @Override+ public void collect(int doc) throws IOException {+ blobIndexVersionRef.set(searcher.doc(context.docBase+doc).get(BLOB_INDEX_VERSION.name()));+ }++ @Override+ protected void doSetNextReader(LeafReaderContext context) throws IOException {+ this.context = context;+ }++ @Override+ public ScoreMode scoreMode() {+ return ScoreMode.COMPLETE_NO_SCORES;+ }++ });+ checked++;+ }++ SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);+ String currentBlobIndexVersion = getIndexVersion(extractor);+ String blobIndexVersion = blobIndexVersionRef.get();+ if (blobIndexVersion != null) {+ if (!blobIndexVersion.equals(currentBlobIndexVersion)) {+ writer.deleteDocuments(query);+ indexBlob(writer, repository, extractor, blobId, blobPath);+ indexed++;}-- });- checked++;- }-- SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);- String currentBlobIndexVersion = getIndexVersion(extractor);- String blobIndexVersion = blobIndexVersionRef.get();- if (blobIndexVersion != null) {- if (!blobIndexVersion.equals(currentBlobIndexVersion)) {- writer.deleteDocuments(query);+ } else {indexBlob(writer, repository, extractor, blobId, blobPath);indexed++;}- } else {- indexBlob(writer, repository, extractor, blobId, blobPath);- indexed++;}+}}@@ -336,7 +344,7 @@ public class DefaultCodeIndexManager implements CodeIndexManager, Serializable {try {logger.debug("Indexing commit (project: {}, commit: {})", project.getPath(), commit.getName());IndexResult indexResult = index(projectManager.getRepository(project.getId()),- commit, writer, searcher);+ commit, writer, searcher, project.findCodeAnalysisPatterns());writer.commit();return indexResult;} catch (Exception e) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.javaindex cb1c97ec37..ccfdddf948 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java@@ -8,6 +8,7 @@ import javax.annotation.Nullable;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.model.Project;import io.onedev.server.util.BeanUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.ReflectionUtils;@@ -140,6 +141,22 @@ public class EditableUtils {@Nullablepublic static String getPlaceholder(AnnotatedElement element) {Editable editable = element.getAnnotation(Editable.class);+ Project project = Project.get();+ if (project != null && project.getParent() == null) {+ String placeholder = editable.rootProjectPlaceholder();+ if (placeholder.length() != 0) {+ return placeholder;+ } else if (editable.rootProjectPlaceholderProvider().length() != 0) {+ Class<?> clazz;+ if (element instanceof Class)+ clazz = (Class<?>) element;+ else if (element instanceof Method)+ clazz = ((Method) element).getDeclaringClass();+ else+ throw new RuntimeException("Unexpected element type: " + element);+ return (String) ReflectionUtils.invokeStaticMethod(clazz, editable.rootProjectPlaceholderProvider());+ }+ }String placeholder = editable.placeholder();if (placeholder.length() != 0) {return placeholder;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/Editable.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/Editable.javaindex d908c925a7..51ebece4c5 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/Editable.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/Editable.java@@ -19,6 +19,10 @@ public @interface Editable {String placeholderProvider() default "";+ String rootProjectPlaceholder() default "";++ String rootProjectPlaceholderProvider() default "";+int order() default 0;String description() default "";diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.javaindex 3cec39de65..949f648b3d 100644--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java@@ -123,6 +123,7 @@ import io.onedev.server.web.page.project.setting.build.ActionAuthorizationsPage;import io.onedev.server.web.page.project.setting.build.BuildPreservationsPage;import io.onedev.server.web.page.project.setting.build.DefaultFixedIssueFiltersPage;import io.onedev.server.web.page.project.setting.build.JobSecretsPage;+import io.onedev.server.web.page.project.setting.codeanalysis.CodeAnalysisSettingPage;import io.onedev.server.web.page.project.setting.general.GeneralProjectSettingPage;import io.onedev.server.web.page.project.setting.pluginsettings.ContributedProjectSettingPage;import io.onedev.server.web.page.project.setting.servicedesk.ProjectServiceDeskSettingPage;@@ -365,6 +366,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new BasePageMapper("projects/${project}/settings/build/action-authorizations", ActionAuthorizationsPage.class));add(new BasePageMapper("projects/${project}/settings/build/build-preserve-rules", BuildPreservationsPage.class));add(new BasePageMapper("projects/${project}/settings/build/default-fixed-issues-filter", DefaultFixedIssueFiltersPage.class));+ add(new BasePageMapper("projects/${project}/settings/code-analysis", CodeAnalysisSettingPage.class));add(new BasePageMapper("projects/${project}/settings/service-desk", ProjectServiceDeskSettingPage.class));add(new BasePageMapper("projects/${project}/settings/web-hooks", WebHooksPage.class));add(new BasePageMapper("projects/${project}/settings/${" + ContributedProjectSettingPage.PARAM_SETTING + "}",diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 6ddfbb33e4..4e753791fc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -89,6 +89,7 @@ import io.onedev.server.web.page.project.setting.build.ActionAuthorizationsPage;import io.onedev.server.web.page.project.setting.build.BuildPreservationsPage;import io.onedev.server.web.page.project.setting.build.DefaultFixedIssueFiltersPage;import io.onedev.server.web.page.project.setting.build.JobSecretsPage;+import io.onedev.server.web.page.project.setting.codeanalysis.CodeAnalysisSettingPage;import io.onedev.server.web.page.project.setting.general.GeneralProjectSettingPage;import io.onedev.server.web.page.project.setting.pluginsettings.ContributedProjectSettingPage;import io.onedev.server.web.page.project.setting.servicedesk.ProjectServiceDeskSettingPage;@@ -264,6 +265,9 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {settingMenuItems.add(new SidebarMenuItem.Page(null, "Tag Protection",TagProtectionsPage.class, TagProtectionsPage.paramsOf(getProject())));+ settingMenuItems.add(new SidebarMenuItem.Page(null, "Code Analysis",+ CodeAnalysisSettingPage.class, CodeAnalysisSettingPage.paramsOf(getProject())));+List<SidebarMenuItem> buildSettingMenuItems = new ArrayList<>();buildSettingMenuItems.add(new SidebarMenuItem.Page(null, "Job Secrets",diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.javaindex 8f62ab7433..3730ec195b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java@@ -587,7 +587,7 @@ public abstract class AdvancedSearchPanel extends Panel {public List<QueryHit> query(AdvancedSearchPanel context) throws InterruptedException {CodeSearchManager searchManager = OneDev.getInstance(CodeSearchManager.class);BlobQuery query = new FileQuery.Builder()- .fileNames(term)+ .fileNames(term.toLowerCase()).caseSensitive(caseSensitive).directory(context.getDirectory(insideCurrentDir)).count(getMaxQueryEntries())diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/codeanalysis/CodeAnalysisSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/codeanalysis/CodeAnalysisSettingPage.htmlnew file mode 100644index 0000000000..4b07131f11--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/codeanalysis/CodeAnalysisSettingPage.html@@ -0,0 +1,10 @@+<wicket:extend>+ <div class="card">+ <div class="card-body">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="editor"></div>+ <input class="btn btn-primary dirty-aware" value="Update" type="submit">+ </form>+ </div>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/codeanalysis/CodeAnalysisSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/codeanalysis/CodeAnalysisSettingPage.javanew file mode 100644index 0000000000..e45cc7e565--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/codeanalysis/CodeAnalysisSettingPage.java@@ -0,0 +1,62 @@+package io.onedev.server.web.page.project.setting.codeanalysis;++import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.CodeAnalysisSetting;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;+import io.onedev.server.web.page.project.setting.ProjectSettingPage;++@SuppressWarnings("serial")+public class CodeAnalysisSettingPage extends ProjectSettingPage {++ public CodeAnalysisSettingPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ CodeAnalysisSetting bean = getProject().getCodeAnalysisSetting();+ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ getProject().setCodeAnalysisSetting(bean);+ OneDev.getInstance(ProjectManager.class).save(getProject());+ setResponsePage(CodeAnalysisSettingPage.class, CodeAnalysisSettingPage.paramsOf(getProject()));+ Session.get().success("Code analysis setting updated");+ }++ };+ form.add(BeanContext.edit("editor", bean));++ add(form);+ }++ @Override+ protected Component newProjectTitle(String componentId) {+ return new Label(componentId, "<span class='text-truncate'>Code Analysis Setting</span>").setEscapeModelStrings(false);+ }++ @Override+ protected void navToProject(Project project) {+ if (SecurityUtils.canManage(project))+ setResponsePage(CodeAnalysisSettingPage.class, paramsOf(project.getId()));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectPage.paramsOf(project.getId()));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/DefaultRoleBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/DefaultRoleBean.javaindex e08b280e94..4da5b30c53 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/DefaultRoleBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/DefaultRoleBean.java@@ -17,7 +17,7 @@ public class DefaultRoleBean implements Serializable {private String roleName;- @Editable(name="Default Role", placeholder="No default role", description="Default role determines default "+ @Editable(name="Default Role", placeholder="Inherit from parent", rootProjectPlaceholder="No default role", description="Default role determines default "+ "permissions granted to everyone in the system. A permission is default permission of the project, "+ "if it is contained in any default role of the project hierarchy (current and all ancestor projects)")@RoleChoice