You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:11:04 UTC
[sling-org-apache-sling-scripting-sightly-js-provider] 07/18:
SLING-4309 Remove redundant RuntimeExtensionException and
SightlyUseException from Sightly's API
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.js.provider-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-js-provider.git
commit c7b48bef6b799e6ba3366af032853ccca0495649
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Thu Jan 15 14:50:02 2015 +0000
SLING-4309 Remove redundant RuntimeExtensionException and SightlyUseException from Sightly's API
Applying patch by Radu Cotescu (thank you very much)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/sightly/js-use-provider@1652117 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/scripting/sightly/js/impl/JsEnvironment.java | 10 +++++-----
.../sling/scripting/sightly/js/impl/async/AsyncExtractor.java | 5 ++---
.../apache/sling/scripting/sightly/js/impl/loop/EventLoop.java | 4 ++--
.../scripting/sightly/js/impl/use/DependencyResolver.java | 4 ++--
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsEnvironment.java b/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsEnvironment.java
index f1979fb..ffaeeb8 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsEnvironment.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsEnvironment.java
@@ -34,8 +34,7 @@ import org.apache.sling.api.resource.Resource;
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.sightly.js.impl.loop.EventLoopInterop;
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);
}
diff --git a/src/main/java/org/apache/sling/scripting/sightly/js/impl/async/AsyncExtractor.java b/src/main/java/org/apache/sling/scripting/sightly/js/impl/async/AsyncExtractor.java
index bf2d933..098bd71 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/js/impl/async/AsyncExtractor.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/js/impl/async/AsyncExtractor.java
@@ -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();
diff --git a/src/main/java/org/apache/sling/scripting/sightly/js/impl/loop/EventLoop.java b/src/main/java/org/apache/sling/scripting/sightly/js/impl/loop/EventLoop.java
index 29480f2..ed565ef 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/js/impl/loop/EventLoop.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/js/impl/loop/EventLoop.java
@@ -21,7 +21,7 @@ package org.apache.sling.scripting.sightly.js.impl.loop;
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;
diff --git a/src/main/java/org/apache/sling/scripting/sightly/js/impl/use/DependencyResolver.java b/src/main/java/org/apache/sling/scripting/sightly/js/impl/use/DependencyResolver.java
index bc43005..ef24105 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/js/impl/use/DependencyResolver.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/js/impl/use/DependencyResolver.java
@@ -22,10 +22,10 @@ package org.apache.sling.scripting.sightly.js.impl.use;
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);
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.