--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressSourceNS.java 2016/01/28 16:12:28 2868 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressSourceNS.java 2016/01/28 16:21:36 2869 @@ -1,10 +1,6 @@ package dk.daoas.adressevedligehold; -import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.Charset; import org.apache.commons.fileupload.FileItem; @@ -28,27 +24,7 @@ @Override public void validate() throws IOException { - try ( - InputStream is1 = file.getInputStream(); - InputStreamReader isr1 = new InputStreamReader(is1, Charset.forName("ISO-8859-1") ); - BufferedReader br1 = new BufferedReader(isr1) - ) { - String line = br1.readLine(); - - if (line == null) { - throw new IOException("Can't read 1st line - is file empty?"); - } - - String[] parts = line.split(","); - if (parts.length != 22) { - throw new IOException("Not enough fields in CSV file. Found " + parts.length + ", expected 22"); - } - } - - - is = file.getInputStream(); - isr = new InputStreamReader(is, Charset.forName("ISO-8859-1") ); - br = new BufferedReader(isr); + super.validatNoHeaderLine(22, ','); } //TODO: Skal csv parsning klares med Apache Commons CSV ?