diff options
author | Daniel Silverthorn <daniel.silverthorn@amdocs.com> | 2017-09-05 11:38:41 -0400 |
---|---|---|
committer | Daniel Silverthorn <daniel.silverthorn@amdocs.com> | 2017-09-05 11:39:51 -0400 |
commit | f4273706e9911ab7a4d125b29c1fc7ef8053e14e (patch) | |
tree | 8db97b653392b6c3c2e660ad4c39509b3886c49a /src/main/java/org/openecomp/schema/OxmModelValidator.java | |
parent | 4e29c1eed57fbcd982c38bd96348b0b183f7820c (diff) |
Replace OxmModelLoader with aaiutils
Issue ID: AAI-245
Change-Id: I38312e114a221686834303a81e6e21a49ee27b2a
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
Diffstat (limited to 'src/main/java/org/openecomp/schema/OxmModelValidator.java')
-rw-r--r-- | src/main/java/org/openecomp/schema/OxmModelValidator.java | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/main/java/org/openecomp/schema/OxmModelValidator.java b/src/main/java/org/openecomp/schema/OxmModelValidator.java index 45a2597..0ae3e13 100644 --- a/src/main/java/org/openecomp/schema/OxmModelValidator.java +++ b/src/main/java/org/openecomp/schema/OxmModelValidator.java @@ -32,6 +32,7 @@ import org.eclipse.persistence.internal.helper.DatabaseField; import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; import org.eclipse.persistence.mappings.DatabaseMapping; import org.eclipse.persistence.oxm.XMLField; +import org.onap.aaiutils.oxm.OxmModelLoader; import org.openecomp.crud.entity.Vertex; import org.openecomp.crud.exception.CrudException; import org.openecomp.crud.util.CrudServiceUtil; @@ -74,7 +75,12 @@ public class OxmModelValidator { Map<String, String> filter) throws CrudException { - DynamicJAXBContext jaxbContext = OxmModelLoader.getContextForVersion(version); + DynamicJAXBContext jaxbContext = null; + try { + jaxbContext = OxmModelLoader.getContextForVersion(version); + } catch (Exception e) { + throw new CrudException(e); + } Map<String, Object> result = new HashMap<String, Object>(); if (jaxbContext == null) { @@ -107,7 +113,12 @@ public class OxmModelValidator { public static String resolveCollectionType(String version, String type) throws CrudException { - DynamicJAXBContext jaxbContext = OxmModelLoader.getContextForVersion(version); + DynamicJAXBContext jaxbContext = null; + try { + jaxbContext = OxmModelLoader.getContextForVersion(version); + } catch (Exception e) { + throw new CrudException(e); + } if (jaxbContext == null) { throw new CrudException("", Status.NOT_FOUND); |