[GitHub] reta closed pull request #391: [CXF-7678] Fluent setters support in search extension

[GitBox]

reta closed pull request #391: [CXF-7678] Fluent setters support in search 
extension
URL: https://github.com/apache/cxf/pull/391
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git 
a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
 
b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
index 3a5bbb08666..87723fbf135 100644
--- 
a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
+++ 
b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
@@ -210,8 +210,9 @@ private String getPropertyName(Method m) {
     }
 
     private boolean isSetter(Method m) {
-        return m.getReturnType().equals(void.class) && 
m.getParameterTypes().length == 1
-               && (m.getName().startsWith("set") || 
m.getName().startsWith("is"));
+        return (m.getReturnType().equals(void.class) || 
m.getReturnType().equals(m.getDeclaringClass()))
+                && m.getParameterTypes().length == 1
+                && (m.getName().startsWith("set") || 
m.getName().startsWith("is"));
     }
 
 
diff --git 
a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java
 
b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java
index 4204413f46c..6ccc2e1139b 100644
--- 
a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java
+++ 
b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/BeanspectorTest.java
@@ -37,8 +37,9 @@ public void testSimpleBean() throws SearchParseException {
         assertTrue(getters.contains("promised"));
 
         Set<String> setters = bean.getSettersNames();
-        assertEquals(1, setters.size());
-        assertTrue(getters.contains("a"));
+        assertEquals(2, setters.size());
+        assertTrue(setters.contains("a"));
+        assertTrue(setters.contains("fluent"));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -69,5 +70,9 @@ public String getA() {
 
         public void setA(String val) {
         }
+        
+        public SimpleBean setFluent(String val) {
+            return this;
+        }
     }
 }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services