SESPRINGPYTHONPY-148: Merging the fix to trunk.

Dariusz Suchojad · Dariusz Suchojad · commit eaf551df1391 · 2010-04-15T22:51:09.000Z
git-svn-id: https://src.springframework.org/svn/se-springpython-py/trunk@783 ce8fead1-4192-4296-8608-a705134b927f
diff --git a/springpython/src/springpython/aop/__init__.py b/springpython/src/springpython/aop/__init__.py
@@ -11,7 +11,7 @@
    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.       
+   limitations under the License.
 """
 import copy
 import logging
@@ -45,7 +45,7 @@ def __init__(self, instance, method_name, args, kwargs, interceptors):
         self.args = args
         self.kwargs = kwargs
         self.intercept_stack = copy.copy(interceptors)
-        self.intercept_stack.append(FinalInterceptor()) 
+        self.intercept_stack.append(FinalInterceptor())
         self.logger = logging.getLogger("springpython.aop.MethodInvocation")
 
     def getInterceptor(self):
@@ -139,7 +139,7 @@ def invoke(self, invocation):
 
     def __setattr__(self, name, value):
         """If "advice", make sure it is a list. Anything else, pass through to simple assignment.
-        Also, if "patterns", initialize the regular expression parsers. 
+        Also, if "patterns", initialize the regular expression parsers.
         """
         if name == "advice" and type(value) != list:
             self.__dict__[name] = [value]
@@ -165,7 +165,7 @@ class AopProxy(object):
     """AopProxy acts like the target object by dispatching all method calls to the target through a MethodInvocation.
     The MethodInvocation object actually deals with potential "around" advice, referred to as interceptors. Attribute
     lookups are not intercepted, but instead fetched from the actual target object."""
-    
+
     def __init__(self, target, interceptors):
         if type(target).__name__ != "instance":
             raise Exception("Target attribute must be an instance.")
@@ -186,24 +186,24 @@ def __getattr__(self, name):
             attr = getattr(self.target, name)
             if not callable(attr):
                 return attr
-            
+
             def dispatch(*args, **kwargs):
-                """This method is returned to the caller emulating the function call being sent to the 
+                """This method is returned to the caller emulating the function call being sent to the
                 target object. This services as a proxying agent for the target object."""
                 invocation = MethodInvocation(self.target, name, args, kwargs, self.interceptors)
                 ##############################################################################
                 # NOTE:
                 # getattr(invocation, name) doesn't work here, because __str__ will print
                 # the MethodInvocation's string, instead of trigger the interceptor stack.
                 ##############################################################################
-                return invocation.__getattr__(name)(*args, **kwargs)  
+                return invocation.__getattr__(name)(*args, **kwargs)
 
             return dispatch
-        
+
 class ProxyFactory(object):
     """This object helps to build AopProxy objects programmatically. It allows configuring advice and target objects.
     Then it will produce an AopProxy when needed. To use similar behavior in an IoC environment, see ProxyFactoryObject."""
-    
+
     def __init__(self, target = None, interceptors = None):
         self.logger = logging.getLogger("springpython.aop.ProxyFactory")
         self.target = target
@@ -218,20 +218,22 @@ def getProxy(self):
         """Generate an AopProxy given the current target and list of interceptors. Any changes to the factory after
         proxy creation do NOT propagate to the proxies."""
         return AopProxy(self.target, self.interceptors)
-    
+
     def __setattr__(self, name, value):
         if name == "target" and type(value) == types.StringType:
-            self.__dict__[name] = utils.getClass(value)()
-        else:
-            self.__dict__[name] = value
+            value = utils.getClass(value)()
+        elif name == "interceptors" and not isinstance(value, list):
+            value = [value]
+
+        self.__dict__[name] = value
 
 class ProxyFactoryObject(ProxyFactory, AopProxy):
     """This class acts as both a ProxyFactory to build and an AopProxy. It makes itself look like the target object.
     Any changes to the target and list of interceptors is immediately seen when using this as a proxy."""
     def __init__(self, target = None, interceptors = None):
         ProxyFactory.__init__(self, target, interceptors)
         self.logger = logging.getLogger("springpython.aop.ProxyFactoryObject")
-        
+
     def __str__(self):
         return self.__getattr__("__str__")()
 
diff --git a/springpython/test/springpythontest/aopTestCases.py b/springpython/test/springpythontest/aopTestCases.py
@@ -11,7 +11,7 @@
    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.       
+   limitations under the License.
 """
 import logging
 import unittest
@@ -33,11 +33,11 @@ def testPointcutInterface(self):
         pointcut = Pointcut()
         self.assertRaises(NotImplementedError, pointcut.class_filter)
         self.assertRaises(NotImplementedError, pointcut.method_matcher)
-        
+
     def testMethodMatcherInterface(self):
         methodMatcher = MethodMatcher()
         self.assertRaises(NotImplementedError, methodMatcher.matches_method_and_target, None, None, None)
-        
+
     def testMethodInterceptorInterface(self):
         methodInterceptor = MethodInterceptor()
         self.assertRaises(NotImplementedError, methodInterceptor.invoke, None)
@@ -55,7 +55,7 @@ def testCreatingAProxyFactoryAndAddingAnInterceptorProgrammatically(self):
         self.assertEquals("<Wrapped>Alright!</Wrapped>", service.doSomething())
         self.assertEquals("<Wrapped>You made it! => test</Wrapped>", service.method("test"))
         self.assertEquals("sample", service.attribute)
-        
+
     def testCreatingAProxyFactoryAndAddingAnInterceptorIoC(self):
         factory = self.appContext.get_object("factory")
         service = factory.getProxy()
@@ -71,7 +71,7 @@ def testWrappingStringFunctionWithInterceptor(self):
         self.assertEquals("This is a sample service.", str(service.target))
         self.assertEquals("<Wrapped>This is a sample service.</Wrapped>", str(service))
         self.assertEquals("<Wrapped>This is a sample service.</Wrapped>", service.__str__())
-    
+
     def testCreatingAProxyFactoryObjectAndAddingAnInterceptorProgrammatically(self):
         service = ProxyFactoryObject()
         service.target = SampleService()
@@ -95,7 +95,7 @@ def testApplyingTwoConditionalPointcutsIoC(self):
         sampleService = self.appContext.get_object("sampleService2")
         self.assertEquals(sampleService.doSomething(), "BEFORE => <Wrapped>Alright!</Wrapped> <= AFTER")
         self.assertEquals(sampleService.method("testdata"), "You made it! => testdata")
-        
+
     def testApplyingASingleConditionalPointcutProgrammatically(self):
         wrappingAdvice = WrappingInterceptor()
         pointcutAdvisor = RegexpMethodPointcutAdvisor()
@@ -118,13 +118,32 @@ def testApplyingTwoConditionalPointcutsProgrammatically(self):
         sampleService.target = targetService
         self.assertEquals(sampleService.doSomething(), "BEFORE => <Wrapped>Alright!</Wrapped> <= AFTER")
         self.assertEquals(sampleService.method("testdata"), "You made it! => testdata")
-        
+
     def testCreatingAProxyFactoryObjectWithAnInterceptorByClassNameInsteadOfInstanceIoC(self):
         service = self.appContext.get_object("sampleService5")
         self.assertEquals("<Wrapped>Alright!</Wrapped>", service.doSomething())
         self.assertEquals("<Wrapped>You made it! => test</Wrapped>", service.method("test"))
         self.assertEquals("sample", service.attribute)
-        
+
+    def testProxyFactoryObjectInterceptorsNotWrappedInAList(self):
+        service = ProxyFactoryObject()
+        service.target = SampleService()
+
+        # Note that it isn't wrapped in a list.
+        service.interceptors = WrappingInterceptor()
+
+        self.assertEquals("This is a sample service.", service.target.__str__())
+        self.assertEquals("This is a sample service.", str(service.target))
+        self.assertEquals("<Wrapped>This is a sample service.</Wrapped>", str(service))
+        self.assertEquals("<Wrapped>This is a sample service.</Wrapped>", service.__str__())
+
+        # sampleService6 has an interceptor which isn't wrapped in a list
+        # inside its XMLConfig.
+        service = self.appContext.get_object("sampleService6")
+        self.assertEquals("<Wrapped>Alright!</Wrapped>", service.doSomething())
+        self.assertEquals("<Wrapped>You made it! => test</Wrapped>", service.method("test"))
+        self.assertEquals("sample", service.attribute)
+
 #class AopProxyFactoryCombinedWithPyroTestCase(unittest.TestCase):
 #    """Tests mixing AOP proxies and Pyro with the point cut on either the client or the server side."""
 #    def __init__(self, methodName='runTest'):
@@ -143,7 +162,7 @@ def testCreatingAProxyFactoryObjectWithAnInterceptorByClassNameInsteadOfInstance
 #
 #    # TODO: There is some issue with running this and the previous test at the same time. It is some type of unforseeable
 #    # dependency. Each test works fine when the other is commented out. Must resolve.
-#    
+#
 #    #def testWrappingPyroProxyOnServerSideIoC(self):
 #    #    remoteService = self.appContext.get_object("remoteService2")
 #    #    clientService = self.appContext.get_object("service2")
@@ -154,9 +173,9 @@ def testCreatingAProxyFactoryObjectWithAnInterceptorByClassNameInsteadOfInstance
 class AopProxiedArgumentsTest(unittest.TestCase):
     def testCallingProxiedMethodWithProxiedPositionalArguments(self):
         targetService = SampleService()
-        
+
         service = ProxyFactoryObject(target = targetService, interceptors = WrappingInterceptor())
-        
+
         self.assertEquals("<Wrapped>You made it! => test</Wrapped>", service.method("test"))
         self.assertEquals("<Wrapped>Alright!</Wrapped>", service.doSomething())
         self.assertEquals("<Wrapped>You made it! => Alright!</Wrapped>",
@@ -167,7 +186,7 @@ def testCallingProxiedMethodWithProxiedPositionalArguments(self):
     def testCallingProxiedMethodWithProxiedNamedArguments(self):
         targetService = SampleService()
         service = ProxyFactoryObject(target = targetService, interceptors = WrappingInterceptor())
-        
+
         self.assertEquals("<Wrapped>You made it! => test</Wrapped>", service.method(data="test"))
         self.assertEquals("<Wrapped>Alright!</Wrapped>", service.doSomething())
         self.assertEquals("<Wrapped>You made it! => Alright!</Wrapped>",
@@ -179,17 +198,17 @@ def testCallingRegExpProxiedMethodThatHasArgumentsWithProxiedPositionalArguments
         pointcutAdvisor = RegexpMethodPointcutAdvisor(advice = WrappingInterceptor(),
                                                       patterns = ["SampleService.method"])
         service = ProxyFactoryObject(target = SampleService(), interceptors = pointcutAdvisor)
-        
+
         self.assertEquals("Alright!", service.doSomething())
         self.assertEquals("<Wrapped>You made it! => test</Wrapped>", service.method("test"))
         self.assertEquals("<Wrapped>You made it! => Alright!</Wrapped>",
                           service.method(service.doSomething()))
-        
+
     def testCallingRegExpProxiedMethodThatHasArgumentsWithProxiedNamedArguments(self):
         pointcutAdvisor = RegexpMethodPointcutAdvisor(advice = WrappingInterceptor(),
                                                       patterns = ["SampleService.method"])
         service = ProxyFactoryObject(target = SampleService(), interceptors = pointcutAdvisor)
-        
+
         self.assertEquals("<Wrapped>You made it! => test</Wrapped>", service.method(data="test"))
         self.assertEquals("<Wrapped>You made it! => Alright!</Wrapped>",
                           service.method(data=service.doSomething()))
@@ -203,7 +222,7 @@ def testCallingRegExpProxiedMethodThatHasNoArgumentsWithProxiedPositionalArgumen
         self.assertEquals("You made it! => test", service.method("test"))
         self.assertEquals("You made it! => <Wrapped>Alright!</Wrapped>",
                           service.method(service.doSomething()))
-        
+
     def testCallingRegExpProxiedMethodThatHasNoArgumentsWithProxiedNamedArguments(self):
         pointcutAdvisor = RegexpMethodPointcutAdvisor(advice = WrappingInterceptor(),
                                                       patterns = ["SampleService.doSomething"])
@@ -219,7 +238,7 @@ def testCallingRegExpProxiedMethodThatHasNoArgumentsWithProxiedNamedArguments(se
     logger.setLevel(loggingLevel)
     ch = logging.StreamHandler()
     ch.setLevel(loggingLevel)
-    formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s") 
+    formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
     ch.setFormatter(formatter)
     logger.addHandler(ch)
 
diff --git a/springpython/test/springpythontest/support/aopApplicationContext.xml b/springpython/test/springpythontest/support/aopApplicationContext.xml
@@ -86,4 +86,14 @@
 		</property>
 	</object>
 
+	<object id="sampleService6" class="springpython.aop.ProxyFactoryObject">
+		<property name="target">
+			<value>springpythontest.support.testSupportClasses.SampleService</value>
+		</property>
+		<property name="interceptors">
+				<!-- Note that it isn't wrapped in a list -->
+				<ref object="wrappingInterceptor"/>
+		</property>
+	</object>
+
 </objects>
