LPS-33799

portal-impl/src/com/liferay/portal/image/ImageToolImpl.java

@@ -378,7 +378,7 @@ public Image getImage(InputStream is, boolean cleanUpStream)
 
 	public boolean isNullOrDefaultSpacer(byte[] bytes) {
 		if ((bytes == null) || (bytes.length == 0) ||
-			(Arrays.equals(bytes, getDefaultSpacer().getTextObj()))) {
+			Arrays.equals(bytes, getDefaultSpacer().getTextObj())) {
 
 			return true;
 		}

portal-impl/src/com/liferay/portal/model/impl/TicketImpl.java

@@ -27,7 +27,7 @@ public TicketImpl() {
 	public boolean isExpired() {
 		Date expirationDate = getExpirationDate();
 
-		if ((expirationDate != null) && (expirationDate.before(new Date()))) {
+		if ((expirationDate != null) && expirationDate.before(new Date())) {
 			return true;
 		}
 		else {

portal-impl/src/com/liferay/portal/security/pacl/PortalPolicy.java

@@ -157,7 +157,7 @@ public String getType() {
 	public boolean implies(
 		ProtectionDomain protectionDomain, Permission permission) {
 
-		if ((!(permission instanceof PACLUtil.Permission)) &&
+		if (!(permission instanceof PACLUtil.Permission) &&
 			((protectionDomain.getClassLoader() == null) ||
 			 !PACLPolicyManager.isActive() ||
 			 !_paclPolicy.isCheckablePermission(permission))) {

portal-impl/src/com/liferay/portal/service/impl/UserGroupRoleServiceImpl.java

@@ -224,8 +224,8 @@ public void deleteUserGroupRoles(long[] userIds, long groupId, long roleId)
 				}
 			}
 			else if ((role.getType() == RoleConstants.TYPE_SITE) &&
-					 (!SiteMembershipPolicyUtil.isRoleProtected(
-					  getPermissionChecker(), userId, groupId, roleId))) {
+					 !SiteMembershipPolicyUtil.isRoleProtected(
+						 getPermissionChecker(), userId, groupId, roleId)) {
 
 					filteredUserGroupRoles.add(userGroupRole);
 			}

portal-impl/src/com/liferay/portal/service/impl/UserServiceImpl.java

@@ -2241,12 +2241,12 @@ protected long[] checkOrganizations(long userId, long[] organizationIds)
 						organizationIds, organization.getOrganizationId()) &&
 					(!OrganizationPermissionUtil.contains(
 						permissionChecker, organization.getOrganizationId(),
-						ActionKeys.ASSIGN_MEMBERS)) ||
-					OrganizationMembershipPolicyUtil.isMembershipProtected(
+						ActionKeys.ASSIGN_MEMBERS) ||
+					 OrganizationMembershipPolicyUtil.isMembershipProtected(
 						permissionChecker, userId,
 						organization.getOrganizationId()) ||
-					OrganizationMembershipPolicyUtil.isMembershipRequired(
-						userId, organization.getOrganizationId())) {
+					 OrganizationMembershipPolicyUtil.isMembershipRequired(
+						userId, organization.getOrganizationId()))) {
 
 					organizationIds = ArrayUtil.append(
 						organizationIds, organization.getOrganizationId());
@@ -2299,9 +2299,9 @@ protected long[] checkRoles(long userId, long[] roleIds)
 				if (!ArrayUtil.contains(roleIds, role.getRoleId()) &&
 					(!RolePermissionUtil.contains(
 						permissionChecker, role.getRoleId(),
-						ActionKeys.ASSIGN_MEMBERS)) ||
+						ActionKeys.ASSIGN_MEMBERS) ||
 					 RoleMembershipPolicyUtil.isRoleRequired(
-						userId, role.getRoleId())) {
+						userId, role.getRoleId()))) {
 
 					roleIds = ArrayUtil.append(roleIds, role.getRoleId());
 				}

portal-impl/src/com/liferay/portal/tools/SeleneseToJavaBuilder.java

@@ -887,6 +887,7 @@ else if (param1.equals("captureEntirePageScreenshot")) {
 			else if (param1.equals("check") || param1.equals("click") ||
 					 param1.equals("doubleClick") ||
 					 param1.equals("downloadTempFile") ||
+					 param1.equals("makeVisible") ||
 					 param1.equals("mouseDown") || param1.equals("mouseMove") ||
 					 param1.equals("mouseOver") || param1.equals("mouseUp") ||
 					 param1.equals("open") || param1.equals("selectFrame") ||

portal-impl/src/com/liferay/portal/tools/SourceFormatter.java

@@ -477,7 +477,12 @@ private static void _checkIfClause(
 					String s = ifClause.substring(
 						previousParenthesisPos + 1, i);
 
-					_checkMissingParentheses(s, fileName, lineCount);
+					if (_hasMissingParentheses(s)) {
+						_processErrorMessage(
+							fileName,
+							"missing parentheses: " + fileName + " " +
+								lineCount);
+					}
 				}
 
 				previousParenthesisPos = i;
@@ -502,9 +507,7 @@ private static void _checkIfClause(
 							String s = ifClause.substring(
 								posOpenParenthesis + 1, i);
 
-							if (Validator.isNotNull(s) &&
-								!s.contains(StringPool.SPACE)) {
-
+							if (_hasRedundantParentheses(s)) {
 								_processErrorMessage(
 									fileName,
 									"redundant parentheses: " + fileName + " " +
@@ -578,34 +581,6 @@ private static void _checkLanguageKeys(
 		}
 	}
 
-	private static void _checkMissingParentheses(
-		String s, String fileName, int lineCount) {
-
-		if (Validator.isNull(s)) {
-			return;
-		}
-
-		boolean containsAndOrOperator = (s.contains("&&") || s.contains("||"));
-
-		boolean containsCompareOperator =
-			(s.contains(" == ") || s.contains(" != ") || s.contains(" < ") ||
-			 s.contains(" > ") || s.contains(" =< ") || s.contains(" => ") ||
-			 s.contains(" <= ") || s.contains(" >= "));
-
-		boolean containsMathOperator =
-			(s.contains(" = ") || s.contains(" - ") || s.contains(" + ") ||
-			 s.contains(" & ") || s.contains(" % ") || s.contains(" * ") ||
-			 s.contains(" / "));
-
-		if (containsCompareOperator &&
-			(containsAndOrOperator ||
-			 (containsMathOperator && !s.contains(StringPool.OPEN_BRACKET)))) {
-
-			_processErrorMessage(
-				fileName, "missing parentheses: " + fileName + " " + lineCount);
-		}
-	}
-
 	private static boolean _checkTaglibVulnerability(
 		String jspContent, String vulnerability) {
 
@@ -4252,6 +4227,64 @@ private static boolean _hasAnnotationOrJavadoc(String s) {
 		}
 	}
 
+	private static boolean _hasMissingParentheses(String s) {
+		if (Validator.isNull(s)) {
+			return false;
+		}
+
+		boolean containsAndOrOperator = (s.contains("&&") || s.contains("||"));
+
+		boolean containsCompareOperator =
+			(s.contains(" == ") || s.contains(" != ") || s.contains(" < ") ||
+			 s.contains(" > ") || s.contains(" =< ") || s.contains(" => ") ||
+			 s.contains(" <= ") || s.contains(" >= "));
+
+		boolean containsMathOperator =
+			(s.contains(" = ") || s.contains(" - ") || s.contains(" + ") ||
+			 s.contains(" & ") || s.contains(" % ") || s.contains(" * ") ||
+			 s.contains(" / "));
+
+		if (containsCompareOperator &&
+			(containsAndOrOperator ||
+			 (containsMathOperator && !s.contains(StringPool.OPEN_BRACKET)))) {
+
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
+
+	private static boolean _hasRedundantParentheses(String s) {
+		if (!s.contains("&&") && !s.contains("||")) {
+			for (int x = 0;;) {
+				x = s.indexOf(StringPool.CLOSE_PARENTHESIS);
+
+				if (x == -1) {
+					break;
+				}
+
+				int y = s.substring(0, x).lastIndexOf(
+					StringPool.OPEN_PARENTHESIS);
+
+				if (y == -1) {
+					break;
+				}
+
+				s = s.substring(0, y)  + s.substring(x + 1);
+			}
+		}
+
+		if (Validator.isNotNull(s) &&
+			!s.contains(StringPool.SPACE)) {
+
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
+
 	private static boolean _isGenerated(String content) {
 		if (content.contains("* @generated") || content.contains("$ANTLR")) {
 			return true;

portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/DataFactory.java

@@ -769,12 +769,12 @@ public DDMContent newDDMContent(DLFileEntry dlFileEntry) {
 	}
 
 	public DDMStorageLink newDDMStorageLink(
-		DDMContent ddmContent, long structureId) {
+		long ddmStorageLinkId, DDMContent ddmContent, long structureId) {
 
 		DDMStorageLink ddmStorageLink = new DDMStorageLinkImpl();
 
 		ddmStorageLink.setUuid(SequentialUUID.generate());
-		ddmStorageLink.setStorageLinkId(_counter.get());
+		ddmStorageLink.setStorageLinkId(ddmStorageLinkId);
 		ddmStorageLink.setClassNameId(
 			_classNamesMap.get(DDMContent.class.getName()));
 		ddmStorageLink.setClassPK(ddmContent.getContentId());
@@ -826,14 +826,15 @@ public DLFileEntry newDlFileEntry(DLFolder dlFoler, int index) {
 	}
 
 	public DLFileEntryMetadata newDLFileEntryMetadata(
-		DDMStorageLink ddmStorageLink, DLFileVersion dlFileVersion) {
+		long ddmStorageLinkId, long ddmStructureId,
+		DLFileVersion dlFileVersion) {
 
 		DLFileEntryMetadata dlFileEntryMetadata = new DLFileEntryMetadataImpl();
 
 		dlFileEntryMetadata.setUuid(SequentialUUID.generate());
 		dlFileEntryMetadata.setFileEntryMetadataId(_counter.get());
-		dlFileEntryMetadata.setDDMStorageId(ddmStorageLink.getPrimaryKey());
-		dlFileEntryMetadata.setDDMStructureId(ddmStorageLink.getStructureId());
+		dlFileEntryMetadata.setDDMStorageId(ddmStorageLinkId);
+		dlFileEntryMetadata.setDDMStructureId(ddmStructureId);
 		dlFileEntryMetadata.setFileEntryTypeId(
 			dlFileVersion.getFileEntryTypeId());
 		dlFileEntryMetadata.setFileEntryId(dlFileVersion.getFileEntryId());

portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/SampleSQLBuilder.java

@@ -35,13 +35,9 @@
 import com.liferay.portal.model.User;
 import com.liferay.portal.tools.ArgumentsUtil;
 import com.liferay.portal.util.InitUtil;
-import com.liferay.portlet.blogs.model.BlogsEntry;
 import com.liferay.portlet.documentlibrary.model.DLFileEntry;
-import com.liferay.portlet.documentlibrary.model.DLFolder;
 import com.liferay.portlet.dynamicdatalists.model.DDLRecord;
-import com.liferay.portlet.messageboards.model.MBCategory;
 import com.liferay.portlet.messageboards.model.MBMessage;
-import com.liferay.portlet.wiki.model.WikiPage;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -198,14 +194,6 @@ public SampleSQLBuilder(Map<String, String> arguments) throws Exception {
 			sb.toString());
 	}
 
-	public void insertBlogsEntry(BlogsEntry blogsEntry) throws Exception {
-		Map<String, Object> context = getContext();
-
-		put(context, "blogsEntry", blogsEntry);
-
-		processTemplate(_tplBlogsEntry, context);
-	}
-
 	public void insertDDLRecord(
 			DDLRecord ddlRecord, int ddlRecordCount, long ddmStructureId)
 		throws Exception {
@@ -230,17 +218,6 @@ public void insertDLFileEntry(DLFileEntry dlFileEntry, long ddmStructureId)
 		processTemplate(_tplDLFileEntry, context);
 	}
 
-	public void insertDLFolder(DLFolder dlFolder, long ddmStructureId)
-		throws Exception {
-
-		Map<String, Object> context = getContext();
-
-		put(context, "ddmStructureId", ddmStructureId);
-		put(context, "dlFolder", dlFolder);
-
-		processTemplate(_tplDLFolder, context);
-	}
-
 	public void insertDLFolders(
 			long groupId, long parentDLFolderId, int dlFolderDepth,
 			long ddmStructureId)
@@ -273,14 +250,6 @@ public void insertLayout(Layout layout) throws Exception {
 		processTemplate(_tplLayout, context);
 	}
 
-	public void insertMBCategory(MBCategory mbCategory) throws Exception {
-		Map<String, Object> context = getContext();
-
-		put(context, "mbCategory", mbCategory);
-
-		processTemplate(_tplMBCategory, context);
-	}
-
 	public void insertMBDiscussion(
 			long groupId, long classNameId, long classPK, long mbThreadId,
 			long mbRootMessageId, int maxCommentCount)
@@ -329,14 +298,6 @@ public void insertUser(List<Long> groupIds, List<Role> roleIds, User user)
 		processTemplate(_tplUser, context);
 	}
 
-	public void insertWikiPage(WikiPage wikiPage) throws Exception {
-		Map<String, Object> context = getContext();
-
-		put(context, "wikiPage", wikiPage);
-
-		processTemplate(_tplWikiPage, context);
-	}
-
 	protected void compressInsertSQL(String insertSQL) throws IOException {
 		String tableName = insertSQL.substring(0, insertSQL.indexOf(' '));
 
@@ -660,21 +621,17 @@ protected void writeToInsertSQLFile(String tableName, String sql)
 	private String _outputDir;
 	private boolean _outputMerge;
 	private File _tempDir;
-	private String _tplBlogsEntry = _TPL_ROOT + "blogs_entry.ftl";
 	private String _tplDDLRecord = _TPL_ROOT + "ddl_record.ftl";
 	private String _tplDLFileEntry = _TPL_ROOT + "dl_file_entry.ftl";
-	private String _tplDLFolder = _TPL_ROOT + "dl_folder.ftl";
 	private String _tplDLFolders = _TPL_ROOT + "dl_folders.ftl";
 	private String _tplGroup = _TPL_ROOT + "group.ftl";
 	private String _tplLayout = _TPL_ROOT + "layout.ftl";
-	private String _tplMBCategory = _TPL_ROOT + "mb_category.ftl";
 	private String _tplMBDiscussion = _TPL_ROOT + "mb_discussion.ftl";
 	private String _tplMBMessage = _TPL_ROOT + "mb_message.ftl";;
 	private String _tplResourcePermission =
 		_TPL_ROOT + "resource_permission.ftl";
 	private String _tplSample = _TPL_ROOT + "sample.ftl";
 	private String _tplUser = _TPL_ROOT + "user.ftl";
-	private String _tplWikiPage = _TPL_ROOT + "wiki_page.ftl";
 	private Writer _writerBlogsCSV;
 	private Writer _writerCompanyCSV;
 	private Writer _writerDocumentLibraryCSV;

portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/dependencies/blogs.ftl

@@ -2,7 +2,9 @@
 	<#list 1..maxBlogsEntryCount as blogsEntryCount>
 		<#assign blogsEntry = dataFactory.newBlogsEntry(groupId, blogsEntryCount)>
 
-		${sampleSQLBuilder.insertBlogsEntry(blogsEntry)}
+		insert into BlogsEntry values ('${blogsEntry.uuid}', ${blogsEntry.entryId}, ${blogsEntry.groupId}, ${blogsEntry.companyId}, ${blogsEntry.userId}, '${blogsEntry.userName}', '${dataFactory.getDateString(blogsEntry.createDate)}', '${dataFactory.getDateString(blogsEntry.modifiedDate)}', '${blogsEntry.title}', '${blogsEntry.urlTitle}', '${blogsEntry.description}', '${blogsEntry.content}', '${dataFactory.getDateString(blogsEntry.displayDate)}', ${blogsEntry.allowPingbacks?string}, ${blogsEntry.allowTrackbacks?string}, '${blogsEntry.trackbacks}', ${blogsEntry.smallImage?string}, ${blogsEntry.smallImageId}, '${blogsEntry.smallImageURL}', ${blogsEntry.status}, ${blogsEntry.statusByUserId}, '${blogsEntry.statusByUserName}', '${dataFactory.getDateString(blogsEntry.statusDate)}');
+
+		<@insertAssetEntry _entry = blogsEntry />
 
 		<#assign mbThreadId = counter.get()>
 		<#assign mbRootMessageId = counter.get()>

portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/dependencies/class_names.ftl

@@ -1,5 +1,3 @@
-<#setting number_format = "0">
-
 <#list dataFactory.classNames as className>
 	insert into ClassName_ values (${className.classNameId}, '${className.value}');
 </#list>

portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/dependencies/company.ftl

@@ -1,5 +1,3 @@
-<#setting number_format = "0">
-
 <#assign company = dataFactory.company>
 
 insert into Company values (${company.companyId}, ${company.accountId}, '${company.webId}', '${company.key}', '${company.mx}', '${company.homeURL}', ${company.logoId}, ${company.system?string}, ${company.maxUsers}, ${company.active?string});

portal-impl/src/com/liferay/portal/tools/samplesqlbuilder/dependencies/counters.ftl

@@ -1,5 +1,3 @@
-<#setting number_format = "0">
-
 <#assign counters = dataFactory.newCounters()>
 
 <#list counters as counter>