Skip to content

Commit 5e1d628

Browse files
committed
Merge branch 'develop'
2 parents 01352d0 + e30fc18 commit 5e1d628

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

src/main/java/com/github/_1c_syntax/mdclasses/metadata/utils/MDOUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ public static MDObjectBase getMDObject(ConfigurationSource configurationSource,
302302
MDObjectBase mdo = null;
303303
var mdoFile = mdoPath.toFile();
304304
if (mdoFile.exists()) {
305-
var xmlMapper = ObjectMapperFactory.createXmlMapper();
305+
var xmlMapper = ObjectMapperFactory.getXmlMapper();
306306
if (configurationSource == ConfigurationSource.EDT) {
307307
try {
308308
mdo = (MDObjectBase) xmlMapper
@@ -522,7 +522,7 @@ private void updateMDOForms(ConfigurationSource configurationSource, MDObjectBas
522522
getMDOFilesInFolder(configurationSource, formFolder)
523523
.forEach(mdoFile -> {
524524
Form mdoForm = null;
525-
var xmlMapper = ObjectMapperFactory.createXmlMapper();
525+
var xmlMapper = ObjectMapperFactory.getXmlMapper();
526526
try {
527527
MetaDataObject metaDataObject = xmlMapper.readValue(mdoFile.toFile(), MetaDataObject.class);
528528
mdoForm = metaDataObject.getForm();

src/main/java/com/github/_1c_syntax/mdclasses/metadata/utils/ObjectMapperFactory.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@
88
@UtilityClass
99
public class ObjectMapperFactory {
1010

11-
public static XmlMapper createXmlMapper() {
11+
private static final XmlMapper xmlMapper = createXmlMapper();
12+
13+
public static XmlMapper getXmlMapper() {
14+
return xmlMapper;
15+
}
16+
17+
private static XmlMapper createXmlMapper() {
1218
XmlMapper xmlMapper = new XmlMapper();
1319

1420
xmlMapper.registerModule(new ParameterNamesModule());

src/test/java/com/github/_1c_syntax/mdclasses/MDOSourceOriginTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ void testLoadConfiguration() {
1919
String basePath = "src/test/resources/metadata/original";
2020
File XML = new File(basePath, "Configuration.xml");
2121

22-
XmlMapper xmlMapper = ObjectMapperFactory.createXmlMapper();
22+
XmlMapper xmlMapper = ObjectMapperFactory.getXmlMapper();
2323

2424
try {
2525
MDObject = xmlMapper.readValue(XML, MetaDataObject.class);

0 commit comments

Comments
 (0)