The Unified and Autonomous Development Platform
Fix issue #1088 - Increase various description/comment length to sufficiently large
Robin Shen4cc0fd0ec699
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.javaindex b44c92da0c..348d7d716a 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java@@ -747,6 +747,9 @@ public class Upgrade extends AbstractPlugin {hibernateProps = StringUtils.replace(hibernateProps,"hibernate.javax.cache.missing_cache_strategy=create","");+ hibernateProps = StringUtils.replace(hibernateProps,+ "org.hibernate.dialect.Oracle12cDialect",+ "io.onedev.server.persistence.OracleDialect");FileUtils.writeStringToFile(hibernatePropsFile, hibernateProps, StandardCharsets.UTF_8);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex d23bf68391..ea129ea127 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -267,7 +267,6 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssfieldManager.populateFields(issues);linkManager.populateLinks(issues);}-return issues;}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex b9d1776452..0d5729efb3 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -781,7 +781,6 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>EntityQuery<PullRequest> requestQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();CriteriaQuery<PullRequest> query = builder.createQuery(PullRequest.class);- query.distinct(true);Root<PullRequest> root = query.from(PullRequest.class);query.where(getPredicates(targetProject, requestQuery.getCriteria(), query, root, builder));@@ -832,7 +831,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>criteriaQuery.where(getPredicates(targetProject, requestCriteria, criteriaQuery, root, builder));- criteriaQuery.select(builder.countDistinct(root));+ criteriaQuery.select(builder.count(root));return getSession().createQuery(criteriaQuery).uniqueResult().intValue();}diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.javaindex 9286aa8da6..803afe3146 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java@@ -48,7 +48,7 @@ public class CodeComment extends ProjectBelonging implements AttachmentStorageSuprivate static final long serialVersionUID = 1L;- public static final int MAX_CONTENT_LEN = 14000;+ public static final int MAX_CONTENT_LEN = 100000;public static final String PROP_PROJECT = "project";diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex 2b6564c355..dec09a52d4 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -1,57 +1,8 @@package io.onedev.server.model;-import static io.onedev.server.model.AbstractEntity.PROP_NUMBER;-import static io.onedev.server.model.Issue.PROP_COMMENT_COUNT;-import static io.onedev.server.model.Issue.PROP_NO_SPACE_TITLE;-import static io.onedev.server.model.Issue.PROP_STATE;-import static io.onedev.server.model.Issue.PROP_SUBMIT_DATE;-import static io.onedev.server.model.Issue.PROP_TITLE;-import static io.onedev.server.model.Issue.PROP_UUID;-import static io.onedev.server.model.Issue.PROP_VOTE_COUNT;-import static io.onedev.server.model.IssueSchedule.NAME_MILESTONE;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Comparator;-import java.util.Date;-import java.util.HashMap;-import java.util.HashSet;-import java.util.Iterator;-import java.util.LinkedHashMap;-import java.util.LinkedHashSet;-import java.util.List;-import java.util.Map;-import java.util.Set;-import java.util.Stack;-import java.util.UUID;-import java.util.stream.Collectors;--import javax.annotation.Nullable;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Embedded;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;--import io.onedev.server.rest.annotation.Api;-import org.apache.commons.lang3.StringUtils;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.RevCommit;-import org.hibernate.annotations.Cache;-import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.hibernate.annotations.DynamicUpdate;-import com.fasterxml.jackson.annotation.JsonIgnore;import com.google.common.collect.Lists;import com.google.common.collect.Sets;-import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;import io.onedev.server.attachment.AttachmentStorageSupport;@@ -69,6 +20,7 @@ import io.onedev.server.model.support.ProjectBelonging;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.model.support.issue.field.spec.FieldSpec;+import io.onedev.server.rest.annotation.Api;import io.onedev.server.search.entity.SortField;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ComponentContext;@@ -80,6 +32,22 @@ import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.util.IssueAware;import io.onedev.server.web.util.WicketUtils;+import org.apache.commons.lang3.StringUtils;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;+import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;+import org.hibernate.annotations.DynamicUpdate;++import javax.annotation.Nullable;+import javax.persistence.*;+import java.io.Serializable;+import java.util.*;+import java.util.stream.Collectors;++import static io.onedev.server.model.AbstractEntity.PROP_NUMBER;+import static io.onedev.server.model.Issue.*;+import static io.onedev.server.model.IssueSchedule.NAME_MILESTONE;@Entity@Table(@@ -101,7 +69,7 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachmentpublic static final int MAX_TITLE_LEN = 255;- public static final int MAX_DESCRIPTION_LEN = 14000;+ public static final int MAX_DESCRIPTION_LEN = 100000;public static final String NAME_PROJECT = "Project";diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex d939de8d95..0eb0a65420 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -89,7 +89,7 @@ public class PullRequest extends ProjectBelongingpublic static final int MAX_TITLE_LEN = 255;- public static final int MAX_DESCRIPTION_LEN = 12000;+ public static final int MAX_DESCRIPTION_LEN = 100000;public static final String NAME_STATUS = "Status";diff --git a/server-core/src/main/java/io/onedev/server/model/support/EntityComment.java b/server-core/src/main/java/io/onedev/server/model/support/EntityComment.javaindex 1dadb4a41e..37daffa169 100644--- a/server-core/src/main/java/io/onedev/server/model/support/EntityComment.java+++ b/server-core/src/main/java/io/onedev/server/model/support/EntityComment.java@@ -14,7 +14,7 @@ public abstract class EntityComment extends AbstractEntity {private static final long serialVersionUID = 1L;- public static final int MAX_CONTENT_LEN = 15000;+ public static final int MAX_CONTENT_LEN = 100000;public static final String PROP_CONTENT = "content";diff --git a/server-core/src/main/java/io/onedev/server/persistence/OracleDialect.java b/server-core/src/main/java/io/onedev/server/persistence/OracleDialect.javanew file mode 100644index 0000000000..509d527973--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/persistence/OracleDialect.java@@ -0,0 +1,14 @@+package io.onedev.server.persistence;++import org.hibernate.dialect.Oracle12cDialect;++import java.sql.Types;++public class OracleDialect extends Oracle12cDialect {+ @Override+ protected void registerCharacterTypeMappings() {+ super.registerCharacterTypeMappings();+ registerColumnType( Types.VARCHAR, "clob" );+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.javaindex f27f6bc72d..7de0a7e7fc 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java@@ -1,17 +1,11 @@package io.onedev.server.search.entity.pullrequest;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestComment;import io.onedev.server.util.criteria.Criteria;+import javax.persistence.criteria.*;+public class CommentCriteria extends Criteria<PullRequest> {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex 2635e99f32..9cf6f8ec94 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -1,43 +1,6 @@package io.onedev.server.web.component.issue.create;-import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Date;-import java.util.List;-import java.util.UUID;--import javax.annotation.Nullable;--import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.CallbackParameter;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.event.IEvent;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.form.CheckBox;-import org.apache.wicket.markup.html.form.FormComponentPanel;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.IRequestParameters;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.util.convert.ConversionException;-import org.apache.wicket.validation.IErrorMessageSource;-import org.apache.wicket.validation.IValidatable;-import org.apache.wicket.validation.IValidationError;-import org.apache.wicket.validation.IValidator;-import org.unbescape.javascript.JavaScriptEscape;-import com.google.common.base.Objects;-import io.onedev.server.OneDev;import io.onedev.server.attachment.AttachmentSupport;import io.onedev.server.attachment.ProjectAttachmentSupport;@@ -70,6 +33,36 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.BeanUpdating;import io.onedev.server.web.util.Cursor;+import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.CallbackParameter;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.form.CheckBox;+import org.apache.wicket.markup.html.form.FormComponentPanel;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.IRequestParameters;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.util.convert.ConversionException;+import org.apache.wicket.validation.IErrorMessageSource;+import org.apache.wicket.validation.IValidatable;+import org.apache.wicket.validation.IValidationError;+import org.apache.wicket.validation.IValidator;+import org.unbescape.javascript.JavaScriptEscape;++import javax.annotation.Nullable;+import java.io.Serializable;+import java.util.*;@SuppressWarnings("serial")public abstract class NewIssueEditor extends FormComponentPanel<Issue> implements InputContext {diff --git a/server-product/system/conf/hibernate.properties b/server-product/system/conf/hibernate.propertiesindex 2b77e3b24c..f8699d0501 100644--- a/server-product/system/conf/hibernate.properties+++ b/server-product/system/conf/hibernate.properties@@ -97,7 +97,7 @@ hibernate.connection.password=# is used#-----------------------------------------------------------------------------------#hibernate.dialect=org.hibernate.dialect.Oracle12cDialect+#hibernate.dialect=io.onedev.server.persistence.OracleDialect#hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver#hibernate.connection.url=jdbc:oracle:thin:@localhost:1521/XEPDB1#hibernate.connection.username=ONEDEV