Skip to content

The Unified and Autonomous Development Platform

fix: Unable to select pull request assignees (OD-2357)

Robin Shen0f329493151f
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java
index ae23265ea1..cf4005d1ce 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/FuzzyCriteria.java
@@ -12,6 +12,7 @@ import javax.persistence.criteria.From;
import javax.persistence.criteria.Order;
import javax.persistence.criteria.Predicate;
+import com.beust.jcommander.internal.Lists;
import com.google.common.base.Splitter;
import io.onedev.commons.utils.StringUtils;
@@ -53,7 +54,7 @@ public class FuzzyCriteria extends Criteria<Project> {
@Override
public List<Order> getPreferOrders(CriteriaBuilder builder, From<Project, Project> from) {
- return List.of(builder.asc(from.get(Project.PROP_PATH_LEN)));
+ return Lists.newArrayList(builder.asc(from.get(Project.PROP_PATH_LEN)));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.java
index 94158140c3..05cee2288e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.java
@@ -16,6 +16,8 @@ import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import com.google.common.collect.Lists;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.CodeComment;
@@ -77,7 +79,7 @@ class CodeCommentFilterPanel extends FilterEditPanel<CodeComment> {
@Override
protected List<String> load() {
- return List.of("Unresolved", "Resolved");
+ return Lists.newArrayList("Unresolved", "Resolved");
}
}, false);
statusChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.java
index c60aa1016a..47b7cd3c50 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.java
@@ -14,6 +14,8 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import com.google.common.collect.Lists;
+
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.git.GitUtils;
@@ -98,7 +100,7 @@ abstract class CommitFilterPanel extends GenericPanel<CommitQuery> {
}
}
if (!found && object != null) {
- query.getCriterias().add(new RevisionCriteria(List.of(new Revision(Revision.Type.BUILD, object.getReference().toString(getProject()), false))));
+ query.getCriterias().add(new RevisionCriteria(Lists.newArrayList(new Revision(Revision.Type.BUILD, object.getReference().toString(getProject()), false))));
}
getModel().setObject(query);
}
@@ -156,7 +158,7 @@ abstract class CommitFilterPanel extends GenericPanel<CommitQuery> {
var criteria = criterias.get(i);
if (criteria instanceof PathCriteria) {
if (object != null)
- criterias.set(i, new PathCriteria(List.of(object)));
+ criterias.set(i, new PathCriteria(Lists.newArrayList(object)));
else
criterias.remove(i);
found = true;
@@ -164,7 +166,7 @@ abstract class CommitFilterPanel extends GenericPanel<CommitQuery> {
}
}
if (!found && object != null) {
- query.getCriterias().add(new PathCriteria(List.of(object)));
+ query.getCriterias().add(new PathCriteria(Lists.newArrayList(object)));
}
getModel().setObject(query);
}
@@ -243,7 +245,7 @@ abstract class CommitFilterPanel extends GenericPanel<CommitQuery> {
}
}
if (!found && object != null) {
- query.getCriterias().add(new RevisionCriteria(List.of(new Revision(type, object, false))));
+ query.getCriterias().add(new RevisionCriteria(Lists.newArrayList(new Revision(type, object, false))));
}
getModel().setObject(query);
}
@@ -377,14 +379,14 @@ abstract class CommitFilterPanel extends GenericPanel<CommitQuery> {
var criteria = criterias.get(i);
if (isBefore && (criteria instanceof BeforeCriteria)) {
if (object != null)
- criterias.set(i, new BeforeCriteria(List.of(DateUtils.formatDate(object))));
+ criterias.set(i, new BeforeCriteria(Lists.newArrayList(DateUtils.formatDate(object))));
else
criterias.remove(i);
found = true;
break;
} else if (!isBefore && (criteria instanceof AfterCriteria)) {
if (object != null)
- criterias.set(i, new AfterCriteria(List.of(DateUtils.formatDate(object))));
+ criterias.set(i, new AfterCriteria(Lists.newArrayList(DateUtils.formatDate(object))));
else
criterias.remove(i);
found = true;
@@ -393,9 +395,9 @@ abstract class CommitFilterPanel extends GenericPanel<CommitQuery> {
}
if (!found && object != null) {
if (isBefore)
- query.getCriterias().add(new BeforeCriteria(List.of(DateUtils.formatDate(object))));
+ query.getCriterias().add(new BeforeCriteria(Lists.newArrayList(DateUtils.formatDate(object))));
else
- query.getCriterias().add(new AfterCriteria(List.of(DateUtils.formatDate(object))));
+ query.getCriterias().add(new AfterCriteria(Lists.newArrayList(DateUtils.formatDate(object))));
}
getModel().setObject(query);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/filteredit/FilterEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/filteredit/FilterEditPanel.java
index 308dc7bb06..983da4ba29 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/filteredit/FilterEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/filteredit/FilterEditPanel.java
@@ -11,6 +11,8 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
+import com.google.common.collect.Lists;
+
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.util.Pair;
@@ -80,7 +82,7 @@ public abstract class FilterEditPanel<T extends AbstractEntity> extends GenericP
if (rootCriteria == null) {
return new ArrayList<>();
} else if (isCriteriaMatching(rootCriteria, criteriaClass, predicate)) {
- return (List<C>) List.of(rootCriteria);
+ return (List<C>) Lists.newArrayList(rootCriteria);
} else if (rootCriteria instanceof AndCriteria) {
var firstMatchingMember = getFirstMatchingMember((AndCriteria<T>) rootCriteria, criteriaClass, predicate);
if (firstMatchingMember != null) {
@@ -88,7 +90,7 @@ public abstract class FilterEditPanel<T extends AbstractEntity> extends GenericP
if (matchingCriteria instanceof OrCriteria)
return getFlattenedMembers((OrCriteria<T>) matchingCriteria);
else
- return (List<C>) List.of(matchingCriteria);
+ return (List<C>) Lists.newArrayList(matchingCriteria);
} else {
return new ArrayList<>();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java
index 5e8314c8c2..cadeba1478 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java
@@ -24,6 +24,8 @@ import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import com.google.common.collect.Lists;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -293,7 +295,7 @@ abstract class IssueFilterPanel extends FilterEditPanel<Issue> {
@Override
protected List<String> load() {
- return List.of(String.valueOf(true), String.valueOf(false));
+ return Lists.newArrayList(String.valueOf(true), String.valueOf(false));
}
}, false);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java
index 20e33796e3..1ce7c6b95e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java
@@ -22,6 +22,8 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
+import com.google.common.collect.Lists;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.PackLabelManager;
import io.onedev.server.entitymanager.PackManager;
@@ -151,10 +153,10 @@ public abstract class PackSidePanel extends Panel {
add(new SelectPackToActChoice("changesSince", choiceProvider) {
@Override
protected void onSelect(AjaxRequestTarget target, Pack selection) {
- var revisionCriteria = new RevisionCriteria(List.of(
+ var revisionCriteria = new RevisionCriteria(Lists.newArrayList(
new Revision(COMMIT, selection.getBuild().getCommitHash(), true),
new Revision(COMMIT, getPack().getBuild().getCommitHash(), false)));
- var commitQuery = new CommitQuery(List.of(revisionCriteria));
+ var commitQuery = new CommitQuery(Lists.newArrayList(revisionCriteria));
setResponsePage(ProjectCommitsPage.class, ProjectCommitsPage.paramsOf(getPack().getBuild().getProject(), commitQuery.toString(), null));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java
index a4a8dd5b7d..76516cb1c1 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java
@@ -9,6 +9,8 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
+import com.google.common.collect.Lists;
+
import io.onedev.server.web.component.stringchoice.StringSingleChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
@@ -36,7 +38,7 @@ public class NullableBooleanPropertyEditor extends PropertyEditor<Boolean> {
@Override
protected List<String> load() {
- return List.of(TextUtils.getDisplayValue(true), TextUtils.getDisplayValue(false));
+ return Lists.newArrayList(TextUtils.getDisplayValue(true), TextUtils.getDisplayValue(false));
}
}, false) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
index 6e91290e1f..8404670aac 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
@@ -2,7 +2,6 @@ package io.onedev.server.web.editable.userchoice;
import static java.util.stream.Collectors.toList;
-import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
@@ -17,6 +16,7 @@ import org.apache.wicket.util.convert.ConversionException;
import com.google.common.base.Preconditions;
import io.onedev.server.OneDev;
+import io.onedev.server.annotation.UserChoice;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
import io.onedev.server.util.ComponentContext;
@@ -26,7 +26,6 @@ import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.component.user.choice.UserSingleChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.annotation.UserChoice;
public class UserSingleChoiceEditor extends PropertyEditor<String> {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.java
index 58ad093942..421609df6c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.java
@@ -14,6 +14,8 @@ import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import com.google.common.collect.Lists;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.AgentManager;
import io.onedev.server.model.Agent;
@@ -78,7 +80,7 @@ class AgentFilterPanel extends FilterEditPanel<Agent> {
@Override
protected List<String> load() {
- return List.of("Online", "Offline");
+ return Lists.newArrayList("Online", "Offline");
}
}, false);
statusChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java
index e192c78f1f..8eb6438dcc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java
@@ -13,6 +13,8 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import com.google.common.collect.Lists;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.model.Build;
@@ -79,7 +81,7 @@ public class BuildChangesPage extends BuildDetailPage {
if (baseCommitHash != null)
revisions.add(new Revision(COMMIT, baseCommitHash, true));
revisions.add(new Revision(COMMIT, getBuild().getCommitHash(), false));
- return new CommitQuery(List.of(new RevisionCriteria(revisions)));
+ return new CommitQuery(Lists.newArrayList(new RevisionCriteria(revisions)));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
index d2b7ba9c69..317a50b3b9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
@@ -32,6 +32,8 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.ObjectId;
+import com.google.common.collect.Lists;
+
import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.OneDev;
import io.onedev.server.codequality.CodeProblem;
@@ -680,7 +682,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotati
&& !mergeBase.equals(leftCommitId)) {
revisions.add(new Revision(COMMIT, leftCommitId.name(), false));
}
- return new CommitQuery(List.of(new RevisionCriteria(revisions)));
+ return new CommitQuery(Lists.newArrayList(new RevisionCriteria(revisions)));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index c6c82e7771..ea308b7d2f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -46,6 +46,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
+import com.google.common.collect.Lists;
+
import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.OneDev;
import io.onedev.server.attachment.AttachmentSupport;
@@ -449,7 +451,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio
List<Revision> revisions = new ArrayList<>();
revisions.add(new Revision(COMMIT, request.getBaseCommitHash(), true));
revisions.add(new Revision(COMMIT, request.getLatestUpdate().getHeadCommitHash(), false));
- return new CommitQuery(List.of(new RevisionCriteria(revisions)));
+ return new CommitQuery(Lists.newArrayList(new RevisionCriteria(revisions)));
}
@Override
diff --git a/server-ee b/server-ee
index 26986191ed..b06c5ddc86 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 26986191eda13f4c7789ea7b7e755a4f4a1ad967
+Subproject commit b06c5ddc869e62fa49e07fd1724a3a268a03afd4
diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestCasesPage.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestCasesPage.java
index 8af9fa0332..268ce16067 100644
--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestCasesPage.java
+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestCasesPage.java
@@ -1,7 +1,6 @@
package io.onedev.server.plugin.report.unittest;
import static java.util.Comparator.comparingInt;
-import static java.util.List.of;
import static java.util.stream.Collectors.toSet;
import static org.unbescape.html.HtmlEscape.escapeHtml5;
@@ -109,7 +108,7 @@ public class UnitTestCasesPage extends UnitTestReportPage {
state.actualStatuses = new HashSet<>();
var report = getReport();
if (report != null && namePatterns != null) {
- var seenStatuses = report.getTestCases(testSuitePatterns.orNull(), namePatterns.orNull(), of(Status.values()))
+ var seenStatuses = report.getTestCases(testSuitePatterns.orNull(), namePatterns.orNull(), Lists.newArrayList(Status.values()))
.stream().map(UnitTestReport.TestCase::getStatus).collect(toSet());
for (var status: Status.values()) {
if (seenStatuses.contains(status))
diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestSuitesPage.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestSuitesPage.java
index ed13c681ce..d0ffe89851 100644
--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestSuitesPage.java
+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestSuitesPage.java
@@ -45,7 +45,6 @@ import java.util.*;
import java.util.stream.Collectors;
import static java.util.Comparator.comparingInt;
-import static java.util.List.of;
import static java.util.stream.Collectors.toSet;
public class UnitTestSuitesPage extends UnitTestReportPage {
@@ -93,7 +92,7 @@ public class UnitTestSuitesPage extends UnitTestReportPage {
state.actualStatuses = new HashSet<>();
var report = getReport();
if (report != null && namePatterns != null) {
- var seenStatuses = report.getTestSuites(namePatterns.orNull(), of(Status.values()))
+ var seenStatuses = report.getTestSuites(namePatterns.orNull(), Lists.newArrayList(Status.values()))
.stream().map(TestSuite::getStatus).collect(toSet());
for (var status: Status.values()) {
if (seenStatuses.contains(status))
diff --git a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
index b1f2ff1c7c..eb83950abb 100644
--- a/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
+++ b/server-plugin/server-plugin-sso-openid/src/main/java/io/onedev/server/plugin/sso/openid/OpenIdConnector.java
@@ -21,6 +21,7 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Lists;
import com.nimbusds.common.contenttype.ContentType;
import com.nimbusds.jwt.JWT;
import com.nimbusds.jwt.JWTClaimsSet;
@@ -234,7 +235,7 @@ public class OpenIdConnector extends SsoConnector {
if (getGroupsClaim() != null) {
var groupsArray = claims.getStringArrayClaim(getGroupsClaim());
if (groupsArray != null)
- groups = List.of(groupsArray);
+ groups = Lists.newArrayList(groupsArray);
else
groups = null;
} else {