column types for integer and decimal

histream-import/src/main/java/de/sekmi/histream/etl/config/Column.java

@@ -18,7 +18,7 @@ import de.sekmi.histream.etl.ParseException;
  *
  */
 @XmlTransient
-@XmlSeeAlso({StringColumn.class})
+@XmlSeeAlso({StringColumn.class,IntegerColumn.class,DateTimeColumn.class,DecimalColumn.class})
 public abstract class Column<T> {
 	protected Column(){
 	}

histream-import/src/main/java/de/sekmi/histream/etl/config/DecimalColumn.java

+package de.sekmi.histream.etl.config;
+
+import java.math.BigDecimal;
+
+import javax.xml.bind.annotation.XmlType;
+
+import de.sekmi.histream.etl.ParseException;
+
+@XmlType(name="decimal")
+public class DecimalColumn extends Column<BigDecimal>{
+
+	@Override
+	public BigDecimal valueOf(Object input) throws ParseException {
+		Object value = preprocessValue(input);
+		if( value == null ){
+			return null;
+		}else if( value instanceof String ){
+			// TODO: use decimalformat for parsing
+			return new BigDecimal((String)value);
+		}else if( value instanceof BigDecimal ){
+			return (BigDecimal)value;
+		}else{
+			throw new ParseException("Invalid type for decimal column: "+value.getClass().getName());
+		}
+	}
+
+}

histream-import/src/main/java/de/sekmi/histream/etl/config/IntegerColumn.java

+package de.sekmi.histream.etl.config;
+
+import javax.xml.bind.annotation.XmlType;
+
+import de.sekmi.histream.etl.ParseException;
+
+@XmlType(name="integer")
+public class IntegerColumn extends Column<Long> {
+
+	@Override
+	public Long valueOf(Object input) throws ParseException {
+		input = preprocessValue(input);
+		if( input == null ){
+			return null;
+		}else if( input instanceof String ){
+			// TODO: use integerformat for parsing
+			return Long.parseLong((String)input);
+		}else if( input instanceof Integer ){
+			return new Long((Integer)input);
+		}else if( input instanceof Long ){
+			return (Long)input;
+		}else{
+			throw new ParseException("Unsupported input type "+input.getClass().getName());
+		}
+	}
+	
+}

histream-import/src/main/java/de/sekmi/histream/etl/config/StringColumn.java

 package de.sekmi.histream.etl.config;
 
+import javax.xml.bind.annotation.XmlType;
+
 import de.sekmi.histream.etl.ParseException;
 
+@XmlType(name="string")
 public class StringColumn extends Column<String>{
 
 	public StringColumn(String name) {

histream-import/src/test/java/de/sekmi/histream/etl/config/TestReadTables.java

@@ -2,6 +2,7 @@ package de.sekmi.histream.etl.config;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.math.BigDecimal;
 import java.time.temporal.ChronoField;
 
 import javax.xml.bind.JAXB;
@@ -59,8 +60,8 @@ public class TestReadTables {
 			Assert.assertTrue(r.getFacts().size() > 0);
 			Observation o = r.getFacts().get(0);
 			Assert.assertEquals("natrium", o.getConceptId());
-			Assert.assertEquals(Value.Type.Text, o.getValue().getType());
-			Assert.assertEquals("124", o.getValue().getStringValue());
+			Assert.assertEquals(Value.Type.Numeric, o.getValue().getType());
+			Assert.assertEquals(BigDecimal.valueOf(124), o.getValue().getNumericValue());
 		}
 	}
 }

histream-import/src/test/resources/test-1-datasource.xml

@@ -33,8 +33,8 @@
 			<birthdate format="d.M.u">geburtsdatum</birthdate>
 			<deathdate format="d.M.u">verstorben</deathdate>
 			<gender>geschlecht</gender>
-			<ignore xsi:type="stringColumn">ignoriert1</ignore>
-			<ignore xsi:type="stringColumn">patfakt1</ignore>
+			<ignore xsi:type="string">ignoriert1</ignore>
+			<ignore xsi:type="string">patfakt1</ignore>
 		</idat>		
 	</patient-table>
 	<!-- optional -->
@@ -53,7 +53,7 @@
 		<mdat>
 			<!-- in/out code -->
 			<concept id="weight">
-				<value xsi:type="stringColumn">gewicht</value>
+				<value xsi:type="string">gewicht</value>
 				<start>start</start>
 			</concept>
 		</mdat>
@@ -71,11 +71,11 @@
 		<mdat>
 			<concept id="natrium">
 				<!-- TODO implement numeric columns -->
-				<value xsi:type="stringColumn">na</value>
+				<value xsi:type="decimal">na</value>
 				<start format="d.M.u[ H[:m[:s]]]">zeitpunkt</start>
 				<unit constant-value="mmol/l" />
 				<modifier id="other">
-					<value xsi:type="stringColumn" constant-value=""/>
+					<value xsi:type="string" constant-value=""/>
 				</modifier>
 			</concept>
 		</mdat>