From 83438308fda55a0a78c1693194686ccbb82cb43f Mon Sep 17 00:00:00 2001 From: Inacio Nery Date: Mon, 22 Feb 2016 11:00:21 -0300 Subject: [PATCH] LPS-63968 Remove calls of DDMBeanTranslatorUtil on Journal --- .../search/test/JournalArticleSearchTest.java | 47 ++++++++++++++++------ .../web/asset/JournalArticleAssetRenderer.java | 8 ++++ .../asset/JournalArticleAssetRendererFactory.java | 8 ++++ .../asset/JournalArticleDDMFormValuesReader.java | 9 ++++- 4 files changed, 57 insertions(+), 15 deletions(-) diff --git a/modules/apps/web-experience/journal/journal-test/src/testIntegration/java/com/liferay/journal/search/test/JournalArticleSearchTest.java b/modules/apps/web-experience/journal/journal-test/src/testIntegration/java/com/liferay/journal/search/test/JournalArticleSearchTest.java index ea464ba..13b8bb0 100644 --- a/modules/apps/web-experience/journal/journal-test/src/testIntegration/java/com/liferay/journal/search/test/JournalArticleSearchTest.java +++ b/modules/apps/web-experience/journal/journal-test/src/testIntegration/java/com/liferay/journal/search/test/JournalArticleSearchTest.java @@ -23,6 +23,7 @@ import com.liferay.dynamic.data.mapping.service.DDMStructureLocalServiceUtil; import com.liferay.dynamic.data.mapping.test.util.DDMStructureTestUtil; import com.liferay.dynamic.data.mapping.test.util.DDMTemplateTestUtil; import com.liferay.dynamic.data.mapping.test.util.search.TestOrderHelper; +import com.liferay.dynamic.data.mapping.util.DDMBeanTranslator; import com.liferay.dynamic.data.mapping.util.DDMIndexer; import com.liferay.dynamic.data.mapping.util.DDMUtil; import com.liferay.journal.configuration.JournalServiceConfigurationValues; @@ -98,6 +99,7 @@ public class JournalArticleSearchTest extends BaseSearchTestCase { super.setUp(); + setUpDDMBeanTranslator(); setUpDDMIndexer(); } @@ -153,7 +155,8 @@ public class JournalArticleSearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMBooleanField() throws Exception { TestOrderHelper testOrderHelper = - new JournalArticleSearchTestOrderHelper(_ddmIndexer, group); + new JournalArticleSearchTestOrderHelper( + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMBooleanField(); } @@ -161,7 +164,8 @@ public class JournalArticleSearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMBooleanFieldRepeatable() throws Exception { TestOrderHelper testOrderHelper = - new JournalArticleSearchTestOrderHelper(_ddmIndexer, group); + new JournalArticleSearchTestOrderHelper( + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMBooleanFieldRepeatable(); } @@ -169,7 +173,8 @@ public class JournalArticleSearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMIntegerField() throws Exception { TestOrderHelper testOrderHelper = - new JournalArticleSearchTestOrderHelper(_ddmIndexer, group); + new JournalArticleSearchTestOrderHelper( + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMIntegerField(); } @@ -177,7 +182,8 @@ public class JournalArticleSearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMIntegerFieldRepeatable() throws Exception { TestOrderHelper testOrderHelper = - new JournalArticleSearchTestOrderHelper(_ddmIndexer, group); + new JournalArticleSearchTestOrderHelper( + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMIntegerFieldRepeatable(); } @@ -185,7 +191,8 @@ public class JournalArticleSearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMNumberField() throws Exception { TestOrderHelper testOrderHelper = - new JournalArticleSearchTestOrderHelper(_ddmIndexer, group); + new JournalArticleSearchTestOrderHelper( + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMNumberField(); } @@ -193,7 +200,8 @@ public class JournalArticleSearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMNumberFieldRepeatable() throws Exception { TestOrderHelper testOrderHelper = - new JournalArticleSearchTestOrderHelper(_ddmIndexer, group); + new JournalArticleSearchTestOrderHelper( + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMNumberFieldRepeatable(); } @@ -201,7 +209,8 @@ public class JournalArticleSearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMRadioField() throws Exception { TestOrderHelper testOrderHelper = - new JournalArticleSearchTestOrderHelper(_ddmIndexer, group); + new JournalArticleSearchTestOrderHelper( + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMRadioField(); } @@ -209,7 +218,8 @@ public class JournalArticleSearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMRadioFieldKeyword() throws Exception { TestOrderHelper testOrderHelper = - new JournalArticleSearchTestOrderHelper(_ddmIndexer, group); + new JournalArticleSearchTestOrderHelper( + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMRadioFieldKeyword(); } @@ -217,7 +227,8 @@ public class JournalArticleSearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMTextField() throws Exception { TestOrderHelper testOrderHelper = - new JournalArticleSearchTestOrderHelper(_ddmIndexer, group); + new JournalArticleSearchTestOrderHelper( + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMTextField(); } @@ -225,7 +236,8 @@ public class JournalArticleSearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMTextFieldKeyword() throws Exception { TestOrderHelper testOrderHelper = - new JournalArticleSearchTestOrderHelper(_ddmIndexer, group); + new JournalArticleSearchTestOrderHelper( + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMTextFieldKeyword(); } @@ -233,7 +245,8 @@ public class JournalArticleSearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMTextFieldRepeatable() throws Exception { TestOrderHelper testOrderHelper = - new JournalArticleSearchTestOrderHelper(_ddmIndexer, group); + new JournalArticleSearchTestOrderHelper( + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMTextFieldRepeatable(); } @@ -454,6 +467,12 @@ public class JournalArticleSearchTest extends BaseSearchTestCase { return hits.getLength(); } + protected void setUpDDMBeanTranslator() { + Registry registry = RegistryUtil.getRegistry(); + + _ddmBeanTranslator = registry.getService(DDMBeanTranslator.class); + } + protected void setUpDDMIndexer() { Registry registry = RegistryUtil.getRegistry(); @@ -492,10 +511,11 @@ public class JournalArticleSearchTest extends BaseSearchTestCase { extends TestOrderHelper { protected JournalArticleSearchTestOrderHelper( - DDMIndexer ddmIndexer, Group group) + DDMBeanTranslator ddmBeanTranslator, DDMIndexer ddmIndexer, + Group group) throws Exception { - super(ddmIndexer, group); + super(ddmBeanTranslator, ddmIndexer, group); } @Override @@ -564,6 +584,7 @@ public class JournalArticleSearchTest extends BaseSearchTestCase { } + private DDMBeanTranslator _ddmBeanTranslator; private DDMIndexer _ddmIndexer; private DDMStructure _ddmStructure; diff --git a/modules/apps/web-experience/journal/journal-web/src/main/java/com/liferay/journal/web/asset/JournalArticleAssetRenderer.java b/modules/apps/web-experience/journal/journal-web/src/main/java/com/liferay/journal/web/asset/JournalArticleAssetRenderer.java index 0cd0b39..9781276 100644 --- a/modules/apps/web-experience/journal/journal-web/src/main/java/com/liferay/journal/web/asset/JournalArticleAssetRenderer.java +++ b/modules/apps/web-experience/journal/journal-web/src/main/java/com/liferay/journal/web/asset/JournalArticleAssetRenderer.java @@ -16,6 +16,7 @@ package com.liferay.journal.web.asset; import com.liferay.asset.kernel.model.BaseJSPAssetRenderer; import com.liferay.asset.kernel.model.DDMFormValuesReader; +import com.liferay.dynamic.data.mapping.util.DDMBeanTranslator; import com.liferay.dynamic.data.mapping.util.FieldsToDDMFormValuesConverter; import com.liferay.journal.configuration.JournalServiceConfigurationValues; import com.liferay.journal.constants.JournalPortletKeys; @@ -121,6 +122,8 @@ public class JournalArticleAssetRenderer JournalArticleDDMFormValuesReader journalArticleDDMFormValuesReader = new JournalArticleDDMFormValuesReader(_article); + journalArticleDDMFormValuesReader.setDDMBeanTranslator( + _ddmBeanTranslator); journalArticleDDMFormValuesReader.setFieldsToDDMFormValuesConverter( _fieldsToDDMFormValuesConverter); journalArticleDDMFormValuesReader.setJournalConverter( @@ -455,6 +458,10 @@ public class JournalArticleAssetRenderer return true; } + public void setDDMBeanTranslator(DDMBeanTranslator ddmBeanTranslator) { + _ddmBeanTranslator = ddmBeanTranslator; + } + public void setFieldsToDDMFormValuesConverter( FieldsToDDMFormValuesConverter fieldsToDDMFormValuesConverter) { @@ -537,6 +544,7 @@ public class JournalArticleAssetRenderer } private final JournalArticle _article; + private DDMBeanTranslator _ddmBeanTranslator; private FieldsToDDMFormValuesConverter _fieldsToDDMFormValuesConverter; private JournalContent _journalContent; private JournalConverter _journalConverter; diff --git a/modules/apps/web-experience/journal/journal-web/src/main/java/com/liferay/journal/web/asset/JournalArticleAssetRendererFactory.java b/modules/apps/web-experience/journal/journal-web/src/main/java/com/liferay/journal/web/asset/JournalArticleAssetRendererFactory.java index d8952f1..d56f1a0 100644 --- a/modules/apps/web-experience/journal/journal-web/src/main/java/com/liferay/journal/web/asset/JournalArticleAssetRendererFactory.java +++ b/modules/apps/web-experience/journal/journal-web/src/main/java/com/liferay/journal/web/asset/JournalArticleAssetRendererFactory.java @@ -22,6 +22,7 @@ import com.liferay.asset.kernel.model.ClassTypeReader; import com.liferay.dynamic.data.mapping.model.DDMStructure; import com.liferay.dynamic.data.mapping.service.DDMStructureLocalService; import com.liferay.dynamic.data.mapping.service.permission.DDMStructurePermission; +import com.liferay.dynamic.data.mapping.util.DDMBeanTranslator; import com.liferay.dynamic.data.mapping.util.FieldsToDDMFormValuesConverter; import com.liferay.journal.constants.JournalPortletKeys; import com.liferay.journal.model.JournalArticle; @@ -240,6 +241,11 @@ public class JournalArticleAssetRendererFactory } @Reference(unbind = "-") + public void setDDMBeanTranslator(DDMBeanTranslator ddmBeanTranslator) { + _ddmBeanTranslator = ddmBeanTranslator; + } + + @Reference(unbind = "-") public void setFieldsToDDMFormValuesConverter( FieldsToDDMFormValuesConverter fieldsToDDMFormValuesConverter) { @@ -259,6 +265,7 @@ public class JournalArticleAssetRendererFactory JournalArticleAssetRenderer journalArticleAssetRenderer = new JournalArticleAssetRenderer(article); + journalArticleAssetRenderer.setDDMBeanTranslator(_ddmBeanTranslator); journalArticleAssetRenderer.setFieldsToDDMFormValuesConverter( _fieldsToDDMFormValuesConverter); journalArticleAssetRenderer.setJournalContent(_journalContent); @@ -306,6 +313,7 @@ public class JournalArticleAssetRendererFactory _journalConverter = journalConverter; } + private DDMBeanTranslator _ddmBeanTranslator; private DDMStructureLocalService _ddmStructureLocalService; private FieldsToDDMFormValuesConverter _fieldsToDDMFormValuesConverter; private JournalArticleLocalService _journalArticleLocalService; diff --git a/modules/apps/web-experience/journal/journal-web/src/main/java/com/liferay/journal/web/asset/JournalArticleDDMFormValuesReader.java b/modules/apps/web-experience/journal/journal-web/src/main/java/com/liferay/journal/web/asset/JournalArticleDDMFormValuesReader.java index e60a894..df9434c 100644 --- a/modules/apps/web-experience/journal/journal-web/src/main/java/com/liferay/journal/web/asset/JournalArticleDDMFormValuesReader.java +++ b/modules/apps/web-experience/journal/journal-web/src/main/java/com/liferay/journal/web/asset/JournalArticleDDMFormValuesReader.java @@ -19,7 +19,7 @@ import com.liferay.dynamic.data.mapping.kernel.DDMFormValues; import com.liferay.dynamic.data.mapping.model.DDMStructure; import com.liferay.dynamic.data.mapping.service.DDMStructureLocalServiceUtil; import com.liferay.dynamic.data.mapping.storage.Fields; -import com.liferay.dynamic.data.mapping.util.DDMBeanTranslatorUtil; +import com.liferay.dynamic.data.mapping.util.DDMBeanTranslator; import com.liferay.dynamic.data.mapping.util.FieldsToDDMFormValuesConverter; import com.liferay.journal.model.JournalArticle; import com.liferay.journal.util.JournalConverter; @@ -47,7 +47,7 @@ final class JournalArticleDDMFormValuesReader extends BaseDDMFormValuesReader { Fields fields = _journalConverter.getDDMFields( ddmStructure, _article.getContent()); - return DDMBeanTranslatorUtil.translate( + return _ddmBeanTranslator.translate( _fieldsToDDMFormValuesConverter.convert(ddmStructure, fields)); } catch (Exception e) { @@ -60,6 +60,10 @@ final class JournalArticleDDMFormValuesReader extends BaseDDMFormValuesReader { _journalConverter = journalConverter; } + public void setDDMBeanTranslator(DDMBeanTranslator ddmBeanTranslator) { + _ddmBeanTranslator = ddmBeanTranslator; + } + public void setFieldsToDDMFormValuesConverter( FieldsToDDMFormValuesConverter fieldsToDDMFormValuesConverter) { @@ -67,6 +71,7 @@ final class JournalArticleDDMFormValuesReader extends BaseDDMFormValuesReader { } private final JournalArticle _article; + private DDMBeanTranslator _ddmBeanTranslator; private FieldsToDDMFormValuesConverter _fieldsToDDMFormValuesConverter; private JournalConverter _journalConverter; } \ No newline at end of file -- 2.6.2 From dbee1fa5e3d2aa105eef46d56e74a5ddfd283573 Mon Sep 17 00:00:00 2001 From: Inacio Nery Date: Mon, 22 Feb 2016 11:00:51 -0300 Subject: [PATCH] LPS-63968 Remove calls of DDMBeanTranslatorUtil on Document Library --- .../lar/FileEntryStagedModelDataHandler.java | 12 +++++-- .../library/search/test/DLFileEntrySearchTest.java | 39 +++++++++++++--------- .../test/DLFileEntryMetadataLocalServiceTest.java | 12 +++++-- .../service/test/DLFileEntryTypeServiceTest.java | 12 +++++-- .../verify/test/DLServiceVerifyProcessTest.java | 12 +++++-- 5 files changed, 63 insertions(+), 24 deletions(-) diff --git a/modules/apps/collaboration/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FileEntryStagedModelDataHandler.java b/modules/apps/collaboration/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FileEntryStagedModelDataHandler.java index 9fd4fa8..a852fb9 100644 --- a/modules/apps/collaboration/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FileEntryStagedModelDataHandler.java +++ b/modules/apps/collaboration/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FileEntryStagedModelDataHandler.java @@ -34,7 +34,7 @@ import com.liferay.dynamic.data.mapping.io.DDMFormValuesJSONSerializer; import com.liferay.dynamic.data.mapping.kernel.DDMFormValues; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; import com.liferay.dynamic.data.mapping.storage.StorageEngine; -import com.liferay.dynamic.data.mapping.util.DDMBeanTranslatorUtil; +import com.liferay.dynamic.data.mapping.util.DDMBeanTranslator; import com.liferay.exportimport.kernel.lar.ExportImportPathUtil; import com.liferay.exportimport.kernel.lar.ExportImportThreadLocal; import com.liferay.exportimport.kernel.lar.PortletDataContext; @@ -188,6 +188,11 @@ public class FileEntryStagedModelDataHandler } } + @Reference(unbind = "-") + public void setDDMBeanTranslator(DDMBeanTranslator ddmBeanTranslator) { + _ddmBeanTranslator = ddmBeanTranslator; + } + @Override protected void doExportStagedModel( PortletDataContext portletDataContext, FileEntry fileEntry) @@ -671,7 +676,7 @@ public class FileEntryStagedModelDataHandler com.liferay.dynamic.data.mapping.storage.DDMFormValues ddmFormValues = _ddmFormValuesJSONDeserializer.deserialize( - DDMBeanTranslatorUtil.translate(ddmStructure.getDDMForm()), + _ddmBeanTranslator.translate(ddmStructure.getDDMForm()), serializedDDMFormValues); ddmFormValues = @@ -679,7 +684,7 @@ public class FileEntryStagedModelDataHandler replaceImportContentReferences( portletDataContext, ddmStructure, ddmFormValues); - return DDMBeanTranslatorUtil.translate(ddmFormValues); + return _ddmBeanTranslator.translate(ddmFormValues); } protected void importMetaData( @@ -872,6 +877,7 @@ public class FileEntryStagedModelDataHandler private static final Log _log = LogFactoryUtil.getLog( FileEntryStagedModelDataHandler.class); + private DDMBeanTranslator _ddmBeanTranslator; private DDMFormValuesExportImportContentProcessor _ddmFormValuesExportImportContentProcessor; private DDMFormValuesJSONDeserializer _ddmFormValuesJSONDeserializer; diff --git a/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/search/test/DLFileEntrySearchTest.java b/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/search/test/DLFileEntrySearchTest.java index 9662611..7793462 100644 --- a/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/search/test/DLFileEntrySearchTest.java +++ b/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/search/test/DLFileEntrySearchTest.java @@ -35,7 +35,7 @@ import com.liferay.dynamic.data.mapping.model.DDMTemplate; import com.liferay.dynamic.data.mapping.service.DDMStructureLocalServiceUtil; import com.liferay.dynamic.data.mapping.test.util.DDMStructureTestUtil; import com.liferay.dynamic.data.mapping.test.util.search.TestOrderHelper; -import com.liferay.dynamic.data.mapping.util.DDMBeanTranslatorUtil; +import com.liferay.dynamic.data.mapping.util.DDMBeanTranslator; import com.liferay.dynamic.data.mapping.util.DDMIndexer; import com.liferay.dynamic.data.mapping.util.DDMUtil; import com.liferay.portal.kernel.dao.orm.QueryUtil; @@ -103,6 +103,7 @@ public class DLFileEntrySearchTest extends BaseSearchTestCase { setUpPermissionThreadLocal(); setUpPrincipalThreadLocal(); + setUpDDMBeanTranslator(); setUpDDMIndexer(); } @@ -122,7 +123,7 @@ public class DLFileEntrySearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMBooleanField() throws Exception { TestOrderHelper testOrderHelper = new DLFileEntrySearchTestOrderHelper( - _ddmIndexer, group); + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMBooleanField(); } @@ -130,7 +131,7 @@ public class DLFileEntrySearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMBooleanFieldRepeatable() throws Exception { TestOrderHelper testOrderHelper = new DLFileEntrySearchTestOrderHelper( - _ddmIndexer, group); + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMBooleanFieldRepeatable(); } @@ -138,7 +139,7 @@ public class DLFileEntrySearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMIntegerField() throws Exception { TestOrderHelper testOrderHelper = new DLFileEntrySearchTestOrderHelper( - _ddmIndexer, group); + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMIntegerField(); } @@ -146,7 +147,7 @@ public class DLFileEntrySearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMIntegerFieldRepeatable() throws Exception { TestOrderHelper testOrderHelper = new DLFileEntrySearchTestOrderHelper( - _ddmIndexer, group); + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMIntegerFieldRepeatable(); } @@ -154,7 +155,7 @@ public class DLFileEntrySearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMNumberField() throws Exception { TestOrderHelper testOrderHelper = new DLFileEntrySearchTestOrderHelper( - _ddmIndexer, group); + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMNumberField(); } @@ -162,7 +163,7 @@ public class DLFileEntrySearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMNumberFieldRepeatable() throws Exception { TestOrderHelper testOrderHelper = new DLFileEntrySearchTestOrderHelper( - _ddmIndexer, group); + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMNumberFieldRepeatable(); } @@ -170,7 +171,7 @@ public class DLFileEntrySearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMRadioField() throws Exception { TestOrderHelper testOrderHelper = new DLFileEntrySearchTestOrderHelper( - _ddmIndexer, group); + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMRadioField(); } @@ -178,7 +179,7 @@ public class DLFileEntrySearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMRadioFieldKeyword() throws Exception { TestOrderHelper testOrderHelper = new DLFileEntrySearchTestOrderHelper( - _ddmIndexer, group); + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMRadioFieldKeyword(); } @@ -186,7 +187,7 @@ public class DLFileEntrySearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMTextField() throws Exception { TestOrderHelper testOrderHelper = new DLFileEntrySearchTestOrderHelper( - _ddmIndexer, group); + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMTextField(); } @@ -194,7 +195,7 @@ public class DLFileEntrySearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMTextFieldKeyword() throws Exception { TestOrderHelper testOrderHelper = new DLFileEntrySearchTestOrderHelper( - _ddmIndexer, group); + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMTextFieldKeyword(); } @@ -202,7 +203,7 @@ public class DLFileEntrySearchTest extends BaseSearchTestCase { @Test public void testOrderByDDMTextFieldRepeatable() throws Exception { TestOrderHelper testOrderHelper = new DLFileEntrySearchTestOrderHelper( - _ddmIndexer, group); + _ddmBeanTranslator, _ddmIndexer, group); testOrderHelper.testOrderByDDMTextFieldRepeatable(); } @@ -278,7 +279,7 @@ public class DLFileEntrySearchTest extends BaseSearchTestCase { String content = "Content: Enterprise. Open Source. For Life."; DDMFormValues ddmFormValues = createDDMFormValues( - DDMBeanTranslatorUtil.translate(_ddmStructure.getDDMForm())); + _ddmBeanTranslator.translate(_ddmStructure.getDDMForm())); for (String keyword : keywords) { ddmFormValues.addDDMFormFieldValue( @@ -466,6 +467,12 @@ public class DLFileEntrySearchTest extends BaseSearchTestCase { return hits.getLength(); } + protected void setUpDDMBeanTranslator() { + Registry registry = RegistryUtil.getRegistry(); + + _ddmBeanTranslator = registry.getService(DDMBeanTranslator.class); + } + protected void setUpDDMIndexer() { Registry registry = RegistryUtil.getRegistry(); @@ -534,10 +541,11 @@ public class DLFileEntrySearchTest extends BaseSearchTestCase { protected class DLFileEntrySearchTestOrderHelper extends TestOrderHelper { protected DLFileEntrySearchTestOrderHelper( - DDMIndexer ddmIndexer, Group group) + DDMBeanTranslator ddmBeanTranslator, DDMIndexer ddmIndexer, + Group group) throws Exception { - super(ddmIndexer, group); + super(ddmBeanTranslator, ddmIndexer, group); } @Override @@ -594,6 +602,7 @@ public class DLFileEntrySearchTest extends BaseSearchTestCase { private static final int _FOLDER_NAME_MAX_LENGTH = 100; + private DDMBeanTranslator _ddmBeanTranslator; private DDMIndexer _ddmIndexer; private DDMStructure _ddmStructure; private String _originalName; diff --git a/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileEntryMetadataLocalServiceTest.java b/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileEntryMetadataLocalServiceTest.java index 81e5012..4a32a6e 100644 --- a/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileEntryMetadataLocalServiceTest.java +++ b/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileEntryMetadataLocalServiceTest.java @@ -32,7 +32,7 @@ import com.liferay.dynamic.data.mapping.kernel.UnlocalizedValue; import com.liferay.dynamic.data.mapping.model.DDMStructure; import com.liferay.dynamic.data.mapping.service.DDMStructureLocalServiceUtil; import com.liferay.dynamic.data.mapping.test.util.DDMFormTestUtil; -import com.liferay.dynamic.data.mapping.util.DDMBeanTranslatorUtil; +import com.liferay.dynamic.data.mapping.util.DDMBeanTranslator; import com.liferay.portal.kernel.model.Group; import com.liferay.portal.kernel.model.User; import com.liferay.portal.kernel.service.ServiceContext; @@ -78,6 +78,7 @@ public class DLFileEntryMetadataLocalServiceTest { @Before public void setUp() throws Exception { + setUpDDMBeanTranslator(); setUpDDMFormXSDDeserializer(); _group = GroupTestUtil.addGroup(); @@ -93,7 +94,7 @@ public class DLFileEntryMetadataLocalServiceTest { _ddmFormXSDDeserializer.deserialize(new String(testFileBytes)); serviceContext.setAttribute( - "ddmForm", DDMBeanTranslatorUtil.translate(ddmForm)); + "ddmForm", _ddmBeanTranslator.translate(ddmForm)); User user = TestPropsValues.getUser(); @@ -185,6 +186,12 @@ public class DLFileEntryMetadataLocalServiceTest { } } + protected void setUpDDMBeanTranslator() { + Registry registry = RegistryUtil.getRegistry(); + + _ddmBeanTranslator = registry.getService(DDMBeanTranslator.class); + } + protected Map setUpDDMFormValuesMap( String ddmStructureKey, Locale currentLocale) { @@ -228,6 +235,7 @@ public class DLFileEntryMetadataLocalServiceTest { DDMFormXSDDeserializer.class); } + private DDMBeanTranslator _ddmBeanTranslator; private DDMFormXSDDeserializer _ddmFormXSDDeserializer; private DDMStructure _ddmStructure; private DLFileEntry _dlFileEntry; diff --git a/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileEntryTypeServiceTest.java b/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileEntryTypeServiceTest.java index b1d4fa6..86a8747 100644 --- a/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileEntryTypeServiceTest.java +++ b/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileEntryTypeServiceTest.java @@ -28,7 +28,7 @@ import com.liferay.dynamic.data.mapping.model.DDMForm; import com.liferay.dynamic.data.mapping.model.DDMStructure; import com.liferay.dynamic.data.mapping.service.DDMStructureLocalServiceUtil; import com.liferay.dynamic.data.mapping.test.util.DDMStructureTestUtil; -import com.liferay.dynamic.data.mapping.util.DDMBeanTranslatorUtil; +import com.liferay.dynamic.data.mapping.util.DDMBeanTranslator; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.model.Group; import com.liferay.portal.kernel.model.User; @@ -85,6 +85,7 @@ public class DLFileEntryTypeServiceTest { @Before public void setUp() throws Exception { + setUpDDMBeanTranslator(); setUpDDMFormXSDDeserializer(); setUpPermissionThreadLocal(); setUpPrincipalThreadLocal(); @@ -143,7 +144,7 @@ public class DLFileEntryTypeServiceTest { new String(testFileBytes)); serviceContext.setAttribute( - "ddmForm", DDMBeanTranslatorUtil.translate(ddmForm)); + "ddmForm", _ddmBeanTranslator.translate(ddmForm)); User user = TestPropsValues.getUser(); @@ -333,6 +334,12 @@ public class DLFileEntryTypeServiceTest { dlFileEntryType.getPrimaryKey(), dlFileEntry.getFileEntryTypeId()); } + protected void setUpDDMBeanTranslator() { + Registry registry = RegistryUtil.getRegistry(); + + _ddmBeanTranslator = registry.getService(DDMBeanTranslator.class); + } + protected void setUpDDMFormXSDDeserializer() { Registry registry = RegistryUtil.getRegistry(); @@ -395,6 +402,7 @@ public class DLFileEntryTypeServiceTest { private DLFileEntryType _basicDocumentDLFileEntryType; private DLFileEntryType _contractDLFileEntryType; + private DDMBeanTranslator _ddmBeanTranslator; private DDMFormXSDDeserializer _ddmFormXSDDeserializer; private List _dlFileEntryTypes; private Folder _folder; diff --git a/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/verify/test/DLServiceVerifyProcessTest.java b/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/verify/test/DLServiceVerifyProcessTest.java index 39d14e8..4958075 100644 --- a/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/verify/test/DLServiceVerifyProcessTest.java +++ b/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/verify/test/DLServiceVerifyProcessTest.java @@ -36,7 +36,7 @@ import com.liferay.dynamic.data.mapping.kernel.UnlocalizedValue; import com.liferay.dynamic.data.mapping.model.DDMStructure; import com.liferay.dynamic.data.mapping.service.DDMStructureLocalServiceUtil; import com.liferay.dynamic.data.mapping.test.util.DDMFormTestUtil; -import com.liferay.dynamic.data.mapping.util.DDMBeanTranslatorUtil; +import com.liferay.dynamic.data.mapping.util.DDMBeanTranslator; import com.liferay.portal.kernel.model.Group; import com.liferay.portal.kernel.model.User; import com.liferay.portal.kernel.repository.model.FileEntry; @@ -119,6 +119,7 @@ public class DLServiceVerifyProcessTest extends BaseVerifyProcessTestCase { public void setUp() throws Exception { super.setUp(); + setUpDDMBeanTranslator(); setUpDDMFormXSDDeserializer(); setUpPermissionThreadLocal(); setUpPrincipalThreadLocal(); @@ -388,7 +389,7 @@ public class DLServiceVerifyProcessTest extends BaseVerifyProcessTestCase { _ddmFormXSDDeserializer.deserialize(new String(bytes)); serviceContext.setAttribute( - "ddmForm", DDMBeanTranslatorUtil.translate(ddmForm)); + "ddmForm", _ddmBeanTranslator.translate(ddmForm)); User user = TestPropsValues.getUser(); @@ -475,6 +476,12 @@ public class DLServiceVerifyProcessTest extends BaseVerifyProcessTestCase { return _serviceTracker.getService(); } + protected void setUpDDMBeanTranslator() { + Registry registry = RegistryUtil.getRegistry(); + + _ddmBeanTranslator = registry.getService(DDMBeanTranslator.class); + } + protected void setUpDDMFormXSDDeserializer() { Registry registry = RegistryUtil.getRegistry(); @@ -520,6 +527,7 @@ public class DLServiceVerifyProcessTest extends BaseVerifyProcessTestCase { private static ServiceTracker _serviceTracker; + private DDMBeanTranslator _ddmBeanTranslator; private DDMFormXSDDeserializer _ddmFormXSDDeserializer; @DeleteAfterTestRun -- 2.6.2 From e665740dac0545444aefcebb0298e90013bca69b Mon Sep 17 00:00:00 2001 From: Inacio Nery Date: Mon, 22 Feb 2016 11:01:19 -0300 Subject: [PATCH] LPS-63968 Remove calls of DDMBeanTranslatorUtil on DDL --- .../data/lists/asset/DDLRecordDDMFormValuesReaderTest.java | 2 +- .../dynamic/data/lists/web/asset/DDLRecordAssetRenderer.java | 8 ++++++-- .../data/lists/web/asset/DDLRecordAssetRendererFactory.java | 10 +++++++++- .../data/lists/web/asset/DDLRecordDDMFormValuesReader.java | 10 +++++++--- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-test/src/test/java/com/liferay/dynamic/data/lists/asset/DDLRecordDDMFormValuesReaderTest.java b/modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-test/src/test/java/com/liferay/dynamic/data/lists/asset/DDLRecordDDMFormValuesReaderTest.java index b0ceb04..2efbe71 100644 --- a/modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-test/src/test/java/com/liferay/dynamic/data/lists/asset/DDLRecordDDMFormValuesReaderTest.java +++ b/modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-test/src/test/java/com/liferay/dynamic/data/lists/asset/DDLRecordDDMFormValuesReaderTest.java @@ -130,7 +130,7 @@ public class DDLRecordDDMFormValuesReaderTest { extends DDLRecordDDMFormValuesReader { public MockDDLRecordDDMFormValuesReader(DDMFormValues ddmFormValues) { - super(null); + super(null, null); _ddmFormValues = ddmFormValues; } diff --git a/modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/asset/DDLRecordAssetRenderer.java b/modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/asset/DDLRecordAssetRenderer.java index e26ccae..35ced8a 100644 --- a/modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/asset/DDLRecordAssetRenderer.java +++ b/modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/asset/DDLRecordAssetRenderer.java @@ -24,6 +24,7 @@ import com.liferay.dynamic.data.lists.model.DDLRecordSet; import com.liferay.dynamic.data.lists.model.DDLRecordVersion; import com.liferay.dynamic.data.lists.service.permission.DDLRecordSetPermission; import com.liferay.dynamic.data.mapping.model.DDMStructure; +import com.liferay.dynamic.data.mapping.util.DDMBeanTranslator; import com.liferay.portal.kernel.language.LanguageUtil; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -50,10 +51,12 @@ import javax.servlet.http.HttpServletResponse; public class DDLRecordAssetRenderer extends BaseJSPAssetRenderer { public DDLRecordAssetRenderer( - DDLRecord record, DDLRecordVersion recordVersion) { + DDLRecord record, DDLRecordVersion recordVersion, + DDMBeanTranslator ddmBeanTranslator) { _record = record; _recordVersion = recordVersion; + _ddmBeanTranslator = ddmBeanTranslator; DDMStructure ddmStructure = null; DDLRecordSet recordSet = null; @@ -95,7 +98,7 @@ public class DDLRecordAssetRenderer extends BaseJSPAssetRenderer { @Override public DDMFormValuesReader getDDMFormValuesReader() { - return new DDLRecordDDMFormValuesReader(_record); + return new DDLRecordDDMFormValuesReader(_record, _ddmBeanTranslator); } @Override @@ -209,6 +212,7 @@ public class DDLRecordAssetRenderer extends BaseJSPAssetRenderer { private static final Log _log = LogFactoryUtil.getLog( DDLRecordAssetRenderer.class); + private final DDMBeanTranslator _ddmBeanTranslator; private final DDMStructure _ddmStructure; private final DDLRecord _record; private final DDLRecordSet _recordSet; diff --git a/modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/asset/DDLRecordAssetRendererFactory.java b/modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/asset/DDLRecordAssetRendererFactory.java index 5270220..a99cc9b 100644 --- a/modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/asset/DDLRecordAssetRendererFactory.java +++ b/modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/asset/DDLRecordAssetRendererFactory.java @@ -26,6 +26,7 @@ import com.liferay.dynamic.data.lists.service.DDLRecordLocalService; import com.liferay.dynamic.data.lists.service.DDLRecordVersionLocalService; import com.liferay.dynamic.data.lists.service.permission.DDLRecordPermission; import com.liferay.dynamic.data.lists.service.permission.DDLRecordSetPermission; +import com.liferay.dynamic.data.mapping.util.DDMBeanTranslator; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.portlet.LiferayPortletRequest; import com.liferay.portal.kernel.portlet.LiferayPortletResponse; @@ -89,7 +90,8 @@ public class DDLRecordAssetRendererFactory } DDLRecordAssetRenderer ddlRecordAssetRenderer = - new DDLRecordAssetRenderer(record, recordVersion); + new DDLRecordAssetRenderer( + record, recordVersion, _ddmBeanTranslator); ddlRecordAssetRenderer.setAssetRendererType(type); ddlRecordAssetRenderer.setServletContext(_servletContext); @@ -157,6 +159,11 @@ public class DDLRecordAssetRendererFactory permissionChecker, classPK, actionId); } + @Reference(unbind = "-") + public void setDDMBeanTranslator(DDMBeanTranslator ddmBeanTranslator) { + _ddmBeanTranslator = ddmBeanTranslator; + } + @Reference( target = "(osgi.web.symbolicname=com.liferay.dynamic.data.lists.web)", unbind = "-" @@ -181,6 +188,7 @@ public class DDLRecordAssetRendererFactory private DDLRecordLocalService _ddlRecordLocalService; private DDLRecordVersionLocalService _ddlRecordVersionLocalService; + private DDMBeanTranslator _ddmBeanTranslator; private ServletContext _servletContext; } \ No newline at end of file diff --git a/modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/asset/DDLRecordDDMFormValuesReader.java b/modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/asset/DDLRecordDDMFormValuesReader.java index 1473dec..906bbbd 100644 --- a/modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/asset/DDLRecordDDMFormValuesReader.java +++ b/modules/apps/forms-and-workflow/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/asset/DDLRecordDDMFormValuesReader.java @@ -17,7 +17,7 @@ package com.liferay.dynamic.data.lists.web.asset; import com.liferay.asset.kernel.model.BaseDDMFormValuesReader; import com.liferay.dynamic.data.lists.model.DDLRecord; import com.liferay.dynamic.data.mapping.kernel.DDMFormValues; -import com.liferay.dynamic.data.mapping.util.DDMBeanTranslatorUtil; +import com.liferay.dynamic.data.mapping.util.DDMBeanTranslator; import com.liferay.portal.kernel.exception.PortalException; /** @@ -25,15 +25,19 @@ import com.liferay.portal.kernel.exception.PortalException; */ public class DDLRecordDDMFormValuesReader extends BaseDDMFormValuesReader { - public DDLRecordDDMFormValuesReader(DDLRecord ddlRecord) { + public DDLRecordDDMFormValuesReader( + DDLRecord ddlRecord, DDMBeanTranslator ddmBeanTranslator) { + _ddlRecord = ddlRecord; + _ddmBeanTranslator = ddmBeanTranslator; } @Override public DDMFormValues getDDMFormValues() throws PortalException { - return DDMBeanTranslatorUtil.translate(_ddlRecord.getDDMFormValues()); + return _ddmBeanTranslator.translate(_ddlRecord.getDDMFormValues()); } private final DDLRecord _ddlRecord; + private final DDMBeanTranslator _ddmBeanTranslator; } \ No newline at end of file -- 2.6.2 From 58e3650b23088bac09dbca76d526c1a0b971f176 Mon Sep 17 00:00:00 2001 From: Inacio Nery Date: Mon, 7 Mar 2016 10:51:50 -0300 Subject: [PATCH] LPS-63968 Move methods from DDMStructure to DDMStructureManager --- .../data/mapping/internal/DDMStructureImpl.java | 36 ------------- .../mapping/internal/DDMStructureManagerImpl.java | 61 ++++++++++++++++++++++ .../dynamic/data/mapping/kernel/DDMStructure.java | 9 ---- .../data/mapping/kernel/DDMStructureManager.java | 12 +++++ .../mapping/kernel/DDMStructureManagerUtil.java | 25 +++++++++ 5 files changed, 98 insertions(+), 45 deletions(-) diff --git a/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/DDMStructureImpl.java b/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/DDMStructureImpl.java index 5123af2..8f42a18 100644 --- a/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/DDMStructureImpl.java +++ b/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/DDMStructureImpl.java @@ -14,10 +14,7 @@ package com.liferay.dynamic.data.mapping.internal; -import com.liferay.dynamic.data.mapping.kernel.DDMForm; -import com.liferay.dynamic.data.mapping.kernel.DDMFormField; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; -import com.liferay.dynamic.data.mapping.util.DDMBeanTranslatorUtil; import com.liferay.expando.kernel.model.ExpandoBridge; import com.liferay.exportimport.kernel.lar.StagedModelType; import com.liferay.portal.kernel.exception.LocaleException; @@ -25,7 +22,6 @@ import com.liferay.portal.kernel.exception.PortalException; import java.io.Serializable; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Locale; @@ -76,32 +72,6 @@ public class DDMStructureImpl implements DDMStructure { } @Override - public DDMForm getDDMForm() { - return DDMBeanTranslatorUtil.translate(_ddmStructure.getDDMForm()); - } - - @Override - public DDMFormField getDDMFormField(String fieldName) - throws PortalException { - - return DDMBeanTranslatorUtil.translate( - _ddmStructure.getDDMFormField(fieldName)); - } - - @Override - public List getDDMFormFields(boolean includeTransientFields) { - List ddmFormFields = new ArrayList<>(); - - for (com.liferay.dynamic.data.mapping.model.DDMFormField ddmFormField : - _ddmStructure.getDDMFormFields(includeTransientFields)) { - - ddmFormFields.add(DDMBeanTranslatorUtil.translate(ddmFormField)); - } - - return ddmFormFields; - } - - @Override public String getDefinition() { return _ddmStructure.getDefinition(); } @@ -149,12 +119,6 @@ public class DDMStructureImpl implements DDMStructure { } @Override - public DDMForm getFullHierarchyDDMForm() { - return DDMBeanTranslatorUtil.translate( - _ddmStructure.getFullHierarchyDDMForm()); - } - - @Override public long getGroupId() { return _ddmStructure.getGroupId(); } diff --git a/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/DDMStructureManagerImpl.java b/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/DDMStructureManagerImpl.java index b386a42..6c00c09 100644 --- a/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/DDMStructureManagerImpl.java +++ b/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-service/src/main/java/com/liferay/dynamic/data/mapping/internal/DDMStructureManagerImpl.java @@ -23,6 +23,7 @@ import com.liferay.dynamic.data.mapping.kernel.DDMStructureManager; import com.liferay.dynamic.data.mapping.kernel.NoSuchStructureException; import com.liferay.dynamic.data.mapping.kernel.RequiredStructureException; import com.liferay.dynamic.data.mapping.kernel.StructureDefinitionException; +import com.liferay.dynamic.data.mapping.model.DDMFormField; import com.liferay.dynamic.data.mapping.service.DDMStorageLinkLocalService; import com.liferay.dynamic.data.mapping.service.DDMStructureLocalService; import com.liferay.dynamic.data.mapping.util.DDM; @@ -210,6 +211,56 @@ public class DDMStructureManagerImpl implements DDMStructureManager { } @Override + public com.liferay.dynamic.data.mapping.kernel.DDMForm getDDMForm( + long structureId) { + + com.liferay.dynamic.data.mapping.model.DDMStructure ddmStructure = + _ddmStructureLocalService.fetchDDMStructure(structureId); + + if (ddmStructure == null) { + return null; + } + + return _ddmBeanTranslator.translate(ddmStructure.getDDMForm()); + } + + @Override + public com.liferay.dynamic.data.mapping.kernel.DDMFormField getDDMFormField( + long structureId, String fieldName) + throws PortalException { + + com.liferay.dynamic.data.mapping.model.DDMStructure ddmStructure = + _ddmStructureLocalService.fetchDDMStructure(structureId); + + if (ddmStructure == null) { + return null; + } + + return _ddmBeanTranslator.translate( + ddmStructure.getDDMFormField(fieldName)); + } + + @Override + public List + getDDMFormFields(long structureId, boolean includeTransientFields) + throws PortalException { + + com.liferay.dynamic.data.mapping.model.DDMStructure ddmStructure = + _ddmStructureLocalService.getStructure(structureId); + + List + ddmFormFields = new ArrayList<>(); + + for (DDMFormField ddmFormField : + ddmStructure.getDDMFormFields(includeTransientFields)) { + + ddmFormFields.add(_ddmBeanTranslator.translate(ddmFormField)); + } + + return ddmFormFields; + } + + @Override public JSONArray getDDMFormFieldsJSONArray(long structureId, String script) throws PortalException { @@ -225,6 +276,16 @@ public class DDMStructureManagerImpl implements DDMStructureManager { } @Override + public DDMForm getFullHierarchyDDMForm(long structureId) + throws PortalException { + + com.liferay.dynamic.data.mapping.model.DDMStructure ddmStructure = + _ddmStructureLocalService.getStructure(structureId); + return _ddmBeanTranslator.translate( + ddmStructure.getFullHierarchyDDMForm()); + } + + @Override public Serializable getIndexedFieldValue( Serializable fieldValue, String fieldType) throws Exception { diff --git a/portal-kernel/src/com/liferay/dynamic/data/mapping/kernel/DDMStructure.java b/portal-kernel/src/com/liferay/dynamic/data/mapping/kernel/DDMStructure.java index a6c3631..b76ca05 100644 --- a/portal-kernel/src/com/liferay/dynamic/data/mapping/kernel/DDMStructure.java +++ b/portal-kernel/src/com/liferay/dynamic/data/mapping/kernel/DDMStructure.java @@ -33,13 +33,6 @@ public interface DDMStructure extends StagedGroupedModel { public long getClassNameId(); - public DDMForm getDDMForm(); - - public DDMFormField getDDMFormField(String fieldName) - throws PortalException; - - public List getDDMFormFields(boolean includeTransientFields); - public String getDefinition(); public String getDescription(); @@ -57,8 +50,6 @@ public interface DDMStructure extends StagedGroupedModel { public String getFieldType(String fieldName) throws PortalException; - public DDMForm getFullHierarchyDDMForm(); - @Override public long getGroupId(); diff --git a/portal-kernel/src/com/liferay/dynamic/data/mapping/kernel/DDMStructureManager.java b/portal-kernel/src/com/liferay/dynamic/data/mapping/kernel/DDMStructureManager.java index 0d10190..769ed4b 100644 --- a/portal-kernel/src/com/liferay/dynamic/data/mapping/kernel/DDMStructureManager.java +++ b/portal-kernel/src/com/liferay/dynamic/data/mapping/kernel/DDMStructureManager.java @@ -84,11 +84,23 @@ public interface DDMStructureManager { public List getClassStructures( long companyId, long classNameId, int start, int end); + public DDMForm getDDMForm(long structureId); + + public DDMFormField getDDMFormField(long structureId, String fieldName) + throws PortalException; + + public List getDDMFormFields( + long structureId, boolean includeTransientFields) + throws PortalException; + public JSONArray getDDMFormFieldsJSONArray(long structureId, String script) throws PortalException; public Class getDDMStructureModelClass(); + public DDMForm getFullHierarchyDDMForm(long structureId) + throws PortalException; + public Serializable getIndexedFieldValue( Serializable fieldValue, String fieldType) throws Exception; diff --git a/portal-kernel/src/com/liferay/dynamic/data/mapping/kernel/DDMStructureManagerUtil.java b/portal-kernel/src/com/liferay/dynamic/data/mapping/kernel/DDMStructureManagerUtil.java index 14b4d33..eef0d79 100644 --- a/portal-kernel/src/com/liferay/dynamic/data/mapping/kernel/DDMStructureManagerUtil.java +++ b/portal-kernel/src/com/liferay/dynamic/data/mapping/kernel/DDMStructureManagerUtil.java @@ -104,6 +104,25 @@ public class DDMStructureManagerUtil { companyId, classNameId, start, end); } + public static DDMForm getDDMForm(long structureId) { + return _ddmStructureManager.getDDMForm(structureId); + } + + public static DDMFormField getDDMFormField( + long structureId, String fieldName) + throws PortalException { + + return _ddmStructureManager.getDDMFormField(structureId, fieldName); + } + + public static List getDDMFormFields( + long structureId, boolean includeTransientFields) + throws PortalException { + + return _ddmStructureManager.getDDMFormFields( + structureId, includeTransientFields); + } + public static JSONArray getDDMFormFieldsJSONArray( long structureId, String script) throws PortalException { @@ -116,6 +135,12 @@ public class DDMStructureManagerUtil { return _ddmStructureManager.getDDMStructureModelClass(); } + public static DDMForm getFullHierarchyDDMForm(long structureId) + throws PortalException { + + return _ddmStructureManager.getFullHierarchyDDMForm(structureId); + } + public static Serializable getIndexedFieldValue( Serializable fieldValue, String fieldType) throws Exception { -- 2.6.2 From a90fed6bcbe6bd156188a42d69126daaf34992f2 Mon Sep 17 00:00:00 2001 From: Inacio Nery Date: Mon, 7 Mar 2016 10:54:07 -0300 Subject: [PATCH] LPS-63968 Replace call from DDMStructure to DDMStructureManager --- .../document/library/lar/FileEntryStagedModelDataHandler.java | 8 ++++++-- .../liferay/document/library/service/test/DLFileVersionTest.java | 4 +++- .../service/impl/DLFileEntryTypeLocalServiceImpl.java | 3 ++- .../portlet/dynamicdatamapping/DDMStructureManagerUtilTest.java | 6 ++++-- .../src/com/liferay/asset/kernel/model/DDMStructureClassType.java | 4 +++- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/modules/apps/collaboration/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FileEntryStagedModelDataHandler.java b/modules/apps/collaboration/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FileEntryStagedModelDataHandler.java index a852fb9..e16b728 100644 --- a/modules/apps/collaboration/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FileEntryStagedModelDataHandler.java +++ b/modules/apps/collaboration/document-library/document-library-service/src/main/java/com/liferay/document/library/lar/FileEntryStagedModelDataHandler.java @@ -31,8 +31,10 @@ import com.liferay.document.library.kernel.util.DLProcessorThreadLocal; import com.liferay.dynamic.data.mapping.exportimport.content.processor.DDMFormValuesExportImportContentProcessor; import com.liferay.dynamic.data.mapping.io.DDMFormValuesJSONDeserializer; import com.liferay.dynamic.data.mapping.io.DDMFormValuesJSONSerializer; +import com.liferay.dynamic.data.mapping.kernel.DDMForm; import com.liferay.dynamic.data.mapping.kernel.DDMFormValues; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; +import com.liferay.dynamic.data.mapping.kernel.DDMStructureManagerUtil; import com.liferay.dynamic.data.mapping.storage.StorageEngine; import com.liferay.dynamic.data.mapping.util.DDMBeanTranslator; import com.liferay.exportimport.kernel.lar.ExportImportPathUtil; @@ -674,10 +676,12 @@ public class FileEntryStagedModelDataHandler String serializedDDMFormValues = portletDataContext.getZipEntryAsString( ddmFormValuesPath); + DDMForm ddmForm = DDMStructureManagerUtil.getDDMForm( + ddmStructure.getStructureId()); + com.liferay.dynamic.data.mapping.storage.DDMFormValues ddmFormValues = _ddmFormValuesJSONDeserializer.deserialize( - _ddmBeanTranslator.translate(ddmStructure.getDDMForm()), - serializedDDMFormValues); + _ddmBeanTranslator.translate(ddmForm), serializedDDMFormValues); ddmFormValues = _ddmFormValuesExportImportContentProcessor. diff --git a/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileVersionTest.java b/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileVersionTest.java index 4d5d3d9..1b8af9f 100644 --- a/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileVersionTest.java +++ b/modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileVersionTest.java @@ -29,6 +29,7 @@ import com.liferay.dynamic.data.mapping.kernel.DDMForm; import com.liferay.dynamic.data.mapping.kernel.DDMFormFieldValue; import com.liferay.dynamic.data.mapping.kernel.DDMFormValues; import com.liferay.dynamic.data.mapping.kernel.DDMStructure; +import com.liferay.dynamic.data.mapping.kernel.DDMStructureManagerUtil; import com.liferay.dynamic.data.mapping.kernel.LocalizedValue; import com.liferay.expando.kernel.model.ExpandoColumnConstants; import com.liferay.expando.kernel.model.ExpandoTable; @@ -327,7 +328,8 @@ public class DLFileVersionTest { for (DDMStructure ddmStructure : ddmStructures) { DDMFormValues ddmFormValues = createDDMFormValues( - ddmStructure.getDDMForm()); + DDMStructureManagerUtil.getDDMForm( + ddmStructure.getStructureId())); for (String fieldName : ddmStructure.getFieldNames()) { DDMFormFieldValue ddmFormFieldValue = createDDMFormFieldValue( diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryTypeLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryTypeLocalServiceImpl.java index 39f1f0b..96094a8 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryTypeLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryTypeLocalServiceImpl.java @@ -744,7 +744,8 @@ public class DLFileEntryTypeLocalServiceImpl ddmStructureKey); if ((ddmStructure != null) && (ddmForm == null)) { - ddmForm = ddmStructure.getDDMForm(); + ddmForm = DDMStructureManagerUtil.getDDMForm( + ddmStructure.getStructureId()); } if (ddmForm == null) { diff --git a/portal-impl/test/integration/com/liferay/portlet/dynamicdatamapping/DDMStructureManagerUtilTest.java b/portal-impl/test/integration/com/liferay/portlet/dynamicdatamapping/DDMStructureManagerUtilTest.java index 7d059fd..3c785da 100644 --- a/portal-impl/test/integration/com/liferay/portlet/dynamicdatamapping/DDMStructureManagerUtilTest.java +++ b/portal-impl/test/integration/com/liferay/portlet/dynamicdatamapping/DDMStructureManagerUtilTest.java @@ -260,10 +260,12 @@ public class DDMStructureManagerUtilTest { descriptionMap.put(LocaleUtil.US, "Structure Description Modified"); + DDMForm ddmForm = DDMStructureManagerUtil.getDDMForm( + expectedStructure.getStructureId()); + DDMStructure actualStructure = DDMStructureManagerUtil.updateStructure( TestPropsValues.getUserId(), expectedStructure.getStructureId(), 0, - nameMap, descriptionMap, expectedStructure.getDDMForm(), - _serviceContext); + nameMap, descriptionMap, ddmForm, _serviceContext); Assert.assertEquals(nameMap, actualStructure.getNameMap()); Assert.assertEquals( diff --git a/portal-kernel/src/com/liferay/asset/kernel/model/DDMStructureClassType.java b/portal-kernel/src/com/liferay/asset/kernel/model/DDMStructureClassType.java index 13e3259..924491a 100644 --- a/portal-kernel/src/com/liferay/asset/kernel/model/DDMStructureClassType.java +++ b/portal-kernel/src/com/liferay/asset/kernel/model/DDMStructureClassType.java @@ -92,7 +92,9 @@ public class DDMStructureClassType implements ClassType { DDMStructure ddmStructure = DDMStructureManagerUtil.getStructure( ddmStructureId); - List ddmFormFields = ddmStructure.getDDMFormFields(false); + List ddmFormFields = + DDMStructureManagerUtil.getDDMFormFields( + ddmStructure.getStructureId(), false); for (DDMFormField ddmFormField : ddmFormFields) { String indexType = ddmFormField.getIndexType(); -- 2.6.2 From abdade0e03e27972a68ac50dc9bf5f3725f81889 Mon Sep 17 00:00:00 2001 From: Inacio Nery Date: Mon, 7 Mar 2016 10:57:30 -0300 Subject: [PATCH] LPS-63968 Remove calls of DDMBeanTranslatorUtil on DDM --- .../data/mapping/util/DDMBeanTranslatorUtil.java | 75 ---------------------- .../mapping/test/util/search/TestOrderHelper.java | 10 ++- 2 files changed, 7 insertions(+), 78 deletions(-) delete mode 100644 modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-api/src/main/java/com/liferay/dynamic/data/mapping/util/DDMBeanTranslatorUtil.java diff --git a/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-api/src/main/java/com/liferay/dynamic/data/mapping/util/DDMBeanTranslatorUtil.java b/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-api/src/main/java/com/liferay/dynamic/data/mapping/util/DDMBeanTranslatorUtil.java deleted file mode 100644 index 7b89fe4..0000000 --- a/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-api/src/main/java/com/liferay/dynamic/data/mapping/util/DDMBeanTranslatorUtil.java +++ /dev/null @@ -1,75 +0,0 @@ -/** - * Copyright (c) 2000-present Liferay, Inc. All rights reserved. - * - * This library is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This library is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - */ - -package com.liferay.dynamic.data.mapping.util; - -import com.liferay.dynamic.data.mapping.model.DDMForm; -import com.liferay.dynamic.data.mapping.model.DDMFormField; -import com.liferay.dynamic.data.mapping.storage.DDMFormValues; -import com.liferay.osgi.util.ServiceTrackerFactory; - -import org.osgi.framework.FrameworkUtil; -import org.osgi.util.tracker.ServiceTracker; - -/** - * @author Leonardo Barros - */ -public class DDMBeanTranslatorUtil { - - public static DDMForm translate( - com.liferay.dynamic.data.mapping.kernel.DDMForm ddmForm) { - - return getDDMBeanTranslator().translate(ddmForm); - } - - public static DDMFormField translate( - com.liferay.dynamic.data.mapping.kernel.DDMFormField ddmFormField) { - - return getDDMBeanTranslator().translate(ddmFormField); - } - - public static DDMFormValues translate( - com.liferay.dynamic.data.mapping.kernel.DDMFormValues ddmFormValues) { - - return getDDMBeanTranslator().translate(ddmFormValues); - } - - public static com.liferay.dynamic.data.mapping.kernel.DDMForm translate( - DDMForm ddmForm) { - - return getDDMBeanTranslator().translate(ddmForm); - } - - public static com.liferay.dynamic.data.mapping.kernel.DDMFormField - translate(DDMFormField ddmFormField) { - - return getDDMBeanTranslator().translate(ddmFormField); - } - - public static com.liferay.dynamic.data.mapping.kernel.DDMFormValues - translate(DDMFormValues ddmFormValues) { - - return getDDMBeanTranslator().translate(ddmFormValues); - } - - protected static DDMBeanTranslator getDDMBeanTranslator() { - return _serviceTracker.getService(); - } - - private static final ServiceTracker - _serviceTracker = ServiceTrackerFactory.open( - FrameworkUtil.getBundle(DDMBeanTranslatorUtil.class), - DDMBeanTranslator.class); - -} \ No newline at end of file diff --git a/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-test-util/src/main/java/com/liferay/dynamic/data/mapping/test/util/search/TestOrderHelper.java b/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-test-util/src/main/java/com/liferay/dynamic/data/mapping/test/util/search/TestOrderHelper.java index 10f6715..f575f73 100644 --- a/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-test-util/src/main/java/com/liferay/dynamic/data/mapping/test/util/search/TestOrderHelper.java +++ b/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-test-util/src/main/java/com/liferay/dynamic/data/mapping/test/util/search/TestOrderHelper.java @@ -33,7 +33,7 @@ import com.liferay.dynamic.data.mapping.storage.DDMFormValues; import com.liferay.dynamic.data.mapping.storage.FieldConstants; import com.liferay.dynamic.data.mapping.test.util.DDMStructureTestUtil; import com.liferay.dynamic.data.mapping.test.util.DDMTemplateTestUtil; -import com.liferay.dynamic.data.mapping.util.DDMBeanTranslatorUtil; +import com.liferay.dynamic.data.mapping.util.DDMBeanTranslator; import com.liferay.dynamic.data.mapping.util.DDMIndexer; import com.liferay.portal.kernel.dao.orm.QueryUtil; import com.liferay.portal.kernel.model.BaseModel; @@ -147,9 +147,12 @@ public abstract class TestOrderHelper { return jsonArrays; } - protected TestOrderHelper(DDMIndexer ddmIndexer, Group group) + protected TestOrderHelper( + DDMBeanTranslator ddmBeanTranslator, DDMIndexer ddmIndexer, + Group group) throws Exception { + _ddmBeanTranslator = ddmBeanTranslator; _ddmIndexer = ddmIndexer; _group = group; @@ -259,7 +262,7 @@ public abstract class TestOrderHelper { DDMFormValuesReader ddmFormValuesReader = assetRenderer.getDDMFormValuesReader(); - DDMFormValues ddmFormValues = DDMBeanTranslatorUtil.translate( + DDMFormValues ddmFormValues = _ddmBeanTranslator.translate( ddmFormValuesReader.getDDMFormValues()); Map> ddmFormFieldValuesMap = @@ -423,6 +426,7 @@ public abstract class TestOrderHelper { } private String _dataType; + private final DDMBeanTranslator _ddmBeanTranslator; private final DDMIndexer _ddmIndexer; private final Group _group; private String _indexType; -- 2.6.2 From 6fd71dadc232f911109a09b900e03cec1d73786d Mon Sep 17 00:00:00 2001 From: Inacio Nery Date: Mon, 7 Mar 2016 10:58:57 -0300 Subject: [PATCH] LPS-63968 Use default version of Portal Kernel --- .../document-library/document-library-service/build.gradle | 2 +- .../collaboration/document-library/document-library-test/build.gradle | 2 +- .../dynamic-data-mapping/dynamic-data-mapping-service/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/apps/collaboration/document-library/document-library-service/build.gradle b/modules/apps/collaboration/document-library/document-library-service/build.gradle index 8f1a17f..6d4cacb 100644 --- a/modules/apps/collaboration/document-library/document-library-service/build.gradle +++ b/modules/apps/collaboration/document-library/document-library-service/build.gradle @@ -12,7 +12,7 @@ dependencies { provided group: "com.liferay", name: "com.liferay.portal.upgrade", version: "2.0.0" provided group: "com.liferay", name: "com.liferay.xstream.configurator.api", version: "2.0.0" provided group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "2.0.0" - provided group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "2.0.0" + provided group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default" provided group: "javax.portlet", name: "portlet-api", version: "2.0" provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1" provided group: "org.osgi", name: "org.osgi.core", version: "5.0.0" diff --git a/modules/apps/collaboration/document-library/document-library-test/build.gradle b/modules/apps/collaboration/document-library/document-library-test/build.gradle index c93ff68..a446902 100644 --- a/modules/apps/collaboration/document-library/document-library-test/build.gradle +++ b/modules/apps/collaboration/document-library/document-library-test/build.gradle @@ -9,5 +9,5 @@ dependencies { testIntegrationCompile group: "com.liferay", name: "com.liferay.dynamic.data.mapping.test.util", version: "2.0.0" testIntegrationCompile group: "com.liferay", name: "com.liferay.registry.api", version: "1.0.0" testIntegrationCompile group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "2.0.0" - testIntegrationCompile group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "2.0.0" + testIntegrationCompile group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default" } \ No newline at end of file diff --git a/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-service/build.gradle b/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-service/build.gradle index 1bf3c41..3a18705 100644 --- a/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-service/build.gradle +++ b/modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-service/build.gradle @@ -22,7 +22,7 @@ dependencies { provided group: "com.liferay", name: "com.liferay.registry.api", version: "1.0.0" provided group: "com.liferay", name: "com.liferay.xstream.configurator.api", version: "2.0.0" provided group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "2.0.0" - provided group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "2.0.0" + provided group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default" provided group: "com.liferay.portal", name: "com.liferay.util.java", version: "2.0.0" provided group: "javax.portlet", name: "portlet-api", version: "2.0" provided group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1" -- 2.6.2