[sling-org-apache-sling-scripting-sightly-js-provider] branch master updated: SLING-9406 - Add bundled script support to the servlets resolver

[pauls]

This is an automated email from the ASF dual-hosted git repository.

pauls pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-js-provider.git


The following commit(s) were added to refs/heads/master by this push:
     new 487f889  SLING-9406 - Add bundled script support to the servlets 
resolver
487f889 is described below

commit 487f8898c1cacd13976c102dc9f545cf10304971
Author: Karl Pauls <karlpa...@gmail.com>
AuthorDate: Wed May 20 00:22:39 2020 +0200

    SLING-9406 - Add bundled script support to the servlets resolver
    
    * don't ask the bundle unit manager for scripts directly anymore
---
 .../sling/scripting/sightly/js/impl/JsUseProvider.java      |  8 +-------
 .../scripting/sightly/js/impl/use/DependencyResolver.java   | 13 +------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsUseProvider.java 
b/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsUseProvider.java
index 1d5c3d6..721c51c 100644
--- 
a/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsUseProvider.java
+++ 
b/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsUseProvider.java
@@ -27,7 +27,6 @@ import org.apache.sling.api.scripting.LazyBindings;
 import 
org.apache.sling.scripting.api.resource.ScriptingResourceResolverProvider;
 import org.apache.sling.scripting.core.ScriptNameAwareReader;
 import org.apache.sling.scripting.sightly.SightlyException;
-import org.apache.sling.scripting.sightly.engine.BundledUnitManager;
 import org.apache.sling.scripting.sightly.js.impl.async.AsyncContainer;
 import org.apache.sling.scripting.sightly.js.impl.async.AsyncExtractor;
 import 
org.apache.sling.scripting.sightly.js.impl.jsapi.ProxyAsyncScriptableFactory;
@@ -39,8 +38,6 @@ import org.apache.sling.scripting.sightly.use.UseProvider;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.component.annotations.ReferenceCardinality;
-import org.osgi.service.component.annotations.ReferencePolicyOption;
 import org.osgi.service.metatype.annotations.AttributeDefinition;
 
 /**
@@ -78,9 +75,6 @@ public class JsUseProvider implements UseProvider {
     @Reference
     private ScriptingResourceResolverProvider 
scriptingResourceResolverProvider;
 
-    @Reference(cardinality = ReferenceCardinality.OPTIONAL, policyOption = 
ReferencePolicyOption.GREEDY)
-    private BundledUnitManager bundledUnitManager;
-
     @Override
     public ProviderOutcome provide(String identifier, RenderContext 
renderContext, Bindings arguments) {
         Bindings globalBindings = new LazyBindings();
@@ -95,7 +89,7 @@ public class JsUseProvider implements UseProvider {
         JsEnvironment environment = null;
         try {
             ResourceResolver slingScriptingResolver = 
scriptingResourceResolverProvider.getRequestScopedResourceResolver();
-            DependencyResolver dependencyResolver = new 
DependencyResolver(slingScriptingResolver, bundledUnitManager);
+            DependencyResolver dependencyResolver = new 
DependencyResolver(slingScriptingResolver);
             environment = new JsEnvironment(jsEngine, dependencyResolver);
             environment.initialize();
             ScriptNameAwareReader reader = 
dependencyResolver.resolve(globalBindings, identifier);
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 44fc612..d9422ec 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,7 +22,6 @@ package org.apache.sling.scripting.sightly.js.impl.use;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
 
 import javax.script.Bindings;
@@ -37,7 +36,6 @@ import org.apache.sling.api.scripting.SlingScript;
 import org.apache.sling.api.scripting.SlingScriptHelper;
 import org.apache.sling.scripting.core.ScriptNameAwareReader;
 import org.apache.sling.scripting.sightly.SightlyException;
-import org.apache.sling.scripting.sightly.engine.BundledUnitManager;
 import org.apache.sling.scripting.sightly.js.impl.Utils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -47,11 +45,9 @@ import org.jetbrains.annotations.Nullable;
  */
 public class DependencyResolver {
 
-    private final BundledUnitManager bundledUnitManager;
     private final ResourceResolver scriptingResourceResolver;
 
-    public DependencyResolver(@NotNull ResourceResolver 
scriptingResourceResolver, @Nullable BundledUnitManager bundledUnitManager) {
-        this.bundledUnitManager = bundledUnitManager;
+    public DependencyResolver(@NotNull ResourceResolver 
scriptingResourceResolver) {
         this.scriptingResourceResolver = scriptingResourceResolver;
     }
 
@@ -62,13 +58,6 @@ public class DependencyResolver {
         ScriptNameAwareReader reader = null;
         IOException ioException = null;
         try {
-            if (bundledUnitManager != null) {
-                URL script = bundledUnitManager.getScript(bindings, 
dependency);
-                if (script != null) {
-                    reader = new ScriptNameAwareReader(new 
StringReader(IOUtils.toString(script, StandardCharsets.UTF_8)),
-                            script.toExternalForm());
-                }
-            }
             if (reader == null) {
                 Resource scriptResource = null;
                 if (dependency.startsWith("/")) {