You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/06/17 11:12:01 UTC
camel git commit: CAMEL-11416: Removed the now useless overrides
removal loop
Repository: camel
Updated Branches:
refs/heads/master ad58d5591 -> 1dd8bf36d
CAMEL-11416: Removed the now useless overrides removal loop
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1dd8bf36
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1dd8bf36
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1dd8bf36
Branch: refs/heads/master
Commit: 1dd8bf36d8571b2cc303bf4b30e9cda689427b2f
Parents: ad58d55
Author: aldettinger <al...@gmail.com>
Authored: Thu Jun 15 21:11:13 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jun 17 13:11:52 2017 +0200
----------------------------------------------------------------------
.../apache/camel/component/bean/BeanInfo.java | 28 --------------------
1 file changed, 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1dd8bf36/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 00f6557..66def2d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -328,34 +328,6 @@ public class BeanInfo {
methods.addAll(extraMethods);
}
- Set<Method> overrides = new HashSet<Method>();
-
- // do not remove duplicates form class from the Java itself as they have some "duplicates" we need
- boolean javaClass = clazz.getName().startsWith("java.") || clazz.getName().startsWith("javax.");
- if (!javaClass) {
- // it may have duplicate methods already, even from declared or from interfaces + declared
- for (Method source : methods) {
-
- // skip bridge methods in duplicate checks (as the bridge method is inserted by the compiler due to type erasure)
- if (source.isBridge()) {
- continue;
- }
-
- for (Method target : methods) {
- // skip ourselves
- if (ObjectHelper.isOverridingMethod(getType(), source, target, true)) {
- continue;
- }
- // skip duplicates which may be assign compatible (favor keep first added method when duplicate)
- if (ObjectHelper.isOverridingMethod(getType(), source, target, false)) {
- overrides.add(target);
- }
- }
- }
- methods.removeAll(overrides);
- overrides.clear();
- }
-
// now introspect the methods and filter non valid methods
for (Method method : methods) {
boolean valid = isValidMethod(clazz, method);