You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/03/29 13:55:22 UTC
[2/5] cayenne git commit: CAY-2416 Added sorting of dbAttributes
convert to xml.
CAY-2416
Added sorting of dbAttributes convert to xml.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8462e6f1
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8462e6f1
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8462e6f1
Branch: refs/heads/master
Commit: 8462e6f15f0e1daf4d6e0aadfe5f626c67b5d919
Parents: 36322d2
Author: kkomyak <co...@gmail.com>
Authored: Wed Mar 28 11:26:44 2018 +0300
Committer: kkomyak <co...@gmail.com>
Committed: Wed Mar 28 11:27:16 2018 +0300
----------------------------------------------------------------------
cayenne-server/src/main/java/org/apache/cayenne/map/DbEntity.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8462e6f1/cayenne-server/src/main/java/org/apache/cayenne/map/DbEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/DbEntity.java b/cayenne-server/src/main/java/org/apache/cayenne/map/DbEntity.java
index 73b6177..c4d8a7d 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/DbEntity.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/DbEntity.java
@@ -45,6 +45,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.TreeMap;
import java.util.function.Function;
/**
@@ -122,7 +123,7 @@ public class DbEntity extends Entity implements ConfigurationNode, DbEntityListe
encoder.attribute("catalog", getCatalog().trim());
}
- encoder.nested(getAttributeMap(), delegate);
+ encoder.nested(new TreeMap<>(getAttributeMap()), delegate);
if (getPrimaryKeyGenerator() != null) {
getPrimaryKeyGenerator().encodeAsXML(encoder, delegate);