Reconcile redirect handling (#984)

Author: labkey-adam

flow/src/org/labkey/flow/controllers/FlowController.java

@@ -367,7 +367,7 @@ public ModelAndView getView(Object o, BindException errors) throws Exception
         {
             FlowPreference.update(getRequest());
             URLHelper url = new URLHelper(getRequest().getContextPath() + "/_.gif");
-            return HttpView.redirect(url, false);
+            return HttpView.redirect(url);
         }
 
         @Override

flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java

@@ -46,7 +46,6 @@
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
 import org.labkey.api.util.URIUtil;
-import org.labkey.api.util.URLHelper;
 import org.labkey.api.util.logging.LogHelper;
 import org.labkey.api.view.ActionURL;
 import org.labkey.api.view.BadRequestException;
@@ -390,7 +389,7 @@ protected ModelAndView uploadRuns(ImportRunsForm form, BindException errors) thr
                 ActionURL url = form.getReturnActionURL();
                 if (url == null)
                     url = new ActionURL(BeginAction.class, getContainer());
-                return HttpView.redirect(url, false);
+                return HttpView.redirect(url);
             }
 
             validatePipeline();
@@ -442,7 +441,7 @@ public ModelAndView getView(ImportRunsForm form, BindException errors) throws Ex
     public static class ShowUploadRunsAction extends SimpleRedirectAction<Object>
     {
         @Override
-        public URLHelper getRedirectURL(Object o)
+        public ActionURL getRedirectURL(Object o)
         {
             return urlProvider(PipelineUrls.class).urlBrowse(getContainer(), null);
         }

microarray/src/org/labkey/microarray/controllers/FeatureAnnotationSetController.java

@@ -86,7 +86,7 @@ public FeatureAnnotationSetController()
     public static class BeginAction extends SimpleRedirectAction<Object>
     {
         @Override
-        public URLHelper getRedirectURL(Object o)
+        public ActionURL getRedirectURL(Object o)
         {
             return new ActionURL(ManageAction.class, getContainer());
         }

ms2/src/org/labkey/ms2/MS2Controller.java

@@ -72,8 +72,6 @@
 import org.labkey.api.exp.api.ExpData;
 import org.labkey.api.exp.api.ExpRun;
 import org.labkey.api.exp.api.ExperimentService;
-import org.labkey.api.pipeline.PipeRoot;
-import org.labkey.api.pipeline.PipelineJob;
 import org.labkey.api.pipeline.PipelineService;
 import org.labkey.api.pipeline.PipelineUrls;
 import org.labkey.api.pipeline.browse.PipelinePathForm;
@@ -150,7 +148,6 @@
 import org.labkey.api.view.RedirectException;
 import org.labkey.api.view.UnauthorizedException;
 import org.labkey.api.view.VBox;
-import org.labkey.api.view.ViewBackgroundInfo;
 import org.labkey.api.view.ViewContext;
 import org.labkey.api.view.WebPartView;
 import org.labkey.api.view.template.PageConfig;
@@ -400,7 +397,7 @@ public ModelAndView getView(RunForm form, BindException errors)
 
                     if (params != null && !params.trim().isEmpty())
                     {
-                        throw new RedirectException(currentURL + "&" + params);
+                        throw new RedirectException(new ActionURL(currentURL + "&" + params));
                     }
                 }
             }

protein/src/org/labkey/protein/ProteinController.java

@@ -214,7 +214,7 @@ protected ModelAndView getHtmlView(ProbabilityProteinSearchForm form, BindExcept
                 ActionURL url = getViewContext().cloneActionURL();
                 url.deleteParameter("minimumProbability");
                 url.deleteParameter("maximumErrorRate");
-                throw new RedirectException(url + "&" + filter.toQueryString("ProteinSearchResults"));
+                throw new RedirectException(new ActionURL(url + "&" + filter.toQueryString("ProteinSearchResults")));
             }
 
             if (request.getParameter("ProteinSearchResults.GroupProbability~gte") != null)