Merge branch 'master' into issue-27289-add-button-to-Content-Type-scr…

…een-enable-new-edit-mode
dotCMS · Jan 23, 2024 · 3fc1517 · 3fc1517
2 parents e230062 + 1894351
commit 3fc1517
Show file tree

Hide file tree

Showing 42 changed files with 172 additions and 135 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -908,7 +908,7 @@
             <dependency>
                 <groupId>com.thoughtworks.xstream</groupId>
                 <artifactId>xstream</artifactId>
-                <version>1.4.17</version>
+                <version>1.4.20</version>
                 <exclusions>
                     <exclusion>
                         <groupId>xpp3</groupId>

diff --git a/...edit/components/fields/content-types-fields-list/content-types-fields-list.component.scss b/...edit/components/fields/content-types-fields-list/content-types-fields-list.component.scss
@@ -1,6 +1,10 @@
 @use "variables" as *;
 $icon-size: 24px;
 
+:host {
+    overflow: auto;
+    margin-bottom: 1.5rem;
+}
 .content-types-fields-list {
     margin: 0;
     padding: 0;

diff --git a/...tlets/shared/dot-content-types-edit/components/layout/content-types-layout.component.scss b/...tlets/shared/dot-content-types-edit/components/layout/content-types-layout.component.scss
@@ -87,10 +87,6 @@ $top-height: ($toolbar-height + $tabview-nav-height + $dot-secondary-toolbar-mai
         flex-direction: column;
         flex-shrink: 0;
 
-        dot-content-types-fields-list {
-            overflow: auto;
-        }
-
         dot-content-type-fields-row-list {
             height: 200px;
         }

diff --git a/...src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/ContainerHandler.java b/...src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/ContainerHandler.java
@@ -56,6 +56,7 @@
 import com.dotcms.publishing.PublisherConfig;
 import com.dotcms.publishing.PublisherConfig.Operation;
 import com.dotcms.rendering.velocity.services.ContainerLoader;
+import com.dotcms.util.xstream.XStreamHandler;
 import com.dotmarketing.beans.Host;
 import com.dotmarketing.beans.Identifier;
 import com.dotmarketing.beans.VersionInfo;
@@ -75,7 +76,6 @@
 import com.liferay.util.FileUtil;
 import com.liferay.util.StringPool;
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
 import io.vavr.control.Try;
 
 import java.io.File;
@@ -150,7 +150,7 @@ private void handleContainers(final Collection<File> containers) throws DotPubli
     final User systemUser = userAPI.getSystemUser();
     File workingOn = null;
     try {
-      XStream xstream = new XStream(new DomDriver());
+      XStream xstream = XStreamHandler.newXStreamInstance();
       // Handle folders
       for (final File containerFile : containers) {
         workingOn = containerFile;

diff --git a/...S/src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/ContentHandler.java b/...S/src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/ContentHandler.java
@@ -65,6 +65,7 @@
 import com.dotcms.storage.FileMetadataAPI;
 import com.dotcms.storage.model.Metadata;
 import com.dotcms.util.CollectionsUtils;
+import com.dotcms.util.xstream.XStreamHandler;
 import com.dotmarketing.beans.Host;
 import com.dotmarketing.beans.Identifier;
 import com.dotmarketing.beans.MultiTree;
@@ -116,8 +117,6 @@
 import com.liferay.portal.model.User;
 import com.liferay.util.FileUtil;
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
-import com.thoughtworks.xstream.mapper.MapperWrapper;
 import io.vavr.Lazy;
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -265,7 +264,7 @@ private void handleContents(final Collection<File> contents, final File folderOu
         Contentlet content = null;
 		ContentWrapper wrapper = null;
     	try{
-	        final XStream xstream = newXStreamInstance();
+	        final XStream xstream = XStreamHandler.newXStreamInstance();
 			final Set<Pair<String,Long>> pushedIdsToIgnore = new HashSet<>();
             for (final File contentFile : contents) {
                 workingOn=contentFile;
@@ -1331,29 +1330,4 @@ private void persistMetadata(final Contentlet contentlet, final Map<String, Meta
         }
     }
 
-	/**
-	 * Custom unmapped properties safe XStream instance factory method
-	 * @return
-	 */
-	public static XStream newXStreamInstance(){
-		final XStream xstream = new XStream(new DomDriver()){
-			//This is here to prevent unmapped properties from old versions from breaking thr conversion
-			//https://stackoverflow.com/questions/5377380/how-to-make-xstream-skip-unmapped-tags-when-parsing-xml
-			@Override
-			protected MapperWrapper wrapMapper(final MapperWrapper next) {
-				return new MapperWrapper(next) {
-					@Override
-					public boolean shouldSerializeMember(final Class definedIn, final String fieldName) {
-						if (definedIn == Object.class) {
-						    Logger.warn(ContentHandler.class,String.format("unmapped property `%s` found ignored while importing bundle. ",fieldName));
-							return false;
-						}
-						return super.shouldSerializeMember(definedIn, fieldName);
-					}
-				};
-			}
-		};
-		return xstream;
-    }
-
 }
diff --git a/...terprise/java/com/dotcms/enterprise/publishing/remote/handler/ContentWorkflowHandler.java b/...terprise/java/com/dotcms/enterprise/publishing/remote/handler/ContentWorkflowHandler.java
@@ -52,6 +52,7 @@
 import com.dotcms.publisher.receiver.handler.IHandler;
 import com.dotcms.publishing.DotPublishingException;
 import com.dotcms.publishing.PublisherConfig;
+import com.dotcms.util.xstream.XStreamHandler;
 import com.dotmarketing.business.APILocator;
 import com.dotmarketing.business.Role;
 import com.dotmarketing.business.RoleAPI;
@@ -74,7 +75,6 @@
 import com.liferay.portal.model.User;
 import com.liferay.util.FileUtil;
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.io.File;
@@ -164,7 +164,7 @@ private void handleContentWorkflow(Collection<File> wFiles) throws DotPublishing
 			final ExistingContentMapping existingContentMap =
 					HandlerUtil.getExistingContentByBundleId(config.getId());
 
-			XStream xstream=new XStream(new DomDriver());
+			XStream xstream = XStreamHandler.newXStreamInstance();
             for (final File wFile : wFiles) {
             	workingOn = wFile;
                 if(wFile.isDirectory()) continue;

diff --git a/...MS/src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/FolderHandler.java b/...MS/src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/FolderHandler.java
@@ -53,6 +53,7 @@
 import com.dotcms.publisher.receiver.handler.IHandler;
 import com.dotcms.publishing.DotPublishingException;
 import com.dotcms.publishing.PublisherConfig;
+import com.dotcms.util.xstream.XStreamHandler;
 import com.dotmarketing.beans.Host;
 import com.dotmarketing.beans.Identifier;
 import com.dotmarketing.business.APILocator;
@@ -75,7 +76,6 @@
 import com.liferay.portal.model.User;
 import com.liferay.util.FileUtil;
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
 import io.vavr.control.Try;
 
 import java.io.File;
@@ -167,7 +167,7 @@ private void handleFolders(Collection<File> folders) throws DotPublishingExcepti
 		Host host = null;
         File workingOn = null;
 		try{
-	        XStream xstream=new XStream(new DomDriver());
+	        XStream xstream = XStreamHandler.newXStreamInstance();
 	        //Handle folders
 	        for(File folderFile: folders) {
 	            workingOn = folderFile;

diff --git a/.../src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/LanguageHandler.java b/.../src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/LanguageHandler.java
@@ -53,6 +53,7 @@
 import com.dotcms.publisher.receiver.handler.IHandler;
 import com.dotcms.publishing.DotPublishingException;
 import com.dotcms.publishing.PublisherConfig;
+import com.dotcms.util.xstream.XStreamHandler;
 import com.dotmarketing.business.APILocator;
 import com.dotmarketing.exception.DotDataException;
 import com.dotmarketing.portlets.languagesmanager.business.LanguageAPI;
@@ -64,7 +65,6 @@
 import com.dotmarketing.util.UtilMethods;
 import com.liferay.util.FileUtil;
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
 
 import java.io.File;
 import java.io.InputStream;
@@ -116,7 +116,7 @@ private void handleLanguages(Collection<File> languages) throws DotPublishingExc
 	    try{
 
 			final List<Language> publishCollectedLanguages = new ArrayList<>();
-	        final XStream xstream = new XStream(new DomDriver());
+	        final XStream xstream = XStreamHandler.newXStreamInstance();
 
 	        for(final File languageFile: languages) {
                 workingOn = languageFile;

diff --git a/dotCMS/src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/LinkHandler.java b/dotCMS/src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/LinkHandler.java
@@ -54,6 +54,7 @@
 import com.dotcms.publisher.receiver.handler.IHandler;
 import com.dotcms.publishing.DotPublishingException;
 import com.dotcms.publishing.PublisherConfig;
+import com.dotcms.util.xstream.XStreamHandler;
 import com.dotmarketing.beans.Host;
 import com.dotmarketing.beans.Identifier;
 import com.dotmarketing.beans.VersionInfo;
@@ -73,7 +74,6 @@
 import com.liferay.portal.model.User;
 import com.liferay.util.FileUtil;
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
 
 import java.io.File;
 import java.io.InputStream;
@@ -137,7 +137,7 @@ private void handleLinks(Collection<File> links) throws DotPublishingException,
 	    File workingOn = null;
 	    Link linkToPublish = null;
 		try{
-	        XStream xstream=new XStream(new DomDriver());
+	        XStream xstream = XStreamHandler.newXStreamInstance();
 
 	        for(File linkFile: links) {
 	            workingOn = linkFile;

diff --git a/.../enterprise/java/com/dotcms/enterprise/publishing/remote/handler/RelationshipHandler.java b/.../enterprise/java/com/dotcms/enterprise/publishing/remote/handler/RelationshipHandler.java
@@ -53,6 +53,7 @@
 import com.dotcms.publishing.DotPublishingException;
 import com.dotcms.publishing.PublisherConfig;
 import com.dotcms.publishing.PublisherConfig.Operation;
+import com.dotcms.util.xstream.XStreamHandler;
 import com.dotmarketing.business.APILocator;
 import com.dotmarketing.business.RelationshipAPI;
 import com.dotmarketing.portlets.structure.model.Relationship;
@@ -63,7 +64,6 @@
 import com.dotmarketing.util.UtilMethods;
 import com.liferay.util.FileUtil;
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
 import java.io.File;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -112,7 +112,7 @@ private void handleRelationships(Collection<File> relationships) throws DotPubli
 	    Relationship relationshipToPublish = null;
 		try{
 			RelationshipAPI relationshipAPI = APILocator.getRelationshipAPI();
-			XStream xstream=new XStream(new DomDriver());
+			XStream xstream = XStreamHandler.newXStreamInstance();
 			for(File relationshipFile : relationships){
                 workingOn = relationshipFile;
 				if(relationshipFile.isDirectory()) continue;

diff --git a/dotCMS/src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/RuleHandler.java b/dotCMS/src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/RuleHandler.java
@@ -55,6 +55,7 @@
 import com.dotcms.publisher.receiver.handler.IHandler;
 import com.dotcms.publishing.DotPublishingException;
 import com.dotcms.publishing.PublisherConfig;
+import com.dotcms.util.xstream.XStreamHandler;
 import com.dotmarketing.business.APILocator;
 import com.dotmarketing.exception.DotDataException;
 import com.dotmarketing.exception.DotSecurityException;
@@ -71,7 +72,6 @@
 import com.liferay.util.FileUtil;
 import com.liferay.util.StringPool;
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
@@ -173,7 +173,7 @@ public List<String> getWarnings() {
 	 */
 	private void handleRules(final Collection<File> rules) throws DotPublishingException {
 
-		final XStream xStream = new XStream(new DomDriver());
+		final XStream xStream = XStreamHandler.newXStreamInstance();
 		String ruleToProcess  = StringPool.BLANK;
 		File ruleFileToRead   = null;
 		User systemUser;

diff --git a/...src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/StructureHandler.java b/...src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/StructureHandler.java
@@ -54,6 +54,7 @@
 import com.dotcms.publishing.PublisherConfig;
 import com.dotcms.publishing.PublisherConfig.Operation;
 import com.dotcms.repackage.com.google.common.collect.ImmutableList;
+import com.dotcms.util.xstream.XStreamHandler;
 import com.dotmarketing.business.APILocator;
 import com.dotmarketing.business.CacheLocator;
 import com.dotmarketing.business.DotStateException;
@@ -74,7 +75,6 @@
 import com.liferay.portal.model.User;
 import com.liferay.util.FileUtil;
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
 import java.io.File;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -118,7 +118,7 @@ private void handleStructures(Collection<File> structures) throws DotPublishingE
         }
 
 		try{
-	        XStream xstream=new XStream(new DomDriver());
+	        XStream xstream = XStreamHandler.newXStreamInstance();
 	        //Handle folders
 	        for(File structureFile: structures) {
 	        	if(structureFile.isDirectory()) continue;

diff --git a/.../src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/TemplateHandler.java b/.../src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/TemplateHandler.java
@@ -55,6 +55,7 @@
 import com.dotcms.publishing.DotPublishingException;
 import com.dotcms.publishing.PublisherConfig;
 import com.dotcms.rendering.velocity.services.TemplateLoader;
+import com.dotcms.util.xstream.XStreamHandler;
 import com.dotmarketing.beans.Host;
 import com.dotmarketing.beans.Identifier;
 import com.dotmarketing.beans.VersionInfo;
@@ -74,7 +75,6 @@
 import com.liferay.util.FileUtil;
 import com.liferay.util.StringPool;
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
 import java.io.File;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -127,7 +127,7 @@ private void handleTemplates(Collection<File> templates) throws DotPublishingExc
 	    File workingOn = null;
         Template template = null;
         try{
-	        XStream xstream=new XStream(new DomDriver());
+	        XStream xstream = XStreamHandler.newXStreamInstance();
 	        //Handle folders
 	        for(File templateFile: templates) {
 	            workingOn = templateFile;

diff --git a/dotCMS/src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/UserHandler.java b/dotCMS/src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/UserHandler.java
@@ -53,6 +53,7 @@
 import com.dotcms.publisher.receiver.handler.IHandler;
 import com.dotcms.publishing.DotPublishingException;
 import com.dotcms.publishing.PublisherConfig;
+import com.dotcms.util.xstream.XStreamHandler;
 import com.dotmarketing.business.APILocator;
 import com.dotmarketing.business.NoSuchUserException;
 import com.dotmarketing.business.Role;
@@ -67,12 +68,10 @@
 import com.liferay.portal.model.User;
 import com.liferay.util.FileUtil;
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
 import java.io.File;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.util.Collection;
-import java.util.List;
 
 /**
  * This handler class is part of the Push Publishing mechanism that deals with User-related information inside a
@@ -125,7 +124,7 @@ public void handle ( File bundleFolder ) throws Exception {
 
             //Get the list of wrapper files
             Collection<File> usersData = FileUtil.listFilesRecursively( bundleFolder, new UserBundler().getFileFilter() );
-            XStream xstream = new XStream( new DomDriver() );
+            XStream xstream = XStreamHandler.newXStreamInstance();
             for ( File userData : usersData ) {
                 workingOn = userData;
                 if ( userData.isDirectory() ) {

diff --git a/.../src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/WorkflowHandler.java b/.../src/enterprise/java/com/dotcms/enterprise/publishing/remote/handler/WorkflowHandler.java
@@ -55,6 +55,7 @@
 import com.dotcms.publishing.DotPublishingException;
 import com.dotcms.publishing.PublisherConfig;
 import com.dotcms.publishing.PublisherConfig.Operation;
+import com.dotcms.util.xstream.XStreamHandler;
 import com.dotcms.workflow.helper.SystemActionMappingsHandlerMerger;
 import com.dotmarketing.beans.Permission;
 import com.dotmarketing.business.APILocator;
@@ -81,7 +82,6 @@
 import com.liferay.portal.model.User;
 import com.liferay.util.FileUtil;
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -153,7 +153,7 @@ private void handleWorkflows(final Collection<File> workflows)
         File workingOn = null;
         try {
 
-            final XStream xstream = new XStream(new DomDriver());
+            final XStream xstream = XStreamHandler.newXStreamInstance();
             final WorkflowAPI workflowAPI = APILocator.getWorkflowAPI();
             //Handle folders
             for (final File workflowFile : workflows) {

diff --git a/...rc/enterprise/java/com/dotcms/enterprise/publishing/staticpublishing/StaticPublisher.java b/...rc/enterprise/java/com/dotcms/enterprise/publishing/staticpublishing/StaticPublisher.java
@@ -144,7 +144,7 @@ public StaticPublisher() {
      */
     private void checkLicense() {
         if (LicenseUtil.getLevel() < REQUIRED_LICENSE_LEVEL) {
-            throw new RuntimeException("Need an Platform license to run this functionality");
+            throw new RuntimeException("Need a Platform license to run this functionality");
         }
     } //checkLicense.
 

diff --git a/...gration-test/java/com/dotcms/enterprise/publishing/remote/handler/ContentHandlerTest.java b/...gration-test/java/com/dotcms/enterprise/publishing/remote/handler/ContentHandlerTest.java
@@ -4,9 +4,9 @@
 import static org.junit.Assert.assertTrue;
 
 import com.dotcms.publisher.pusher.wrapper.ContentWrapper;
-import com.dotcms.security.apps.SecretsStore;
 import com.dotcms.test.util.FileTestUtil;
 import com.dotcms.util.IntegrationTestInitService;
+import com.dotcms.util.xstream.XStreamHandler;
 import com.dotmarketing.portlets.contentlet.model.Contentlet;
 import com.thoughtworks.xstream.XStream;
 import java.io.File;
@@ -34,7 +34,7 @@ public static void prepare() throws Exception {
      */
     @Test
     public void Test_XStream_Deserializer() throws IOException {
-        final XStream xStream = ContentHandler.newXStreamInstance();
+        final XStream xStream = XStreamHandler.newXStreamInstance();
 
         final File file = FileTestUtil.getFileInResources(INPUT_FILE_PATH);
         ContentWrapper wrapper;