From 59b90519eda3b95b0cfc49b6349a591c7d0c78e2 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Mon, 7 Feb 2022 17:56:44 +0000 Subject: 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 --- .../plugins-event-protocol-xml/pom.xml | 110 ------- .../event/protocol/xml/Apex2XmlEventConverter.java | 188 ------------ .../protocol/xml/XmlEventProtocolParameters.java | 53 ---- .../plugins/event/protocol/xml/package-info.java | 26 -- .../src/main/resources/xml/apex-event.xjb | 39 --- .../src/main/resources/xml/apex-event.xsd | 119 -------- .../event/protocol/xml/XmlEventGenerator.java | 119 -------- .../event/protocol/xml/XmlEventHandlerTest.java | 205 ------------- .../xml/XmlEventProtocolParametersTest.java | 40 --- .../protocol/xml/XmlTaggedEventConsumerTest.java | 339 --------------------- .../plugins-event/plugins-event-protocol/pom.xml | 2 +- 11 files changed, 1 insertion(+), 1239 deletions(-) delete mode 100644 plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml delete mode 100644 plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/Apex2XmlEventConverter.java delete mode 100644 plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventProtocolParameters.java delete mode 100644 plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/java/org/onap/policy/apex/plugins/event/protocol/xml/package-info.java delete mode 100644 plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/resources/xml/apex-event.xjb delete mode 100644 plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/resources/xml/apex-event.xsd delete mode 100644 plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventGenerator.java delete mode 100644 plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventHandlerTest.java delete mode 100644 plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlEventProtocolParametersTest.java delete mode 100644 plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/test/java/org/onap/policy/apex/plugins/event/protocol/xml/XmlTaggedEventConsumerTest.java (limited to 'plugins/plugins-event/plugins-event-protocol') diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml deleted file mode 100644 index 743167d14..000000000 --- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - 4.0.0 - - org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol - plugins-event-protocol - 2.7.1-SNAPSHOT - - - plugins-event-protocol-xml - ${project.artifactId} - [${project.parent.artifactId}] Plugin for handling events that are being transported in XML format - - - ${project.basedir}/src - - - - - org.onap.policy.common - utils - - - org.eclipse.persistence - eclipselink - - - org.jvnet.jaxb2_commons - jaxb2-basics-runtime - 1.11.1 - - - - - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.14.0 - - src/main/resources/xml - apex-event.xsd - src/main/resources/xml - apex-event.xjb - org.onap.policy.apex.plugins.event.protocol.xml.jaxb - true - true - true - true - - - org.jvnet.jaxb2_commons - jaxb2-basics - 1.11.1 - - - org.jvnet.jaxb2_commons - jaxb2-basics-annotate - 1.0.2 - - - org.jvnet.jaxb2_commons - jaxb2-value-constructor - 3.0 - - - - -Xannotate - -XtoString - -Xmergeable - -Xcopyable - -Xequals - -XhashCode - -Xvalue-constructor - - - - - generate - - generate - - - - - - - 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 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 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 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 xmlDataList = new ArrayList<>(); - - try { - for (final Entry 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 = " - - - - - - - - - - - - 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 @@ - - - - - - - An event that comes into or is emitted out of an Apex system. - - - - - - - - - - - - - - An event that comes into or goes out of an Apex system - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A single data item of an Apex event. - - - - - - - - - - - - - - - - - - - - - - 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("\n"); - builder.append("\n"); - - builder.append(" " + eventName + "\n"); - builder.append(" 0.0.1\n"); - builder.append(" org.onap.policy.apex.sample.events\n"); - builder.append(" test\n"); - builder.append(" apex\n"); - builder.append(" \n"); - builder.append(" TestSlogan\n"); - builder.append(" Test slogan for External Event" + (nextEventNo++) + "\n"); - builder.append(" \n"); - builder.append(" \n"); - builder.append(" TestMatchCase\n"); - builder.append(" " + nextMatchCase + "\n"); - builder.append(" \n"); - builder.append(" \n"); - builder.append(" TestTimestamp\n"); - builder.append(" " + System.currentTimeMillis() + "\n"); - builder.append(" \n"); - builder.append(" \n"); - builder.append(" TestTemperature\n"); - builder.append(" " + nextTestTemperature + "\n"); - builder.append(" \n"); - builder.append(""); - - 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 event0000DataMap = new HashMap(); - 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("Event0000")); - assertTrue(apexEvent0000XmlString.contains("0.0.1")); - assertTrue(apexEvent0000XmlString.contains("This is a test slogan")); - assertTrue(apexEvent0000XmlString.contains("12345")); - assertTrue(apexEvent0000XmlString.contains("")); - assertTrue(apexEvent0000XmlString.contains("" + event0000StartTime.getTime() + "")); - assertTrue(apexEvent0000XmlString.contains("34.5445667")); - - final Date event0004StartTime = new Date(1434363272000L); - final Map event0004DataMap = new HashMap(); - 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("Event0004")); - assertTrue(apexEvent0004XmlString.contains("0.0.1")); - assertTrue(apexEvent0004XmlString.contains("Test slogan for External Event")); - assertTrue(apexEvent0004XmlString.contains("1434370506078")); - assertTrue(apexEvent0004XmlString.contains("" + event0004StartTime.getTime() + "")); - assertTrue(apexEvent0004XmlString.contains("1064.43")); - } 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(""); - } - - /** - * Test full event line. - * - * @throws IOException Signals that an I/O exception has occurred. - */ - @Test - public void testFullEventLine() throws IOException { - verifyLine("testFullEventLine", "1469781869268", - "1469781869268"); - } - - /** - * Test full event garbage before line. - * - * @throws IOException Signals that an I/O exception has occurred. - */ - @Test - public void testFullEventGarbageBeforeLine() throws IOException { - verifyEnd("testFullEventGarbageBeforeLine", - "Garbage1469781869268"); - } - - /** - * 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", - "Garbage1469781869268Rubbish"); - } - - /** - * Test full event garbage after line. - * - * @throws IOException Signals that an I/O exception has occurred. - */ - @Test - public void testFullEventGarbageAfterLine() throws IOException { - verifyLine("testFullEventGarbageAfterLine", - "1469781869268Rubbish", - "1469781869268Rubbish"); - } - - /** - * 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\n"); - } - - /** - * Test full event multi line. - * - * @throws IOException Signals that an I/O exception has occurred. - */ - @Test - public void testFullEventMultiLine() throws IOException { - verifyLine("testFullEventMultiLine", - "\n\n1469781869268\n\n\n", - "\n\n1469781869268\n"); - } - - /** - * 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\n\n1469781869268\n\n\n", - "\n\n1469781869268\n"); - } - - /** - * 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\n\n1469781869268" - + "\n\nRubbish\n\n"; - - verifyLine("testFullEventsGarbageAfterLine", garbageString, - "\n\n1469781869268\n\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", - "\n\n1469781869268\n\nRubbish", - "\n\n1469781869268\n\nRubbish"); - } - - /** - * Test partial events line. - * - * @throws IOException Signals that an I/O exception has occurred. - */ - @Test - public void testPartialEventsLine() throws IOException { - verifyEnd("testPartialEventsLine", "1469781869268" - + "1469781869268"); - } - - /** - * Test full events garbage before line. - * - * @throws IOException Signals that an I/O exception has occurred. - */ - @Test - public void testFullEventsGarbageBeforeLine() throws IOException { - verifyEnd("testPartialEventsLine", - "Garbage1469781869268" - + ""); - } - - /** - * 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", "Garbage1469781869268" - + "Rubbish\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 = "1469781869268" - + "RubbishRefuse"; - - 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\n\n\n\n", - "\n\n"); - } - - /** - * Test full events multi line. - * - * @throws IOException Signals that an I/O exception has occurred. - */ - @Test - public void testFullEventsMultiLine() throws IOException { - String garbageString = "\n\n1469781869268\n" - + "\n\n\n1469781869268\n\n"; - - verifyLines("testFullEventsMultiLine", garbageString, - "\n\n1469781869268\n", - "\n\n1469781869268\n"); - } - - /** - * 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\n\n1469781869268\n" - + "\n\n\n\n1469781869268\n\n"; - - verifyLines("testFullEventsGarbageBeforeMultiLine", garbageString, - "\n\n1469781869268\n", - "\n\n1469781869268\n"); - } - - /** - * 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\n\n1469781869268\n" - + "\nRubbish\n\n\n1469781869268\n" - + "\nRefuse\n"; - - verifyLines("testFullEventsGarbageBeforeAfterMultiLine", garbageString, - "\n\n1469781869268\n\nRubbish", - "\n\n1469781869268\n\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", - "\n\n1469781869268\n\nRubbish", - "\n\n1469781869268\n\nRubbish"); - } - - private void verifyNull(String testName, String xml) throws IOException { - final InputStream xmlInputStream = new ByteArrayInputStream(xml.getBytes()); - - final HeaderDelimitedTextBlockReader xmlTaggedReader = new HeaderDelimitedTextBlockReader(" plugins-event-protocol-jms - plugins-event-protocol-xml plugins-event-protocol-yaml -- cgit 1.2.3-korg