Changeset 210

Timestamp:

02/05/07 19:46:49 (2 years ago)

Author:

schst

Message:

Do not call methods that require any parameters, export public methods and properties by default
Added support for XMLProperties and XMLMethods using the XMLMatcher annotation

Files:

• trunk/src/main/php/net/stubbles/xml/serializer/annotations/XMLMatcher.php (added)
• trunk/src/main/php/net/stubbles/xml/serializer/stubXMLSerializer.php (modified) (6 diffs)
• trunk/src/test/php/net/stubbles/xml/stubXMLSerializerTestCase.php (modified) (3 diffs)

trunk/src/main/php/net/stubbles/xml/serializer/stubXMLSerializer.php

@@ -10 +10 @@
-                      'net.stubbles.xml.serializer.annotations.XMLAttribute',
-                      'net.stubbles.xml.serializer.annotations.XMLIgnore',
+                      'net.stubbles.xml.serializer.annotations.XMLMatcher',
-                      'net.stubbles.relection.stubReflection');
-
@@ -124 +125 @@
-        // export props
-        $properties = $clazz->getProperties();
+
+        // get the property-matcher
+        if ($clazz->hasAnnotation('XMLProperties')) {
+            $matcher = $clazz->getAnnotation('XMLProperties');
+        } else {
+            $matcher = null;
+        }
+
-        foreach ($properties as $property) {
-            if (!$property->isPublic()) {
@@ -131 +140 @@
-                continue;
-            }
+            if (null !== $matcher && !$matcher->matches($property->getName())) {
+                continue;
+            }
+
-            $propValue = $property->getValue($object);
-            if ($property->hasAnnotation('XMLAttribute')) {
@@ -139 +152 @@
-            if ($property->hasAnnotation('XMLTag')) {
-                $xmlTag = $property->getAnnotation('XMLTag');
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-        // export methods
-        $methods = $clazz->getMethods();
+
+        // get the method-matcher
+        if ($clazz->hasAnnotation('XMLMethods')) {
+            $matcher = $clazz->getAnnotation('XMLMethods');
+        } else {
+            $matcher = null;
+        }
+
-        foreach ($methods as $method) {
-            if (!$method->isPublic()) {
@@ -161 +186 @@
-                continue;
-            }
+            if (0 != $method->getNumberOfParameters()) {
+                continue;
+            }
-            if ($method->hasAnnotation('XMLIgnore')) {
-                continue;
-            }
+            if (null !== $matcher && !$matcher->matches($method->getName())) {
+                continue;
+            }
+
+
-            $returnValue = $method->invoke($object);
-            if ($method->hasAnnotation('XMLAttribute')) {
@@ -172 +205 @@
-            if ($method->hasAnnotation('XMLTag')) {
-                $xmlTag = $method->getAnnotation('XMLTag');
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        $xmlWriter->writeEndElement();

trunk/src/test/php/net/stubbles/xml/stubXMLSerializerTestCase.php

@@ -12 +12 @@
-/**
- * Simple Test class to test the XMLSerializer
+ */
+class XMLSerializerDefaultObj {
+    private $ignore = 'ignore';
+    public $foo = 'foo';
+
+    public function getBar() {
+        return 'bar';
+    }
+
+    public function setBar($bar) {
+        throw new Exception('setBar has been called');
+    }
+}
+
+/**
+ * Simple Test class to test the XMLSerializer
- *
- * @XMLTag(tagName=foo)
@@ -77 +93 @@
-    public function getValue() {
-        return "returned";
+    }
+}
+
+/**
+ * Simple Test class to test the XMLSerializer
+ *
+ * @XMLTag(tagName=testObject)
+ * @XMLProperties[XMLMatcher](pattern=/^[a-zA-Z]{3}$/)
+ */
+class XMLSerializerPropertyMatcher {
+    public $one   = 'one';
+    public $two   = 'two';
+    public $three = 'three';
+}
+
+
+/**
+ * Simple Test class to test the XMLSerializer
+ *
+ * @XMLTag(tagName=testObject)
+ * @XMLMethods[XMLMatcher](pattern=/^getF/)
+ */
+class XMLSerializerMethodMatcher {
+    public function getFoo() {
+        return "foo";
+    }
+    public function getBar() {
+        return "bar";
-    }
-}
@@ -222 +266 @@
-        $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<class method="returned"/>', $writer->asXML());
-    }
+
+    /**
+     * Test serializing an object with a property matcher
+     */
+    public function testObjectPropertyMatcher() {
+        $writer = new stubDomXMLStreamWriter();
+        $obj = new XMLSerializerPropertyMatcher();
+        $this->serializer->serialize($obj, $writer);
+        $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<testObject><one>one</one><two>two</two></testObject>', $writer->asXML());
+    }
+
+    /**
+     * Test serializing an object with a method matcher
+     */
+    public function testObjectMethodMatcher() {
+        $writer = new stubDomXMLStreamWriter();
+        $obj = new XMLSerializerMethodMatcher();
+        $this->serializer->serialize($obj, $writer);
+        $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<testObject><getFoo>foo</getFoo></testObject>', $writer->asXML());
+    }
+
+    /**
+     * Test serializing an object with a method matcher
+     */
+    public function testObjectDefault() {
+        $writer = new stubDomXMLStreamWriter();
+        $obj = new XMLSerializerDefaultObj();
+        $this->serializer->serialize($obj, $writer);
+        $this->assertEqual('<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<XMLSerializerDefaultObj><foo>foo</foo><getBar>bar</getBar></XMLSerializerDefaultObj>', $writer->asXML());
+    }
-}
-?>