From cb4f07af47b7b10a937fb640ae7d3a4637043b93 Mon Sep 17 00:00:00 2001 From: j2blake Date: Thu, 2 Feb 2012 17:05:36 +0000 Subject: [PATCH] NIHVIVO-2694 Simplify the interface to the IdentifierBundleFactory. Require only an HttpServletRequest as a parameter. --- .../ActiveIdentifierBundleFactories.java | 3 +-- .../identifier/IdentifierBundleFactory.java | 22 +++++++------------ .../factory/BaseIdentifierBundleFactory.java | 20 ----------------- 3 files changed, 9 insertions(+), 36 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/ActiveIdentifierBundleFactories.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/ActiveIdentifierBundleFactories.java index e21857f3b..086326c43 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/ActiveIdentifierBundleFactories.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/ActiveIdentifierBundleFactories.java @@ -122,8 +122,7 @@ public class ActiveIdentifierBundleFactories { HttpSession session, ServletContext ctx) { IdentifierBundle ib = new ArrayIdentifierBundle(); for (IdentifierBundleFactory ibf : factories) { - IdentifierBundle obj = ibf.getIdentifierBundle(request, session, - ctx); + IdentifierBundle obj = ibf.getIdentifierBundle(request); if (obj != null) { ib.addAll(obj); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/IdentifierBundleFactory.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/IdentifierBundleFactory.java index a798d657a..4c16af8e2 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/IdentifierBundleFactory.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/IdentifierBundleFactory.java @@ -2,22 +2,16 @@ package edu.cornell.mannlib.vitro.webapp.auth.identifier; -import javax.servlet.ServletContext; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpServletRequest; /** - * Creates an IdentifierBundle for a ServletRequest/HttpSession. Useful - * for getting the identifiers that should be associated with a request to - * a servlet or a JSP. - * - * We have this method signature because these are the object that are accessible - * from JSP TagSupport.pageContext. - * - * @author bdc34 - * + * Creates an IdentifierBundle for a ServletRequest/HttpSession. Useful for + * getting the identifiers that should be associated with a request. */ public interface IdentifierBundleFactory { - public IdentifierBundle getIdentifierBundle(ServletRequest request, HttpSession session, ServletContext context); - + /** + * Return the IdentifierBundle from this factory. May return an empty + * bundle, but never returns null. + */ + public IdentifierBundle getIdentifierBundle(HttpServletRequest request); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/BaseIdentifierBundleFactory.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/BaseIdentifierBundleFactory.java index 592242f3f..ff5693355 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/BaseIdentifierBundleFactory.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/BaseIdentifierBundleFactory.java @@ -3,11 +3,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.identifier.factory; import javax.servlet.ServletContext; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundleFactory; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao; @@ -42,25 +38,9 @@ public abstract class BaseIdentifierBundleFactory implements this.indDao = wdf.getIndividualDao(); } - /** - * This method should go away. Why are we passing anything other than the - * request? - */ - @Override - public final IdentifierBundle getIdentifierBundle(ServletRequest request, - HttpSession session, ServletContext context) { - return getIdentifierBundle((HttpServletRequest) request); - } - @Override public String toString() { return this.getClass().getSimpleName() + " - " + hashCode(); } - /** - * Return the IdentifierBundle from this factory. May return an empty - * bundle, but never returns null. - */ - public abstract IdentifierBundle getIdentifierBundle(HttpServletRequest req); - }