svn commit: r1673425 - /sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/sightly/ModelFactoryUseProvider.java

[radu]

Author: radu
Date: Tue Apr 14 13:43:27 2015
New Revision: 1673425

URL: http://svn.apache.org/r1673425
Log:
SLING-4618 - Remove dependency to unexported class

* removed dependency to 
org.apache.sling.scripting.sightly.impl.engine.extension.use.UseProviderUtils

Modified:
    
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/sightly/ModelFactoryUseProvider.java

Modified: 
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/sightly/ModelFactoryUseProvider.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/sightly/ModelFactoryUseProvider.java?rev=1673425&r1=1673424&r2=1673425&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/sightly/ModelFactoryUseProvider.java
 (original)
+++ 
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/sightly/ModelFactoryUseProvider.java
 Tue Apr 14 13:43:27 2015
@@ -18,8 +18,8 @@ package org.apache.sling.models.impl.sig
 
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.script.Bindings;
+import javax.script.SimpleBindings;
 import javax.servlet.ServletRequest;
 
 import org.apache.felix.scr.annotations.Component;
@@ -31,7 +31,6 @@ import org.apache.sling.api.resource.Res
 import org.apache.sling.api.scripting.SlingBindings;
 import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
 import org.apache.sling.models.factory.ModelFactory;
-import 
org.apache.sling.scripting.sightly.impl.engine.extension.use.UseProviderUtils;
 import org.apache.sling.scripting.sightly.render.RenderContext;
 import org.apache.sling.scripting.sightly.use.ProviderOutcome;
 import org.apache.sling.scripting.sightly.use.UseProvider;
@@ -66,8 +65,7 @@ public class ModelFactoryUseProvider imp
     private DynamicClassLoaderManager dynamicClassLoaderManager = null;
     
     @Override
-    public ProviderOutcome provide(final String identifier,
-            final RenderContext renderContext, final Bindings arguments) {
+    public ProviderOutcome provide(final String identifier, final 
RenderContext renderContext, final Bindings arguments) {
         final Class<?> cls;
         try {
             cls = 
dynamicClassLoaderManager.getDynamicClassLoader().loadClass(identifier);
@@ -77,7 +75,7 @@ public class ModelFactoryUseProvider imp
             return ProviderOutcome.failure();
         }
         Bindings globalBindings = renderContext.getBindings();
-        Bindings bindings = UseProviderUtils.merge(globalBindings, arguments);
+        Bindings bindings = merge(globalBindings, arguments);
         Resource resource = (Resource) bindings.get(SlingBindings.RESOURCE);
         if (resource == null) {
             return ProviderOutcome.failure(new IllegalStateException("Could 
not get resource from bindings"));
@@ -143,4 +141,11 @@ public class ModelFactoryUseProvider imp
             }
         }
     }
+
+    private SimpleBindings merge(Bindings former, Bindings latter) {
+        SimpleBindings bindings = new SimpleBindings();
+        bindings.putAll(former);
+        bindings.putAll(latter);
+        return bindings;
+    }
 }