LPS-57255 Use Manager classes

liferay · Aug 3, 2015 · 4613136 · 4613136
1 parent ab16257
commit 4613136
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/portal-service/src/com/liferay/portlet/asset/service/persistence/AssetEntryQuery.java b/portal-service/src/com/liferay/portlet/asset/service/persistence/AssetEntryQuery.java
@@ -30,7 +30,7 @@
 import com.liferay.portlet.asset.model.AssetCategory;
 import com.liferay.portlet.asset.service.AssetCategoryLocalServiceUtil;
 import com.liferay.portlet.asset.service.AssetTagLocalServiceUtil;
-import com.liferay.portlet.dynamicdatamapping.util.DDMIndexer;
+import com.liferay.portlet.dynamicdatamapping.DDMStructureManager;
 
 import java.io.Serializable;
 
@@ -57,7 +57,8 @@ public class AssetEntryQuery {
 	public static String checkOrderByCol(String orderByCol) {
 		if (ArrayUtil.contains(ORDER_BY_COLUMNS, orderByCol) ||
 			((orderByCol != null) &&
-			 orderByCol.startsWith(DDMIndexer.DDM_FIELD_PREFIX))) {
+			 orderByCol.startsWith(
+				 DDMStructureManager.STRUCTURE_INDEXER_FIELD_PREFIX))) {
 
 			return orderByCol;
 		}

diff --git a/portal-test/src/com/liferay/portlet/dynamicdatamapping/util/test/DDMStructureTestUtil.java b/portal-test/src/com/liferay/portlet/dynamicdatamapping/util/test/DDMStructureTestUtil.java
@@ -23,11 +23,11 @@
 import com.liferay.portlet.dynamicdatamapping.DDMStructure;
 import com.liferay.portlet.dynamicdatamapping.DDMStructureManager;
 import com.liferay.portlet.dynamicdatamapping.DDMStructureManagerUtil;
+import com.liferay.portlet.dynamicdatamapping.StorageEngineManager;
 import com.liferay.portlet.dynamicdatamapping.model.DDMForm;
 import com.liferay.portlet.dynamicdatamapping.model.DDMFormField;
 import com.liferay.portlet.dynamicdatamapping.model.DDMFormLayout;
 import com.liferay.portlet.dynamicdatamapping.model.LocalizedValue;
-import com.liferay.portlet.dynamicdatamapping.storage.StorageType;
 
 import java.util.HashMap;
 import java.util.Locale;
@@ -66,7 +66,7 @@ public static DDMStructure addStructure(
 		return DDMStructureManagerUtil.addStructure(
 			TestPropsValues.getUserId(), groupId, parentStructureId,
 			PortalUtil.getClassNameId(className), null, nameMap, null, ddmForm,
-			ddmFormLayout, StorageType.JSON.toString(),
+			ddmFormLayout, StorageEngineManager.STORAGE_TYPE_DEFAULT,
 			DDMStructureManager.STRUCTURE_TYPE_DEFAULT, serviceContext);
 	}