SAK-41630 pasystem, announcement, Podcast, postem: commons-lang => co…

…mmons-lang3 (sakaiproject#6750)
elhakimfirdaus · Apr 5, 2019 · 2b863dc · 2b863dc
1 parent 87d69fb
commit 2b863dc
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 39 deletions.
diff --git a/...ment-impl/impl/src/java/org/sakaiproject/announcement/impl/SiteEmailNotificationAnnc.java b/...ment-impl/impl/src/java/org/sakaiproject/announcement/impl/SiteEmailNotificationAnnc.java
@@ -25,7 +25,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.sakaiproject.announcement.api.AnnouncementMessage;
 import org.sakaiproject.announcement.api.AnnouncementMessageEdit;
 import org.sakaiproject.announcement.api.AnnouncementMessageHeader;

diff --git a/announcement/announcement-tool/tool/pom.xml b/announcement/announcement-tool/tool/pom.xml
@@ -65,8 +65,8 @@
             <artifactId>sakai-velocity-tool</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>

diff --git a/...src/java/org/sakaiproject/announcement/entityprovider/AnnouncementEntityProviderImpl.java b/...src/java/org/sakaiproject/announcement/entityprovider/AnnouncementEntityProviderImpl.java
@@ -35,8 +35,8 @@
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 
 import org.sakaiproject.announcement.api.AnnouncementChannel;
 import org.sakaiproject.announcement.api.AnnouncementMessage;

diff --git a/...nnouncement-tool/tool/src/java/org/sakaiproject/announcement/tool/AnnouncementAction.java b/...nnouncement-tool/tool/src/java/org/sakaiproject/announcement/tool/AnnouncementAction.java
@@ -37,7 +37,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

diff --git a/...cement-tool/tool/src/java/org/sakaiproject/announcement/tool/AnnouncementActionState.java b/...cement-tool/tool/src/java/org/sakaiproject/announcement/tool/AnnouncementActionState.java
@@ -31,7 +31,7 @@
 import java.util.Set;
 import java.util.Vector;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.sakaiproject.announcement.api.AnnouncementMessageEdit;
 import org.sakaiproject.cheftool.ControllerState;
 import org.sakaiproject.entity.cover.EntityManager;

diff --git a/pasystem/pasystem-impl/impl/pom.xml b/pasystem/pasystem-impl/impl/pom.xml
@@ -48,10 +48,6 @@
       <artifactId>commons-lang3</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.sakaiproject.entitybroker</groupId>
       <artifactId>entitybroker-api</artifactId>

diff --git a/...system-impl/impl/src/java/org/sakaiproject/pasystem/impl/rest/PASystemEntityProvider.java b/...system-impl/impl/src/java/org/sakaiproject/pasystem/impl/rest/PASystemEntityProvider.java
@@ -28,10 +28,8 @@
 import java.util.Map;
 import java.util.TimeZone;
 
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.json.simple.JSONObject;
-
 import org.sakaiproject.component.cover.ComponentManager;
 import org.sakaiproject.entitybroker.DeveloperHelperService;
 import org.sakaiproject.entitybroker.EntityView;
@@ -43,8 +41,8 @@
 import org.sakaiproject.entitybroker.entityprovider.capabilities.Describeable;
 import org.sakaiproject.entitybroker.entityprovider.capabilities.Outputable;
 import org.sakaiproject.entitybroker.entityprovider.extension.Formats;
-import org.sakaiproject.pasystem.api.Acknowledger;
 import org.sakaiproject.pasystem.api.AcknowledgementType;
+import org.sakaiproject.pasystem.api.Acknowledger;
 import org.sakaiproject.pasystem.api.PASystem;
 import org.sakaiproject.site.api.Site;
 import org.sakaiproject.site.api.ToolConfiguration;
@@ -54,6 +52,8 @@
 import org.sakaiproject.user.api.User;
 import org.sakaiproject.user.cover.UserDirectoryService;
 
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * Web services supporting AJAX requests from the PA System end user display.
  */

diff --git a/podcasts/podcasts-app/pom.xml b/podcasts/podcasts-app/pom.xml
@@ -71,8 +71,8 @@
       <artifactId>spring-beans</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
     <dependency>
         <groupId>javax.servlet</groupId>

diff --git a/...ts-app/src/java/org/sakaiproject/tool/podcasts/entityproviders/PodcastEntityProvider.java b/...ts-app/src/java/org/sakaiproject/tool/podcasts/entityproviders/PodcastEntityProvider.java
@@ -18,10 +18,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.sakaiproject.api.app.podcasts.PodcastService;
 import org.sakaiproject.content.api.ContentResource;
 import org.sakaiproject.entity.api.ResourceProperties;
@@ -42,6 +39,10 @@
 import org.sakaiproject.site.api.ToolConfiguration;
 import org.sakaiproject.tool.api.ToolManager;
 
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * Entity provider for the Podcast tool
  */

diff --git a/postem/postem-app/pom.xml b/postem/postem-app/pom.xml
@@ -103,6 +103,10 @@
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
       <artifactId>javax.servlet.jsp-api</artifactId>

diff --git a/postem/postem-app/src/java/org/sakaiproject/tool/postem/PostemTool.java b/postem/postem-app/src/java/org/sakaiproject/tool/postem/PostemTool.java
@@ -39,7 +39,7 @@
 import javax.faces.context.FacesContext;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.myfaces.shared_impl.util.MessageUtils;
 
 import org.sakaiproject.api.app.postem.data.Gradebook;
@@ -281,7 +281,7 @@ public String getCurrentStudentGrades() {
 		}
 		if (currentStudent == null) {	
 			return "<p>" + msgs.getFormattedMessage("no_grades_for_user", 
-					new Object[]{StringEscapeUtils.escapeHtml(currentGradebook.getTitle())}) + "</p>";
+					new Object[]{StringEscapeUtils.escapeHtml3(currentGradebook.getTitle())}) + "</p>";
 		}
 		return currentStudent.formatGrades();
 
@@ -294,7 +294,7 @@ public String getFirstStudentGrades() {
 		Set students = currentGradebook.getStudents();
 		if (students.size() == 0) {
 			return "<p>" + msgs.getFormattedMessage("no_grades_in_gradebook", 
-					new Object[]{StringEscapeUtils.escapeHtml(currentGradebook.getTitle())}) + "</p>";
+					new Object[]{StringEscapeUtils.escapeHtml3(currentGradebook.getTitle())}) + "</p>";
 		}
 		if (currentGradebook.getFirstUploadedUsername() != null) {
 			StudentGrades student = currentGradebook.studentGrades(currentGradebook.getFirstUploadedUsername());
@@ -312,7 +312,7 @@ public String getSelectedStudentGrades() {
 
 		if (currentGradebook.getUsernames() == null || currentGradebook.getUsernames().isEmpty()) {
 			return "<p>" + msgs.getFormattedMessage("no_grades_in_gradebook", 
-					new Object[]{StringEscapeUtils.escapeHtml(currentGradebook.getTitle())}) + "</p>";
+					new Object[]{StringEscapeUtils.escapeHtml3(currentGradebook.getTitle())}) + "</p>";
 		}
 
 		if (selectedStudent == null || selectedStudent.equals("")) {

diff --git a/postem/postem-hbm/pom.xml b/postem/postem-hbm/pom.xml
@@ -30,8 +30,8 @@
     </dependency>
 <!--org.sakaiprojectsakai-user-api${sakai.version}-->
      <dependency>
-    	<groupId>commons-lang</groupId>
-    	<artifactId>commons-lang</artifactId>
+    	<groupId>org.apache.commons</groupId>
+    	<artifactId>commons-lang3</artifactId>
     </dependency>
   </dependencies>
   <build>

diff --git a/postem/postem-hbm/src/java/org/sakaiproject/component/app/postem/data/GradebookImpl.java b/postem/postem-hbm/src/java/org/sakaiproject/component/app/postem/data/GradebookImpl.java
@@ -35,12 +35,10 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.apache.commons.lang.StringEscapeUtils;
-//import org.apache.commons.math.stat.descriptive.SummaryStatistics;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.sakaiproject.api.app.postem.data.Gradebook;
 import org.sakaiproject.api.app.postem.data.StudentGrades;
 import org.sakaiproject.api.app.postem.data.Template;
-
 import org.sakaiproject.user.api.UserNotDefinedException;
 import org.sakaiproject.user.cover.UserDirectoryService;
 
@@ -330,7 +328,7 @@ public String getHeadingsRow() {
 			headingBuffer.append(";' >");
 			headingBuffer.append(current);
 			headingBuffer.append("</th>");*/
-			headingBuffer.append("<th style=\"padding: 0.6em;\" scope=\"col\">" + StringEscapeUtils.escapeHtml(current) + "</th>");
+			headingBuffer.append("<th style=\"padding: 0.6em;\" scope=\"col\">" + StringEscapeUtils.escapeHtml3(current) + "</th>");
 			ii++;
 		}
 		/*StringBuilder newBuffer = new StringBuilder();

diff --git a/postem/postem-hbm/src/java/org/sakaiproject/component/app/postem/data/StudentGradesImpl.java b/postem/postem-hbm/src/java/org/sakaiproject/component/app/postem/data/StudentGradesImpl.java
@@ -30,7 +30,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.sakaiproject.api.app.postem.data.Gradebook;
 import org.sakaiproject.api.app.postem.data.StudentGrades;
 import org.sakaiproject.api.app.postem.data.Template;
@@ -168,28 +168,28 @@ public String formatGrades() {
 			gradeBuffer.append("<table class=\"itemSummary\">");
 
 			if (h2.size() != 0) {
-				gradeBuffer.append("<tr><th scope=\"row\">" + StringEscapeUtils.escapeHtml(h2.get(0).toString()) + "</th><td>");
+				gradeBuffer.append("<tr><th scope=\"row\">" + StringEscapeUtils.escapeHtml3(h2.get(0).toString()) + "</th><td>");
 				h2.remove(0);
-				gradeBuffer.append(StringEscapeUtils.escapeHtml(getUsername()));
+				gradeBuffer.append(StringEscapeUtils.escapeHtml3(getUsername()));
 				gradeBuffer.append("</td></tr>");
 				Iterator ii = h2.iterator();
 				Iterator jj = grades.iterator();
 
 				while (ii.hasNext()) {
 					gradeBuffer.append("<tr><th scope=\"row\">");
-					gradeBuffer.append(StringEscapeUtils.escapeHtml((String) ii.next()));
+					gradeBuffer.append(StringEscapeUtils.escapeHtml3((String) ii.next()));
 					gradeBuffer.append("</th><td>");
-					gradeBuffer.append(StringEscapeUtils.escapeHtml((String) jj.next()));
+					gradeBuffer.append(StringEscapeUtils.escapeHtml3((String) jj.next()));
 					gradeBuffer.append("</td></tr>");
 				}
 			} else {
 				gradeBuffer.append("<tr><td>");
-				gradeBuffer.append(StringEscapeUtils.escapeHtml(getUsername()));
+				gradeBuffer.append(StringEscapeUtils.escapeHtml3(getUsername()));
 				gradeBuffer.append("</td></tr>");
 				Iterator jj = grades.iterator();
 				while (jj.hasNext()) {
 					gradeBuffer.append("<tr><td>");
-					gradeBuffer.append(StringEscapeUtils.escapeHtml((String) jj.next()));
+					gradeBuffer.append(StringEscapeUtils.escapeHtml3((String) jj.next()));
 					gradeBuffer.append("</td></tr>");
 				}
 			}
@@ -220,7 +220,7 @@ public String getGradesRow() {
 			gradeBuffer.append(width);
 			gradeBuffer.append(";' >");*/
 			gradeBuffer.append("<td style=\"padding:0.6em;\">");
-			gradeBuffer.append(StringEscapeUtils.escapeHtml(current));
+			gradeBuffer.append(StringEscapeUtils.escapeHtml3(current));
 			gradeBuffer.append("</td>");
 			ii++;
 		}