LPS-124949 Ignore null results received from Sharepoint

build-test.xml

@@ -2535,6 +2535,12 @@ jdbc.default.password=${database.password}</echo>
 		</sequential>
 	</macrodef>
 
+	<macrodef name="prepare-portal-template-freemarker-osgi-configuration">
+		<sequential>
+			<echo file="${liferay.home}/osgi/configs/com.liferay.portal.template.freemarker.configuration.FreeMarkerEngineConfiguration.config">asyncRenderTimeout=L"7200000"</echo>
+		</sequential>
+	</macrodef>
+
 	<macrodef name="prepare-safari-driver">
 		<sequential>
 			<if>
@@ -8666,6 +8672,8 @@ osb.lcs.portlet.oauth.consumer.secret=${osb.lcs.portlet.oauth.consumer.secret}</
 		<prepare-portal-elasticsearch-osgi-configuration />
 
 		<prepare-portal-search-osgi-configuration/>
+
+		<prepare-portal-template-freemarker-osgi-configuration />
 	</target>
 
 	<target name="prepare-patching-tool">

modules/.releng/sdk/gradle-plugins-defaults/artifact.properties

@@ -1,5 +1,5 @@
-artifact.git.id=90aa8b8d93b5c3dbce573a9120ef53923a80f3b8
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/7.0.7/com.liferay.gradle.plugins.defaults-7.0.7-javadoc.jar
-artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/7.0.7/com.liferay.gradle.plugins.defaults-7.0.7-sources-commercial.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/7.0.7/com.liferay.gradle.plugins.defaults-7.0.7-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/7.0.7/com.liferay.gradle.plugins.defaults-7.0.7.jar
+artifact.git.id=f6d12551216c8e7a61f44ca28425702146c6ee3b
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/7.0.8/com.liferay.gradle.plugins.defaults-7.0.8-javadoc.jar
+artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/7.0.8/com.liferay.gradle.plugins.defaults-7.0.8-sources-commercial.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/7.0.8/com.liferay.gradle.plugins.defaults-7.0.8-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.defaults/7.0.8/com.liferay.gradle.plugins.defaults-7.0.8.jar

modules/.releng/sdk/gradle-plugins-rest-builder/artifact.properties

@@ -1,4 +1,4 @@
-artifact.git.id=dc646cc0d4a43a1f36eaf20ffd90d9194033c1bd
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.rest.builder/1.1.16/com.liferay.gradle.plugins.rest.builder-1.1.16-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.rest.builder/1.1.16/com.liferay.gradle.plugins.rest.builder-1.1.16-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.rest.builder/1.1.16/com.liferay.gradle.plugins.rest.builder-1.1.16.jar
+artifact.git.id=80011720aaaae52986770ce4c8fb8b3c88f7ebdd
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.rest.builder/1.1.17/com.liferay.gradle.plugins.rest.builder-1.1.17-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.rest.builder/1.1.17/com.liferay.gradle.plugins.rest.builder-1.1.17-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.rest.builder/1.1.17/com.liferay.gradle.plugins.rest.builder-1.1.17.jar

modules/.releng/sdk/gradle-plugins-source-formatter/artifact.properties

@@ -1,4 +1,4 @@
-artifact.git.id=b84297550d01e61bfea8e2d88c26ee065fa20929
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.0.2/com.liferay.gradle.plugins.source.formatter-5.0.2-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.0.2/com.liferay.gradle.plugins.source.formatter-5.0.2-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.0.2/com.liferay.gradle.plugins.source.formatter-5.0.2.jar
+artifact.git.id=53135e307d8cc971cc64ca39775cc128e73bcf85
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.0.3/com.liferay.gradle.plugins.source.formatter-5.0.3-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.0.3/com.liferay.gradle.plugins.source.formatter-5.0.3-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.source.formatter/5.0.3/com.liferay.gradle.plugins.source.formatter-5.0.3.jar

modules/.releng/sdk/gradle-plugins/artifact.properties

@@ -1,5 +1,5 @@
-artifact.git.id=90aa8b8d93b5c3dbce573a9120ef53923a80f3b8
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/13.0.3/com.liferay.gradle.plugins-13.0.3-javadoc.jar
-artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/13.0.3/com.liferay.gradle.plugins-13.0.3-sources-commercial.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/13.0.3/com.liferay.gradle.plugins-13.0.3-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/13.0.3/com.liferay.gradle.plugins-13.0.3.jar
+artifact.git.id=f6d12551216c8e7a61f44ca28425702146c6ee3b
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/13.0.4/com.liferay.gradle.plugins-13.0.4-javadoc.jar
+artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/13.0.4/com.liferay.gradle.plugins-13.0.4-sources-commercial.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/13.0.4/com.liferay.gradle.plugins-13.0.4-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins/13.0.4/com.liferay.gradle.plugins-13.0.4.jar

modules/.releng/util/portal-tools-rest-builder/artifact.properties

@@ -1,6 +1,6 @@
-artifact.git.id=dc646cc0d4a43a1f36eaf20ffd90d9194033c1bd
-artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.rest.builder/1.0.141/com.liferay.portal.tools.rest.builder-1.0.141-sources-commercial.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.rest.builder/1.0.141/com.liferay.portal.tools.rest.builder-1.0.141-sources.jar
-artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.rest.builder/1.0.141/com.liferay.portal.tools.rest.builder-1.0.141.tar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.rest.builder/1.0.141/com.liferay.portal.tools.rest.builder-1.0.141.jar
-artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.rest.builder/1.0.141/com.liferay.portal.tools.rest.builder-1.0.141.zip
+artifact.git.id=80011720aaaae52986770ce4c8fb8b3c88f7ebdd
+artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.rest.builder/1.0.142/com.liferay.portal.tools.rest.builder-1.0.142-sources-commercial.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.rest.builder/1.0.142/com.liferay.portal.tools.rest.builder-1.0.142-sources.jar
+artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.rest.builder/1.0.142/com.liferay.portal.tools.rest.builder-1.0.142.tar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.rest.builder/1.0.142/com.liferay.portal.tools.rest.builder-1.0.142.jar
+artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.portal.tools.rest.builder/1.0.142/com.liferay.portal.tools.rest.builder-1.0.142.zip

modules/.releng/util/source-formatter/artifact.properties

@@ -1,6 +1,6 @@
-artifact.git.id=b84297550d01e61bfea8e2d88c26ee065fa20929
-artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1072/com.liferay.source.formatter-1.0.1072-sources-commercial.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1072/com.liferay.source.formatter-1.0.1072-sources.jar
-artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1072/com.liferay.source.formatter-1.0.1072.tar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1072/com.liferay.source.formatter-1.0.1072.jar
-artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1072/com.liferay.source.formatter-1.0.1072.zip
+artifact.git.id=53135e307d8cc971cc64ca39775cc128e73bcf85
+artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1073/com.liferay.source.formatter-1.0.1073-sources-commercial.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1073/com.liferay.source.formatter-1.0.1073-sources.jar
+artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1073/com.liferay.source.formatter-1.0.1073.tar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1073/com.liferay.source.formatter-1.0.1073.jar
+artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.source.formatter/1.0.1073/com.liferay.source.formatter-1.0.1073.zip

modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/AccountGroupDisplaySearchContainerFactory.java

@@ -17,7 +17,6 @@
 import com.liferay.account.admin.web.internal.display.AccountGroupDisplay;
 import com.liferay.account.model.AccountGroup;
 import com.liferay.account.service.AccountGroupLocalServiceUtil;
-import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
 import com.liferay.portal.kernel.dao.search.SearchContainer;
 import com.liferay.portal.kernel.portlet.LiferayPortletRequest;
 import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
@@ -55,7 +54,7 @@ public static SearchContainer<AccountGroupDisplay> create(
 		accountGroupDisplaySearchContainer.setOrderByType(orderByType);
 
 		accountGroupDisplaySearchContainer.setRowChecker(
-			new EmptyOnClickRowChecker(liferayPortletResponse));
+			new SelectAccountGroupRowChecker(liferayPortletResponse));
 
 		String keywords = ParamUtil.getString(
 			liferayPortletRequest, "keywords");

modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/SelectAccountGroupRowChecker.java

@@ -0,0 +1,38 @@
+/**
+ * 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.account.admin.web.internal.dao.search;
+
+import com.liferay.account.admin.web.internal.display.AccountGroupDisplay;
+import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
+
+import javax.portlet.PortletResponse;
+
+/**
+ * @author Pei-Jung Lan
+ */
+public class SelectAccountGroupRowChecker extends EmptyOnClickRowChecker {
+
+	public SelectAccountGroupRowChecker(PortletResponse portletResponse) {
+		super(portletResponse);
+	}
+
+	@Override
+	public boolean isDisabled(Object object) {
+		AccountGroupDisplay accountGroupDisplay = (AccountGroupDisplay)object;
+
+		return accountGroupDisplay.isDefaultAccountGroup();
+	}
+
+}

modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/AccountGroupDisplay.java

@@ -37,8 +37,12 @@ public static AccountGroupDisplay of(long accountGroupId) {
 			AccountGroupLocalServiceUtil.fetchAccountGroup(accountGroupId));
 	}
 
-	public long getAccountEntriesCount() {
-		return _accountEntriesCount;
+	public String getAccountEntriesCount() {
+		if (_accountEntriesCount < 0) {
+			return StringPool.DOUBLE_DASH;
+		}
+
+		return String.valueOf(_accountEntriesCount);
 	}
 
 	public long getAccountGroupId() {
@@ -53,21 +57,31 @@ public String getName() {
 		return _name;
 	}
 
+	public boolean isDefaultAccountGroup() {
+		return _defaultAccountGroup;
+	}
+
 	private AccountGroupDisplay() {
 		_accountEntriesCount = 0;
 		_accountGroupId = 0;
+		_defaultAccountGroup = false;
 		_description = StringPool.BLANK;
 		_name = StringPool.BLANK;
 	}
 
 	private AccountGroupDisplay(AccountGroup accountGroup) {
 		_accountEntriesCount = _getAccountEntriesCount(accountGroup);
 		_accountGroupId = accountGroup.getAccountGroupId();
+		_defaultAccountGroup = accountGroup.isDefaultAccountGroup();
 		_description = accountGroup.getDescription();
 		_name = accountGroup.getName();
 	}
 
 	private long _getAccountEntriesCount(AccountGroup accountGroup) {
+		if (accountGroup.isDefaultAccountGroup()) {
+			return -1;
+		}
+
 		return AccountGroupAccountEntryRelLocalServiceUtil.
 			getAccountGroupAccountEntryRelsCountByAccountGroupId(
 				accountGroup.getAccountGroupId());
@@ -78,6 +92,7 @@ private long _getAccountEntriesCount(AccountGroup accountGroup) {
 
 	private final long _accountEntriesCount;
 	private final long _accountGroupId;
+	private final boolean _defaultAccountGroup;
 	private final String _description;
 	private final String _name;
 

modules/apps/account/account-admin-web/src/main/resources/META-INF/resources/account_groups_admin/account_group_action.jsp

@@ -29,23 +29,25 @@ AccountGroupDisplay accountGroupDisplay = (AccountGroupDisplay)row.getObject();
 	message="<%= StringPool.BLANK %>"
 	showWhenSingleIcon="<%= true %>"
 >
-	<portlet:renderURL var="editAccountGroupURL">
-		<portlet:param name="mvcRenderCommandName" value="/account_admin/edit_account_group" />
-		<portlet:param name="backURL" value="<%= currentURL %>" />
-		<portlet:param name="accountGroupId" value="<%= String.valueOf(accountGroupDisplay.getAccountGroupId()) %>" />
-	</portlet:renderURL>
+	<c:if test="<%= !accountGroupDisplay.isDefaultAccountGroup() %>">
+		<portlet:renderURL var="editAccountGroupURL">
+			<portlet:param name="mvcRenderCommandName" value="/account_admin/edit_account_group" />
+			<portlet:param name="backURL" value="<%= currentURL %>" />
+			<portlet:param name="accountGroupId" value="<%= String.valueOf(accountGroupDisplay.getAccountGroupId()) %>" />
+		</portlet:renderURL>
 
-	<liferay-ui:icon
-		message="edit"
-		url="<%= editAccountGroupURL %>"
-	/>
+		<liferay-ui:icon
+			message="edit"
+			url="<%= editAccountGroupURL %>"
+		/>
 
-	<portlet:actionURL name="/account_admin/delete_account_groups" var="deleteAccountGroupURL">
-		<portlet:param name="redirect" value="<%= currentURL %>" />
-		<portlet:param name="accountGroupIds" value="<%= String.valueOf(accountGroupDisplay.getAccountGroupId()) %>" />
-	</portlet:actionURL>
+		<portlet:actionURL name="/account_admin/delete_account_groups" var="deleteAccountGroupURL">
+			<portlet:param name="redirect" value="<%= currentURL %>" />
+			<portlet:param name="accountGroupIds" value="<%= String.valueOf(accountGroupDisplay.getAccountGroupId()) %>" />
+		</portlet:actionURL>
 
-	<liferay-ui:icon-delete
-		url="<%= deleteAccountGroupURL %>"
-	/>
+		<liferay-ui:icon-delete
+			url="<%= deleteAccountGroupURL %>"
+		/>
+	</c:if>
 </liferay-ui:icon-menu>

modules/apps/account/account-admin-web/src/main/resources/META-INF/resources/account_groups_admin/view.jsp

@@ -45,6 +45,12 @@ ViewAccountGroupsManagementToolbarDisplayContext viewAccountGroupsManagementTool
 					<portlet:param name="screenNavigationCategoryKey" value="<%= AccountScreenNavigationEntryConstants.CATEGORY_KEY_ACCOUNTS %>" />
 				</portlet:renderURL>
 
+				<%
+				if (accountGroupDisplay.isDefaultAccountGroup()) {
+					rowURL = null;
+				}
+				%>
+
 				<liferay-ui:search-container-column-text
 					cssClass="table-cell-expand table-title"
 					href="<%= rowURL %>"
@@ -63,7 +69,7 @@ ViewAccountGroupsManagementToolbarDisplayContext viewAccountGroupsManagementTool
 					cssClass="table-cell-expand"
 					href="<%= rowURL %>"
 					name="accounts"
-					value="<%= String.valueOf(accountGroupDisplay.getAccountEntriesCount()) %>"
+					value="<%= accountGroupDisplay.getAccountEntriesCount() %>"
 				/>
 
 				<liferay-ui:search-container-column-jsp

modules/apps/adaptive-media/adaptive-media-image-item-selector-impl/src/main/java/com/liferay/adaptive/media/image/item/selector/internal/FileEntryAMImageFileEntryItemSelectorReturnTypeResolver.java

@@ -55,7 +55,7 @@ public String getValue(FileEntry fileEntry, ThemeDisplay themeDisplay)
 		throws Exception {
 
 		JSONObject fileEntryJSONObject = JSONUtil.put(
-			"fileEntryId", fileEntry.getFileEntryId());
+			"fileEntryId", String.valueOf(fileEntry.getFileEntryId()));
 
 		String previewURL = null;
 

modules/apps/adaptive-media/adaptive-media-image-item-selector-impl/src/main/java/com/liferay/adaptive/media/image/item/selector/internal/FileEntryAMImageURLItemSelectorReturnTypeResolver.java

@@ -77,7 +77,7 @@ public String getValue(FileEntry fileEntry, ThemeDisplay themeDisplay)
 		JSONObject fileEntryJSONObject = JSONUtil.put(
 			"defaultSource", previewURL
 		).put(
-			"fileEntryId", fileEntry.getFileEntryId()
+			"fileEntryId", String.valueOf(fileEntry.getFileEntryId())
 		);
 
 		JSONArray sourcesJSONArray = JSONFactoryUtil.createJSONArray();

modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/item/selector/AssetEntryItemSelectorReturnTypeResolver.java

@@ -49,7 +49,7 @@ public String getValue(AssetEntry assetEntry, ThemeDisplay themeDisplay) {
 		).put(
 			"classNameId", assetEntry.getClassNameId()
 		).put(
-			"classPK", assetEntry.getClassPK()
+			"classPK", String.valueOf(assetEntry.getClassPK())
 		).put(
 			"title", assetEntry.getTitle(themeDisplay.getLocale())
 		).toString();

modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/AssetListItemSelectorReturnTypeResolver.java

@@ -51,7 +51,7 @@ public String getValue(
 		return JSONUtil.put(
 			"classNameId", _portal.getClassNameId(AssetListEntry.class)
 		).put(
-			"classPK", assetListEntry.getAssetListEntryId()
+			"classPK", String.valueOf(assetListEntry.getAssetListEntryId())
 		).put(
 			"title", assetListEntry.getTitle()
 		).toString();