-
Type:
Regression Bug
-
Status: Closed
-
Resolution: No Longer Reproducible
-
Affects Version/s: Master
-
Fix Version/s: Master
-
Component/s: Asset Lists, DM, Portal Services
-
Labels:
-
Story Points:1
-
Sprint:036 - Clefable
-
QA Test Name:
-
QA Test Score:5
https://testray.liferay.com/home/-/testray/case_results/858372339
[echo] +++ b/modules/apps/asset/asset-list-service/src/main/java/com/liferay/asset/list/service/http/AssetListEntryServiceHttp.java [echo] @@ -467,7 +467,8 @@ public class AssetListEntryServiceHttp { [echo] [echo] public static java.util.List<com.liferay.asset.list.model.AssetListEntry> [echo] getAssetListEntries( [echo] - HttpPrincipal httpPrincipal, long[] groupIds, int start, int end, [echo] + HttpPrincipal httpPrincipal, long groupId, String title, int start, [echo] + int end, [echo] com.liferay.portal.kernel.util.OrderByComparator [echo] <com.liferay.asset.list.model.AssetListEntry> [echo] orderByComparator) { [echo] @@ -478,7 +479,7 @@ public class AssetListEntryServiceHttp { [echo] _getAssetListEntriesParameterTypes11); [echo] [echo] MethodHandler methodHandler = new MethodHandler( [echo] - methodKey, groupIds, start, end, orderByComparator); [echo] + methodKey, groupId, title, start, end, orderByComparator); [echo] [echo] Object returnObj = null; [echo] [echo] @@ -502,8 +503,7 @@ public class AssetListEntryServiceHttp { [echo] [echo] public static java.util.List<com.liferay.asset.list.model.AssetListEntry> [echo] getAssetListEntries( [echo] - HttpPrincipal httpPrincipal, long groupId, String title, int start, [echo] - int end, [echo] + HttpPrincipal httpPrincipal, long[] groupIds, int start, int end, [echo] com.liferay.portal.kernel.util.OrderByComparator [echo] <com.liferay.asset.list.model.AssetListEntry> [echo] orderByComparator) { [echo] @@ -514,7 +514,7 @@ public class AssetListEntryServiceHttp { [echo] _getAssetListEntriesParameterTypes12); [echo] [echo] MethodHandler methodHandler = new MethodHandler( [echo] - methodKey, groupId, title, start, end, orderByComparator); [echo] + methodKey, groupIds, start, end, orderByComparator); [echo] [echo] Object returnObj = null; [echo] [echo] @@ -1001,12 +1001,12 @@ public class AssetListEntryServiceHttp { [echo] }; [echo] private static final Class<?>[] _getAssetListEntriesParameterTypes11 = [echo] new Class[] { [echo] - long[].class, int.class, int.class, [echo] + long.class, String.class, int.class, int.class, [echo] com.liferay.portal.kernel.util.OrderByComparator.class [echo] }; [echo] private static final Class<?>[] _getAssetListEntriesParameterTypes12 = [echo] new Class[] { [echo] - long.class, String.class, int.class, int.class, [echo] + long[].class, int.class, int.class, [echo] com.liferay.portal.kernel.util.OrderByComparator.class [echo] }; [echo] private static final Class<?>[] _getAssetListEntriesParameterTypes13 = [echo] diff --git a/modules/apps/asset/asset-list-service/src/main/java/com/liferay/asset/list/service/http/AssetListEntryServiceSoap.java b/modules/apps/asset/asset-list-service/src/main/java/com/liferay/asset/list/service/http/AssetListEntryServiceSoap.java [echo] index c133cf4..d2bb2f0 100644 [echo] --- a/modules/apps/asset/asset-list-service/src/main/java/com/liferay/asset/list/service/http/AssetListEntryServiceSoap.java [echo] +++ b/modules/apps/asset/asset-list-service/src/main/java/com/liferay/asset/list/service/http/AssetListEntryServiceSoap.java [echo] @@ -264,7 +264,7 @@ public class AssetListEntryServiceSoap { [echo] [echo] public static com.liferay.asset.list.model.AssetListEntrySoap[] [echo] getAssetListEntries( [echo] - long[] groupIds, int start, int end, [echo] + long groupId, String title, int start, int end, [echo] com.liferay.portal.kernel.util.OrderByComparator [echo] <com.liferay.asset.list.model.AssetListEntry> [echo] orderByComparator) [echo] @@ -273,7 +273,7 @@ public class AssetListEntryServiceSoap { [echo] try { [echo] java.util.List<com.liferay.asset.list.model.AssetListEntry> [echo] returnValue = AssetListEntryServiceUtil.getAssetListEntries( [echo] - groupIds, start, end, orderByComparator); [echo] + groupId, title, start, end, orderByComparator); [echo] [echo] return com.liferay.asset.list.model.AssetListEntrySoap.toSoapModels( [echo] returnValue); [echo] @@ -287,7 +287,7 @@ public class AssetListEntryServiceSoap { [echo] [echo] public static com.liferay.asset.list.model.AssetListEntrySoap[] [echo] getAssetListEntries( [echo] - long groupId, String title, int start, int end, [echo] + long[] groupIds, int start, int end, [echo] com.liferay.portal.kernel.util.OrderByComparator [echo] <com.liferay.asset.list.model.AssetListEntry> [echo] orderByComparator) [echo] @@ -296,7 +296,7 @@ public class AssetListEntryServiceSoap { [echo] try { [echo] java.util.List<com.liferay.asset.list.model.AssetListEntry> [echo] returnValue = AssetListEntryServiceUtil.getAssetListEntries( [echo] - groupId, title, start, end, orderByComparator); [echo] + groupIds, start, end, orderByComparator); [echo] [echo] return com.liferay.asset.list.model.AssetListEntrySoap.toSoapModels( [echo] returnValue); [echo] diff --git a/modules/apps/document-library/document-library-content-service/src/main/java/com/liferay/document/library/content/service/persistence/impl/DLContentPersistenceImpl.java b/modules/apps/document-library/document-library-content-service/src/main/java/com/liferay/document/library/content/service/persistence/impl/DLContentPersistenceImpl.java [echo] index 9787712..3b3f310 100644 [echo] --- a/modules/apps/document-library/document-library-content-service/src/main/java/com/liferay/document/library/content/service/persistence/impl/DLContentPersistenceImpl.java [echo] +++ b/modules/apps/document-library/document-library-content-service/src/main/java/com/liferay/document/library/content/service/persistence/impl/DLContentPersistenceImpl.java [echo] @@ -48,6 +48,7 @@ import java.lang.reflect.InvocationHandler; [echo] import java.util.ArrayList; [echo] import java.util.Collections; [echo] import java.util.HashMap; [echo] +import java.util.HashSet; [echo] import java.util.Iterator; [echo] import java.util.List; [echo] import java.util.Map; [echo] @@ -3648,6 +3649,16 @@ public class DLContentPersistenceImpl [echo] } [echo] [echo] @Override [echo] + public Set<String> getCTIgnoredAttributeNames() { [echo] + return _ctIgnoredAttributeNames; [echo] + } [echo] + [echo] + @Override [echo] + public Set<String> getCTMergeableAttributeNames() { [echo] + return _ctMergeableAttributeNames; [echo] + } [echo] + [echo] + @Override [echo] public List<String[]> getUniqueIndexColumnNames() { [echo] return _uniqueIndexColumnNames; [echo] } [echo] @@ -3670,6 +3681,10 @@ public class DLContentPersistenceImpl [echo] return update(dlContent); [echo] } [echo] [echo] + private static final Set<String> _ctIgnoredAttributeNames = [echo] + new HashSet<String>(); [echo] + private static final Set<String> _ctMergeableAttributeNames = [echo] + new HashSet<String>(); [echo] private static final List<String[]> _uniqueIndexColumnNames = [echo] new ArrayList<String[]>(); [echo] [echo] diff --git a/portal-impl/src/com/liferay/portal/service/persistence/impl/ResourcePermissionPersistenceImpl.java b/portal-impl/src/com/liferay/portal/service/persistence/impl/ResourcePermissionPersistenceImpl.java [echo] index 643db42..5d23240 100644 [echo] --- a/portal-impl/src/com/liferay/portal/service/persistence/impl/ResourcePermissionPersistenceImpl.java [echo] +++ b/portal-impl/src/com/liferay/portal/service/persistence/impl/ResourcePermissionPersistenceImpl.java [echo] @@ -45,6 +45,7 @@ import java.lang.reflect.InvocationHandler; [echo] import java.util.ArrayList; [echo] import java.util.Collections; [echo] import java.util.HashMap; [echo] +import java.util.HashSet; [echo] import java.util.Iterator; [echo] import java.util.List; [echo] import java.util.Map; [echo] @@ -8347,6 +8348,16 @@ public class ResourcePermissionPersistenceImpl [echo] } [echo] [echo] @Override [echo] + public Set<String> getCTIgnoredAttributeNames() { [echo] + return _ctIgnoredAttributeNames; [echo] + } [echo] + [echo] + @Override [echo] + public Set<String> getCTMergeableAttributeNames() { [echo] + return _ctMergeableAttributeNames; [echo] + } [echo] + [echo] + @Override [echo] public List<String[]> getUniqueIndexColumnNames() { [echo] return _uniqueIndexColumnNames; [echo] } [echo] @@ -8373,6 +8384,10 @@ public class ResourcePermissionPersistenceImpl [echo] return update(resourcePermission); [echo] } [echo] [echo] + private static final Set<String> _ctIgnoredAttributeNames = [echo] + new HashSet<String>(); [echo] + private static final Set<String> _ctMergeableAttributeNames = [echo] + new HashSet<String>(); [echo] private static final List<String[]> _uniqueIndexColumnNames = [echo] new ArrayList<String[]>();