Repository: ode Updated Branches: refs/heads/master 0a73a9e24 -> b2ddc6436
ODE-1074:Change the method name "contains" to "find". The method tries to find an Object in Collection c that deep equals to the Object t1. If found, return the found object, otherwise return null. Thus, rename the method as "find" should be more clear than "contains" since "contains" is prone to ask whether something is contained or not and return true or false. Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/3a06ad7f Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/3a06ad7f Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/3a06ad7f Branch: refs/heads/master Commit: 3a06ad7f9c6c25d5e4021b5b52d2a7a59533d7b4 Parents: 93c9155 Author: Kui LIU <[email protected]> Authored: Tue Apr 24 17:06:43 2018 +0200 Committer: Kui LIU <[email protected]> Committed: Tue Apr 24 17:06:43 2018 +0200 ---------------------------------------------------------------------- .../org/apache/ode/bpel/obj/migrate/DeepEqualityHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/3a06ad7f/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DeepEqualityHelper.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DeepEqualityHelper.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DeepEqualityHelper.java index e012ac5..f3eccfb 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DeepEqualityHelper.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DeepEqualityHelper.java @@ -110,7 +110,7 @@ public class DeepEqualityHelper{ Set ks2 = m2.keySet(); for (Object k1 : ks1){ st.push(k1.toString()); - Object k2 = contains(ks2, k1); + Object k2 = find(ks2, k1); if (k2 == null){ if (!logFalseThrough){ __log.debug("Unequal in Map: cant find key. " + st + "\n missing key: " + k1); @@ -175,7 +175,7 @@ public class DeepEqualityHelper{ while (i1.hasNext()){ Object o1 = i1.next(); st.push(":" + o1.getClass().getSimpleName()); - if (contains(c2, o1) == null) { + if (find(c2, o1) == null) { if (!logFalseThrough){ __log.debug("Unequal in Set: Object mismatch. " + st + "\n" + "can't find " + o1); @@ -188,7 +188,7 @@ public class DeepEqualityHelper{ return true; } - private Object contains(Collection c, Object t1) { + private Object find(Collection c, Object t1) { Iterator itor = c.iterator(); Object t2; logFalseThrough = true;
