[utilities COMMIT] /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript....

[noreply at shibboleth.net]

Author: rdw
Date: Mon Apr 29 10:01:21 2013
New Revision: 391

URL: http://svn.shibboleth.net/view/utilities?rev=391&view=rev
Log:
IDP-283 Remove Optional from Scripted support functions and its only use in the attribute filter)

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java?rev=391&r1=390&r2=391&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java Mon Apr 29 10:01:21 2013
@@ -34,7 +34,6 @@
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
-import com.google.common.base.Optional;
 import com.google.common.io.Files;
 
 /** This is a helper class that takes care of reading in, optionally compiling, and evaluating a script. */
@@ -127,15 +126,15 @@
      * 
      * @param scriptBindings the script bindings
      * 
-     * @return the result of the script or {@link Optional#absent()} if the script did not return a result
+     * @return the result of the script or null if the script did not return a result
      * 
      * @throws ScriptException thrown if there was a problem evaluating the script
      */
-    @Nonnull public Optional<Object> eval(Bindings scriptBindings) throws ScriptException {
+    @Nonnull public Object eval(Bindings scriptBindings) throws ScriptException {
         if (compiledScript != null) {
-            return Optional.fromNullable(compiledScript.eval(scriptBindings));
+            return compiledScript.eval(scriptBindings);
         } else {
-            return Optional.fromNullable(scriptEngine.eval(script, scriptBindings));
+            return scriptEngine.eval(script, scriptBindings);
         }
     }
 
@@ -148,11 +147,11 @@
      * 
      * @throws ScriptException thrown if there was a problem evaluating the script
      */
-    @Nonnull public Optional<Object> eval(ScriptContext scriptContext) throws ScriptException {
+    @Nonnull public Object eval(ScriptContext scriptContext) throws ScriptException {
         if (compiledScript != null) {
-            return Optional.fromNullable(compiledScript.eval(scriptContext));
+            return compiledScript.eval(scriptContext);
         } else {
-            return Optional.fromNullable(scriptEngine.eval(script, scriptContext));
+            return scriptEngine.eval(script, scriptContext);
         }
     }