SAK-51003 Kernel SiteService limit column TITLE to a length of 99 cha…

…rs (#13313)
sakaiproject · Feb 17, 2025 · 214aa43 · 214aa43
1 parent 2592eb0
commit 214aa43
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java
@@ -327,7 +327,7 @@ protected void saveTx(Site edit)
 				fields = new Object[6];
 				fields[0] = page.getId();
 				fields[1] = caseId(edit.getId());
-				fields[2] = page.getTitle();
+				fields[2] = StringUtils.abbreviate(StringUtils.trimToEmpty(page.getTitle()), SiteServiceSqlDefault.TITLE_MAX_LENGTH);
 				fields[3] = Integer.toString(page.getLayout());
 				fields[4] = ((((BaseSitePage) page).m_popup) ? "1" : "0");
 				fields[5] = Integer.valueOf(pageOrder++);
@@ -352,7 +352,7 @@ protected void saveTx(Site edit)
 					fields[2] = caseId(edit.getId());
 					fields[3] = tool.getToolId();
 					fields[4] = Integer.valueOf(toolOrder++);
-					fields[5] = tool.getTitle();
+					fields[5] = StringUtils.abbreviate(StringUtils.trimToEmpty(tool.getTitle()), SiteServiceSqlDefault.TITLE_MAX_LENGTH);
 					fields[6] = tool.getLayoutHints();
 					m_sql.dbWrite(statement, fields);
 
@@ -365,9 +365,9 @@ protected void saveTx(Site edit)
 			// add each group
 			for (Iterator<Group> iGroups = edit.getGroups().iterator(); iGroups.hasNext();)
 			{
-				Group group = (Group) iGroups.next();
+				Group group = iGroups.next();
 				//does the group have a title?
-				if (group.getTitle() == null || group.getTitle().trim().length() == 0)
+				if (group.getTitle() == null || group.getTitle().trim().isEmpty())
 				{
 					throw new IllegalArgumentException("Group title can't be empty");
 				}
@@ -378,7 +378,7 @@ protected void saveTx(Site edit)
 				fields = new Object[4];
 				fields[0] = group.getId();
 				fields[1] = caseId(edit.getId());
-				fields[2] = group.getTitle();
+				fields[2] = StringUtils.abbreviate(StringUtils.trimToEmpty(group.getTitle()), SiteServiceSqlDefault.TITLE_MAX_LENGTH);
 				fields[3] = group.getDescription();
 				m_sql.dbWrite(statement, fields);
 
@@ -506,7 +506,7 @@ protected void saveToolConfigTx(ToolConfiguration tool)
 			fields[2] = caseId(tool.getSiteId());
 			fields[3] = tool.getToolId();
 			fields[4] = Integer.valueOf(tool.getPageOrder());
-			fields[5] = tool.getTitle();
+			fields[5] = StringUtils.abbreviate(StringUtils.trimToEmpty(tool.getTitle()), SiteServiceSqlDefault.TITLE_MAX_LENGTH);
 			fields[6] = tool.getLayoutHints();
 			m_sql.dbWrite(statement, fields);
 

diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/SiteServiceSqlDefault.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/SiteServiceSqlDefault.java
@@ -28,6 +28,8 @@
  */
 public class SiteServiceSqlDefault implements SiteServiceSql
 {
+	public static final int TITLE_MAX_LENGTH = 99;
+
 	/**
 	 * returns the sql statement which deletes the groups for a given site from the sakai_site_group table.
 	 */
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,8 @@ @@
      */
     public class SiteServiceSqlDefault implements SiteServiceSql
     {
+    	public static final int TITLE_MAX_LENGTH = 99;
     	/**
     	 * returns the sql statement which deletes the groups for a given site from the sakai_site_group table.
     	 */
@@ Expand Down @@