You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by sa...@apache.org on 2014/11/08 13:36:56 UTC
incubator-johnzon git commit: revert hashmap -> linkedhashmap
Repository: incubator-johnzon
Updated Branches:
refs/heads/master 1b2389104 -> 64ddab0df
revert hashmap -> linkedhashmap
Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/64ddab0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/64ddab0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/64ddab0d
Branch: refs/heads/master
Commit: 64ddab0df40a57b33ad39e8f0b35710ad0a801d0
Parents: 1b23891
Author: salyh <he...@gmail.com>
Authored: Thu Nov 6 11:19:39 2014 +0100
Committer: Hendrik Saly <he...@gmail.com>
Committed: Sat Nov 8 13:35:18 2014 +0100
----------------------------------------------------------------------
.../apache/johnzon/mapper/reflection/Mappings.java | 16 ++++++++--------
.../java/org/apache/johnzon/mapper/MapperTest.java | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/64ddab0d/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/reflection/Mappings.java
----------------------------------------------------------------------
diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/reflection/Mappings.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/reflection/Mappings.java
index d0e2d07..116c97f 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/reflection/Mappings.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/reflection/Mappings.java
@@ -18,11 +18,6 @@
*/
package org.apache.johnzon.mapper.reflection;
-import org.apache.johnzon.mapper.Converter;
-import org.apache.johnzon.mapper.JohnzonConverter;
-import org.apache.johnzon.mapper.JohnzonIgnore;
-import org.apache.johnzon.mapper.MapperException;
-
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
@@ -33,7 +28,7 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Collection;
import java.util.Comparator;
-import java.util.LinkedHashMap;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Queue;
@@ -43,6 +38,11 @@ import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.apache.johnzon.mapper.Converter;
+import org.apache.johnzon.mapper.JohnzonConverter;
+import org.apache.johnzon.mapper.JohnzonIgnore;
+import org.apache.johnzon.mapper.MapperException;
+
public class Mappings {
public static class ClassMapping {
public final Class<?> clazz;
@@ -204,9 +204,9 @@ public class Mappings {
private ClassMapping createClassMapping(final Class<?> clazz) {
try {
final Map<String, Getter> getters = fieldOrdering != null ?
- new TreeMap<String, Getter>(fieldOrdering) : new LinkedHashMap<String, Getter>();
+ new TreeMap<String, Getter>(fieldOrdering) : new HashMap<String, Getter>();
final Map<String, Setter> setters = fieldOrdering != null ?
- new TreeMap<String, Setter>(fieldOrdering) : new LinkedHashMap<String, Setter>();
+ new TreeMap<String, Setter>(fieldOrdering) : new HashMap<String, Setter>();
final PropertyDescriptor[] propertyDescriptors = Introspector.getBeanInfo(clazz).getPropertyDescriptors();
for (final PropertyDescriptor descriptor : propertyDescriptors) {
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/64ddab0d/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
----------------------------------------------------------------------
diff --git a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
index 7478422..f23f050 100644
--- a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
+++ b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperTest.java
@@ -166,7 +166,7 @@ public class MapperTest {
// object
baos = new ByteArrayOutputStream();
new MapperBuilder().build().writeArray(new Pair[] { new Pair(1, "a"), new Pair(2, "b") }, baos);
- assertEquals("[{\"i\":1,\"s\":\"a\"},{\"i\":2,\"s\":\"b\"}]", new String(baos.toByteArray()));
+ assertEquals("[{\"s\":\"a\",\"i\":1},{\"s\":\"b\",\"i\":2}]", new String(baos.toByteArray()));
}
@Test