Skip to content

Commit

Permalink
Issue 10711 make use of contentType.fields() instead of FieldsCache (#…
Browse files Browse the repository at this point in the history
…11503)

* #10711: Use contentType.fields() insteadof FieldsCache

* #10711: Remove usage of legacy-field-transformer
  • Loading branch information
agomez-dotcms authored and dsilvam committed May 8, 2017
1 parent 4d4d6c1 commit 6b3ae06
Showing 1 changed file with 2 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down Expand Up @@ -92,14 +88,12 @@ private void streamingJsonExport(File file, int run) throws DotDataException, Do
List<ContentType> exporting = tapi.search(null, "mod_date", limit, offset);
for (ContentType contentType : exporting) {

List<Field> fields = new LegacyFieldTransformer(FieldsCache.getFieldsByStructureInode(contentType.inode())).asList();
List<Field> fields = contentType.fields();

List<FieldVariable> fieldVariables=new ArrayList<FieldVariable>();
for(Field ff : fields) {
fieldVariables.addAll(
new FieldVariableTransformer(
APILocator.getFieldAPI().getFieldVariablesForField(ff.inode(), APILocator.getUserAPI().getSystemUser(), false)
).newFieldList()
APILocator.getContentTypeFieldAPI().loadVariables(ff)
);
}

Expand Down

0 comments on commit 6b3ae06

Please sign in to comment.