[spring-extensions] branch master updated: JPAR-115 - Javadoc fixes

[Ian Young]

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

iay pushed a commit to branch master
in repository spring-extensions.

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

The following commit(s) were added to refs/heads/master by this push:
       new  3ebb602   JPAR-115 - Javadoc fixes
3ebb602 is described below

commit 3ebb6029cd8ee4c9f5d2c5c6f45f6ac82ad408d1
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Tue Nov 27 17:09:04 2018 +0000

    JPAR-115 - Javadoc fixes
---
 .../ext/spring/util/AbstractSpringExpressionEvaluator.java         | 7 ++++++-
 .../net/shibboleth/ext/spring/velocity/VelocityConfigurer.java     | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/shibboleth/ext/spring/util/AbstractSpringExpressionEvaluator.java b/src/main/java/net/shibboleth/ext/spring/util/AbstractSpringExpressionEvaluator.java
index dfb9a3c..4895a4a 100644
--- a/src/main/java/net/shibboleth/ext/spring/util/AbstractSpringExpressionEvaluator.java
+++ b/src/main/java/net/shibboleth/ext/spring/util/AbstractSpringExpressionEvaluator.java
@@ -151,7 +151,12 @@ public abstract class AbstractSpringExpressionEvaluator<T, U> {
         returnOnError = what;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * Evaluate the Spring expression on the provided input.
+     *
+     * @param input input over which to evaluate the expression
+     * @return result of applying the expression to the provided input
+     */
     protected U evaluate(@Nullable final T input) {
 
         // Try outside the try so as to preserve derived semantics
diff --git a/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfigurer.java b/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfigurer.java
index 4ce0469..2f3ff8e 100644
--- a/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfigurer.java
+++ b/src/main/java/net/shibboleth/ext/spring/velocity/VelocityConfigurer.java
@@ -38,7 +38,7 @@ import org.springframework.web.context.ServletContextAware;
  *
  * <pre class="code">
  * <bean id="velocityConfig" class="org.springframework.web.servlet.view.velocity.VelocityConfigurer">
- *   <property name="resourceLoaderPath"><value>/WEB-INF/velocity/</value></property>
+ *   <property name="resourceLoaderPath"><value>/WEB-INF/velocity/</value></property>
  * </bean></pre>
  *
  * This bean must be included in the application context of any application

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