Clean up (unused imports etc); also renamed WritableBeanProperty to BeanPropertyWriter (more descriptive)
diff --git a/src/java/org/codehaus/jackson/map/MappingJsonFactory.java b/src/java/org/codehaus/jackson/map/MappingJsonFactory.java
index 1eedf78..22e24ab 100644
--- a/src/java/org/codehaus/jackson/map/MappingJsonFactory.java
+++ b/src/java/org/codehaus/jackson/map/MappingJsonFactory.java
@@ -14,8 +14,6 @@
*/
package org.codehaus.jackson.map;
-import java.io.*;
-
import org.codehaus.jackson.*;
/**
diff --git a/src/java/org/codehaus/jackson/map/deser/BeanDeserializerFactory.java b/src/java/org/codehaus/jackson/map/deser/BeanDeserializerFactory.java
index 0a3af7e..9d45a6a 100644
--- a/src/java/org/codehaus/jackson/map/deser/BeanDeserializerFactory.java
+++ b/src/java/org/codehaus/jackson/map/deser/BeanDeserializerFactory.java
@@ -2,7 +2,6 @@
import java.lang.reflect.*;
import java.util.*;
-import java.util.concurrent.*;
import org.codehaus.jackson.annotate.*;
import org.codehaus.jackson.map.*;
diff --git a/src/java/org/codehaus/jackson/map/deser/StdDeserializationContext.java b/src/java/org/codehaus/jackson/map/deser/StdDeserializationContext.java
index 9c95dcc..3e39ea1 100644
--- a/src/java/org/codehaus/jackson/map/deser/StdDeserializationContext.java
+++ b/src/java/org/codehaus/jackson/map/deser/StdDeserializationContext.java
@@ -1,13 +1,11 @@
package org.codehaus.jackson.map.deser;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.*;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.map.*;
import org.codehaus.jackson.map.util.ArrayBuilders;
+import org.codehaus.jackson.map.util.DateFormatHolder;
import org.codehaus.jackson.map.util.ObjectBuffer;
/**
diff --git a/src/java/org/codehaus/jackson/map/ser/ArraySerializers.java b/src/java/org/codehaus/jackson/map/ser/ArraySerializers.java
index 4c0bc13..be7d083 100644
--- a/src/java/org/codehaus/jackson/map/ser/ArraySerializers.java
+++ b/src/java/org/codehaus/jackson/map/ser/ArraySerializers.java
@@ -1,7 +1,6 @@
package org.codehaus.jackson.map.ser;
import java.io.IOException;
-import java.util.*;
import org.codehaus.jackson.*;
import org.codehaus.jackson.map.*;
diff --git a/src/java/org/codehaus/jackson/map/ser/WritableBeanProperty.java b/src/java/org/codehaus/jackson/map/ser/BeanPropertyWriter.java
similarity index 96%
rename from src/java/org/codehaus/jackson/map/ser/WritableBeanProperty.java
rename to src/java/org/codehaus/jackson/map/ser/BeanPropertyWriter.java
index b4a1b1c..2c4599b 100644
--- a/src/java/org/codehaus/jackson/map/ser/WritableBeanProperty.java
+++ b/src/java/org/codehaus/jackson/map/ser/BeanPropertyWriter.java
@@ -14,7 +14,7 @@
* property, matching to a single accessor method, and to be serializer
* as a field value in json output.
*/
-public final class WritableBeanProperty
+public final class BeanPropertyWriter
{
/**
* Logical name of the property; will be used as the field name
@@ -34,7 +34,7 @@
*/
JsonSerializer<Object> _serializer = null;
- public WritableBeanProperty(String name, Method acc)
+ public BeanPropertyWriter(String name, Method acc)
{
_name = name;
_accessorMethod = acc;
diff --git a/src/java/org/codehaus/jackson/map/ser/BeanSerializer.java b/src/java/org/codehaus/jackson/map/ser/BeanSerializer.java
index 4994623..054be63 100644
--- a/src/java/org/codehaus/jackson/map/ser/BeanSerializer.java
+++ b/src/java/org/codehaus/jackson/map/ser/BeanSerializer.java
@@ -1,7 +1,6 @@
package org.codehaus.jackson.map.ser;
import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Modifier;
import java.util.Collection;
@@ -23,9 +22,9 @@
{
final String _className;
- final WritableBeanProperty[] _props;
+ final BeanPropertyWriter[] _props;
- public BeanSerializer(Class<?> type, WritableBeanProperty[] props)
+ public BeanSerializer(Class<?> type, BeanPropertyWriter[] props)
{
// sanity check
if (props.length == 0) {
@@ -36,9 +35,9 @@
_className = type.getName();
}
- public BeanSerializer(Class<?> type, Collection<WritableBeanProperty> props)
+ public BeanSerializer(Class<?> type, Collection<BeanPropertyWriter> props)
{
- this(type, props.toArray(new WritableBeanProperty[props.size()]));
+ this(type, props.toArray(new BeanPropertyWriter[props.size()]));
}
public void serialize(Object bean, JsonGenerator jgen, SerializerProvider provider)
@@ -67,7 +66,7 @@
public void resolve(SerializerProvider provider)
throws JsonMappingException
{
- for (WritableBeanProperty prop : _props) {
+ for (BeanPropertyWriter prop : _props) {
if (!prop.hasSerializer()) {
Class<?> rt = prop.getReturnType();
/* Note: we can only assign serializer statically if the
diff --git a/src/java/org/codehaus/jackson/map/ser/BeanSerializerFactory.java b/src/java/org/codehaus/jackson/map/ser/BeanSerializerFactory.java
index ada8756..3046635 100644
--- a/src/java/org/codehaus/jackson/map/ser/BeanSerializerFactory.java
+++ b/src/java/org/codehaus/jackson/map/ser/BeanSerializerFactory.java
@@ -4,7 +4,6 @@
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
import org.codehaus.jackson.annotate.JsonUseSerializer;
import org.codehaus.jackson.map.JsonSerializer;
@@ -126,7 +125,7 @@
}
// First: what properties are to be serializable?
- Collection<WritableBeanProperty> props = findBeanProperties(type);
+ Collection<BeanPropertyWriter> props = findBeanProperties(type);
if (props == null || props.size() == 0) {
// No properties, no serializer
return null;
@@ -183,7 +182,7 @@
/**
* Method used to collect all actual serializable properties
*/
- protected Collection<WritableBeanProperty> findBeanProperties(Class<?> forClass)
+ protected Collection<BeanPropertyWriter> findBeanProperties(Class<?> forClass)
{
ClassIntrospector intr = new ClassIntrospector(forClass);
LinkedHashMap<String,Method> methodsByProp = intr.findGetters();
@@ -191,11 +190,11 @@
if (methodsByProp.isEmpty()) {
return null;
}
- ArrayList<WritableBeanProperty> props = new ArrayList<WritableBeanProperty>(methodsByProp.size());
+ ArrayList<BeanPropertyWriter> props = new ArrayList<BeanPropertyWriter>(methodsByProp.size());
for (Map.Entry<String,Method> en : methodsByProp.entrySet()) {
Method m = en.getValue();
ClassUtil.checkAndFixAccess(m, m.getDeclaringClass());
- WritableBeanProperty wprop = new WritableBeanProperty(en.getKey(), m);
+ BeanPropertyWriter wprop = new BeanPropertyWriter(en.getKey(), m);
props.add(wprop);
/* One more thing: does Method specify a serializer?
diff --git a/src/java/org/codehaus/jackson/map/util/DateFormatHolder.java b/src/java/org/codehaus/jackson/map/util/DateFormatHolder.java
index 6666ef3..fc7c49e 100644
--- a/src/java/org/codehaus/jackson/map/util/DateFormatHolder.java
+++ b/src/java/org/codehaus/jackson/map/util/DateFormatHolder.java
@@ -1,4 +1,4 @@
-package org.codehaus.jackson.map.deser;
+package org.codehaus.jackson.map.util;
import java.text.DateFormat;
import java.text.ParseException;
diff --git a/src/test/impl/TestByteBasedSymbols.java b/src/test/impl/TestByteBasedSymbols.java
index 7edb4db..0d2333b 100644
--- a/src/test/impl/TestByteBasedSymbols.java
+++ b/src/test/impl/TestByteBasedSymbols.java
@@ -6,8 +6,6 @@
import org.codehaus.jackson.sym.Name;
import org.codehaus.jackson.sym.NameCanonicalizer;
-import static org.junit.Assert.*;
-
import main.BaseTest;
/**
diff --git a/src/test/main/BaseTest.java b/src/test/main/BaseTest.java
index d677b6c..bec2475 100644
--- a/src/test/main/BaseTest.java
+++ b/src/test/main/BaseTest.java
@@ -6,7 +6,7 @@
import org.codehaus.jackson.*;
-import static org.junit.Assert.*;
+//import static org.junit.Assert.*;
public class BaseTest
extends TestCase
diff --git a/src/test/main/TestArrayParsing.java b/src/test/main/TestArrayParsing.java
index 60795c9..36f6726 100644
--- a/src/test/main/TestArrayParsing.java
+++ b/src/test/main/TestArrayParsing.java
@@ -2,8 +2,6 @@
import org.codehaus.jackson.*;
-import static org.junit.Assert.*;
-
/**
* Set of additional unit for verifying array parsing, specifically
* edge cases.
diff --git a/src/test/org/codehaus/jackson/main/TestJsonParser.java b/src/test/org/codehaus/jackson/main/TestJsonParser.java
index 6524726..bc04468 100644
--- a/src/test/org/codehaus/jackson/main/TestJsonParser.java
+++ b/src/test/org/codehaus/jackson/main/TestJsonParser.java
@@ -49,7 +49,6 @@
// regular factory can't do it, without a call to setCodec()
JsonFactory jf = new JsonFactory();
try {
- StringWriter sw = new StringWriter();
final String JSON = "{ \"x\" : 9 }";
JsonParser jp = jf.createJsonParser(new StringReader(JSON));
Pojo p = jp.readValueAs(Pojo.class);
diff --git a/src/test/org/codehaus/jackson/map/TestObjectMapperArrayDeserializer.java b/src/test/org/codehaus/jackson/map/TestObjectMapperArrayDeserializer.java
index b168b2f..fb09e8d 100644
--- a/src/test/org/codehaus/jackson/map/TestObjectMapperArrayDeserializer.java
+++ b/src/test/org/codehaus/jackson/map/TestObjectMapperArrayDeserializer.java
@@ -3,15 +3,11 @@
import main.BaseTest;
import java.io.*;
-import java.net.*;
-import java.math.BigDecimal;
-import java.math.BigInteger;
import java.util.*;
import static org.junit.Assert.*;
import org.codehaus.jackson.*;
-import org.codehaus.jackson.map.*;
import org.codehaus.jackson.type.TypeReference;
/**
diff --git a/src/test/org/codehaus/jackson/map/TestObjectMapperBeanDeserializer.java b/src/test/org/codehaus/jackson/map/TestObjectMapperBeanDeserializer.java
index ccb05fa..90d92bd 100644
--- a/src/test/org/codehaus/jackson/map/TestObjectMapperBeanDeserializer.java
+++ b/src/test/org/codehaus/jackson/map/TestObjectMapperBeanDeserializer.java
@@ -4,12 +4,9 @@
import java.io.*;
import java.net.URL;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
import java.util.*;
import org.codehaus.jackson.*;
-import org.codehaus.jackson.map.*;
/**
* Unit tests for verifying deserialization of Beans.
diff --git a/src/test/org/codehaus/jackson/map/TestObjectMapperBeanSerializer.java b/src/test/org/codehaus/jackson/map/TestObjectMapperBeanSerializer.java
index 2c168ee..9b7e0cd 100644
--- a/src/test/org/codehaus/jackson/map/TestObjectMapperBeanSerializer.java
+++ b/src/test/org/codehaus/jackson/map/TestObjectMapperBeanSerializer.java
@@ -6,10 +6,8 @@
import java.net.*;
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.util.*;
import org.codehaus.jackson.*;
-import org.codehaus.jackson.map.*;
/**
* This unit test suite tries to verify that the "Native" java type
diff --git a/src/test/org/codehaus/jackson/map/TestObjectMapperContainerDeserializer.java b/src/test/org/codehaus/jackson/map/TestObjectMapperContainerDeserializer.java
index bd8c249..e239f74 100644
--- a/src/test/org/codehaus/jackson/map/TestObjectMapperContainerDeserializer.java
+++ b/src/test/org/codehaus/jackson/map/TestObjectMapperContainerDeserializer.java
@@ -2,11 +2,8 @@
import main.BaseTest;
-import java.io.*;
import java.util.*;
-import org.codehaus.jackson.*;
-import org.codehaus.jackson.map.*;
import org.codehaus.jackson.type.TypeReference;
/**
diff --git a/src/test/org/codehaus/jackson/map/TestObjectMapperDateDeserializer.java b/src/test/org/codehaus/jackson/map/TestObjectMapperDateDeserializer.java
index 7828e16..e2e11df 100644
--- a/src/test/org/codehaus/jackson/map/TestObjectMapperDateDeserializer.java
+++ b/src/test/org/codehaus/jackson/map/TestObjectMapperDateDeserializer.java
@@ -2,14 +2,10 @@
import main.BaseTest;
-import java.io.*;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
-import org.codehaus.jackson.*;
-import org.codehaus.jackson.map.*;
-
/**
* Unit tests for verifying handling of simple Date-related
* types.
diff --git a/src/test/org/codehaus/jackson/map/TestObjectMapperSimpleDeserializer.java b/src/test/org/codehaus/jackson/map/TestObjectMapperSimpleDeserializer.java
index 7273bf8..bf83b34 100644
--- a/src/test/org/codehaus/jackson/map/TestObjectMapperSimpleDeserializer.java
+++ b/src/test/org/codehaus/jackson/map/TestObjectMapperSimpleDeserializer.java
@@ -7,12 +7,9 @@
import java.math.BigInteger;
import java.net.URL;
import java.net.URI;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
import java.util.*;
import org.codehaus.jackson.*;
-import org.codehaus.jackson.map.*;
/**
* Unit tests for verifying handling of simple basic non-structured
diff --git a/src/test/org/codehaus/jackson/map/TestObjectMapperSimpleSerializer.java b/src/test/org/codehaus/jackson/map/TestObjectMapperSimpleSerializer.java
index 4524178..1ea10fd 100644
--- a/src/test/org/codehaus/jackson/map/TestObjectMapperSimpleSerializer.java
+++ b/src/test/org/codehaus/jackson/map/TestObjectMapperSimpleSerializer.java
@@ -3,12 +3,6 @@
import main.BaseTest;
import java.io.*;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.*;
-
-import org.codehaus.jackson.*;
-import org.codehaus.jackson.map.*;
/**
* Unit tests for verifying serialization of simple basic non-structured
diff --git a/src/test/org/codehaus/jackson/map/TestTreeMapperDeserializer.java b/src/test/org/codehaus/jackson/map/TestTreeMapperDeserializer.java
index 5a3cf48..192e1ae 100644
--- a/src/test/org/codehaus/jackson/map/TestTreeMapperDeserializer.java
+++ b/src/test/org/codehaus/jackson/map/TestTreeMapperDeserializer.java
@@ -7,7 +7,6 @@
import java.util.*;
import org.codehaus.jackson.*;
-import org.codehaus.jackson.map.*;
import org.codehaus.jackson.node.*;
/**
diff --git a/src/test/org/codehaus/jackson/map/TestTreeMapperMaps.java b/src/test/org/codehaus/jackson/map/TestTreeMapperMaps.java
index 5d2c2a6..e8e0fbf 100644
--- a/src/test/org/codehaus/jackson/map/TestTreeMapperMaps.java
+++ b/src/test/org/codehaus/jackson/map/TestTreeMapperMaps.java
@@ -2,11 +2,9 @@
import main.BaseTest;
-import java.io.*;
import java.util.*;
import org.codehaus.jackson.*;
-import org.codehaus.jackson.map.*;
import org.codehaus.jackson.node.ObjectNode;
/**
diff --git a/src/test/org/codehaus/jackson/map/TestTreeMapperSerializer.java b/src/test/org/codehaus/jackson/map/TestTreeMapperSerializer.java
index b05bff5..aff008e 100644
--- a/src/test/org/codehaus/jackson/map/TestTreeMapperSerializer.java
+++ b/src/test/org/codehaus/jackson/map/TestTreeMapperSerializer.java
@@ -6,7 +6,6 @@
import java.io.*;
import org.codehaus.jackson.*;
-import org.codehaus.jackson.map.*;
import org.codehaus.jackson.node.ArrayNode;
import org.codehaus.jackson.node.ObjectNode;
diff --git a/src/test/org/codehaus/jackson/map/deser/TestBasicAnnotations.java b/src/test/org/codehaus/jackson/map/deser/TestBasicAnnotations.java
index 8d22c53..16e2d43 100644
--- a/src/test/org/codehaus/jackson/map/deser/TestBasicAnnotations.java
+++ b/src/test/org/codehaus/jackson/map/deser/TestBasicAnnotations.java
@@ -3,7 +3,6 @@
import main.BaseTest;
import java.io.*;
-import java.util.*;
import org.codehaus.jackson.*;
import org.codehaus.jackson.annotate.*;
diff --git a/src/test/org/codehaus/jackson/map/deser/TestValueAnnotations.java b/src/test/org/codehaus/jackson/map/deser/TestValueAnnotations.java
index f06824d..2a9abe0 100644
--- a/src/test/org/codehaus/jackson/map/deser/TestValueAnnotations.java
+++ b/src/test/org/codehaus/jackson/map/deser/TestValueAnnotations.java
@@ -2,10 +2,8 @@
import main.BaseTest;
-import java.io.*;
import java.util.*;
-import org.codehaus.jackson.*;
import org.codehaus.jackson.annotate.*;
import org.codehaus.jackson.map.*;
diff --git a/src/test/org/codehaus/jackson/map/ser/TestAnnotationInheritance.java b/src/test/org/codehaus/jackson/map/ser/TestAnnotationInheritance.java
index f4de9d0..6739de2 100644
--- a/src/test/org/codehaus/jackson/map/ser/TestAnnotationInheritance.java
+++ b/src/test/org/codehaus/jackson/map/ser/TestAnnotationInheritance.java
@@ -5,7 +5,6 @@
import java.io.*;
import java.util.*;
-import org.codehaus.jackson.*;
import org.codehaus.jackson.annotate.*;
import org.codehaus.jackson.map.*;
diff --git a/src/test/org/codehaus/jackson/map/ser/TestArraySerialization.java b/src/test/org/codehaus/jackson/map/ser/TestArraySerialization.java
index 52759d2..d14c540 100644
--- a/src/test/org/codehaus/jackson/map/ser/TestArraySerialization.java
+++ b/src/test/org/codehaus/jackson/map/ser/TestArraySerialization.java
@@ -3,9 +3,7 @@
import main.BaseTest;
import java.io.*;
-import java.util.*;
-import org.codehaus.jackson.*;
import org.codehaus.jackson.map.*;
public class TestArraySerialization
diff --git a/src/test/org/codehaus/jackson/map/ser/TestCglibUsage.java b/src/test/org/codehaus/jackson/map/ser/TestCglibUsage.java
index fab691a..379750f 100644
--- a/src/test/org/codehaus/jackson/map/ser/TestCglibUsage.java
+++ b/src/test/org/codehaus/jackson/map/ser/TestCglibUsage.java
@@ -8,8 +8,6 @@
import net.sf.cglib.proxy.*;
-import org.codehaus.jackson.*;
-import org.codehaus.jackson.annotate.*;
import org.codehaus.jackson.map.*;
/**
diff --git a/src/test/org/codehaus/jackson/map/ser/TestEnumSerialization.java b/src/test/org/codehaus/jackson/map/ser/TestEnumSerialization.java
index 759628f..f1c7a69 100644
--- a/src/test/org/codehaus/jackson/map/ser/TestEnumSerialization.java
+++ b/src/test/org/codehaus/jackson/map/ser/TestEnumSerialization.java
@@ -3,12 +3,9 @@
import main.BaseTest;
import java.io.*;
-import java.util.*;
-import org.codehaus.jackson.*;
import org.codehaus.jackson.annotate.JsonUseSerializer;
import org.codehaus.jackson.map.*;
-import org.codehaus.jackson.map.ser.*;
/**
* Unit tests for verifying serialization of simple basic non-structured
diff --git a/src/test/org/codehaus/jackson/map/ser/TestExceptionHandling.java b/src/test/org/codehaus/jackson/map/ser/TestExceptionHandling.java
index f164f87..52af456 100644
--- a/src/test/org/codehaus/jackson/map/ser/TestExceptionHandling.java
+++ b/src/test/org/codehaus/jackson/map/ser/TestExceptionHandling.java
@@ -7,7 +7,6 @@
import org.codehaus.jackson.*;
import org.codehaus.jackson.map.*;
-import org.codehaus.jackson.map.ser.*;
/**
* Unit test for verifying that exceptions are properly handled (caught,
diff --git a/src/tools/TestSerializationError.java b/src/tools/TestSerializationError.java
index 2a999aa..30697de 100644
--- a/src/tools/TestSerializationError.java
+++ b/src/tools/TestSerializationError.java
@@ -1,7 +1,6 @@
import java.io.*;
import java.util.*;
-import org.codehaus.jackson.*;
import org.codehaus.jackson.map.*;
public class TestSerializationError
