SAK-43084 Deprecated Validator.getFileName => (commons-io) FilenameUt…

…ils.getName (sakaiproject#7822)
kusmayady · Jan 31, 2020 · a4447db · a4447db
1 parent d5b4e7c
commit a4447db
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 30 deletions.
diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
@@ -58,6 +58,7 @@
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -13645,7 +13646,7 @@ public void doAttachUpload(RunData data, boolean singleFileUpload) {
             // only if in the single file upload case, need to warn user to upload a local file
             addAlert(state, rb.getString("choosefile7"));
         } else if (fileitem.getFileName().length() > 0) {
-            String filename = Validator.getFileName(fileitem.getFileName());
+            String filename = FilenameUtils.getName(fileitem.getFileName());
             InputStream fileContentStream = fileitem.getInputStream();
             String contentType = fileitem.getContentType();
 
@@ -13657,7 +13658,7 @@ public void doAttachUpload(RunData data, boolean singleFileUpload) {
                     addAlert(state, rb.getFormattedMessage("attempty", filename));
                 } else {
                     // we just want the file name part - strip off any drive and path stuff
-                    String name = Validator.getFileName(filename);
+                    String name = FilenameUtils.getName(filename);
                     String resourceId = Validator.escapeResourceName(name);
 
                     // make a set of properties to add for the new resource

diff --git a/content/content-tool/tool/src/java/org/sakaiproject/content/tool/FilePickerAction.java b/content/content-tool/tool/src/java/org/sakaiproject/content/tool/FilePickerAction.java
@@ -21,34 +21,36 @@
 
 package org.sakaiproject.content.tool;
 
+import static org.sakaiproject.content.util.IdUtil.isolateName;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLDecoder;
-import java.util.Arrays;
 import java.util.ArrayList;
-import java.util.Comparator;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.Vector;
-import java.util.Map.Entry;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.sakaiproject.antivirus.api.VirusFoundException;
 import org.sakaiproject.authz.api.SecurityAdvisor;
@@ -62,29 +64,29 @@
 import org.sakaiproject.component.cover.ServerConfigurationService;
 import org.sakaiproject.content.api.ContentCollection;
 import org.sakaiproject.content.api.ContentCollectionEdit;
-import org.sakaiproject.content.api.ContentHostingService;
 import org.sakaiproject.content.api.ContentEntity;
+import org.sakaiproject.content.api.ContentHostingService;
 import org.sakaiproject.content.api.ContentResource;
 import org.sakaiproject.content.api.ContentResourceEdit;
 import org.sakaiproject.content.api.ContentResourceFilter;
 import org.sakaiproject.content.api.ContentTypeImageService;
 import org.sakaiproject.content.api.FilePickerHelper;
+import org.sakaiproject.content.api.GroupAwareEntity.AccessMode;
 import org.sakaiproject.content.api.InteractionAction;
 import org.sakaiproject.content.api.ResourceToolAction;
 import org.sakaiproject.content.api.ResourceToolActionPipe;
 import org.sakaiproject.content.api.ResourceType;
 import org.sakaiproject.content.api.ResourceTypeRegistry;
 import org.sakaiproject.content.api.ServiceLevelAction;
-import org.sakaiproject.content.api.GroupAwareEntity.AccessMode;
 import org.sakaiproject.content.tool.ResourcesAction.ChefPathItem;
+import org.sakaiproject.entity.api.EntityManager;
 import org.sakaiproject.entity.api.EntityPropertyNotDefinedException;
 import org.sakaiproject.entity.api.EntityPropertyTypeException;
 import org.sakaiproject.entity.api.Reference;
 import org.sakaiproject.entity.api.ResourceProperties;
 import org.sakaiproject.entity.api.ResourcePropertiesEdit;
-import org.sakaiproject.entity.api.EntityManager;
-import org.sakaiproject.event.api.SessionState;
 import org.sakaiproject.event.api.NotificationService;
+import org.sakaiproject.event.api.SessionState;
 import org.sakaiproject.exception.IdInvalidException;
 import org.sakaiproject.exception.IdLengthException;
 import org.sakaiproject.exception.IdUniquenessException;
@@ -96,7 +98,6 @@
 import org.sakaiproject.exception.ServerOverloadException;
 import org.sakaiproject.exception.TypeException;
 import org.sakaiproject.googledrive.model.GoogleDriveItem;
-import org.sakaiproject.googledrive.model.GoogleDriveItemComparator;
 import org.sakaiproject.googledrive.model.GoogleDriveUser;
 import org.sakaiproject.googledrive.service.GoogleDriveService;
 import org.sakaiproject.onedrive.model.OneDriveItem;
@@ -107,11 +108,11 @@
 import org.sakaiproject.site.api.SiteService;
 import org.sakaiproject.time.api.Time;
 import org.sakaiproject.time.api.TimeService;
+import org.sakaiproject.tool.api.SessionManager;
 import org.sakaiproject.tool.api.Tool;
 import org.sakaiproject.tool.api.ToolException;
-import org.sakaiproject.tool.api.ToolSession;
-import org.sakaiproject.tool.api.SessionManager;
 import org.sakaiproject.tool.api.ToolManager;
+import org.sakaiproject.tool.api.ToolSession;
 import org.sakaiproject.user.api.User;
 import org.sakaiproject.user.api.UserDirectoryService;
 import org.sakaiproject.util.FileItem;
@@ -121,7 +122,7 @@
 import org.sakaiproject.util.StringUtil;
 import org.sakaiproject.util.Validator;
 
-import static org.sakaiproject.content.util.IdUtil.isolateName;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * The FilePickerAction drives the FilePicker helper.<br />
@@ -1331,7 +1332,7 @@ else if (fileitem.getFileName() == null || fileitem.getFileName().length() == 0)
 		}
 		else if (fileitem.getFileName().length() > 0)
 		{
-			String filename = Validator.getFileName(fileitem.getFileName());
+			String filename = FilenameUtils.getName(fileitem.getFileName());
 			InputStream fileContentStream = fileitem.getInputStream();
 
 			// Store contentLength as long for future-proofing, though in many cases this
@@ -1346,7 +1347,7 @@ else if (fileitem.getFileName().length() > 0)
 			else if(fileContentStream != null)
 			{
 				// we just want the file name part - strip off any drive and path stuff
-				String name = Validator.getFileName(filename);
+				String name = FilenameUtils.getName(filename);
 				String resourceId = Validator.escapeResourceName(name);
 
 				ContentHostingService contentService = (ContentHostingService) toolSession.getAttribute (STATE_CONTENT_SERVICE);
@@ -1992,7 +1993,7 @@ else if(copyAction instanceof ServiceLevelAction)
 
 				InputStream contentStream = resource.streamContent();
 				String contentType = resource.getContentType();
-				String filename = Validator.getFileName(itemId);
+				String filename = FilenameUtils.getName(itemId);
 				String resourceId = Validator.escapeResourceName(filename);
 
 				String siteId = toolManager.getCurrentPlacement().getContext();

diff --git a/content/content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java b/content/content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java
@@ -24,14 +24,12 @@
 import static org.sakaiproject.content.util.IdUtil.isolateContainingId;
 import static org.sakaiproject.content.util.IdUtil.isolateName;
 
-import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
-import java.text.Normalizer;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -56,13 +54,12 @@
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.quartz.JobDetail;
 import org.quartz.JobKey;
@@ -134,7 +131,6 @@
 import org.sakaiproject.exception.PermissionException;
 import org.sakaiproject.exception.ServerOverloadException;
 import org.sakaiproject.exception.TypeException;
-import org.sakaiproject.site.api.Site;
 import org.sakaiproject.site.api.Group;
 import org.sakaiproject.site.api.Site;
 import org.sakaiproject.site.api.SitePage;
@@ -9556,7 +9552,7 @@ public void doMultipleFoldersUpload(RunData data) {
 	        return;
 
 	    } else if (fileitem.getFileName().length() > 0) {
-	        String filename = Validator.getFileName(fileitem.getFileName());
+	        String filename = FilenameUtils.getName(fileitem.getFileName());
 	        if (displayName == null) {
 	            displayName = filename;
 	        } else if ("".equals(displayName)) {

diff --git a/content/content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesHelperAction.java b/content/content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesHelperAction.java
@@ -44,6 +44,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.sakaiproject.cheftool.Context;
 import org.sakaiproject.cheftool.JetspeedRunData;
@@ -1135,7 +1136,7 @@ else if (fileitem.getFileName() == null || fileitem.getFileName().length() == 0)
 		}
 		else if (fileitem.getFileName().length() > 0)
 		{
-			String filename = Validator.getFileName(fileitem.getFileName());
+			String filename = FilenameUtils.getName(fileitem.getFileName());
 			InputStream stream = fileitem.getInputStream();
 			pipe.setRevisedContentStream(stream);
 			String contentType = fileitem.getContentType().replaceAll("\"", "");
@@ -1547,7 +1548,7 @@ else if (fileitem.getFileName() == null || fileitem.getFileName().length() == 0)
 			}
 			else if (fileitem.getFileName().length() > 0)
 			{
-				String filename = Validator.getFileName(fileitem.getFileName());
+				String filename = FilenameUtils.getName(fileitem.getFileName());
 				pipe.setRevisedContentStream( fileitem.getInputStream() );
 				String contentType = fileitem.getContentType().replaceAll("\"", "");
 				pipe.setRevisedMimeType(contentType);

diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/BaseContentService.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/BaseContentService.java
@@ -68,6 +68,7 @@
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.tika.io.TikaInputStream;
@@ -7052,7 +7053,7 @@ protected void handleAccessResource(HttpServletRequest req, HttpServletResponse
 			else
 			{
 				// use the last part, the file name part of the id, for the download file name
-				String fileName = Validator.getFileName(ref.getId());
+				String fileName = FilenameUtils.getName(ref.getId());
 				String disposition = null;
 
 				if (Validator.letBrowserInline(contentType))

diff --git a/.../tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderAccessService.java b/.../tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderAccessService.java
@@ -53,7 +53,7 @@
 import org.apache.commons.io.IOUtils;
 
 import uk.org.ponder.messageutil.MessageLocator;
-
+import org.apache.commons.io.FilenameUtils;
 import org.sakaiproject.authz.api.AuthzGroupService;
 import org.sakaiproject.authz.api.SecurityAdvisor;
 import org.sakaiproject.authz.api.SecurityService;
@@ -726,7 +726,7 @@ public void handleAccess(HttpServletRequest req, HttpServletResponse res, Refere
 						else
 						{
 							// use the last part, the file name part of the id, for the download file name
-							String fileName = Web.encodeFileName(req, Validator.getFileName(ref.getId()));
+							String fileName = Web.encodeFileName(req, FilenameUtils.getName(ref.getId()));
 							String disposition = null;
 
 							boolean inline = false;

diff --git a/...mailarchive-subetha/src/java/org/sakaiproject/mailarchive/SakaiMessageHandlerFactory.java b/...mailarchive-subetha/src/java/org/sakaiproject/mailarchive/SakaiMessageHandlerFactory.java
@@ -745,7 +745,7 @@ else if (p.isMimeType("text/enriched") && p.getFileName() == null) {
      */
     protected Optional<ContentResource> createAttachment(String siteId, List<Reference> attachments, String type, String fileName, InputStream in, String id) {
         // we just want the file name part - strip off any drive and path stuff
-        String name = FilenameUtils.getName(fileName);  //Validator.getFileName(fileName);
+        String name = FilenameUtils.getName(fileName);  //FilenameUtils.getName(fileName);
         String resourceName = Validator.escapeResourceName(fileName);
 
         // make a set of properties to add for the new resource

diff --git a/podcasts/podcasts-app/src/java/org/sakaiproject/tool/podcasts/podHomeBean.java b/podcasts/podcasts-app/src/java/org/sakaiproject/tool/podcasts/podHomeBean.java
@@ -46,6 +46,7 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.io.FilenameUtils;
 import org.sakaiproject.api.app.podcasts.PodcastPermissionsService;
 import org.sakaiproject.api.app.podcasts.PodcastService;
 import org.sakaiproject.api.app.podcasts.exception.PodcastException;
@@ -1161,7 +1162,7 @@ public void processFileUpload(ValueChangeEvent event)
 
 		FileItem item = (FileItem) event.getNewValue();
 		String fieldName = item.getFieldName();
-		filename = Validator.getFileName(item.getName());
+		filename = FilenameUtils.getName(item.getName());
 		fileSize = item.getSize();
 		fileContentType = item.getContentType();
 //		log.info("processFileUpload(): item: " + item