From 7cd175e41e28ee69c65f3a65150a08b4b07fa059 Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Wed, 23 Mar 2016 18:52:57 +0100 Subject: [PATCH] Fix #2 remove IdentitySet in order to reuse existing objet --- .../javabean/JavaBeanMarshaller.java | 5 +- .../javaetmoi/javabean/util/IdentitySet.java | 68 ------------------- 2 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 src/main/java/com/javaetmoi/javabean/util/IdentitySet.java diff --git a/src/main/java/com/javaetmoi/javabean/JavaBeanMarshaller.java b/src/main/java/com/javaetmoi/javabean/JavaBeanMarshaller.java index 771f9ab..ebf7a8a 100644 --- a/src/main/java/com/javaetmoi/javabean/JavaBeanMarshaller.java +++ b/src/main/java/com/javaetmoi/javabean/JavaBeanMarshaller.java @@ -3,7 +3,6 @@ import com.javaetmoi.javabean.bean.Item; import com.javaetmoi.javabean.bean.SetterParam; import com.javaetmoi.javabean.generator.*; -import com.javaetmoi.javabean.util.IdentitySet; import com.squareup.javapoet.JavaFile; import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.TypeSpec; @@ -38,13 +37,13 @@ */ public class JavaBeanMarshaller { - private Map variables = new HashMap(); + private Map variables = new HashMap<>(); private final TypeSpec.Builder clazz; private final MethodSpec.Builder method; - private Set processedBeans = new IdentitySet(); + private Set processedBeans = new HashSet<>(); private final static Logger LOG = LoggerFactory.getLogger(JavaBeanMarshaller.class); diff --git a/src/main/java/com/javaetmoi/javabean/util/IdentitySet.java b/src/main/java/com/javaetmoi/javabean/util/IdentitySet.java deleted file mode 100644 index d08374b..0000000 --- a/src/main/java/com/javaetmoi/javabean/util/IdentitySet.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.javaetmoi.javabean.util; - -import java.util.Collection; -import java.util.IdentityHashMap; -import java.util.Iterator; -import java.util.Set; - -public class IdentitySet implements Set { - private static final Object VALUE = new Object(); - - private final IdentityHashMap map = new IdentityHashMap(); - - public int size() { - return map.size(); - } - - public boolean isEmpty() { - return map.isEmpty(); - } - - public boolean add(E o) { - return map.put(o, VALUE) == null; - } - - public boolean contains(Object o) { - return map.get(o) == VALUE; - } - - public Iterator iterator() { - return map.keySet().iterator(); - } - - public void clear() { - map.clear(); - } - - @Override - public Object[] toArray() { - throw new UnsupportedOperationException(); - } - - @Override - public T[] toArray(T[] a) { - throw new UnsupportedOperationException(); - } - - @Override - public boolean remove(Object o) { - throw new UnsupportedOperationException(); - } - - @Override - public boolean containsAll(Collection c) { - throw new UnsupportedOperationException(); - } - - public boolean addAll(Collection c) { - throw new UnsupportedOperationException(); - } - - public boolean retainAll(Collection c) { - throw new UnsupportedOperationException(); - } - - public boolean removeAll(Collection c) { - throw new UnsupportedOperationException(); - } -}