SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

polishing

Browse Source
This commit is contained in:
Oleg Zhurakousky
2018-06-25 18:09:22 -04:00
parent da9658ef1f
commit ed228dae59
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/MergableProperties.java
View File

@@ -47,6 +47,9 @@ public interface MergableProperties {
* - If source property is mergable then merge.
*/
default void merge(MergableProperties mergable) {
if (mergable == null) {
return;
}
for (PropertyDescriptor targetPd : BeanUtils.getPropertyDescriptors(mergable.getClass())) {
Method writeMethod = targetPd.getWriteMethod();
if (writeMethod != null) {
@@ -62,6 +65,7 @@ public interface MergableProperties {
Object value = readMethod.invoke(this);
if (value != null) {
if (value instanceof MergableProperties) {
Object m = readMethod.invoke(mergable);
((MergableProperties)value).merge((MergableProperties)readMethod.invoke(mergable));
}
else {