[spring-extensions] branch main updated: Javadoc errors

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository spring-extensions.

View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=e0e58efcc2039c51bcdbb62c82f8fc9e76e527ef

The following commit(s) were added to refs/heads/main by this push:
       new  e0e58ef   Javadoc errors
e0e58ef is described below

commit e0e58efcc2039c51bcdbb62c82f8fc9e76e527ef
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jul 6 08:41:00 2021 -0400

    Javadoc errors
---
 src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java    | 7 ++++---
 src/main/java/net/shibboleth/ext/spring/velocity/VelocityView.java | 6 ++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java b/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
index 8861a9b..dfbff9b 100644
--- a/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
+++ b/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
@@ -323,12 +323,13 @@ public final class SpringSupport {
         return result;
     }
 
-    /** Return the {@link LanguageRange} associated with this request prepended with
+    /**
+     * Return the {@link LanguageRange} associated with this request prepended with
      * the Spring preferred locale.  This allows external (non browser) control of
      * the language.
+     * 
      * @param request the request to process
-     * @return The range returned from {@link HttpServletSupport#getLanguageRange(HttpServletRequest)}
-     * with the Locale from {@link RequestContextUtils#getLocale(HttpServletRequest)} prepended
+     * @return range returned from the browser request with the active Spring locale prepended
      */
     @Nonnull @NonnullElements @Unmodifiable
     public static List<LanguageRange> getLanguageRange(final HttpServletRequest request) {
diff --git a/src/main/java/net/shibboleth/ext/spring/velocity/VelocityView.java b/src/main/java/net/shibboleth/ext/spring/velocity/VelocityView.java
index 6e5d56b..ade9683 100644
--- a/src/main/java/net/shibboleth/ext/spring/velocity/VelocityView.java
+++ b/src/main/java/net/shibboleth/ext/spring/velocity/VelocityView.java
@@ -216,6 +216,12 @@ public class VelocityView extends AbstractTemplateView {
      * 
      * <p>Output is directed to the servlet response.
      * This method can be overridden if custom behavior is needed.</p>
+     *
+     * @param model the model Map, containing the model attributes to be exposed to the view
+     * @param request current HTTP request
+     * @param response current HTTP response
+     * 
+     * @throws Exception if there's a fatal error while rendering the model
      */
     @Override
     protected void renderMergedTemplateModel(final Map<String,Object> model,

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.