From 6b3ae069404821f907d4ff7bd8e663d810693ea7 Mon Sep 17 00:00:00 2001 From: agomez-dotcms Date: Mon, 8 May 2017 09:03:55 -0600 Subject: [PATCH] Issue 10711 make use of contentType.fields() instead of FieldsCache (#11503) * #10711: Use contentType.fields() insteadof FieldsCache * #10711: Remove usage of legacy-field-transformer --- .../contenttype/util/ContentTypeImportExportUtil.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dotCMS/src/main/java/com/dotcms/contenttype/util/ContentTypeImportExportUtil.java b/dotCMS/src/main/java/com/dotcms/contenttype/util/ContentTypeImportExportUtil.java index c69b50f8f0c7..8fa2492a5e26 100644 --- a/dotCMS/src/main/java/com/dotcms/contenttype/util/ContentTypeImportExportUtil.java +++ b/dotCMS/src/main/java/com/dotcms/contenttype/util/ContentTypeImportExportUtil.java @@ -17,11 +17,8 @@ import com.dotcms.contenttype.model.field.Field; import com.dotcms.contenttype.model.field.FieldVariable; import com.dotcms.contenttype.model.type.ContentType; -import com.dotcms.contenttype.transform.field.FieldVariableTransformer; -import com.dotcms.contenttype.transform.field.LegacyFieldTransformer; import com.dotmarketing.business.APILocator; import com.dotmarketing.business.DotStateException; -import com.dotmarketing.cache.FieldsCache; import com.dotmarketing.exception.DotDataException; import com.dotmarketing.exception.DotSecurityException; import com.fasterxml.jackson.annotation.JsonInclude.Include; @@ -33,7 +30,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.liferay.portal.model.User; public class ContentTypeImportExportUtil { @@ -92,14 +88,12 @@ private void streamingJsonExport(File file, int run) throws DotDataException, Do List exporting = tapi.search(null, "mod_date", limit, offset); for (ContentType contentType : exporting) { - List fields = new LegacyFieldTransformer(FieldsCache.getFieldsByStructureInode(contentType.inode())).asList(); + List fields = contentType.fields(); List fieldVariables=new ArrayList(); for(Field ff : fields) { fieldVariables.addAll( - new FieldVariableTransformer( - APILocator.getFieldAPI().getFieldVariablesForField(ff.inode(), APILocator.getUserAPI().getSystemUser(), false) - ).newFieldList() + APILocator.getContentTypeFieldAPI().loadVariables(ff) ); }