From 7460c156d2f3b0e0db0cbf0d04ff1da7834a9ca3 Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Thu, 19 Mar 2020 17:57:35 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20xml-mapper=20=D0=BE=D0=B4=D0=B8=D0=BD=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_1c_syntax/mdclasses/metadata/utils/MDOUtils.java | 4 ++-- .../mdclasses/metadata/utils/ObjectMapperFactory.java | 8 +++++++- .../github/_1c_syntax/mdclasses/MDOSourceOriginTest.java | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/github/_1c_syntax/mdclasses/metadata/utils/MDOUtils.java b/src/main/java/com/github/_1c_syntax/mdclasses/metadata/utils/MDOUtils.java index 85a46398d..670bf19f2 100644 --- a/src/main/java/com/github/_1c_syntax/mdclasses/metadata/utils/MDOUtils.java +++ b/src/main/java/com/github/_1c_syntax/mdclasses/metadata/utils/MDOUtils.java @@ -302,7 +302,7 @@ public static MDObjectBase getMDObject(ConfigurationSource configurationSource, MDObjectBase mdo = null; var mdoFile = mdoPath.toFile(); if (mdoFile.exists()) { - var xmlMapper = ObjectMapperFactory.createXmlMapper(); + var xmlMapper = ObjectMapperFactory.getXmlMapper(); if (configurationSource == ConfigurationSource.EDT) { try { mdo = (MDObjectBase) xmlMapper @@ -522,7 +522,7 @@ private void updateMDOForms(ConfigurationSource configurationSource, MDObjectBas getMDOFilesInFolder(configurationSource, formFolder) .forEach(mdoFile -> { Form mdoForm = null; - var xmlMapper = ObjectMapperFactory.createXmlMapper(); + var xmlMapper = ObjectMapperFactory.getXmlMapper(); try { MetaDataObject metaDataObject = xmlMapper.readValue(mdoFile.toFile(), MetaDataObject.class); mdoForm = metaDataObject.getForm(); diff --git a/src/main/java/com/github/_1c_syntax/mdclasses/metadata/utils/ObjectMapperFactory.java b/src/main/java/com/github/_1c_syntax/mdclasses/metadata/utils/ObjectMapperFactory.java index 311499cfe..671c4512e 100644 --- a/src/main/java/com/github/_1c_syntax/mdclasses/metadata/utils/ObjectMapperFactory.java +++ b/src/main/java/com/github/_1c_syntax/mdclasses/metadata/utils/ObjectMapperFactory.java @@ -8,7 +8,13 @@ @UtilityClass public class ObjectMapperFactory { - public static XmlMapper createXmlMapper() { + private static final XmlMapper xmlMapper = createXmlMapper(); + + public static XmlMapper getXmlMapper() { + return xmlMapper; + } + + private static XmlMapper createXmlMapper() { XmlMapper xmlMapper = new XmlMapper(); xmlMapper.registerModule(new ParameterNamesModule()); diff --git a/src/test/java/com/github/_1c_syntax/mdclasses/MDOSourceOriginTest.java b/src/test/java/com/github/_1c_syntax/mdclasses/MDOSourceOriginTest.java index a114f05fe..cf4b16173 100644 --- a/src/test/java/com/github/_1c_syntax/mdclasses/MDOSourceOriginTest.java +++ b/src/test/java/com/github/_1c_syntax/mdclasses/MDOSourceOriginTest.java @@ -19,7 +19,7 @@ void testLoadConfiguration() { String basePath = "src/test/resources/metadata/original"; File XML = new File(basePath, "Configuration.xml"); - XmlMapper xmlMapper = ObjectMapperFactory.createXmlMapper(); + XmlMapper xmlMapper = ObjectMapperFactory.getXmlMapper(); try { MDObject = xmlMapper.readValue(XML, MetaDataObject.class);