Skip to content

Создание xml-mapper один раз #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2020
Merged

Создание xml-mapper один раз #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/github/_1c_syntax/mdclasses/metadata/utils/MDOUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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();
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/com/github/_1c_syntax/mdclasses/metadata/utils/ObjectMapperFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/github/_1c_syntax/mdclasses/MDOSourceOriginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down