Using modern Java APIs

garcia-jj · garcia-jj · commit 14392bc51eae · 2016-01-17T04:13:00.000-02:00
diff --git a/src/org/beanio/internal/compiler/ParserFactorySupport.java b/src/org/beanio/internal/compiler/ParserFactorySupport.java
@@ -1527,7 +1527,7 @@ protected Property createProperty(PropertyConfig config) {
             if (config.getComponentType() == ComponentConfig.SEGMENT) {
                 required = config.getMinOccurs() > 0 && !config.isNillable();
             }
-            boolean matchNull = !required && new Integer(0).equals(config.getMinOccurs());
+            boolean matchNull = !required && Integer.valueOf(0).equals(config.getMinOccurs());
             
             CollectionBean collection = new CollectionBean();
             collection.setName(config.getName());
@@ -1538,7 +1538,7 @@ protected Property createProperty(PropertyConfig config) {
         }
         else {
             boolean required = propertyStack.isEmpty();
-            boolean matchNull = !required && new Integer(0).equals(config.getMinOccurs());
+            boolean matchNull = !required && Integer.valueOf(0).equals(config.getMinOccurs());
             
             Bean bean = new Bean();
             bean.setName(config.getName());
diff --git a/src/org/beanio/internal/compiler/flat/FlatPreprocessor.java b/src/org/beanio/internal/compiler/flat/FlatPreprocessor.java
@@ -360,7 +360,7 @@ else if (field.getLength() == null) {
             }
         }
         else {
-            if (new Integer(-1).equals(field.getLength())) {
+            if (Integer.valueOf(-1).equals(field.getLength())) {
                 field.setLength(null);
             }
         }
diff --git a/src/org/beanio/internal/compiler/json/JsonParserFactory.java b/src/org/beanio/internal/compiler/json/JsonParserFactory.java
@@ -147,7 +147,7 @@ protected FieldFormat createFieldFormat(FieldConfig config, Class<?> type) {
         format.setJsonName(config.getJsonName());
         format.setJsonArray(config.isJsonArray());
         format.setJsonArrayIndex(config.getJsonArrayIndex());
-        format.setLazy(config.getMinOccurs() != null && new Integer(0).equals(config.getMinOccurs()));
+        format.setLazy(config.getMinOccurs() != null && Integer.valueOf(0).equals(config.getMinOccurs()));
         format.setNillable(true); // for now, allow any JSON field to be nullable
         
         // default the JSON type based on the property type
diff --git a/src/org/beanio/internal/config/annotation/AnnotationParser.java b/src/org/beanio/internal/config/annotation/AnnotationParser.java
@@ -754,7 +754,7 @@ private static Integer toUnboundedValue(int n) {
         if (val == null) {
             return null;
         }
-        if (val.compareTo(new Integer(0)) < 0) {
+        if (val.compareTo(Integer.valueOf(0)) < 0) {
             return Integer.MAX_VALUE;
         }
         return val;
diff --git a/src/org/beanio/internal/parser/format/delimited/DelimitedMarshallingContext.java b/src/org/beanio/internal/parser/format/delimited/DelimitedMarshallingContext.java
@@ -142,7 +142,7 @@ public Entry(int position, String text) {
         }
         
         public int compareTo(Entry o) {
-            return new Integer(this.order).compareTo(o.order);
+            return Integer.valueOf(this.order).compareTo(o.order);
         }
         
         @Override
diff --git a/src/org/beanio/internal/parser/format/fixedlength/FixedLengthMarshallingContext.java b/src/org/beanio/internal/parser/format/fixedlength/FixedLengthMarshallingContext.java
@@ -133,7 +133,7 @@ public Entry(int position, String text) {
         }
         
         public int compareTo(Entry o) {
-            return new Integer(this.order).compareTo(o.order);
+            return Integer.valueOf(this.order).compareTo(o.order);
         }
         
         @Override
diff --git a/src/org/beanio/internal/util/DebugUtil.java b/src/org/beanio/internal/util/DebugUtil.java
@@ -1,6 +1,7 @@
 package org.beanio.internal.util;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 
 import org.beanio.internal.parser.format.FieldPadding;
 
@@ -45,13 +46,8 @@ public static String formatPadding(FieldPadding padding) {
     }
     
     public static String toString(Debuggable c) {
-        try {
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            c.debug(new PrintStream(out));
-            return new String(out.toByteArray(), "ASCII");
-        }
-        catch (UnsupportedEncodingException e) {
-            throw new IllegalStateException(e);
-        }
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        c.debug(new PrintStream(out));
+        return new String(out.toByteArray(), StandardCharsets.US_ASCII);
     }
 }
diff --git a/src/org/beanio/internal/util/JsonUtil.java b/src/org/beanio/internal/util/JsonUtil.java
@@ -75,12 +75,12 @@ public static Number toNumber(String text) throws NumberFormatException {
             return d;
         } 
         else if (text.length() < INT_SIZE) {
-            return new Integer(text);
+            return Integer.valueOf(text);
         }
         else {
             Long n = new Long(text);
             if (n.intValue() == n.longValue()) {
-                return new Integer(n.intValue());
+                return Integer.valueOf(n.intValue());
             }
             return n;
         }
diff --git a/test/org/beanio/parser/annotation/AnnotationTest.java b/test/org/beanio/parser/annotation/AnnotationTest.java
@@ -113,13 +113,13 @@ public void testAnnotatedFields() {
             Assert.assertEquals("left", user.getHands()[0]);
             Assert.assertEquals("right", user.getHands()[1]);
             Assert.assertEquals(new GregorianCalendar(1970, 0, 1).getTime(), user.birthDate);
-            Assert.assertEquals(new Integer(28), user.getAge());
+            Assert.assertEquals(Integer.valueOf(28), user.getAge());
             Assert.assertEquals(2, user.letters.size());
-            Assert.assertEquals(new Character('A'), user.letters.get(0));
-            Assert.assertEquals(new Character('B'), user.letters.get(1));
+            Assert.assertEquals(Character.valueOf('A'), user.letters.get(0));
+            Assert.assertEquals(Character.valueOf('B'), user.letters.get(1));
             Assert.assertEquals(1, user.numbers.size());
             Assert.assertEquals(LinkedList.class, user.numbers.getClass());
-            Assert.assertEquals(new Integer(1), user.numbers.get(0));
+            Assert.assertEquals(Integer.valueOf(1), user.numbers.get(0));
             Assert.assertEquals("END", user.end);
             
             Assert.assertEquals(input[i], m[i].marshal(user).toString());
diff --git a/test/org/beanio/parser/json/segment/JsonSegmentParserTest.java b/test/org/beanio/parser/json/segment/JsonSegmentParserTest.java
@@ -56,7 +56,7 @@ public void testSegment_JsonTypeObjectList() {
         
         try {
             Map map = (Map) in.read();
-            assertEquals(new Integer(2), map.get("count"));
+            assertEquals(Integer.valueOf(2), map.get("count"));
             
             List list = (List) map.get("friends");
             Person person = (Person) list.get(0);
diff --git a/test/org/beanio/parser/lazy/LazyTest.java b/test/org/beanio/parser/lazy/LazyTest.java
@@ -34,7 +34,7 @@ public void testLazySegment() {
         user = (LazyUser) u.unmarshal("kevin1         ");
         assertEquals("kevin", user.name);
         assertNotNull(user.account);
-        assertEquals(new Integer(1), user.account.getNumber());
+        assertEquals(Integer.valueOf(1), user.account.getNumber());
         assertEquals("", user.account.getText());
     }
     
diff --git a/test/org/beanio/parser/property/PropertyParserTest.java b/test/org/beanio/parser/property/PropertyParserTest.java
@@ -46,7 +46,7 @@ public void testBasic() {
         
         try {
             Map map = (Map) in.read();
-            assertEquals(new Integer(1), map.get("id"));
+            assertEquals(Integer.valueOf(1), map.get("id"));
             assertNull(map.get("recordType"));
             
             StringWriter text = new StringWriter();
@@ -61,8 +61,8 @@ public void testBasic() {
             assertEquals("Detail,John" + lineSeparator, text.toString());
             
             map = (Map) in.read();
-            assertEquals(new Integer(3), map.get("id"));
-            assertEquals(new Integer(1), map.get("recordCount"));
+            assertEquals(Integer.valueOf(3), map.get("id"));
+            assertEquals(Integer.valueOf(1), map.get("recordCount"));
             assertNull(map.get("recordType"));
             
             text = new StringWriter();
diff --git a/test/org/beanio/parser/target/TargetTest.java b/test/org/beanio/parser/target/TargetTest.java
@@ -53,7 +53,7 @@ public void testTarget() {
         assertEquals("N,,kev,kevo", marshaller.marshal(list).toString());
         
         Integer age = (Integer) unmarshaller.unmarshal("A,jen,28");
-        assertEquals(new Integer(28), age);
+        assertEquals(Integer.valueOf(28), age);
         assertEquals("A,unknown,28", marshaller.marshal(age).toString());
     }
     
diff --git a/test/org/beanio/parser/template/TemplateParserTest.java b/test/org/beanio/parser/template/TemplateParserTest.java
@@ -47,7 +47,7 @@ public void testRecordTemplate() {
         
         try {
             Map map = (Map) in.read();
-            assertEquals(new Integer(1), map.get("id"));
+            assertEquals(Integer.valueOf(1), map.get("id"));
             assertEquals("joe", map.get("name"));
             assertEquals('M', map.get("gender"));
         }
@@ -67,7 +67,7 @@ public void testBeanTemplate() {
             assertEquals('M', map.get("gender"));
             assertNotNull(map.get("bean"));
             map = (Map) map.get("bean");
-            assertEquals(new Integer(1), map.get("id"));
+            assertEquals(Integer.valueOf(1), map.get("id"));
             assertEquals("joe", map.get("name"));
             
         }
@@ -84,7 +84,7 @@ public void testIncludeTemplateFromRecord() {
         
         try {
             Map map = (Map) in.read();
-            assertEquals(new Integer(1), map.get("id"));
+            assertEquals(Integer.valueOf(1), map.get("id"));
             assertEquals("joe", map.get("firstName"));
             assertEquals("smith", map.get("lastName"));
             assertEquals('M', map.get("gender"));
diff --git a/test/org/beanio/parser/trim/TrimTest.java b/test/org/beanio/parser/trim/TrimTest.java
@@ -31,6 +31,6 @@ public void testLazySegment() {
         Map map = (Map) u.unmarshal("\"jen  \",jen  ,1    ");
         assertEquals("jen  ", map.get("text"));
         assertEquals("jen", map.get("text_trim"));
-        assertEquals(new Integer(1), map.get("number"));
+        assertEquals(Integer.valueOf(1), map.get("number"));
     }
 }
diff --git a/test/org/beanio/parser/types/TypesParserTest.java b/test/org/beanio/parser/types/TypesParserTest.java
@@ -58,13 +58,13 @@ public void testObjectHandlers() throws Exception {
         try {
             ObjectRecord record;
             record = (ObjectRecord) in.read();
-            assertEquals(new Byte((byte) 10), record.getByteValue());
-            assertEquals(new Short((short) 10), record.getShortValue());
-            assertEquals(new Integer(-10), record.getIntegerValue());
-            assertEquals(new Long(10), record.getLongValue());
-            assertEquals(new Float(10.1f), record.getFloatValue());
-            assertEquals(new Double(-10.1), record.getDoubleValue());
-            assertEquals(new Character('A'), record.getCharacterValue());
+            assertEquals(Byte.valueOf((byte) 10), record.getByteValue());
+            assertEquals(Short.valueOf((short) 10), record.getShortValue());
+            assertEquals(Integer.valueOf(-10), record.getIntegerValue());
+            assertEquals(Long.valueOf(10), record.getLongValue());
+            assertEquals(Float.valueOf(10.1f), record.getFloatValue());
+            assertEquals(Double.valueOf(-10.1), record.getDoubleValue());
+            assertEquals(Character.valueOf('A'), record.getCharacterValue());
             assertEquals("ABC", record.getStringValue());
             assertEquals(new SimpleDateFormat("MMddyy").parse("010170"), record.getDateValue());
             assertEquals(Boolean.TRUE, record.getBooleanValue());
@@ -240,12 +240,12 @@ public void testFormats() throws Exception {
         try {
             ObjectRecord record;
             record = (ObjectRecord) in.read();
-            assertEquals(new Byte((byte)1), record.getByteValue());
-            assertEquals(new Short((short)2), record.getShortValue());
-            assertEquals(new Integer(-3), record.getIntegerValue());
-            assertEquals(new Long(4), record.getLongValue());
-            assertEquals(new Float("5.1"), record.getFloatValue());
-            assertEquals(new Double("-6.1"), record.getDoubleValue());
+            assertEquals(Byte.valueOf((byte)1), record.getByteValue());
+            assertEquals(Short.valueOf((short)2), record.getShortValue());
+            assertEquals(Integer.valueOf(-3), record.getIntegerValue());
+            assertEquals(Long.valueOf(4), record.getLongValue());
+            assertEquals(Float.valueOf("5.1"), record.getFloatValue());
+            assertEquals(Double.valueOf("-6.1"), record.getDoubleValue());
             assertEquals(sdf.parse("2011-01-01"), record.getDateValue());
             assertEquals(new BigInteger("10"), record.getBigIntegerValue());
             assertEquals(new BigDecimal("10.5"), record.getBigDecimalValue());
diff --git a/test/org/beanio/parser/xml/Person.java b/test/org/beanio/parser/xml/Person.java
@@ -25,7 +25,7 @@
 public class Person {
     /* used to test that the setter is not called for missing elements */
     public static final String DEFAULT_NAME = new String();
-    public static final Integer DEFAULT_AGE = new Integer(-1);
+    public static final Integer DEFAULT_AGE = Integer.valueOf(-1);
     
     private String type;
     private String gender;
diff --git a/test/org/beanio/parser/xml/field/XmlFieldTest.java b/test/org/beanio/parser/xml/field/XmlFieldTest.java
@@ -49,7 +49,7 @@ public void testPaddingForOptionalField() throws Exception {
         BeanWriter out = factory.createWriter("stream", s);
         try {
             Person person = (Person) in.read();
-            assertEquals(new Integer(25), person.getAge());
+            assertEquals(Integer.valueOf(25), person.getAge());
             out.write(person);
             
             person = (Person) in.read();
@@ -76,7 +76,7 @@ public void testPaddingForRequiredField() throws Exception {
         BeanWriter out = factory.createWriter("stream2", s);
         try {
             Person person = (Person) in.read();
-            assertEquals(new Integer(25), person.getAge());
+            assertEquals(Integer.valueOf(25), person.getAge());
             out.write(person);
             
             assertFieldError(in, 5, "record", "age", "", "Required field not set");
@@ -105,7 +105,7 @@ public void testSetterNotCalledForMissingField() throws Exception {
             Person person = (Person) in.read();
             assertEquals("Joe", person.getFirstName());
             assertNull(person.getLastName());
-            assertEquals(new Integer(10), person.getAge());
+            assertEquals(Integer.valueOf(10), person.getAge());
             
             person = (Person) in.read();
             assertEquals("John", person.getFirstName());
diff --git a/test/org/beanio/parser/xml/record/XmlRecordTest.java b/test/org/beanio/parser/xml/record/XmlRecordTest.java
@@ -55,7 +55,7 @@ public void testRecordClassIsCollection() throws Exception {
             List list = (List) in.read();
             assertEquals("John", list.get(0));
             assertNull(list.get(1));
-            assertEquals(new Integer(22), list.get(2));
+            assertEquals(Integer.valueOf(22), list.get(2));
 
             out.write(list);
             out.close();
diff --git a/test/org/beanio/stream/JsonReaderTest.java b/test/org/beanio/stream/JsonReaderTest.java
@@ -73,7 +73,7 @@ public void test_readNumber() throws IOException {
         map = in.read();
         assertEquals(int1, map.get("int1"));
         map = in.read();
-        assertEquals(new Integer(10), map.get("int2"));
+        assertEquals(Integer.valueOf(10), map.get("int2"));
         map = in.read();
         assertEquals(long1, map.get("long1"));
 
@@ -126,7 +126,7 @@ public void test_readObject() throws IOException {
         Map object;
 
         Map map = in.read();
-        assertEquals(new Integer(20), map.get("field2"));
+        assertEquals(Integer.valueOf(20), map.get("field2"));
         object = (Map) map.get("o1");
         assertEquals("value1", object.get("field1"));
 
@@ -137,7 +137,7 @@ public void test_readObject() throws IOException {
         map = in.read();
         object = (Map) map.get("o1");
         assertEquals("value1", object.get("field1"));
-        assertEquals(new Integer(10), object.get("field2"));
+        assertEquals(Integer.valueOf(10), object.get("field2"));
 
         assertNull(in.read());
     }
@@ -190,7 +190,7 @@ public void test_mixedArray() throws IOException {
             "{ \"array\" : [ [10], { \"field\":\"value\" } ]}");
         
         List list = (List) ((List)map.get("array")).get(0);
-        assertEquals(new Integer(10), list.get(0));
+        assertEquals(Integer.valueOf(10), list.get(0));
         
         map = (Map) ((List)map.get("array")).get(1);
         assertEquals("value", map.get("field"));
diff --git a/test/org/beanio/types/CharacterTypeHandlerTest.java b/test/org/beanio/types/CharacterTypeHandlerTest.java
@@ -30,7 +30,7 @@ public class CharacterTypeHandlerTest {
     @Test
     public void testParse() throws TypeConversionException {
         CharacterTypeHandler handler = new CharacterTypeHandler();
-        assertEquals(new Character('V'), handler.parse("V"));
+        assertEquals(Character.valueOf('V'), handler.parse("V"));
         assertNull(handler.parse(null));
         assertNull(handler.parse(""));
     }
@@ -44,7 +44,7 @@ public void testParseInvalid() throws TypeConversionException {
     @Test
     public void testFormat() throws TypeConversionException {
         CharacterTypeHandler handler = new CharacterTypeHandler();
-        assertEquals("V", handler.format(new Character('V')));
+        assertEquals("V", handler.format(Character.valueOf('V')));
         assertEquals("", handler.format(""));
         assertNull(handler.format(null));
     }

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ else if (field.getLength() == null) {`
`360`	`360`	`}`
`361`	`361`	`}`
`362`	`362`	`else {`
`363`		`- if (new Integer(-1).equals(field.getLength())) {`
	`363`	`+ if (Integer.valueOf(-1).equals(field.getLength())) {`
`364`	`364`	`field.setLength(null);`
`365`	`365`	`}`
`366`	`366`	`}`
Original file line number	Diff line number	Diff line change
`@@ -754,7 +754,7 @@ private static Integer toUnboundedValue(int n) {`
`754`	`754`	`if (val == null) {`
`755`	`755`	`return null;`
`756`	`756`	`}`
`757`		`- if (val.compareTo(new Integer(0)) < 0) {`
	`757`	`+ if (val.compareTo(Integer.valueOf(0)) < 0) {`
`758`	`758`	`return Integer.MAX_VALUE;`
`759`	`759`	`}`
`760`	`760`	`return val;`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public Entry(int position, String text) {`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`public int compareTo(Entry o) {`
`145`		`- return new Integer(this.order).compareTo(o.order);`
	`145`	`+ return Integer.valueOf(this.order).compareTo(o.order);`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public Entry(int position, String text) {`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`public int compareTo(Entry o) {`
`136`		`- return new Integer(this.order).compareTo(o.order);`
	`136`	`+ return Integer.valueOf(this.order).compareTo(o.order);`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -75,12 +75,12 @@ public static Number toNumber(String text) throws NumberFormatException {`
`75`	`75`	`return d;`
`76`	`76`	`}`
`77`	`77`	`else if (text.length() < INT_SIZE) {`
`78`		`- return new Integer(text);`
	`78`	`+ return Integer.valueOf(text);`
`79`	`79`	`}`
`80`	`80`	`else {`
`81`	`81`	`Long n = new Long(text);`
`82`	`82`	`if (n.intValue() == n.longValue()) {`
`83`		`- return new Integer(n.intValue());`
	`83`	`+ return Integer.valueOf(n.intValue());`
`84`	`84`	`}`
`85`	`85`	`return n;`
`86`	`86`	`}`