You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/09/16 16:13:39 UTC

svn commit: r997756 - in /myfaces/extensions/cdi/trunk/jse-modules/scripting-module: api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ impl/src/main/java/org/apache/m...

Author: gpetracek
Date: Thu Sep 16 14:13:39 2010
New Revision: 997756

URL: http://svn.apache.org/viewvc?rev=997756&view=rev
Log:
EXTCDI-54 and EXTCDI-56

Added:
    myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptBuilder.java
Modified:
    myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptExecutor.java
    myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptEngineManagerProducer.java
    myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ExceptionUtils.java

Added: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptBuilder.java?rev=997756&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptBuilder.java (added)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptBuilder.java Thu Sep 16 14:13:39 2010
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.cdi.scripting.api;
+
+import javax.script.Bindings;
+
+/**
+ * @author Gerhard Petracek
+ */
+public interface ScriptBuilder
+{
+    ScriptBuilder script(String script);
+
+    ScriptBuilder namedArgument(String name, Object value);
+
+    ScriptBuilder bindings(Bindings bindings);
+
+    Object eval();
+    
+    <T> T eval(Class<T> returnType);
+}

Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptExecutor.java?rev=997756&r1=997755&r2=997756&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptExecutor.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/api/src/main/java/org/apache/myfaces/extensions/cdi/scripting/api/ScriptExecutor.java Thu Sep 16 14:13:39 2010
@@ -18,6 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.scripting.api;
 
+import javax.script.Bindings;
 import java.util.Map;
 
 /**
@@ -29,7 +30,11 @@ public interface ScriptExecutor
 
     Object eval(String script, Map<String, Object> arguments);
 
+    Object eval(String script, Bindings bindings);
+
     <T> T eval(String script, Class<T> returnType);
 
     <T> T eval(String script, Map<String, Object> arguments, Class<T> returnType);
+
+    <T> T eval(String script, Bindings bindings, Class<T> returnType);
 }

Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptEngineManagerProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptEngineManagerProducer.java?rev=997756&r1=997755&r2=997756&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptEngineManagerProducer.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptEngineManagerProducer.java Thu Sep 16 14:13:39 2010
@@ -21,9 +21,11 @@ package org.apache.myfaces.extensions.cd
 import org.apache.myfaces.extensions.cdi.scripting.api.ScriptLanguage;
 import org.apache.myfaces.extensions.cdi.scripting.api.LanguageManager;
 import org.apache.myfaces.extensions.cdi.scripting.api.ScriptExecutor;
+import org.apache.myfaces.extensions.cdi.scripting.api.ScriptBuilder;
 import org.apache.myfaces.extensions.cdi.scripting.api.language.Language;
 import static org.apache.myfaces.extensions.cdi.scripting.api.ScriptingModuleBeanNames.*;
 import static org.apache.myfaces.extensions.cdi.scripting.impl.util.ExceptionUtils.unknownScriptingLanguage;
+import static org.apache.myfaces.extensions.cdi.scripting.impl.util.ExceptionUtils.overrideBuilderState;
 
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
@@ -121,8 +123,13 @@ public class ScriptEngineManagerProducer
     @Deprecated
     public ScriptExecutor createScriptExecutor(InjectionPoint injectionPoint, LanguageManager languageManager)
     {
-        final ScriptEngine scriptEngine = createScriptEngineByLanguageName(injectionPoint, languageManager);
+        ScriptEngine scriptEngine = createScriptEngineByLanguageName(injectionPoint, languageManager);
 
+        return createScriptExecutor(scriptEngine);
+    }
+
+    private ScriptExecutor createScriptExecutor(final ScriptEngine scriptEngine)
+    {
         return new ScriptExecutor()
         {
             public Object eval(String script)
@@ -135,6 +142,11 @@ public class ScriptEngineManagerProducer
                 return eval(script, arguments, Object.class);
             }
 
+            public Object eval(String script, Bindings bindings)
+            {
+                return eval(script, bindings, Object.class);
+            }
+
             public <T> T eval(String script, Class<T> returnType)
             {
                 try
@@ -159,6 +171,99 @@ public class ScriptEngineManagerProducer
                     throw new RuntimeException(e);
                 }
             }
+
+            public <T> T eval(String script, Bindings bindings, Class<T> returnType)
+            {
+                try
+                {
+                    return (T)scriptEngine.eval(script, bindings);
+                }
+                catch (ScriptException e)
+                {
+                    throw new RuntimeException(e);
+                }
+            }
+        };
+    }
+
+    @Produces
+    @ScriptLanguage(PlaceHolderLanguage.class)
+    @Deprecated
+    public ScriptBuilder createScriptBuilder(InjectionPoint injectionPoint, LanguageManager languageManager)
+    {
+        ScriptEngine scriptEngine = createScriptEngineByLanguageName(injectionPoint, languageManager);
+
+        return createScriptBuilder(scriptEngine);
+    }
+
+    private ScriptBuilder createScriptBuilder(final ScriptEngine scriptEngine)
+    {
+        return new ScriptBuilder()
+        {
+            private Map<String, Object> arguments;
+            private String script;
+            private Bindings bindings;
+
+            public ScriptBuilder script(String script)
+            {
+                this.script = script;
+                return this;
+            }
+
+            public ScriptBuilder namedArgument(String name, Object value)
+            {
+                if(this.bindings != null)
+                {
+                    throw overrideBuilderState("(named) argument/s");
+                }
+
+                if(this.arguments == null)
+                {
+                    this.arguments = new HashMap<String, Object>();
+                }
+                this.arguments.put(name, value);
+                return this;
+            }
+
+            public ScriptBuilder bindings(Bindings bindings)
+            {
+                if(this.arguments != null)
+                {
+                    throw overrideBuilderState("bindings");
+                }
+
+                this.bindings = bindings;
+                return this;
+            }
+
+            public Object eval()
+            {
+                return eval(Object.class);
+            }
+
+            public <T> T eval(Class<T> returnType)
+            {
+                try
+                {
+                    if(this.bindings == null && this.arguments == null)
+                    {
+                        return (T)scriptEngine.eval(this.script);
+                    }
+
+                    Bindings scriptBindings = this.bindings;
+
+                    if(scriptBindings == null)
+                    {
+                        scriptBindings = new SimpleBindings(this.arguments);
+                    }
+
+                    return (T)scriptEngine.eval(this.script, scriptBindings);
+                }
+                catch (ScriptException e)
+                {
+                    throw new RuntimeException(e);
+                }
+            }
         };
     }
 

Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ExceptionUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ExceptionUtils.java?rev=997756&r1=997755&r2=997756&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ExceptionUtils.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ExceptionUtils.java Thu Sep 16 14:13:39 2010
@@ -20,6 +20,7 @@ package org.apache.myfaces.extensions.cd
 
 import org.apache.myfaces.extensions.cdi.scripting.impl.spi.LanguageBean;
 import org.apache.myfaces.extensions.cdi.scripting.api.language.Language;
+import org.apache.myfaces.extensions.cdi.scripting.api.ScriptBuilder;
 
 /**
  * @author Gerhard Petracek
@@ -47,4 +48,11 @@ public class ExceptionUtils
         return new RuntimeException("Invalid approach detected to replace " + id.getName() + ". Can't replace " +
             foundLanguage.getClass().getName() + " with " + newLanguage.getClass().getName());
     }
+
+    public static RuntimeException overrideBuilderState(String newValueHint)
+    {
+        return new RuntimeException("Invalid script builder (" + ScriptBuilder.class.getName() + ") state. " +
+            "It isn't allowed to override the existing state of the builder with new " + newValueHint);
+
+    }
 }