Merge pull request #6 from jpdark007/master

Complete test and clean some code kevinseim#7

Author: exabrial

.gitignore

@@ -16,3 +16,4 @@
 hs_err_pid*
 /build/
 /classes/
+/bin/

gradle.properties

@@ -0,0 +1,2 @@
+sonatypeUsername=
+sonatypePassword=

src/org/beanio/internal/compiler/ParserFactorySupport.java

@@ -391,7 +391,7 @@ protected void initializeGroup(GroupConfig config) throws BeanIOConfigurationExc
 
     protected void initializeGroupIteration(GroupConfig config, Property property) {
         // wrap the segment in an iteration
-        Component aggregation = createRecordAggregation(config, property);
+        Component aggregation = createRecordAggregation(config);
 
         pushParser(aggregation);
         if (property != null || config.getTarget() != null) {
@@ -476,7 +476,7 @@ protected void initializeRecord(RecordConfig config) throws BeanIOConfigurationE
 
     protected void initializeRecordIteration(RecordConfig config, Property property) {
         // wrap the segment in an iteration
-        Component collection = createRecordAggregation(config, property);
+        Component collection = createRecordAggregation(config);
 
         pushParser(collection);
         if (property != null || config.getTarget() != null) {
@@ -588,7 +588,7 @@ protected void finalizeRecord(RecordConfig config, Record record) {
 
     }
 
-    private Property findTarget(Component segment, String name) {
+    private static Property findTarget(Component segment, String name) {
         Component c = findDescendant("value", segment, name);
         if (c == null) {
             throw new BeanIOConfigurationException("Descendant value '" + name + "' not found");
@@ -604,7 +604,7 @@ private Property findTarget(Component segment, String name) {
         return property;
     }
 
-    private Component findDescendant(String type, Component c, String name) {
+    private static Component findDescendant(String type, Component c, String name) {
         if (name.equals(c.getName())) {
             return c;
         }
@@ -1026,7 +1026,7 @@ else if (arrayType == null) {
      * @return the created {@link RecordAggregation}
      * @throws BeanIOConfigurationException
      */
-    protected RecordAggregation createRecordAggregation(PropertyConfig config, Property property) 
+    protected RecordAggregation createRecordAggregation(PropertyConfig config) 
         throws BeanIOConfigurationException
     {
         boolean isMap = false;
@@ -1051,7 +1051,7 @@ protected RecordAggregation createRecordAggregation(PropertyConfig config, Prope
         }
 
         // create the appropriate iteration type
-        RecordAggregation aggregation;;
+        RecordAggregation aggregation;
         if (collectionType == TypeUtil.ARRAY_TYPE) {
             aggregation = new RecordArray();
         }

src/org/beanio/internal/util/DomUtil.java

@@ -65,7 +65,7 @@ public static Document newDocument() {
      * @param title the name of the DOM
      * @param document the DOM to print
      */
-    public static void print(String title, Node document) {
+    public static void print(String title, Node document) throws BeanIOException{
         try {
             TransformerFactory factory = TransformerFactory.newInstance();
             Transformer trans = factory.newTransformer();
@@ -82,7 +82,7 @@ public static void print(String title, Node document) {
             System.out.println("-------------------------------------------");
         }
         catch (Exception ex) {
-            ex.printStackTrace();
+        	throw new BeanIOException(ex);
         }
     }
 }

src/org/beanio/types/xml/AbstractXmlCalendarTypeHandler.java

@@ -31,7 +31,9 @@
  */
 public abstract class AbstractXmlCalendarTypeHandler extends CalendarTypeHandler {
 
-    protected static final DatatypeFactory dataTypeFactory;
+    private static final String DATE_TIME = "dateTime";
+	private static final String INVALID_XML = "Invalid XML ";
+	protected static final DatatypeFactory dataTypeFactory;
     static {
         try {
             dataTypeFactory = DatatypeFactory.newInstance();
@@ -67,20 +69,20 @@ public Calendar parse(String text) throws TypeConversionException {
         try {
             XMLGregorianCalendar xcal = dataTypeFactory.newXMLGregorianCalendar(text);
             if (!lenientDatatype && type != null && !xcal.getXMLSchemaType().equals(type)) {
-                throw new TypeConversionException("Invalid XML " + type.getLocalPart());
+                throw new TypeConversionException(INVALID_XML + type.getLocalPart());
             }
 
             if (!isTimeZoneAllowed() && xcal.getTimezone() != DatatypeConstants.FIELD_UNDEFINED) {
-                String typeName = type == null ? "dateTime" : type.getLocalPart();
-                throw new TypeConversionException("Invalid XML " + typeName + 
+                String typeName = type == null ? DATE_TIME : type.getLocalPart();
+                throw new TypeConversionException(INVALID_XML + typeName + 
                     ", time zone not allowed");
             }
 
             return xcal.toGregorianCalendar();
         }
         catch (IllegalArgumentException ex) {
-            String typeName = type == null ? "dateTime" : type.getLocalPart();
-            throw new TypeConversionException("Invalid XML " + typeName);
+            String typeName = type == null ? DATE_TIME : type.getLocalPart();
+            throw new TypeConversionException(INVALID_XML + typeName);
         }
     }
 

test/org/beanio/parser/inlinemaps/InlineMapParserTest.java

@@ -1,5 +1,7 @@
 package org.beanio.parser.inlinemaps;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.StringReader;
 import java.util.Map;
 
@@ -104,5 +106,23 @@ public void testMapRecordGroup() {
             "entity,PERSON,-22.282174,166.441458,TEST_ENTITY_3\n";
 
         BeanReader in = factory.createReader("stream5", new StringReader(text));
+        
+        Map map = (Map) in.read();
+        assertEquals("ACTIVE", map.get("status"));
+        assertEquals("PERSON", map.get("subtype"));
+        assertEquals (Double.valueOf(8.4), map.get("lat"));
+        assertEquals(Double.valueOf(-77.2), map.get("lon"));
+        
+        map = (Map) in.read();
+        assertEquals ("ACTIVE", map.get("status"));
+        assertEquals("PERSON", map.get("subtype"));
+        assertEquals (Double.valueOf(-33.99367), map.get("lat"));
+        assertEquals(Double.valueOf(25.67632), map.get("lon"));
+        
+        map = (Map) in.read();
+        assertEquals ("ACTIVE", map.get("status"));
+        assertEquals("PERSON", map.get("subtype"));
+        assertEquals (Double.valueOf(-22.282174), map.get("lat"));
+        assertEquals(Double.valueOf(166.441458), map.get("lon"));
     }
 }