svn commit: r1438421 - in /cxf/trunk/rt/databinding/jaxb/src: main/java/org/apache/cxf/jaxb/Utils.java test/java/org/apache/cxf/jaxb/UtilsTest.java

[em...@apache.org]

Author: ema
Date: Fri Jan 25 10:22:48 2013
New Revision: 1438421

URL: http://svn.apache.org/viewvc?rev=1438421&view=rev
Log:
[CXF-4735]:Fix the jaxb Utils.getGetters doesn't exclude toString()

Added:
    cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java   (with props)
Modified:
    cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java

Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java?rev=1438421&r1=1438420&r2=1438421&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java Fri Jan 25 10:22:48 2013
@@ -153,7 +153,9 @@ final class Utils {
             if (setter != null) {
                 return !setter.isAnnotationPresent(XmlTransient.class);
             }
-            return true;
+            if (getterIndex(m.getName()) > -1) {
+                return true;
+            }
         }
         return false;
     }

Added: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java?rev=1438421&view=auto
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java (added)
+++ cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java Fri Jan 25 10:22:48 2013
@@ -0,0 +1,87 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software 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.
+ */
+package org.apache.cxf.jaxb;
+
+import java.lang.reflect.Method;
+
+import javax.xml.bind.annotation.XmlAccessType;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class UtilsTest extends Assert {
+
+    @Test
+    public void testGetMethod() {
+        for (Method method : Utils.getGetters(MyException.class, XmlAccessType.PUBLIC_MEMBER)) {
+            if (method.getName().equals("toString")) {
+                fail("toString should not be included in get methods list");
+            }
+        }
+    }
+
+    public class MyException extends Exception {
+        private static final long serialVersionUID = 1L;
+        private String from;
+        private int id;
+        private String summary;
+
+        public MyException() {
+        } // mandatory constructor
+
+        public MyException(String from, int id, String message, String summary) {
+            super(message);
+            this.from = from;
+            this.id = id;
+            this.summary = summary;
+        }
+
+        // mandatory from setter
+        public void setFrom(String from) {
+            this.from = from;
+        }
+
+        // mandatory id setter
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        // mandatory summary setter
+        public void setSummary(String summary) {
+            this.summary = summary;
+        }
+
+        public String getFrom() {
+            return from;
+        }
+
+        public int getId() {
+            return id;
+        }
+
+        public String getSummary() {
+            return summary;
+        }
+
+        public String toString() {
+            return from + "," + id + "," + getMessage() + "," + summary;
+        }
+    }
+
+}

Propchange: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/UtilsTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date