Adjust redirect handling (#420)

Author: labkey-adam

cluster/src/org/labkey/cluster/ClusterController.java

@@ -43,7 +43,9 @@
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.URLHelper;
+import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.HtmlView;
+import org.labkey.api.view.RedirectException;
 import org.labkey.cluster.pipeline.AbstractClusterExecutionEngine;
 import org.springframework.validation.BindException;
 import org.springframework.validation.Errors;
@@ -492,7 +494,7 @@ else if (!sf.lookupContainer().hasPermission(getUser(), ReadPermission.class))
         }
 
         @Override
-        public URLHelper getRedirectURL(ViewJavaLogForm viewJavaLogForm) throws Exception
+        public ActionURL getRedirectURL(ViewJavaLogForm viewJavaLogForm) throws Exception
         {
             PipelineStatusFile sf = PipelineService.get().getStatusFile(viewJavaLogForm.getJobId());
             File parentDir = new File(sf.getFilePath()).getParentFile();
@@ -540,7 +542,7 @@ public URLHelper getRedirectURL(ViewJavaLogForm viewJavaLogForm) throws Exceptio
 
             relPath = org.labkey.api.util.Path.parse(FilenameUtils.separatorsToUnix(relPath)).encode();
 
-            return new URLHelper(root.getWebdavURL() + relPath);
+            throw new RedirectException(new URLHelper(root.getWebdavURL() + relPath));
         }
     }
 

discvrcore/src/org/labkey/discvrcore/DiscvrCoreController.java

@@ -285,7 +285,7 @@ public void setTargetContainer(String targetContainer)
     public class SetTableIncrementValueAction extends SimpleRedirectAction<Object>
     {
         @Override
-        public URLHelper getRedirectURL(Object o) throws Exception
+        public ActionURL getRedirectURL(Object o)
         {
             return DetailsURL.fromString("laboratory/setTableIncrementValue.view", getContainer()).getActionURL();
         }
@@ -297,7 +297,7 @@ public URLHelper getRedirectURL(Object o) throws Exception
     public class ManageFileRootAction extends SimpleRedirectAction<Object>
     {
         @Override
-        public URLHelper getRedirectURL(Object o) throws Exception
+        public ActionURL getRedirectURL(Object o)
         {
             return DetailsURL.fromString("admin/manageFileRoot.view", getContainer()).getActionURL();
         }
@@ -308,15 +308,15 @@ public URLHelper getRedirectURL(Object o) throws Exception
     public static class AddCustomIndexesAction extends ConfirmAction<Object>
     {
         @Override
-        public ModelAndView getConfirmView(Object o, BindException errors) throws Exception
+        public ModelAndView getConfirmView(Object o, BindException errors)
         {
             setTitle("Add Custom Core.Container Indexes");
 
             return HtmlView.of("This action will add custom indexes to core.contains. Only do this if you are absolutely certain about the consequences. Do you want to continue?");
         }
 
         @Override
-        public boolean handlePost(Object o, BindException errors) throws Exception
+        public boolean handlePost(Object o, BindException errors)
         {
             return DiscvrCoreManager.get().addCoreContainersIndexes();
         }