Skip to content

The Unified and Autonomous Development Platform

Fix the issue that NoClassDefFoundError when access various query pages

Robin Shenf4cbbd7b3843
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
index d2d65aa2ab..859ef1207a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
@@ -8,6 +8,8 @@ import static io.onedev.server.util.BuildConstants.FIELD_QUEUEING_DATE;
import static io.onedev.server.util.BuildConstants.FIELD_RUNNING_DATE;
import static io.onedev.server.util.BuildConstants.FIELD_SUBMIT_DATE;
import static io.onedev.server.util.BuildConstants.FIELD_VERSION;
+import static io.onedev.server.util.BuildConstants.ORDER_FIELDS;
+import static io.onedev.server.util.BuildConstants.QUERY_FIELDS;
import java.util.ArrayList;
import java.util.Collection;
@@ -46,7 +48,6 @@ import io.onedev.server.search.entity.build.BuildQueryParser.OrCriteriaContext;
import io.onedev.server.search.entity.build.BuildQueryParser.OrderContext;
import io.onedev.server.search.entity.build.BuildQueryParser.ParensCriteriaContext;
import io.onedev.server.search.entity.build.BuildQueryParser.QueryContext;
-import io.onedev.server.util.BuildConstants;
import io.onedev.server.util.ProjectAwareCommitId;
public class BuildQuery extends EntityQuery<Build> {
@@ -225,7 +226,7 @@ public class BuildQuery extends EntityQuery<Build> {
List<EntitySort> buildSorts = new ArrayList<>();
for (OrderContext order: queryContext.order()) {
String fieldName = getValue(order.Quoted().getText());
- if (!BuildConstants.ORDER_FIELDS.containsKey(fieldName))
+ if (!ORDER_FIELDS.containsKey(fieldName))
throw new OneException("Can not order by field: " + fieldName);
EntitySort commentSort = new EntitySort();
@@ -245,15 +246,15 @@ public class BuildQuery extends EntityQuery<Build> {
public static void checkField(Project project, String fieldName, int operator) {
Collection<String> paramNames = OneDev.getInstance(BuildParamManager.class).getBuildParamNames();
- if (!BuildConstants.QUERY_FIELDS.contains(fieldName) && !paramNames.contains(fieldName))
+ if (!QUERY_FIELDS.contains(fieldName) && !paramNames.contains(fieldName))
throw new OneException("Field not found: " + fieldName);
switch (operator) {
case BuildQueryLexer.IsBefore:
case BuildQueryLexer.IsAfter:
- if (!fieldName.equals(BuildConstants.FIELD_SUBMIT_DATE)
- && !fieldName.equals(BuildConstants.FIELD_QUEUEING_DATE)
- && !fieldName.equals(BuildConstants.FIELD_RUNNING_DATE)
- && !fieldName.equals(BuildConstants.FIELD_FINISH_DATE))
+ if (!fieldName.equals(FIELD_SUBMIT_DATE)
+ && !fieldName.equals(FIELD_QUEUEING_DATE)
+ && !fieldName.equals(FIELD_RUNNING_DATE)
+ && !fieldName.equals(FIELD_FINISH_DATE))
throw newOperatorException(fieldName, operator);
break;
case BuildQueryLexer.Is:
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
index f7625ddd1c..5afd5d0eb5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
@@ -6,6 +6,8 @@ import static io.onedev.server.util.CodeCommentConstants.FIELD_PATH;
import static io.onedev.server.util.CodeCommentConstants.FIELD_REPLY;
import static io.onedev.server.util.CodeCommentConstants.FIELD_REPLY_COUNT;
import static io.onedev.server.util.CodeCommentConstants.FIELD_UPDATE_DATE;
+import static io.onedev.server.util.CodeCommentConstants.QUERY_FIELDS;
+import static io.onedev.server.util.CodeCommentConstants.ORDER_FIELDS;
import java.util.ArrayList;
import java.util.Date;
@@ -42,7 +44,6 @@ import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.OrCrite
import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.OrderContext;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.ParensCriteriaContext;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.QueryContext;
-import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.util.ProjectAwareCommitId;
public class CodeCommentQuery extends EntityQuery<CodeComment> {
@@ -190,7 +191,7 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {
List<EntitySort> commentSorts = new ArrayList<>();
for (OrderContext order: queryContext.order()) {
String fieldName = getValue(order.Quoted().getText());
- if (!CodeCommentConstants.ORDER_FIELDS.containsKey(fieldName))
+ if (!ORDER_FIELDS.containsKey(fieldName))
throw new OneException("Can not order by field: " + fieldName);
EntitySort commentSort = new EntitySort();
@@ -209,7 +210,7 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {
}
public static void checkField(Project project, String fieldName, int operator) {
- if (!CodeCommentConstants.QUERY_FIELDS.contains(fieldName))
+ if (!QUERY_FIELDS.contains(fieldName))
throw new OneException("Field not found: " + fieldName);
switch (operator) {
case CodeCommentQueryLexer.IsBefore:
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index e2cf20d784..4950c18df3 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
@@ -1,16 +1,5 @@
package io.onedev.server.search.entity.issue;
-import static io.onedev.server.util.IssueConstants.FIELD_COMMENT;
-import static io.onedev.server.util.IssueConstants.FIELD_COMMENT_COUNT;
-import static io.onedev.server.util.IssueConstants.FIELD_DESCRIPTION;
-import static io.onedev.server.util.IssueConstants.FIELD_MILESTONE;
-import static io.onedev.server.util.IssueConstants.FIELD_NUMBER;
-import static io.onedev.server.util.IssueConstants.FIELD_STATE;
-import static io.onedev.server.util.IssueConstants.FIELD_SUBMIT_DATE;
-import static io.onedev.server.util.IssueConstants.FIELD_TITLE;
-import static io.onedev.server.util.IssueConstants.FIELD_UPDATE_DATE;
-import static io.onedev.server.util.IssueConstants.FIELD_VOTE_COUNT;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -149,9 +138,9 @@ public class IssueQuery extends EntityQuery<Issue> {
int operator = ctx.operator.getType();
if (validate)
checkField(fieldName, operator);
- if (fieldName.equals(FIELD_MILESTONE))
+ if (fieldName.equals(IssueConstants.FIELD_MILESTONE))
return new MilestoneCriteria(null);
- else if (fieldName.equals(FIELD_DESCRIPTION))
+ else if (fieldName.equals(IssueConstants.FIELD_DESCRIPTION))
return new DescriptionCriteria(null);
else
return new FieldOperatorCriteria(fieldName, operator);
@@ -196,18 +185,18 @@ public class IssueQuery extends EntityQuery<Issue> {
switch (operator) {
case IssueQueryLexer.IsBefore:
case IssueQueryLexer.IsAfter:
- if (fieldName.equals(FIELD_SUBMIT_DATE))
+ if (fieldName.equals(IssueConstants.FIELD_SUBMIT_DATE))
return new SubmitDateCriteria(value, operator);
- else if (fieldName.equals(FIELD_UPDATE_DATE))
+ else if (fieldName.equals(IssueConstants.FIELD_UPDATE_DATE))
return new UpdateDateCriteria(value, operator);
else
return new DateFieldCriteria(fieldName, value, operator);
case IssueQueryLexer.Contains:
- if (fieldName.equals(FIELD_TITLE)) {
+ if (fieldName.equals(IssueConstants.FIELD_TITLE)) {
return new TitleCriteria(value);
- } else if (fieldName.equals(FIELD_DESCRIPTION)) {
+ } else if (fieldName.equals(IssueConstants.FIELD_DESCRIPTION)) {
return new DescriptionCriteria(value);
- } else if (fieldName.equals(FIELD_COMMENT)) {
+ } else if (fieldName.equals(IssueConstants.FIELD_COMMENT)) {
return new CommentCriteria(value);
} else {
FieldSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);
@@ -223,15 +212,15 @@ public class IssueQuery extends EntityQuery<Issue> {
}
}
case IssueQueryLexer.Is:
- if (fieldName.equals(FIELD_MILESTONE)) {
+ if (fieldName.equals(IssueConstants.FIELD_MILESTONE)) {
return new MilestoneCriteria(value);
- } else if (fieldName.equals(FIELD_STATE)) {
+ } else if (fieldName.equals(IssueConstants.FIELD_STATE)) {
return new StateCriteria(value);
- } else if (fieldName.equals(FIELD_VOTE_COUNT)) {
+ } else if (fieldName.equals(IssueConstants.FIELD_VOTE_COUNT)) {
return new VoteCountCriteria(getIntValue(value), operator);
- } else if (fieldName.equals(FIELD_COMMENT_COUNT)) {
+ } else if (fieldName.equals(IssueConstants.FIELD_COMMENT_COUNT)) {
return new CommentCountCriteria(getIntValue(value), operator);
- } else if (fieldName.equals(FIELD_NUMBER)) {
+ } else if (fieldName.equals(IssueConstants.FIELD_NUMBER)) {
return new NumberCriteria(getIntValue(value), operator);
} else {
FieldSpec field = getIssueSetting().getFieldSpec(fieldName);
@@ -257,11 +246,11 @@ public class IssueQuery extends EntityQuery<Issue> {
}
case IssueQueryLexer.IsLessThan:
case IssueQueryLexer.IsGreaterThan:
- if (fieldName.equals(FIELD_VOTE_COUNT)) {
+ if (fieldName.equals(IssueConstants.FIELD_VOTE_COUNT)) {
return new VoteCountCriteria(getIntValue(value), operator);
- } else if (fieldName.equals(FIELD_COMMENT_COUNT)) {
+ } else if (fieldName.equals(IssueConstants.FIELD_COMMENT_COUNT)) {
return new CommentCountCriteria(getIntValue(value), operator);
- } else if (fieldName.equals(FIELD_NUMBER)) {
+ } else if (fieldName.equals(IssueConstants.FIELD_NUMBER)) {
return new NumberCriteria(getIntValue(value), operator);
} else {
FieldSpec field = getIssueSetting().getFieldSpec(fieldName);
@@ -350,8 +339,11 @@ public class IssueQuery extends EntityQuery<Issue> {
throw new OneException("Field not found: " + fieldName);
switch (operator) {
case IssueQueryLexer.IsEmpty:
- if (IssueConstants.QUERY_FIELDS.contains(fieldName) && !fieldName.equals(FIELD_DESCRIPTION) && !fieldName.equals(FIELD_MILESTONE))
+ if (IssueConstants.QUERY_FIELDS.contains(fieldName)
+ && !fieldName.equals(IssueConstants.FIELD_DESCRIPTION)
+ && !fieldName.equals(IssueConstants.FIELD_MILESTONE)) {
throw newOperatorException(fieldName, operator);
+ }
break;
case IssueQueryLexer.IsMe:
if (!(fieldSpec instanceof UserChoiceField))
@@ -359,24 +351,27 @@ public class IssueQuery extends EntityQuery<Issue> {
break;
case IssueQueryLexer.IsBefore:
case IssueQueryLexer.IsAfter:
- if (!fieldName.equals(FIELD_SUBMIT_DATE) && !fieldName.equals(FIELD_UPDATE_DATE) && !(fieldSpec instanceof DateField))
+ if (!fieldName.equals(IssueConstants.FIELD_SUBMIT_DATE)
+ && !fieldName.equals(IssueConstants.FIELD_UPDATE_DATE)
+ && !(fieldSpec instanceof DateField)) {
throw newOperatorException(fieldName, operator);
+ }
break;
case IssueQueryLexer.Contains:
- if (!fieldName.equals(FIELD_TITLE)
- && !fieldName.equals(FIELD_DESCRIPTION)
- && !fieldName.equals(FIELD_COMMENT)
+ if (!fieldName.equals(IssueConstants.FIELD_TITLE)
+ && !fieldName.equals(IssueConstants.FIELD_DESCRIPTION)
+ && !fieldName.equals(IssueConstants.FIELD_COMMENT)
&& !(fieldSpec instanceof TextField)
&& !(fieldSpec != null && fieldSpec.isAllowMultiple())) {
throw newOperatorException(fieldName, operator);
}
break;
case IssueQueryLexer.Is:
- if (!fieldName.equals(FIELD_STATE)
- && !fieldName.equals(FIELD_VOTE_COUNT)
- && !fieldName.equals(FIELD_COMMENT_COUNT)
- && !fieldName.equals(FIELD_NUMBER)
- && !fieldName.equals(FIELD_MILESTONE)
+ if (!fieldName.equals(IssueConstants.FIELD_STATE)
+ && !fieldName.equals(IssueConstants.FIELD_VOTE_COUNT)
+ && !fieldName.equals(IssueConstants.FIELD_COMMENT_COUNT)
+ && !fieldName.equals(IssueConstants.FIELD_NUMBER)
+ && !fieldName.equals(IssueConstants.FIELD_MILESTONE)
&& !(fieldSpec instanceof IssueChoiceField)
&& !(fieldSpec instanceof PullRequestChoiceField)
&& !(fieldSpec instanceof BuildChoiceField)
@@ -391,9 +386,9 @@ public class IssueQuery extends EntityQuery<Issue> {
break;
case IssueQueryLexer.IsLessThan:
case IssueQueryLexer.IsGreaterThan:
- if (!fieldName.equals(FIELD_VOTE_COUNT)
- && !fieldName.equals(FIELD_COMMENT_COUNT)
- && !fieldName.equals(FIELD_NUMBER)
+ if (!fieldName.equals(IssueConstants.FIELD_VOTE_COUNT)
+ && !fieldName.equals(IssueConstants.FIELD_COMMENT_COUNT)
+ && !fieldName.equals(IssueConstants.FIELD_NUMBER)
&& !(fieldSpec instanceof NumberField)
&& !(fieldSpec instanceof ChoiceField))
throw newOperatorException(fieldName, operator);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java
index 0e644dbd56..ba7717f7b1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java
@@ -9,6 +9,8 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
@@ -40,32 +42,39 @@ public class BuildListPage extends LayoutPage {
private static final String PARAM_EXPECTED_COUNT = "expectedCount";
- private String query;
-
private Integer expectedCount;
- public BuildListPage(PageParameters params) {
- super(params);
- query = params.get(PARAM_QUERY).toOptionalString();
- if (query != null && query.length() == 0) {
- query = null;
- List<String> queries = new ArrayList<>();
- if (getLoginUser() != null) {
- for (NamedBuildQuery namedQuery: getLoginUser().getBuildQuerySetting().getUserQueries())
+ private final IModel<String> queryModel = new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ String query = getPageParameters().get(PARAM_QUERY).toOptionalString();
+ if (query != null && query.length() == 0) {
+ query = null;
+ List<String> queries = new ArrayList<>();
+ if (getLoginUser() != null) {
+ for (NamedBuildQuery namedQuery: getLoginUser().getBuildQuerySetting().getUserQueries())
+ queries.add(namedQuery.getQuery());
+ }
+ for (NamedBuildQuery namedQuery: getBuildSetting().getNamedQueries())
queries.add(namedQuery.getQuery());
- }
- for (NamedBuildQuery namedQuery: getBuildSetting().getNamedQueries())
- queries.add(namedQuery.getQuery());
- for (String each: queries) {
- try {
- if (SecurityUtils.getUser() != null || !BuildQuery.parse(null, each).needsLogin()) {
- query = each;
- break;
+ for (String each: queries) {
+ try {
+ if (SecurityUtils.getUser() != null || !BuildQuery.parse(null, each).needsLogin()) {
+ query = each;
+ break;
+ }
+ } catch (Exception e) {
}
- } catch (Exception e) {
- }
- }
+ }
+ }
+ return query;
}
+
+ };
+
+ public BuildListPage(PageParameters params) {
+ super(params);
expectedCount = params.get(PARAM_EXPECTED_COUNT).toOptionalInteger();
}
@@ -73,6 +82,12 @@ public class BuildListPage extends LayoutPage {
return OneDev.getInstance(SettingManager.class).getBuildSetting();
}
+ @Override
+ protected void onDetach() {
+ queryModel.detach();
+ super.onDetach();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -131,7 +146,7 @@ public class BuildListPage extends LayoutPage {
@Override
public PageParameters newPageParameters(int currentPage) {
- PageParameters params = paramsOf(query, null, 0);
+ PageParameters params = paramsOf(queryModel.getObject(), null, 0);
params.add(PARAM_CURRENT_PAGE, currentPage+1);
return params;
}
@@ -143,7 +158,7 @@ public class BuildListPage extends LayoutPage {
};
- add(new BuildListPanel("main", query, expectedCount) {
+ add(new BuildListPanel("main", queryModel.getObject(), expectedCount) {
@Override
protected PagingHistorySupport getPagingHistorySupport() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.java
index 09a5a2a481..99448e4544 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.java
@@ -11,6 +11,8 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
@@ -22,7 +24,6 @@ import io.onedev.server.model.support.QuerySetting;
import io.onedev.server.model.support.administration.IssueSetting;
import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.issue.list.IssueListPanel;
import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;
import io.onedev.server.web.component.modal.ModalPanel;
@@ -41,36 +42,49 @@ public class IssueListPage extends LayoutPage {
private static final String PARAM_QUERY = "query";
- private String query;
-
- public IssueListPage(PageParameters params) {
- super(params);
- query = params.get(PARAM_QUERY).toOptionalString();
- if (query != null && query.length() == 0) {
- query = null;
- List<String> queries = new ArrayList<>();
- if (getLoginUser() != null) {
- for (NamedIssueQuery namedQuery: getLoginUser().getIssueQuerySetting().getUserQueries())
+ private final IModel<String> queryModel = new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ String query = getPageParameters().get(PARAM_QUERY).toOptionalString();
+ if (query != null && query.length() == 0) {
+ query = null;
+ List<String> queries = new ArrayList<>();
+ if (getLoginUser() != null) {
+ for (NamedIssueQuery namedQuery: getLoginUser().getIssueQuerySetting().getUserQueries())
+ queries.add(namedQuery.getQuery());
+ }
+ for (NamedIssueQuery namedQuery: getIssueSetting().getNamedQueries())
queries.add(namedQuery.getQuery());
- }
- for (NamedIssueQuery namedQuery: getIssueSetting().getNamedQueries())
- queries.add(namedQuery.getQuery());
- for (String each: queries) {
- try {
- if (SecurityUtils.getUser() != null || !IssueQuery.parse(null, each, true).needsLogin()) {
- query = each;
- break;
+ for (String each: queries) {
+ try {
+ if (getLoginUser() != null || !IssueQuery.parse(null, each, true).needsLogin()) {
+ query = each;
+ break;
+ }
+ } catch (Exception e) {
}
- } catch (Exception e) {
- }
- }
+ }
+ }
+ return query;
}
+
+ };
+
+ public IssueListPage(PageParameters params) {
+ super(params);
}
protected IssueSetting getIssueSetting() {
return OneDev.getInstance(SettingManager.class).getIssueSetting();
}
+ @Override
+ protected void onDetach() {
+ queryModel.detach();
+ super.onDetach();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -133,7 +147,7 @@ public class IssueListPage extends LayoutPage {
@Override
public PageParameters newPageParameters(int currentPage) {
- PageParameters params = paramsOf(query, 0);
+ PageParameters params = paramsOf(queryModel.getObject(), 0);
params.add(PARAM_CURRENT_PAGE, currentPage+1);
return params;
}
@@ -145,7 +159,7 @@ public class IssueListPage extends LayoutPage {
};
- add(new IssueListPanel("main", query) {
+ add(new IssueListPanel("main", queryModel.getObject()) {
@Override
protected PagingHistorySupport getPagingHistorySupport() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
index 54940b6d59..d031cbb934 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
@@ -9,6 +9,8 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
@@ -41,30 +43,37 @@ public class ProjectBuildsPage extends ProjectPage {
private static final String PARAM_QUERY = "query";
- private String query;
-
- public ProjectBuildsPage(PageParameters params) {
- super(params);
- query = params.get(PARAM_QUERY).toOptionalString();
- if (query != null && query.length() == 0) {
- List<String> queries = new ArrayList<>();
- if (getProject().getBuildQuerySettingOfCurrentUser() != null) {
- for (NamedBuildQuery namedQuery: getProject().getBuildQuerySettingOfCurrentUser().getUserQueries())
+ private final IModel<String> queryModel = new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ String query = getPageParameters().get(PARAM_QUERY).toOptionalString();
+ if (query != null && query.length() == 0) {
+ List<String> queries = new ArrayList<>();
+ if (getProject().getBuildQuerySettingOfCurrentUser() != null) {
+ for (NamedBuildQuery namedQuery: getProject().getBuildQuerySettingOfCurrentUser().getUserQueries())
+ queries.add(namedQuery.getQuery());
+ }
+ for (NamedBuildQuery namedQuery: getProject().getBuildSetting().getNamedQueries(true))
queries.add(namedQuery.getQuery());
- }
- for (NamedBuildQuery namedQuery: getProject().getBuildSetting().getNamedQueries(true))
- queries.add(namedQuery.getQuery());
- query = null;
- for (String each: queries) {
- try {
- if (SecurityUtils.getUser() != null || !BuildQuery.parse(getProject(), each).needsLogin()) {
- query = each;
- break;
+ query = null;
+ for (String each: queries) {
+ try {
+ if (SecurityUtils.getUser() != null || !BuildQuery.parse(getProject(), each).needsLogin()) {
+ query = each;
+ break;
+ }
+ } catch (Exception e) {
}
- } catch (Exception e) {
- }
- }
+ }
+ }
+ return query;
}
+
+ };
+
+ public ProjectBuildsPage(PageParameters params) {
+ super(params);
}
private BuildQuerySettingManager getBuildQuerySettingManager() {
@@ -75,6 +84,12 @@ public class ProjectBuildsPage extends ProjectPage {
return OneDev.getInstance(SettingManager.class).getBuildSetting();
}
+ @Override
+ protected void onDetach() {
+ queryModel.detach();
+ super.onDetach();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -130,7 +145,7 @@ public class ProjectBuildsPage extends ProjectPage {
@Override
public PageParameters newPageParameters(int currentPage) {
- PageParameters params = paramsOf(getProject(), query, 0);
+ PageParameters params = paramsOf(getProject(), queryModel.getObject(), 0);
params.add(PARAM_CURRENT_PAGE, currentPage+1);
return params;
}
@@ -142,7 +157,7 @@ public class ProjectBuildsPage extends ProjectPage {
};
- add(new BuildListPanel("main", query, null) {
+ add(new BuildListPanel("main", queryModel.getObject(), null) {
@Override
protected PagingHistorySupport getPagingHistorySupport() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
index 17beb3ca85..6291a47a2e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
@@ -9,6 +9,8 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
@@ -37,36 +39,49 @@ public class ProjectCodeCommentsPage extends ProjectPage {
private static final String PARAM_QUERY = "query";
- private String query;
-
- public ProjectCodeCommentsPage(PageParameters params) {
- super(params);
- query = params.get(PARAM_QUERY).toString();
- if (query != null && query.length() == 0) {
- query = null;
- List<String> queries = new ArrayList<>();
- if (getProject().getCodeCommentQuerySettingOfCurrentUser() != null) {
- for (NamedCodeCommentQuery namedQuery: getProject().getCodeCommentQuerySettingOfCurrentUser().getUserQueries())
+ private final IModel<String> queryModel = new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ String query = getPageParameters().get(PARAM_QUERY).toString();
+ if (query != null && query.length() == 0) {
+ query = null;
+ List<String> queries = new ArrayList<>();
+ if (getProject().getCodeCommentQuerySettingOfCurrentUser() != null) {
+ for (NamedCodeCommentQuery namedQuery: getProject().getCodeCommentQuerySettingOfCurrentUser().getUserQueries())
+ queries.add(namedQuery.getQuery());
+ }
+ for (NamedCodeCommentQuery namedQuery: getProject().getNamedCodeCommentQueries())
queries.add(namedQuery.getQuery());
- }
- for (NamedCodeCommentQuery namedQuery: getProject().getNamedCodeCommentQueries())
- queries.add(namedQuery.getQuery());
- for (String each: queries) {
- try {
- if (SecurityUtils.getUser() != null || !CodeCommentQuery.parse(getProject(), each).needsLogin()) {
- query = each;
- break;
+ for (String each: queries) {
+ try {
+ if (SecurityUtils.getUser() != null || !CodeCommentQuery.parse(getProject(), each).needsLogin()) {
+ query = each;
+ break;
+ }
+ } catch (Exception e) {
}
- } catch (Exception e) {
- }
- }
+ }
+ }
+ return query;
}
+
+ };
+
+ public ProjectCodeCommentsPage(PageParameters params) {
+ super(params);
}
private CodeCommentQuerySettingManager getCodeCommentQuerySettingManager() {
return OneDev.getInstance(CodeCommentQuerySettingManager.class);
}
+ @Override
+ protected void onDetach() {
+ queryModel.detach();
+ super.onDetach();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -116,7 +131,7 @@ public class ProjectCodeCommentsPage extends ProjectPage {
@Override
public PageParameters newPageParameters(int currentPage) {
- PageParameters params = paramsOf(getProject(), query);
+ PageParameters params = paramsOf(getProject(), queryModel.getObject());
params.add(PARAM_CURRENT_PAGE, currentPage+1);
return params;
}
@@ -128,7 +143,7 @@ public class ProjectCodeCommentsPage extends ProjectPage {
};
- add(new CodeCommentListPanel("main", query) {
+ add(new CodeCommentListPanel("main", queryModel.getObject()) {
@Override
protected Project getProject() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
index c65266df88..4bc95d7f01 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
@@ -9,6 +9,8 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
@@ -36,41 +38,53 @@ public class ProjectCommitsPage extends ProjectPage {
private static final String PARAM_COMMIT_QUERY = "commitQuery";
- private String query;
-
private String compareWith;
+ private final IModel<String> queryModel = new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ String query = getPageParameters().get(PARAM_COMMIT_QUERY).toString();
+ if (query != null && query.length() == 0) {
+ query = null;
+ List<String> queries = new ArrayList<>();
+ if (getProject().getCommitQuerySettingOfCurrentUser() != null) {
+ for (NamedCommitQuery namedQuery: getProject().getCommitQuerySettingOfCurrentUser().getUserQueries())
+ queries.add(namedQuery.getQuery());
+ }
+ for (NamedCommitQuery namedQuery: getProject().getNamedCommitQueries())
+ queries.add(namedQuery.getQuery());
+ for (String each: queries) {
+ try {
+ if (SecurityUtils.getUser() != null || !CommitQuery.parse(getProject(), each).needsLogin()) {
+ query = each;
+ break;
+ }
+ } catch (Exception e) {
+ }
+ }
+ }
+ return query;
+ }
+
+ };
+
public ProjectCommitsPage(PageParameters params) {
super(params);
compareWith = params.get(PARAM_COMPARE_WITH).toString();
-
- query = params.get(PARAM_COMMIT_QUERY).toString();
- if (query != null && query.length() == 0) {
- query = null;
- List<String> queries = new ArrayList<>();
- if (getProject().getCommitQuerySettingOfCurrentUser() != null) {
- for (NamedCommitQuery namedQuery: getProject().getCommitQuerySettingOfCurrentUser().getUserQueries())
- queries.add(namedQuery.getQuery());
- }
- for (NamedCommitQuery namedQuery: getProject().getNamedCommitQueries())
- queries.add(namedQuery.getQuery());
- for (String each: queries) {
- try {
- if (SecurityUtils.getUser() != null || !CommitQuery.parse(getProject(), each).needsLogin()) {
- query = each;
- break;
- }
- } catch (Exception e) {
- }
- }
- }
}
private CommitQuerySettingManager getCommitQuerySettingManager() {
return OneDev.getInstance(CommitQuerySettingManager.class);
}
+ @Override
+ protected void onDetach() {
+ queryModel.detach();
+ super.onDetach();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -90,9 +104,8 @@ public class ProjectCommitsPage extends ProjectPage {
@Override
protected Link<Void> newQueryLink(String componentId, NamedCommitQuery namedQuery) {
- query = namedQuery.getQuery();
return new BookmarkablePageLink<Void>(componentId, ProjectCommitsPage.class,
- ProjectCommitsPage.paramsOf(getProject(), query, compareWith));
+ ProjectCommitsPage.paramsOf(getProject(), namedQuery.getQuery(), compareWith));
}
@Override
@@ -118,7 +131,7 @@ public class ProjectCommitsPage extends ProjectPage {
});
- add(new CommitListPanel("main", query) {
+ add(new CommitListPanel("main", queryModel.getObject()) {
@Override
protected void onQueryUpdated(AjaxRequestTarget target, String query) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
index f1c6457dba..8487ec741e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
@@ -9,6 +9,8 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
@@ -39,37 +41,49 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
private static final String PARAM_QUERY = "query";
- private String query;
-
- public ProjectIssueListPage(PageParameters params) {
- super(params);
-
- query = params.get(PARAM_QUERY).toOptionalString();
- if (query != null && query.length() == 0) {
- query = null;
- List<String> queries = new ArrayList<>();
- if (getProject().getIssueQuerySettingOfCurrentUser() != null) {
- for (NamedIssueQuery namedQuery: getProject().getIssueQuerySettingOfCurrentUser().getUserQueries())
+ private final IModel<String> queryModel = new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ String query = getPageParameters().get(PARAM_QUERY).toOptionalString();
+ if (query != null && query.length() == 0) {
+ query = null;
+ List<String> queries = new ArrayList<>();
+ if (getProject().getIssueQuerySettingOfCurrentUser() != null) {
+ for (NamedIssueQuery namedQuery: getProject().getIssueQuerySettingOfCurrentUser().getUserQueries())
+ queries.add(namedQuery.getQuery());
+ }
+ for (NamedIssueQuery namedQuery: getProject().getIssueSetting().getNamedQueries(true))
queries.add(namedQuery.getQuery());
- }
- for (NamedIssueQuery namedQuery: getProject().getIssueSetting().getNamedQueries(true))
- queries.add(namedQuery.getQuery());
- for (String each: queries) {
- try {
- if (SecurityUtils.getUser() != null || !IssueQuery.parse(getProject(), each, true).needsLogin()) {
- query = each;
- break;
+ for (String each: queries) {
+ try {
+ if (SecurityUtils.getUser() != null || !IssueQuery.parse(getProject(), each, true).needsLogin()) {
+ query = each;
+ break;
+ }
+ } catch (Exception e) {
}
- } catch (Exception e) {
- }
- }
+ }
+ }
+ return query;
}
+
+ };
+
+ public ProjectIssueListPage(PageParameters params) {
+ super(params);
}
private IssueQuerySettingManager getIssueQuerySettingManager() {
return OneDev.getInstance(IssueQuerySettingManager.class);
}
+ @Override
+ protected void onDetach() {
+ queryModel.detach();
+ super.onDetach();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -125,7 +139,7 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
@Override
public PageParameters newPageParameters(int currentPage) {
- PageParameters params = paramsOf(getProject(), query, 0);
+ PageParameters params = paramsOf(getProject(), queryModel.getObject(), 0);
params.add(PARAM_CURRENT_PAGE, currentPage+1);
return params;
}
@@ -137,7 +151,7 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
};
- add(new IssueListPanel("main", query) {
+ add(new IssueListPanel("main", queryModel.getObject()) {
@Override
protected PagingHistorySupport getPagingHistorySupport() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
index 2ec2880012..7b98461797 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
@@ -11,6 +11,8 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
@@ -43,30 +45,37 @@ public class ProjectPullRequestsPage extends ProjectPage {
private static final String PARAM_QUERY = "query";
- private String query;
-
- public ProjectPullRequestsPage(PageParameters params) {
- super(params);
- query = params.get(PARAM_QUERY).toOptionalString();
- if (query != null && query.length() == 0) {
- query = null;
- List<String> queries = new ArrayList<>();
- if (getProject().getPullRequestQuerySettingOfCurrentUser() != null) {
- for (NamedPullRequestQuery namedQuery: getProject().getPullRequestQuerySettingOfCurrentUser().getUserQueries())
+ private final IModel<String> queryModel = new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ String query = getPageParameters().get(PARAM_QUERY).toOptionalString();
+ if (query != null && query.length() == 0) {
+ query = null;
+ List<String> queries = new ArrayList<>();
+ if (getProject().getPullRequestQuerySettingOfCurrentUser() != null) {
+ for (NamedPullRequestQuery namedQuery: getProject().getPullRequestQuerySettingOfCurrentUser().getUserQueries())
+ queries.add(namedQuery.getQuery());
+ }
+ for (NamedPullRequestQuery namedQuery: getProject().getPullRequestSetting().getNamedQueries(true))
queries.add(namedQuery.getQuery());
- }
- for (NamedPullRequestQuery namedQuery: getProject().getPullRequestSetting().getNamedQueries(true))
- queries.add(namedQuery.getQuery());
- for (String each: queries) {
- try {
- if (SecurityUtils.getUser() != null || !PullRequestQuery.parse(getProject(), each).needsLogin()) {
- query = each;
- break;
+ for (String each: queries) {
+ try {
+ if (SecurityUtils.getUser() != null || !PullRequestQuery.parse(getProject(), each).needsLogin()) {
+ query = each;
+ break;
+ }
+ } catch (Exception e) {
}
- } catch (Exception e) {
- }
- }
+ }
+ }
+ return query;
}
+
+ };
+
+ public ProjectPullRequestsPage(PageParameters params) {
+ super(params);
}
private PullRequestQuerySettingManager getPullRequestQuerySettingManager() {
@@ -77,6 +86,12 @@ public class ProjectPullRequestsPage extends ProjectPage {
return OneDev.getInstance(SettingManager.class).getPullRequestSetting();
}
+ @Override
+ protected void onDetach() {
+ queryModel.detach();
+ super.onDetach();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -132,7 +147,7 @@ public class ProjectPullRequestsPage extends ProjectPage {
@Override
public PageParameters newPageParameters(int currentPage) {
- PageParameters params = paramsOf(getProject(), query, 0);
+ PageParameters params = paramsOf(getProject(), queryModel.getObject(), 0);
params.add(PARAM_CURRENT_PAGE, currentPage+1);
return params;
}
@@ -144,7 +159,7 @@ public class ProjectPullRequestsPage extends ProjectPage {
};
- add(new PullRequestListPanel("main", query) {
+ add(new PullRequestListPanel("main", queryModel.getObject()) {
@Override
protected PagingHistorySupport getPagingHistorySupport() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.java b/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.java
index 25cddc3a50..3e81c7f502 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.java
@@ -11,6 +11,8 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
@@ -40,37 +42,50 @@ public class PullRequestListPage extends LayoutPage {
private static final String PARAM_QUERY = "query";
- private String query;
-
- public PullRequestListPage(PageParameters params) {
- super(params);
- query = params.get(PARAM_QUERY).toOptionalString();
- if (query != null && query.length() == 0) {
- query = null;
- List<String> queries = new ArrayList<>();
- if (getLoginUser() != null) {
- for (NamedPullRequestQuery namedQuery: getLoginUser().getPullRequestQuerySetting().getUserQueries())
+ private final IModel<String> queryModel = new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ String query = getPageParameters().get(PARAM_QUERY).toOptionalString();
+ if (query != null && query.length() == 0) {
+ query = null;
+ List<String> queries = new ArrayList<>();
+ if (getLoginUser() != null) {
+ for (NamedPullRequestQuery namedQuery: getLoginUser().getPullRequestQuerySetting().getUserQueries())
+ queries.add(namedQuery.getQuery());
+ }
+ for (NamedPullRequestQuery namedQuery: getPullRequestSetting().getNamedQueries())
queries.add(namedQuery.getQuery());
- }
- for (NamedPullRequestQuery namedQuery: getPullRequestSetting().getNamedQueries())
- queries.add(namedQuery.getQuery());
-
- for (String each: queries) {
- try {
- if (SecurityUtils.getUser() != null || !PullRequestQuery.parse(null, each).needsLogin()) {
- query = each;
- break;
+
+ for (String each: queries) {
+ try {
+ if (SecurityUtils.getUser() != null || !PullRequestQuery.parse(null, each).needsLogin()) {
+ query = each;
+ break;
+ }
+ } catch (Exception e) {
}
- } catch (Exception e) {
- }
- }
+ }
+ }
+ return query;
}
+
+ };
+
+ public PullRequestListPage(PageParameters params) {
+ super(params);
}
protected PullRequestSetting getPullRequestSetting() {
return OneDev.getInstance(SettingManager.class).getPullRequestSetting();
}
+ @Override
+ protected void onDetach() {
+ queryModel.detach();
+ super.onDetach();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -124,7 +139,7 @@ public class PullRequestListPage extends LayoutPage {
@Override
public PageParameters newPageParameters(int currentPage) {
- PageParameters params = paramsOf(query, 0);
+ PageParameters params = paramsOf(queryModel.getObject(), 0);
params.add(PARAM_CURRENT_PAGE, currentPage+1);
return params;
}
@@ -136,7 +151,7 @@ public class PullRequestListPage extends LayoutPage {
};
- add(new PullRequestListPanel("main", query) {
+ add(new PullRequestListPanel("main", queryModel.getObject()) {
@Override
protected PagingHistorySupport getPagingHistorySupport() {