QI-377 Method collision resolution more predictable This fixes QI-377 IssueTest that failed with Java 8.
Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/0a31fb8f Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/0a31fb8f Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/0a31fb8f Branch: refs/heads/develop Commit: 0a31fb8f23a7f27db973a8d8d3f2d3b655dd37a8 Parents: e6ea4ec Author: Paul Merlin <[email protected]> Authored: Tue Apr 7 15:11:57 2015 +0200 Committer: Paul Merlin <[email protected]> Committed: Tue Apr 7 15:11:57 2015 +0200 ---------------------------------------------------------------------- .../java/org/qi4j/runtime/composite/CompositeMethodsModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/0a31fb8f/core/runtime/src/main/java/org/qi4j/runtime/composite/CompositeMethodsModel.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/qi4j/runtime/composite/CompositeMethodsModel.java b/core/runtime/src/main/java/org/qi4j/runtime/composite/CompositeMethodsModel.java index 6fec5eb..f18d222 100644 --- a/core/runtime/src/main/java/org/qi4j/runtime/composite/CompositeMethodsModel.java +++ b/core/runtime/src/main/java/org/qi4j/runtime/composite/CompositeMethodsModel.java @@ -15,7 +15,7 @@ package org.qi4j.runtime.composite; import java.lang.reflect.Method; -import java.util.HashMap; +import java.util.LinkedHashMap; import org.qi4j.api.composite.MissingMethodException; import org.qi4j.functional.HierarchicalVisitor; import org.qi4j.functional.Iterables; @@ -32,12 +32,12 @@ import static org.qi4j.functional.Iterables.map; public final class CompositeMethodsModel implements VisitableHierarchy<Object, Object> { - private HashMap<Method, CompositeMethodModel> methods; + private final LinkedHashMap<Method, CompositeMethodModel> methods; private final MixinsModel mixinsModel; public CompositeMethodsModel( MixinsModel mixinsModel ) { - methods = new HashMap<Method, CompositeMethodModel>(); + methods = new LinkedHashMap<>(); this.mixinsModel = mixinsModel; }
