diff options
author | JoeOLeary <joseph.o.leary@est.tech> | 2019-02-19 10:30:26 +0000 |
---|---|---|
committer | JoeOLeary <joseph.o.leary@est.tech> | 2019-02-19 10:30:26 +0000 |
commit | 4d4dc481af71692a15dc66e0504ed7e8dcbe94af (patch) | |
tree | 97c2a875cd0ddf8e2fcd9c63ca400d4218cedb93 /src/main/java | |
parent | 32ba8905197d61b6a9610d50a57cf4ba31e53a52 (diff) |
Add XML validation
Issue-ID: DCAEGEN2-1217
Change-Id: Ic76885ab1c8e020a2bded05a264092684a747461
Signed-off-by: JoeOLeary <joseph.o.leary@est.tech>
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/org/onap/dcaegen2/services/pmmapper/App.java | 11 | ||||
-rw-r--r-- | src/main/java/org/onap/dcaegen2/services/pmmapper/utils/XMLValidator.java | 63 |
2 files changed, 72 insertions, 2 deletions
diff --git a/src/main/java/org/onap/dcaegen2/services/pmmapper/App.java b/src/main/java/org/onap/dcaegen2/services/pmmapper/App.java index 67d4875..72d1509 100644 --- a/src/main/java/org/onap/dcaegen2/services/pmmapper/App.java +++ b/src/main/java/org/onap/dcaegen2/services/pmmapper/App.java @@ -34,6 +34,7 @@ import org.onap.dcaegen2.services.pmmapper.exceptions.TooManyTriesException; import org.onap.dcaegen2.services.pmmapper.mapping.Mapper; import org.onap.dcaegen2.services.pmmapper.model.MapperConfig; import org.onap.dcaegen2.services.pmmapper.healthcheck.HealthCheckHandler; +import org.onap.dcaegen2.services.pmmapper.utils.XMLValidator; import org.onap.logging.ref.slf4j.ONAPLogAdapter; import org.slf4j.LoggerFactory; import org.slf4j.MDC; @@ -44,16 +45,22 @@ import java.nio.file.Paths; public class App { private static final ONAPLogAdapter logger = new ONAPLogAdapter(LoggerFactory.getLogger(App.class)); private static Path mappingTemplate = Paths.get("/opt/app/pm-mapper/etc/mapping.ftl"); + private static Path xmlSchema = Paths.get("/opt/app/pm-mapper/etc/measCollec_plusString.xsd"); public static void main(String[] args) throws InterruptedException, TooManyTriesException, CBSConfigException, EnvironmentConfigException, CBSServerError, MapperConfigException { HealthCheckHandler healthCheckHandler = new HealthCheckHandler(); Mapper mapper = new Mapper(mappingTemplate); + XMLValidator validator = new XMLValidator(xmlSchema); DataRouterSubscriber dataRouterSubscriber = new DataRouterSubscriber(event -> { event.getHttpServerExchange().unDispatch(); event.getHttpServerExchange().getResponseSender().send(StatusCodes.OK_STRING); MDC.setContextMap(event.getMdc()); - String ves = mapper.map(event); - logger.unwrap().info("Mapped Event: {}", ves); + if(!validator.validate(event)){ + logger.unwrap().info("Event failed validation against schema."); + } else { + String ves = mapper.map(event); + logger.unwrap().info("Mapped Event: {}", ves); + } }); MapperConfig mapperConfig = new ConfigHandler().getMapperConfig(); dataRouterSubscriber.start(mapperConfig); diff --git a/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/XMLValidator.java b/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/XMLValidator.java new file mode 100644 index 0000000..a00f80b --- /dev/null +++ b/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/XMLValidator.java @@ -0,0 +1,63 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 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.dcaegen2.services.pmmapper.utils; + +import lombok.NonNull; +import org.onap.dcaegen2.services.pmmapper.mapping.Mapper; +import org.onap.dcaegen2.services.pmmapper.model.Event; +import org.onap.logging.ref.slf4j.ONAPLogAdapter; +import org.slf4j.LoggerFactory; +import org.xml.sax.SAXException; + +import javax.xml.XMLConstants; +import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; +import java.io.IOException; +import java.io.StringReader; +import java.nio.file.Path; + +public class XMLValidator { + private static final ONAPLogAdapter logger = new ONAPLogAdapter(LoggerFactory.getLogger(Mapper.class)); + private Schema schema; + public XMLValidator(Path xmlSchemaDefinition) { + SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); + try { + schema = schemaFactory.newSchema(xmlSchemaDefinition.toFile()); + } catch (SAXException exception) { + logger.unwrap().error("Failed to read schema", exception); + throw new IllegalArgumentException("Bad Schema", exception); + } + } + + public boolean validate(@NonNull Event event) { + try { + Validator validator = schema.newValidator(); + validator.validate(new StreamSource(new StringReader(event.getBody()))); + logger.unwrap().info("XML validation successful {}", event); + return true; + } catch (SAXException | IOException exception) { + logger.unwrap().info("XML validation failed {}", event, exception); + return false; + } + } +}
\ No newline at end of file |