You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2015/01/15 15:50:02 UTC
svn commit: r1652117 - in /sling/trunk/contrib/scripting/sightly:
engine/src/main/java/org/apache/sling/scripting/sightly/extension/
engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/
engine/src/main/java/org/apache/sling/sc...
Author: fmeschbe
Date: Thu Jan 15 14:50:02 2015
New Revision: 1652117
URL: http://svn.apache.org/r1652117
Log:
SLING-4309 Remove redundant RuntimeExtensionException and SightlyUseException from Sightly's API
Applying patch by Radu Cotescu (thank you very much)
Removed:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/extension/RuntimeExtensionException.java
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/use/SightlyUseException.java
Modified:
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ExtensionUtils.java
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/XSSRuntimeExtension.java
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/UseProviderUtils.java
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/UseRuntimeExtension.java
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java
sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/JoinFilter.java
sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsEnvironment.java
sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/async/AsyncExtractor.java
sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/loop/EventLoop.java
sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/use/DependencyResolver.java
Modified: sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ExtensionUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ExtensionUtils.java?rev=1652117&r1=1652116&r2=1652117&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ExtensionUtils.java (original)
+++ sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ExtensionUtils.java Thu Jan 15 14:50:02 2015
@@ -18,8 +18,8 @@
******************************************************************************/
package org.apache.sling.scripting.sightly.impl.engine.extension;
+import org.apache.sling.scripting.sightly.SightlyException;
import org.apache.sling.scripting.sightly.extension.RuntimeExtension;
-import org.apache.sling.scripting.sightly.extension.RuntimeExtensionException;
/**
* Helper class for {@link RuntimeExtension} implementations.
@@ -32,11 +32,11 @@ public class ExtensionUtils {
* @param extensionName the name of the extension
* @param arguments the arguments array
* @param count the expected number or arguments
- * @throws RuntimeExtensionException if the number of supplied arguments differs from what's expected
+ * @throws SightlyException if the number of supplied arguments differs from what's expected
*/
public static void checkArgumentCount(String extensionName, Object[] arguments, int count) {
if (arguments.length != count) {
- throw new RuntimeExtensionException(String.format("Extension %s requires %d arguments", extensionName, count));
+ throw new SightlyException(String.format("Extension %s requires %d arguments", extensionName, count));
}
}
Modified: sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/XSSRuntimeExtension.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/XSSRuntimeExtension.java?rev=1652117&r1=1652116&r2=1652117&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/XSSRuntimeExtension.java (original)
+++ sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/XSSRuntimeExtension.java Thu Jan 15 14:50:02 2015
@@ -30,9 +30,9 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.scripting.sightly.SightlyException;
import org.apache.sling.scripting.sightly.extension.ExtensionInstance;
import org.apache.sling.scripting.sightly.extension.RuntimeExtension;
-import org.apache.sling.scripting.sightly.extension.RuntimeExtensionException;
import org.apache.sling.scripting.sightly.impl.compiler.CompilerException;
import org.apache.sling.scripting.sightly.impl.filter.XSSFilter;
import org.apache.sling.scripting.sightly.impl.html.MarkupUtils;
@@ -65,7 +65,7 @@ public class XSSRuntimeExtension impleme
@Override
public Object call(Object... arguments) {
if (arguments.length < 2) {
- throw new RuntimeExtensionException(
+ throw new SightlyException(
String.format("Extension %s requires at least %d arguments", XSSFilter.FUNCTION_NAME, 2));
}
Object original = arguments[0];
Modified: sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/UseProviderUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/UseProviderUtils.java?rev=1652117&r1=1652116&r2=1652117&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/UseProviderUtils.java (original)
+++ sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/UseProviderUtils.java Thu Jan 15 14:50:02 2015
@@ -26,7 +26,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.api.scripting.SlingScriptHelper;
import org.apache.sling.scripting.sightly.ResourceResolution;
-import org.apache.sling.scripting.sightly.use.SightlyUseException;
+import org.apache.sling.scripting.sightly.SightlyException;
import org.apache.sling.scripting.sightly.use.UseProvider;
/**
@@ -89,6 +89,6 @@ public class UseProviderUtils {
return;
}
}
- throw new SightlyUseException("Use plugin cannot access path: " + resource.getPath());
+ throw new SightlyException("Use plugin cannot access path: " + resource.getPath());
}
}
Modified: sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/UseRuntimeExtension.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/UseRuntimeExtension.java?rev=1652117&r1=1652116&r2=1652117&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/UseRuntimeExtension.java (original)
+++ sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/UseRuntimeExtension.java Thu Jan 15 14:50:02 2015
@@ -35,13 +35,12 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.ReferencePolicy;
import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.scripting.sightly.SightlyException;
import org.apache.sling.scripting.sightly.extension.ExtensionInstance;
import org.apache.sling.scripting.sightly.extension.RuntimeExtension;
-import org.apache.sling.scripting.sightly.extension.RuntimeExtensionException;
import org.apache.sling.scripting.sightly.impl.plugin.UsePlugin;
import org.apache.sling.scripting.sightly.render.RenderContext;
import org.apache.sling.scripting.sightly.use.ProviderOutcome;
-import org.apache.sling.scripting.sightly.use.SightlyUseException;
import org.apache.sling.scripting.sightly.use.UseProvider;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -72,7 +71,7 @@ public class UseRuntimeExtension impleme
@Override
public Object call(Object... arguments) {
if (arguments.length != 2) {
- throw new RuntimeExtensionException("Use extension requires two arguments");
+ throw new SightlyException("Use extension requires two arguments");
}
String identifier = renderContext.toString(arguments[0]);
if (StringUtils.isEmpty(identifier)) {
@@ -89,7 +88,7 @@ public class UseRuntimeExtension impleme
return outcome.getResult();
}
}
- throw new SightlyUseException("No use provider could resolve identifier: " + identifier);
+ throw new SightlyException("No use provider could resolve identifier: " + identifier);
}
};
}
Modified: sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java?rev=1652117&r1=1652116&r2=1652117&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java (original)
+++ sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java Thu Jan 15 14:50:02 2015
@@ -26,9 +26,9 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.scripting.sightly.SightlyException;
import org.apache.sling.scripting.sightly.extension.ExtensionInstance;
import org.apache.sling.scripting.sightly.extension.RuntimeExtension;
-import org.apache.sling.scripting.sightly.extension.RuntimeExtensionException;
import org.apache.sling.scripting.sightly.impl.compiler.expression.Expression;
import org.apache.sling.scripting.sightly.impl.compiler.expression.ExpressionNode;
import org.apache.sling.scripting.sightly.impl.compiler.expression.node.RuntimeCall;
@@ -68,7 +68,7 @@ public class FormatFilter extends Filter
@Override
public Object call(Object... arguments) {
if (arguments.length != 2) {
- throw new RuntimeExtensionException("Format function must be called with two arguments");
+ throw new SightlyException("Format function must be called with two arguments");
}
String source = renderContext.toString(arguments[0]);
Object[] params = decodeParams(arguments[1]);
Modified: sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/JoinFilter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/JoinFilter.java?rev=1652117&r1=1652116&r2=1652117&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/JoinFilter.java (original)
+++ sling/trunk/contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/JoinFilter.java Thu Jan 15 14:50:02 2015
@@ -26,9 +26,9 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.scripting.sightly.SightlyException;
import org.apache.sling.scripting.sightly.extension.ExtensionInstance;
import org.apache.sling.scripting.sightly.extension.RuntimeExtension;
-import org.apache.sling.scripting.sightly.extension.RuntimeExtensionException;
import org.apache.sling.scripting.sightly.impl.compiler.expression.Expression;
import org.apache.sling.scripting.sightly.impl.compiler.expression.ExpressionNode;
import org.apache.sling.scripting.sightly.impl.compiler.expression.node.RuntimeCall;
@@ -64,7 +64,7 @@ public class JoinFilter extends FilterCo
@Override
public Object call(Object... arguments) {
if (arguments.length != 2) {
- throw new RuntimeExtensionException("Join function must be called with two arguments.");
+ throw new SightlyException("Join function must be called with two arguments.");
}
Collection<?> collection = renderContext.toCollection(arguments[0]);
String joinString = renderContext.toString(arguments[1]);
Modified: sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsEnvironment.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsEnvironment.java?rev=1652117&r1=1652116&r2=1652117&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsEnvironment.java (original)
+++ sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsEnvironment.java Thu Jan 15 14:50:02 2015
@@ -34,8 +34,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.api.scripting.SlingScriptHelper;
import org.apache.sling.scripting.sightly.ResourceResolution;
-import org.mozilla.javascript.Context;
-import org.slf4j.LoggerFactory;
+import org.apache.sling.scripting.sightly.SightlyException;
import org.apache.sling.scripting.sightly.js.impl.async.AsyncContainer;
import org.apache.sling.scripting.sightly.js.impl.async.TimingBindingsValuesProvider;
import org.apache.sling.scripting.sightly.js.impl.async.UnaryCallback;
@@ -45,7 +44,8 @@ import org.apache.sling.scripting.sightl
import org.apache.sling.scripting.sightly.js.impl.loop.Task;
import org.apache.sling.scripting.sightly.js.impl.use.DependencyResolver;
import org.apache.sling.scripting.sightly.js.impl.use.UseFunction;
-import org.apache.sling.scripting.sightly.use.SightlyUseException;
+import org.mozilla.javascript.Context;
+import org.slf4j.LoggerFactory;
/**
* Environment for running JS scripts
@@ -95,7 +95,7 @@ public class JsEnvironment {
scriptResource = ResourceResolution.resolveComponentRelative(caller.getResourceResolver(), caller, path);
}
if (scriptResource == null) {
- throw new SightlyUseException("Required script resource could not be located: " + path);
+ throw new SightlyException("Required script resource could not be located: " + path);
}
runResource(scriptResource, globalBindings, arguments, callback);
}
@@ -163,7 +163,7 @@ public class JsEnvironment {
callback.invoke(result);
}
} catch (ScriptException e) {
- throw new SightlyUseException(e);
+ throw new SightlyException(e);
} finally {
IOUtils.closeQuietly(reader);
}
Modified: sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/async/AsyncExtractor.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/async/AsyncExtractor.java?rev=1652117&r1=1652116&r2=1652117&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/async/AsyncExtractor.java (original)
+++ sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/async/AsyncExtractor.java Thu Jan 15 14:50:02 2015
@@ -18,13 +18,13 @@
******************************************************************************/
package org.apache.sling.scripting.sightly.js.impl.async;
+import org.apache.sling.scripting.sightly.SightlyException;
import org.mozilla.javascript.BaseFunction;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Function;
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject;
import org.apache.sling.scripting.sightly.js.impl.loop.EventLoopInterop;
-import org.apache.sling.scripting.sightly.use.SightlyUseException;
/**
*
@@ -60,8 +60,7 @@ public class AsyncExtractor {
}
});
if (errorContainer.isCompleted()) {
- throw new SightlyUseException("Promise has completed with failure: " +
- Context.toString(errorContainer.getResult()));
+ throw new SightlyException("Promise has completed with failure: " + Context.toString(errorContainer.getResult()));
}
} finally {
Context.exit();
Modified: sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/loop/EventLoop.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/loop/EventLoop.java?rev=1652117&r1=1652116&r2=1652117&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/loop/EventLoop.java (original)
+++ sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/loop/EventLoop.java Thu Jan 15 14:50:02 2015
@@ -21,7 +21,7 @@ package org.apache.sling.scripting.sight
import java.util.LinkedList;
import java.util.Queue;
-import org.apache.sling.scripting.sightly.use.SightlyUseException;
+import org.apache.sling.scripting.sightly.SightlyException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,7 +68,7 @@ public class EventLoop {
}
}
if (thrownException != null) {
- throw new SightlyUseException(thrownException);
+ throw new SightlyException(thrownException);
}
} finally {
isRunning = false;
Modified: sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/use/DependencyResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/use/DependencyResolver.java?rev=1652117&r1=1652116&r2=1652117&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/use/DependencyResolver.java (original)
+++ sling/trunk/contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/use/DependencyResolver.java Thu Jan 15 14:50:02 2015
@@ -22,10 +22,10 @@ package org.apache.sling.scripting.sight
import javax.script.Bindings;
import org.apache.sling.api.resource.Resource;
+import org.apache.sling.scripting.sightly.SightlyException;
import org.apache.sling.scripting.sightly.js.impl.JsEnvironment;
import org.apache.sling.scripting.sightly.js.impl.Utils;
import org.apache.sling.scripting.sightly.js.impl.async.UnaryCallback;
-import org.apache.sling.scripting.sightly.use.SightlyUseException;
/**
* Resolves dependencies specified by the Use function
@@ -49,7 +49,7 @@ public class DependencyResolver {
*/
public void resolve(String dependency, UnaryCallback callback) {
if (!Utils.isJsScript(dependency)) {
- throw new SightlyUseException("Only JS scripts are allowed as dependencies. Invalid dependency: " + dependency);
+ throw new SightlyException("Only JS scripts are allowed as dependencies. Invalid dependency: " + dependency);
}
jsEnvironment.run(caller, dependency, globalBindings, Utils.EMPTY_BINDINGS, callback);
}