Remove JAXB and XML, use GSON for JSON

This review converst apex-pdp to use GSON for JSON handling. In order to
preserve backward compatibility with the JAXB format of JSON, custom
handling of maps was required. Therefore, the policy-common
StandardCoder could not be used.

There are a lot of small changes, removing annotations from concepts and
tweaking of test data. However, this cleans up the code base so it is
worth doing.

Issue-ID: POLICY-1820
Change-Id: I213fa64f6d7f3f1df8d10f111d9fbedbe80f9fe0
Signed-off-by: liamfallon <liam.fallon@est.tech>

9 files changed, 0 insertions, 1128 deletions

diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/Apex2XmlEventConverter.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/Apex2XmlEventConverter.java
deleted file mode 100644
index 907d426e7..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/Apex2XmlEventConverter.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2021-2022 Bell Canada. All rights reserved.
- *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.plugins.event.protocol.xml;
-
-import java.io.ByteArrayInputStream;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map.Entry;
-import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.SchemaFactory;
-import org.onap.policy.apex.plugins.event.protocol.xml.jaxb.ObjectFactory;
-import org.onap.policy.apex.plugins.event.protocol.xml.jaxb.XMLApexEvent;
-import org.onap.policy.apex.plugins.event.protocol.xml.jaxb.XMLApexEventData;
-import org.onap.policy.apex.service.engine.event.ApexEvent;
-import org.onap.policy.apex.service.engine.event.ApexEventException;
-import org.onap.policy.apex.service.engine.event.ApexEventProtocolConverter;
-import org.onap.policy.apex.service.engine.event.ApexEventRuntimeException;
-import org.onap.policy.apex.service.parameters.eventprotocol.EventProtocolParameters;
-import org.onap.policy.common.utils.resources.ResourceUtils;
-import org.xml.sax.SAXException;
-
-/**
- * The Class Apex2XMLEventConverter converts {@link ApexEvent} instances into string instances of {@link XMLApexEvent}
- * that are XML representations of Apex events defined in JAXB.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public final class Apex2XmlEventConverter implements ApexEventProtocolConverter {
-
-    private static final String MODEL_SCHEMA_NAME = "xml/apex-event.xsd";
-
-    // XML Unmarshaller and marshaller and object factory for events
-    private Unmarshaller unmarshaller;
-    private Marshaller marshaller;
-    private ObjectFactory objectFactory = new ObjectFactory();
-
-    /**
-     * Constructor to create the Apex to XML converter.
-     *
-     * @throws ApexEventException the apex event exception
-     */
-    public Apex2XmlEventConverter() throws ApexEventException {
-        try {
-            final var schemaUrl = ResourceUtils.getUrlResource(MODEL_SCHEMA_NAME);
-            final var apexEventSchema =
-                    SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI).newSchema(schemaUrl);
-
-            final var jaxbContext = JAXBContext.newInstance(XMLApexEvent.class);
-
-            // Set up the unmarshaller to carry out validation
-            unmarshaller = jaxbContext.createUnmarshaller();
-            unmarshaller.setEventHandler(new javax.xml.bind.helpers.DefaultValidationEventHandler());
-            unmarshaller.setSchema(apexEventSchema);
-
-            // Set up the marshaller
-            marshaller = jaxbContext.createMarshaller();
-            marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-            marshaller.setSchema(apexEventSchema);
-        } catch (JAXBException | SAXException e) {
-            throw new ApexEventException("Unable to set up marshalling and unmarshalling for XML events", e);
-        }
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public void init(final EventProtocolParameters parameters) {
-        // No initialization necessary on this class
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public List<ApexEvent> toApexEvent(final String eventName, final Object eventObject) throws ApexEventException {
-        // Check the XML event
-        if (eventObject == null) {
-            throw new ApexEventException("event processing failed, XML event is null");
-        }
-
-        // Cast the event to a string, if our conversion is correctly configured, this cast should always work
-        String xmlEventString = null;
-        try {
-            xmlEventString = (String) eventObject;
-        } catch (final Exception e) {
-            final String errorMessage = "error converting event \"" + eventObject + "\" to a string";
-            throw new ApexEventRuntimeException(errorMessage, e);
-        }
-
-        // The XML event
-        XMLApexEvent xmlApexEvent = null;
-
-        // Use JAXB to read and verify the event from the XML string
-        try {
-            final var source = new StreamSource(new ByteArrayInputStream(xmlEventString.getBytes()));
-            final JAXBElement<XMLApexEvent> rootElement = unmarshaller.unmarshal(source, XMLApexEvent.class);
-            xmlApexEvent = rootElement.getValue();
-        } catch (final JAXBException e) {
-            throw new ApexEventException("Unable to unmarshal Apex XML event\n" + xmlEventString, e);
-        }
-
-        // Create the Apex event
-        // FIXME: Introduce new AxEvent field for APEX to Xml conversion
-        final var apexEvent = new ApexEvent(xmlApexEvent.getName(), xmlApexEvent.getVersion(),
-                xmlApexEvent.getNameSpace(), xmlApexEvent.getSource(), xmlApexEvent.getTarget(), "");
-
-        // Set the data on the apex event
-        for (final XMLApexEventData xmlData : xmlApexEvent.getData()) {
-            apexEvent.put(xmlData.getKey(), xmlData.getValue());
-        }
-
-        // Return the event in a single element
-        final ArrayList<ApexEvent> eventList = new ArrayList<>();
-        eventList.add(apexEvent);
-        return eventList;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public String fromApexEvent(final ApexEvent apexEvent) throws ApexEventException {
-        // Check the Apex event
-        if (apexEvent == null) {
-            throw new ApexEventException("event processing failed, Apex event is null");
-        }
-
-        // Get the Apex event data
-        final List<XMLApexEventData> xmlDataList = new ArrayList<>();
-
-        try {
-            for (final Entry<String, Object> apexDataEntry : apexEvent.entrySet()) {
-                // Add an XML event data item
-                if (apexDataEntry.getValue() != null) {
-                    xmlDataList.add(new XMLApexEventData(apexDataEntry.getKey(), apexDataEntry.getValue().toString()));
-                } else {
-                    xmlDataList.add(new XMLApexEventData(apexDataEntry.getKey(), ""));
-                }
-            }
-        } catch (final Exception e) {
-            throw new ApexEventException("Unable to transfer Apex event data to XML\n" + apexEvent, e);
-        }
-
-        // Create the XML event
-        final var xmlApexEvent = new XMLApexEvent(apexEvent.getName(), apexEvent.getVersion(),
-                apexEvent.getNameSpace(), apexEvent.getSource(), apexEvent.getTarget(), xmlDataList);
-
-        // Write the event into a DOM document
-        try {
-            // Marshal the event into XML
-            final var writer = new StringWriter();
-            marshaller.marshal(objectFactory.createXmlApexEvent(xmlApexEvent), writer);
-
-            // Return the event as XML in a string
-            return writer.toString();
-        } catch (final JAXBException e) {
-            throw new ApexEventException("Unable to unmarshal Apex event to XML\n" + apexEvent, e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventProtocolParameters.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventProtocolParameters.java
deleted file mode 100644
index 143669db1..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventProtocolParameters.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.plugins.event.protocol.xml;
-
-import org.onap.policy.apex.service.parameters.eventprotocol.EventProtocolTextTokenDelimitedParameters;
-
-/**
- * Event protocol parameters for XML as an event protocol.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class XmlEventProtocolParameters extends EventProtocolTextTokenDelimitedParameters {
-    /** The label of this carrier technology. */
-    public static final String XML_EVENT_PROTOCOL_LABEL = "XML";
-
-    // Constants for the text delimiter token
-    private static final String XML_TEXT_DELIMITER_TOKEN = "<?xml";
-
-    /**
-     * Constructor to create a JSON event protocol parameter instance and register the instance with the parameter
-     * service.
-     */
-    public XmlEventProtocolParameters() {
-        super();
-
-        // Set the event protocol properties for the XML event protocol
-        this.setLabel(XML_EVENT_PROTOCOL_LABEL);
-
-        // Set the starting and ending delimiters for text blocks of XML events
-        this.setStartDelimiterToken(XML_TEXT_DELIMITER_TOKEN);
-
-        // Set the event protocol plugin class
-        this.setEventProtocolPluginClass(Apex2XmlEventConverter.class.getName());
-    }
-}
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/package-info.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/package-info.java
deleted file mode 100644
index 4f972657f..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/package-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-/**
- * Contains the implementation of the APEX event protocol converter plugin for events in XML format.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-package org.onap.policy.apex.plugins.event.protocol.xml;
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/resources/xml/apex-event.xjb b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/resources/xml/apex-event.xjb
deleted file mode 100644
index fa334c413..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/resources/xml/apex-event.xjb
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2016-2018 Ericsson. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<jaxb:bindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:annox="http://annox.dev.java.net"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd"
-	version="2.1">
-
-	<!--jaxb:globalBindings generateIsSetMethod="true">
-		<xjc:serializable uid="1" />
-		<xjc:javaType name="java.lang.String" xmlType="xs:string"
-			adapter="org.onap.policy.apex.core.model.xml.StringTrimAdapter" />
-	</jaxb:globalBindings-->
-
-	<jaxb:bindings schemaLocation="apex-event.xsd" node="/xs:schema">
-		<jaxb:bindings node="xs:complexType[@name='XMLApexEvent']"> <annox:annotate> 
-			<annox:annotate annox:class="java.lang.SuppressWarnings" value="all" /> </annox:annotate> 
-			</jaxb:bindings>
-	</jaxb:bindings>
-</jaxb:bindings>
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/resources/xml/apex-event.xsd b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/resources/xml/apex-event.xsd
deleted file mode 100644
index c8314550a..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/resources/xml/apex-event.xsd
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2016-2018 Ericsson. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<schema targetNamespace="http://www.onap.org/policy/apex-pdp/apexevent" elementFormDefault="qualified"
-    xmlns="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    xmlns:basic="http://jaxb2-commons.dev.java.net/basic"
-    xmlns:copyable="http://jaxb2-commons.dev.java.net/basic/copyable"
-    xmlns:equals="http://jaxb2-commons.dev.java.net/basic/equals"
-    xmlns:hashCode="http://jaxb2-commons.dev.java.net/basic/hashCode"
-    xmlns:mergeable="http://jaxb2-commons.dev.java.net/basic/mergeable"
-    xmlns:toString="http://jaxb2-commons.dev.java.net/basic/toString"
-    jaxb:extensionBindingPrefixes="xjc basic copyable equals hashCode mergeable toString"
-    xmlns:apexev="http://www.onap.org/policy/apex-pdp/apexevent" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-    jaxb:version="2.0">
-
-    <annotation>
-        <documentation>An event that comes into or is emitted out of an Apex system.
-        </documentation>
-    </annotation>
-
-    <annotation>
-        <appinfo>
-            <jaxb:globalBindings generateIsSetMethod="true">
-                <xjc:serializable uid="1" />
-            </jaxb:globalBindings>
-        </appinfo>
-    </annotation>
-
-    <complexType name="XMLApexEvent">
-        <annotation>
-            <documentation>An event that comes into or goes out of an Apex system</documentation>
-        </annotation>
-        <sequence>
-            <element name="name" maxOccurs="1" minOccurs="1">
-                <simpleType>
-                    <restriction base="string">
-                        <pattern value="[A-Za-z0-9\-_:]+"></pattern>
-                    </restriction>
-                </simpleType>
-            </element>
-            <element name="version" maxOccurs="1" minOccurs="1">
-                <simpleType>
-                    <restriction base="string">
-                        <pattern value="[0-9.]+"></pattern>
-                    </restriction>
-                </simpleType>
-            </element>
-            <element name="nameSpace" maxOccurs="1" minOccurs="1">
-                <simpleType>
-                    <restriction base="string">
-                        <minLength value="1"></minLength>
-                    </restriction>
-                </simpleType>
-            </element>
-            <element name="source" maxOccurs="1" minOccurs="0">
-                <simpleType>
-                    <restriction base="string">
-                        <minLength value="0"></minLength>
-                    </restriction>
-                </simpleType>
-            </element>
-            <element name="target" maxOccurs="1" minOccurs="0">
-                <simpleType>
-                    <restriction base="string">
-                        <minLength value="0"></minLength>
-                    </restriction>
-                </simpleType>
-            </element>
-            <element name="data" type="apexev:XMLApexEventData" maxOccurs="unbounded" minOccurs="0">
-            </element>
-        </sequence>
-    </complexType>
-
-    <element name="xmlApexEvent" type="apexev:XMLApexEvent"></element>
-
-    <complexType name="XMLApexEventData">
-        <annotation>
-            <documentation>
-                A single data item of an Apex event.
-            </documentation>
-        </annotation>
-        <sequence>
-            <element name="key" maxOccurs="1" minOccurs="1">
-                <simpleType>
-                    <restriction base="string">
-                        <pattern value="[A-Za-z0-9\-_:]+"></pattern>
-                    </restriction>
-                </simpleType>
-            </element>
-            <element name="value" maxOccurs="1" minOccurs="1">
-                <simpleType>
-                    <restriction base="string">
-                        <minLength value="0"></minLength>
-                    </restriction>
-                </simpleType>
-            </element>
-        </sequence>
-    </complexType>
-
-
-</schema>
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventGenerator.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventGenerator.java
deleted file mode 100644
index 9c8696c6c..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventGenerator.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.plugins.event.protocol.xml;
-
-import java.util.Random;
-import lombok.Getter;
-
-/**
- * The Class XmlEventGenerator.
- */
-public class XmlEventGenerator {
-    @Getter
-    private static int nextEventNo = 0;
-
-    /**
-     * Xml events.
-     *
-     * @param eventCount the event count
-     * @return the string
-     */
-    public static String xmlEvents(final int eventCount) {
-        final StringBuilder builder = new StringBuilder();
-
-        for (int i = 0; i < eventCount; i++) {
-            if (i > 0) {
-                builder.append("\n");
-            }
-            builder.append(xmlEvent());
-        }
-
-        return builder.toString();
-    }
-
-    /**
-     * Xml event.
-     *
-     * @return the string
-     */
-    public static String xmlEvent() {
-        final Random rand = new Random();
-
-        final StringBuilder builder = new StringBuilder();
-
-        int nextEventNo = rand.nextInt(2);
-        final String eventName = (nextEventNo == 0 ? "Event0000" : "Event0100");
-        final int nextMatchCase = rand.nextInt(4);
-        final float nextTestTemperature = rand.nextFloat() * 10000;
-
-        builder.append("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n");
-        builder.append("<xmlApexEvent xmlns=\"http://www.onap.org/policy/apex-pdp/apexevent\">\n");
-
-        builder.append("  <name>" + eventName + "</name>\n");
-        builder.append("  <version>0.0.1</version>\n");
-        builder.append("  <nameSpace>org.onap.policy.apex.sample.events</nameSpace>\n");
-        builder.append("  <source>test</source>\n");
-        builder.append("  <target>apex</target>\n");
-        builder.append("  <data>\n");
-        builder.append("    <key>TestSlogan</key>\n");
-        builder.append("    <value>Test slogan for External Event" + (nextEventNo++) + "</value>\n");
-        builder.append("  </data>\n");
-        builder.append("  <data>\n");
-        builder.append("    <key>TestMatchCase</key>\n");
-        builder.append("    <value>" + nextMatchCase + "</value>\n");
-        builder.append("  </data>\n");
-        builder.append("  <data>\n");
-        builder.append("    <key>TestTimestamp</key>\n");
-        builder.append("    <value>" + System.currentTimeMillis() + "</value>\n");
-        builder.append("  </data>\n");
-        builder.append("  <data>\n");
-        builder.append("    <key>TestTemperature</key>\n");
-        builder.append("    <value>" + nextTestTemperature + "</value>\n");
-        builder.append("  </data>\n");
-        builder.append("</xmlApexEvent>");
-
-        return builder.toString();
-    }
-
-    /**
-     * The main method.
-     *
-     * @param args the arguments
-     */
-    public static void main(final String[] args) {
-        if (args.length != 1) {
-            System.err.println("usage EventGenerator #events");
-            return;
-        }
-
-        int eventCount = 0;
-        try {
-            eventCount = Integer.parseInt(args[0]);
-        } catch (final Exception e) {
-            System.err.println("usage EventGenerator #events");
-            e.printStackTrace();
-            return;
-        }
-
-        System.out.println(xmlEvents(eventCount));
-    }
-}
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventHandlerTest.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventHandlerTest.java
deleted file mode 100644
index f8caf8c2f..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventHandlerTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020-2021 Nordix Foundation.
- *  Modifications Copyright (C) 2022 Bell Canada.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.plugins.event.protocol.xml;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.Test;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.service.engine.event.ApexEvent;
-import org.onap.policy.apex.service.engine.event.ApexEventException;
-import org.onap.policy.apex.service.engine.event.ApexEventRuntimeException;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The Class TestApexXMLEventHandlerURL.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class XmlEventHandlerTest {
-    private static final XLogger logger = XLoggerFactory.getXLogger(XmlEventHandlerTest.class);
-
-    /**
-     * Test XML to apex event. Null value is passed as parameter.
-     *
-     * @throws ApexException on Apex event handling errors
-     */
-    @Test(expected = ApexException.class)
-    public void testApexEventToApexNullObject() throws ApexException {
-        final Apex2XmlEventConverter xmlEventConverter = new Apex2XmlEventConverter();
-        // This is only for code coverage stats. This method does nothing
-        xmlEventConverter.init(null);
-
-        xmlEventConverter.toApexEvent("XMLEventName", null);
-    }
-
-    /**
-     * Test XML to apex event. There is no string passed as parameter.
-     *
-     * @throws ApexException on Apex event handling errors
-     */
-    @Test(expected = ApexEventRuntimeException.class)
-    public void testApexEventToApexNotString() throws ApexException {
-        final Apex2XmlEventConverter xmlEventConverter = new Apex2XmlEventConverter();
-
-        xmlEventConverter.toApexEvent("XMLEventName", new Random().nextInt());
-    }
-
-    /**
-     * Test not valid XML to apex event.
-     *
-     * @throws ApexException on Apex event handling errors
-     */
-    @Test(expected = ApexException.class)
-    public void testApexEventToApexNotXml() throws ApexException {
-        final Apex2XmlEventConverter xmlEventConverter = new Apex2XmlEventConverter();
-
-        xmlEventConverter.toApexEvent("XMLEventName", RandomStringUtils.randomAlphabetic(25));
-    }
-
-    /**
-     * Test XML to apex event.
-     *
-     * @throws ApexException on Apex event handling errors
-     */
-    @Test
-    public void testXmltoApexEvent() throws ApexException {
-        try {
-            final Apex2XmlEventConverter xmlEventConverter = new Apex2XmlEventConverter();
-            assertNotNull(xmlEventConverter);
-
-            final String apexEventXmlStringIn = XmlEventGenerator.xmlEvent();
-
-            logger.debug("input event\n" + apexEventXmlStringIn);
-
-            for (final ApexEvent apexEvent : xmlEventConverter.toApexEvent("XMLEventName", apexEventXmlStringIn)) {
-                assertNotNull(apexEvent);
-
-                logger.debug(apexEvent.toString());
-
-                assertTrue(apexEvent.getName().equals("Event0000") || apexEvent.getName().equals("Event0100"));
-                assertEquals("0.0.1", apexEvent.getVersion());
-                assertEquals("org.onap.policy.apex.sample.events", apexEvent.getNameSpace());
-                assertEquals("test", apexEvent.getSource());
-                assertEquals("apex", apexEvent.getTarget());
-                assertTrue(apexEvent.get("TestSlogan").toString().startsWith("Test slogan for External Event"));
-
-                final Object testMatchCaseSelected = apexEvent.get("TestMatchCaseSelected");
-                assertNull(testMatchCaseSelected);
-            }
-        } catch (final Exception e) {
-            e.printStackTrace();
-            throw new ApexException("Exception reading Apex event xml file", e);
-        }
-    }
-
-    /**
-     * Test null as apex event to xml.
-     *
-     * @throws ApexEventException on Apex event handling errors
-     */
-    @Test(expected = ApexEventException.class)
-    public void testApexEventToXmlNullEvent() throws ApexEventException {
-        final Apex2XmlEventConverter xmlEventConverter = new Apex2XmlEventConverter();
-        xmlEventConverter.fromApexEvent(null);
-    }
-
-    /**
-     * Test apex event to xml.
-     *
-     * @throws ApexException on Apex event handling errors
-     */
-    @Test
-    public void testApexEventToXml() throws ApexException {
-        try {
-            final Apex2XmlEventConverter xmlEventConverter = new Apex2XmlEventConverter();
-            assertNotNull(xmlEventConverter);
-
-            final Date event0000StartTime = new Date();
-            final Map<String, Object> event0000DataMap = new HashMap<String, Object>();
-            event0000DataMap.put("TestSlogan", "This is a test slogan");
-            event0000DataMap.put("TestMatchCase", 12345);
-            event0000DataMap.put("TestTimestamp", event0000StartTime.getTime());
-            event0000DataMap.put("TestTemperature", 34.5445667);
-            event0000DataMap.put("NullValue", null);
-
-            final ApexEvent apexEvent0000 =
-                    new ApexEvent("Event0000", "0.0.1", "org.onap.policy.apex.sample.events", "test", "apex", "");
-            apexEvent0000.putAll(event0000DataMap);
-
-            final String apexEvent0000XmlString = xmlEventConverter.fromApexEvent(apexEvent0000);
-
-            logger.debug(apexEvent0000XmlString);
-
-            assertTrue(apexEvent0000XmlString.contains("<name>Event0000</name>"));
-            assertTrue(apexEvent0000XmlString.contains("<version>0.0.1</version>"));
-            assertTrue(apexEvent0000XmlString.contains("<value>This is a test slogan</value>"));
-            assertTrue(apexEvent0000XmlString.contains("<value>12345</value>"));
-            assertTrue(apexEvent0000XmlString.contains("<value></value>"));
-            assertTrue(apexEvent0000XmlString.contains("<value>" + event0000StartTime.getTime() + "</value>"));
-            assertTrue(apexEvent0000XmlString.contains("<value>34.5445667</value>"));
-
-            final Date event0004StartTime = new Date(1434363272000L);
-            final Map<String, Object> event0004DataMap = new HashMap<String, Object>();
-            event0004DataMap.put("TestSlogan", "Test slogan for External Event");
-            event0004DataMap.put("TestMatchCase", Integer.valueOf(2));
-            event0004DataMap.put("TestTimestamp", Long.valueOf(event0004StartTime.getTime()));
-            event0004DataMap.put("TestTemperature", Double.valueOf(1064.43));
-            event0004DataMap.put("TestMatchCaseSelected", Integer.valueOf(2));
-            event0004DataMap.put("TestMatchStateTime", Long.valueOf(1434370506078L));
-            event0004DataMap.put("TestEstablishCaseSelected", Integer.valueOf(0));
-            event0004DataMap.put("TestEstablishStateTime", Long.valueOf(1434370506085L));
-            event0004DataMap.put("TestDecideCaseSelected", Integer.valueOf(3));
-            event0004DataMap.put("TestDecideStateTime", Long.valueOf(1434370506092L));
-            event0004DataMap.put("TestActCaseSelected", Integer.valueOf(2));
-            event0004DataMap.put("TestActStateTime", Long.valueOf(1434370506095L));
-
-            final ApexEvent apexEvent0004 = new ApexEvent("Event0004", "0.0.1",
-                    "org.onap.policy.apex.domains.sample.events", "test", "apex", "");
-            apexEvent0004.putAll(event0004DataMap);
-
-            final String apexEvent0004XmlString = xmlEventConverter.fromApexEvent(apexEvent0004);
-
-            logger.debug(apexEvent0004XmlString);
-
-            assertTrue(apexEvent0004XmlString.contains("<name>Event0004</name>"));
-            assertTrue(apexEvent0004XmlString.contains("<version>0.0.1</version>"));
-            assertTrue(apexEvent0004XmlString.contains("<value>Test slogan for External Event</value>"));
-            assertTrue(apexEvent0004XmlString.contains("<value>1434370506078</value>"));
-            assertTrue(apexEvent0004XmlString.contains("<value>" + event0004StartTime.getTime() + "</value>"));
-            assertTrue(apexEvent0004XmlString.contains("<value>1064.43</value>"));
-        } catch (final Exception e) {
-            e.printStackTrace();
-            throw new ApexException("Exception reading Apex event xml file", e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventProtocolParametersTest.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventProtocolParametersTest.java
deleted file mode 100644
index 27fd22095..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventProtocolParametersTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2021 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.plugins.event.protocol.xml;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class XmlEventProtocolParametersTest {
-
-    /**
-     * Test object creation.
-     */
-    @Test
-    public void instantiationTest() {
-        final XmlEventProtocolParameters parameters = new XmlEventProtocolParameters();
-
-        assertEquals(XmlEventProtocolParameters.XML_EVENT_PROTOCOL_LABEL, parameters.getLabel());
-        assertEquals("<?xml", parameters.getStartDelimiterToken());
-        assertEquals(Apex2XmlEventConverter.class.getName(), parameters.getEventProtocolPluginClass());
-    }
-}
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlTaggedEventConsumerTest.java b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlTaggedEventConsumerTest.java
deleted file mode 100644
index 320d7ba22..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlTaggedEventConsumerTest.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.plugins.event.protocol.xml;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import org.junit.Test;
-import org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.consumer.HeaderDelimitedTextBlockReader;
-import org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.consumer.TextBlock;
-
-/**
- * The Class TestXmlTaggedEventConsumer.
- */
-public class XmlTaggedEventConsumerTest {
-
-    /**
-     * Test garbage text line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testGarbageTextLine() throws IOException {
-        verifyNull("testGarbageTextLine", "hello there");
-    }
-
-    /**
-     * Test partial event line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testPartialEventLine() throws IOException {
-        verifyNull("testPartialEventLine", "1469781869268</TestTimestamp></MainTag>");
-    }
-
-    /**
-     * Test full event line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testFullEventLine() throws IOException {
-        verifyLine("testFullEventLine", "<?xml><MainTag><TestTimestamp>1469781869268</TestTimestamp></MainTag>",
-                        "<?xml><MainTag><TestTimestamp>1469781869268</TestTimestamp></MainTag>");
-    }
-
-    /**
-     * Test full event garbage before line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testFullEventGarbageBeforeLine() throws IOException {
-        verifyEnd("testFullEventGarbageBeforeLine",
-                        "Garbage<?xml><MainTag><TestTimestamp>1469781869268</TestTimestamp></MainTag>");
-    }
-
-    /**
-     * Test full event garbage before after line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testFullEventGarbageBeforeAfterLine() throws IOException {
-        verifyEnd("testFullEventGarbageBeforeAfterLine",
-                        "Garbage<?xml><MainTag><TestTimestamp>1469781869268</TestTimestamp></MainTag>Rubbish");
-    }
-
-    /**
-     * Test full event garbage after line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testFullEventGarbageAfterLine() throws IOException {
-        verifyLine("testFullEventGarbageAfterLine",
-                        "<?xml><MainTag><TestTimestamp>1469781869268</TestTimestamp></MainTag>Rubbish",
-                        "<?xml><MainTag><TestTimestamp>1469781869268</TestTimestamp></MainTag>Rubbish");
-    }
-
-    /**
-     * Test garbage text multi line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testGarbageTextMultiLine() throws IOException {
-        verifyEnd("testGarbageTextMultiLine", "hello\nthere");
-    }
-
-    /**
-     * Test partial event multi line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testPartialEventMultiLine() throws IOException {
-        verifyEnd("testPartialEventMultiLine", "1469781869268\n</TestTimestamp>\n</MainTag>");
-    }
-
-    /**
-     * Test full event multi line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testFullEventMultiLine() throws IOException {
-        verifyLine("testFullEventMultiLine",
-                        "<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n</MainTag>\n\n",
-                        "<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n</MainTag>");
-    }
-
-    /**
-     * Test full event garbage before multi line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testFullEventGarbageBeforeMultiLine() throws IOException {
-        verifyLine("testFullEventGarbageBeforeMultiLine",
-                "Garbage\n<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n</MainTag>\n\n",
-                "<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n</MainTag>");
-    }
-
-    /**
-     * Test full event garbage before after multi line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testFullEventGarbageBeforeAfterMultiLine() throws IOException {
-        String garbageString = "Garbage\n<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>"
-                        + "\n</MainTag>\nRubbish\n\n";
-
-        verifyLine("testFullEventsGarbageAfterLine", garbageString,
-                        "<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n</MainTag>\nRubbish");
-    }
-
-    /**
-     * Test full event garbage after multi line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testFullEventGarbageAfterMultiLine() throws IOException {
-        verifyLine("testFullEventGarbageAfterMultiLine",
-                        "<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n</MainTag>\nRubbish",
-                        "<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n</MainTag>\nRubbish");
-    }
-
-    /**
-     * Test partial events line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testPartialEventsLine() throws IOException {
-        verifyEnd("testPartialEventsLine", "1469781869268</TestTimestamp></MainTag><?xml><MainTag>"
-                        + "<TestTimestamp>1469781869268</TestTimestamp>");
-    }
-
-    /**
-     * Test full events garbage before line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testFullEventsGarbageBeforeLine() throws IOException {
-        verifyEnd("testPartialEventsLine",
-                        "Garbage<?xml><MainTag><TestTimestamp>1469781869268</TestTimestamp></MainTag>"
-                                        + "<?xml><MainTag><TestTimestamp>");
-    }
-
-    /**
-     * Test full events garbage before after line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testFullEventsGarbageBeforeAfterLine() throws IOException {
-        verifyEnd("testFullEventGarbageBeforeLine", "Garbage<?xml><MainTag><TestTimestamp>1469781869268</TestTimestamp>"
-                        + "</MainTag>Rubbish<?xml><MainTag><TestTimestamp>\nRefuse");
-    }
-
-    /**
-     * Test full events garbage after line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testFullEventsGarbageAfterLine() throws IOException {
-        String garbageString = "<?xml><MainTag><TestTimestamp>1469781869268</TestTimestamp>"
-                        + "</MainTag>Rubbish<?xml><MainTag><TestTimestamp>Refuse";
-
-        verifyLine("testFullEventsGarbageAfterLine", garbageString, garbageString);
-    }
-
-    /**
-     * Test partial events multi line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testPartialEventsMultiLine() throws IOException {
-        verifyLine("testPartialEventsMultiLine",
-                        "1469781869268\n</TestTimestamp>\n</MainTag>\n<?xml>\n<MainTag>\n<TestTimestamp>",
-                        "<?xml>\n<MainTag>\n<TestTimestamp>");
-    }
-
-    /**
-     * Test full events multi line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testFullEventsMultiLine() throws IOException {
-        String garbageString = "<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n"
-                        + "</MainTag>\n<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n</MainTag>\n";
-
-        verifyLines("testFullEventsMultiLine", garbageString,
-                        "<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n</MainTag>",
-                        "<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n</MainTag>");
-    }
-
-    /**
-     * Test full events garbage before multi line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testFullEventsGarbageBeforeMultiLine() throws IOException {
-        String garbageString = "Garbage\n<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n"
-                        + "</MainTag>\n\n<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n</MainTag>\n";
-
-        verifyLines("testFullEventsGarbageBeforeMultiLine", garbageString,
-                        "<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n</MainTag>",
-                        "<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n</MainTag>");
-    }
-
-    /**
-     * Test full events garbage before after multi line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testFullEventsGarbageBeforeAfterMultiLine() throws IOException {
-        String garbageString = "Garbage\n<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n"
-                        + "</MainTag>\nRubbish\n<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n"
-                        + "</MainTag>\nRefuse\n";
-
-        verifyLines("testFullEventsGarbageBeforeAfterMultiLine", garbageString,
-                        "<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n</MainTag>\nRubbish",
-                        "<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n</MainTag>\nRefuse");
-    }
-
-    /**
-     * Test full events garbage after multi line.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     */
-    @Test
-    public void testFullEventsGarbageAfterMultiLine() throws IOException {
-        verifyLine("testFullEventsGarbageAfterMultiLine",
-                        "<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n</MainTag>\nRubbish",
-                        "<?xml>\n<MainTag>\n<TestTimestamp>1469781869268</TestTimestamp>\n</MainTag>\nRubbish");
-    }
-
-    private void verifyNull(String testName, String xml) throws IOException {
-        final InputStream xmlInputStream = new ByteArrayInputStream(xml.getBytes());
-
-        final HeaderDelimitedTextBlockReader xmlTaggedReader = new HeaderDelimitedTextBlockReader("<?xml", null, true);
-        xmlTaggedReader.init(xmlInputStream);
-
-        final TextBlock textBlock = xmlTaggedReader.readTextBlock();
-        assertNull(testName, textBlock.getText());
-        assertTrue(testName, textBlock.isEndOfText());
-    }
-
-    private void verifyLine(String testName, String xml, String expected) throws IOException {
-        final InputStream xmlInputStream = new ByteArrayInputStream(xml.getBytes());
-
-        final HeaderDelimitedTextBlockReader xmlTaggedReader = new HeaderDelimitedTextBlockReader("<?xml", null, true);
-        xmlTaggedReader.init(xmlInputStream);
-
-        final TextBlock textBlock = xmlTaggedReader.readTextBlock();
-        assertEquals(testName, expected, textBlock.getText());
-        assertTrue(testName, textBlock.isEndOfText());
-    }
-
-    private void verifyLines(String testName, String xml, String expected, String expected2) throws IOException {
-        final InputStream xmlInputStream = new ByteArrayInputStream(xml.getBytes());
-
-        final HeaderDelimitedTextBlockReader xmlTaggedReader = new HeaderDelimitedTextBlockReader("<?xml", null, true);
-        xmlTaggedReader.init(xmlInputStream);
-
-        TextBlock textBlock = xmlTaggedReader.readTextBlock();
-        assertEquals(testName, expected, textBlock.getText());
-        assertFalse(testName, textBlock.isEndOfText());
-
-        textBlock = xmlTaggedReader.readTextBlock();
-        assertEquals(testName, expected2, textBlock.getText());
-        assertTrue(testName, textBlock.isEndOfText());
-    }
-
-    private void verifyEnd(String testName, String xml) throws IOException {
-        final InputStream xmlInputStream = new ByteArrayInputStream(xml.getBytes());
-
-        final HeaderDelimitedTextBlockReader xmlTaggedReader = new HeaderDelimitedTextBlockReader("<?xml", null, true);
-        xmlTaggedReader.init(xmlInputStream);
-
-        final TextBlock textBlock = xmlTaggedReader.readTextBlock();
-        assertTrue(testName, textBlock.isEndOfText());
-    }
-}