From 892cdb2921c1fc113dd4da8c822a7a07829f0edd Mon Sep 17 00:00:00 2001 From: Andreas Gudian Date: Sat, 7 Feb 2015 20:47:44 +0100 Subject: [PATCH] #323 make order of fields for used mappers stable (ordered as given in @Mapper#uses and then @MapperConfig#uses, omitting duplicates) --- .../src/main/java/org/mapstruct/ap/util/MapperConfig.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/processor/src/main/java/org/mapstruct/ap/util/MapperConfig.java b/processor/src/main/java/org/mapstruct/ap/util/MapperConfig.java index f82da7dd9..e09a5b19e 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/MapperConfig.java +++ b/processor/src/main/java/org/mapstruct/ap/util/MapperConfig.java @@ -19,9 +19,10 @@ package org.mapstruct.ap.util; import java.util.ArrayList; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; + import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; import javax.lang.model.type.DeclaredType; @@ -73,7 +74,7 @@ public class MapperConfig { } public List uses() { - Set uses = new HashSet( mapperPrism.uses() ); + Set uses = new LinkedHashSet( mapperPrism.uses() ); if ( mapperConfigPrism != null ) { uses.addAll( mapperConfigPrism.uses() ); }