diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java new file mode 100644 index 0000000000..73de3df234 --- /dev/null +++ b/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbBRPTransformer.java @@ -0,0 +1,164 @@ +package nl.b3p.brmo.loader; + +import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; +import java.sql.SQLException; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.Result; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpression; +import javax.xml.xpath.XPathFactory; +import nl.b3p.brmo.loader.entity.Bericht; +import nl.b3p.brmo.loader.util.RsgbTransformer; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +/** + * + * @author meine + */ +public class RsgbBRPTransformer extends RsgbTransformer { + + private static final Log log = LogFactory.getLog(RsgbBRPTransformer.class); + private StagingProxy staging; + + public RsgbBRPTransformer(String pathToXsl, StagingProxy staging) throws TransformerConfigurationException, ParserConfigurationException { + super(pathToXsl); + this.staging = staging; + } + + @Override + public String transformToDbXml(Bericht bericht) throws SAXException, IOException, TransformerConfigurationException, TransformerException { + String current = super.transformToDbXml(bericht); + StringBuilder loadLog = new StringBuilder(); + + try { + Bericht old = staging.getPreviousBericht(bericht, loadLog); + + if (old != null) { + Document d = merge(old.getDbXml(), current); + String mergedDBXML = print(d); + bericht.setDbXml(mergedDBXML); + current = mergedDBXML; + } + } catch (SQLException ex) { + log.error("Cannot retrieve old bericht: ", ex); + } catch (Exception ex) { + log.error("Cannot retrieve old bericht: ", ex); + } + + // retrieve old bericht + // apply current to old + // return modified dbxml + return current; + } + + @Override + public Node transformToDbXmlNode(Bericht bericht) throws SAXException, IOException, TransformerConfigurationException, TransformerException { + Node n = super.transformToDbXmlNode(bericht); + + // retrieve old bericht + // apply current to old + // return modified dbxml + return n; + } + + protected static Document merge(String oldFile, String newFile) throws Exception { + XPathFactory xPathFactory = XPathFactory.newInstance(); + XPath xpath = xPathFactory.newXPath(); + XPathExpression expression = xpath.compile("/root/data"); + + DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance(); + docBuilderFactory.setIgnoringElementContentWhitespace(true); + DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder(); + Document base = docBuilder.parse(new InputSource(new StringReader(oldFile))); + + Element old = (Element) expression.evaluate(base, XPathConstants.NODE); + if (old == null) { + throw new IOException(oldFile + ": expression does not evaluate to node"); + } + + Document merge = docBuilder.parse(new InputSource(new StringReader(newFile))); + Node newNode = (Node) expression.evaluate(merge, XPathConstants.NODE); + + /* + (1)Voor elke node in merge, kijk of hij bestaat in base + zo nee, importeer + zo ja, kijk of dit het een na diepste niveau is + zo ja, + ga voor elk childnode na of deze bestaat + zo nee, importeer + zo ja, overschrijf waarde + zo nee, recurse in (1) + */ + merge(base, newNode, old, true/*, merge*/); + + return base; + } + + private static final String GEEN_WAARDE = "geenWaarde"; + + private static void merge(Document base, Node newNode, Element old, boolean first/*, Node merge*/) { + while (newNode.hasChildNodes()) { + Node newChild = newNode.getFirstChild(); + newNode.removeChild(newChild); + String name = newChild.getNodeName(); + NodeList nl = old.getElementsByTagName(name); + if (nl.getLength() == 0) { // Geen oude data gevonden voor huidige node + newChild = base.importNode(newChild, true); + newChild.setTextContent(newChild.getTextContent()); + old.appendChild(newChild); + } else { + Element oldItem = (Element) nl.item(0); + if (first) { + merge(base, newChild, oldItem, false); + } else { + String content = newChild.getTextContent(); + if (content.equals(GEEN_WAARDE)) { + oldItem.setTextContent(""); + } else if(content.equals("")){ + //keep old content + }else { + oldItem.setTextContent(sanitizeValue(newChild.getTextContent())); + } + } + } + } + } + + private static String sanitizeValue(String val){ + if(val.contains(GEEN_WAARDE)){ + String newValue = val.replaceAll(GEEN_WAARDE + " ", ""); + newValue = newValue.replaceAll(GEEN_WAARDE, ""); + return newValue; + }else{ + return val; + } + } + + protected static String print(Document doc) throws Exception { + TransformerFactory transformerFactory = TransformerFactory.newInstance(); + Transformer transformer = transformerFactory.newTransformer(); + DOMSource source = new DOMSource(doc); + StringWriter sw = new StringWriter(); + Result result = new StreamResult(sw); + transformer.transform(source, result); + return sw.toString(); + } +} diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbProxy.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbProxy.java index 7d03452230..271fe9004e 100644 --- a/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbProxy.java +++ b/brmo-loader/src/main/java/nl/b3p/brmo/loader/RsgbProxy.java @@ -684,7 +684,7 @@ private RsgbTransformer getTransformer(String brType) throws TransformerConfigur } else if (brType.equals(BrmoFramework.BR_BAG)) { t = new RsgbTransformer(BrmoFramework.XSL_BAG); } else if(brType.equals(BrmoFramework.BR_BRP)){ - t = new RsgbTransformer(BrmoFramework.XSL_BRP); + t = new RsgbBRPTransformer(BrmoFramework.XSL_BRP, this.stagingProxy); }else if (brType.equals(BrmoFramework.BR_NHR)) { t = new RsgbTransformer(BrmoFramework.XSL_NHR); // } else if (brType.equals(BrmoFramework.BR_BGTLIGHT)) { diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/StagingProxy.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/StagingProxy.java index eeb9c4bb02..c214063e19 100644 --- a/brmo-loader/src/main/java/nl/b3p/brmo/loader/StagingProxy.java +++ b/brmo-loader/src/main/java/nl/b3p/brmo/loader/StagingProxy.java @@ -480,6 +480,10 @@ public void updateBerichtenDbXml(List berichten, RsgbTransformer transf private PreparedStatement getOldBerichtStatementById; public Bericht getOldBericht(Bericht nieuwBericht, StringBuilder loadLog) throws SQLException { + return getOldBericht(nieuwBericht.getObjectRef(), loadLog); + } + + public Bericht getOldBericht(String objectRef, StringBuilder loadLog) throws SQLException { Split split = SimonManager.getStopwatch("b3p.staging.bericht.getold").start(); Bericht bericht = null; @@ -498,7 +502,7 @@ public Bericht getOldBericht(Bericht nieuwBericht, StringBuilder loadLog) throws } else { getOldBerichtStatement.clearParameters(); } - getOldBerichtStatement.setString(1, nieuwBericht.getObjectRef()); + getOldBerichtStatement.setString(1, objectRef); ResultSet rs = getOldBerichtStatement.executeQuery(); List list = h.handle(rs); @@ -543,6 +547,86 @@ public Bericht getOldBericht(Bericht nieuwBericht, StringBuilder loadLog) throws split.stop(); return bericht; } + + + private PreparedStatement getPreviousBerichtStatement; + + public Bericht getPreviousBericht(Bericht ber, StringBuilder loadLog) throws SQLException { + return getPreviousBericht(ber.getObjectRef(), ber.getDatum(), ber.getId(), loadLog); + } + + /** + * Gets the previous method (not the first) + * @param objectRef + * @param datum + * @param currentBerichtId + * @param loadLog + * @return + * @throws SQLException + */ + public Bericht getPreviousBericht(String objectRef, Date datum, Long currentBerichtId, StringBuilder loadLog) throws SQLException { + Split split = SimonManager.getStopwatch("b3p.staging.bericht.getprevious").start(); + + Bericht bericht = null; + ResultSetHandler> h + = new BeanListHandler(Bericht.class, new StagingRowHandler()); + + if(getPreviousBerichtStatement == null) { + String sql = "SELECT id, object_ref, datum, volgordenummer, soort, status, job_id, status_datum FROM " + + BrmoFramework.BERICHT_TABLE + " WHERE" + + " object_ref = ? and datum <= ? and id <> ?" + + " ORDER BY datum asc, volgordenummer desc"; + sql = geomToJdbc.buildPaginationSql(sql, 0, 1); + + getPreviousBerichtStatement = getConnection().prepareStatement(sql); + } else { + getPreviousBerichtStatement.clearParameters(); + } + getPreviousBerichtStatement.setString(1, objectRef); + getPreviousBerichtStatement.setTimestamp(2, new java.sql.Timestamp(datum.getTime())); + getPreviousBerichtStatement.setLong(3, currentBerichtId); + + ResultSet rs = getPreviousBerichtStatement.executeQuery(); + List list = h.handle(rs); + rs.close(); + + if(!list.isEmpty()) { + loadLog.append("Vorig bericht gevonden:\n"); + for(Bericht b: list) { + if( bericht == null) { + loadLog.append("Meest recent bericht gevonden: ").append(b).append("\n"); + bericht = b; + } else { + loadLog.append("Niet geschikt bericht: ").append(b).append("\n"); + } + } + } + + if (bericht != null) { + //bericht nu wel vullen met alle kolommen + if (getOldBerichtStatementById == null) { + String sql = "SELECT * FROM " + + BrmoFramework.BERICHT_TABLE + + " WHERE id = ?"; + + getOldBerichtStatementById = getConnection().prepareStatement(sql); + } else { + getOldBerichtStatementById.clearParameters(); + } + getOldBerichtStatementById.setLong(1, bericht.getId()); + + ResultSet rs2 = getOldBerichtStatementById.executeQuery(); + List list2 = h.handle(rs2); + rs2.close(); + + if(!list2.isEmpty()) { + bericht = list2.get(0); + } + } + + split.stop(); + return bericht; + } /** * Update (overschrijft) een bericht in job tabel. (object_ref, datum, @@ -682,7 +766,7 @@ public void loadBr(InputStream stream, String type, String fileName, Date d, Pro } else if (TopNLType.isTopNLType(type)) { brmoXMLReader = new TopNLFileReader(fileName, type); } else if(type.equals(BrmoFramework.BR_BRP)){ - brmoXMLReader = new BRPXMLReader(cis, d); + brmoXMLReader = new BRPXMLReader(cis, d, this); } else if (type.equals(BrmoFramework.BR_GBAV)) { brmoXMLReader = new GbavXMLReader(cis); } else { diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/util/RsgbTransformer.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/util/RsgbTransformer.java index 0da72eb0c1..9de3c69c72 100644 --- a/brmo-loader/src/main/java/nl/b3p/brmo/loader/util/RsgbTransformer.java +++ b/brmo-loader/src/main/java/nl/b3p/brmo/loader/util/RsgbTransformer.java @@ -31,8 +31,8 @@ */ public class RsgbTransformer { private static final Log log = LogFactory.getLog(RsgbTransformer.class); - private final Templates t; - private final DocumentBuilder db; + protected final Templates t; + protected final DocumentBuilder db; public RsgbTransformer(String pathToXsl) throws TransformerConfigurationException, ParserConfigurationException { diff --git a/brmo-loader/src/main/java/nl/b3p/brmo/loader/xml/BRPXMLReader.java b/brmo-loader/src/main/java/nl/b3p/brmo/loader/xml/BRPXMLReader.java index aeb2e6ab0f..be96d13b9d 100644 --- a/brmo-loader/src/main/java/nl/b3p/brmo/loader/xml/BRPXMLReader.java +++ b/brmo-loader/src/main/java/nl/b3p/brmo/loader/xml/BRPXMLReader.java @@ -26,17 +26,24 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.OutputKeys; +import javax.xml.transform.Source; +import javax.xml.transform.Templates; import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; +import javax.xml.transform.URIResolver; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; import nl.b3p.brmo.loader.BrmoFramework; +import nl.b3p.brmo.loader.StagingProxy; import nl.b3p.brmo.loader.entity.Bericht; +import nl.b3p.brmo.loader.util.RsgbTransformer; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -51,10 +58,15 @@ public class BRPXMLReader extends BrmoXMLReader { private NodeList nodes = null; private int index; + private Templates template; + private final String pathToXsl = "/xsl/brp-brxml-preprocessor.xsl"; + public static final String PREFIX = "NL.BRP.Persoon."; + private StagingProxy staging; - public BRPXMLReader(InputStream in, Date d) throws Exception { + public BRPXMLReader(InputStream in, Date d, StagingProxy staging) throws Exception { this.in = in; + this.staging = staging; setBestandsDatum(d); init(); } @@ -66,6 +78,18 @@ public void init() throws Exception { factory.setNamespaceAware(true); DocumentBuilder builder = factory.newDocumentBuilder(); Document doc = builder.parse(in); + + TransformerFactory tf = TransformerFactory.newInstance(); + tf.setURIResolver(new URIResolver() { + @Override + public Source resolve(String href, String base) throws TransformerException { + return new StreamSource(RsgbTransformer.class.getResourceAsStream("/xsl/" + href)); + } + }); + + Source xsl = new StreamSource(this.getClass().getResourceAsStream(pathToXsl)); + this.template = tf.newTemplates(xsl); + nodes = doc.getDocumentElement().getChildNodes(); index = 0; } @@ -79,9 +103,20 @@ public boolean hasNext() throws Exception { public Bericht next() throws Exception { Node n = nodes.item(index); index++; - + String object_ref = getObjectRef(n); StringWriter sw = new StringWriter(); - Transformer t = TransformerFactory.newInstance().newTransformer(); + Bericht old = staging.getPreviousBericht(object_ref, getBestandsDatum(), -1L, new StringBuilder()); + + // kijk hier of dit bericht een voorganger heeft: zo niet, dan moet niet de preprocessor template gebruikt worden, maar de gewone. + + Transformer t; + + if (old != null) { + t = this.template.newTransformer(); + } else { + t = TransformerFactory.newInstance().newTransformer(); + } + t.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); t.transform(new DOMSource(n), new StreamResult(sw));//new StreamResult(outputStream)); @@ -94,7 +129,7 @@ public Bericht next() throws Exception { Bericht b = new Bericht(brXML); b.setBrOrgineelXml(origXML); b.setVolgordeNummer(index); - b.setObjectRef(getObjectRef(n)); + b.setObjectRef(object_ref); b.setSoort(BrmoFramework.BR_BRP); b.setDatum(getBestandsDatum()); return b; @@ -112,7 +147,7 @@ private String getObjectRef(Node n) { break; } } - return hash; + return PREFIX + hash; } /** diff --git a/brmo-loader/src/main/resources/xsl/brp-brxml-preprocessor.xsl b/brmo-loader/src/main/resources/xsl/brp-brxml-preprocessor.xsl new file mode 100644 index 0000000000..4c36e764aa --- /dev/null +++ b/brmo-loader/src/main/resources/xsl/brp-brxml-preprocessor.xsl @@ -0,0 +1,27 @@ + + + + + + + + + + + + + geenWaarde + + + + + + + + + \ No newline at end of file diff --git a/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl b/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl index 643282d642..5ff181adf0 100644 --- a/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl +++ b/brmo-loader/src/main/resources/xsl/brp-to-rsgb-xml.xsl @@ -32,10 +32,10 @@ - + - NATUURLIJK PERSOON + INGESCHREVEN NATUURLIJK PERSOON @@ -92,6 +92,7 @@ + @@ -104,7 +105,7 @@ - + @@ -116,20 +117,22 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -157,18 +160,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -220,8 +223,8 @@ - + - \ No newline at end of file + diff --git a/brmo-loader/src/test/java/nl/b3p/brmo/loader/RsgbBRPTransformerTest.java b/brmo-loader/src/test/java/nl/b3p/brmo/loader/RsgbBRPTransformerTest.java new file mode 100644 index 0000000000..0f17f5c4e4 --- /dev/null +++ b/brmo-loader/src/test/java/nl/b3p/brmo/loader/RsgbBRPTransformerTest.java @@ -0,0 +1,43 @@ + package nl.b3p.brmo.loader; + +import java.io.StringWriter; +import org.apache.commons.io.IOUtils; +import static org.junit.Assert.assertEquals; +import org.junit.Test; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * + * @author meine + */ + + +public class RsgbBRPTransformerTest { + + // @Test + public void mergeTest() throws Exception{ + StringWriter writerOld = new StringWriter(); + IOUtils.copy(RsgbBRPTransformerTest.class.getResourceAsStream("old.xml"), writerOld, "UTF-8"); + String old = writerOld.toString(); + + StringWriter writerNew = new StringWriter(); + IOUtils.copy(RsgbBRPTransformerTest.class.getResourceAsStream("new.xml"), writerNew, "UTF-8"); + String newFile = writerNew.toString(); + + Document doc = RsgbBRPTransformer.merge( old, newFile); + NodeList data = doc.getElementsByTagName("data"); + assertEquals("Too many data elems", 1,data.getLength()); + Node dataNode = data.item(0); + //assertEquals("Too many children in data", 6, dataChildren.getLength()); + NodeList huw = doc.getElementsByTagName("huw_ger_partn"); + assertEquals("Huwelijk not present", 1, huw.getLength()); + NodeList subjectList = doc.getElementsByTagName("subject"); + assertEquals("too many subjects", 1, subjectList.getLength()); + Element subject = (Element)subjectList.item(0); + assertEquals("new value in adres_buitenland not merged", "daaro", subject.getElementsByTagName("adres_buitenland").item(0).getTextContent() ); + assertEquals("old value in pa_postbus__of_antwoordnummer not retained", "666", subject.getElementsByTagName("pa_postbus__of_antwoordnummer").item(0).getTextContent() ); + } +} diff --git a/brmo-loader/src/test/java/nl/b3p/brmo/loader/xml/BagXMLReaderTest.java b/brmo-loader/src/test/java/nl/b3p/brmo/loader/xml/BagXMLReaderTest.java index 808f1a5336..214d261df3 100644 --- a/brmo-loader/src/test/java/nl/b3p/brmo/loader/xml/BagXMLReaderTest.java +++ b/brmo-loader/src/test/java/nl/b3p/brmo/loader/xml/BagXMLReaderTest.java @@ -121,7 +121,7 @@ public void mutTestLargeXML() throws Exception { * * @throws Exception if any */ - //@Test + @Test public void mutTestZipFile() throws Exception { ZipInputStream zis = new ZipInputStream( BagXMLReaderTest.class.getResourceAsStream(mutZipName)); diff --git a/brmo-service/pom.xml b/brmo-service/pom.xml index ef64f35629..919007649f 100644 --- a/brmo-service/pom.xml +++ b/brmo-service/pom.xml @@ -444,11 +444,11 @@ jakarta.mail ${jakarta.mail.version} - - com.oracle.jdbc - ojdbc8 - ${oracle.jdbc.version} - + + + + + @@ -551,11 +551,11 @@ jakarta.mail ${jakarta.mail.version} - - net.sourceforge.jtds - jtds - ${sqlserver.jtds.version} - + + + + + diff --git a/brmo-service/src/test/java/nl/b3p/brmo/service/testutil/TestUtil.java b/brmo-service/src/test/java/nl/b3p/brmo/service/testutil/TestUtil.java index 95c02dd982..d2f2b6f191 100644 --- a/brmo-service/src/test/java/nl/b3p/brmo/service/testutil/TestUtil.java +++ b/brmo-service/src/test/java/nl/b3p/brmo/service/testutil/TestUtil.java @@ -52,6 +52,7 @@ public abstract class TestUtil { protected BasicDataSource dsStaging; protected BasicDataSource dsRsgb; + protected BasicDataSource dsRsgbBgt; /** * logging rule. @@ -118,6 +119,12 @@ public void loadDBprop() throws IOException { dsRsgb.setPassword(DBPROPS.getProperty("rsgb.password")); dsRsgb.setAccessToUnderlyingConnectionAllowed(true); + dsRsgbBgt = new BasicDataSource(); + dsRsgbBgt.setUrl(DBPROPS.getProperty("rsgb.url")); + dsRsgbBgt.setUsername(DBPROPS.getProperty("rsgb.username")); + dsRsgbBgt.setPassword(DBPROPS.getProperty("rsgb.password")); + dsRsgbBgt.setAccessToUnderlyingConnectionAllowed(true); + setupJNDI(); } @@ -153,6 +160,7 @@ protected void setupJNDI() { ic.createSubcontext("java:comp/env/jdbc/brmo"); ic.bind("java:comp/env/jdbc/brmo/rsgb", dsRsgb); ic.bind("java:comp/env/jdbc/brmo/staging", dsStaging); + ic.bind("java:comp/env/jdbc/brmo/staging", dsRsgbBgt); haveSetupJNDI = true; } catch (NamingException ex) { LOG.warn("Opzetten van datasource jndi is mislukt", ex); diff --git a/brmo-service/src/test/resources/sqlserver.properties b/brmo-service/src/test/resources/sqlserver.properties index 22ddbe6fd5..1cdf72bdb5 100644 --- a/brmo-service/src/test/resources/sqlserver.properties +++ b/brmo-service/src/test/resources/sqlserver.properties @@ -11,9 +11,9 @@ staging.url=jdbc:jtds:sqlserver://127.0.0.1:1433/staging;instance=${mssql.instan jdbc.driverClassName=net.sourceforge.jtds.jdbc.Driver rsgbbgt.url=jdbc:jtds:sqlserver://127.0.0.1:1433/bgttest;instance=${mssql.instancename} -rsgbbgt.user=sa -rsgbbgt.passwd=Password12! +rsgbbgt.username=sa +rsgbbgt.password=Password12! topnl.url=jdbc:jtds:sqlserver://127.0.0.1:1433/topnl;instance=${mssql.instancename} -topnl.user=topnl -topnl.passwd=topnl \ No newline at end of file +topnl.username=topnl +topnl.password=topnl \ No newline at end of file diff --git a/brmo-stufbg204/brmo-stufbg204-soapui-project.xml b/brmo-stufbg204/brmo-stufbg204-soapui-project.xml index d67660bf45..1c10feb55f 100644 --- a/brmo-stufbg204/brmo-stufbg204-soapui-project.xml +++ b/brmo-stufbg204/brmo-stufbg204-soapui-project.xml @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ -]]>http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon?wsdl +]]>http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon?wsdl Dit document definieert de webservices voor het sectormodel basisgegevens. Dit document gaat uit van twee webservices: @@ -168,7 +168,7 @@ In het endpoint dient de url nog correct te worden ingevuld. -]]>http://schemas.xmlsoap.org/wsdl/http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon?xsd=2 +]]>http://schemas.xmlsoap.org/wsdl/http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon?xsd=2 Schema met de in StUF gebruikte elementen en attributen @@ -576,7 +576,7 @@ In het endpoint dient de url nog correct te worden ingevuld. -]]>http://www.w3.org/2001/XMLSchemahttp://localhost:8084/brmo-stufbg204/StUFBGAsynchroon?xsd=1 +]]>http://www.w3.org/2001/XMLSchemahttp://localhost:8084/brmo-stufbg204/StUFBGAsynchroon?xsd=1 @@ -6287,7 +6287,7 @@ Sortering 02: deelgemeentenaam -]]>http://www.w3.org/2001/XMLSchemahttp://example.com/StUFBGAsynchroonhttp://localhost:8037/brmo-stufbg204/StUFBGAsynchroonhttp://localhost:8084/brmo-stufbg204/StUFBGAsynchroon<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon +]]>http://www.w3.org/2001/XMLSchemahttp://example.com/StUFBGAsynchroonhttp://localhost:8084/brmo-stufbg204/StUFBGAsynchroonhttp://localhost:8084/brmo-stufbg204/StUFBGAsynchroon<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon @@ -60985,6 +60985,7 @@ Sortering 02: deelgemeentenaam T V + 2019011415491600 @@ -61367,7 +61368,535 @@ Sortering 02: deelgemeentenaam -]]>No Authorizationhttp://localhost:8084/brmo-stufbg204/StUFBGSynchroon?wsdl +]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon + + + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000021 + 2019011415533900 + + T + I + 2019011415533900 + + + + + 2625854460 + 976900187 + 5c5 + 6 + 95 + 952f9c9ff + 1988-06-03 + M + 7 + 1802 + + E + + + 20210328 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + + + +]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon + + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000028 + 2019011416033300 + + W + I + 2019011416033300 + + + + + 2625854460 + 976900187 + 5c5 + 6 + 95 + pietje + 1988-06-03 + M + + + 20210328 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + + + 2625854460 + 976900187 + 5c5 + 6 + 95 + 952f9c9ff + 1988-06-03 + M + + + 20210328 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + 20110526 + + 20240430 + 19600509 + + + + + + + + c58b867 + 1960-05-09 + + + + + + + +]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004A + 2019011417265400 + + C + I + 2019011417265400 + + + + + 2422002328 + 637352461 + 818b + 5 + 95 + 20f + 1977-10-13 + M + + + 19991023 + 19600509 + + + 2713PA + + Mañanalaan + 95 + + + + + + 1801 + + + + + 2422002328 + 637352461 + 818b + 5 + 95 + 20f + 1977-10-13 + M + + + 19991023 + 19600509 + + + 2713PA + + Mañanalaan + 95 + + + + + + 1801 + + + + + + +]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000027 + 2019011415542600 + + T + I + 2019011415542600 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + 0 + 1801 + E + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + + +]]>No Authorization<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGAsynchroon + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000033 + 2019011416115200 + + W + I + 2019011416115200 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + + + + 19960304 + 19600509 + + + 2767GP + + Roemeenmanweg + 22 + + + + + + 1801 + + + + + + +]]>No Authorizationhttp://localhost:8084/brmo-stufbg204/StUFBGSynchroon?wsdl Dit document definieert de webservices voor het sectormodel basisgegevens. Dit document gaat uit van twee webservices: @@ -67624,7 +68153,7 @@ Sortering 02: deelgemeentenaam -]]>http://www.w3.org/2001/XMLSchemahttp://example.com/StUFBGSynchroonhttp://localhost:8037/brmo-stufbg204/StUFBGSynchroonhttp://localhost:8084/brmo-stufbg204/StUFBGSynchroon<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGSynchroon +]]>http://www.w3.org/2001/XMLSchemahttp://example.com/StUFBGSynchroonhttp://localhost:8084/brmo-stufbg204/StUFBGSynchroonhttp://localhost:8084/brmo-stufbg204/StUFBGSynchroon<xml-fragment/>UTF-8http://localhost:8084/brmo-stufbg204/StUFBGSynchroon @@ -197599,4 +198128,4 @@ Sortering 02: deelgemeentenaam -]]>No Authorization \ No newline at end of file +]]>No Authorizationhttp://localhost:8084/brmo-stufbg204/StUFBGAsynchroon \ No newline at end of file diff --git a/brmo-stufbg204/pom.xml b/brmo-stufbg204/pom.xml index cefbeb35e3..df1f8d2f1d 100644 --- a/brmo-stufbg204/pom.xml +++ b/brmo-stufbg204/pom.xml @@ -88,6 +88,11 @@ dbunit test + + org.slf4j + slf4j-log4j12 + test + @@ -197,7 +202,80 @@ + + ${project.basedir}/src/test/resources/postgres.properties + + + + ${project.basedir}/src/test/tomcatconf/ + true + + + ${project.basedir}/src/test/resources/ + + + + org.codehaus.mojo + properties-maven-plugin + + + ${project.basedir}/src/test/resources/postgres.properties + ${project.basedir}/src/test/resources/local.postgres.properties + + true + + + + initialize + + read-project-properties + + + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + + 9090 + + ${project.build.directory}/test-classes/testcontext.xml + + + + tomcat-run + + run-war-only + + pre-integration-test + + true + ${maven.test.skip} + + + + tomcat-shutdown + + shutdown + + post-integration-test + + ${maven.test.skip} + true + + + + + + org.postgresql + postgresql + ${postgresql.jdbc.version} + + + maven-failsafe-plugin @@ -223,7 +301,80 @@ + + ${project.basedir}/src/test/resources/oracle.properties + + + + ${project.basedir}/src/test/tomcatconf/ + true + + + ${project.basedir}/src/test/resources/ + + + + org.codehaus.mojo + properties-maven-plugin + + + ${project.basedir}/src/test/resources/oracle.properties + ${project.basedir}/src/test/resources/local.oracle.properties + + true + + + + initialize + + read-project-properties + + + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + + 9090 + + ${project.build.directory}/test-classes/testcontext.oracle.xml + + + + tomcat-run + + run-war-only + + pre-integration-test + + true + ${maven.test.skip} + + + + tomcat-shutdown + + shutdown + + post-integration-test + + ${maven.test.skip} + true + + + + + + + + + + + maven-failsafe-plugin @@ -249,7 +400,81 @@ + + ${project.basedir}/src/test/resources/sqlserver.properties + + + + ${project.basedir}/src/test/tomcatconf/ + true + + + ${project.basedir}/src/test/resources/ + true + + + + org.codehaus.mojo + properties-maven-plugin + + + ${project.basedir}/src/test/resources/sqlserver.properties + ${project.basedir}/src/test/resources/local.sqlserver.properties + + true + + + + initialize + + read-project-properties + + + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + + 9090 + + ${project.build.directory}/test-classes/testcontext.xml + + + + tomcat-run + + run-war-only + + pre-integration-test + + true + ${maven.test.skip} + + + + tomcat-shutdown + + shutdown + + post-integration-test + + ${maven.test.skip} + true + + + + + + + + + + + maven-failsafe-plugin diff --git a/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java b/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java index 7ddafb51ea..3eba4c9274 100644 --- a/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java +++ b/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/StUFBGasynchroon.java @@ -4,6 +4,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.text.ParseException; import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.Date; @@ -33,11 +34,9 @@ import nl.b3p.brmo.stufbg204.util.StUFbg204Util; import nl.egem.stuf.sector.bg._0204.AsynchroonAntwoordBericht; import nl.egem.stuf.sector.bg._0204.KennisgevingsBericht; -import nl.egem.stuf.sector.bg._0204.StUFFout; import nl.egem.stuf.sector.bg._0204.VraagBericht; import nl.egem.stuf.stuf0204.BevestigingsBericht; import nl.egem.stuf.stuf0204.FoutBericht; -import nl.egem.stuf.stuf0204.Mutatiesoort; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; @@ -63,16 +62,15 @@ public class StUFBGasynchroon { private static final Log LOG = LogFactory.getLog(StUFBGasynchroon.class); public BevestigingsBericht ontvangAsynchroneVraag(VraagBericht vraag) { - // LOG.debug("Er is vraag ontvangen van soort: " + vraag.getStuurgegevens().getBerichtsoort()); - + LOG.debug("Er is een vraag ontvangen van soort: " + vraag.getStuurgegevens().getBerichtsoort()); BevestigingsBericht b = new BevestigingsBericht(); b.setStuurgegevens(StUFbg204Util.maakStuurgegevens(vraag.getStuurgegevens())); + return b; } public BevestigingsBericht ontvangAsynchroonAntwoord(AsynchroonAntwoordBericht asynchroonAntwoord) { - // LOG.debug("Er is antwoord ontvangen van soort: " + asynchroonAntwoord.getStuurgegevens().getBerichtsoort()); - + LOG.debug("Er is een antwoord ontvangen van soort: " + asynchroonAntwoord.getStuurgegevens().getBerichtsoort()); BevestigingsBericht b = new BevestigingsBericht(); b.setStuurgegevens(StUFbg204Util.maakStuurgegevens(asynchroonAntwoord.getStuurgegevens())); @@ -80,20 +78,87 @@ public BevestigingsBericht ontvangAsynchroonAntwoord(AsynchroonAntwoordBericht a } public BevestigingsBericht ontvangFout(FoutBericht fout) { - // LOG.debug("Er is fout ontvangen van soort: " + fout.getStuurgegevens().getBerichtsoort()); - + LOG.debug("Er is een fout ontvangen van soort: " + fout.getStuurgegevens().getBerichtsoort()); BevestigingsBericht b = new BevestigingsBericht(); b.setStuurgegevens(StUFbg204Util.maakStuurgegevens(fout.getStuurgegevens())); return b; } + /** + * + * 4.2 Stuurgegevens voor kennisgevingberichten. In paragraaf 2.3 zijn vier + * varianten binnen een kennisgevingbericht onderkend: + * + *

Toevoeging

+ * Bij een toevoeging is in het zendende systeem een occurrence toegevoegd, + * omdat is vastgesteld dat in de werkelijkheid een voor het zendende + * systeem relevant object bestaat. + * + *

Wijziging

+ * Bij een wijziging is in het zendende systeem een occurrence gewijzigd, + * omdat is vastgesteld dat er in de werkelijkheid eigenschappen (gegevens) + * zijn veranderd van het object waar naar die occurrence verwijst. + * + *

Verwijdering

+ * Bij een verwijdering is in het zendende systeem een occurrence + * verwijderd, omdat is vastgesteld dat in de werkelijkheid het object + * waarnaar de occurrence verwijst, niet meer bestaat of niet meer relevant + * is voor het zendende systeem. + * + *

Correctie

+ * Bij een correctie is in het zendende systeem een occurrence gewijzigd, + * omdat is vastgesteld dat de vastgelegde waarden niet correct waren. Bij + * een correctie is het object in de werkelijkheid waarnaar de occurrence + * verwijst, zelf niet gewijzigd. Deze verschillende varianten worden als + * volgt gecodeerd in het stuurgegeven mutatiesoort: + *
    + *
  • ‘T’: Toevoeging + *
  • ‘W’: Wijziging + *
  • ‘V’: Verwijdering + *
  • ‘C’: Correctie + *
+ * Het is aan het ontvangende systeem om te interpreteren in hoeverre een + * kennisgeving relevant is en of de kennisgeving het gevolg is van het + * ontstaan of verdwijnen van een object c.q. van het relevant worden of + * niet meer relevant zijn van het object voor het zendende systeem. Het + * kennisgevingbericht bevat geen aanduiding van de gebeurtenis die + * aanleiding gaf tot de wijziging van de gegevens (zie paragraaf 2.3). + * + *
+ * Naast de mutatiesoort is in een kennisgevingbericht ook relevant hoe het + * ontvangende systeem geacht wordt te reageren op het bericht. Een + * kennisgevingbericht kan puur informatief bedoeld zijn: het ontvangende + * systeem mag zelf beslissen of de kennisgeving al dan niet wordt verwerkt + * in de eigen gegevens. Daarnaast kan het verplicht zijn voor het + * ontvangende systeem om de gegevens over te nemen. Of een + * kennisgevingbericht informatief is of verplicht over te nemen geeft het + * stuurgegeven indicator overname aan met 'I' (informatief) respectievelijk + * 'V' (verplicht). Aanvullende afspraken over de omgang met deze rubriek + * kunnen worden vastgelegd in het sectormodel. + * + * @param kennisgeving te verwerken kennisgevingsbericht + * @return een bevestiging van de kennisgeving + */ public BevestigingsBericht ontvangKennisgeving(KennisgevingsBericht kennisgeving) { - // LOG.debug("Er is kennisgeving ontvangen van soort: " + kennisgeving.getStuurgegevens().getBerichtsoort()); + LOG.debug("Er is een kennisgeving ontvangen van soort: " + kennisgeving.getStuurgegevens().getBerichtsoort() + + " en mutatiesoort " + kennisgeving.getStuurgegevens().getKennisgeving().getMutatiesoort()); BevestigingsBericht b = new BevestigingsBericht(); b.setStuurgegevens(StUFbg204Util.maakStuurgegevens(kennisgeving.getStuurgegevens())); - if(kennisgeving.getStuurgegevens().getKennisgeving().getMutatiesoort().equals(Mutatiesoort.T)){ - saveBericht(kennisgeving, kennisgeving.getStuurgegevens().getTijdstipBericht()); + + switch (kennisgeving.getStuurgegevens().getKennisgeving().getMutatiesoort()) { + case T: + saveBericht(kennisgeving, kennisgeving.getStuurgegevens().getKennisgeving().getTijdstipMutatie()); + break; + case W: + case C: + // dit werkt -nog- niet omdat dit 2 PRS nodes bevat, een was en een wordt... + saveBericht(kennisgeving, kennisgeving.getStuurgegevens().getKennisgeving().getTijdstipMutatie()); + break; + case V: + default: + LOG.warn("Onbekende mutatiesoort wordt niet verwerkt."); + break; } return b; } @@ -105,14 +170,14 @@ private void saveBericht(Object body, String datum) { InputStream in = getXml(body); Date d = StUFbg204Util.sdf.parse(datum); - String name = "Upload op " + StUFbg204Util.sdf.format(new Date()); + String bestand_naam = "StUF-BG upload op " + StUFbg204Util.sdf.format(new Date()); - brmo.loadFromStream(BrmoFramework.BR_BRP, in, name, d); + brmo.loadFromStream(BrmoFramework.BR_BRP, in, bestand_naam, d, null); brmo.closeBrmoFramework(); } catch (BrmoException ex) { - LOG.error("Cannot create BRMO Framework:", ex); - } catch (Exception ex) { - LOG.error("Cannot get datasource:", ex); + LOG.error("Fout tijdens laden van StUF-BG bericht", ex); + } catch (JAXBException | ParseException ex) { + LOG.error("Fout tijdens parsen van bericht", ex); } } @@ -130,20 +195,23 @@ private InputStream getXml(Object o) throws JAXBException { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setNamespaceAware(true); DocumentBuilder builder = factory.newDocumentBuilder(); - + Document doc = builder.parse(in); - List> prefixes = new ArrayList<>(); + List> prefixes = new ArrayList<>(); getPrefixesRecursive(doc.getDocumentElement(), prefixes); //haal de body eruit met xpath XPathFactory xPathfactory = XPathFactory.newInstance(); XPath xpath = xPathfactory.newXPath(); XPathExpression expr = xpath.compile("//*[local-name() = 'body']/*"); NodeList nodelist = (NodeList) expr.evaluate(doc, XPathConstants.NODESET); - Node root = doc.createElement("root"); + + Document newDoc = builder.newDocument(); + Node root = newDoc.createElement("root"); for (int i = 0; i < nodelist.getLength(); i++) { Node n = nodelist.item(i); - root.appendChild(n); + Node newNode = newDoc.importNode(n, true); + root.appendChild(newNode); } // Vertaal xml naar inputstream voor verwerking in brmo framework @@ -162,7 +230,7 @@ private InputStream getXml(Object o) throws JAXBException { private static final String XMLNAMESPACE = "xmlns"; - public static void getPrefixesRecursive(Element element, List> prefixes) { + public static void getPrefixesRecursive(Element element, List> prefixes) { getPrefixes(element, prefixes); Node parent = element.getParentNode(); if (parent instanceof Element) { @@ -173,11 +241,10 @@ public static void getPrefixesRecursive(Element element, List> prefixes) { + public static void getPrefixes(Element element, List> prefixes) { NamedNodeMap atts = element.getAttributes(); for (int i = 0; i < atts.getLength(); i++) { Node node = atts.item(i); diff --git a/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/util/StUFbg204Util.java b/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/util/StUFbg204Util.java index 71bf070c21..51edf10004 100644 --- a/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/util/StUFbg204Util.java +++ b/brmo-stufbg204/src/main/java/nl/b3p/brmo/stufbg204/util/StUFbg204Util.java @@ -18,7 +18,7 @@ */ public final class StUFbg204Util { - public static final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddkkkmmssSSS"); + public static final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddkkmmssSSS"); private static JAXBContext jaxbContext; private StUFbg204Util() { diff --git a/brmo-stufbg204/src/main/resources/log4j.properties b/brmo-stufbg204/src/main/resources/log4j.properties index 474c6f66bb..6360f0cad4 100644 --- a/brmo-stufbg204/src/main/resources/log4j.properties +++ b/brmo-stufbg204/src/main/resources/log4j.properties @@ -3,8 +3,9 @@ logFile=brmo-stufbg204-service.log # Gebruik TRACE om SQL statements van de SOAP requests te loggen log4j.rootLogger=INFO,file -log4j.logger.nl.b3p=TRACE -log4j.logger.nl.b3p.brmo.soap.util.LogMessageHandler=ERROR +log4j.logger.nl.b3p=INFO +log4j.logger.nl.b3p.brmo.soap.util.LogMessageHandler=INFO +log4j.logger.nl.b3p.web.jsp=INFO log4j.appender.file=org.apache.log4j.RollingFileAppender log4j.appender.file.file=${logFilePath}/${logFile} diff --git a/brmo-stufbg204/src/main/webapp/logs.jsp b/brmo-stufbg204/src/main/webapp/logs.jsp index d10d45b0fa..789738e128 100644 --- a/brmo-stufbg204/src/main/webapp/logs.jsp +++ b/brmo-stufbg204/src/main/webapp/logs.jsp @@ -27,4 +27,4 @@ 

<%=line%>

- \ No newline at end of file + diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/StUFBGsynchroonIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/StUFBGsynchroonIntegrationTest.java index 4dcc51e154..00163215d8 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/StUFBGsynchroonIntegrationTest.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/StUFBGsynchroonIntegrationTest.java @@ -29,20 +29,6 @@ public class StUFBGsynchroonIntegrationTest extends TestStub { @Before @Override public void setUp() { - BasicDataSource dsStaging = new BasicDataSource(); - dsStaging.setUrl(DBPROPS.getProperty("staging.url")); - dsStaging.setUsername(DBPROPS.getProperty("staging.username")); - dsStaging.setPassword(DBPROPS.getProperty("staging.password")); - dsStaging.setAccessToUnderlyingConnectionAllowed(true); - - BasicDataSource dsRsgb = new BasicDataSource(); - dsRsgb.setUrl(DBPROPS.getProperty("rsgb.url")); - dsRsgb.setUsername(DBPROPS.getProperty("rsgb.username")); - dsRsgb.setPassword(DBPROPS.getProperty("rsgb.password")); - dsRsgb.setAccessToUnderlyingConnectionAllowed(true); - - setupJNDI(dsRsgb, dsStaging); - stub = new StUFBGsynchroon(); } diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/Stufbg204ServiceIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/Stufbg204ServiceIntegrationTest.java index e70600ea21..684bf13f51 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/Stufbg204ServiceIntegrationTest.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/Stufbg204ServiceIntegrationTest.java @@ -30,20 +30,6 @@ public class Stufbg204ServiceIntegrationTest extends TestStub { @Before @Override public void setUp() { - BasicDataSource dsStaging = new BasicDataSource(); - dsStaging.setUrl(DBPROPS.getProperty("staging.url")); - dsStaging.setUsername(DBPROPS.getProperty("staging.username")); - dsStaging.setPassword(DBPROPS.getProperty("staging.password")); - dsStaging.setAccessToUnderlyingConnectionAllowed(true); - - BasicDataSource dsRsgb = new BasicDataSource(); - dsRsgb.setUrl(DBPROPS.getProperty("rsgb.url")); - dsRsgb.setUsername(DBPROPS.getProperty("rsgb.username")); - dsRsgb.setPassword(DBPROPS.getProperty("rsgb.password")); - dsRsgb.setAccessToUnderlyingConnectionAllowed(true); - - setupJNDI(dsRsgb, dsStaging); - service = new StUFBGasynchroon(); } diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/TestStub.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/TestStub.java index 88c53e79e8..23d9b03ff1 100644 --- a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/TestStub.java +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/TestStub.java @@ -50,6 +50,8 @@ public abstract class TestStub { */ protected boolean isPostgis; + protected BasicDataSource dsStaging; + protected BasicDataSource dsRsgb; /** * logging rule. */ @@ -102,6 +104,20 @@ public void loadDBprop() throws IOException { } catch (ClassNotFoundException ex) { LOG.error("Database driver niet gevonden.", ex); } + + dsStaging = new BasicDataSource(); + dsStaging.setUrl(DBPROPS.getProperty("staging.url")); + dsStaging.setUsername(DBPROPS.getProperty("staging.username")); + dsStaging.setPassword(DBPROPS.getProperty("staging.password")); + dsStaging.setAccessToUnderlyingConnectionAllowed(true); + + dsRsgb = new BasicDataSource(); + dsRsgb.setUrl(DBPROPS.getProperty("rsgb.url")); + dsRsgb.setUsername(DBPROPS.getProperty("rsgb.username")); + dsRsgb.setPassword(DBPROPS.getProperty("rsgb.password")); + dsRsgb.setAccessToUnderlyingConnectionAllowed(true); + + setupJNDI(); } /** @@ -122,11 +138,8 @@ public void endTest() { /** * setup jndi voor testcases. - * - * @param dsRsgb rsgb databron - * @param dsStaging staging databron */ - protected void setupJNDI(final BasicDataSource dsRsgb, final BasicDataSource dsStaging) { + private void setupJNDI() { if (!haveSetupJNDI) { try { System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.naming.java.javaURLContextFactory"); diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java new file mode 100644 index 0000000000..dfd10ebb48 --- /dev/null +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkHuwelijksMutatieIntegrationTest.java @@ -0,0 +1,250 @@ +/* + * Copyright (C) 2018 B3Partners B.V. + */ +package nl.b3p.brmo.stufbg204; + +import java.io.IOException; +import java.sql.SQLException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + +import nl.b3p.brmo.loader.BrmoFramework; +import nl.b3p.brmo.loader.util.BrmoException; +import nl.b3p.brmo.test.util.database.dbunit.CleanUtil; +import nl.b3p.loader.jdbc.OracleConnectionUnwrapper; +import org.apache.commons.dbcp.BasicDataSource; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.http.HttpStatus; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.InputStreamEntity; +import org.dbunit.DatabaseUnitException; +import org.dbunit.database.DatabaseConfig; +import org.dbunit.database.DatabaseConnection; +import org.dbunit.database.DatabaseDataSourceConnection; +import org.dbunit.database.IDatabaseConnection; +import org.dbunit.dataset.DataSetException; +import org.dbunit.dataset.ITable; +import org.dbunit.ext.mssql.MsSqlDataTypeFactory; +import org.dbunit.ext.oracle.Oracle10DataTypeFactory; +import org.dbunit.ext.postgresql.PostgresqlDataTypeFactory; +import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.*; + +/** + * Deze testcase verwerkt een soap bericht uit een bestand als kennisgeving. Het + * bestand bevat een HuwelijksMutatie welke naar de stufbg204 async service + * wordt gepost, hierna wordt in de staging gechecked voor laadproces en bericht + * en wordt na trasnformatie in de rsgb gechecked. + * + * @author Mark Prins + * @code mvn -Dit.test=VerwerkHuwelijksMutatieIntegrationTest -Dtest.onlyITs=true verify -Ppostgresql > target/postgresql.log} + */ +public class VerwerkHuwelijksMutatieIntegrationTest extends WebTestStub { + + private static final Log LOG = LogFactory.getLog(VerwerkHuwelijksMutatieIntegrationTest.class); + private IDatabaseConnection staging; + private IDatabaseConnection rsgb; + private final Lock sequential = new ReentrantLock(); + private BrmoFramework brmo; + + @Before + @Override + public void setUp() throws SQLException, BrmoException, DatabaseUnitException { + brmo = new BrmoFramework(dsStaging, dsRsgb, null); + staging = new DatabaseDataSourceConnection(dsStaging); + rsgb = new DatabaseDataSourceConnection(dsRsgb); + + if (this.isMsSQL) { + staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new MsSqlDataTypeFactory()); + rsgb.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new MsSqlDataTypeFactory()); + } else if (this.isOracle) { + dsStaging.getConnection().setAutoCommit(true); + dsRsgb.getConnection().setAutoCommit(true); + staging = new DatabaseConnection(OracleConnectionUnwrapper.unwrap(dsStaging.getConnection()), DBPROPS.getProperty("staging.username").toUpperCase()); + staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new Oracle10DataTypeFactory()); + staging.getConfig().setProperty(DatabaseConfig.FEATURE_SKIP_ORACLE_RECYCLEBIN_TABLES, true); + rsgb = new DatabaseConnection(OracleConnectionUnwrapper.unwrap(dsRsgb.getConnection()), DBPROPS.getProperty("rsgb.username").toUpperCase()); + rsgb.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new Oracle10DataTypeFactory()); + rsgb.getConfig().setProperty(DatabaseConfig.FEATURE_SKIP_ORACLE_RECYCLEBIN_TABLES, true); + } else if (this.isPostgis) { + staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new PostgresqlDataTypeFactory()); + rsgb.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new PostgresqlDataTypeFactory()); + } else { + fail("Geen ondersteunde database aangegegeven"); + } + + sequential.lock(); + } + + @After + public void cleanup() throws Exception { + brmo.closeBrmoFramework(); + CleanUtil.cleanSTAGING(staging, false); + CleanUtil.cleanRSGB_BRP(rsgb); + staging.close(); + rsgb.close(); + sequential.unlock(); + } + + @Test + @Ignore("Deze test mislukt omdat in het bericht de gegevens van de partner ontbreken, het bericht kan daardoor niet verwerkt worden") + public void testBericht() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + InputStreamEntity reqEntity = new InputStreamEntity( + VerwerkHuwelijksMutatieIntegrationTest.class.getResourceAsStream("/OpnemenHuwelijkScenario/StUF_request.xml"), + -1, + ContentType.create("text/xml", "utf-8") + ); + reqEntity.setChunked(true); + HttpPost httppost = new HttpPost(BASE_TEST_URL + "StUFBGAsynchroon"); + httppost.setEntity(reqEntity); + // httppost.addHeader("SOAPAction", "ontvangKennisgeving"); + + LOG.debug("SOAP request uitvoeren: " + httppost.getRequestLine()); + + // set-up preemptive auth voor request en stuur bericht + CloseableHttpResponse response = client.execute(target, httppost, localContext); + + assertThat("Response status is OK.", response.getStatusLine().getStatusCode(), equalTo(HttpStatus.SC_OK)); + + // check staging database inhoud + assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 1l <= brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + ITable laadproces = staging.createDataSet().getTable("laadproces"); + assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ "2018-12-21 14:18:45.0", laadproces.getValue(0, "bestand_datum").toString()); + + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.df2e41b72f8a3421ef575617fc247a77018a573f", bericht.getValue(0, "object_ref")); + assertEquals("datum klopt niet", "2018-12-21 14:18:45.0", bericht.getValue(0, "datum").toString()); + + // transformeren van bericht en check rsgb database inhoud + Thread t = brmo.toRsgb(); + t.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertTrue("Aantal rijen klopt niet", subject.getRowCount() == 1); + assertEquals("naam niet als verwacht", "J de Cuykelaer", subject.getValue(0, "naam")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertTrue("Aantal rijen klopt niet", nat_prs.getRowCount() == 1); + assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(1, "geslachtsaand")); + assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertTrue("Aantal rijen klopt niet", ingeschr_nat_prs.getRowCount() == 1); + assertEquals("a nummer niet als verwacht", "9173658014", ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", "301571818", ingeschr_nat_prs.getValue(0, "bsn")); + } + + @Test + @Ignore("Deze test mislukt omdat in het bericht de gegevens van de partner ontbreken, het bericht kan daardoor niet verwerkt worden") + public void testToevoegingMetHuwelijkAlsComfort() throws IOException, DataSetException, SQLException, InterruptedException, ParseException, BrmoException { + InputStreamEntity reqEntity = new InputStreamEntity( + VerwerkToevoegingMutatieIntegrationTest.class.getResourceAsStream("/testdata-tnt/SoapBerichten/toevoeging_huwelijk_als_comfort.xml"), + -1, + ContentType.create("text/xml", "utf-8") + ); + reqEntity.setChunked(true); + HttpPost httppost = new HttpPost(BASE_TEST_URL + "StUFBGAsynchroon"); + httppost.setEntity(reqEntity); + // httppost.addHeader("SOAPAction", "ontvangKennisgeving"); + + LOG.debug("SOAP request uitvoeren: " + httppost.getRequestLine()); + + // set-up preemptive auth voor request en stuur bericht + CloseableHttpResponse response = client.execute(target, httppost, localContext); + + assertThat("Response status is OK.", response.getStatusLine().getStatusCode(), equalTo(HttpStatus.SC_OK)); + + // check staging database inhoud + assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 1l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + ITable laadproces = staging.createDataSet().getTable("laadproces"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd kk:mm:ss.SS"); + assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", laadproces.getValue(0, "bestand_datum").toString()); + + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.fcd17242d8211342df48efd67341ca9765de8347", bericht.getValue(0, "object_ref")); + assertEquals("datum klopt niet", "2019-01-14 16:04:37.0", bericht.getValue(0, "datum").toString()); + + // transformeren van bericht en check rsgb database inhoud + Thread t = brmo.toRsgb(); + t.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertEquals("Aantal rijen klopt niet", 1, subject.getRowCount()); + assertEquals("naam niet als verwacht", "727b5940 900ed1be 8b701201 935a9e ba5b4d6e d9b9226a", subject.getValue(0, "naam")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertTrue("Aantal rijen klopt niet", nat_prs.getRowCount() == 1); + assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(1, "geslachtsaand")); + // assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertTrue("Aantal rijen klopt niet", ingeschr_nat_prs.getRowCount() == 1); + assertEquals("a nummer niet als verwacht", "6171717520", ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", "749069273", ingeschr_nat_prs.getValue(0, "bsn")); + } + + + @Test + @Ignore("TODO de 2e persoon wordt niet uitgeparsed") + public void testBericht2() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + InputStreamEntity reqEntity = new InputStreamEntity( + VerwerkHuwelijksMutatieIntegrationTest.class.getResourceAsStream("/OpnemenHuwelijkScenario/StUF_request2.xml"), + -1, + ContentType.create("text/xml", "utf-8") + ); + reqEntity.setChunked(true); + HttpPost httppost = new HttpPost(BASE_TEST_URL + "StUFBGAsynchroon"); + httppost.setEntity(reqEntity); + // httppost.addHeader("SOAPAction", "ontvangKennisgeving"); + + LOG.debug("SOAP request uitvoeren: " + httppost.getRequestLine()); + + // set-up preemptive auth voor request en stuur bericht + CloseableHttpResponse response = client.execute(target, httppost, localContext); + + assertThat("Response status is OK.", response.getStatusLine().getStatusCode(), equalTo(HttpStatus.SC_OK)); + + // check staging database inhoud + assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 1l <= brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + ITable laadproces = staging.createDataSet().getTable("laadproces"); + assertEquals("datum klopt niet", /* StUFbg204Util.sdf.parse("201812211418450000") */ "2018-12-21 14:18:45.0", laadproces.getValue(0, "bestand_datum").toString()); + + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.df2e41b72f8a3421ef575617fc247a77018a573f", bericht.getValue(0, "object_ref")); + assertEquals("datum klopt niet", "2018-12-21 14:18:45.0", bericht.getValue(0, "datum").toString()); + + // transformeren van bericht en check rsgb database inhoud + Thread t = brmo.toRsgb(); + t.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertTrue("Aantal rijen klopt niet", subject.getRowCount() == 1); + assertEquals("naam niet als verwacht", "J de Cuykelaer", subject.getValue(0, "naam")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertTrue("Aantal rijen klopt niet", nat_prs.getRowCount() == 1); + assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(1, "geslachtsaand")); + assertEquals("geslachtsnaam niet als verwacht", "Cuykelaer", nat_prs.getValue(0, "nm_geslachtsnaam")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertTrue("Aantal rijen klopt niet", ingeschr_nat_prs.getRowCount() == 1); + assertEquals("a nummer niet als verwacht", "9173658014", ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", "301571818", ingeschr_nat_prs.getValue(0, "bsn")); + } +} diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java new file mode 100644 index 0000000000..1a2e12616c --- /dev/null +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/VerwerkToevoegingMutatieIntegrationTest.java @@ -0,0 +1,346 @@ +/* + * Copyright (C) 2018 B3Partners B.V. + */ +package nl.b3p.brmo.stufbg204; + +import java.io.IOException; +import java.math.BigDecimal; +import java.sql.SQLException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + +import nl.b3p.brmo.loader.BrmoFramework; +import nl.b3p.brmo.loader.util.BrmoException; +import nl.b3p.brmo.test.util.database.dbunit.CleanUtil; +import nl.b3p.loader.jdbc.OracleConnectionUnwrapper; +import org.apache.commons.dbcp.BasicDataSource; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.http.HttpStatus; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.InputStreamEntity; +import org.dbunit.DatabaseUnitException; +import org.dbunit.database.DatabaseConfig; +import org.dbunit.database.DatabaseConnection; +import org.dbunit.database.DatabaseDataSourceConnection; +import org.dbunit.database.IDatabaseConnection; +import org.dbunit.dataset.DataSetException; +import org.dbunit.dataset.ITable; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.*; + +import org.dbunit.ext.mssql.MsSqlDataTypeFactory; +import org.dbunit.ext.oracle.Oracle10DataTypeFactory; +import org.dbunit.ext.postgresql.PostgresqlDataTypeFactory; +import org.junit.After; + +import org.junit.Before; +import org.junit.Test; + +/** + * Deze testcase verwerkt een soap bericht uit een bestand als kennisgeving. Het + * bestand bevat een HuwelijksMutatie welke naar de stufbg204 async service + * wordt gepost, hierna wordt in de staging gechecked voor laadproces en bericht + * en wordt na trasnformatie in de rsgb gechecked. + * + * @author Mark Prins + * @code mvn -Dit.test=VerwerkToevoegingMutatieIntegrationTest -Dtest.onlyITs=true verify -Ppostgresql > target/postgresql.log} + * @code mvn -Dit.test=VerwerkToevoegingMutatieIntegrationTest -Dtest.onlyITs=true verify -Pmssql -pl brmo-stufbg204 > target/mssql.log} + */ +public class VerwerkToevoegingMutatieIntegrationTest extends WebTestStub { + + private static final Log LOG = LogFactory.getLog(VerwerkToevoegingMutatieIntegrationTest.class); + private IDatabaseConnection staging; + private IDatabaseConnection rsgb; + private final Lock sequential = new ReentrantLock(); + private BrmoFramework brmo; + + @Before + @Override + public void setUp() throws SQLException, BrmoException, DatabaseUnitException { + brmo = new BrmoFramework(dsStaging, dsRsgb, null); + // brmo.setEnablePipeline(true); + + staging = new DatabaseDataSourceConnection(dsStaging); + rsgb = new DatabaseDataSourceConnection(dsRsgb); + if (this.isMsSQL) { + staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new MsSqlDataTypeFactory()); + rsgb.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new MsSqlDataTypeFactory()); + } else if (this.isOracle) { + dsStaging.getConnection().setAutoCommit(true); + dsRsgb.getConnection().setAutoCommit(true); + staging = new DatabaseConnection(OracleConnectionUnwrapper.unwrap(dsStaging.getConnection()), DBPROPS.getProperty("staging.username").toUpperCase()); + staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new Oracle10DataTypeFactory()); + staging.getConfig().setProperty(DatabaseConfig.FEATURE_SKIP_ORACLE_RECYCLEBIN_TABLES, true); + rsgb = new DatabaseConnection(OracleConnectionUnwrapper.unwrap(dsRsgb.getConnection()), DBPROPS.getProperty("rsgb.username").toUpperCase()); + rsgb.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new Oracle10DataTypeFactory()); + rsgb.getConfig().setProperty(DatabaseConfig.FEATURE_SKIP_ORACLE_RECYCLEBIN_TABLES, true); + } else if (this.isPostgis) { + staging.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new PostgresqlDataTypeFactory()); + rsgb.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new PostgresqlDataTypeFactory()); + } else { + fail("Geen ondersteunde database aangegegeven"); + } + + sequential.lock(); + } + + @After + public void cleanup() throws Exception { + brmo.closeBrmoFramework(); + CleanUtil.cleanSTAGING(staging, true); + CleanUtil.cleanRSGB_BRP(rsgb); + staging.close(); + rsgb.close(); + sequential.unlock(); + } + + @Test + public void testToevoeging() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + doRequest("/testdata-tnt/mergetest/toevoeging.xml"); + // check staging database inhoud + assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 1l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + ITable laadproces = staging.createDataSet().getTable("laadproces"); + assertEquals("datum klopt niet", "2019-01-14 15:54:26.0", laadproces.getValue(0, "bestand_datum").toString()); + + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); + assertEquals("datum klopt niet", "2019-01-14 15:54:26.0", bericht.getValue(0, "datum").toString()); + + // transformeren van bericht en check rsgb database inhoud + Thread t = brmo.toRsgb(); + t.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertEquals("Aantal rijen klopt niet", 1, subject.getRowCount()); + assertEquals("naam niet als verwacht", "5 568cf", subject.getValue(0, "naam")); + assertEquals("adres_binnenland niet als verwacht", "Poolmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount()); + assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(0, "geslachtsaand")); + assertEquals("geslachtsnaam niet als verwacht", "568cf", nat_prs.getValue(0, "nm_geslachtsnaam")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount()); + assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); + } + + @Test + public void testMutatieAanpassing() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + doRequest("/testdata-tnt/mergetest/toevoeging.xml"); + doRequest("/testdata-tnt/mergetest/wijziging_aanpassing.xml"); + + // check staging database inhoud + assertTrue("Er zijn anders dan 2 STAGING_OK laadprocessen", 2l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + ITable laadproces = staging.createDataSet().getTable("laadproces"); + assertEquals("datum klopt niet", "2019-01-14 15:54:26.0", laadproces.getValue(0, "bestand_datum").toString()); + + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); + assertEquals("datum klopt niet", "2019-01-14 15:54:26.0", bericht.getValue(0, "datum").toString()); + + // transformeren van bericht en check rsgb database inhoud + Thread t = brmo.toRsgb(); + t.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertEquals("Aantal rijen klopt niet", 1, subject.getRowCount()); + assertEquals("naam niet als verwacht", "5 568cf", subject.getValue(0, "naam")); + assertEquals("adres_binnenland niet als verwacht", "Roemeenmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount()); + assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(0, "geslachtsaand")); + assertEquals("geslachtsnaam niet als verwacht", "568cf", nat_prs.getValue(0, "nm_geslachtsnaam")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount()); + assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); + } + + /** + * element geslachtsaanduiding weggehaald --> is dan onbekend bij verzender. Laten bestaan, want is op een of andere + * manier wel in rsgb gekomen via een andere weg en mag dus niet weg. Moet weg bij StUF:noValue="geenWaarde" + */ + @Test + public void testMutatieGeenElement() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + doRequest("/testdata-tnt/mergetest/toevoeging.xml"); + doRequest("/testdata-tnt/mergetest/wijziging_waardeonbekend_geenelement.xml"); + + // check staging database inhoud + assertEquals("Er zijn anders dan 2 STAGING_OK laadprocessen", 2l, brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + ITable laadproces = staging.createDataSet().getTable("laadproces"); + assertEquals("datum klopt niet", "2019-01-14 15:54:26.0", laadproces.getValue(0, "bestand_datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 16:11:52.0", laadproces.getValue(1, "bestand_datum").toString()); + + assertEquals("Er zijn anders dan 3 STAGING_OK berichten", 3l, brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); + assertEquals("datum klopt niet", "2019-01-14 15:54:26.0", bericht.getValue(0, "datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 16:11:52.0", bericht.getValue(1, "datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 16:11:52.0", bericht.getValue(2, "datum").toString()); + + // transformeren van bericht en check rsgb database inhoud + Thread t = brmo.toRsgb(); + t.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertEquals("Aantal rijen klopt niet", 1, subject.getRowCount()); + assertEquals("naam niet als verwacht", "5 568cf", subject.getValue(0, "naam")); + assertEquals("adres_binnenland niet als verwacht", "Roemeenmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount()); + assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(0, "geslachtsaand")); + assertEquals("geslachtsnaam niet als verwacht", "568cf", nat_prs.getValue(0, "nm_geslachtsnaam")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount()); + assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); + } + + + @Test + public void testMutatieGeenWaarde() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + doRequest("/testdata-tnt/mergetest/toevoeging.xml"); + // assertTrue("Pijplijn moet aan staan", brmo.isEnablePipeline()); + /* Thread t = brmo.toRsgb(); + t.join();*/ + + doRequest("/testdata-tnt/mergetest/wijziging_geenWaarde.xml"); + + // check staging database inhoud + assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 2l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + ITable laadproces = staging.createDataSet().getTable("laadproces"); + assertEquals("datum klopt niet", "2019-01-14 15:54:26.0", laadproces.getValue(0, "bestand_datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 16:11:52.0", laadproces.getValue(1, "bestand_datum").toString()); + + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); + assertEquals("datum klopt niet", "2019-01-14 15:54:26.0", bericht.getValue(0, "datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 16:11:52.0", bericht.getValue(1, "datum").toString()); + assertEquals("datum klopt niet", "2019-01-14 16:11:52.0", bericht.getValue(2, "datum").toString()); + + // transformeren van bericht en check rsgb database inhoud + Thread t2 = brmo.toRsgb(); + t2.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertEquals("Aantal rijen klopt niet", 1, subject.getRowCount()); + assertEquals("naam niet als verwacht", "5 568cf", subject.getValue(0, "naam")); + assertEquals("adres_binnenland niet als verwacht", "Roemeenmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount()); + assertNull("geslacht moet leeg zijn", nat_prs.getValue(0, "geslachtsaand")); + assertEquals("geslachtsnaam niet als verwacht", "568cf", nat_prs.getValue(0, "nm_geslachtsnaam")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount()); + assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); + } + + + @Test + public void testMutatieNietGeautoriseerd() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + doRequest("/testdata-tnt/mergetest/toevoeging.xml"); + + + doRequest("/testdata-tnt/mergetest/wijziging_nietmeesturen_ongeauthoriseerd.xml"); + + // check staging database inhoud + assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 2l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); + + + // transformeren van bericht en check rsgb database inhoud + Thread t = brmo.toRsgb(); + t.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertEquals("Aantal rijen klopt niet", 1, subject.getRowCount()); + assertEquals("naam niet als verwacht", "5 568cf", subject.getValue(0, "naam")); + assertEquals("adres_binnenland niet als verwacht", "Roemeenmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount()); + assertEquals("geslacht niet als verwacht", "M", nat_prs.getValue(0, "geslachtsaand")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount()); + assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); + } + + + @Test + public void testMutatieGevuldNaarLeeg() throws IOException, DataSetException, SQLException, BrmoException, InterruptedException, ParseException { + doRequest("/testdata-tnt/mergetest/toevoeging.xml"); + doRequest("/testdata-tnt/mergetest/wijziging_gevuldveldleeg.xml"); + + // check staging database inhoud + assertTrue("Er zijn anders dan 1 STAGING_OK laadprocessen", 2l == brmo.getCountLaadProcessen(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + assertTrue("Er zijn anders dan 1 STAGING_OK berichten", 1l <= brmo.getCountBerichten(null, null, BrmoFramework.BR_BRP, "STAGING_OK")); + ITable bericht = staging.createDataSet().getTable("bericht"); + assertEquals("object ref klopt niet", "NL.BRP.Persoon.2275c97ea44fceef93fde351a9ff06eeb3a1ecf3", bericht.getValue(0, "object_ref")); + + // transformeren van bericht en check rsgb database inhoud + Thread t = brmo.toRsgb(); + t.join(); + + ITable subject = rsgb.createDataSet().getTable("subject"); + assertEquals("Aantal rijen klopt niet", 1, subject.getRowCount()); + assertEquals("naam niet als verwacht", "5 568cf", subject.getValue(0, "naam")); + assertEquals("adres_binnenland niet als verwacht", "Roemeenmanweg 22 2767GP", subject.getValue(0, "adres_binnenland")); + + ITable nat_prs = rsgb.createDataSet().getTable("nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, nat_prs.getRowCount()); + assertNull("geslacht niet als verwacht", nat_prs.getValue(0, "geslachtsaand")); + + ITable ingeschr_nat_prs = rsgb.createDataSet().getTable("ingeschr_nat_prs"); + assertEquals("Aantal rijen klopt niet", 1, ingeschr_nat_prs.getRowCount()); + assertEquals("a nummer niet als verwacht", new BigDecimal("3056876036"), ingeschr_nat_prs.getValue(0, "a_nummer")); + assertEquals("bsn nummer niet als verwacht", new BigDecimal("902215443"), ingeschr_nat_prs.getValue(0, "bsn")); + } + + + private void doRequest(String file) throws IOException { + InputStreamEntity reqEntity = new InputStreamEntity( + VerwerkToevoegingMutatieIntegrationTest.class.getResourceAsStream(file), + -1, + ContentType.create("text/xml", "utf-8") + ); + reqEntity.setChunked(true); + HttpPost httppost = new HttpPost(BASE_TEST_URL + "StUFBGAsynchroon"); + httppost.setEntity(reqEntity); + // httppost.addHeader("SOAPAction", "ontvangKennisgeving"); + LOG.debug("SOAP request uitvoeren; POST " + file + " naar: " + httppost.getRequestLine()); + + // set-up preemptive auth voor request en stuur bericht + CloseableHttpResponse response = client.execute(target, httppost, localContext); + + LOG.debug(("Request done.")); + assertThat("Response status is not OK.", response.getStatusLine().getStatusCode(), equalTo(HttpStatus.SC_OK)); + response.close(); + } +} diff --git a/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/WebTestStub.java b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/WebTestStub.java new file mode 100644 index 0000000000..96fccc19e2 --- /dev/null +++ b/brmo-stufbg204/src/test/java/nl/b3p/brmo/stufbg204/WebTestStub.java @@ -0,0 +1,76 @@ +package nl.b3p.brmo.stufbg204; + +import java.io.IOException; +import org.apache.http.HttpHost; +import org.apache.http.auth.AuthScope; +import org.apache.http.auth.UsernamePasswordCredentials; +import org.apache.http.client.AuthCache; +import org.apache.http.client.CredentialsProvider; +import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.impl.auth.BasicScheme; +import org.apache.http.impl.client.BasicAuthCache; +import org.apache.http.impl.client.BasicCookieStore; +import org.apache.http.impl.client.BasicCredentialsProvider; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.impl.client.LaxRedirectStrategy; +import org.junit.AfterClass; +import org.junit.BeforeClass; + +/** + * Integratie test utility klasse om online integratie tests te bouwen welke + * tegen een brmo-stufbg204 kunnen worden uitgevoerd. + * + * @author Mark Prins + */ +public abstract class WebTestStub extends TestStub { + + public static final int HTTP_PORT = 9090; + /** + * the server root url. {@value} + */ + public static final String BASE_TEST_URL = "http://localhost:" + HTTP_PORT + "/brmo-stufbg204/"; + + /** + * onze test client. + */ + protected static CloseableHttpClient client; + protected static HttpHost target; + protected static HttpClientContext localContext; + + /** + * initialize http client. + */ + @BeforeClass + public static void setUpClass() { + target = new HttpHost("localhost", HTTP_PORT, "http"); + AuthCache authCache = new BasicAuthCache(); + authCache.put(target, new BasicScheme()); + + localContext = HttpClientContext.create(); + localContext.setAuthCache(authCache); + + CredentialsProvider credsProvider = new BasicCredentialsProvider(); + credsProvider.setCredentials( + new AuthScope(target.getHostName(), target.getPort()), + new UsernamePasswordCredentials("brmo", "brmo")); + + client = HttpClients.custom() + .useSystemProperties() + .setUserAgent("brmo integration test") + .setRedirectStrategy(new LaxRedirectStrategy()) + .setDefaultCookieStore(new BasicCookieStore()) + .setDefaultCredentialsProvider(credsProvider) + .build(); + } + + /** + * close http client connections. + * + * @throws IOException if any occurs closing the http connection + */ + @AfterClass + public static void tearDownClass() throws IOException { + client.close(); + } +} diff --git a/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_request.xml b/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_request.xml new file mode 100644 index 0000000000..78abf8e565 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_request.xml @@ -0,0 +1,108 @@ + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 2018000005FF + 2018122114184500 + + W + I + 2018122114184500 + + + + + 9173658014 + 301571818 + Jan + J + de + Cuykelaer + 19671210 + M + + + 19920228 + + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + + + 9173658014 + 301571818 + Jan + J + de + Cuykelaer + 19671210 + M + + + 19920228 + + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + 20110526 + + 20110526 + + + + + + + + + Tupolev + + + + + + + + + diff --git a/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_request2.xml b/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_request2.xml new file mode 100644 index 0000000000..1daa49eba3 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_request2.xml @@ -0,0 +1,108 @@ + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 2018000005FF + 2018122114184500 + + W + I + 2018122114184500 + + + + + 9173658014 + 301571818 + Jan + J + de + Cuykelaer + 19671210 + M + + + 19920228 + + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + + + 9173658014 + 301571818 + Jan + J + de + Cuykelaer + 19671210 + M + + + 19920228 + + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + 20110526 + + 20110526 + + + + + 1173658019 + 401571819 + Beppie + B + Janssssen + 19671211 + V + + + + + + + diff --git a/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_response.xml b/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_response.xml new file mode 100644 index 0000000000..061fc0bfad --- /dev/null +++ b/brmo-stufbg204/src/test/resources/OpnemenHuwelijkScenario/StUF_response.xml @@ -0,0 +1,30 @@ + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + B3Partners B.V. + BRMO + + + DeDommel + B3Partners + + 2018000005FF + 201812210141847988 + + W + I + 2018122114184500 + + + + + diff --git a/brmo-stufbg204/src/test/resources/log4j.xml b/brmo-stufbg204/src/test/resources/log4j.xml index c2a1fe88ed..eff8c9219d 100644 --- a/brmo-stufbg204/src/test/resources/log4j.xml +++ b/brmo-stufbg204/src/test/resources/log4j.xml @@ -7,6 +7,14 @@ + + + + + + + + @@ -29,10 +37,26 @@ + + + + + + + + + + + + + + + + diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/README.md b/brmo-stufbg204/src/test/resources/testdata-tnt/README.md new file mode 100644 index 0000000000..eb3d273c43 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/README.md @@ -0,0 +1,3 @@ +Alle berichten zijn door onze anonimizer heen gefietst, daardoor is het mogelijk dat voorletters niet meer overeenkomen met voornamen en dat een begindatum soms na een einddatum ligt. + +De vulberichten zijn `T` berichten diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/SoapBerichten/toevoeging_huwelijk_als_comfort.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/SoapBerichten/toevoeging_huwelijk_als_comfort.xml new file mode 100644 index 0000000000..7c79e8f5d6 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/SoapBerichten/toevoeging_huwelijk_als_comfort.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000030 + 2019011416043700 + + T + I + 2019011416043700 + + + + + 6171717520 + + 749069273 + + 727b5940 900ed1be 8b701201 935a9e ba5b4d6e d9b9226a + + c42b69 + + 95 + + e7145 a3026 19399 37 eff41b7 0cc4de 845 e60 5971 fb2 627e7 552ca ac7 b33eb5bd + + 1971-10-22 + + M + 0 + JH + 1802 + + E + + + 19410723 + + 19600509 + + + + 3055NL + + Le Fèvre de Montignyln + 49 + + + + + + 1802 + + + + 19360000 + + 19600618 + + 19600509 + + + + + + + + + + + + + + 0e8fc 07a65 02f2e 674af + + 1960-05-09 + + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000028.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000028.anon.xml new file mode 100644 index 0000000000..9e730e5add --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000028.anon.xml @@ -0,0 +1,112 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000028 + 2019011416033300 + + W + I + 2019011416033300 + + + + + 2625854460 + 976900187 + 5c5 + 6 + 95 + 952f9c9ff + 1988-06-03 + M + + + 20210328 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + + + 2625854460 + 976900187 + 5c5 + 6 + 95 + 952f9c9ff + 1988-06-03 + M + + + 20210328 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + 20110526 + + 20240430 + 19600509 + + + + + + + + c58b867 + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000029.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000029.anon.xml new file mode 100644 index 0000000000..6c5a1edf36 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000029.anon.xml @@ -0,0 +1,112 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000029 + 2019011416034100 + + W + I + 2019011416034100 + + + + + 0789721340 + 606117644 + c14d5 + 0 + + c58b867 + 1964-02-09 + V + + + 20240627 + 19600509 + + + 3020RV + + Markt + 4 + + + + + + 1801 + + + + + + 0789721340 + 606117644 + c14d5 + 0 + + c58b867 + 1964-02-09 + V + + + 20240627 + 19600509 + + + 3020RV + + Markt + 4 + + + + + + 1801 + + + + 20110526 + + 20240430 + 19600509 + + + + + + + 95 + 952f9c9ff + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002A.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002A.anon.xml new file mode 100644 index 0000000000..e015fc8510 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002A.anon.xml @@ -0,0 +1,93 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002A + 2019011416034900 + + W + I + 2019011416034900 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + 0 + + + 19410724 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + 7 + + + 19410724 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002B.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002B.anon.xml new file mode 100644 index 0000000000..fccbc63902 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002B.anon.xml @@ -0,0 +1,93 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002B + 2019011416035700 + + W + I + 2019011416035700 + + + + + 8222536691 + 398069336 + d01926a + d + + 3879b76c + 1989-07-11 + V + 0 + + + 19890711 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 8222536691 + 398069336 + d01926a + d + + 3879b76c + 1989-07-11 + V + 7 + + + 19890711 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002C.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002C.anon.xml new file mode 100644 index 0000000000..74f8a086fe --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002C.anon.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002C + 2019011416040500 + + W + I + 2019011416040500 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + + + 20210612 + 19930618 + + + 3019RT + + Thorbeckestraat + 5 + + + + + + 1801 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + + + 19930618 + 19600509 + + + 3020HA + + Sequoialaan + 5 + c + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002D.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002D.anon.xml new file mode 100644 index 0000000000..c8c72510eb --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002D.anon.xml @@ -0,0 +1,105 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002D + 2019011416041300 + + W + I + 2019011416041300 + + + + + 7423586859 + 955 + 1989c7 + 7 + 970 + d0d536 + 2005-03-20 + V + + + + + + + 20230120 + 19410723 + + + 8073KS + + van Speykstraat + 52 + + + + + + 1801 + + + + + 7423586859 + 955 + 1989c7 + 7 + 970 + d0d536 + 2005-03-20 + V + + + 20110609 + + + 19410723 + 19600509 + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002E.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002E.anon.xml new file mode 100644 index 0000000000..255d975ca1 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002E.anon.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002E + 2019011416042100 + + W + I + 2019011416042100 + + + + + 1913118637 + 306472837 + f0365 + 6 + + 534ae8f7c + 1987-09-06 + M + + + 19870906 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + 1913118637 + 306472837 + f0365 + 6 + + 8246a79 + 1987-09-06 + M + + + 19870906 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002F.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002F.anon.xml new file mode 100644 index 0000000000..99d7fbc254 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_20190000002F.anon.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000002F + 2019011416042900 + + W + I + 2019011416042900 + + + + + 1318579222 + 030941790 + 84827c4d06e85a77 + 7 + + 6284224 + 1940-05-18 + V + + + 19990621 + 19410723 + + + 1064BH + + Burgemeester Röellstraat + 31 + + + + + + 1801 + + + + + 1318579222 + 030941790 + 84827c4d06e85a77 + 7 + + 6284224 + 1940-05-18 + V + + + 19410723 + 19600509 + + + 1065CS + + Christiaan Brüningsstr + 25 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000030.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000030.anon.xml new file mode 100644 index 0000000000..a6b19a2509 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_1/stuf-bg_201900000030.anon.xml @@ -0,0 +1,87 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000030 + 2019011416043700 + + T + I + 2019011416043700 + + + + + 6171717520 + 749069273 + 727b5940 900ed1be 8b701201 935a9e ba5b4d6e d9b9226a + c42b69 + 95 + e7145 a3026 19399 37 eff41b7 0cc4de 845 e60 5971 fb2 627e7 552ca ac7 b33eb5bd + 1971-10-22 + M + 0 + JH + 1802 + + E + + + 19410723 + 19600509 + + + 3055NL + + Le Fèvre de Montignyln + 49 + + + + + + 1802 + + + + 19360000 + + 19600618 + 19600509 + + + + + + + + 0e8fc 07a65 02f2e 674af + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000031.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000031.anon.xml new file mode 100644 index 0000000000..fdbc18ad90 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000031.anon.xml @@ -0,0 +1,93 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000031 + 2019011416113600 + + W + I + 2019011416113600 + + + + + 0789721340 + 606117644 + c14d5 + 0 + + c58b867 + 1964-02-09 + V + 1801 + + + 20240627 + 19930618 + + + 3020RV + + Markt + 4 + + + + + + 1801 + + + + + 0789721340 + 606117644 + c14d5 + 0 + + c58b867 + 1964-02-09 + V + 1802 + + + 19930618 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000032.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000032.anon.xml new file mode 100644 index 0000000000..65dc38e7b1 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000032.anon.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000032 + 2019011416114400 + + W + I + 2019011416114400 + + + + + 5396163489 + 677924762 + c57e226 + 6 + + d6231 + 2027-06-16 + V + + + 20000227 + 19410723 + + + + + + + + + + Onder de Belvédère a/d Groenegracht + + 1802 + + + + + 5396163489 + 677924762 + c57e226 + 6 + + d6231 + 2027-06-16 + V + + + 19410723 + 19600509 + + + 6049HD + + A K vd Coppellostr + 17 + + B + + + + 1802 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000033.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000033.anon.xml new file mode 100644 index 0000000000..89b1cd8e00 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000033.anon.xml @@ -0,0 +1,112 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000033 + 2019011416115200 + + W + I + 2019011416115200 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + 20110609 + + 19410723 + 19600509 + + + + + + + + 0f2 + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000034.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000034.anon.xml new file mode 100644 index 0000000000..31891cd9fb --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000034.anon.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000034 + 2019011416120000 + + W + I + 2019011416120000 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19410723 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000035.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000035.anon.xml new file mode 100644 index 0000000000..7635425cc8 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000035.anon.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000035 + 2019011416120800 + + W + I + 2019011416120800 + + + + + 9406420424 + 995140038 + d96c084 + 8 + + 568cf + 1960-11-16 + V + + + 19601116 + 19410723 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 9406420424 + 995140038 + d96c084 + 8 + + 568cf + 1960-11-16 + V + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000036.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000036.anon.xml new file mode 100644 index 0000000000..f11a4fdb97 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000036.anon.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000036 + 2019011416121600 + + W + I + 2019011416121600 + + + + + 7674337126 + 749421371 + a85deb0a1 + 6 + + 71525c823 + 2008-01-08 + V + + + 20080108 + 19410723 + + + 2710SR + + Achterbergweg + 15 + + + + + + 1801 + + + + + 7674337126 + 749421371 + a85deb0a1 + 6 + + 71525c823 + 2008-01-08 + V + + + 19410723 + 19600509 + + + 2724SK + + Lissenvaart + 51 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000037.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000037.anon.xml new file mode 100644 index 0000000000..cdcc7b2696 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000037.anon.xml @@ -0,0 +1,93 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000037 + 2019011416122400 + + W + I + 2019011416122400 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + 0 + + + 19980814 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + 7 + + + 19980814 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000038.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000038.anon.xml new file mode 100644 index 0000000000..e168b1fb3f --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000038.anon.xml @@ -0,0 +1,112 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000038 + 2019011416123200 + + W + I + 2019011416123200 + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + 20110609 + + 19410723 + 19600509 + + + + + + + + 568cf + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000039.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000039.anon.xml new file mode 100644 index 0000000000..4c3d14b3de --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_201900000039.anon.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000039 + 2019011416124000 + + W + I + 2019011416124000 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + + + 19930618 + 19410723 + + + 3020HA + + Sequoialaan + 5 + c + + + + + 1801 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + + + 19410723 + 19600509 + + + 3020HA + + Sequoialaan + 29 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003A.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003A.anon.xml new file mode 100644 index 0000000000..9fda8fe18d --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003A.anon.xml @@ -0,0 +1,93 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003A + 2019011416124800 + + W + I + 2019011416124800 + + + + + 6763823555 + 377226361 + 8bc796 + 3 + + 534ae8f7c + 1989-08-05 + V + E + + + 19700309 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + 6763823555 + 377226361 + 8bc796 + 3 + + 534ae8f7c + 1989-08-05 + V + V + + + 19700309 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003B.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003B.anon.xml new file mode 100644 index 0000000000..3ab4c3bcd3 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003B.anon.xml @@ -0,0 +1,112 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003B + 2019011416125600 + + W + I + 2019011416125600 + + + + + 6763823555 + 377226361 + 8bc796 + 3 + + 534ae8f7c + 1989-08-05 + V + + + 19700309 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + + 6763823555 + 377226361 + 8bc796 + 3 + + 534ae8f7c + 1989-08-05 + V + + + 19700309 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + 20110609 + + 19410723 + 19600509 + + + + + + + + 8246a79 + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003C.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003C.anon.xml new file mode 100644 index 0000000000..167d795a11 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003C.anon.xml @@ -0,0 +1,112 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003C + 2019011416130400 + + W + I + 2019011416130400 + + + + + 3850536601 + 615713666 + 4357a29dd8 + 8 + + 8246a79 + 2029-04-16 + M + + + 19521113 + 19600509 + + + 3053KG + + Karel de Grotestraat + 26 + + + + + + 1801 + + + + + + 3850536601 + 615713666 + 4357a29dd8 + 8 + + 8246a79 + 2029-04-16 + M + + + 19521113 + 19600509 + + + 3053KG + + Karel de Grotestraat + 26 + + + + + + 1801 + + + + 20110609 + + 19410723 + 19600509 + + + + + + + + 534ae8f7c + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003D.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003D.anon.xml new file mode 100644 index 0000000000..5c3285a57e --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003D.anon.xml @@ -0,0 +1,131 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003D + 2019011416131200 + + W + I + 2019011416131200 + + + + + 7274687268 + 896760175 + 8b2394 1034f4 + fc + + 437138e + 1975-07-04 + M + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 19600509 + + 20290424 + 19600509 + + + + + + + + c1b36d + 1960-05-09 + + + + + + 7274687268 + 896760175 + 8b2394 1034f4 + fc + + 437138e + 1975-07-04 + M + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 20240430 + + 20290424 + 20240430 + + + + + + + + c1b36d + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003E.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003E.anon.xml new file mode 100644 index 0000000000..f40841993b --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_2/stuf-bg_20190000003E.anon.xml @@ -0,0 +1,131 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003E + 2019011416132000 + + W + I + 2019011416132000 + + + + + 2969431370 + 683962287 + 23948abf + 6 + + c1b36d + 1958-04-21 + V + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 19600509 + + 20290424 + 19600509 + + + + + + + + 437138e + 1960-05-09 + + + + + + 2969431370 + 683962287 + 23948abf + 6 + + c1b36d + 1958-04-21 + V + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 20240430 + + 20290424 + 20240430 + + + + + + + + 437138e + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_20190000003F.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_20190000003F.anon.xml new file mode 100644 index 0000000000..1071b10537 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_20190000003F.anon.xml @@ -0,0 +1,93 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000003F + 2019011417105600 + + W + I + 2019011417105600 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + 7 + + + 19980814 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + 0 + + + 19980814 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000040.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000040.anon.xml new file mode 100644 index 0000000000..7448a47022 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000040.anon.xml @@ -0,0 +1,93 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000040 + 2019011417110300 + + W + I + 2019011417110300 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + 1 + + + 19410724 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + 0 + + + 19410724 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000041.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000041.anon.xml new file mode 100644 index 0000000000..d0e3c64fc9 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000041.anon.xml @@ -0,0 +1,93 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000041 + 2019011417111100 + + W + I + 2019011417111100 + + + + + 7274687268 + 896760175 + 8b2394 1034f4 + fc + + 437138e + 1975-07-04 + M + G + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + 7274687268 + 896760175 + 8b2394 1034f4 + fc + 95 + afafb + 1975-07-04 + M + + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000042.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000042.anon.xml new file mode 100644 index 0000000000..6f3984b2c3 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000042.anon.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000042 + 2019011417111900 + + W + I + 2019011417111900 + + + + + 7128413151 + 783340266 + 16d95b5 + b + + 437138e + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + 7128413151 + 783340266 + 16d95b5 + b + 95 + afafb + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000043.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000043.anon.xml new file mode 100644 index 0000000000..5ee58e7720 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000043.anon.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000043 + 2019011417112700 + + W + I + 2019011417112700 + + + + + 3087970133 + 919965111 + bb866 + 8 + + 437138e + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + 3087970133 + 919965111 + bb866 + 8 + 95 + afafb + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000044.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000044.anon.xml new file mode 100644 index 0000000000..d11b6bbea2 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000044.anon.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000044 + 2019011417113400 + + W + I + 2019011417113400 + + + + + 6433621730 + 094368468 + 10035d + 6 + + 437138e + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + 6433621730 + 094368468 + 10035d + 6 + 95 + afafb + 1992-06-13 + V + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000045.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000045.anon.xml new file mode 100644 index 0000000000..f2ffc83530 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_3/stuf-bg_201900000045.anon.xml @@ -0,0 +1,131 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000045 + 2019011417114200 + + W + I + 2019011417114200 + + + + + 2969431370 + 683962287 + 23948abf + 6 + + c1b36d + 1958-04-21 + V + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 20240430 + + 20290424 + 20240430 + + + + + + + + 437138e + 1960-05-09 + + + + + + 2969431370 + 683962287 + 23948abf + 6 + + c1b36d + 1958-04-21 + V + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + 20240430 + + 20290424 + 20240430 + + + + + + + 95 + afafb + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000046.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000046.anon.xml new file mode 100644 index 0000000000..272e86a2d0 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000046.anon.xml @@ -0,0 +1,131 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000046 + 2019011417262200 + + W + I + 2019011417262200 + + + + + 3169200703 + 584407993 + 04c44364e2 + 5 + 970 + a5e93 c5d7 503fd0 + 2004-03-14 + V + + + 20030129 + 19600509 + + + 3019RT + + Thorbeckestraat + 5 + + + + + + 1801 + + + + 19930425 + 19600509 + + 20030129 + 19600509 + + + + + + + + 80fd77f + 1960-05-09 + + + + + + 3169200703 + 584407993 + 04c44364e2 + 5 + 970 + a5e93 c5d7 503fd0 + 2004-03-14 + V + + + 20030129 + 19600509 + + + 3019RT + + Thorbeckestraat + 5 + + + + + + 1801 + + + + 19930425 + 19410723 + + 20030129 + 19410723 + + + + + + + + 80fd77f + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000047.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000047.anon.xml new file mode 100644 index 0000000000..89f9c707ed --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000047.anon.xml @@ -0,0 +1,131 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000047 + 2019011417263000 + + W + I + 2019011417263000 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + 20110609 + 19600509 + + 19410723 + 19600509 + + + + + + + + 0f2 + 1960-05-09 + + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + 20110609 + 19410723 + + 19410723 + 19410723 + + + + + + + + 0f2 + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000048.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000048.anon.xml new file mode 100644 index 0000000000..8ea451f253 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000048.anon.xml @@ -0,0 +1,97 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000048 + 2019011417263800 + + W + I + 2019011417263800 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + 1960-05-09 + + + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + 1941-07-23 + + + + + 19410723 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000049.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000049.anon.xml new file mode 100644 index 0000000000..04f2e129cb --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000049.anon.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000049 + 2019011417264600 + + W + I + 2019011417264600 + + + + + 9406420424 + 995140038 + d96c084 + 8 + + 568cf + 1960-11-16 + V + + + 19410723 + 19410723 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 9406420424 + 995140038 + d96c084 + 8 + + 568cf + 1960-11-16 + V + + + 19410723 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 1 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004A.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004A.anon.xml new file mode 100644 index 0000000000..902e4a6099 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004A.anon.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004A + 2019011417265400 + + C + I + 2019011417265400 + + + + + 2422002328 + 637352461 + 818b + 5 + 95 + 20f + 1977-10-13 + M + + + 19991023 + 19600509 + + + 2713PA + + Mañanalaan + 95 + + + + + + 1801 + + + + + 2422002328 + 637352461 + 818b + 5 + 95 + 20f + 1977-10-13 + M + + + 19991023 + 19600509 + + + 2713PA + + Mañanalaan + 95 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004B.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004B.anon.xml new file mode 100644 index 0000000000..afb3053046 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004B.anon.xml @@ -0,0 +1,93 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004B + 2019011417270200 + + W + I + 2019011417270200 + + + + + 8844739345 + 440019134 + bf4d d6bd9 28575 + d47 + + 33bdf4 + 2020-07-17 + V + 1801 + + + 19920128 + 19410723 + + + 2724SK + + Lissenvaart + 51 + + + + + + 1801 + + + + + 8844739345 + 440019134 + bf4d d6bd9 28575 + d47 + + 33bdf4 + 2020-07-17 + V + 1802 + + + 19410723 + 19600509 + + + 7684KI + + Apeldoornseweg + 83 + + + + + + 1802 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004C.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004C.anon.xml new file mode 100644 index 0000000000..1b7f027b3e --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004C.anon.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004C + 2019011417271000 + + W + I + 2019011417271000 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + + + 19980814 + 19410723 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + + + 19410723 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 1 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004D.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004D.anon.xml new file mode 100644 index 0000000000..fbc4d8f916 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004D.anon.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004D + 2019011417271800 + + W + I + 2019011417271800 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + + + 19410724 + 19410723 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + + + 19410723 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 1 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004E.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004E.anon.xml new file mode 100644 index 0000000000..cefd9eca49 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004E.anon.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004E + 2019011417272600 + + W + I + 2019011417272600 + + + + + 8222536691 + 398069336 + d01926a + d + + 3879b76c + 1989-07-11 + V + + + 19890711 + 19410723 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 8222536691 + 398069336 + d01926a + d + + 3879b76c + 1989-07-11 + V + + + 19410723 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 1 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004F.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004F.anon.xml new file mode 100644 index 0000000000..aca25fa7d2 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_20190000004F.anon.xml @@ -0,0 +1,131 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000004F + 2019011417273400 + + W + I + 2019011417273400 + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + 20110609 + 19600509 + + 19410723 + 19600509 + + + + + + + + 568cf + 1960-05-09 + + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + 20110609 + 19410723 + + 19410723 + 19410723 + + + + + + + + 568cf + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000050.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000050.anon.xml new file mode 100644 index 0000000000..530432ac57 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000050.anon.xml @@ -0,0 +1,97 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000050 + 2019011417274200 + + W + I + 2019011417274200 + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + 1960-05-09 + + + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + 1941-07-23 + + + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000051.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000051.anon.xml new file mode 100644 index 0000000000..8d8355b039 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_mutaties_serie_4/stuf-bg_201900000051.anon.xml @@ -0,0 +1,97 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000051 + 2019011417275000 + + W + I + 2019011417275000 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + 1960-05-09 + + + + + 19410723 + 19600509 + + + 3020HA + + Sequoialaan + 29 + + + + + + 1801 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + 1941-07-23 + + + + + 19410723 + 19600509 + + + 3020HA + + Sequoialaan + 29 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000000.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000000.anon.xml new file mode 100644 index 0000000000..e57eefdda3 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000000.anon.xml @@ -0,0 +1,86 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000000 + 2019011415491600 + + T + I + 2019011415491600 + + + + + 1153283835 + 195616527 + + + + 59de7 83 e01b 58 9812b + 1996-10-08 + V + 0 + 1801 + + E + + + 19850330 + 19600509 + + + 2571AA + + v Voerst v Lyndenstr + 10 + + + + + + 1801 + + + + 20050811 + + 19410813 + 19600509 + + + + + + + + 84c97b1e + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000001.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000001.anon.xml new file mode 100644 index 0000000000..488b22af31 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000001.anon.xml @@ -0,0 +1,86 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000001 + 2019011415492400 + + T + I + 2019011415492400 + + + + + 2861888781 + 093735639 + dd75d5981 231e5 + cf + + d34ce8 + 1958-06-21 + V + 0 + 1801 + + V + + + 19381011 + 19600509 + + + 2593BP + + Laan v Nieuw Oost-Indië + 210 + + + + + + 1801 + + + + 20190115 + + 19600509 + 20190115 + + + + + + + 51a + 00d5d + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000002.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000002.anon.xml new file mode 100644 index 0000000000..1399ef51f9 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000002.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000002 + 2019011415493200 + + T + I + 2019011415493200 + + + + + 7128413151 + 783340266 + 16d95b5 + b + + 437138e + 1992-06-13 + V + 0 + 1801 + E + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000003.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000003.anon.xml new file mode 100644 index 0000000000..700a44d61b --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000003.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000003 + 2019011415494000 + + T + I + 2019011415494000 + + + + + 0814678270 + 497919104 + e24e2 + 5 + + 3879b76c + 1941-07-24 + V + 0 + 1801 + E + + + 19410724 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000004.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000004.anon.xml new file mode 100644 index 0000000000..14ace82dd9 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000004.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000004 + 2019011415494800 + + T + I + 2019011415494800 + + + + + 8222536691 + 398069336 + d01926a + d + + 3879b76c + 1989-07-11 + V + 0 + 1801 + E + + + 19890711 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000005.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000005.anon.xml new file mode 100644 index 0000000000..920834b735 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000005.anon.xml @@ -0,0 +1,86 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000005 + 2019011415495700 + + T + I + 2019011415495700 + + + + + 3169200703 + 584407993 + 04c44364e2 + 5 + 970 + a5e93 c5d7 503fd0 + 2004-03-14 + V + 0 + JV + 1801 + E + + + 20030129 + 19600509 + + + 3019RT + + Thorbeckestraat + 5 + + + + + + 1801 + + + + 19930425 + + 20030129 + 19600509 + + + + + + + + 80fd77f + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000006.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000006.anon.xml new file mode 100644 index 0000000000..328eac9b5e --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000006.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000006 + 2019011415500500 + + T + I + 2019011415500500 + + + + + 0491849700 + 917760778 + d5eef8 + 8 + + e8da590 + 1997-05-29 + V + 0 + 1801 + E + + + 19970529 + 19600509 + + + 1011RE + + Jonas Daniël Meijerplein + 11 + A + III + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000007.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000007.anon.xml new file mode 100644 index 0000000000..5aebee2d4e --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000007.anon.xml @@ -0,0 +1,85 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000007 + 2019011415501300 + + T + I + 2019011415501300 + + + + + 3156735539 + 242708704 + 2b77f2e + 0 + 8a8 + ae0d2b1 + 2008-06-04 + V + 0 + 1801 + E + + + 20130616 + 19600509 + + + 2724SK + + Lissenvaart + 51 + + + + + + 1801 + + + + 19410516 + + 19600509 + 19410516 + + + + + + + 2d + 6687d + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000008.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000008.anon.xml new file mode 100644 index 0000000000..0a4dda3dfd --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000008.anon.xml @@ -0,0 +1,85 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000008 + 2019011415502100 + + T + I + 2019011415502100 + + + + + 9221555535 + 065596429 + 9e961 + 6 + + 71525c823 + 2015-08-19 + M + 0 + 1801 + E + + + 20270322 + 19600509 + + + 2710SR + + Achterbergweg + 15 + + + + + + 1801 + + + + 19780310 + + 20270322 + 19600509 + + + + + + + + c8cf7e + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000009.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000009.anon.xml new file mode 100644 index 0000000000..b8d277af7a --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000009.anon.xml @@ -0,0 +1,67 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000009 + 2019011415502900 + + T + I + 2019011415502900 + + + + + 4190218146 + 237931115 + fd9c6c + 5 + + fea619c9c + 1970-10-27 + M + 0 + 1801 + + E + + + 20020102 + 19600509 + + + 1425SG + + Gen Karel vd Heydenln + 43 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000A.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000A.anon.xml new file mode 100644 index 0000000000..76f41f3458 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000A.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000A + 2019011415503700 + + T + I + 2019011415503700 + + + + + 1913118637 + 306472837 + f0365 + 6 + + 534ae8f7c + 1987-09-06 + M + 0 + 1801 + E + + + 19870906 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000B.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000B.anon.xml new file mode 100644 index 0000000000..f52f852e76 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000B.anon.xml @@ -0,0 +1,85 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000B + 2019011415504500 + + T + I + 2019011415504500 + + + + + 8844739345 + 440019134 + bf4d d6bd9 28575 + d47 + + 33bdf4 + 2020-07-17 + V + 0 + 1801 + E + + + 19920128 + 19600509 + + + 2724SK + + Lissenvaart + 51 + + + + + + 1801 + + + + 20171006 + + 19600509 + 20171006 + + + + + + + 95 + d4fe9 + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000C.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000C.anon.xml new file mode 100644 index 0000000000..87c5e6f666 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000C.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000C + 2019011415505200 + + T + I + 2019011415505200 + + + + + 3087970133 + 919965111 + bb866 + 8 + + 437138e + 1992-06-13 + V + 0 + 1801 + E + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000D.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000D.anon.xml new file mode 100644 index 0000000000..8f20c53953 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000D.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000D + 2019011415510000 + + T + I + 2019011415510000 + + + + + 9406420424 + 995140038 + d96c084 + 8 + + 568cf + 1960-11-16 + V + 0 + 1801 + E + + + 19601116 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000E.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000E.anon.xml new file mode 100644 index 0000000000..231792cf85 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000E.anon.xml @@ -0,0 +1,85 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000E + 2019011415510800 + + T + I + 2019011415510800 + + + + + 9304800390 + 734784828 + b3e e181d8c + 3e + + 80fd77f + 2005-07-28 + M + 0 + 1801 + E + + + 20210612 + 19600509 + + + 3019RT + + Thorbeckestraat + 5 + + + + + + 1801 + + + + 19930425 + + 20030129 + 19600509 + + + + + + + 970 + a5e93 c5d7 503fd0 + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000F.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000F.anon.xml new file mode 100644 index 0000000000..ee6600228b --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000000F.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000000F + 2019011415511600 + + T + I + 2019011415511600 + + + + + 3608087947 + 698393536 + 38d8aa + f + + 2c56 + 1986-05-12 + M + 0 + 1801 + E + + + 19860512 + 19600509 + + + 2712AD + + Zuidstraat + 13 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000010.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000010.anon.xml new file mode 100644 index 0000000000..17fecc3518 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000010.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000010 + 2019011415512400 + + T + I + 2019011415512400 + + + + + 2678967915 + 355960378 + c9b5d70 + 0 + + 3879b76c + 1998-08-14 + V + 0 + 1801 + E + + + 19980814 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000011.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000011.anon.xml new file mode 100644 index 0000000000..60cc232782 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000011.anon.xml @@ -0,0 +1,85 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000011 + 2019011415513200 + + T + I + 2019011415513200 + + + + + 4075079129 + 402988237 + 354f + 6 + + 2c56 + 1943-07-28 + M + 0 + 1801 + E + + + 19501118 + 19600509 + + + 2712AD + + Zuidstraat + 13 + + + + + + 1801 + + + + 19850328 + + 19600516 + 19600509 + + + + + + + + b0ebc + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000012.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000012.anon.xml new file mode 100644 index 0000000000..5f325237fb --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000012.anon.xml @@ -0,0 +1,85 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000012 + 2019011415514000 + + T + I + 2019011415514000 + + + + + 0549847258 + 035308385 + f9478bdc + 0 + + c8cf7e + 2010-09-14 + V + 0 + 1801 + V + + + 20270322 + 19600509 + + + 2710SR + + Achterbergweg + 15 + + + + + + 1801 + + + + 19780310 + + 20270322 + 19600509 + + + + + + + + 71525c823 + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000013.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000013.anon.xml new file mode 100644 index 0000000000..a1cb1e8ddc --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000013.anon.xml @@ -0,0 +1,67 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000013 + 2019011415514800 + + T + I + 2019011415514800 + + + + + 0593074166 + 363367574 + 2cfd1bf6c + 5 + b7 + 67425 + 2005-02-21 + V + 0 + 1801 + + E + + + 19800206 + 19600509 + + + 3020TF + + Bakenessegracht + 37 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000014.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000014.anon.xml new file mode 100644 index 0000000000..91e3e5da8c --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000014.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000014 + 2019011415515600 + + T + I + 2019011415515600 + + + + + 2842897910 + 017434635 + 390fe + 0 + + 0f2 + 2025-05-25 + V + 0 + 1801 + E + + + 19450427 + 19600509 + + + 2753WG + + Wilgenlaan + 4 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000015.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000015.anon.xml new file mode 100644 index 0000000000..cb0c597d0f --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000015.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000015 + 2019011415520500 + + T + I + 2019011415520500 + + + + + 1412016204 + 323607784 + 2ec80 + 6 + + 7bebb51ebe49 + 1974-02-27 + M + 0 + 1801 + E + + + 19790414 + 19600509 + + + 2700KM + + Curaçaostraat + 28 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000016.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000016.anon.xml new file mode 100644 index 0000000000..652f1d1236 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000016.anon.xml @@ -0,0 +1,87 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000016 + 2019011415521200 + + T + I + 2019011415521200 + + + + + 7274687268 + 896760175 + 8b2394 1034f4 + fc + + 437138e + 1975-07-04 + M + 0 + G + 1801 + + E + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + + 20290424 + 19600509 + + + + + + + + c1b36d + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000017.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000017.anon.xml new file mode 100644 index 0000000000..bd53f90a5c --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000017.anon.xml @@ -0,0 +1,67 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000017 + 2019011415522000 + + T + I + 2019011415522000 + + + + + 1318579222 + 030941790 + 84827c4d06e85a77 + 7 + + 6284224 + 1940-05-18 + V + 0 + 1801 + + E + + + 19990621 + 19600509 + + + 1064BH + + Burgemeester Röellstraat + 31 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000018.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000018.anon.xml new file mode 100644 index 0000000000..3a04fd13f7 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000018.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000018 + 2019011415522800 + + T + I + 2019011415522800 + + + + + 6433621730 + 094368468 + 10035d + 6 + + 437138e + 1992-06-13 + V + 0 + 1801 + E + + + 19920613 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000019.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000019.anon.xml new file mode 100644 index 0000000000..332c50a864 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000019.anon.xml @@ -0,0 +1,93 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000019 + 2019011415523600 + + T + I + 2019011415523600 + + + + + 5512727045 + 455478156 + a0edec840 2dd6bf36 f4237bed26 a55464192 77c87ab9d2 + b8c22 + 970 + a5e93 c5d7 503fd0 + 2004-11-06 + M + 0 + B + 1801 + + + 20070605 + E + + + 20031118 + 19600509 + + + + + + + + + + + + + + + + + + + + 19820511 + + 20000513 + 19600509 + + + + + + + 74f 97f + 5ad + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001A.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001A.anon.xml new file mode 100644 index 0000000000..67575eb30a --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001A.anon.xml @@ -0,0 +1,86 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001A + 2019011415524400 + + T + I + 2019011415524400 + + + + + 2969431370 + 683962287 + 23948abf + 6 + + c1b36d + 1958-04-21 + V + 0 + 1801 + + E + + + 19561007 + 19600509 + + + 3019RP + + Piersonstraat + 7 + + + + + + 1801 + + + + 19810909 + + 20290424 + 19600509 + + + + + + + + 437138e + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001B.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001B.anon.xml new file mode 100644 index 0000000000..4b033e483d --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001B.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001B + 2019011415525200 + + T + I + 2019011415525200 + + + + + 3850536601 + 615713666 + 4357a29dd8 + 8 + + 8246a79 + 2029-04-16 + M + 0 + 1801 + E + + + 19521113 + 19600509 + + + 3053KG + + Karel de Grotestraat + 26 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001C.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001C.anon.xml new file mode 100644 index 0000000000..d0a9f22a9b --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001C.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001C + 2019011415530000 + + T + I + 2019011415530000 + + + + + 7674337126 + 749421371 + a85deb0a1 + 6 + + 71525c823 + 2008-01-08 + V + 0 + 1801 + E + + + 20080108 + 19600509 + + + 2710SR + + Achterbergweg + 15 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001D.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001D.anon.xml new file mode 100644 index 0000000000..5cd8e598d7 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001D.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001D + 2019011415530800 + + T + I + 2019011415530800 + + + + + 8157901140 + 567143730 + 6bd6ff + 8 + + e8da590 + 1997-05-29 + V + 0 + 1801 + E + + + 19970529 + 19600509 + + + 1011RE + + Jonas Daniël Meijerplein + 11 + A + III + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001E.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001E.anon.xml new file mode 100644 index 0000000000..19f43af2b7 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001E.anon.xml @@ -0,0 +1,67 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001E + 2019011415531600 + + T + I + 2019011415531600 + + + + + 9100673820 + 821030777 + be6ea8 + 0 + + 5fb75f1 + 1986-08-19 + V + 0 + 1801 + + E + + + 19390312 + 19600509 + + + 2497BX + + Jonkheer van Riemsdijkln + 41 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001F.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001F.anon.xml new file mode 100644 index 0000000000..bd65afbf4b --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_20190000001F.anon.xml @@ -0,0 +1,87 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 20190000001F + 2019011415532300 + + T + I + 2019011415532300 + + + + + 5396163489 + 677924762 + c57e226 + 6 + + d6231 + 2027-06-16 + V + 0 + PS + 1802 + + E + + + 20000227 + 19600509 + + + + + + + + + + Onder de Belvédère a/d Groenegracht + + 1802 + + + + 19541015 + + 19600509 + 19541015 + + + + + + + b7 + 67425 + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000020.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000020.anon.xml new file mode 100644 index 0000000000..6c15ae7783 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000020.anon.xml @@ -0,0 +1,87 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000020 + 2019011415533100 + + T + I + 2019011415533100 + + + + + 8475834889 + 932870521 + 394de4b + e + + d6231 + 2027-06-16 + V + 0 + PS + 1802 + + E + + + 19800206 + 19600509 + + + 2727FM + + Thorbeckegracht + 53 + + + + + + 1802 + + + + 19541015 + + 19600509 + 19541015 + + + + + + + b7 + 67425 + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000021.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000021.anon.xml new file mode 100644 index 0000000000..226b89246d --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000021.anon.xml @@ -0,0 +1,67 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000021 + 2019011415533900 + + T + I + 2019011415533900 + + + + + 2625854460 + 976900187 + 5c5 + 6 + 95 + 952f9c9ff + 1988-06-03 + M + 7 + 1802 + + E + + + 20210328 + 19600509 + + + 2727FM + + Thorbeckegracht + 73 + + + + + + 1802 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000022.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000022.anon.xml new file mode 100644 index 0000000000..ad0c101a9b --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000022.anon.xml @@ -0,0 +1,85 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000022 + 2019011415534700 + + T + I + 2019011415534700 + + + + + 9641459515 + 082806973 + d62ab + 5 + + b0ebc + 1974-10-23 + V + 0 + 1801 + V + + + 19451120 + 19600509 + + + 2712AD + + Zuidstraat + 13 + + + + + + 1801 + + + + 19850328 + + 19600516 + 19600509 + + + + + + + + 2c56 + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000023.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000023.anon.xml new file mode 100644 index 0000000000..61260c599d --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000023.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000023 + 2019011415535500 + + T + I + 2019011415535500 + + + + + 6763823555 + 377226361 + 8bc796 + 3 + + 534ae8f7c + 1989-08-05 + V + 0 + 1801 + E + + + 19700309 + 19600509 + + + 1785LG + + A M v Voorthuijsenstr + 23 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000024.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000024.anon.xml new file mode 100644 index 0000000000..138599ab1e --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000024.anon.xml @@ -0,0 +1,85 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000024 + 2019011415540300 + + T + I + 2019011415540300 + + + + + 2422002328 + 637352461 + 818b + 5 + 95 + 20f + 1977-10-13 + M + 0 + 1801 + E + + + 19991023 + 19600509 + + + 2713PA + + Mañanalaan + 95 + + + + + + 1801 + + + + 19360703 + + 19600509 + 19360703 + + + + + + + 95 + d4fe9 + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000025.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000025.anon.xml new file mode 100644 index 0000000000..22466b6127 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000025.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000025 + 2019011415541000 + + T + I + 2019011415541000 + + + + + 7423586859 + 955 + 1989c7 + 7 + 970 + d0d536 + 2005-03-20 + V + 0 + 1801 + E + + + 20230120 + 19600509 + + + 8073KS + + van Speykstraat + 52 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000026.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000026.anon.xml new file mode 100644 index 0000000000..dc36f6e654 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000026.anon.xml @@ -0,0 +1,86 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000026 + 2019011415541800 + + T + I + 2019011415541800 + + + + + 0789721340 + 606117644 + c14d5 + 0 + + c58b867 + 1964-02-09 + V + 0 + 1801 + + E + + + 20240627 + 19600509 + + + 3020RV + + Markt + 4 + + + + + + 1801 + + + + 20190204 + + 19600509 + 20190204 + + + + + + + + 9296df2fb + 1960-05-09 + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000027.anon.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000027.anon.xml new file mode 100644 index 0000000000..fa6b426bc9 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/StUF_XML_vulberichten/stuf-bg_201900000027.anon.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000027 + 2019011415542600 + + T + I + 2019011415542600 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + 0 + 1801 + E + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/toevoeging.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/toevoeging.xml new file mode 100644 index 0000000000..fa6b426bc9 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/toevoeging.xml @@ -0,0 +1,66 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000027 + 2019011415542600 + + T + I + 2019011415542600 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + 0 + 1801 + E + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_aanpassing.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_aanpassing.xml new file mode 100644 index 0000000000..8c8a22393e --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_aanpassing.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000033 + 2019011416115200 + + W + I + 2019011416115200 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Roemeenmanweg + 22 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_geenWaarde.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_geenWaarde.xml new file mode 100644 index 0000000000..53968ecaa2 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_geenWaarde.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000033 + 2019011416115200 + + W + I + 2019011416115200 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + + + + 19960304 + 19600509 + + + 2767GP + + Roemeenmanweg + 22 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_gevuldveldleeg.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_gevuldveldleeg.xml new file mode 100644 index 0000000000..cb5cd185d7 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_gevuldveldleeg.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000033 + 2019011416115200 + + W + I + 2019011416115200 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + + + + 19960304 + 19600509 + + + 2767GP + + Roemeenmanweg + 22 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_nietmeesturen_ongeauthoriseerd.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_nietmeesturen_ongeauthoriseerd.xml new file mode 100644 index 0000000000..9809aa530f --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_nietmeesturen_ongeauthoriseerd.xml @@ -0,0 +1,91 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000033 + 2019011416115200 + + W + I + 2019011416115200 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + + + + 19960304 + 19600509 + + + 2767GP + + Roemeenmanweg + 22 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_waardeonbekend_geenelement.xml b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_waardeonbekend_geenelement.xml new file mode 100644 index 0000000000..c124192a58 --- /dev/null +++ b/brmo-stufbg204/src/test/resources/testdata-tnt/mergetest/wijziging_waardeonbekend_geenelement.xml @@ -0,0 +1,90 @@ + + + + + + + + Lk01 + PRS + BG + 0204 + 0204 + + tent + Competent-StUF + + + DeDommel + B3Partners + + 201900000033 + 2019011416115200 + + W + I + 2019011416115200 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + M + + + 19960304 + 19600509 + + + 2767GP + + Poolmanweg + 22 + + + + + + 1801 + + + + + 3056876036 + 902215443 + 7f74d7 + 5 + + 568cf + 2003-01-15 + + + 19960304 + 19600509 + + + 2767GP + + Roemeenmanweg + 22 + + + + + + 1801 + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/tomcatconf/testcontext.oracle.xml b/brmo-stufbg204/src/test/tomcatconf/testcontext.oracle.xml new file mode 100644 index 0000000000..cd872ac685 --- /dev/null +++ b/brmo-stufbg204/src/test/tomcatconf/testcontext.oracle.xml @@ -0,0 +1,45 @@ + + + + + + + + \ No newline at end of file diff --git a/brmo-stufbg204/src/test/tomcatconf/testcontext.xml b/brmo-stufbg204/src/test/tomcatconf/testcontext.xml new file mode 100644 index 0000000000..8b40a214a8 --- /dev/null +++ b/brmo-stufbg204/src/test/tomcatconf/testcontext.xml @@ -0,0 +1,45 @@ + + + + + + + + diff --git a/pom.xml b/pom.xml index c621f6aa98..6872d36f91 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 3.6.10.Final 22.0 - 4.0 + 4.1 1.16.1 7.1.8 42.2.8