From eeaed79d77283142e4a34805dd510cbbd9a701e1 Mon Sep 17 00:00:00 2001 From: freddyucv Date: Tue, 10 May 2022 15:54:57 -0600 Subject: [PATCH] #21060 Using XStreamFactory everywhere --- .../elasticsearch/business/ESContentletAPIImpl.java | 5 +++-- .../contenttype/business/sql/FixTaskFixStructureTable.java | 3 ++- .../com/dotcms/publisher/business/PublishAuditHistory.java | 3 ++- .../java/com/dotcms/publisher/util/PushCategoryUtil.java | 3 ++- .../main/java/com/dotcms/publishing/XMLSerializerUtil.java | 3 ++- dotCMS/src/main/java/com/dotcms/rest/ContentResource.java | 7 ++++--- dotCMS/src/main/java/com/dotcms/rest/TestResource.java | 5 +++-- .../tasks/FixTask00001CheckAssetsMissingIdentifiers.java | 3 ++- .../tasks/FixTask00003CheckContainersInconsistencies.java | 3 ++- .../tasks/FixTask00006CheckLinksInconsistencies.java | 3 ++- .../tasks/FixTask00007CheckTemplatesInconsistencies.java | 3 ++- .../tasks/FixTask00008CheckTreeInconsistencies.java | 3 ++- .../FixTask00009CheckContentletsInexistentInodes.java | 3 ++- .../tasks/FixTask00011RenameHostInFieldVariableName.java | 3 ++- .../fixtask/tasks/FixTask00012UpdateAssetsHosts.java | 3 ++- .../tasks/FixTask00020DeleteOrphanedIdentifiers.java | 3 ++- .../fixtask/tasks/FixTask00030DeleteOrphanedAssets.java | 3 ++- .../tasks/FixTask00050FixInodesWithoutContentlets.java | 3 ++- .../fixtask/tasks/FixTask00060FixAssetType.java | 3 ++- .../tasks/FixTask00080DeleteOrphanedContentTypeFields.java | 3 ++- .../FixTask00090RecreateMissingFoldersInParentPath.java | 3 ++- .../tasks/FixTask00095DeleteOrphanRelationships.java | 3 ++- 22 files changed, 48 insertions(+), 26 deletions(-) diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java index 47286eb5c8ad..94310d54b95a 100644 --- a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java +++ b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java @@ -55,6 +55,7 @@ import com.dotcms.util.ConversionUtils; import com.dotcms.util.DotPreconditions; import com.dotcms.util.ThreadContextUtil; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.MultiTree; @@ -2478,7 +2479,7 @@ private void backupDestroyedContentlets(final List contentlets, fina if (contentlets.size() > 0) { - final XStream xstream = new XStream(new DomDriver()); + final XStream xstream = XStreamFactory.INSTANCE.getInstance(); final File backupFolder = new File(backupPath); if (!backupFolder.exists()) { @@ -2791,7 +2792,7 @@ public void deleteAllVersionsandBackup(List contentlets, User user, } if (contentlets.size() > 0) { - XStream _xstream = new XStream(new DomDriver()); + XStream _xstream = XStreamFactory.INSTANCE.getInstance(); Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_HH-mm-ss"); String lastmoddate = sdf.format(date); diff --git a/dotCMS/src/main/java/com/dotcms/contenttype/business/sql/FixTaskFixStructureTable.java b/dotCMS/src/main/java/com/dotcms/contenttype/business/sql/FixTaskFixStructureTable.java index 58cfa9595996..e7e7196b15c9 100644 --- a/dotCMS/src/main/java/com/dotcms/contenttype/business/sql/FixTaskFixStructureTable.java +++ b/dotCMS/src/main/java/com/dotcms/contenttype/business/sql/FixTaskFixStructureTable.java @@ -1,6 +1,7 @@ package com.dotcms.contenttype.business.sql; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.Inode; @@ -188,7 +189,7 @@ public List > executeFix() throws DotDataException, DotRunti public List > getModifiedData() { if (modifiedData.size() > 0) { - XStream _xstream = new XStream(new DomDriver()); + XStream _xstream = XStreamFactory.INSTANCE.getInstance();; Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_HH-mm-ss"); String lastmoddate = sdf.format(date); diff --git a/dotCMS/src/main/java/com/dotcms/publisher/business/PublishAuditHistory.java b/dotCMS/src/main/java/com/dotcms/publisher/business/PublishAuditHistory.java index 678ff6656a33..0460c3a92435 100644 --- a/dotCMS/src/main/java/com/dotcms/publisher/business/PublishAuditHistory.java +++ b/dotCMS/src/main/java/com/dotcms/publisher/business/PublishAuditHistory.java @@ -1,5 +1,6 @@ package com.dotcms.publisher.business; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; import com.thoughtworks.xstream.XStream; @@ -113,7 +114,7 @@ public void addOrUpdateEndpoint(String groupId, String endpointId, EndpointDetai } } - static XStream xstream=new XStream(new DomDriver()); + static XStream xstream = XStreamFactory.INSTANCE.getInstance(); public String getSerialized() { diff --git a/dotCMS/src/main/java/com/dotcms/publisher/util/PushCategoryUtil.java b/dotCMS/src/main/java/com/dotcms/publisher/util/PushCategoryUtil.java index 1cd5e76e9fd4..9a7482f2f044 100644 --- a/dotCMS/src/main/java/com/dotcms/publisher/util/PushCategoryUtil.java +++ b/dotCMS/src/main/java/com/dotcms/publisher/util/PushCategoryUtil.java @@ -2,6 +2,7 @@ import com.dotcms.publisher.pusher.wrapper.CategoryWrapper; import com.dotcms.publishing.DotPublishingException; +import com.dotcms.util.XStreamFactory; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.io.xml.DomDriver; import java.io.File; @@ -28,7 +29,7 @@ public class PushCategoryUtil { private int categoriesCount; public PushCategoryUtil(Collection categories, String categoryExtension) throws DotPublishingException { - xstream=new XStream(new DomDriver()); + xstream = XStreamFactory.INSTANCE.getInstance(); categoriesByInode = new HashMap<>(); categoriesTopLevel = new HashSet<>(); diff --git a/dotCMS/src/main/java/com/dotcms/publishing/XMLSerializerUtil.java b/dotCMS/src/main/java/com/dotcms/publishing/XMLSerializerUtil.java index 6ec0b5f73135..59e81fdf1fa4 100644 --- a/dotCMS/src/main/java/com/dotcms/publishing/XMLSerializerUtil.java +++ b/dotCMS/src/main/java/com/dotcms/publishing/XMLSerializerUtil.java @@ -1,6 +1,7 @@ package com.dotcms.publishing; +import com.dotcms.util.XStreamFactory; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.XStreamException; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; @@ -28,7 +29,7 @@ public static XMLSerializerUtil getInstance() { } private XMLSerializerUtil(){ - xmlSerializer = new XStream(new DomDriver(StandardCharsets.UTF_8.name())); + xmlSerializer = XStreamFactory.INSTANCE.getInstance(StandardCharsets.UTF_8); } public XStream getXmlSerializer() { diff --git a/dotCMS/src/main/java/com/dotcms/rest/ContentResource.java b/dotCMS/src/main/java/com/dotcms/rest/ContentResource.java index b7a9fd61f7be..2ec12186032e 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/ContentResource.java +++ b/dotCMS/src/main/java/com/dotcms/rest/ContentResource.java @@ -17,6 +17,7 @@ import com.dotcms.rest.api.v1.authentication.ResponseUtil; import com.dotcms.rest.exception.ForbiddenException; import com.dotcms.rest.exception.mapper.ExceptionMapperUtil; +import com.dotcms.util.XStreamFactory; import com.dotcms.uuid.shorty.ShortyId; import com.dotcms.uuid.shorty.ShortyIdAPI; import com.dotcms.workflow.form.FireActionForm; @@ -776,7 +777,7 @@ private String getXML(final List cons, final HttpServletRequest requ final boolean allCategoriesInfo){ final StringBuilder sb = new StringBuilder(); - final XStream xstream = new XStream(new DomDriver()); + final XStream xstream = XStreamFactory.INSTANCE.getInstance(); xstream.alias("content", Map.class); xstream.registerConverter(new MapEntryConverter()); sb.append(""); @@ -1019,7 +1020,7 @@ private List addRelatedContentToXMLMap(final HttpServletRequest request, final H private String getXMLContentIds(Contentlet con) { - XStream xstream = new XStream(new DomDriver()); + XStream xstream = XStreamFactory.INSTANCE.getInstance(); xstream.alias("content", Map.class); xstream.registerConverter(new MapEntryConverter()); StringBuilder sb = new StringBuilder(); @@ -2130,7 +2131,7 @@ protected void processXML(Contentlet contentlet, InputStream inputStream) .startsWith(" root = (Map) xstream.fromXML(input); diff --git a/dotCMS/src/main/java/com/dotcms/rest/TestResource.java b/dotCMS/src/main/java/com/dotcms/rest/TestResource.java index e0d3d438f453..338aa622f7c8 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/TestResource.java +++ b/dotCMS/src/main/java/com/dotcms/rest/TestResource.java @@ -1,6 +1,7 @@ package com.dotcms.rest; import com.dotcms.repackage.org.apache.commons.httpclient.HttpStatus; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; import com.dotmarketing.util.json.JSONException; @@ -79,7 +80,7 @@ public Response getDocumentCount (@Context HttpServletRequest request, @Context mapResponse.put( "param1", param1 ); mapResponse.put( "param2", param2 ); - XStream xstream = new XStream( new DomDriver() ); + XStream xstream = XStreamFactory.INSTANCE.getInstance(); xstream.alias( "response", Map.class ); StringBuilder xmlBuilder = new StringBuilder(); @@ -170,7 +171,7 @@ public Response saveTest ( @Context HttpServletRequest request, mapResponse.put( "param1", param1 ); mapResponse.put( "param2", param2 ); - XStream xstream = new XStream( new DomDriver() ); + XStream xstream = XStreamFactory.INSTANCE.getInstance(); xstream.alias( "response", Map.class ); StringBuilder xmlBuilder = new StringBuilder(); diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00001CheckAssetsMissingIdentifiers.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00001CheckAssetsMissingIdentifiers.java index b5eec47addf2..0fe7882ee4b2 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00001CheckAssetsMissingIdentifiers.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00001CheckAssetsMissingIdentifiers.java @@ -1,6 +1,7 @@ package com.dotmarketing.fixtask.tasks; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.beans.Identifier; import com.dotmarketing.beans.Inode; @@ -188,7 +189,7 @@ public List > executeFix() throws DotDataException, DotRunti public List > getModifiedData() { if (modifiedData.size() > 0) { - XStream _xstream = new XStream(new DomDriver()); + XStream _xstream = XStreamFactory.INSTANCE.getInstance(); Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_HH-mm-ss"); String lastmoddate = sdf.format(date); diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00003CheckContainersInconsistencies.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00003CheckContainersInconsistencies.java index 866a7d7ebd5d..1cbaee0700e2 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00003CheckContainersInconsistencies.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00003CheckContainersInconsistencies.java @@ -1,6 +1,7 @@ package com.dotmarketing.fixtask.tasks; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.beans.Inode; import com.dotmarketing.common.db.DotConnect; @@ -152,7 +153,7 @@ public List > executeFix() throws DotDataException, DotRunt public List > getModifiedData() { if (modifiedData.size() > 0) { - XStream _xstream = new XStream(new DomDriver()); + XStream _xstream = XStreamFactory.INSTANCE.getInstance(); Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_HH-mm-ss"); String lastmoddate = sdf.format(date); diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00006CheckLinksInconsistencies.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00006CheckLinksInconsistencies.java index cb7e0a1ec288..005a4444722c 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00006CheckLinksInconsistencies.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00006CheckLinksInconsistencies.java @@ -1,6 +1,7 @@ package com.dotmarketing.fixtask.tasks; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.DbConnectionFactory; @@ -155,7 +156,7 @@ public List > executeFix() throws DotDataException, DotRunti public List > getModifiedData() { if (modifiedData.size() > 0) { - XStream _xstream = new XStream(new DomDriver()); + XStream _xstream = XStreamFactory.INSTANCE.getInstance(); Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_HH-mm-ss"); String lastmoddate = sdf.format(date); diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00007CheckTemplatesInconsistencies.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00007CheckTemplatesInconsistencies.java index b7768eb12432..55b26076767d 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00007CheckTemplatesInconsistencies.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00007CheckTemplatesInconsistencies.java @@ -1,6 +1,7 @@ package com.dotmarketing.fixtask.tasks; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.DbConnectionFactory; @@ -154,7 +155,7 @@ public List > executeFix() throws DotDataException, DotRunti public List > getModifiedData() { if (modifiedData.size() > 0) { - XStream _xstream = new XStream(new DomDriver()); + XStream _xstream = XStreamFactory.INSTANCE.getInstance(); Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_HH-mm-ss"); String lastmoddate = sdf.format(date); diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00008CheckTreeInconsistencies.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00008CheckTreeInconsistencies.java index ffa792c37598..1dc0486631e0 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00008CheckTreeInconsistencies.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00008CheckTreeInconsistencies.java @@ -1,6 +1,7 @@ package com.dotmarketing.fixtask.tasks; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.DbConnectionFactory; @@ -144,7 +145,7 @@ public List > executeFix() throws DotDataException, public List > getModifiedData() { if (modifiedData.size() > 0) { - XStream _xstream = new XStream(new DomDriver()); + XStream _xstream = XStreamFactory.INSTANCE.getInstance(); Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_HH-mm-ss"); String lastmoddate = sdf.format(date); diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00009CheckContentletsInexistentInodes.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00009CheckContentletsInexistentInodes.java index dbc0b9d0802d..ba7342479900 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00009CheckContentletsInexistentInodes.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00009CheckContentletsInexistentInodes.java @@ -1,6 +1,7 @@ package com.dotmarketing.fixtask.tasks; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.HibernateUtil; @@ -121,7 +122,7 @@ public class FixTask00009CheckContentletsInexistentInodes implements FixTask { public List > getModifiedData() { if (modifiedData.size() > 0) { - XStream _xstream = new XStream(new DomDriver()); + XStream _xstream = XStreamFactory.INSTANCE.getInstance(); Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_HH-mm-ss"); String lastmoddate = sdf.format(date); diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00011RenameHostInFieldVariableName.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00011RenameHostInFieldVariableName.java index 676fc85fa961..e5f85856392d 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00011RenameHostInFieldVariableName.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00011RenameHostInFieldVariableName.java @@ -1,5 +1,6 @@ package com.dotmarketing.fixtask.tasks; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.HibernateUtil; @@ -85,7 +86,7 @@ public List> executeFix() throws DotDataException, DotRuntim public List > getModifiedData() { if (modifiedData.size() > 0) { - XStream _xstream = new XStream(new DomDriver()); + XStream _xstream = XStreamFactory.INSTANCE.getInstance(); Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_HH-mm-ss"); String lastmoddate = sdf.format(date); diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00012UpdateAssetsHosts.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00012UpdateAssetsHosts.java index fe501b3b79dd..d8b2f950aeaa 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00012UpdateAssetsHosts.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00012UpdateAssetsHosts.java @@ -1,5 +1,6 @@ package com.dotmarketing.fixtask.tasks; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.beans.Host; import com.dotmarketing.beans.Inode; @@ -195,7 +196,7 @@ public List> executeFix() throws DotDataException, DotRuntim public List> getModifiedData() { if (0 < modifiedData.size()) { - XStream _xstream = new XStream(new DomDriver()); + XStream _xstream = XStreamFactory.INSTANCE.getInstance(); Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_HH-mm-ss"); String lastmoddate = sdf.format(date); diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00020DeleteOrphanedIdentifiers.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00020DeleteOrphanedIdentifiers.java index 600aafedbb2e..d41466675ec8 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00020DeleteOrphanedIdentifiers.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00020DeleteOrphanedIdentifiers.java @@ -1,6 +1,7 @@ package com.dotmarketing.fixtask.tasks; import com.dotcms.util.CloseUtils; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.beans.Inode; import com.dotmarketing.common.db.DotConnect; @@ -140,7 +141,7 @@ public List> executeFix() throws DotDataException, public List> getModifiedData() { if (modifiedData.size() > 0) { - XStream _xstream = new XStream(new DomDriver()); + XStream _xstream = XStreamFactory.INSTANCE.getInstance(); Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_HH-mm-ss"); String lastmoddate = sdf.format(date); diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00030DeleteOrphanedAssets.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00030DeleteOrphanedAssets.java index e3220e4e3699..4a7a30f0dd70 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00030DeleteOrphanedAssets.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00030DeleteOrphanedAssets.java @@ -4,6 +4,7 @@ package com.dotmarketing.fixtask.tasks; import com.dotcms.util.CloseUtils; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.HibernateUtil; @@ -165,7 +166,7 @@ public List> executeFix() throws DotDataException, DotRuntim public List> getModifiedData() { if (modifiedData.size() > 0) { - XStream _xstream = new XStream(new DomDriver()); + XStream _xstream = XStreamFactory.INSTANCE.getInstance(); Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_HH-mm-ss"); String lastmoddate = sdf.format(date); diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00050FixInodesWithoutContentlets.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00050FixInodesWithoutContentlets.java index 76f6bc863908..983f293249b2 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00050FixInodesWithoutContentlets.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00050FixInodesWithoutContentlets.java @@ -1,6 +1,7 @@ package com.dotmarketing.fixtask.tasks; import com.dotcms.util.CloseUtils; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.HibernateUtil; @@ -141,7 +142,7 @@ public List> executeFix() throws DotDataException, public List> getModifiedData() { if (modifiedData.size() > 0) { - XStream _xstream = new XStream(new DomDriver()); + XStream _xstream = XStreamFactory.INSTANCE.getInstance(); Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_HH-mm-ss"); String lastmoddate = sdf.format(date); diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00060FixAssetType.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00060FixAssetType.java index 1e1f7f06b033..a6162ea7dfa7 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00060FixAssetType.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00060FixAssetType.java @@ -1,6 +1,7 @@ package com.dotmarketing.fixtask.tasks; import com.dotcms.util.CloseUtils; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.beans.Inode; import com.dotmarketing.business.CacheLocator; import com.dotmarketing.common.db.DotConnect; @@ -142,7 +143,7 @@ public List> executeFix() throws DotDataException, DotRuntim @Override public List> getModifiedData() { if (modifiedData.size() > 0) { - XStream _xstream = new XStream(new DomDriver()); + XStream _xstream = XStreamFactory.INSTANCE.getInstance(); Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_HH-mm-ss"); String lastmoddate = sdf.format(date); diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00080DeleteOrphanedContentTypeFields.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00080DeleteOrphanedContentTypeFields.java index cd2c2c654293..b9f17c6724e2 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00080DeleteOrphanedContentTypeFields.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00080DeleteOrphanedContentTypeFields.java @@ -1,6 +1,7 @@ package com.dotmarketing.fixtask.tasks; import com.dotcms.util.CloseUtils; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.common.db.DotConnect; import com.dotmarketing.db.HibernateUtil; @@ -118,7 +119,7 @@ public List> executeFix() throws DotDataException, @Override public List> getModifiedData() { if (modifiedData.size() > 0) { - XStream _xstream = new XStream(new DomDriver()); + XStream _xstream = XStreamFactory.INSTANCE.getInstance(); Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_HH-mm-ss"); String lastmoddate = sdf.format(date); diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00090RecreateMissingFoldersInParentPath.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00090RecreateMissingFoldersInParentPath.java index 313979844cc8..e04fb80ba60f 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00090RecreateMissingFoldersInParentPath.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00090RecreateMissingFoldersInParentPath.java @@ -6,6 +6,7 @@ import com.dotcms.repackage.com.google.common.base.Preconditions; import com.dotcms.repackage.com.google.common.base.Strings; import com.dotcms.util.CloseUtils; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.beans.Identifier; import com.dotmarketing.business.APILocator; @@ -205,7 +206,7 @@ private void createFixAudit(List> returnValue, int total) th @Override public List> getModifiedData() { if (modifiedData.size() > 0) { - XStream _xstream = new XStream(new DomDriver()); + XStream _xstream = XStreamFactory.INSTANCE.getInstance(); Date date = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_HH-mm-ss"); String lastmoddate = sdf.format(date); diff --git a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00095DeleteOrphanRelationships.java b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00095DeleteOrphanRelationships.java index 6ceb59d58ab6..aaf9ed4a249a 100644 --- a/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00095DeleteOrphanRelationships.java +++ b/dotCMS/src/main/java/com/dotmarketing/fixtask/tasks/FixTask00095DeleteOrphanRelationships.java @@ -2,6 +2,7 @@ import com.dotcms.business.WrapInTransaction; import com.dotcms.util.CloseUtils; +import com.dotcms.util.XStreamFactory; import com.dotmarketing.beans.FixAudit; import com.dotmarketing.beans.Inode; import com.dotmarketing.business.APILocator; @@ -101,7 +102,7 @@ public List> executeFix() throws DotDataException { public List> getModifiedData() { if (modifiedData.isEmpty()) { final String fixesUriSubstring = "fixes"; - final XStream xstreamObj = new XStream(new DomDriver()); + final XStream xstreamObj = XStreamFactory.INSTANCE.getInstance(); final LocalDate date = LocalDate.now(); final SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_HH-mm-ss"); final String lastModDate = sdf.format(date);