summaryrefslogtreecommitdiffstats
path: root/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/resources
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2022-02-07 17:56:44 +0000
committerliamfallon <liam.fallon@est.tech>2022-02-08 18:39:03 +0000
commit59b90519eda3b95b0cfc49b6349a591c7d0c78e2 (patch)
tree810e07f7d5cf270582264c40245372f597c713a2 /plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/resources
parentdef44b294fa00bb5470e977eef9a05e5087035f0 (diff)
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>
Diffstat (limited to 'plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/resources')
-rw-r--r--plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/resources/xml/apex-event.xjb39
-rw-r--r--plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/main/resources/xml/apex-event.xsd119
2 files changed, 0 insertions, 158 deletions
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>