diff --git a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/internal/display/context/logic/UIItemsBuilder.java b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/internal/display/context/logic/UIItemsBuilder.java index c0898eb5e5ec99..66fc16d267313c 100644 --- a/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/internal/display/context/logic/UIItemsBuilder.java +++ b/modules/apps/document-library/document-library-web/src/main/java/com/liferay/document/library/web/internal/display/context/logic/UIItemsBuilder.java @@ -921,13 +921,8 @@ public boolean isViewOriginalFileActionAvailable() { } public boolean isViewUsagesActionAvailable() { - if (FeatureFlagManagerUtil.isEnabled( - _themeDisplay.getCompanyId(), "LPD-36446")) { - - return true; - } - - return false; + return FeatureFlagManagerUtil.isEnabled( + _themeDisplay.getCompanyId(), "LPD-36446"); } public boolean isViewVersionActionAvailable() { diff --git a/modules/apps/dynamic-data-lists/dynamic-data-lists-service/src/main/java/com/liferay/dynamic/data/lists/service/impl/DDLRecordLocalServiceImpl.java b/modules/apps/dynamic-data-lists/dynamic-data-lists-service/src/main/java/com/liferay/dynamic/data/lists/service/impl/DDLRecordLocalServiceImpl.java index 63c22b2037c90c..74272c74255d9d 100644 --- a/modules/apps/dynamic-data-lists/dynamic-data-lists-service/src/main/java/com/liferay/dynamic/data/lists/service/impl/DDLRecordLocalServiceImpl.java +++ b/modules/apps/dynamic-data-lists/dynamic-data-lists-service/src/main/java/com/liferay/dynamic/data/lists/service/impl/DDLRecordLocalServiceImpl.java @@ -1160,11 +1160,7 @@ protected boolean isKeepRecordVersionLabel( Map latestAttributes = latestExpandoBridge.getAttributes(); - if (!lastAttributes.equals(latestAttributes)) { - return false; - } - - return true; + return lastAttributes.equals(latestAttributes); } protected Fields toFields( diff --git a/modules/apps/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/internal/display/context/DDLDisplayContext.java b/modules/apps/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/internal/display/context/DDLDisplayContext.java index f03b0dde8a151e..34e3c7901db785 100644 --- a/modules/apps/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/internal/display/context/DDLDisplayContext.java +++ b/modules/apps/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/internal/display/context/DDLDisplayContext.java @@ -585,11 +585,7 @@ public boolean isShowAddRecordSetIcon() { } public boolean isShowCancelButton() { - if (isFormView()) { - return false; - } - - return true; + return !isFormView(); } public boolean isShowConfigurationIcon() throws PortalException { @@ -763,11 +759,7 @@ protected boolean hasResults() { } protected boolean isSearch() { - if (Validator.isNotNull(getKeywords())) { - return true; - } - - return false; + return Validator.isNotNull(getKeywords()); } private DDMTemplate _fetchDisplayDDMTemplate() { diff --git a/modules/apps/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/internal/display/context/DDLViewRecordsDisplayContext.java b/modules/apps/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/internal/display/context/DDLViewRecordsDisplayContext.java index 42bd167160707f..7a9fcad319b485 100644 --- a/modules/apps/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/internal/display/context/DDLViewRecordsDisplayContext.java +++ b/modules/apps/dynamic-data-lists/dynamic-data-lists-web/src/main/java/com/liferay/dynamic/data/lists/web/internal/display/context/DDLViewRecordsDisplayContext.java @@ -531,11 +531,7 @@ protected boolean hasResults() throws PortalException { } protected boolean isSearch() { - if (Validator.isNotNull(getKeywords())) { - return true; - } - - return false; + return Validator.isNotNull(getKeywords()); } protected boolean isShowAddRecordButton() throws PortalException { @@ -592,11 +588,7 @@ private SearchContext _getSearchContext( } private boolean _isDDMFormFieldTransient(DDMFormField ddmFormField) { - if (Validator.isNull(ddmFormField.getDataType())) { - return true; - } - - return false; + return Validator.isNull(ddmFormField.getDataType()); } private void _putDDMFormFieldValue( diff --git a/modules/apps/expando/expando-export-import/src/main/java/com/liferay/expando/exportimport/internal/data/handler/StagedExpandoColumnStagedModelDataHandler.java b/modules/apps/expando/expando-export-import/src/main/java/com/liferay/expando/exportimport/internal/data/handler/StagedExpandoColumnStagedModelDataHandler.java index ef86d5e2b217e5..fab1074379b2ae 100644 --- a/modules/apps/expando/expando-export-import/src/main/java/com/liferay/expando/exportimport/internal/data/handler/StagedExpandoColumnStagedModelDataHandler.java +++ b/modules/apps/expando/expando-export-import/src/main/java/com/liferay/expando/exportimport/internal/data/handler/StagedExpandoColumnStagedModelDataHandler.java @@ -82,11 +82,7 @@ public boolean validateReference( fetchStagedModelsByUuidAndCompanyId( uuid, portletDataContext.getCompanyId()); - if (ListUtil.isEmpty(stagedExpandoColumns)) { - return false; - } - - return true; + return !ListUtil.isEmpty(stagedExpandoColumns); } @Override diff --git a/modules/apps/feature-flag/feature-flag-web/src/main/java/com/liferay/feature/flag/web/internal/configuration/admin/display/FeatureFlagConfigurationScreen.java b/modules/apps/feature-flag/feature-flag-web/src/main/java/com/liferay/feature/flag/web/internal/configuration/admin/display/FeatureFlagConfigurationScreen.java index fc5b86e117e5b9..e45ec0ccf91139 100644 --- a/modules/apps/feature-flag/feature-flag-web/src/main/java/com/liferay/feature/flag/web/internal/configuration/admin/display/FeatureFlagConfigurationScreen.java +++ b/modules/apps/feature-flag/feature-flag-web/src/main/java/com/liferay/feature/flag/web/internal/configuration/admin/display/FeatureFlagConfigurationScreen.java @@ -63,11 +63,7 @@ public String getScope() { @Override public boolean isVisible() { - if (_featureFlagType.isUIEnabled()) { - return true; - } - - return false; + return _featureFlagType.isUIEnabled(); } @Override diff --git a/modules/apps/friendly-url/friendly-url-service/src/main/java/com/liferay/friendly/url/internal/servlet/FriendlyURLServlet.java b/modules/apps/friendly-url/friendly-url-service/src/main/java/com/liferay/friendly/url/internal/servlet/FriendlyURLServlet.java index 61e2c357bc5fcb..d7145683cb77ac 100644 --- a/modules/apps/friendly-url/friendly-url-service/src/main/java/com/liferay/friendly/url/internal/servlet/FriendlyURLServlet.java +++ b/modules/apps/friendly-url/friendly-url-service/src/main/java/com/liferay/friendly/url/internal/servlet/FriendlyURLServlet.java @@ -1089,13 +1089,8 @@ private boolean _isImpersonated( } private boolean _isPermanentRedirect(long companyId) { - if (Objects.equals( - _getFriendlyURLRedirectionType(companyId), "permanent")) { - - return true; - } - - return false; + return Objects.equals( + _getFriendlyURLRedirectionType(companyId), "permanent"); } private boolean _isShowAlternativeLayoutFriendlyURLMessage(long companyId) { diff --git a/modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/java/com/liferay/frontend/data/set/admin/web/internal/fragment/renderer/FDSAdminFragmentRenderer.java b/modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/java/com/liferay/frontend/data/set/admin/web/internal/fragment/renderer/FDSAdminFragmentRenderer.java index c89ba793e9283c..e8c1b74c50c557 100644 --- a/modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/java/com/liferay/frontend/data/set/admin/web/internal/fragment/renderer/FDSAdminFragmentRenderer.java +++ b/modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/java/com/liferay/frontend/data/set/admin/web/internal/fragment/renderer/FDSAdminFragmentRenderer.java @@ -127,11 +127,7 @@ public String getLabel(Locale locale) { @Override public boolean isSelectable(HttpServletRequest httpServletRequest) { - if (!FeatureFlagManagerUtil.isEnabled("LPS-164563")) { - return false; - } - - return true; + return FeatureFlagManagerUtil.isEnabled("LPS-164563"); } @Override diff --git a/modules/apps/info/info-api/src/main/java/com/liferay/info/item/InfoItemFormVariation.java b/modules/apps/info/info-api/src/main/java/com/liferay/info/item/InfoItemFormVariation.java index 2e809cd91669f3..dc688dce3a71a7 100644 --- a/modules/apps/info/info-api/src/main/java/com/liferay/info/item/InfoItemFormVariation.java +++ b/modules/apps/info/info-api/src/main/java/com/liferay/info/item/InfoItemFormVariation.java @@ -46,11 +46,7 @@ public boolean equals(Object object) { InfoItemFormVariation infoItemFormVariation = (InfoItemFormVariation)object; - if (Objects.equals(_key, infoItemFormVariation._key)) { - return true; - } - - return false; + return Objects.equals(_key, infoItemFormVariation._key); } public String getExternalReferenceCode() { diff --git a/modules/apps/item-selector/item-selector-taglib/src/main/java/com/liferay/item/selector/taglib/internal/display/context/GroupSelectorDisplayContext.java b/modules/apps/item-selector/item-selector-taglib/src/main/java/com/liferay/item/selector/taglib/internal/display/context/GroupSelectorDisplayContext.java index be53747afd1497..c12304be7bbd4d 100644 --- a/modules/apps/item-selector/item-selector-taglib/src/main/java/com/liferay/item/selector/taglib/internal/display/context/GroupSelectorDisplayContext.java +++ b/modules/apps/item-selector/item-selector-taglib/src/main/java/com/liferay/item/selector/taglib/internal/display/context/GroupSelectorDisplayContext.java @@ -124,11 +124,7 @@ public String getViewGroupURL(Group group) { } public boolean isGroupTypeActive(String groupType) { - if (groupType.equals(_getGroupType())) { - return true; - } - - return false; + return groupType.equals(_getGroupType()); } protected GroupSelectorDisplayContext( diff --git a/modules/apps/item-selector/item-selector-web/src/main/java/com/liferay/item/selector/web/internal/ItemSelectorImpl.java b/modules/apps/item-selector/item-selector-web/src/main/java/com/liferay/item/selector/web/internal/ItemSelectorImpl.java index 3b0516a3ff26fd..4f56fcd018cf90 100644 --- a/modules/apps/item-selector/item-selector-web/src/main/java/com/liferay/item/selector/web/internal/ItemSelectorImpl.java +++ b/modules/apps/item-selector/item-selector-web/src/main/java/com/liferay/item/selector/web/internal/ItemSelectorImpl.java @@ -437,11 +437,7 @@ private ItemSelectorViewRenderer _applyCustomizations( private boolean _isSearch(Map parameters) { String keywords = getValue(parameters, "keywords"); - if (Validator.isNotNull(keywords)) { - return true; - } - - return false; + return Validator.isNotNull(keywords); } private static final Pattern _itemSelectorURLPattern = Pattern.compile( diff --git a/modules/apps/item-selector/item-selector-web/src/main/java/com/liferay/item/selector/web/internal/display/context/ItemSelectorViewDescriptorRendererDisplayContext.java b/modules/apps/item-selector/item-selector-web/src/main/java/com/liferay/item/selector/web/internal/display/context/ItemSelectorViewDescriptorRendererDisplayContext.java index c50236c5ea360f..b4549a983c0802 100644 --- a/modules/apps/item-selector/item-selector-web/src/main/java/com/liferay/item/selector/web/internal/display/context/ItemSelectorViewDescriptorRendererDisplayContext.java +++ b/modules/apps/item-selector/item-selector-web/src/main/java/com/liferay/item/selector/web/internal/display/context/ItemSelectorViewDescriptorRendererDisplayContext.java @@ -109,19 +109,11 @@ public SearchContainer getSearchContainer() throws PortalException { } public boolean isDescriptiveDisplayStyle() { - if (Objects.equals(getDisplayStyle(), "descriptive")) { - return true; - } - - return false; + return Objects.equals(getDisplayStyle(), "descriptive"); } public boolean isIconDisplayStyle() { - if (Objects.equals(getDisplayStyle(), "icon")) { - return true; - } - - return false; + return Objects.equals(getDisplayStyle(), "icon"); } public boolean isMultipleSelection() { diff --git a/modules/apps/list-type/list-type-service/src/main/java/com/liferay/list/type/internal/security/permission/resource/ListTypePortletResourcePermissionWrapper.java b/modules/apps/list-type/list-type-service/src/main/java/com/liferay/list/type/internal/security/permission/resource/ListTypePortletResourcePermissionWrapper.java index d08f3f26977faf..336cacaa3d0149 100644 --- a/modules/apps/list-type/list-type-service/src/main/java/com/liferay/list/type/internal/security/permission/resource/ListTypePortletResourcePermissionWrapper.java +++ b/modules/apps/list-type/list-type-service/src/main/java/com/liferay/list/type/internal/security/permission/resource/ListTypePortletResourcePermissionWrapper.java @@ -40,11 +40,7 @@ public Boolean contains( PermissionChecker permissionChecker, String name, Group group, String actionId) { - if (permissionChecker.hasPermission(group, name, 0, actionId)) { - return true; - } - - return false; + return permissionChecker.hasPermission(group, name, 0, actionId); } } diff --git a/modules/apps/login/login-web/src/main/java/com/liferay/login/web/internal/layout/portlet/CreateAccountPortletManager.java b/modules/apps/login/login-web/src/main/java/com/liferay/login/web/internal/layout/portlet/CreateAccountPortletManager.java index bc2dd8d4e30138..70d982e67beb2e 100644 --- a/modules/apps/login/login-web/src/main/java/com/liferay/login/web/internal/layout/portlet/CreateAccountPortletManager.java +++ b/modules/apps/login/login-web/src/main/java/com/liferay/login/web/internal/layout/portlet/CreateAccountPortletManager.java @@ -23,11 +23,7 @@ public class CreateAccountPortletManager implements PortletManager { @Override public boolean isVisible(Layout layout) { - if (FeatureFlagManagerUtil.isEnabled("LPD-6378")) { - return true; - } - - return false; + return FeatureFlagManagerUtil.isEnabled("LPD-6378"); } } \ No newline at end of file diff --git a/modules/apps/login/login-web/src/main/java/com/liferay/login/web/internal/layout/portlet/ForgotPasswordPortletManager.java b/modules/apps/login/login-web/src/main/java/com/liferay/login/web/internal/layout/portlet/ForgotPasswordPortletManager.java index 3884a0437b3a35..c494b6f0218802 100644 --- a/modules/apps/login/login-web/src/main/java/com/liferay/login/web/internal/layout/portlet/ForgotPasswordPortletManager.java +++ b/modules/apps/login/login-web/src/main/java/com/liferay/login/web/internal/layout/portlet/ForgotPasswordPortletManager.java @@ -23,11 +23,7 @@ public class ForgotPasswordPortletManager implements PortletManager { @Override public boolean isVisible(Layout layout) { - if (FeatureFlagManagerUtil.isEnabled("LPD-6378")) { - return true; - } - - return false; + return FeatureFlagManagerUtil.isEnabled("LPD-6378"); } } \ No newline at end of file diff --git a/modules/apps/marketplace/marketplace-api/src/main/java/com/liferay/marketplace/util/BundleManagerUtil.java b/modules/apps/marketplace/marketplace-api/src/main/java/com/liferay/marketplace/util/BundleManagerUtil.java index 3fb3b7cd3bbfed..7e2af5fe93c32a 100644 --- a/modules/apps/marketplace/marketplace-api/src/main/java/com/liferay/marketplace/util/BundleManagerUtil.java +++ b/modules/apps/marketplace/marketplace-api/src/main/java/com/liferay/marketplace/util/BundleManagerUtil.java @@ -107,11 +107,7 @@ public static void installLPKG(File file) throws Exception { } public static boolean isInstalled(Bundle bundle) { - if (ArrayUtil.contains(_INSTALLED_BUNDLE_STATES, bundle.getState())) { - return true; - } - - return false; + return ArrayUtil.contains(_INSTALLED_BUNDLE_STATES, bundle.getState()); } public static boolean isInstalled(String symbolicName, String version) { diff --git a/modules/apps/marketplace/marketplace-app-manager-web/src/main/java/com/liferay/marketplace/app/manager/web/internal/portlet/configuration/icon/UploadConfigurationIcon.java b/modules/apps/marketplace/marketplace-app-manager-web/src/main/java/com/liferay/marketplace/app/manager/web/internal/portlet/configuration/icon/UploadConfigurationIcon.java index eba44963c96f12..441361918a6a56 100644 --- a/modules/apps/marketplace/marketplace-app-manager-web/src/main/java/com/liferay/marketplace/app/manager/web/internal/portlet/configuration/icon/UploadConfigurationIcon.java +++ b/modules/apps/marketplace/marketplace-app-manager-web/src/main/java/com/liferay/marketplace/app/manager/web/internal/portlet/configuration/icon/UploadConfigurationIcon.java @@ -64,11 +64,7 @@ public boolean isShow(PortletRequest portletRequest) { User user = themeDisplay.getUser(); - if (user.isGuestUser()) { - return false; - } - - return true; + return !user.isGuestUser(); } @Override diff --git a/modules/apps/marketplace/marketplace-app-manager-web/src/main/java/com/liferay/marketplace/app/manager/web/internal/util/BundleUtil.java b/modules/apps/marketplace/marketplace-app-manager-web/src/main/java/com/liferay/marketplace/app/manager/web/internal/util/BundleUtil.java index d9d994e6543547..26d4315be88c7f 100644 --- a/modules/apps/marketplace/marketplace-app-manager-web/src/main/java/com/liferay/marketplace/app/manager/web/internal/util/BundleUtil.java +++ b/modules/apps/marketplace/marketplace-app-manager-web/src/main/java/com/liferay/marketplace/app/manager/web/internal/util/BundleUtil.java @@ -51,11 +51,7 @@ public static boolean isFragment(Bundle bundle) { String fragmentHost = headers.get(Constants.FRAGMENT_HOST); - if (Validator.isNotNull(fragmentHost)) { - return true; - } - - return false; + return Validator.isNotNull(fragmentHost); } } \ No newline at end of file diff --git a/modules/apps/marketplace/marketplace-app-manager-web/src/main/java/com/liferay/marketplace/app/manager/web/internal/util/MarketplaceAppManagerSearchUtil.java b/modules/apps/marketplace/marketplace-app-manager-web/src/main/java/com/liferay/marketplace/app/manager/web/internal/util/MarketplaceAppManagerSearchUtil.java index 3497122ff5a0c6..4993ae54bfa5d0 100644 --- a/modules/apps/marketplace/marketplace-app-manager-web/src/main/java/com/liferay/marketplace/app/manager/web/internal/util/MarketplaceAppManagerSearchUtil.java +++ b/modules/apps/marketplace/marketplace-app-manager-web/src/main/java/com/liferay/marketplace/app/manager/web/internal/util/MarketplaceAppManagerSearchUtil.java @@ -62,11 +62,7 @@ private static boolean _containsMatches(String regex, String string) { Matcher matcher = pattern.matcher(string); - if (matcher.find()) { - return true; - } - - return false; + return matcher.find(); } private static String _getKeywordsRegex(String keywords) { @@ -111,11 +107,7 @@ private static boolean _hasBundleKeywordsMatch( String bundleName = headers.get(Constants.BUNDLE_NAME); - if (_containsMatches(keywordsRegex, bundleName)) { - return true; - } - - return false; + return _containsMatches(keywordsRegex, bundleName); } } \ No newline at end of file diff --git a/modules/apps/marketplace/marketplace-service/src/main/java/com/liferay/marketplace/internal/service/permission/MarketplacePermission.java b/modules/apps/marketplace/marketplace-service/src/main/java/com/liferay/marketplace/internal/service/permission/MarketplacePermission.java index 493c0875ee2a5d..d5d9813c6281ee 100644 --- a/modules/apps/marketplace/marketplace-service/src/main/java/com/liferay/marketplace/internal/service/permission/MarketplacePermission.java +++ b/modules/apps/marketplace/marketplace-service/src/main/java/com/liferay/marketplace/internal/service/permission/MarketplacePermission.java @@ -25,11 +25,7 @@ public static void check(PermissionChecker permissionChecker) public static boolean contains(PermissionChecker permissionChecker) throws PortalException { - if (!permissionChecker.isOmniadmin()) { - return false; - } - - return true; + return permissionChecker.isOmniadmin(); } } \ No newline at end of file diff --git a/modules/apps/microblogs/microblogs-service/src/main/java/com/liferay/microblogs/internal/security/permission/resource/MicroblogsEntryModelResourcePermission.java b/modules/apps/microblogs/microblogs-service/src/main/java/com/liferay/microblogs/internal/security/permission/resource/MicroblogsEntryModelResourcePermission.java index 822580195d4bd1..eeb3c6765281e5 100644 --- a/modules/apps/microblogs/microblogs-service/src/main/java/com/liferay/microblogs/internal/security/permission/resource/MicroblogsEntryModelResourcePermission.java +++ b/modules/apps/microblogs/microblogs-service/src/main/java/com/liferay/microblogs/internal/security/permission/resource/MicroblogsEntryModelResourcePermission.java @@ -75,16 +75,10 @@ public boolean contains( if (actionId.equals(ActionKeys.DELETE) || actionId.equals(ActionKeys.UPDATE)) { - if (permissionChecker.hasOwnerPermission( - microblogsEntry.getCompanyId(), - MicroblogsEntry.class.getName(), - microblogsEntry.getMicroblogsEntryId(), - microblogsEntry.getUserId(), actionId)) { - - return true; - } - - return false; + return permissionChecker.hasOwnerPermission( + microblogsEntry.getCompanyId(), MicroblogsEntry.class.getName(), + microblogsEntry.getMicroblogsEntryId(), + microblogsEntry.getUserId(), actionId); } if (permissionChecker.hasOwnerPermission( diff --git a/modules/apps/notification/notification-service/src/main/java/com/liferay/notification/internal/security/permission/resource/NotificationQueueEntryPortletResourcePermissionWrapper.java b/modules/apps/notification/notification-service/src/main/java/com/liferay/notification/internal/security/permission/resource/NotificationQueueEntryPortletResourcePermissionWrapper.java index b0946e011dbec1..7d28ff4b8a1269 100644 --- a/modules/apps/notification/notification-service/src/main/java/com/liferay/notification/internal/security/permission/resource/NotificationQueueEntryPortletResourcePermissionWrapper.java +++ b/modules/apps/notification/notification-service/src/main/java/com/liferay/notification/internal/security/permission/resource/NotificationQueueEntryPortletResourcePermissionWrapper.java @@ -40,11 +40,7 @@ public Boolean contains( PermissionChecker permissionChecker, String name, Group group, String actionId) { - if (permissionChecker.hasPermission(group, name, 0, actionId)) { - return true; - } - - return false; + return permissionChecker.hasPermission(group, name, 0, actionId); } } diff --git a/modules/apps/notification/notification-service/src/main/java/com/liferay/notification/internal/security/permission/resource/NotificationTemplatePortletResourcePermissionWrapper.java b/modules/apps/notification/notification-service/src/main/java/com/liferay/notification/internal/security/permission/resource/NotificationTemplatePortletResourcePermissionWrapper.java index 10682cc2b1790a..cdd182301056de 100644 --- a/modules/apps/notification/notification-service/src/main/java/com/liferay/notification/internal/security/permission/resource/NotificationTemplatePortletResourcePermissionWrapper.java +++ b/modules/apps/notification/notification-service/src/main/java/com/liferay/notification/internal/security/permission/resource/NotificationTemplatePortletResourcePermissionWrapper.java @@ -41,11 +41,7 @@ public Boolean contains( PermissionChecker permissionChecker, String name, Group group, String actionId) { - if (permissionChecker.hasPermission(group, name, 0, actionId)) { - return true; - } - - return false; + return permissionChecker.hasPermission(group, name, 0, actionId); } } diff --git a/modules/apps/password-policies-admin/password-policies-admin-web/src/main/java/com/liferay/password/policies/admin/web/internal/portlet/configuration/icon/AssignMembersPortletConfigurationIcon.java b/modules/apps/password-policies-admin/password-policies-admin-web/src/main/java/com/liferay/password/policies/admin/web/internal/portlet/configuration/icon/AssignMembersPortletConfigurationIcon.java index 1aa5d4e962ec4a..0e0c86cbc39c5a 100644 --- a/modules/apps/password-policies-admin/password-policies-admin-web/src/main/java/com/liferay/password/policies/admin/web/internal/portlet/configuration/icon/AssignMembersPortletConfigurationIcon.java +++ b/modules/apps/password-policies-admin/password-policies-admin-web/src/main/java/com/liferay/password/policies/admin/web/internal/portlet/configuration/icon/AssignMembersPortletConfigurationIcon.java @@ -74,15 +74,9 @@ public boolean isShow(PortletRequest portletRequest) { ThemeDisplay themeDisplay = (ThemeDisplay)portletRequest.getAttribute( WebKeys.THEME_DISPLAY); - if (PasswordPolicyPermissionUtil.contains( - themeDisplay.getPermissionChecker(), - _getPasswordPolicyId(portletRequest), - ActionKeys.ASSIGN_MEMBERS)) { - - return true; - } - - return false; + return PasswordPolicyPermissionUtil.contains( + themeDisplay.getPermissionChecker(), + _getPasswordPolicyId(portletRequest), ActionKeys.ASSIGN_MEMBERS); } private long _getPasswordPolicyId(PortletRequest portletRequest) { diff --git a/modules/apps/password-policies-admin/password-policies-admin-web/src/main/java/com/liferay/password/policies/admin/web/internal/portlet/configuration/icon/EditPasswordPolicyPortletConfigurationIcon.java b/modules/apps/password-policies-admin/password-policies-admin-web/src/main/java/com/liferay/password/policies/admin/web/internal/portlet/configuration/icon/EditPasswordPolicyPortletConfigurationIcon.java index 1bcd90ba387d52..c37f52107c4942 100644 --- a/modules/apps/password-policies-admin/password-policies-admin-web/src/main/java/com/liferay/password/policies/admin/web/internal/portlet/configuration/icon/EditPasswordPolicyPortletConfigurationIcon.java +++ b/modules/apps/password-policies-admin/password-policies-admin-web/src/main/java/com/liferay/password/policies/admin/web/internal/portlet/configuration/icon/EditPasswordPolicyPortletConfigurationIcon.java @@ -70,14 +70,9 @@ public boolean isShow(PortletRequest portletRequest) { ThemeDisplay themeDisplay = (ThemeDisplay)portletRequest.getAttribute( WebKeys.THEME_DISPLAY); - if (PasswordPolicyPermissionUtil.contains( - themeDisplay.getPermissionChecker(), - _getPasswordPolicyId(portletRequest), ActionKeys.UPDATE)) { - - return true; - } - - return false; + return PasswordPolicyPermissionUtil.contains( + themeDisplay.getPermissionChecker(), + _getPasswordPolicyId(portletRequest), ActionKeys.UPDATE); } private long _getPasswordPolicyId(PortletRequest portletRequest) { diff --git a/modules/apps/password-policies-admin/password-policies-admin-web/src/main/java/com/liferay/password/policies/admin/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java b/modules/apps/password-policies-admin/password-policies-admin-web/src/main/java/com/liferay/password/policies/admin/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java index 7084bed9be36fe..cd4c3e15fd3a9d 100644 --- a/modules/apps/password-policies-admin/password-policies-admin-web/src/main/java/com/liferay/password/policies/admin/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java +++ b/modules/apps/password-policies-admin/password-policies-admin-web/src/main/java/com/liferay/password/policies/admin/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java @@ -83,14 +83,9 @@ public boolean isShow(PortletRequest portletRequest) { ThemeDisplay themeDisplay = (ThemeDisplay)portletRequest.getAttribute( WebKeys.THEME_DISPLAY); - if (PasswordPolicyPermissionUtil.contains( - themeDisplay.getPermissionChecker(), - _getPasswordPolicyId(portletRequest), ActionKeys.PERMISSIONS)) { - - return true; - } - - return false; + return PasswordPolicyPermissionUtil.contains( + themeDisplay.getPermissionChecker(), + _getPasswordPolicyId(portletRequest), ActionKeys.PERMISSIONS); } @Override diff --git a/modules/apps/portal-language/portal-language-override-web/src/main/java/com/liferay/portal/language/override/web/internal/portlet/configuration/icon/ImportTranslationsPortletConfigurationIcon.java b/modules/apps/portal-language/portal-language-override-web/src/main/java/com/liferay/portal/language/override/web/internal/portlet/configuration/icon/ImportTranslationsPortletConfigurationIcon.java index 1bee169fef434e..67c42f42e92828 100644 --- a/modules/apps/portal-language/portal-language-override-web/src/main/java/com/liferay/portal/language/override/web/internal/portlet/configuration/icon/ImportTranslationsPortletConfigurationIcon.java +++ b/modules/apps/portal-language/portal-language-override-web/src/main/java/com/liferay/portal/language/override/web/internal/portlet/configuration/icon/ImportTranslationsPortletConfigurationIcon.java @@ -65,14 +65,9 @@ public boolean isShow(PortletRequest portletRequest) { ThemeDisplay themeDisplay = (ThemeDisplay)portletRequest.getAttribute( WebKeys.THEME_DISPLAY); - if (PortalPermissionUtil.contains( - themeDisplay.getPermissionChecker(), - PLOActionKeys.MANAGE_LANGUAGE_OVERRIDES)) { - - return true; - } - - return false; + return PortalPermissionUtil.contains( + themeDisplay.getPermissionChecker(), + PLOActionKeys.MANAGE_LANGUAGE_OVERRIDES); } @Reference diff --git a/modules/apps/portal-remote/portal-remote-cors-impl/src/main/java/com/liferay/portal/remote/cors/internal/CORSSupport.java b/modules/apps/portal-remote/portal-remote-cors-impl/src/main/java/com/liferay/portal/remote/cors/internal/CORSSupport.java index ecc7449f0bcf44..de802bbdd27afc 100644 --- a/modules/apps/portal-remote/portal-remote-cors-impl/src/main/java/com/liferay/portal/remote/cors/internal/CORSSupport.java +++ b/modules/apps/portal-remote/portal-remote-cors-impl/src/main/java/com/liferay/portal/remote/cors/internal/CORSSupport.java @@ -76,11 +76,7 @@ public static boolean isCORSRequest( String origin = requestHeadersFunction.apply(ORIGIN); - if (Validator.isBlank(origin)) { - return false; - } - - return true; + return !Validator.isBlank(origin); } public boolean isValidCORSPreflightRequest( diff --git a/modules/apps/portal-remote/portal-remote-cors-impl/src/main/java/com/liferay/portal/remote/cors/internal/servlet/filter/PortalCORSServletFilter.java b/modules/apps/portal-remote/portal-remote-cors-impl/src/main/java/com/liferay/portal/remote/cors/internal/servlet/filter/PortalCORSServletFilter.java index 245b431083e651..ac556e025abdb3 100644 --- a/modules/apps/portal-remote/portal-remote-cors-impl/src/main/java/com/liferay/portal/remote/cors/internal/servlet/filter/PortalCORSServletFilter.java +++ b/modules/apps/portal-remote/portal-remote-cors-impl/src/main/java/com/liferay/portal/remote/cors/internal/servlet/filter/PortalCORSServletFilter.java @@ -70,11 +70,7 @@ public boolean isFilterEnabled( HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { - if (CORSSupport.isCORSRequest(httpServletRequest::getHeader)) { - return true; - } - - return false; + return CORSSupport.isCORSRequest(httpServletRequest::getHeader); } @Activate diff --git a/modules/apps/portal-remote/portal-remote-json-web-service-web/src/main/java/com/liferay/portal/remote/json/web/service/web/internal/JSONWebServiceActionConfig.java b/modules/apps/portal-remote/portal-remote-json-web-service-web/src/main/java/com/liferay/portal/remote/json/web/service/web/internal/JSONWebServiceActionConfig.java index 344d057320993a..1f33df1a7005fc 100644 --- a/modules/apps/portal-remote/portal-remote-json-web-service-web/src/main/java/com/liferay/portal/remote/json/web/service/web/internal/JSONWebServiceActionConfig.java +++ b/modules/apps/portal-remote/portal-remote-json-web-service-web/src/main/java/com/liferay/portal/remote/json/web/service/web/internal/JSONWebServiceActionConfig.java @@ -121,11 +121,8 @@ public boolean equals(Object object) { JSONWebServiceActionConfig jsonWebServiceActionConfig = (JSONWebServiceActionConfig)object; - if (Objects.equals(_signature, jsonWebServiceActionConfig._signature)) { - return true; - } - - return false; + return Objects.equals( + _signature, jsonWebServiceActionConfig._signature); } @Override diff --git a/modules/apps/portal-remote/portal-remote-json-web-service-web/src/main/java/com/liferay/portal/remote/json/web/service/web/internal/JSONWebServiceNamingUtil.java b/modules/apps/portal-remote/portal-remote-json-web-service-web/src/main/java/com/liferay/portal/remote/json/web/service/web/internal/JSONWebServiceNamingUtil.java index 997556875a5727..09ab56bedfb034 100644 --- a/modules/apps/portal-remote/portal-remote-json-web-service-web/src/main/java/com/liferay/portal/remote/json/web/service/web/internal/JSONWebServiceNamingUtil.java +++ b/modules/apps/portal-remote/portal-remote-json-web-service-web/src/main/java/com/liferay/portal/remote/json/web/service/web/internal/JSONWebServiceNamingUtil.java @@ -181,11 +181,7 @@ public static boolean isIncludedPath( } public static boolean isValidHttpMethod(String httpMethod) { - if (_invalidHttpMethods.contains(httpMethod)) { - return false; - } - - return true; + return !_invalidHttpMethods.contains(httpMethod); } private static String _getMethodNamePrefix(String methodName) { diff --git a/modules/apps/portal-scheduler/portal-scheduler-quartz/src/main/java/com/liferay/portal/scheduler/quartz/internal/upgrade/v1_0_3/QuartzDBPartitionUpgradeProcess.java b/modules/apps/portal-scheduler/portal-scheduler-quartz/src/main/java/com/liferay/portal/scheduler/quartz/internal/upgrade/v1_0_3/QuartzDBPartitionUpgradeProcess.java index a3d17469a5ffe7..f9d7b599deff02 100644 --- a/modules/apps/portal-scheduler/portal-scheduler-quartz/src/main/java/com/liferay/portal/scheduler/quartz/internal/upgrade/v1_0_3/QuartzDBPartitionUpgradeProcess.java +++ b/modules/apps/portal-scheduler/portal-scheduler-quartz/src/main/java/com/liferay/portal/scheduler/quartz/internal/upgrade/v1_0_3/QuartzDBPartitionUpgradeProcess.java @@ -32,11 +32,7 @@ protected void doUpgrade() throws Exception { @Override protected boolean isSkipUpgradeProcess() { - if (!DBPartition.isPartitionEnabled()) { - return true; - } - - return false; + return !DBPartition.isPartitionEnabled(); } private void _addIndex(String createIndexSQLStatement) throws Exception { diff --git a/modules/apps/portal-scheduler/portal-scheduler-quartz/src/test/java/com/liferay/portal/scheduler/quartz/internal/QuartzSchedulerEngineTest.java b/modules/apps/portal-scheduler/portal-scheduler-quartz/src/test/java/com/liferay/portal/scheduler/quartz/internal/QuartzSchedulerEngineTest.java index 45ed50a8490127..74b4577add1562 100644 --- a/modules/apps/portal-scheduler/portal-scheduler-quartz/src/test/java/com/liferay/portal/scheduler/quartz/internal/QuartzSchedulerEngineTest.java +++ b/modules/apps/portal-scheduler/portal-scheduler-quartz/src/test/java/com/liferay/portal/scheduler/quartz/internal/QuartzSchedulerEngineTest.java @@ -735,11 +735,7 @@ public boolean isInStandbyMode() { @Override public boolean isShutdown() { - if (!_ready) { - return true; - } - - return false; + return !_ready; } @Override diff --git a/modules/apps/portal-search-elasticsearch7/portal-search-elasticsearch7-impl/src/main/java/com/liferay/portal/search/elasticsearch7/internal/ElasticsearchSearchEngine.java b/modules/apps/portal-search-elasticsearch7/portal-search-elasticsearch7-impl/src/main/java/com/liferay/portal/search/elasticsearch7/internal/ElasticsearchSearchEngine.java index 571ecbece049f4..f60318d23e8958 100644 --- a/modules/apps/portal-search-elasticsearch7/portal-search-elasticsearch7-impl/src/main/java/com/liferay/portal/search/elasticsearch7/internal/ElasticsearchSearchEngine.java +++ b/modules/apps/portal-search-elasticsearch7/portal-search-elasticsearch7-impl/src/main/java/com/liferay/portal/search/elasticsearch7/internal/ElasticsearchSearchEngine.java @@ -506,11 +506,7 @@ private boolean _hasBackupRepository() { List snapshotRepositoryDetailsList = getSnapshotRepositoriesResponse.getSnapshotRepositoryDetails(); - if (snapshotRepositoryDetailsList.isEmpty()) { - return false; - } - - return true; + return !snapshotRepositoryDetailsList.isEmpty(); } private void _putTimestampPipeline() { diff --git a/modules/apps/portal-search-elasticsearch7/portal-search-elasticsearch7-impl/src/main/java/com/liferay/portal/search/elasticsearch7/internal/logging/ElasticsearchExceptionHandler.java b/modules/apps/portal-search-elasticsearch7/portal-search-elasticsearch7-impl/src/main/java/com/liferay/portal/search/elasticsearch7/internal/logging/ElasticsearchExceptionHandler.java index ac6f8014d2892e..18e215a60af4ac 100644 --- a/modules/apps/portal-search-elasticsearch7/portal-search-elasticsearch7-impl/src/main/java/com/liferay/portal/search/elasticsearch7/internal/logging/ElasticsearchExceptionHandler.java +++ b/modules/apps/portal-search-elasticsearch7/portal-search-elasticsearch7-impl/src/main/java/com/liferay/portal/search/elasticsearch7/internal/logging/ElasticsearchExceptionHandler.java @@ -48,11 +48,7 @@ else if (_logExceptionsOnly) { private boolean _isIndexNotFound(Throwable throwable) { String message = throwable.getMessage(); - if (message.contains(INDEX_NOT_FOUND_EXCEPTION_MESSAGE)) { - return true; - } - - return false; + return message.contains(INDEX_NOT_FOUND_EXCEPTION_MESSAGE); } private final Log _log; diff --git a/modules/apps/portal-search-elasticsearch7/portal-search-elasticsearch7-impl/src/main/java/com/liferay/portal/search/elasticsearch7/internal/sidecar/Sidecar.java b/modules/apps/portal-search-elasticsearch7/portal-search-elasticsearch7-impl/src/main/java/com/liferay/portal/search/elasticsearch7/internal/sidecar/Sidecar.java index 2d5708091b689c..2ed9087ff14be0 100644 --- a/modules/apps/portal-search-elasticsearch7/portal-search-elasticsearch7-impl/src/main/java/com/liferay/portal/search/elasticsearch7/internal/sidecar/Sidecar.java +++ b/modules/apps/portal-search-elasticsearch7/portal-search-elasticsearch7-impl/src/main/java/com/liferay/portal/search/elasticsearch7/internal/sidecar/Sidecar.java @@ -258,11 +258,7 @@ private ProcessChannel _executeSidecarMainProcess() { private boolean _fileNameContains(Path path, String s) { String name = String.valueOf(path.getFileName()); - if (name.contains(s)) { - return true; - } - - return false; + return name.contains(s); } private String _getBootstrapClassPath() { diff --git a/modules/apps/portal-search-opensearch2/portal-search-opensearch2-impl/src/main/java/com/liferay/portal/search/opensearch2/internal/logging/OpenSearchExceptionHandler.java b/modules/apps/portal-search-opensearch2/portal-search-opensearch2-impl/src/main/java/com/liferay/portal/search/opensearch2/internal/logging/OpenSearchExceptionHandler.java index 8358894ce0477b..5ee742c449d142 100644 --- a/modules/apps/portal-search-opensearch2/portal-search-opensearch2-impl/src/main/java/com/liferay/portal/search/opensearch2/internal/logging/OpenSearchExceptionHandler.java +++ b/modules/apps/portal-search-opensearch2/portal-search-opensearch2-impl/src/main/java/com/liferay/portal/search/opensearch2/internal/logging/OpenSearchExceptionHandler.java @@ -48,11 +48,7 @@ else if (_logExceptionsOnly) { private boolean _isIndexNotFound(Throwable throwable) { String message = throwable.getMessage(); - if (message.contains(INDEX_NOT_FOUND_EXCEPTION_MESSAGE)) { - return true; - } - - return false; + return message.contains(INDEX_NOT_FOUND_EXCEPTION_MESSAGE); } private final Log _log; diff --git a/modules/apps/portal-search-solr8/portal-search-solr8-impl/src/main/java/com/liferay/portal/search/solr8/internal/filter/BooleanFilterTranslatorImpl.java b/modules/apps/portal-search-solr8/portal-search-solr8-impl/src/main/java/com/liferay/portal/search/solr8/internal/filter/BooleanFilterTranslatorImpl.java index 5a5786c1f7f170..5982165ff0bc5a 100644 --- a/modules/apps/portal-search-solr8/portal-search-solr8-impl/src/main/java/com/liferay/portal/search/solr8/internal/filter/BooleanFilterTranslatorImpl.java +++ b/modules/apps/portal-search-solr8/portal-search-solr8-impl/src/main/java/com/liferay/portal/search/solr8/internal/filter/BooleanFilterTranslatorImpl.java @@ -88,11 +88,7 @@ private boolean _isOnlyMustNotClauses(BooleanFilter booleanFilter) { booleanClauses = booleanFilter.getMustNotBooleanClauses(); - if (!booleanClauses.isEmpty()) { - return true; - } - - return false; + return !booleanClauses.isEmpty(); } } \ No newline at end of file diff --git a/modules/apps/portal-search-solr8/portal-search-solr8-impl/src/main/java/com/liferay/portal/search/solr8/internal/suggest/NGramHolderBuilderImpl.java b/modules/apps/portal-search-solr8/portal-search-solr8-impl/src/main/java/com/liferay/portal/search/solr8/internal/suggest/NGramHolderBuilderImpl.java index e76ddfb40aa981..6ec375c569f6ec 100644 --- a/modules/apps/portal-search-solr8/portal-search-solr8-impl/src/main/java/com/liferay/portal/search/solr8/internal/suggest/NGramHolderBuilderImpl.java +++ b/modules/apps/portal-search-solr8/portal-search-solr8-impl/src/main/java/com/liferay/portal/search/solr8/internal/suggest/NGramHolderBuilderImpl.java @@ -96,11 +96,7 @@ protected NGramTokenizer createNGramTokenizer( @Override protected boolean isTokenChar(int c) { - if (Character.isWhitespace(c)) { - return false; - } - - return true; + return !Character.isWhitespace(c); } }; diff --git a/modules/apps/portal-search/portal-search-rest-impl/src/main/java/com/liferay/portal/search/rest/internal/resource/v1_0/SearchResultResourceImpl.java b/modules/apps/portal-search/portal-search-rest-impl/src/main/java/com/liferay/portal/search/rest/internal/resource/v1_0/SearchResultResourceImpl.java index 2c313d9c011d7a..7467693643986c 100644 --- a/modules/apps/portal-search/portal-search-rest-impl/src/main/java/com/liferay/portal/search/rest/internal/resource/v1_0/SearchResultResourceImpl.java +++ b/modules/apps/portal-search/portal-search-rest-impl/src/main/java/com/liferay/portal/search/rest/internal/resource/v1_0/SearchResultResourceImpl.java @@ -289,14 +289,9 @@ private boolean _isAllowedSearchContextAttribute(String key) { } private boolean _isEmbedded() { - if (StringUtil.contains( - ParamUtil.getString(contextHttpServletRequest, "nestedFields"), - "embedded")) { - - return true; - } - - return false; + return StringUtil.contains( + ParamUtil.getString(contextHttpServletRequest, "nestedFields"), + "embedded"); } private boolean _isEmptyOrContains(List list, String... strings) { diff --git a/modules/apps/portal-search/portal-search-test-util/src/main/java/com/liferay/portal/search/test/rule/logging/ExpectedLogMethodTestRule.java b/modules/apps/portal-search/portal-search-test-util/src/main/java/com/liferay/portal/search/test/rule/logging/ExpectedLogMethodTestRule.java index 375ea46c6de7a4..4078ac91e23fbe 100644 --- a/modules/apps/portal-search/portal-search-test-util/src/main/java/com/liferay/portal/search/test/rule/logging/ExpectedLogMethodTestRule.java +++ b/modules/apps/portal-search/portal-search-test-util/src/main/java/com/liferay/portal/search/test/rule/logging/ExpectedLogMethodTestRule.java @@ -145,11 +145,7 @@ protected void describeMismatchSafely( @Override protected boolean matchesSafely(T logEntries) { - if (matcher.matches(toString(logEntries))) { - return true; - } - - return false; + return matcher.matches(toString(logEntries)); } protected String toString(T logEntries) { @@ -185,11 +181,7 @@ protected void clear() { } protected boolean isAnythingExpected() { - if (matchers.isEmpty()) { - return false; - } - - return true; + return !matchers.isEmpty(); } protected final List> matchers = new ArrayList<>(); diff --git a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/configuration/admin/display/SearchWebConfigurationVisibilityController.java b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/configuration/admin/display/SearchWebConfigurationVisibilityController.java index 7d93ac92906860..ea4362e271ee4e 100644 --- a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/configuration/admin/display/SearchWebConfigurationVisibilityController.java +++ b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/configuration/admin/display/SearchWebConfigurationVisibilityController.java @@ -29,11 +29,7 @@ public String getKey() { public boolean isVisible( ExtendedObjectClassDefinition.Scope scope, Serializable scopePK) { - if (FeatureFlagManagerUtil.isEnabled("LPD-13778")) { - return true; - } - - return false; + return FeatureFlagManagerUtil.isEnabled("LPD-13778"); } } \ No newline at end of file diff --git a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/display/context/SearchDisplayContext.java b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/display/context/SearchDisplayContext.java index ba31fd77439f91..c36cb709459633 100644 --- a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/display/context/SearchDisplayContext.java +++ b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/display/context/SearchDisplayContext.java @@ -469,11 +469,7 @@ public boolean isSearchScopePreferenceEverythingAvailable() { Group group = themeDisplay.getScopeGroup(); - if (group.isStagingGroup()) { - return false; - } - - return true; + return !group.isStagingGroup(); } public boolean isSearchScopePreferenceLetTheUserChoose() { diff --git a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/document/DocumentFormPermissionCheckerImpl.java b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/document/DocumentFormPermissionCheckerImpl.java index 52d6e92dd64389..98d88302f15569 100644 --- a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/document/DocumentFormPermissionCheckerImpl.java +++ b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/document/DocumentFormPermissionCheckerImpl.java @@ -23,11 +23,7 @@ public boolean hasPermission() { PermissionChecker permissionChecker = _themeDisplay.getPermissionChecker(); - if (permissionChecker.isCompanyAdmin()) { - return true; - } - - return false; + return permissionChecker.isCompanyAdmin(); } private final ThemeDisplay _themeDisplay; diff --git a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/AssetCategoriesSearchFacetDisplayContextBuilder.java b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/AssetCategoriesSearchFacetDisplayContextBuilder.java index 5a5cc2dcdc402e..76bfab2ca53f6e 100644 --- a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/AssetCategoriesSearchFacetDisplayContextBuilder.java +++ b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/AssetCategoriesSearchFacetDisplayContextBuilder.java @@ -213,11 +213,7 @@ protected double getPopularity( } protected boolean isNothingSelected() { - if (_selectedCategoryIds.isEmpty()) { - return true; - } - - return false; + return _selectedCategoryIds.isEmpty(); } protected boolean isRenderNothing() { @@ -229,11 +225,7 @@ protected boolean isRenderNothing() { } protected boolean isSelected(long categoryId) { - if (_selectedCategoryIds.contains(categoryId)) { - return true; - } - - return false; + return _selectedCategoryIds.contains(categoryId); } private List _collectBuckets(Facet facet) { diff --git a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/AssetEntriesSearchFacetDisplayContextBuilder.java b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/AssetEntriesSearchFacetDisplayContextBuilder.java index 3e1c1a91c40c8d..38bf171f605897 100644 --- a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/AssetEntriesSearchFacetDisplayContextBuilder.java +++ b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/AssetEntriesSearchFacetDisplayContextBuilder.java @@ -115,11 +115,7 @@ public int getPopularity( } public boolean isNothingSelected() { - if (_parameterValues.isEmpty()) { - return true; - } - - return false; + return _parameterValues.isEmpty(); } public void setClassNames(String[] classNames) { diff --git a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/AssetTagsSearchFacetDisplayContextBuilder.java b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/AssetTagsSearchFacetDisplayContextBuilder.java index d64bad45cb0953..9a6b7dfd9b773b 100644 --- a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/AssetTagsSearchFacetDisplayContextBuilder.java +++ b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/AssetTagsSearchFacetDisplayContextBuilder.java @@ -211,11 +211,7 @@ protected List getTermCollectors() { } protected boolean isNothingSelected() { - if (_selectedTags.isEmpty()) { - return true; - } - - return false; + return _selectedTags.isEmpty(); } protected boolean isRenderNothing() { @@ -229,11 +225,7 @@ protected boolean isRenderNothing() { } protected boolean isSelected(String value) { - if (_selectedTags.contains(value)) { - return true; - } - - return false; + return _selectedTags.contains(value); } private List _buildBucketDisplayContexts() { diff --git a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/FolderSearchFacetDisplayContextBuilder.java b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/FolderSearchFacetDisplayContextBuilder.java index 9ca60da177e86f..ded0c564d553d0 100644 --- a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/FolderSearchFacetDisplayContextBuilder.java +++ b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/FolderSearchFacetDisplayContextBuilder.java @@ -169,11 +169,7 @@ protected List getTermCollectors() { } protected boolean isNothingSelected() { - if (_selectedFolderIds.isEmpty()) { - return true; - } - - return false; + return _selectedFolderIds.isEmpty(); } protected boolean isRenderNothing( @@ -190,11 +186,7 @@ protected boolean isRenderNothing( } protected boolean isSelected(long folderId) { - if (_selectedFolderIds.contains(folderId)) { - return true; - } - - return false; + return _selectedFolderIds.contains(folderId); } private BucketDisplayContext _buildBucketDisplayContext( diff --git a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/ScopeSearchFacetDisplayContextBuilder.java b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/ScopeSearchFacetDisplayContextBuilder.java index 2301f6aa12e8d6..2dbdd7fb3fe5e4 100644 --- a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/ScopeSearchFacetDisplayContextBuilder.java +++ b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/ScopeSearchFacetDisplayContextBuilder.java @@ -222,11 +222,7 @@ protected List getTermCollectors() { } protected boolean isNothingSelected() { - if (_selectedGroupIds.isEmpty()) { - return true; - } - - return false; + return _selectedGroupIds.isEmpty(); } protected boolean isRenderNothing() { @@ -240,19 +236,11 @@ protected boolean isRenderNothing() { List termCollectors = getTermCollectors(); - if (!termCollectors.isEmpty()) { - return false; - } - - return true; + return termCollectors.isEmpty(); } protected boolean isSelected(Long groupId) { - if (_selectedGroupIds.contains(groupId)) { - return true; - } - - return false; + return _selectedGroupIds.contains(groupId); } private List _buildBucketDisplayContexts( diff --git a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/UserSearchFacetDisplayContextBuilder.java b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/UserSearchFacetDisplayContextBuilder.java index e3b1a377591af1..dff79dcff10ff0 100644 --- a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/UserSearchFacetDisplayContextBuilder.java +++ b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/facet/display/context/builder/UserSearchFacetDisplayContextBuilder.java @@ -191,19 +191,11 @@ protected List getTermCollectors() { } protected boolean isNothingSelected() { - if (_paramValues.isEmpty()) { - return true; - } - - return false; + return _paramValues.isEmpty(); } protected boolean isSelected(String value) { - if (_paramValues.contains(value)) { - return true; - } - - return false; + return _paramValues.contains(value); } private List _buildBucketDisplayContexts( diff --git a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/layout/portlet/SearchPortletManager.java b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/layout/portlet/SearchPortletManager.java index 58ab3e651ccee3..3a0777e67a27e1 100644 --- a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/layout/portlet/SearchPortletManager.java +++ b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/layout/portlet/SearchPortletManager.java @@ -28,11 +28,7 @@ public boolean isDeprecated() { @Override public boolean isVisible(Layout layout) { - if (FeatureFlagManagerUtil.isEnabled("LPD-13778")) { - return true; - } - - return false; + return FeatureFlagManagerUtil.isEnabled("LPD-13778"); } } \ No newline at end of file diff --git a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/search/bar/portlet/helper/SearchBarPrecedenceHelper.java b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/search/bar/portlet/helper/SearchBarPrecedenceHelper.java index 5e39d93896328f..354c34b9b57094 100644 --- a/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/search/bar/portlet/helper/SearchBarPrecedenceHelper.java +++ b/modules/apps/portal-search/portal-search-web/src/main/java/com/liferay/portal/search/web/internal/search/bar/portlet/helper/SearchBarPrecedenceHelper.java @@ -105,14 +105,9 @@ public boolean isSearchBarInBodyWithHeaderSearchBarAlreadyPresent( SearchBarPortletPreferences searchBarPortletPreferences2 = _getSearchBarPortletPreferences(portletId, themeDisplay); - if (!Objects.equals( - searchBarPortletPreferences1.getFederatedSearchKey(), - searchBarPortletPreferences2.getFederatedSearchKey())) { - - return false; - } - - return true; + return Objects.equals( + searchBarPortletPreferences1.getFederatedSearchKey(), + searchBarPortletPreferences2.getFederatedSearchKey()); } private List _getPortlets(ThemeDisplay themeDisplay) { @@ -156,11 +151,7 @@ private boolean _isHeaderSearchBar(Portlet portlet) { } private boolean _isSamePortlet(Portlet portlet, String portletId) { - if (Objects.equals(portlet.getPortletId(), portletId)) { - return true; - } - - return false; + return Objects.equals(portlet.getPortletId(), portletId); } @Reference diff --git a/modules/apps/portal-search/portal-search/src/main/java/com/liferay/portal/search/internal/capabilities/SearchCapabilitiesImpl.java b/modules/apps/portal-search/portal-search/src/main/java/com/liferay/portal/search/internal/capabilities/SearchCapabilitiesImpl.java index 983e07921b6c9f..aa3a3a74d81062 100644 --- a/modules/apps/portal-search/portal-search/src/main/java/com/liferay/portal/search/internal/capabilities/SearchCapabilitiesImpl.java +++ b/modules/apps/portal-search/portal-search/src/main/java/com/liferay/portal/search/internal/capabilities/SearchCapabilitiesImpl.java @@ -21,75 +21,42 @@ public class SearchCapabilitiesImpl implements SearchCapabilities { @Override public boolean isAnalyticsSupported() { - if (_isSearchEngineSolr()) { - return false; - } - - return true; + return !_isSearchEngineSolr(); } @Override public boolean isCommerceSupported() { - if (_isSearchEngineSolr()) { - return false; - } - - return true; + return !_isSearchEngineSolr(); } @Override public boolean isConcurrentModeSupported() { - if (_isSearchEngineSolr()) { - return false; - } - - return true; + return !_isSearchEngineSolr(); } @Override public boolean isResultRankingsSupported() { - if (_isSearchEngineSolr()) { - return false; - } - - return true; + return !_isSearchEngineSolr(); } @Override public boolean isSearchExperiencesSupported() { - if (_isSearchEngineSolr()) { - return false; - } - - return true; + return !_isSearchEngineSolr(); } @Override public boolean isSynonymsSupported() { - if (_isSearchEngineSolr()) { - return false; - } - - return true; + return !_isSearchEngineSolr(); } @Override public boolean isWorkflowMetricsSupported() { - if (_isSearchEngineSolr()) { - return false; - } - - return true; + return !_isSearchEngineSolr(); } private boolean _isSearchEngineSolr() { - if (Objects.equals( - _searchEngineInformation.getVendorString(), "Solr")) { - - return true; - } - - return false; + return Objects.equals( + _searchEngineInformation.getVendorString(), "Solr"); } @Reference diff --git a/modules/apps/portal-search/portal-search/src/main/java/com/liferay/portal/search/internal/facet/FacetBucketUtil.java b/modules/apps/portal-search/portal-search/src/main/java/com/liferay/portal/search/internal/facet/FacetBucketUtil.java index d01b2d774fdbae..4ec54b4f1bdd73 100644 --- a/modules/apps/portal-search/portal-search/src/main/java/com/liferay/portal/search/internal/facet/FacetBucketUtil.java +++ b/modules/apps/portal-search/portal-search/src/main/java/com/liferay/portal/search/internal/facet/FacetBucketUtil.java @@ -33,11 +33,7 @@ public static boolean isFieldInBucket( return _isRangeValueInBucket(field, term); } - if (ArrayUtil.contains(field.getValues(), term, false)) { - return true; - } - - return false; + return ArrayUtil.contains(field.getValues(), term, false); } private static boolean _containsFieldNameFieldValue( diff --git a/modules/apps/portal-search/portal-search/src/main/java/com/liferay/portal/search/internal/filter/range/RangeTermQueryValueParser.java b/modules/apps/portal-search/portal-search/src/main/java/com/liferay/portal/search/internal/filter/range/RangeTermQueryValueParser.java index cc4de8b8ec77fa..1147910d5279ea 100644 --- a/modules/apps/portal-search/portal-search/src/main/java/com/liferay/portal/search/internal/filter/range/RangeTermQueryValueParser.java +++ b/modules/apps/portal-search/portal-search/src/main/java/com/liferay/portal/search/internal/filter/range/RangeTermQueryValueParser.java @@ -36,21 +36,13 @@ public RangeTermQueryValue parse(String value) { protected boolean isIncludesLower(Matcher matcher) { String lowerBracket = matcher.group("lowerBracket"); - if (lowerBracket.equals(StringPool.OPEN_BRACKET)) { - return true; - } - - return false; + return lowerBracket.equals(StringPool.OPEN_BRACKET); } protected boolean isIncludesUpper(Matcher matcher) { String upperBracket = matcher.group("upperBracket"); - if (upperBracket.equals(StringPool.CLOSE_BRACKET)) { - return true; - } - - return false; + return upperBracket.equals(StringPool.CLOSE_BRACKET); } private static final Pattern _pattern = Pattern.compile( diff --git a/modules/apps/portal-security-audit/portal-security-audit-router/src/main/java/com/liferay/portal/security/audit/router/internal/DefaultAuditRouter.java b/modules/apps/portal-security-audit/portal-security-audit-router/src/main/java/com/liferay/portal/security/audit/router/internal/DefaultAuditRouter.java index 1ebc3b65f55ffa..ba713406016d99 100644 --- a/modules/apps/portal-security-audit/portal-security-audit-router/src/main/java/com/liferay/portal/security/audit/router/internal/DefaultAuditRouter.java +++ b/modules/apps/portal-security-audit/portal-security-audit-router/src/main/java/com/liferay/portal/security/audit/router/internal/DefaultAuditRouter.java @@ -44,11 +44,7 @@ public class DefaultAuditRouter implements AuditRouter { public boolean isDeployed() { Set keys = _serviceTrackerMap.keySet(); - if (keys.isEmpty()) { - return false; - } - - return true; + return !keys.isEmpty(); } @Override diff --git a/modules/apps/portal-security/portal-security-ldap-impl/src/main/java/com/liferay/portal/security/ldap/internal/configuration/LDAPServerConfigurationProviderImpl.java b/modules/apps/portal-security/portal-security-ldap-impl/src/main/java/com/liferay/portal/security/ldap/internal/configuration/LDAPServerConfigurationProviderImpl.java index 4877c4a5424f9e..77fe4a03de9be6 100644 --- a/modules/apps/portal-security/portal-security-ldap-impl/src/main/java/com/liferay/portal/security/ldap/internal/configuration/LDAPServerConfigurationProviderImpl.java +++ b/modules/apps/portal-security/portal-security-ldap-impl/src/main/java/com/liferay/portal/security/ldap/internal/configuration/LDAPServerConfigurationProviderImpl.java @@ -432,14 +432,9 @@ private boolean _isCustomMappingModified( Dictionary oldProperties = configuration.getProperties(); - if (Arrays.equals( - GetterUtil.getStringValues(oldProperties.get(key)), - GetterUtil.getStringValues(properties.get(key)))) { - - return false; - } - - return true; + return !Arrays.equals( + GetterUtil.getStringValues(oldProperties.get(key)), + GetterUtil.getStringValues(properties.get(key))); } private static final Log _log = LogFactoryUtil.getLog( diff --git a/modules/apps/portal-security/portal-security-script-management-web/src/main/java/com/liferay/portal/security/script/management/web/internal/configuration/admin/display/ScriptManagementConfigurationScreen.java b/modules/apps/portal-security/portal-security-script-management-web/src/main/java/com/liferay/portal/security/script/management/web/internal/configuration/admin/display/ScriptManagementConfigurationScreen.java index 65c045a29c66f1..038dae00448f4d 100644 --- a/modules/apps/portal-security/portal-security-script-management-web/src/main/java/com/liferay/portal/security/script/management/web/internal/configuration/admin/display/ScriptManagementConfigurationScreen.java +++ b/modules/apps/portal-security/portal-security-script-management-web/src/main/java/com/liferay/portal/security/script/management/web/internal/configuration/admin/display/ScriptManagementConfigurationScreen.java @@ -53,11 +53,7 @@ public String getScope() { @Override public boolean isVisible() { - if (PropsValues.SCRIPT_MANAGEMENT_CONFIGURATION_ENABLED) { - return true; - } - - return false; + return PropsValues.SCRIPT_MANAGEMENT_CONFIGURATION_ENABLED; } @Override diff --git a/modules/apps/portal-settings/portal-settings-authentication-opensso-web/src/main/java/com/liferay/portal/settings/authentication/opensso/web/internal/configuration/admin/display/OpenSSOPortalSettingsConfigurationScreenWrapper.java b/modules/apps/portal-settings/portal-settings-authentication-opensso-web/src/main/java/com/liferay/portal/settings/authentication/opensso/web/internal/configuration/admin/display/OpenSSOPortalSettingsConfigurationScreenWrapper.java index 44aa226924ad1c..e81079cc5636d4 100644 --- a/modules/apps/portal-settings/portal-settings-authentication-opensso-web/src/main/java/com/liferay/portal/settings/authentication/opensso/web/internal/configuration/admin/display/OpenSSOPortalSettingsConfigurationScreenWrapper.java +++ b/modules/apps/portal-settings/portal-settings-authentication-opensso-web/src/main/java/com/liferay/portal/settings/authentication/opensso/web/internal/configuration/admin/display/OpenSSOPortalSettingsConfigurationScreenWrapper.java @@ -110,11 +110,7 @@ public boolean isDeprecated() { @Override public boolean isVisible() { - if (FeatureFlagManagerUtil.isEnabled("LPD-36719")) { - return true; - } - - return false; + return FeatureFlagManagerUtil.isEnabled("LPD-36719"); } } diff --git a/modules/apps/portal-settings/portal-settings-web/src/main/java/com/liferay/portal/settings/web/internal/configuration/admin/display/RatingsEditCompanyPortalSettingsConfigurationScreenWrapper.java b/modules/apps/portal-settings/portal-settings-web/src/main/java/com/liferay/portal/settings/web/internal/configuration/admin/display/RatingsEditCompanyPortalSettingsConfigurationScreenWrapper.java index 8ecf574027fc9c..ef3878696e6a66 100644 --- a/modules/apps/portal-settings/portal-settings-web/src/main/java/com/liferay/portal/settings/web/internal/configuration/admin/display/RatingsEditCompanyPortalSettingsConfigurationScreenWrapper.java +++ b/modules/apps/portal-settings/portal-settings-web/src/main/java/com/liferay/portal/settings/web/internal/configuration/admin/display/RatingsEditCompanyPortalSettingsConfigurationScreenWrapper.java @@ -82,11 +82,7 @@ public boolean isVisible() { PortletRatingsDefinitionUtil. getPortletRatingsDefinitionValuesMap(); - if (portletRatingsDefinitionValuesMap.isEmpty()) { - return false; - } - - return true; + return !portletRatingsDefinitionValuesMap.isEmpty(); } } diff --git a/modules/apps/portal-store/portal-store-azure/src/main/java/com/liferay/portal/store/azure/AzureStore.java b/modules/apps/portal-store/portal-store-azure/src/main/java/com/liferay/portal/store/azure/AzureStore.java index ea1104f99c20fd..78e1d24f1230c0 100644 --- a/modules/apps/portal-store/portal-store-azure/src/main/java/com/liferay/portal/store/azure/AzureStore.java +++ b/modules/apps/portal-store/portal-store-azure/src/main/java/com/liferay/portal/store/azure/AzureStore.java @@ -272,11 +272,7 @@ public boolean hasFile( String[] versions = getFileVersions( companyId, repositoryId, fileName); - if (ArrayUtil.isNotEmpty(versions)) { - return true; - } - - return false; + return ArrayUtil.isNotEmpty(versions); } BlobClient blobClient = _blobContainerClient.getBlobClient( diff --git a/modules/apps/portal-vulcan/portal-vulcan-impl/src/main/java/com/liferay/portal/vulcan/internal/graphql/servlet/GraphQLServletExtender.java b/modules/apps/portal-vulcan/portal-vulcan-impl/src/main/java/com/liferay/portal/vulcan/internal/graphql/servlet/GraphQLServletExtender.java index 19a34e70241686..acdcbb8a8a557b 100644 --- a/modules/apps/portal-vulcan/portal-vulcan-impl/src/main/java/com/liferay/portal/vulcan/internal/graphql/servlet/GraphQLServletExtender.java +++ b/modules/apps/portal-vulcan/portal-vulcan-impl/src/main/java/com/liferay/portal/vulcan/internal/graphql/servlet/GraphQLServletExtender.java @@ -2519,16 +2519,10 @@ private boolean _isStatusException(GraphQLError graphQLError) { return false; } - if (StringUtil.endsWith( - ClassUtil.getClassName( - _getThrowable( - (ExceptionWhileDataFetching)graphQLError)), - "StatusException")) { - - return true; - } - - return false; + return StringUtil.endsWith( + ClassUtil.getClassName( + _getThrowable((ExceptionWhileDataFetching)graphQLError)), + "StatusException"); } private final Set _graphQLNamespaces; diff --git a/modules/apps/portal-vulcan/portal-vulcan-test/src/testIntegration/java/com/liferay/portal/vulcan/internal/extension/test/EntityExtensionTest.java b/modules/apps/portal-vulcan/portal-vulcan-test/src/testIntegration/java/com/liferay/portal/vulcan/internal/extension/test/EntityExtensionTest.java index cedee53321703f..f93cd4da7ba24a 100644 --- a/modules/apps/portal-vulcan/portal-vulcan-test/src/testIntegration/java/com/liferay/portal/vulcan/internal/extension/test/EntityExtensionTest.java +++ b/modules/apps/portal-vulcan/portal-vulcan-test/src/testIntegration/java/com/liferay/portal/vulcan/internal/extension/test/EntityExtensionTest.java @@ -251,11 +251,7 @@ public Collection getFilteredPropertyNames( @Override public boolean isApplicableExtension(long companyId, String className) { - if (className.equals(TestClass.class.getName())) { - return true; - } - - return false; + return className.equals(TestClass.class.getName()); } @Override diff --git a/modules/apps/portal-workflow/portal-workflow-kaleo-definition-api/src/main/java/com/liferay/portal/workflow/kaleo/definition/Node.java b/modules/apps/portal-workflow/portal-workflow-kaleo-definition-api/src/main/java/com/liferay/portal/workflow/kaleo/definition/Node.java index d1c3b512c503ce..7052cace50fcd6 100644 --- a/modules/apps/portal-workflow/portal-workflow-kaleo-definition-api/src/main/java/com/liferay/portal/workflow/kaleo/definition/Node.java +++ b/modules/apps/portal-workflow/portal-workflow-kaleo-definition-api/src/main/java/com/liferay/portal/workflow/kaleo/definition/Node.java @@ -52,11 +52,7 @@ public boolean equals(Object object) { Node node = (Node)object; - if (!Objects.equals(_name, node._name)) { - return false; - } - - return true; + return Objects.equals(_name, node._name); } @Override diff --git a/modules/apps/portal-workflow/portal-workflow-kaleo-runtime-impl/src/main/java/com/liferay/portal/workflow/kaleo/runtime/internal/node/JoinXorNodeExecutor.java b/modules/apps/portal-workflow/portal-workflow-kaleo-runtime-impl/src/main/java/com/liferay/portal/workflow/kaleo/runtime/internal/node/JoinXorNodeExecutor.java index 02e810c16756b7..55d0e7e2c71b65 100644 --- a/modules/apps/portal-workflow/portal-workflow-kaleo-runtime-impl/src/main/java/com/liferay/portal/workflow/kaleo/runtime/internal/node/JoinXorNodeExecutor.java +++ b/modules/apps/portal-workflow/portal-workflow-kaleo-runtime-impl/src/main/java/com/liferay/portal/workflow/kaleo/runtime/internal/node/JoinXorNodeExecutor.java @@ -229,11 +229,7 @@ private boolean _isFinalKaleoInstanceToken( KaleoNode kaleoNode = kaleoInstanceToken.getCurrentKaleoNode(); - if (kaleoNode.isTerminal()) { - return true; - } - - return false; + return kaleoNode.isTerminal(); } @Reference diff --git a/modules/apps/portal-workflow/portal-workflow-kaleo-runtime-integration-impl/src/main/java/com/liferay/portal/workflow/kaleo/runtime/integration/internal/security/permission/WorkflowTaskPermissionImpl.java b/modules/apps/portal-workflow/portal-workflow-kaleo-runtime-integration-impl/src/main/java/com/liferay/portal/workflow/kaleo/runtime/integration/internal/security/permission/WorkflowTaskPermissionImpl.java index 4d2c22e1e6dfa3..ba13faf3b5e50d 100644 --- a/modules/apps/portal-workflow/portal-workflow-kaleo-runtime-integration-impl/src/main/java/com/liferay/portal/workflow/kaleo/runtime/integration/internal/security/permission/WorkflowTaskPermissionImpl.java +++ b/modules/apps/portal-workflow/portal-workflow-kaleo-runtime-integration-impl/src/main/java/com/liferay/portal/workflow/kaleo/runtime/integration/internal/security/permission/WorkflowTaskPermissionImpl.java @@ -216,13 +216,8 @@ private boolean _isWorkflowTaskAssignableToRoles( return false; } - if (ArrayUtil.contains( - roleIds, workflowTaskAssignee.getAssigneeClassPK())) { - - return true; - } - - return false; + return ArrayUtil.contains( + roleIds, workflowTaskAssignee.getAssigneeClassPK()); } private boolean _isWorkflowTaskAssignableToUser( diff --git a/modules/apps/portal-workflow/portal-workflow-kaleo-service/src/main/java/com/liferay/portal/workflow/kaleo/model/impl/KaleoTimerImpl.java b/modules/apps/portal-workflow/portal-workflow-kaleo-service/src/main/java/com/liferay/portal/workflow/kaleo/model/impl/KaleoTimerImpl.java index be056b162bb8a9..89183bcb888cdb 100644 --- a/modules/apps/portal-workflow/portal-workflow-kaleo-service/src/main/java/com/liferay/portal/workflow/kaleo/model/impl/KaleoTimerImpl.java +++ b/modules/apps/portal-workflow/portal-workflow-kaleo-service/src/main/java/com/liferay/portal/workflow/kaleo/model/impl/KaleoTimerImpl.java @@ -25,11 +25,7 @@ public List getKaleoTaskReassignments() { @Override public boolean isRecurring() { - if (Validator.isNotNull(getRecurrenceScale())) { - return true; - } - - return false; + return Validator.isNotNull(getRecurrenceScale()); } } \ No newline at end of file diff --git a/modules/apps/portal-workflow/portal-workflow-task-web/src/main/java/com/liferay/portal/workflow/task/web/internal/display/context/WorkflowTaskDisplayContext.java b/modules/apps/portal-workflow/portal-workflow-task-web/src/main/java/com/liferay/portal/workflow/task/web/internal/display/context/WorkflowTaskDisplayContext.java index 3ba19c0f1bc009..188be07b8faf09 100644 --- a/modules/apps/portal-workflow/portal-workflow-task-web/src/main/java/com/liferay/portal/workflow/task/web/internal/display/context/WorkflowTaskDisplayContext.java +++ b/modules/apps/portal-workflow/portal-workflow-task-web/src/main/java/com/liferay/portal/workflow/task/web/internal/display/context/WorkflowTaskDisplayContext.java @@ -1180,27 +1180,15 @@ null, null, _getCompleted(), true, searchByUserRoles, null, } private boolean _isAssignedToMyRolesTabSelected() { - if (Objects.equals(_getTabs1(), "assigned-to-my-roles")) { - return true; - } - - return false; + return Objects.equals(_getTabs1(), "assigned-to-my-roles"); } private boolean _isNavigationAll() { - if (Objects.equals(_getNavigation(), "all")) { - return true; - } - - return false; + return Objects.equals(_getNavigation(), "all"); } private boolean _isNavigationCompleted() { - if (Objects.equals(_getNavigation(), "completed")) { - return true; - } - - return false; + return Objects.equals(_getNavigation(), "completed"); } private void _setWorkflowTaskSearchEmptyResultsMessage( diff --git a/modules/apps/portal-workflow/portal-workflow-web/src/main/java/com/liferay/portal/workflow/web/internal/display/context/WorkflowDefinitionLinkDisplayContext.java b/modules/apps/portal-workflow/portal-workflow-web/src/main/java/com/liferay/portal/workflow/web/internal/display/context/WorkflowDefinitionLinkDisplayContext.java index 99fd4268e4eae8..c3638849d043e5 100644 --- a/modules/apps/portal-workflow/portal-workflow-web/src/main/java/com/liferay/portal/workflow/web/internal/display/context/WorkflowDefinitionLinkDisplayContext.java +++ b/modules/apps/portal-workflow/portal-workflow-web/src/main/java/com/liferay/portal/workflow/web/internal/display/context/WorkflowDefinitionLinkDisplayContext.java @@ -333,14 +333,8 @@ public String getWorkflowDefinitionValue( } public boolean isControlPanelPortlet() { - if (Objects.equals( - _getPortletName(), - WorkflowPortletKeys.CONTROL_PANEL_WORKFLOW)) { - - return true; - } - - return false; + return Objects.equals( + _getPortletName(), WorkflowPortletKeys.CONTROL_PANEL_WORKFLOW); } public boolean isWorkflowDefinitionEquals( diff --git a/modules/apps/portal-workflow/portal-workflow-web/src/main/java/com/liferay/portal/workflow/web/internal/display/context/WorkflowInstanceViewDisplayContext.java b/modules/apps/portal-workflow/portal-workflow-web/src/main/java/com/liferay/portal/workflow/web/internal/display/context/WorkflowInstanceViewDisplayContext.java index 531aaadb5a502a..0fc5ce34efbb92 100644 --- a/modules/apps/portal-workflow/portal-workflow-web/src/main/java/com/liferay/portal/workflow/web/internal/display/context/WorkflowInstanceViewDisplayContext.java +++ b/modules/apps/portal-workflow/portal-workflow-web/src/main/java/com/liferay/portal/workflow/web/internal/display/context/WorkflowInstanceViewDisplayContext.java @@ -240,35 +240,19 @@ public long getWorkflowContextEntryClassPK( } public boolean isNavigationAll() { - if (Objects.equals(getNavigation(), "all")) { - return true; - } - - return false; + return Objects.equals(getNavigation(), "all"); } public boolean isNavigationCompleted() { - if (Objects.equals(getNavigation(), "completed")) { - return true; - } - - return false; + return Objects.equals(getNavigation(), "completed"); } public boolean isNavigationPending() { - if (Objects.equals(getNavigation(), "pending")) { - return true; - } - - return false; + return Objects.equals(getNavigation(), "pending"); } public boolean isSearch() { - if (Validator.isNotNull(getKeywords())) { - return true; - } - - return false; + return Validator.isNotNull(getKeywords()); } public boolean isShowExtraInfo() { diff --git a/modules/apps/portal/portal-cluster-multiple/src/main/java/com/liferay/portal/cluster/multiple/internal/jgroups/AddressImpl.java b/modules/apps/portal/portal-cluster-multiple/src/main/java/com/liferay/portal/cluster/multiple/internal/jgroups/AddressImpl.java index b0bc6bfef5e58e..3d067380f2b077 100644 --- a/modules/apps/portal/portal-cluster-multiple/src/main/java/com/liferay/portal/cluster/multiple/internal/jgroups/AddressImpl.java +++ b/modules/apps/portal/portal-cluster-multiple/src/main/java/com/liferay/portal/cluster/multiple/internal/jgroups/AddressImpl.java @@ -38,11 +38,7 @@ public boolean equals(Object object) { AddressImpl addressImpl = (AddressImpl)object; - if (_address.equals(addressImpl._address)) { - return true; - } - - return false; + return _address.equals(addressImpl._address); } @Override diff --git a/modules/apps/portal/portal-http-impl/src/main/java/com/liferay/portal/http/internal/HttpImpl.java b/modules/apps/portal/portal-http-impl/src/main/java/com/liferay/portal/http/internal/HttpImpl.java index 77a6a029f26856..7daacd3e091244 100644 --- a/modules/apps/portal/portal-http-impl/src/main/java/com/liferay/portal/http/internal/HttpImpl.java +++ b/modules/apps/portal/portal-http-impl/src/main/java/com/liferay/portal/http/internal/HttpImpl.java @@ -370,11 +370,7 @@ protected void deactivate() { protected boolean hasRequestHeader( RequestBuilder requestBuilder, String name) { - if (ArrayUtil.isEmpty(requestBuilder.getHeaders(name))) { - return false; - } - - return true; + return !ArrayUtil.isEmpty(requestBuilder.getHeaders(name)); } @Modified diff --git a/modules/apps/portal/portal-i18n-filter/src/main/java/com/liferay/portal/i18n/filter/internal/I18nFilter.java b/modules/apps/portal/portal-i18n-filter/src/main/java/com/liferay/portal/i18n/filter/internal/I18nFilter.java index 6d349220cd8f26..4d724202bb8ba7 100644 --- a/modules/apps/portal/portal-i18n-filter/src/main/java/com/liferay/portal/i18n/filter/internal/I18nFilter.java +++ b/modules/apps/portal/portal-i18n-filter/src/main/java/com/liferay/portal/i18n/filter/internal/I18nFilter.java @@ -423,13 +423,8 @@ private String _getFriendlyURLRedirectionType(long companyId) { } private boolean _isPermanentRedirect(long companyId) { - if (Objects.equals( - _getFriendlyURLRedirectionType(companyId), "permanent")) { - - return true; - } - - return false; + return Objects.equals( + _getFriendlyURLRedirectionType(companyId), "permanent"); } private static final Log _log = LogFactoryUtil.getLog(I18nFilter.class); diff --git a/modules/apps/portal/portal-json-web-service-client/src/main/java/com/liferay/portal/json/web/service/client/BaseJSONWebServiceClientImpl.java b/modules/apps/portal/portal-json-web-service-client/src/main/java/com/liferay/portal/json/web/service/client/BaseJSONWebServiceClientImpl.java index d11aacf7cb9e97..760097cc769503 100644 --- a/modules/apps/portal/portal-json-web-service-client/src/main/java/com/liferay/portal/json/web/service/client/BaseJSONWebServiceClientImpl.java +++ b/modules/apps/portal/portal-json-web-service-client/src/main/java/com/liferay/portal/json/web/service/client/BaseJSONWebServiceClientImpl.java @@ -1126,11 +1126,7 @@ private boolean _isApplicationJSONContentType(HttpEntity httpEntity) { String contentTypeHeaderValue = contentTypeHeader.getValue(); - if (contentTypeHeaderValue.contains("application/json")) { - return true; - } - - return false; + return contentTypeHeaderValue.contains("application/json"); } private boolean _isBlank(String s) { diff --git a/modules/apps/portal/portal-spring-extender-impl/src/main/java/com/liferay/portal/spring/extender/internal/loader/ModuleAggregareClassLoader.java b/modules/apps/portal/portal-spring-extender-impl/src/main/java/com/liferay/portal/spring/extender/internal/loader/ModuleAggregareClassLoader.java index df7e94eedf14a5..5f1750aa74e5d2 100644 --- a/modules/apps/portal/portal-spring-extender-impl/src/main/java/com/liferay/portal/spring/extender/internal/loader/ModuleAggregareClassLoader.java +++ b/modules/apps/portal/portal-spring-extender-impl/src/main/java/com/liferay/portal/spring/extender/internal/loader/ModuleAggregareClassLoader.java @@ -57,14 +57,8 @@ public boolean equals(Object object) { ModuleAggregareClassLoader moduleAggregareClassLoader = (ModuleAggregareClassLoader)object; - if (Objects.equals( - _moduleClassLoader, - moduleAggregareClassLoader._moduleClassLoader)) { - - return true; - } - - return false; + return Objects.equals( + _moduleClassLoader, moduleAggregareClassLoader._moduleClassLoader); } @Override diff --git a/modules/apps/portal/portal-upgrade-impl/src/main/java/com/liferay/portal/upgrade/internal/executor/UpgradeExecutor.java b/modules/apps/portal/portal-upgrade-impl/src/main/java/com/liferay/portal/upgrade/internal/executor/UpgradeExecutor.java index 0ff4eedcbf4bcc..0ad6290e7e37db 100644 --- a/modules/apps/portal/portal-upgrade-impl/src/main/java/com/liferay/portal/upgrade/internal/executor/UpgradeExecutor.java +++ b/modules/apps/portal/portal-upgrade-impl/src/main/java/com/liferay/portal/upgrade/internal/executor/UpgradeExecutor.java @@ -240,11 +240,7 @@ private boolean _isInitialRelease(List upgradeInfos) { String fromSchemaVersion = upgradeInfo.getFromSchemaVersionString(); - if (fromSchemaVersion.equals("0.0.0")) { - return true; - } - - return false; + return fromSchemaVersion.equals("0.0.0"); } private boolean _requiresUpdateIndexes( diff --git a/modules/apps/portal/portal-upgrade-impl/src/test/java/com/liferay/portal/upgrade/internal/graph/ReleaseGraphManagerTest.java b/modules/apps/portal/portal-upgrade-impl/src/test/java/com/liferay/portal/upgrade/internal/graph/ReleaseGraphManagerTest.java index 92bd872695adf8..68035475320e0a 100644 --- a/modules/apps/portal/portal-upgrade-impl/src/test/java/com/liferay/portal/upgrade/internal/graph/ReleaseGraphManagerTest.java +++ b/modules/apps/portal/portal-upgrade-impl/src/test/java/com/liferay/portal/upgrade/internal/graph/ReleaseGraphManagerTest.java @@ -270,11 +270,7 @@ public boolean equals(Object object) { TestUpgradeStep testUpgradeStep = (TestUpgradeStep)object; - if (!_name.equals(testUpgradeStep._name)) { - return false; - } - - return true; + return _name.equals(testUpgradeStep._name); } @Override diff --git a/modules/apps/portlet-configuration/portlet-configuration-css-web/src/main/java/com/liferay/portlet/configuration/css/web/internal/display/context/PortletConfigurationCSSPortletDisplayContext.java b/modules/apps/portlet-configuration/portlet-configuration-css-web/src/main/java/com/liferay/portlet/configuration/css/web/internal/display/context/PortletConfigurationCSSPortletDisplayContext.java index d19086e56e995e..1fa6cf272696ba 100644 --- a/modules/apps/portlet-configuration/portlet-configuration-css-web/src/main/java/com/liferay/portlet/configuration/css/web/internal/display/context/PortletConfigurationCSSPortletDisplayContext.java +++ b/modules/apps/portlet-configuration/portlet-configuration-css-web/src/main/java/com/liferay/portlet/configuration/css/web/internal/display/context/PortletConfigurationCSSPortletDisplayContext.java @@ -250,14 +250,9 @@ public boolean hasAccess() throws PortalException { ThemeDisplay themeDisplay = (ThemeDisplay)_renderRequest.getAttribute( WebKeys.THEME_DISPLAY); - if (!PortletPermissionUtil.contains( - themeDisplay.getPermissionChecker(), themeDisplay.getLayout(), - getPortletResource(), ActionKeys.CONFIGURATION)) { - - return false; - } - - return true; + return PortletPermissionUtil.contains( + themeDisplay.getPermissionChecker(), themeDisplay.getLayout(), + getPortletResource(), ActionKeys.CONFIGURATION); } public boolean isBorderSameForAll(String property) { diff --git a/modules/apps/portlet-configuration/portlet-configuration-sharing-web/src/main/java/com/liferay/portlet/configuration/sharing/web/internal/portlet/configuration/icon/FacebookPortletConfigurationIcon.java b/modules/apps/portlet-configuration/portlet-configuration-sharing-web/src/main/java/com/liferay/portlet/configuration/sharing/web/internal/portlet/configuration/icon/FacebookPortletConfigurationIcon.java index b3ea29a0afe901..8d762f10620dd0 100644 --- a/modules/apps/portlet-configuration/portlet-configuration-sharing-web/src/main/java/com/liferay/portlet/configuration/sharing/web/internal/portlet/configuration/icon/FacebookPortletConfigurationIcon.java +++ b/modules/apps/portlet-configuration/portlet-configuration-sharing-web/src/main/java/com/liferay/portlet/configuration/sharing/web/internal/portlet/configuration/icon/FacebookPortletConfigurationIcon.java @@ -82,11 +82,7 @@ public boolean isShow(PortletRequest portletRequest) { facebookShowAddAppLink = false; } - if (facebookShowAddAppLink) { - return true; - } - - return false; + return facebookShowAddAppLink; } @Reference diff --git a/modules/apps/portlet-configuration/portlet-configuration-sharing-web/src/main/java/com/liferay/portlet/configuration/sharing/web/internal/portlet/configuration/icon/IGooglePortletConfigurationIcon.java b/modules/apps/portlet-configuration/portlet-configuration-sharing-web/src/main/java/com/liferay/portlet/configuration/sharing/web/internal/portlet/configuration/icon/IGooglePortletConfigurationIcon.java index cdabfbff8df6b3..ff6f1fc297226d 100644 --- a/modules/apps/portlet-configuration/portlet-configuration-sharing-web/src/main/java/com/liferay/portlet/configuration/sharing/web/internal/portlet/configuration/icon/IGooglePortletConfigurationIcon.java +++ b/modules/apps/portlet-configuration/portlet-configuration-sharing-web/src/main/java/com/liferay/portlet/configuration/sharing/web/internal/portlet/configuration/icon/IGooglePortletConfigurationIcon.java @@ -91,11 +91,7 @@ public boolean isShow(PortletRequest portletRequest) { portletPreferences.getValue( "lfrIgoogleShowAddAppLink", StringPool.BLANK)); - if (lfrIgoogleShowAddAppLink) { - return true; - } - - return false; + return lfrIgoogleShowAddAppLink; } @Override diff --git a/modules/apps/portlet-configuration/portlet-configuration-sharing-web/src/main/java/com/liferay/portlet/configuration/sharing/web/internal/portlet/configuration/icon/NetvibesPortletConfigurationIcon.java b/modules/apps/portlet-configuration/portlet-configuration-sharing-web/src/main/java/com/liferay/portlet/configuration/sharing/web/internal/portlet/configuration/icon/NetvibesPortletConfigurationIcon.java index e1c3650b7c60d6..6d8d7b763e5f2d 100644 --- a/modules/apps/portlet-configuration/portlet-configuration-sharing-web/src/main/java/com/liferay/portlet/configuration/sharing/web/internal/portlet/configuration/icon/NetvibesPortletConfigurationIcon.java +++ b/modules/apps/portlet-configuration/portlet-configuration-sharing-web/src/main/java/com/liferay/portlet/configuration/sharing/web/internal/portlet/configuration/icon/NetvibesPortletConfigurationIcon.java @@ -85,11 +85,7 @@ public boolean isShow(PortletRequest portletRequest) { portletPreferences.getValue( "lfrNetvibesShowAddAppLink", StringPool.BLANK)); - if (lfrNetvibesShowAddAppLink) { - return true; - } - - return false; + return lfrNetvibesShowAddAppLink; } @Override diff --git a/modules/apps/portlet-configuration/portlet-configuration-sharing-web/src/main/java/com/liferay/portlet/configuration/sharing/web/internal/portlet/configuration/icon/WidgetPortletConfigurationIcon.java b/modules/apps/portlet-configuration/portlet-configuration-sharing-web/src/main/java/com/liferay/portlet/configuration/sharing/web/internal/portlet/configuration/icon/WidgetPortletConfigurationIcon.java index e9b6c99c182aa7..7f0a7b9173aa37 100644 --- a/modules/apps/portlet-configuration/portlet-configuration-sharing-web/src/main/java/com/liferay/portlet/configuration/sharing/web/internal/portlet/configuration/icon/WidgetPortletConfigurationIcon.java +++ b/modules/apps/portlet-configuration/portlet-configuration-sharing-web/src/main/java/com/liferay/portlet/configuration/sharing/web/internal/portlet/configuration/icon/WidgetPortletConfigurationIcon.java @@ -85,11 +85,7 @@ public boolean isShow(PortletRequest portletRequest) { portletPreferences.getValue("lfrWidgetShowAddAppLink", null), PropsValues.THEME_PORTLET_SHARING_DEFAULT); - if (lfrWidgetShowAddAppLink) { - return true; - } - - return false; + return lfrWidgetShowAddAppLink; } @Override diff --git a/modules/apps/product-navigation/product-navigation-applications-menu-web/src/main/java/com/liferay/product/navigation/applications/menu/web/internal/product/navigation/control/menu/ApplicationsMenuApplicationMenuProductNavigationControlMenuEntry.java b/modules/apps/product-navigation/product-navigation-applications-menu-web/src/main/java/com/liferay/product/navigation/applications/menu/web/internal/product/navigation/control/menu/ApplicationsMenuApplicationMenuProductNavigationControlMenuEntry.java index 032dfdb273d8f4..3f28e43d43d386 100644 --- a/modules/apps/product-navigation/product-navigation-applications-menu-web/src/main/java/com/liferay/product/navigation/applications/menu/web/internal/product/navigation/control/menu/ApplicationsMenuApplicationMenuProductNavigationControlMenuEntry.java +++ b/modules/apps/product-navigation/product-navigation-applications-menu-web/src/main/java/com/liferay/product/navigation/applications/menu/web/internal/product/navigation/control/menu/ApplicationsMenuApplicationMenuProductNavigationControlMenuEntry.java @@ -62,13 +62,8 @@ public boolean isShow(HttpServletRequest httpServletRequest) return false; } - if (ApplicationsMenuUtil.hasChildPanelApps( - _panelAppRegistry, themeDisplay)) { - - return true; - } - - return false; + return ApplicationsMenuUtil.hasChildPanelApps( + _panelAppRegistry, themeDisplay); } @Override diff --git a/modules/apps/product-navigation/product-navigation-control-menu-api/src/main/java/com/liferay/product/navigation/control/menu/BaseProductNavigationControlMenuEntry.java b/modules/apps/product-navigation/product-navigation-control-menu-api/src/main/java/com/liferay/product/navigation/control/menu/BaseProductNavigationControlMenuEntry.java index e4d1627d36272f..b3e7845d455ef3 100644 --- a/modules/apps/product-navigation/product-navigation-control-menu-api/src/main/java/com/liferay/product/navigation/control/menu/BaseProductNavigationControlMenuEntry.java +++ b/modules/apps/product-navigation/product-navigation-control-menu-api/src/main/java/com/liferay/product/navigation/control/menu/BaseProductNavigationControlMenuEntry.java @@ -38,13 +38,8 @@ public boolean equals(Object object) { ProductNavigationControlMenuEntry productNavigationControlMenuEntry = (ProductNavigationControlMenuEntry)object; - if (Objects.equals( - getKey(), productNavigationControlMenuEntry.getKey())) { - - return true; - } - - return false; + return Objects.equals( + getKey(), productNavigationControlMenuEntry.getKey()); } @Override @@ -109,11 +104,7 @@ public boolean isPanelStateOpen( String panelState = SessionClicks.get( httpServletRequest, key, "closed"); - if (Objects.equals(panelState, "open")) { - return true; - } - - return false; + return Objects.equals(panelState, "open"); } @Override diff --git a/modules/apps/product-navigation/product-navigation-control-menu-impl/src/main/java/com/liferay/product/navigation/control/menu/internal/manager/ProductNavigationControlMenuManagerImpl.java b/modules/apps/product-navigation/product-navigation-control-menu-impl/src/main/java/com/liferay/product/navigation/control/menu/internal/manager/ProductNavigationControlMenuManagerImpl.java index fe155c65236465..633e2bce8f3f8a 100644 --- a/modules/apps/product-navigation/product-navigation-control-menu-impl/src/main/java/com/liferay/product/navigation/control/menu/internal/manager/ProductNavigationControlMenuManagerImpl.java +++ b/modules/apps/product-navigation/product-navigation-control-menu-impl/src/main/java/com/liferay/product/navigation/control/menu/internal/manager/ProductNavigationControlMenuManagerImpl.java @@ -130,14 +130,9 @@ private boolean _isLockedLayoutView(HttpServletRequest httpServletRequest) { _portal.getPortletNamespace(LayoutAdminPortletKeys.GROUP_PAGES) + "mvcRenderCommandName"; - if (Objects.equals( - ParamUtil.getString(httpServletRequest, mvcRenderCommandName), - "/layout_admin/locked_layout")) { - - return true; - } - - return false; + return Objects.equals( + ParamUtil.getString(httpServletRequest, mvcRenderCommandName), + "/layout_admin/locked_layout"); } private static final Log _log = LogFactoryUtil.getLog( diff --git a/modules/apps/product-navigation/product-navigation-control-menu-impl/src/main/java/com/liferay/product/navigation/control/menu/internal/util/ProductNavigationControlMenuCategoryRegistryImpl.java b/modules/apps/product-navigation/product-navigation-control-menu-impl/src/main/java/com/liferay/product/navigation/control/menu/internal/util/ProductNavigationControlMenuCategoryRegistryImpl.java index 34d23e789f55c0..b78e8833c3405c 100644 --- a/modules/apps/product-navigation/product-navigation-control-menu-impl/src/main/java/com/liferay/product/navigation/control/menu/internal/util/ProductNavigationControlMenuCategoryRegistryImpl.java +++ b/modules/apps/product-navigation/product-navigation-control-menu-impl/src/main/java/com/liferay/product/navigation/control/menu/internal/util/ProductNavigationControlMenuCategoryRegistryImpl.java @@ -86,11 +86,7 @@ public class ProductNavigationControlMenuCategoryRegistryImpl productNavigationControlMenuCategory, httpServletRequest); - if (productNavigationControlMenuEntries.isEmpty()) { - return false; - } - - return true; + return !productNavigationControlMenuEntries.isEmpty(); } catch (PortalException portalException) { _log.error(portalException); diff --git a/modules/apps/product-navigation/product-navigation-control-menu-web/src/main/java/com/liferay/product/navigation/control/menu/web/internal/LayoutHeaderProductNavigationControlMenuEntry.java b/modules/apps/product-navigation/product-navigation-control-menu-web/src/main/java/com/liferay/product/navigation/control/menu/web/internal/LayoutHeaderProductNavigationControlMenuEntry.java index dd4437d9785815..98ae89d87a3993 100644 --- a/modules/apps/product-navigation/product-navigation-control-menu-web/src/main/java/com/liferay/product/navigation/control/menu/web/internal/LayoutHeaderProductNavigationControlMenuEntry.java +++ b/modules/apps/product-navigation/product-navigation-control-menu-web/src/main/java/com/liferay/product/navigation/control/menu/web/internal/LayoutHeaderProductNavigationControlMenuEntry.java @@ -188,11 +188,7 @@ public boolean isRelevant(HttpServletRequest httpServletRequest) { String layoutMode = ParamUtil.getString( httpServletRequest, "p_l_mode", Constants.VIEW); - if (layoutMode.equals(Constants.EDIT)) { - return true; - } - - return false; + return layoutMode.equals(Constants.EDIT); } @Override diff --git a/modules/apps/product-navigation/product-navigation-control-menu-web/src/main/java/com/liferay/product/navigation/control/menu/web/internal/util/ProductNavigationControlMenuUtil.java b/modules/apps/product-navigation/product-navigation-control-menu-web/src/main/java/com/liferay/product/navigation/control/menu/web/internal/util/ProductNavigationControlMenuUtil.java index 1dd324bee59e46..22085fc66024bd 100644 --- a/modules/apps/product-navigation/product-navigation-control-menu-web/src/main/java/com/liferay/product/navigation/control/menu/web/internal/util/ProductNavigationControlMenuUtil.java +++ b/modules/apps/product-navigation/product-navigation-control-menu-web/src/main/java/com/liferay/product/navigation/control/menu/web/internal/util/ProductNavigationControlMenuUtil.java @@ -63,11 +63,7 @@ private static boolean _hasAddContentOrApplicationPermission( Layout layout = themeDisplay.getLayout(); - if (layout.isLayoutPrototypeLinkActive()) { - return false; - } - - return true; + return !layout.isLayoutPrototypeLinkActive(); } private static boolean _hasCustomizePermission(ThemeDisplay themeDisplay) @@ -84,14 +80,8 @@ private static boolean _hasCustomizePermission(ThemeDisplay themeDisplay) return false; } - if (LayoutPermissionUtil.contains( - themeDisplay.getPermissionChecker(), layout, - ActionKeys.CUSTOMIZE)) { - - return true; - } - - return false; + return LayoutPermissionUtil.contains( + themeDisplay.getPermissionChecker(), layout, ActionKeys.CUSTOMIZE); } private static boolean _hasUpdateLayoutPermission(ThemeDisplay themeDisplay) diff --git a/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/ApplicationsPanelCategory.java b/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/ApplicationsPanelCategory.java index aff8eff915b53c..df0180bf8c18cf 100644 --- a/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/ApplicationsPanelCategory.java +++ b/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/ApplicationsPanelCategory.java @@ -46,13 +46,8 @@ public String getLabel(Locale locale) { public boolean isShow(PermissionChecker permissionChecker, Group group) throws PortalException { - if (PortalPermissionUtil.contains( - permissionChecker, ActionKeys.VIEW_CONTROL_PANEL)) { - - return true; - } - - return false; + return PortalPermissionUtil.contains( + permissionChecker, ActionKeys.VIEW_CONTROL_PANEL); } @Reference diff --git a/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/ControlPanelCategory.java b/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/ControlPanelCategory.java index c93df9bfc4b06b..360f3095b36ae6 100644 --- a/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/ControlPanelCategory.java +++ b/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/ControlPanelCategory.java @@ -46,13 +46,8 @@ public String getLabel(Locale locale) { public boolean isShow(PermissionChecker permissionChecker, Group group) throws PortalException { - if (PortalPermissionUtil.contains( - permissionChecker, ActionKeys.VIEW_CONTROL_PANEL)) { - - return true; - } - - return false; + return PortalPermissionUtil.contains( + permissionChecker, ActionKeys.VIEW_CONTROL_PANEL); } @Reference diff --git a/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/SecurityPanelCategory.java b/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/SecurityPanelCategory.java index 52ed02dc6333ad..9f4593d216f2ba 100644 --- a/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/SecurityPanelCategory.java +++ b/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/SecurityPanelCategory.java @@ -46,13 +46,8 @@ public String getLabel(Locale locale) { public boolean isShow(PermissionChecker permissionChecker, Group group) throws PortalException { - if (PortalPermissionUtil.contains( - permissionChecker, ActionKeys.VIEW_CONTROL_PANEL)) { - - return true; - } - - return false; + return PortalPermissionUtil.contains( + permissionChecker, ActionKeys.VIEW_CONTROL_PANEL); } @Reference diff --git a/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/SitesPanelCategory.java b/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/SitesPanelCategory.java index 42f86116f85fc3..ad48bcf35c9dcb 100644 --- a/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/SitesPanelCategory.java +++ b/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/SitesPanelCategory.java @@ -46,13 +46,8 @@ public String getLabel(Locale locale) { public boolean isShow(PermissionChecker permissionChecker, Group group) throws PortalException { - if (PortalPermissionUtil.contains( - permissionChecker, ActionKeys.VIEW_CONTROL_PANEL)) { - - return true; - } - - return false; + return PortalPermissionUtil.contains( + permissionChecker, ActionKeys.VIEW_CONTROL_PANEL); } @Reference diff --git a/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/SystemPanelCategory.java b/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/SystemPanelCategory.java index 3b3be2ed406eeb..8e157aa6962046 100644 --- a/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/SystemPanelCategory.java +++ b/modules/apps/product-navigation/product-navigation-control-panel/src/main/java/com/liferay/product/navigation/control/panel/internal/application/list/SystemPanelCategory.java @@ -46,13 +46,8 @@ public String getLabel(Locale locale) { public boolean isShow(PermissionChecker permissionChecker, Group group) throws PortalException { - if (PortalPermissionUtil.contains( - permissionChecker, ActionKeys.VIEW_CONTROL_PANEL)) { - - return true; - } - - return false; + return PortalPermissionUtil.contains( + permissionChecker, ActionKeys.VIEW_CONTROL_PANEL); } @Reference diff --git a/modules/apps/product-navigation/product-navigation-personal-menu-api/src/main/java/com/liferay/product/navigation/personal/menu/BasePersonalMenuEntry.java b/modules/apps/product-navigation/product-navigation-personal-menu-api/src/main/java/com/liferay/product/navigation/personal/menu/BasePersonalMenuEntry.java index 63bfe6e7344c86..594f136b04b7af 100644 --- a/modules/apps/product-navigation/product-navigation-personal-menu-api/src/main/java/com/liferay/product/navigation/personal/menu/BasePersonalMenuEntry.java +++ b/modules/apps/product-navigation/product-navigation-personal-menu-api/src/main/java/com/liferay/product/navigation/personal/menu/BasePersonalMenuEntry.java @@ -85,11 +85,7 @@ public boolean isActive(PortletRequest portletRequest, String portletId) { return false; } - if (portletId.equals(getPortletId())) { - return true; - } - - return false; + return portletId.equals(getPortletId()); } @Override diff --git a/modules/apps/product-navigation/product-navigation-product-menu-api/src/main/java/com/liferay/product/navigation/product/menu/display/context/ProductMenuDisplayContext.java b/modules/apps/product-navigation/product-navigation-product-menu-api/src/main/java/com/liferay/product/navigation/product/menu/display/context/ProductMenuDisplayContext.java index 0df4054ebdf8d5..9c7e229398b817 100644 --- a/modules/apps/product-navigation/product-navigation-product-menu-api/src/main/java/com/liferay/product/navigation/product/menu/display/context/ProductMenuDisplayContext.java +++ b/modules/apps/product-navigation/product-navigation-product-menu-api/src/main/java/com/liferay/product/navigation/product/menu/display/context/ProductMenuDisplayContext.java @@ -188,11 +188,7 @@ public boolean isShowProductMenu() { List childPanelCategories = getChildPanelCategories(); - if (childPanelCategories.isEmpty()) { - return false; - } - - return true; + return !childPanelCategories.isEmpty(); } private List _filterPanelCategories( @@ -223,14 +219,9 @@ private boolean _hasAdministrationPortletPermission() throws Exception { ControlPanelEntry controlPanelEntry = portlet.getControlPanelEntryInstance(); - if (!controlPanelEntry.hasAccessPermission( - _themeDisplay.getPermissionChecker(), - _themeDisplay.getScopeGroup(), portlet)) { - - return false; - } - - return true; + return controlPanelEntry.hasAccessPermission( + _themeDisplay.getPermissionChecker(), _themeDisplay.getScopeGroup(), + portlet); } private boolean _isEnableApplicationsMenu() { diff --git a/modules/apps/product-navigation/product-navigation-product-menu-web/src/main/java/com/liferay/product/navigation/product/menu/web/internal/display/context/LayoutsTreeDisplayContext.java b/modules/apps/product-navigation/product-navigation-product-menu-web/src/main/java/com/liferay/product/navigation/product/menu/web/internal/display/context/LayoutsTreeDisplayContext.java index ff293590c053cb..fbc424f31604c0 100644 --- a/modules/apps/product-navigation/product-navigation-product-menu-web/src/main/java/com/liferay/product/navigation/product/menu/web/internal/display/context/LayoutsTreeDisplayContext.java +++ b/modules/apps/product-navigation/product-navigation-product-menu-web/src/main/java/com/liferay/product/navigation/product/menu/web/internal/display/context/LayoutsTreeDisplayContext.java @@ -310,11 +310,7 @@ private Map _getConfigData() { () -> { Group scopeGroup = _themeDisplay.getScopeGroup(); - if (scopeGroup.hasLocalOrRemoteStagingGroup()) { - return true; - } - - return false; + return scopeGroup.hasLocalOrRemoteStagingGroup(); } ).build()); @@ -778,14 +774,9 @@ private JSONArray _getSiteNavigationMenuJSONArray() { } private boolean _hasAddLayoutPermission() throws PortalException { - if (GroupPermissionUtil.contains( - _themeDisplay.getPermissionChecker(), - _themeDisplay.getScopeGroup(), ActionKeys.ADD_LAYOUT)) { - - return true; - } - - return false; + return GroupPermissionUtil.contains( + _themeDisplay.getPermissionChecker(), _themeDisplay.getScopeGroup(), + ActionKeys.ADD_LAYOUT); } private boolean _hasAdministrationPortletPermission() throws Exception { @@ -799,25 +790,15 @@ private boolean _hasAdministrationPortletPermission() throws Exception { ControlPanelEntry controlPanelEntry = portlet.getControlPanelEntryInstance(); - if (!controlPanelEntry.hasAccessPermission( - _themeDisplay.getPermissionChecker(), - _themeDisplay.getScopeGroup(), portlet)) { - - return false; - } - - return true; + return controlPanelEntry.hasAccessPermission( + _themeDisplay.getPermissionChecker(), _themeDisplay.getScopeGroup(), + portlet); } private boolean _hasConfigureLayoutPermission() throws PortalException { - if (GroupPermissionUtil.contains( - _themeDisplay.getPermissionChecker(), - _themeDisplay.getScopeGroup(), ActionKeys.MANAGE_LAYOUTS)) { - - return true; - } - - return false; + return GroupPermissionUtil.contains( + _themeDisplay.getPermissionChecker(), _themeDisplay.getScopeGroup(), + ActionKeys.MANAGE_LAYOUTS); } private boolean _isPageHierarchyOption(String pageTypeOption) { diff --git a/modules/apps/product-navigation/product-navigation-product-menu-web/src/main/java/com/liferay/product/navigation/product/menu/web/internal/product/navigation/control/menu/ProductMenuProductNavigationControlMenuEntry.java b/modules/apps/product-navigation/product-navigation-product-menu-web/src/main/java/com/liferay/product/navigation/product/menu/web/internal/product/navigation/control/menu/ProductMenuProductNavigationControlMenuEntry.java index 299e427eb59cd4..ffe34d47c41b8a 100644 --- a/modules/apps/product-navigation/product-navigation-product-menu-web/src/main/java/com/liferay/product/navigation/product/menu/web/internal/product/navigation/control/menu/ProductMenuProductNavigationControlMenuEntry.java +++ b/modules/apps/product-navigation/product-navigation-product-menu-web/src/main/java/com/liferay/product/navigation/product/menu/web/internal/product/navigation/control/menu/ProductMenuProductNavigationControlMenuEntry.java @@ -200,13 +200,8 @@ public boolean includeIcon( public boolean isShow(HttpServletRequest httpServletRequest) throws PortalException { - if (_productNavigationProductMenuHelper.isShowProductMenu( - httpServletRequest)) { - - return true; - } - - return false; + return _productNavigationProductMenuHelper.isShowProductMenu( + httpServletRequest); } private static final String _TMPL_CONTENT = StringUtil.read( diff --git a/modules/apps/product-navigation/product-navigation-product-menu-web/src/main/java/com/liferay/product/navigation/product/menu/web/internal/product/navigation/control/panel/ProductMenuProductNavigationControlPanelEntry.java b/modules/apps/product-navigation/product-navigation-product-menu-web/src/main/java/com/liferay/product/navigation/product/menu/web/internal/product/navigation/control/panel/ProductMenuProductNavigationControlPanelEntry.java index e85fd82eddc94d..b3d185da6a3da0 100644 --- a/modules/apps/product-navigation/product-navigation-product-menu-web/src/main/java/com/liferay/product/navigation/product/menu/web/internal/product/navigation/control/panel/ProductMenuProductNavigationControlPanelEntry.java +++ b/modules/apps/product-navigation/product-navigation-product-menu-web/src/main/java/com/liferay/product/navigation/product/menu/web/internal/product/navigation/control/panel/ProductMenuProductNavigationControlPanelEntry.java @@ -58,11 +58,7 @@ private boolean _isImpersonated() { return false; } - if (themeDisplay.isImpersonated()) { - return true; - } - - return false; + return themeDisplay.isImpersonated(); } } \ No newline at end of file diff --git a/modules/apps/product-navigation/product-navigation-site-administration/src/main/java/com/liferay/product/navigation/site/administration/internal/application/list/SiteAdministrationPanelCategory.java b/modules/apps/product-navigation/product-navigation-site-administration/src/main/java/com/liferay/product/navigation/site/administration/internal/application/list/SiteAdministrationPanelCategory.java index d725d51622b0c3..115b03faac7b31 100644 --- a/modules/apps/product-navigation/product-navigation-site-administration/src/main/java/com/liferay/product/navigation/site/administration/internal/application/list/SiteAdministrationPanelCategory.java +++ b/modules/apps/product-navigation/product-navigation-site-administration/src/main/java/com/liferay/product/navigation/site/administration/internal/application/list/SiteAdministrationPanelCategory.java @@ -102,14 +102,8 @@ public boolean isShow(PermissionChecker permissionChecker, Group group) return false; } - if (GroupPermissionUtil.contains( - permissionChecker, group, - ActionKeys.VIEW_SITE_ADMINISTRATION)) { - - return true; - } - - return false; + return GroupPermissionUtil.contains( + permissionChecker, group, ActionKeys.VIEW_SITE_ADMINISTRATION); } @Override diff --git a/modules/apps/product-navigation/product-navigation-site-administration/src/main/java/com/liferay/product/navigation/site/administration/internal/display/context/SiteAdministrationPanelCategoryDisplayContext.java b/modules/apps/product-navigation/product-navigation-site-administration/src/main/java/com/liferay/product/navigation/site/administration/internal/display/context/SiteAdministrationPanelCategoryDisplayContext.java index de1cdbcaf8403e..55fb1ea4494d5e 100644 --- a/modules/apps/product-navigation/product-navigation-site-administration/src/main/java/com/liferay/product/navigation/site/administration/internal/display/context/SiteAdministrationPanelCategoryDisplayContext.java +++ b/modules/apps/product-navigation/product-navigation-site-administration/src/main/java/com/liferay/product/navigation/site/administration/internal/display/context/SiteAdministrationPanelCategoryDisplayContext.java @@ -424,14 +424,9 @@ public boolean isShowSiteAdministration() throws PortalException { return false; } - if (GroupPermissionUtil.contains( - _themeDisplay.getPermissionChecker(), group, - ActionKeys.VIEW_SITE_ADMINISTRATION)) { - - return true; - } - - return false; + return GroupPermissionUtil.contains( + _themeDisplay.getPermissionChecker(), group, + ActionKeys.VIEW_SITE_ADMINISTRATION); } public boolean isShowSiteSelector() throws PortalException { @@ -444,11 +439,7 @@ public boolean isShowSiteSelector() throws PortalException { List recentSites = _recentGroupManager.getRecentGroups( PortalUtil.getHttpServletRequest(_portletRequest)); - if (!recentSites.isEmpty()) { - return true; - } - - return false; + return !recentSites.isEmpty(); } public boolean isShowStagingInfo() throws PortalException { diff --git a/modules/apps/product-navigation/product-navigation-site-administration/src/main/java/com/liferay/product/navigation/site/administration/internal/menu/MySitesPersonalMenuEntry.java b/modules/apps/product-navigation/product-navigation-site-administration/src/main/java/com/liferay/product/navigation/site/administration/internal/menu/MySitesPersonalMenuEntry.java index 074d57633f8598..1410afb51c7d4f 100644 --- a/modules/apps/product-navigation/product-navigation-site-administration/src/main/java/com/liferay/product/navigation/site/administration/internal/menu/MySitesPersonalMenuEntry.java +++ b/modules/apps/product-navigation/product-navigation-site-administration/src/main/java/com/liferay/product/navigation/site/administration/internal/menu/MySitesPersonalMenuEntry.java @@ -126,11 +126,7 @@ public boolean isShow( List recentGroups = _recentGroupManager.getRecentGroups( _portal.getHttpServletRequest(portletRequest)); - if (!recentGroups.isEmpty()) { - return true; - } - - return false; + return !recentGroups.isEmpty(); } @Reference diff --git a/modules/apps/redirect/redirect-web/src/main/java/com/liferay/redirect/web/internal/display/context/EditRedirectEntryDisplayContext.java b/modules/apps/redirect/redirect-web/src/main/java/com/liferay/redirect/web/internal/display/context/EditRedirectEntryDisplayContext.java index f71770ca23d015..7e5eb4f1bdb3a1 100644 --- a/modules/apps/redirect/redirect-web/src/main/java/com/liferay/redirect/web/internal/display/context/EditRedirectEntryDisplayContext.java +++ b/modules/apps/redirect/redirect-web/src/main/java/com/liferay/redirect/web/internal/display/context/EditRedirectEntryDisplayContext.java @@ -171,11 +171,7 @@ public boolean isRedirectEntryPermanent() { } public boolean isRedirectEntryTemporary() { - if (isRedirectEntryPermanent()) { - return false; - } - - return true; + return !isRedirectEntryPermanent(); } public boolean isShowAlertMessage() { diff --git a/modules/apps/redirect/redirect-web/src/main/java/com/liferay/redirect/web/internal/display/context/RedirectDisplayContext.java b/modules/apps/redirect/redirect-web/src/main/java/com/liferay/redirect/web/internal/display/context/RedirectDisplayContext.java index ff6eea3e12d7c4..c53d7edbb05121 100644 --- a/modules/apps/redirect/redirect-web/src/main/java/com/liferay/redirect/web/internal/display/context/RedirectDisplayContext.java +++ b/modules/apps/redirect/redirect-web/src/main/java/com/liferay/redirect/web/internal/display/context/RedirectDisplayContext.java @@ -66,38 +66,22 @@ public List getNavigationItems() { } public boolean isShowRedirectEntries() { - if (_isShowNavigationPanel("aliases")) { - return true; - } - - return false; + return _isShowNavigationPanel("aliases"); } public boolean isShowRedirectNotFoundEntries() { - if (_isShowNavigationPanel("404-urls")) { - return true; - } - - return false; + return _isShowNavigationPanel("404-urls"); } private boolean _isShowNavigationPanel(String name) { String navigation = ParamUtil.getString( _httpServletRequest, "navigation", "aliases"); - if (navigation.equals(name)) { - return true; - } - - return false; + return navigation.equals(name); } private boolean _isShowRedirectPatterns() { - if (_isShowNavigationPanel("patterns")) { - return true; - } - - return false; + return _isShowNavigationPanel("patterns"); } private final HttpServletRequest _httpServletRequest; diff --git a/modules/apps/redirect/redirect-web/src/main/java/com/liferay/redirect/web/internal/display/context/RedirectEntryInfoPanelDisplayContext.java b/modules/apps/redirect/redirect-web/src/main/java/com/liferay/redirect/web/internal/display/context/RedirectEntryInfoPanelDisplayContext.java index 42deb3d153b7dd..91228dbb5a75d2 100644 --- a/modules/apps/redirect/redirect-web/src/main/java/com/liferay/redirect/web/internal/display/context/RedirectEntryInfoPanelDisplayContext.java +++ b/modules/apps/redirect/redirect-web/src/main/java/com/liferay/redirect/web/internal/display/context/RedirectEntryInfoPanelDisplayContext.java @@ -123,11 +123,7 @@ public String getRedirectEntryUserFullName() { } public boolean isEmptyRedirectEntries() { - if (_redirectEntries.isEmpty()) { - return true; - } - - return false; + return _redirectEntries.isEmpty(); } public boolean isSingletonRedirectEntry() { diff --git a/modules/apps/roles/roles-admin-api/src/main/java/com/liferay/roles/admin/role/type/contributor/RoleTypeContributor.java b/modules/apps/roles/roles-admin-api/src/main/java/com/liferay/roles/admin/role/type/contributor/RoleTypeContributor.java index d4456362fa51c2..6e4189c7c20a08 100644 --- a/modules/apps/roles/roles-admin-api/src/main/java/com/liferay/roles/admin/role/type/contributor/RoleTypeContributor.java +++ b/modules/apps/roles/roles-admin-api/src/main/java/com/liferay/roles/admin/role/type/contributor/RoleTypeContributor.java @@ -131,11 +131,7 @@ public default String getTypeLabel() { * granted by the role; false otherwise */ public default boolean isAllowDefinePermissions(Role role) { - if (ArrayUtil.contains(getExcludedRoleNames(), role.getName())) { - return false; - } - - return true; + return !ArrayUtil.contains(getExcludedRoleNames(), role.getName()); } /** diff --git a/modules/apps/roles/roles-admin-impl/src/main/java/com/liferay/roles/admin/internal/role/type/contributor/OrganizationRoleTypeContributor.java b/modules/apps/roles/roles-admin-impl/src/main/java/com/liferay/roles/admin/internal/role/type/contributor/OrganizationRoleTypeContributor.java index c784aa1016f214..45c92ed82db9c2 100644 --- a/modules/apps/roles/roles-admin-impl/src/main/java/com/liferay/roles/admin/internal/role/type/contributor/OrganizationRoleTypeContributor.java +++ b/modules/apps/roles/roles-admin-impl/src/main/java/com/liferay/roles/admin/internal/role/type/contributor/OrganizationRoleTypeContributor.java @@ -80,11 +80,7 @@ public boolean isAllowDelete(Role role) { @Override public boolean isAutomaticallyAssigned(Role role) { - if (Objects.equals(RoleConstants.ORGANIZATION_USER, role.getName())) { - return true; - } - - return false; + return Objects.equals(RoleConstants.ORGANIZATION_USER, role.getName()); } @Reference diff --git a/modules/apps/roles/roles-admin-impl/src/main/java/com/liferay/roles/admin/internal/role/type/contributor/RegularRoleTypeContributor.java b/modules/apps/roles/roles-admin-impl/src/main/java/com/liferay/roles/admin/internal/role/type/contributor/RegularRoleTypeContributor.java index c873b49f4c1be5..e184cc38ab4cf9 100644 --- a/modules/apps/roles/roles-admin-impl/src/main/java/com/liferay/roles/admin/internal/role/type/contributor/RegularRoleTypeContributor.java +++ b/modules/apps/roles/roles-admin-impl/src/main/java/com/liferay/roles/admin/internal/role/type/contributor/RegularRoleTypeContributor.java @@ -58,13 +58,8 @@ public int getType() { @Override public boolean isAllowAssignMembers(Role role) { - if (ArrayUtil.contains( - _AUTOMATICALLY_ASSIGNED_ROLE_NAMES, role.getName())) { - - return false; - } - - return true; + return !ArrayUtil.contains( + _AUTOMATICALLY_ASSIGNED_ROLE_NAMES, role.getName()); } @Override @@ -92,13 +87,8 @@ public boolean isAllowDelete(Role role) { @Override public boolean isAutomaticallyAssigned(Role role) { - if (ArrayUtil.contains( - _AUTOMATICALLY_ASSIGNED_ROLE_NAMES, role.getName())) { - - return true; - } - - return false; + return ArrayUtil.contains( + _AUTOMATICALLY_ASSIGNED_ROLE_NAMES, role.getName()); } private static final String[] _AUTOMATICALLY_ASSIGNED_ROLE_NAMES = { diff --git a/modules/apps/roles/roles-admin-impl/src/main/java/com/liferay/roles/admin/internal/role/type/contributor/SiteRoleTypeContributor.java b/modules/apps/roles/roles-admin-impl/src/main/java/com/liferay/roles/admin/internal/role/type/contributor/SiteRoleTypeContributor.java index a549979bf92994..e02d10bbcb7b8f 100644 --- a/modules/apps/roles/roles-admin-impl/src/main/java/com/liferay/roles/admin/internal/role/type/contributor/SiteRoleTypeContributor.java +++ b/modules/apps/roles/roles-admin-impl/src/main/java/com/liferay/roles/admin/internal/role/type/contributor/SiteRoleTypeContributor.java @@ -79,11 +79,7 @@ public boolean isAllowDelete(Role role) { @Override public boolean isAutomaticallyAssigned(Role role) { - if (Objects.equals(RoleConstants.SITE_MEMBER, role.getName())) { - return true; - } - - return false; + return Objects.equals(RoleConstants.SITE_MEMBER, role.getName()); } @Reference diff --git a/modules/apps/roles/roles-admin-web/src/main/java/com/liferay/roles/admin/web/internal/display/context/EditRolePermissionsResourceDisplayContext.java b/modules/apps/roles/roles-admin-web/src/main/java/com/liferay/roles/admin/web/internal/display/context/EditRolePermissionsResourceDisplayContext.java index 2e1a319b6987ed..c8d86884294d0c 100644 --- a/modules/apps/roles/roles-admin-web/src/main/java/com/liferay/roles/admin/web/internal/display/context/EditRolePermissionsResourceDisplayContext.java +++ b/modules/apps/roles/roles-admin-web/src/main/java/com/liferay/roles/admin/web/internal/display/context/EditRolePermissionsResourceDisplayContext.java @@ -224,11 +224,7 @@ private boolean _hasHiddenPortletCategory(Portlet portlet) { Set portletIds = hiddenPortletCategory.getPortletIds(); - if (portletIds.contains(portlet.getPortletId())) { - return true; - } - - return false; + return portletIds.contains(portlet.getPortletId()); } private void _updateSearchContainerResultRows() throws PortalException { diff --git a/modules/apps/roles/roles-admin-web/src/main/java/com/liferay/roles/admin/web/internal/portlet/RolesAdminPortlet.java b/modules/apps/roles/roles-admin-web/src/main/java/com/liferay/roles/admin/web/internal/portlet/RolesAdminPortlet.java index 5049ee6c17c761..997e645c074719 100644 --- a/modules/apps/roles/roles-admin-web/src/main/java/com/liferay/roles/admin/web/internal/portlet/RolesAdminPortlet.java +++ b/modules/apps/roles/roles-admin-web/src/main/java/com/liferay/roles/admin/web/internal/portlet/RolesAdminPortlet.java @@ -603,11 +603,7 @@ private boolean _isDepotGroup(long groupId) { try { Group group = _groupService.getGroup(groupId); - if (group.isDepot()) { - return true; - } - - return false; + return group.isDepot(); } catch (PortalException portalException) { return ReflectionUtil.throwException(portalException); diff --git a/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/internal/configuration/provider/SegmentsConfigurationProviderImpl.java b/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/internal/configuration/provider/SegmentsConfigurationProviderImpl.java index c643d0ae6681ea..d3571178821a9b 100644 --- a/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/internal/configuration/provider/SegmentsConfigurationProviderImpl.java +++ b/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/internal/configuration/provider/SegmentsConfigurationProviderImpl.java @@ -137,11 +137,7 @@ public boolean isRoleSegmentationEnabled(long companyId) _configurationProvider.getCompanyConfiguration( SegmentsCompanyConfiguration.class, companyId); - if (!segmentsCompanyConfiguration.roleSegmentationEnabled()) { - return false; - } - - return true; + return segmentsCompanyConfiguration.roleSegmentationEnabled(); } @Override @@ -165,11 +161,7 @@ public boolean isSegmentationEnabled(long companyId) _configurationProvider.getCompanyConfiguration( SegmentsCompanyConfiguration.class, companyId); - if (!segmentsCompanyConfiguration.segmentationEnabled()) { - return false; - } - - return true; + return segmentsCompanyConfiguration.segmentationEnabled(); } @Override diff --git a/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/service/impl/SegmentsExperienceServiceImpl.java b/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/service/impl/SegmentsExperienceServiceImpl.java index 65f51936b55908..ec07ccc89fdcd1 100644 --- a/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/service/impl/SegmentsExperienceServiceImpl.java +++ b/modules/apps/segments/segments-service/src/main/java/com/liferay/segments/service/impl/SegmentsExperienceServiceImpl.java @@ -351,13 +351,8 @@ private boolean _hasUpdateLayoutPermission(long plid) return false; } - if (_layoutPermission.containsLayoutRestrictedUpdatePermission( - getPermissionChecker(), layout)) { - - return true; - } - - return false; + return _layoutPermission.containsLayoutRestrictedUpdatePermission( + getPermissionChecker(), layout); } @Reference diff --git a/modules/apps/segments/segments-web/src/main/java/com/liferay/segments/web/internal/display/context/SegmentsDisplayContext.java b/modules/apps/segments/segments-web/src/main/java/com/liferay/segments/web/internal/display/context/SegmentsDisplayContext.java index 484c5269cfaaa4..a1497452362495 100644 --- a/modules/apps/segments/segments-web/src/main/java/com/liferay/segments/web/internal/display/context/SegmentsDisplayContext.java +++ b/modules/apps/segments/segments-web/src/main/java/com/liferay/segments/web/internal/display/context/SegmentsDisplayContext.java @@ -572,11 +572,7 @@ private boolean _hasResults() throws PortalException { } private boolean _isSearch() { - if (Validator.isNotNull(_getKeywords())) { - return true; - } - - return false; + return Validator.isNotNull(_getKeywords()); } private static final Log _log = LogFactoryUtil.getLog( diff --git a/modules/apps/sharing/sharing-service/src/main/java/com/liferay/sharing/service/impl/SharingEntryLocalServiceImpl.java b/modules/apps/sharing/sharing-service/src/main/java/com/liferay/sharing/service/impl/SharingEntryLocalServiceImpl.java index dcb1ee07826983..fa483fc7f91d6b 100644 --- a/modules/apps/sharing/sharing-service/src/main/java/com/liferay/sharing/service/impl/SharingEntryLocalServiceImpl.java +++ b/modules/apps/sharing/sharing-service/src/main/java/com/liferay/sharing/service/impl/SharingEntryLocalServiceImpl.java @@ -608,11 +608,7 @@ public boolean hasSharingPermission( for (SharingEntry sharingEntry : sharingEntries) { if (classPK == sharingEntry.getClassPK()) { - if (sharingEntry.hasSharingPermission(sharingEntryAction)) { - return true; - } - - return false; + return sharingEntry.hasSharingPermission(sharingEntryAction); } } diff --git a/modules/apps/sharing/sharing-web/src/main/java/com/liferay/sharing/web/internal/display/context/ViewSharedAssetsDisplayContext.java b/modules/apps/sharing/sharing-web/src/main/java/com/liferay/sharing/web/internal/display/context/ViewSharedAssetsDisplayContext.java index f12cdd1bf6ed4a..e37b1ea84c7c28 100644 --- a/modules/apps/sharing/sharing-web/src/main/java/com/liferay/sharing/web/internal/display/context/ViewSharedAssetsDisplayContext.java +++ b/modules/apps/sharing/sharing-web/src/main/java/com/liferay/sharing/web/internal/display/context/ViewSharedAssetsDisplayContext.java @@ -301,11 +301,7 @@ public boolean isSharingEntryVisible(SharingEntry sharingEntry) _sharingConfigurationFactory.getGroupSharingConfiguration( _groupLocalService.getGroup(sharingEntry.getGroupId())); - if (!groupSharingConfiguration.isEnabled()) { - return false; - } - - return true; + return groupSharingConfiguration.isEnabled(); } private PortletURL _getURLEdit( diff --git a/modules/apps/sharing/sharing-web/src/main/java/com/liferay/sharing/web/internal/display/context/ViewSharingEntryAssetEntryDisplayContext.java b/modules/apps/sharing/sharing-web/src/main/java/com/liferay/sharing/web/internal/display/context/ViewSharingEntryAssetEntryDisplayContext.java index 5311c5334fd42d..b83f4b0487ed90 100644 --- a/modules/apps/sharing/sharing-web/src/main/java/com/liferay/sharing/web/internal/display/context/ViewSharingEntryAssetEntryDisplayContext.java +++ b/modules/apps/sharing/sharing-web/src/main/java/com/liferay/sharing/web/internal/display/context/ViewSharingEntryAssetEntryDisplayContext.java @@ -95,11 +95,7 @@ public boolean isControlPanelGroup() { Group group = themeDisplay.getScopeGroup(); - if (group.equals(themeDisplay.getControlPanelGroup())) { - return true; - } - - return false; + return group.equals(themeDisplay.getControlPanelGroup()); } private AssetEntry _getAssetEntry() throws PortalException { diff --git a/modules/apps/staging/staging-bar-web/src/main/java/com/liferay/staging/bar/web/internal/util/StagingBarControlMenuUtil.java b/modules/apps/staging/staging-bar-web/src/main/java/com/liferay/staging/bar/web/internal/util/StagingBarControlMenuUtil.java index 90f4b7de1c5ab6..cebf22f84d0964 100644 --- a/modules/apps/staging/staging-bar-web/src/main/java/com/liferay/staging/bar/web/internal/util/StagingBarControlMenuUtil.java +++ b/modules/apps/staging/staging-bar-web/src/main/java/com/liferay/staging/bar/web/internal/util/StagingBarControlMenuUtil.java @@ -51,11 +51,7 @@ private static boolean _isShow(HttpServletRequest httpServletRequest) String layoutMode = ParamUtil.getString( httpServletRequest, "p_l_mode", Constants.VIEW); - if (layoutMode.equals(Constants.EDIT)) { - return false; - } - - return true; + return !layoutMode.equals(Constants.EDIT); } private static final String _SHOW = diff --git a/modules/apps/staging/staging-processes-web/src/main/java/com/liferay/staging/processes/web/internal/portlet/configuration/icon/PublishTemplatesConfigurationIcon.java b/modules/apps/staging/staging-processes-web/src/main/java/com/liferay/staging/processes/web/internal/portlet/configuration/icon/PublishTemplatesConfigurationIcon.java index 21ad7c02130f12..14cdbf0ab4d1bb 100644 --- a/modules/apps/staging/staging-processes-web/src/main/java/com/liferay/staging/processes/web/internal/portlet/configuration/icon/PublishTemplatesConfigurationIcon.java +++ b/modules/apps/staging/staging-processes-web/src/main/java/com/liferay/staging/processes/web/internal/portlet/configuration/icon/PublishTemplatesConfigurationIcon.java @@ -102,11 +102,7 @@ public boolean isShow(PortletRequest portletRequest) { User user = themeDisplay.getUser(); - if (user.isGuestUser()) { - return false; - } - - return true; + return !user.isGuestUser(); } private static final Log _log = LogFactoryUtil.getLog( diff --git a/modules/apps/staging/staging-taglib/src/main/java/com/liferay/staging/taglib/internal/display/context/LayoutsTreeDisplayContext.java b/modules/apps/staging/staging-taglib/src/main/java/com/liferay/staging/taglib/internal/display/context/LayoutsTreeDisplayContext.java index 620c79cf676ae0..1558b9bc57dd89 100644 --- a/modules/apps/staging/staging-taglib/src/main/java/com/liferay/staging/taglib/internal/display/context/LayoutsTreeDisplayContext.java +++ b/modules/apps/staging/staging-taglib/src/main/java/com/liferay/staging/taglib/internal/display/context/LayoutsTreeDisplayContext.java @@ -471,13 +471,8 @@ private String _getTreeId() { } private boolean _isIncomplete() { - if (LayoutStagingUtil.isBranchingLayoutSet( - getSelectPagesGroup(), isSelectPagesPrivateLayout())) { - - return true; - } - - return false; + return LayoutStagingUtil.isBranchingLayoutSet( + getSelectPagesGroup(), isSelectPagesPrivateLayout()); } private String _action; diff --git a/modules/apps/staging/staging-taglib/src/main/java/com/liferay/staging/taglib/internal/display/context/ProcessListDisplayContext.java b/modules/apps/staging/staging-taglib/src/main/java/com/liferay/staging/taglib/internal/display/context/ProcessListDisplayContext.java index ab335e01e658aa..2719f0b83ea047 100644 --- a/modules/apps/staging/staging-taglib/src/main/java/com/liferay/staging/taglib/internal/display/context/ProcessListDisplayContext.java +++ b/modules/apps/staging/staging-taglib/src/main/java/com/liferay/staging/taglib/internal/display/context/ProcessListDisplayContext.java @@ -256,19 +256,11 @@ private String _getTaskExecutorClassName() { } private boolean _isNavigationCompleted() { - if (Objects.equals(_getNavigation(), "completed")) { - return true; - } - - return false; + return Objects.equals(_getNavigation(), "completed"); } private boolean _isNavigationHome() { - if (Objects.equals(_getNavigation(), "all")) { - return true; - } - - return false; + return Objects.equals(_getNavigation(), "all"); } private boolean _isOrderByAsc() { diff --git a/modules/apps/static/portal-configuration/portal-configuration-persistence-impl/src/main/java/com/liferay/portal/configuration/persistence/internal/upgrade/v2_0_0/ConfigurationDBPartitionUpgradeProcess.java b/modules/apps/static/portal-configuration/portal-configuration-persistence-impl/src/main/java/com/liferay/portal/configuration/persistence/internal/upgrade/v2_0_0/ConfigurationDBPartitionUpgradeProcess.java index 719de1002de598..002558602ffe22 100644 --- a/modules/apps/static/portal-configuration/portal-configuration-persistence-impl/src/main/java/com/liferay/portal/configuration/persistence/internal/upgrade/v2_0_0/ConfigurationDBPartitionUpgradeProcess.java +++ b/modules/apps/static/portal-configuration/portal-configuration-persistence-impl/src/main/java/com/liferay/portal/configuration/persistence/internal/upgrade/v2_0_0/ConfigurationDBPartitionUpgradeProcess.java @@ -136,11 +136,7 @@ protected void doUpgrade() throws Exception { @Override protected boolean isSkipUpgradeProcess() { - if (!DBPartition.isPartitionEnabled()) { - return true; - } - - return false; + return !DBPartition.isPartitionEnabled(); } private ScopeConfiguration _getScopeConfiguration( diff --git a/modules/apps/static/portal-file-install/portal-file-install-impl/src/main/java/com/liferay/portal/file/install/internal/DefaultJarInstaller.java b/modules/apps/static/portal-file-install/portal-file-install-impl/src/main/java/com/liferay/portal/file/install/internal/DefaultJarInstaller.java index ee9fe4d543f7d8..9d34b0c31f5ac8 100644 --- a/modules/apps/static/portal-file-install/portal-file-install-impl/src/main/java/com/liferay/portal/file/install/internal/DefaultJarInstaller.java +++ b/modules/apps/static/portal-file-install/portal-file-install-impl/src/main/java/com/liferay/portal/file/install/internal/DefaultJarInstaller.java @@ -21,11 +21,7 @@ public class DefaultJarInstaller implements FileInstaller { public boolean canTransformURL(File artifact) { String name = artifact.getName(); - if (name.endsWith(".jar")) { - return true; - } - - return false; + return name.endsWith(".jar"); } @Override diff --git a/modules/apps/static/portal-file-install/portal-file-install-impl/src/main/java/com/liferay/portal/file/install/internal/configuration/ConfigurationFileInstaller.java b/modules/apps/static/portal-file-install/portal-file-install-impl/src/main/java/com/liferay/portal/file/install/internal/configuration/ConfigurationFileInstaller.java index 6a8699b81459b6..ea53a1e5bbb40b 100644 --- a/modules/apps/static/portal-file-install/portal-file-install-impl/src/main/java/com/liferay/portal/file/install/internal/configuration/ConfigurationFileInstaller.java +++ b/modules/apps/static/portal-file-install/portal-file-install-impl/src/main/java/com/liferay/portal/file/install/internal/configuration/ConfigurationFileInstaller.java @@ -255,11 +255,7 @@ private boolean _equals( } } - if (oldDictionary.isEmpty()) { - return true; - } - - return false; + return oldDictionary.isEmpty(); } private String _escapeFilterValue(String string) { diff --git a/modules/apps/static/portal-osgi-web/portal-osgi-web-http-servlet-impl/src/main/java/com/liferay/portal/osgi/web/http/servlet/internal/context/LiferayContextController.java b/modules/apps/static/portal-osgi-web/portal-osgi-web-http-servlet-impl/src/main/java/com/liferay/portal/osgi/web/http/servlet/internal/context/LiferayContextController.java index 30704a73e3bc94..752eb1af493c8e 100644 --- a/modules/apps/static/portal-osgi-web/portal-osgi-web-http-servlet-impl/src/main/java/com/liferay/portal/osgi/web/http/servlet/internal/context/LiferayContextController.java +++ b/modules/apps/static/portal-osgi-web/portal-osgi-web-http-servlet-impl/src/main/java/com/liferay/portal/osgi/web/http/servlet/internal/context/LiferayContextController.java @@ -737,14 +737,8 @@ public boolean matches(ServiceReference serviceReference) { HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT); if (contextSelect == null) { - if (_contextName.equals( - HttpWhiteboardConstants. - HTTP_WHITEBOARD_DEFAULT_CONTEXT_NAME)) { - - return true; - } - - return false; + return _contextName.equals( + HttpWhiteboardConstants.HTTP_WHITEBOARD_DEFAULT_CONTEXT_NAME); } if (_contextName.equals(contextSelect)) { diff --git a/modules/apps/static/portal-osgi-web/portal-osgi-web-portlet-container-test/src/testIntegration/java/com/liferay/portal/osgi/web/portlet/container/test/ActionRequestPortletContainerTest.java b/modules/apps/static/portal-osgi-web/portal-osgi-web-portlet-container-test/src/testIntegration/java/com/liferay/portal/osgi/web/portlet/container/test/ActionRequestPortletContainerTest.java index f0da224a0c8307..be28162bf4add4 100644 --- a/modules/apps/static/portal-osgi-web/portal-osgi-web-portlet-container-test/src/testIntegration/java/com/liferay/portal/osgi/web/portlet/container/test/ActionRequestPortletContainerTest.java +++ b/modules/apps/static/portal-osgi-web/portal-osgi-web-portlet-container-test/src/testIntegration/java/com/liferay/portal/osgi/web/portlet/container/test/ActionRequestPortletContainerTest.java @@ -365,11 +365,7 @@ private static class TestSharedSecretTokenWhitelist @Override public boolean isValidSharedSecret(String sharedSecret) { - if (_SHARED_SECRET.equals(sharedSecret)) { - return true; - } - - return false; + return _SHARED_SECRET.equals(sharedSecret); } } diff --git a/modules/apps/static/portal-osgi-web/portal-osgi-web-servlet-context-helper-api/src/main/java/com/liferay/portal/osgi/web/servlet/context/helper/definition/ListenerDefinition.java b/modules/apps/static/portal-osgi-web/portal-osgi-web-servlet-context-helper-api/src/main/java/com/liferay/portal/osgi/web/servlet/context/helper/definition/ListenerDefinition.java index d74d9d2d027d47..fbafa118d97072 100644 --- a/modules/apps/static/portal-osgi-web/portal-osgi-web-servlet-context-helper-api/src/main/java/com/liferay/portal/osgi/web/servlet/context/helper/definition/ListenerDefinition.java +++ b/modules/apps/static/portal-osgi-web/portal-osgi-web-servlet-context-helper-api/src/main/java/com/liferay/portal/osgi/web/servlet/context/helper/definition/ListenerDefinition.java @@ -25,14 +25,9 @@ public boolean equals(Object object) { ListenerDefinition listenerDefinition = (ListenerDefinition)object; - if (Objects.equals( - _eventListener.getClass(), - listenerDefinition._eventListener.getClass())) { - - return true; - } - - return false; + return Objects.equals( + _eventListener.getClass(), + listenerDefinition._eventListener.getClass()); } public EventListener getEventListener() { diff --git a/modules/apps/static/portal-osgi-web/portal-osgi-web-servlet-context-helper-impl/src/main/java/com/liferay/portal/osgi/web/servlet/context/helper/internal/ServletContextHelperRegistrationImpl.java b/modules/apps/static/portal-osgi-web/portal-osgi-web-servlet-context-helper-impl/src/main/java/com/liferay/portal/osgi/web/servlet/context/helper/internal/ServletContextHelperRegistrationImpl.java index dd2017f80621db..05a264100ee057 100644 --- a/modules/apps/static/portal-osgi-web/portal-osgi-web-servlet-context-helper-impl/src/main/java/com/liferay/portal/osgi/web/servlet/context/helper/internal/ServletContextHelperRegistrationImpl.java +++ b/modules/apps/static/portal-osgi-web/portal-osgi-web-servlet-context-helper-impl/src/main/java/com/liferay/portal/osgi/web/servlet/context/helper/internal/ServletContextHelperRegistrationImpl.java @@ -314,11 +314,7 @@ private boolean _contains(String[] array, String classResource) { return false; } - if (classResource.startsWith(array[-index - 2])) { - return true; - } - - return false; + return classResource.startsWith(array[-index - 2]); } private ServiceRegistration _createDefaultServlet() { diff --git a/modules/apps/static/portal-osgi-web/portal-osgi-web-wab-generator-impl/src/main/java/com/liferay/portal/osgi/web/wab/generator/internal/processor/WabProcessor.java b/modules/apps/static/portal-osgi-web/portal-osgi-web-wab-generator-impl/src/main/java/com/liferay/portal/osgi/web/wab/generator/internal/processor/WabProcessor.java index 1e943eb54aac7d..924589fdfbc696 100644 --- a/modules/apps/static/portal-osgi-web/portal-osgi-web-wab-generator-impl/src/main/java/com/liferay/portal/osgi/web/wab/generator/internal/processor/WabProcessor.java +++ b/modules/apps/static/portal-osgi-web/portal-osgi-web-wab-generator-impl/src/main/java/com/liferay/portal/osgi/web/wab/generator/internal/processor/WabProcessor.java @@ -1326,11 +1326,7 @@ private void _processTLDDependencies(Analyzer analyzer) throws IOException { String fileName = file.getName(); - if (fileName.endsWith(".tld")) { - return true; - } - - return false; + return fileName.endsWith(".tld"); }); for (File file : files) { diff --git a/modules/apps/static/portal/portal-upgrade-api/src/main/java/com/liferay/portal/upgrade/release/BaseUpgradeWebModuleRelease.java b/modules/apps/static/portal/portal-upgrade-api/src/main/java/com/liferay/portal/upgrade/release/BaseUpgradeWebModuleRelease.java index 797997849b3d27..dca94224847388 100644 --- a/modules/apps/static/portal/portal-upgrade-api/src/main/java/com/liferay/portal/upgrade/release/BaseUpgradeWebModuleRelease.java +++ b/modules/apps/static/portal/portal-upgrade-api/src/main/java/com/liferay/portal/upgrade/release/BaseUpgradeWebModuleRelease.java @@ -72,11 +72,7 @@ protected boolean hasAnyPortletId( } try (ResultSet resultSet = preparedStatement.executeQuery()) { - if (resultSet.next()) { - return true; - } - - return false; + return resultSet.next(); } } } diff --git a/modules/apps/style-book/style-book-web/src/main/java/com/liferay/style/book/web/internal/configuration/icon/ImportPortletConfigurationIcon.java b/modules/apps/style-book/style-book-web/src/main/java/com/liferay/style/book/web/internal/configuration/icon/ImportPortletConfigurationIcon.java index 4daeff37230c1b..8d57787b7728c9 100644 --- a/modules/apps/style-book/style-book-web/src/main/java/com/liferay/style/book/web/internal/configuration/icon/ImportPortletConfigurationIcon.java +++ b/modules/apps/style-book/style-book-web/src/main/java/com/liferay/style/book/web/internal/configuration/icon/ImportPortletConfigurationIcon.java @@ -72,15 +72,9 @@ public boolean isShow(PortletRequest portletRequest) { ThemeDisplay themeDisplay = (ThemeDisplay)portletRequest.getAttribute( WebKeys.THEME_DISPLAY); - if (_portletResourcePermission.contains( - themeDisplay.getPermissionChecker(), - themeDisplay.getScopeGroup(), - StyleBookActionKeys.MANAGE_STYLE_BOOK_ENTRIES)) { - - return true; - } - - return false; + return _portletResourcePermission.contains( + themeDisplay.getPermissionChecker(), themeDisplay.getScopeGroup(), + StyleBookActionKeys.MANAGE_STYLE_BOOK_ENTRIES); } @Override diff --git a/modules/apps/style-book/style-book-web/src/main/java/com/liferay/style/book/web/internal/display/context/StyleBookDisplayContext.java b/modules/apps/style-book/style-book-web/src/main/java/com/liferay/style/book/web/internal/display/context/StyleBookDisplayContext.java index 507e887f58b423..4d4bbdc564e168 100644 --- a/modules/apps/style-book/style-book-web/src/main/java/com/liferay/style/book/web/internal/display/context/StyleBookDisplayContext.java +++ b/modules/apps/style-book/style-book-web/src/main/java/com/liferay/style/book/web/internal/display/context/StyleBookDisplayContext.java @@ -222,11 +222,7 @@ private StyleBookEntry _getStyleFromThemeStyleBookEntry(long groupId) { } private boolean _isSearch() { - if (Validator.isNotNull(_getKeywords())) { - return true; - } - - return false; + return Validator.isNotNull(_getKeywords()); } private final HttpServletRequest _httpServletRequest; diff --git a/modules/apps/style-book/style-book-web/src/main/java/com/liferay/style/book/web/internal/display/context/StyleBookManagementToolbarDisplayContext.java b/modules/apps/style-book/style-book-web/src/main/java/com/liferay/style/book/web/internal/display/context/StyleBookManagementToolbarDisplayContext.java index 1ff8365e989d00..4f8c07cf556902 100644 --- a/modules/apps/style-book/style-book-web/src/main/java/com/liferay/style/book/web/internal/display/context/StyleBookManagementToolbarDisplayContext.java +++ b/modules/apps/style-book/style-book-web/src/main/java/com/liferay/style/book/web/internal/display/context/StyleBookManagementToolbarDisplayContext.java @@ -197,15 +197,10 @@ public Boolean isDisabled() { @Override public Boolean isShowCreationMenu() { - if (StyleBookPermission.contains( - _themeDisplay.getPermissionChecker(), - _themeDisplay.getScopeGroupId(), - StyleBookActionKeys.MANAGE_STYLE_BOOK_ENTRIES)) { - - return true; - } - - return false; + return StyleBookPermission.contains( + _themeDisplay.getPermissionChecker(), + _themeDisplay.getScopeGroupId(), + StyleBookActionKeys.MANAGE_STYLE_BOOK_ENTRIES); } @Override diff --git a/modules/apps/style-book/style-book-web/src/main/java/com/liferay/style/book/web/internal/zip/processor/StyleBookEntryZipProcessorImpl.java b/modules/apps/style-book/style-book-web/src/main/java/com/liferay/style/book/web/internal/zip/processor/StyleBookEntryZipProcessorImpl.java index e22b5d5d0ebcb7..6bc6d58be028f5 100644 --- a/modules/apps/style-book/style-book-web/src/main/java/com/liferay/style/book/web/internal/zip/processor/StyleBookEntryZipProcessorImpl.java +++ b/modules/apps/style-book/style-book-web/src/main/java/com/liferay/style/book/web/internal/zip/processor/StyleBookEntryZipProcessorImpl.java @@ -369,11 +369,7 @@ private void _importStyleBookEntries( } private boolean _isStyleBookEntry(String fileName) { - if (Objects.equals(_getFileName(fileName), "style-book.json")) { - return true; - } - - return false; + return Objects.equals(_getFileName(fileName), "style-book.json"); } @Reference diff --git a/modules/apps/translation/translation-service/src/main/java/com/liferay/translation/internal/security/permission/resource/TranslationEntryModelResourcePermission.java b/modules/apps/translation/translation-service/src/main/java/com/liferay/translation/internal/security/permission/resource/TranslationEntryModelResourcePermission.java index 6cc43c1ff31b00..2c9c523b10f230 100644 --- a/modules/apps/translation/translation-service/src/main/java/com/liferay/translation/internal/security/permission/resource/TranslationEntryModelResourcePermission.java +++ b/modules/apps/translation/translation-service/src/main/java/com/liferay/translation/internal/security/permission/resource/TranslationEntryModelResourcePermission.java @@ -94,14 +94,9 @@ public boolean contains( TranslationConstants.RESOURCE_NAME + "." + translationEntry.getLanguageId(); - if (permissionChecker.hasPermission( - translationEntry.getGroupId(), name, name, - TranslationActionKeys.TRANSLATE)) { - - return true; - } - - return false; + return permissionChecker.hasPermission( + translationEntry.getGroupId(), name, name, + TranslationActionKeys.TRANSLATE); } @Override diff --git a/modules/apps/translation/translation-web/src/main/java/com/liferay/translation/web/internal/display/context/TranslateDisplayContext.java b/modules/apps/translation/translation-web/src/main/java/com/liferay/translation/web/internal/display/context/TranslateDisplayContext.java index fa291cfc520b2d..f85753f924bb9e 100644 --- a/modules/apps/translation/translation-web/src/main/java/com/liferay/translation/web/internal/display/context/TranslateDisplayContext.java +++ b/modules/apps/translation/translation-web/src/main/java/com/liferay/translation/web/internal/display/context/TranslateDisplayContext.java @@ -420,11 +420,7 @@ public PortletURL getUpdateTranslationPortletURL() { } public boolean hasTranslationPermission() { - if (_isAvailableTargetLanguageIdsEmpty()) { - return false; - } - - return true; + return !_isAvailableTargetLanguageIdsEmpty(); } public boolean isAutoTranslateEnabled() throws PortalException { @@ -565,11 +561,7 @@ private TranslationEntry _getTranslationEntry() { } private boolean _isAvailableTargetLanguageIdsEmpty() { - if (_availableTargetLanguageIds.isEmpty()) { - return true; - } - - return false; + return _availableTargetLanguageIds.isEmpty(); } private final List _availableSourceLanguageIds; diff --git a/modules/apps/trash/trash-service/src/main/java/com/liferay/trash/internal/TrashHelperImpl.java b/modules/apps/trash/trash-service/src/main/java/com/liferay/trash/internal/TrashHelperImpl.java index d28b5878e57e8c..6c2932d5af88a7 100644 --- a/modules/apps/trash/trash-service/src/main/java/com/liferay/trash/internal/TrashHelperImpl.java +++ b/modules/apps/trash/trash-service/src/main/java/com/liferay/trash/internal/TrashHelperImpl.java @@ -390,11 +390,7 @@ private String _getTrashTitle(long trashEntryId, String prefix) { } private boolean _isValidTrashTitle(String title, String prefix) { - if (title.startsWith(prefix)) { - return true; - } - - return false; + return title.startsWith(prefix); } private static final String _TRASH_PREFIX = StringPool.SLASH; diff --git a/modules/apps/trash/trash-test-util/src/main/java/com/liferay/trash/test/util/BaseTrashHandlerTestCase.java b/modules/apps/trash/trash-test-util/src/main/java/com/liferay/trash/test/util/BaseTrashHandlerTestCase.java index cf9b39e716c2a7..5452fc7b0a67ce 100644 --- a/modules/apps/trash/trash-test-util/src/main/java/com/liferay/trash/test/util/BaseTrashHandlerTestCase.java +++ b/modules/apps/trash/trash-test-util/src/main/java/com/liferay/trash/test/util/BaseTrashHandlerTestCase.java @@ -3402,11 +3402,7 @@ protected boolean isInTrashContainer(ClassedModel classedModel) protected abstract boolean isInTrashContainer(TrashedModel trashedModel); protected boolean isValidTrashTitle(String title) { - if (title.startsWith(_TRASH_PREFIX)) { - return true; - } - - return false; + return title.startsWith(_TRASH_PREFIX); } protected abstract void moveBaseModelToTrash(long primaryKey) diff --git a/modules/apps/trash/trash-web/src/main/java/com/liferay/trash/web/internal/display/context/TrashDisplayContext.java b/modules/apps/trash/trash-web/src/main/java/com/liferay/trash/web/internal/display/context/TrashDisplayContext.java index 6229b785670017..94252f967a1c33 100644 --- a/modules/apps/trash/trash-web/src/main/java/com/liferay/trash/web/internal/display/context/TrashDisplayContext.java +++ b/modules/apps/trash/trash-web/src/main/java/com/liferay/trash/web/internal/display/context/TrashDisplayContext.java @@ -567,35 +567,19 @@ public boolean isApproximate() { } public boolean isDescriptiveView() { - if (Objects.equals(getDisplayStyle(), "descriptive")) { - return true; - } - - return false; + return Objects.equals(getDisplayStyle(), "descriptive"); } public boolean isIconView() { - if (Objects.equals(getDisplayStyle(), "icon")) { - return true; - } - - return false; + return Objects.equals(getDisplayStyle(), "icon"); } public boolean isListView() { - if (Objects.equals(getDisplayStyle(), "list")) { - return true; - } - - return false; + return Objects.equals(getDisplayStyle(), "list"); } public boolean isSearch() { - if (Validator.isNotNull(getKeywords())) { - return true; - } - - return false; + return Validator.isNotNull(getKeywords()); } private List _getBreadcrumbEntries( diff --git a/modules/apps/trash/trash-web/src/main/java/com/liferay/trash/web/internal/portlet/configuration/icon/EmptyTrashPortletConfigurationIcon.java b/modules/apps/trash/trash-web/src/main/java/com/liferay/trash/web/internal/portlet/configuration/icon/EmptyTrashPortletConfigurationIcon.java index bead8998a8387c..e8409a84e825fe 100644 --- a/modules/apps/trash/trash-web/src/main/java/com/liferay/trash/web/internal/portlet/configuration/icon/EmptyTrashPortletConfigurationIcon.java +++ b/modules/apps/trash/trash-web/src/main/java/com/liferay/trash/web/internal/portlet/configuration/icon/EmptyTrashPortletConfigurationIcon.java @@ -80,11 +80,7 @@ public boolean isShow(PortletRequest portletRequest) { String keywords = ParamUtil.getString(portletRequest, "keywords"); - if (Validator.isNotNull(keywords)) { - return false; - } - - return true; + return !Validator.isNotNull(keywords); } @Override diff --git a/modules/apps/user-associated-data/user-associated-data-api/src/main/java/com/liferay/user/associated/data/display/BaseModelUADDisplay.java b/modules/apps/user-associated-data/user-associated-data-api/src/main/java/com/liferay/user/associated/data/display/BaseModelUADDisplay.java index edadf902c094ae..1150da0a13e138 100644 --- a/modules/apps/user-associated-data/user-associated-data-api/src/main/java/com/liferay/user/associated/data/display/BaseModelUADDisplay.java +++ b/modules/apps/user-associated-data/user-associated-data-api/src/main/java/com/liferay/user/associated/data/display/BaseModelUADDisplay.java @@ -111,11 +111,7 @@ public boolean isInTrash(T t) @Override public boolean isSiteScoped() { - if (GroupedModel.class.isAssignableFrom(getTypeClass())) { - return true; - } - - return false; + return GroupedModel.class.isAssignableFrom(getTypeClass()); } @Override diff --git a/modules/apps/user-associated-data/user-associated-data-web/src/main/java/com/liferay/user/associated/data/web/internal/display/context/ViewUADEntitiesManagementToolbarDisplayContext.java b/modules/apps/user-associated-data/user-associated-data-web/src/main/java/com/liferay/user/associated/data/web/internal/display/context/ViewUADEntitiesManagementToolbarDisplayContext.java index 639c6be249627a..5c5594f73d2b6b 100644 --- a/modules/apps/user-associated-data/user-associated-data-web/src/main/java/com/liferay/user/associated/data/web/internal/display/context/ViewUADEntitiesManagementToolbarDisplayContext.java +++ b/modules/apps/user-associated-data/user-associated-data-web/src/main/java/com/liferay/user/associated/data/web/internal/display/context/ViewUADEntitiesManagementToolbarDisplayContext.java @@ -99,11 +99,7 @@ public String getSearchActionURL() { public Boolean isShowInfoButton() { String applicationKey = _viewUADEntitiesDisplay.getApplicationKey(); - if (applicationKey.equals(UADConstants.ALL_APPLICATIONS)) { - return false; - } - - return true; + return !applicationKey.equals(UADConstants.ALL_APPLICATIONS); } @Override diff --git a/modules/apps/user-associated-data/user-associated-data-web/src/main/java/com/liferay/user/associated/data/web/internal/user/action/contributor/ErasePersonalDataUserActionContributor.java b/modules/apps/user-associated-data/user-associated-data-web/src/main/java/com/liferay/user/associated/data/web/internal/user/action/contributor/ErasePersonalDataUserActionContributor.java index acf53be671e77a..c94360a8cbd7c6 100644 --- a/modules/apps/user-associated-data/user-associated-data-web/src/main/java/com/liferay/user/associated/data/web/internal/user/action/contributor/ErasePersonalDataUserActionContributor.java +++ b/modules/apps/user-associated-data/user-associated-data-web/src/main/java/com/liferay/user/associated/data/web/internal/user/action/contributor/ErasePersonalDataUserActionContributor.java @@ -54,11 +54,7 @@ public String getURL( @Override public boolean isShowConfirmationMessage(User selUser) { - if (selUser.isActive()) { - return true; - } - - return false; + return selUser.isActive(); } @Override diff --git a/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/frontend/taglib/servlet/taglib/UserMembershipsScreenNavigationEntry.java b/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/frontend/taglib/servlet/taglib/UserMembershipsScreenNavigationEntry.java index e5c258ba6b1322..8e086d8f622fff 100644 --- a/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/frontend/taglib/servlet/taglib/UserMembershipsScreenNavigationEntry.java +++ b/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/frontend/taglib/servlet/taglib/UserMembershipsScreenNavigationEntry.java @@ -69,16 +69,11 @@ public boolean isEditable( PortletDisplay portletDisplay = themeDisplay.getPortletDisplay(); - if (Objects.equals( - portletDisplay.getPortletName(), - PortletProviderUtil.getPortletId( - PortalMyAccountApplicationType.MyAccount.CLASS_NAME, - PortletProvider.Action.VIEW))) { - - return false; - } - - return true; + return !Objects.equals( + portletDisplay.getPortletName(), + PortletProviderUtil.getPortletId( + PortalMyAccountApplicationType.MyAccount.CLASS_NAME, + PortletProvider.Action.VIEW)); } @Override diff --git a/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/frontend/taglib/servlet/taglib/UserOrganizationsScreenNavigationEntry.java b/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/frontend/taglib/servlet/taglib/UserOrganizationsScreenNavigationEntry.java index aa4028fea0b94d..48ca4017858de3 100644 --- a/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/frontend/taglib/servlet/taglib/UserOrganizationsScreenNavigationEntry.java +++ b/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/frontend/taglib/servlet/taglib/UserOrganizationsScreenNavigationEntry.java @@ -71,11 +71,7 @@ public boolean isEditable( PortalMyAccountApplicationType.MyAccount.CLASS_NAME, PortletProvider.Action.VIEW); - if (myAccountPortletId.equals(portletDisplay.getPortletName())) { - return false; - } - - return true; + return !myAccountPortletId.equals(portletDisplay.getPortletName()); } @Override diff --git a/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/frontend/taglib/servlet/taglib/UserProfileAndDashboardScreenNavigationEntry.java b/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/frontend/taglib/servlet/taglib/UserProfileAndDashboardScreenNavigationEntry.java index 3f50f7be43e4bd..7ba76b1bec7410 100644 --- a/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/frontend/taglib/servlet/taglib/UserProfileAndDashboardScreenNavigationEntry.java +++ b/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/frontend/taglib/servlet/taglib/UserProfileAndDashboardScreenNavigationEntry.java @@ -66,11 +66,7 @@ public boolean isVisible(User user, User selUser) { PortalMyAccountApplicationType.MyAccount.CLASS_NAME, PortletProvider.Action.VIEW); - if (myAccountPortletId.equals(portletDisplay.getPortletName())) { - return false; - } - - return true; + return !myAccountPortletId.equals(portletDisplay.getPortletName()); } } \ No newline at end of file diff --git a/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/frontend/taglib/servlet/taglib/UserRolesScreenNavigationEntry.java b/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/frontend/taglib/servlet/taglib/UserRolesScreenNavigationEntry.java index a5ebdcfb85d299..db445c5ba775ca 100644 --- a/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/frontend/taglib/servlet/taglib/UserRolesScreenNavigationEntry.java +++ b/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/frontend/taglib/servlet/taglib/UserRolesScreenNavigationEntry.java @@ -65,16 +65,11 @@ public boolean isEditable( PortletDisplay portletDisplay = themeDisplay.getPortletDisplay(); - if (Objects.equals( - portletDisplay.getPortletName(), - PortletProviderUtil.getPortletId( - PortalMyAccountApplicationType.MyAccount.CLASS_NAME, - PortletProvider.Action.VIEW))) { - - return false; - } - - return true; + return !Objects.equals( + portletDisplay.getPortletName(), + PortletProviderUtil.getPortletId( + PortalMyAccountApplicationType.MyAccount.CLASS_NAME, + PortletProvider.Action.VIEW)); } @Override diff --git a/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/product/navigation/personal/menu/MyDashboardPersonalMenuEntry.java b/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/product/navigation/personal/menu/MyDashboardPersonalMenuEntry.java index 02106a7a673c09..caf8bf3f864ac7 100644 --- a/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/product/navigation/personal/menu/MyDashboardPersonalMenuEntry.java +++ b/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/product/navigation/personal/menu/MyDashboardPersonalMenuEntry.java @@ -78,11 +78,7 @@ public boolean isActive(PortletRequest portletRequest, String portletId) User user = themeDisplay.getUser(); - if (displayURL.startsWith(user.getDisplayURL(themeDisplay, true))) { - return true; - } - - return false; + return displayURL.startsWith(user.getDisplayURL(themeDisplay, true)); } @Override diff --git a/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/product/navigation/personal/menu/MyProfilePersonalMenuEntry.java b/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/product/navigation/personal/menu/MyProfilePersonalMenuEntry.java index cc220bd6396098..2b9b67703679e7 100644 --- a/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/product/navigation/personal/menu/MyProfilePersonalMenuEntry.java +++ b/modules/apps/users-admin/users-admin-web/src/main/java/com/liferay/users/admin/web/internal/product/navigation/personal/menu/MyProfilePersonalMenuEntry.java @@ -78,11 +78,7 @@ public boolean isActive(PortletRequest portletRequest, String portletId) User user = themeDisplay.getUser(); - if (displayURL.startsWith(user.getDisplayURL(themeDisplay, false))) { - return true; - } - - return false; + return displayURL.startsWith(user.getDisplayURL(themeDisplay, false)); } @Override diff --git a/modules/core/petra/petra-memory/src/main/java/com/liferay/petra/memory/EqualitySoftReference.java b/modules/core/petra/petra-memory/src/main/java/com/liferay/petra/memory/EqualitySoftReference.java index bbb622651ff806..2333f91dca23d6 100644 --- a/modules/core/petra/petra-memory/src/main/java/com/liferay/petra/memory/EqualitySoftReference.java +++ b/modules/core/petra/petra-memory/src/main/java/com/liferay/petra/memory/EqualitySoftReference.java @@ -42,11 +42,7 @@ public boolean equals(Object object) { EqualitySoftReference equalitySoftReference = (EqualitySoftReference)object; - if (Objects.equals(get(), equalitySoftReference.get())) { - return true; - } - - return false; + return Objects.equals(get(), equalitySoftReference.get()); } @Override diff --git a/modules/core/petra/petra-memory/src/main/java/com/liferay/petra/memory/EqualityWeakReference.java b/modules/core/petra/petra-memory/src/main/java/com/liferay/petra/memory/EqualityWeakReference.java index 40826b04ffa295..90b840c91bf5ee 100644 --- a/modules/core/petra/petra-memory/src/main/java/com/liferay/petra/memory/EqualityWeakReference.java +++ b/modules/core/petra/petra-memory/src/main/java/com/liferay/petra/memory/EqualityWeakReference.java @@ -42,11 +42,7 @@ public boolean equals(Object object) { EqualityWeakReference equalityWeakReference = (EqualityWeakReference)object; - if (Objects.equals(get(), equalityWeakReference.get())) { - return true; - } - - return false; + return Objects.equals(get(), equalityWeakReference.get()); } @Override diff --git a/modules/core/petra/petra-process/src/main/java/com/liferay/petra/process/PathHolder.java b/modules/core/petra/petra-process/src/main/java/com/liferay/petra/process/PathHolder.java index ced030a790a987..1d21c2864593ab 100644 --- a/modules/core/petra/petra-process/src/main/java/com/liferay/petra/process/PathHolder.java +++ b/modules/core/petra/petra-process/src/main/java/com/liferay/petra/process/PathHolder.java @@ -38,11 +38,7 @@ public boolean equals(Object object) { PathHolder pathHolder = (PathHolder)object; - if (Objects.equals(toString(), pathHolder.toString())) { - return true; - } - - return false; + return Objects.equals(toString(), pathHolder.toString()); } public Path getPath() { diff --git a/modules/core/petra/petra-url-pattern-mapper/src/main/java/com/liferay/petra/url/pattern/mapper/internal/DynamicSizeTrieURLPatternMapper.java b/modules/core/petra/petra-url-pattern-mapper/src/main/java/com/liferay/petra/url/pattern/mapper/internal/DynamicSizeTrieURLPatternMapper.java index 8517f1bf53524a..7772a30f02b7a7 100644 --- a/modules/core/petra/petra-url-pattern-mapper/src/main/java/com/liferay/petra/url/pattern/mapper/internal/DynamicSizeTrieURLPatternMapper.java +++ b/modules/core/petra/petra-url-pattern-mapper/src/main/java/com/liferay/petra/url/pattern/mapper/internal/DynamicSizeTrieURLPatternMapper.java @@ -247,11 +247,7 @@ public T getValue() { } public boolean isEnd() { - if (Objects.nonNull(_value)) { - return true; - } - - return false; + return Objects.nonNull(_value); } public TrieNode setNextTrieNode(char character, TrieNode nextTrieNode) { diff --git a/modules/core/portal-web/src/test/java/com/liferay/portal/web/internal/session/replication/SessionReplicationHttpSessionWrapperTestValue.java b/modules/core/portal-web/src/test/java/com/liferay/portal/web/internal/session/replication/SessionReplicationHttpSessionWrapperTestValue.java index 599157844e1b21..4a7b60a90681fe 100644 --- a/modules/core/portal-web/src/test/java/com/liferay/portal/web/internal/session/replication/SessionReplicationHttpSessionWrapperTestValue.java +++ b/modules/core/portal-web/src/test/java/com/liferay/portal/web/internal/session/replication/SessionReplicationHttpSessionWrapperTestValue.java @@ -35,13 +35,8 @@ public boolean equals(Object object) { sessionReplicationHttpSessionWrapperTestValue = (SessionReplicationHttpSessionWrapperTestValue)object; - if (Objects.equals( - _value, sessionReplicationHttpSessionWrapperTestValue._value)) { - - return true; - } - - return false; + return Objects.equals( + _value, sessionReplicationHttpSessionWrapperTestValue._value); } public String getValue() { diff --git a/modules/dxp/apps/akismet/akismet-service/src/main/java/com/liferay/akismet/internal/client/AkismetClientImpl.java b/modules/dxp/apps/akismet/akismet-service/src/main/java/com/liferay/akismet/internal/client/AkismetClientImpl.java index 38082168556cc5..4a82ac14146d1c 100644 --- a/modules/dxp/apps/akismet/akismet-service/src/main/java/com/liferay/akismet/internal/client/AkismetClientImpl.java +++ b/modules/dxp/apps/akismet/akismet-service/src/main/java/com/liferay/akismet/internal/client/AkismetClientImpl.java @@ -215,11 +215,7 @@ public boolean verifyApiKey(long companyId, String apiKey) "key", apiKey ).build()); - if (response.equals("valid")) { - return true; - } - - return false; + return response.equals("valid"); } @Activate diff --git a/modules/dxp/apps/analytics/analytics-reports-layout-impl/src/main/java/com/liferay/analytics/reports/layout/internal/info/item/LayoutAnalyticsReportsInfoItem.java b/modules/dxp/apps/analytics/analytics-reports-layout-impl/src/main/java/com/liferay/analytics/reports/layout/internal/info/item/LayoutAnalyticsReportsInfoItem.java index 7d4157bc6395ab..ed0f3a91599daa 100644 --- a/modules/dxp/apps/analytics/analytics-reports-layout-impl/src/main/java/com/liferay/analytics/reports/layout/internal/info/item/LayoutAnalyticsReportsInfoItem.java +++ b/modules/dxp/apps/analytics/analytics-reports-layout-impl/src/main/java/com/liferay/analytics/reports/layout/internal/info/item/LayoutAnalyticsReportsInfoItem.java @@ -193,13 +193,8 @@ private boolean _hasEditPermission( Layout layout, PermissionChecker permissionChecker) throws PortalException { - if (!LayoutPermissionUtil.containsLayoutRestrictedUpdatePermission( - permissionChecker, layout)) { - - return false; - } - - return true; + return LayoutPermissionUtil.containsLayoutRestrictedUpdatePermission( + permissionChecker, layout); } private static final Log _log = LogFactoryUtil.getLog( diff --git a/modules/dxp/apps/commerce-avalara/commerce-avalara-tax-engine-fixed-web/src/main/java/com/liferay/commerce/avalara/tax/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodAvalaraRateRelsScreenNavigationEntry.java b/modules/dxp/apps/commerce-avalara/commerce-avalara-tax-engine-fixed-web/src/main/java/com/liferay/commerce/avalara/tax/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodAvalaraRateRelsScreenNavigationEntry.java index 996fbc2306c254..20784aa5353721 100644 --- a/modules/dxp/apps/commerce-avalara/commerce-avalara-tax-engine-fixed-web/src/main/java/com/liferay/commerce/avalara/tax/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodAvalaraRateRelsScreenNavigationEntry.java +++ b/modules/dxp/apps/commerce-avalara/commerce-avalara-tax-engine-fixed-web/src/main/java/com/liferay/commerce/avalara/tax/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodAvalaraRateRelsScreenNavigationEntry.java @@ -55,11 +55,7 @@ public boolean isVisible(User user, CommerceTaxMethod commerceTaxMethod) { String engineKey = commerceTaxMethod.getEngineKey(); - if (engineKey.equals("avalara")) { - return true; - } - - return false; + return engineKey.equals("avalara"); } @Override diff --git a/modules/dxp/apps/commerce-avalara/commerce-avalara-tax-engine-fixed-web/src/main/java/com/liferay/commerce/avalara/tax/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodAvalaraScreenNavigationEntry.java b/modules/dxp/apps/commerce-avalara/commerce-avalara-tax-engine-fixed-web/src/main/java/com/liferay/commerce/avalara/tax/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodAvalaraScreenNavigationEntry.java index 5af6351aeefa76..88aea4d4afeac4 100644 --- a/modules/dxp/apps/commerce-avalara/commerce-avalara-tax-engine-fixed-web/src/main/java/com/liferay/commerce/avalara/tax/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodAvalaraScreenNavigationEntry.java +++ b/modules/dxp/apps/commerce-avalara/commerce-avalara-tax-engine-fixed-web/src/main/java/com/liferay/commerce/avalara/tax/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodAvalaraScreenNavigationEntry.java @@ -59,11 +59,7 @@ public boolean isVisible(User user, CommerceTaxMethod commerceTaxMethod) { String engineKey = commerceTaxMethod.getEngineKey(); - if (engineKey.equals("avalara")) { - return true; - } - - return false; + return engineKey.equals("avalara"); } @Override diff --git a/modules/dxp/apps/commerce/commerce-shop-by-diagram-web/src/main/java/com/liferay/commerce/shop/by/diagram/web/internal/frontend/taglib/servlet/taglib/CSDiagramCPTypeScreenNavigationEntry.java b/modules/dxp/apps/commerce/commerce-shop-by-diagram-web/src/main/java/com/liferay/commerce/shop/by/diagram/web/internal/frontend/taglib/servlet/taglib/CSDiagramCPTypeScreenNavigationEntry.java index 95bb542274f51e..55ac4e214f51de 100644 --- a/modules/dxp/apps/commerce/commerce-shop-by-diagram-web/src/main/java/com/liferay/commerce/shop/by/diagram/web/internal/frontend/taglib/servlet/taglib/CSDiagramCPTypeScreenNavigationEntry.java +++ b/modules/dxp/apps/commerce/commerce-shop-by-diagram-web/src/main/java/com/liferay/commerce/shop/by/diagram/web/internal/frontend/taglib/servlet/taglib/CSDiagramCPTypeScreenNavigationEntry.java @@ -55,13 +55,8 @@ public boolean isVisible(User user, CPDefinition cpDefinition) { return false; } - if (CSDiagramCPTypeConstants.NAME.equals( - cpDefinition.getProductTypeName())) { - - return true; - } - - return false; + return CSDiagramCPTypeConstants.NAME.equals( + cpDefinition.getProductTypeName()); } @Override diff --git a/modules/dxp/apps/document-library-opener/document-library-opener-onedrive-web/src/main/java/com/liferay/document/library/opener/onedrive/web/internal/oauth/AccessToken.java b/modules/dxp/apps/document-library-opener/document-library-opener-onedrive-web/src/main/java/com/liferay/document/library/opener/onedrive/web/internal/oauth/AccessToken.java index 20dd6a783b0dc7..5c49125caebe24 100644 --- a/modules/dxp/apps/document-library-opener/document-library-opener-onedrive-web/src/main/java/com/liferay/document/library/opener/onedrive/web/internal/oauth/AccessToken.java +++ b/modules/dxp/apps/document-library-opener/document-library-opener-onedrive-web/src/main/java/com/liferay/document/library/opener/onedrive/web/internal/oauth/AccessToken.java @@ -47,11 +47,7 @@ public String getRefreshToken() { public boolean isValid() { LocalDateTime localDateTime = LocalDateTime.now(); - if (localDateTime.isBefore(_expirationLocalDateTime)) { - return true; - } - - return false; + return localDateTime.isBefore(_expirationLocalDateTime); } private final LocalDateTime _expirationLocalDateTime; diff --git a/modules/dxp/apps/multi-factor-authentication/multi-factor-authentication-email-otp-web/src/main/java/com/liferay/multi/factor/authentication/email/otp/web/internal/checker/EmailOTPBrowserMFAChecker.java b/modules/dxp/apps/multi-factor-authentication/multi-factor-authentication-email-otp-web/src/main/java/com/liferay/multi/factor/authentication/email/otp/web/internal/checker/EmailOTPBrowserMFAChecker.java index e5c8b8ef4b2e88..5d31272cf8dc31 100644 --- a/modules/dxp/apps/multi-factor-authentication/multi-factor-authentication-email-otp-web/src/main/java/com/liferay/multi/factor/authentication/email/otp/web/internal/checker/EmailOTPBrowserMFAChecker.java +++ b/modules/dxp/apps/multi-factor-authentication/multi-factor-authentication-email-otp-web/src/main/java/com/liferay/multi/factor/authentication/email/otp/web/internal/checker/EmailOTPBrowserMFAChecker.java @@ -130,11 +130,7 @@ public boolean isBrowserVerified( HttpSession httpSession = originalHttpServletRequest.getSession(false); - if (_isVerified(httpSession, userId)) { - return true; - } - - return false; + return _isVerified(httpSession, userId); } @Override diff --git a/modules/dxp/apps/multi-factor-authentication/multi-factor-authentication-fido2-web/src/main/java/com/liferay/multi/factor/authentication/fido2/web/internal/checker/FIDO2BrowserSetupMFAChecker.java b/modules/dxp/apps/multi-factor-authentication/multi-factor-authentication-fido2-web/src/main/java/com/liferay/multi/factor/authentication/fido2/web/internal/checker/FIDO2BrowserSetupMFAChecker.java index 34e44a83b08059..6c30841e13d6f8 100644 --- a/modules/dxp/apps/multi-factor-authentication/multi-factor-authentication-fido2-web/src/main/java/com/liferay/multi/factor/authentication/fido2/web/internal/checker/FIDO2BrowserSetupMFAChecker.java +++ b/modules/dxp/apps/multi-factor-authentication/multi-factor-authentication-fido2-web/src/main/java/com/liferay/multi/factor/authentication/fido2/web/internal/checker/FIDO2BrowserSetupMFAChecker.java @@ -154,11 +154,7 @@ public boolean isAvailable(long userId) { _mfaFIDO2CredentialEntryLocalService. getMFAFIDO2CredentialEntriesByUserId(userId); - if (!mfaFIDO2CredentialEntries.isEmpty()) { - return true; - } - - return false; + return !mfaFIDO2CredentialEntries.isEmpty(); } @Override @@ -168,11 +164,8 @@ public boolean isBrowserVerified( HttpServletRequest originalHttpServletRequest = _portal.getOriginalServletRequest(httpServletRequest); - if (_isVerified(originalHttpServletRequest.getSession(false), userId)) { - return true; - } - - return false; + return _isVerified( + originalHttpServletRequest.getSession(false), userId); } @Override diff --git a/modules/dxp/apps/multi-factor-authentication/multi-factor-authentication-timebased-otp-web/src/main/java/com/liferay/multi/factor/authentication/timebased/otp/web/internal/checker/TimeBasedOTPBrowserSetupMFAChecker.java b/modules/dxp/apps/multi-factor-authentication/multi-factor-authentication-timebased-otp-web/src/main/java/com/liferay/multi/factor/authentication/timebased/otp/web/internal/checker/TimeBasedOTPBrowserSetupMFAChecker.java index a4a3aa1e004ae4..b6e0467a493fa7 100755 --- a/modules/dxp/apps/multi-factor-authentication/multi-factor-authentication-timebased-otp-web/src/main/java/com/liferay/multi/factor/authentication/timebased/otp/web/internal/checker/TimeBasedOTPBrowserSetupMFAChecker.java +++ b/modules/dxp/apps/multi-factor-authentication/multi-factor-authentication-timebased-otp-web/src/main/java/com/liferay/multi/factor/authentication/timebased/otp/web/internal/checker/TimeBasedOTPBrowserSetupMFAChecker.java @@ -167,11 +167,7 @@ public boolean isBrowserVerified( HttpSession httpSession = originalHttpServletRequest.getSession(false); - if (_isVerified(httpSession, userId)) { - return true; - } - - return false; + return _isVerified(httpSession, userId); } @Override diff --git a/modules/dxp/apps/osb/osb-faro/osb-faro-admin-web/src/main/java/com/liferay/osb/faro/admin/web/internal/display/context/FaroAdminDisplayContext.java b/modules/dxp/apps/osb/osb-faro/osb-faro-admin-web/src/main/java/com/liferay/osb/faro/admin/web/internal/display/context/FaroAdminDisplayContext.java index ebe7ac8206ebf8..bd5f452526f9f0 100644 --- a/modules/dxp/apps/osb/osb-faro/osb-faro-admin-web/src/main/java/com/liferay/osb/faro/admin/web/internal/display/context/FaroAdminDisplayContext.java +++ b/modules/dxp/apps/osb/osb-faro/osb-faro-admin-web/src/main/java/com/liferay/osb/faro/admin/web/internal/display/context/FaroAdminDisplayContext.java @@ -247,59 +247,31 @@ private String _getOrderByType() { } private boolean _isBasic() { - if (StringUtil.equals(_getNavigation(), "basic")) { - return true; - } - - return false; + return StringUtil.equals(_getNavigation(), "basic"); } private boolean _isBusiness() { - if (StringUtil.equals(_getNavigation(), "business")) { - return true; - } - - return false; + return StringUtil.equals(_getNavigation(), "business"); } private boolean _isEnterprise() { - if (StringUtil.equals(_getNavigation(), "enterprise")) { - return true; - } - - return false; + return StringUtil.equals(_getNavigation(), "enterprise"); } private boolean _isInactive() { - if (StringUtil.equals(_getNavigation(), "inactive")) { - return true; - } - - return false; + return StringUtil.equals(_getNavigation(), "inactive"); } private boolean _isNavigationUsageLimitApproaching() { - if (StringUtil.equals(_getNavigation(), "usage-limit-approaching")) { - return true; - } - - return false; + return StringUtil.equals(_getNavigation(), "usage-limit-approaching"); } private boolean _isNavigationUsageLimitExceeded() { - if (StringUtil.equals(_getNavigation(), "usage-limit-exceeded")) { - return true; - } - - return false; + return StringUtil.equals(_getNavigation(), "usage-limit-exceeded"); } private boolean _isOffline() { - if (StringUtil.equals(_getNavigation(), "offline")) { - return true; - } - - return false; + return StringUtil.equals(_getNavigation(), "offline"); } private final HttpServletRequest _httpServletRequest; diff --git a/modules/dxp/apps/osb/osb-faro/osb-faro-engine-client/src/main/java/com/liferay/osb/faro/engine/client/model/AsahProject.java b/modules/dxp/apps/osb/osb-faro/osb-faro-engine-client/src/main/java/com/liferay/osb/faro/engine/client/model/AsahProject.java index 2ebae9764c512d..93e73407d05a2a 100644 --- a/modules/dxp/apps/osb/osb-faro/osb-faro-engine-client/src/main/java/com/liferay/osb/faro/engine/client/model/AsahProject.java +++ b/modules/dxp/apps/osb/osb-faro/osb-faro-engine-client/src/main/java/com/liferay/osb/faro/engine/client/model/AsahProject.java @@ -31,11 +31,7 @@ public boolean equals(Object object) { AsahProject project = (AsahProject)object; - if (Objects.equals(_id, project._id)) { - return true; - } - - return false; + return Objects.equals(_id, project._id); } public String getId() { diff --git a/modules/dxp/apps/osb/osb-faro/osb-faro-service/src/main/java/com/liferay/osb/faro/model/impl/FaroProjectImpl.java b/modules/dxp/apps/osb/osb-faro/osb-faro-service/src/main/java/com/liferay/osb/faro/model/impl/FaroProjectImpl.java index b0334a418aea42..fe686dfe034ac7 100644 --- a/modules/dxp/apps/osb/osb-faro/osb-faro-service/src/main/java/com/liferay/osb/faro/model/impl/FaroProjectImpl.java +++ b/modules/dxp/apps/osb/osb-faro/osb-faro-service/src/main/java/com/liferay/osb/faro/model/impl/FaroProjectImpl.java @@ -57,14 +57,8 @@ public boolean isTrial() { JSONObject jsonObject = JSONFactoryUtil.createJSONObject( getSubscription()); - if (StringUtil.equals( - jsonObject.getString("name"), - "Liferay Analytics Cloud Basic")) { - - return true; - } - - return false; + return StringUtil.equals( + jsonObject.getString("name"), "Liferay Analytics Cloud Basic"); } catch (Exception exception) { _log.error(exception); diff --git a/modules/dxp/apps/osb/osb-faro/osb-faro-web/src/main/java/com/liferay/osb/faro/web/internal/controller/main/OAuth2Controller.java b/modules/dxp/apps/osb/osb-faro/osb-faro-web/src/main/java/com/liferay/osb/faro/web/internal/controller/main/OAuth2Controller.java index d056866380546a..a954c26d13460d 100644 --- a/modules/dxp/apps/osb/osb-faro/osb-faro-web/src/main/java/com/liferay/osb/faro/web/internal/controller/main/OAuth2Controller.java +++ b/modules/dxp/apps/osb/osb-faro/osb-faro-web/src/main/java/com/liferay/osb/faro/web/internal/controller/main/OAuth2Controller.java @@ -170,13 +170,8 @@ private boolean _filterOAuth2AuthorizationByGroupId( ExpandoBridge expandoBridge = oAuth2Authorization.getExpandoBridge(); - if (Objects.equals( - groupId, expandoBridge.getAttribute("groupId", false))) { - - return true; - } - - return false; + return Objects.equals( + groupId, expandoBridge.getAttribute("groupId", false)); } private String _generateApplicationName() { diff --git a/modules/dxp/apps/osb/osb-faro/osb-faro-web/src/main/java/com/liferay/osb/faro/web/internal/controller/main/ProjectController.java b/modules/dxp/apps/osb/osb-faro/osb-faro-web/src/main/java/com/liferay/osb/faro/web/internal/controller/main/ProjectController.java index 92bd590d9dc545..8c33081e7aa8db 100644 --- a/modules/dxp/apps/osb/osb-faro/osb-faro-web/src/main/java/com/liferay/osb/faro/web/internal/controller/main/ProjectController.java +++ b/modules/dxp/apps/osb/osb-faro/osb-faro-web/src/main/java/com/liferay/osb/faro/web/internal/controller/main/ProjectController.java @@ -1153,11 +1153,7 @@ private boolean _isSubscriptionPlanChanged( oldSubscriptionName = StringUtil.replace( oldSubscriptionName, "LXC ", "Liferay SaaS "); - if (!Objects.equals(oldSubscriptionName, subscriptionName)) { - return true; - } - - return false; + return !Objects.equals(oldSubscriptionName, subscriptionName); } private boolean _isWorkspaceHealthy(FaroProject faroProject) { diff --git a/modules/dxp/apps/osb/osb-faro/osb-faro-web/src/main/java/com/liferay/osb/faro/web/internal/request/filter/SecurityFilter.java b/modules/dxp/apps/osb/osb-faro/osb-faro-web/src/main/java/com/liferay/osb/faro/web/internal/request/filter/SecurityFilter.java index 88ceb19b60ca02..e42ab3140a4a02 100644 --- a/modules/dxp/apps/osb/osb-faro/osb-faro-web/src/main/java/com/liferay/osb/faro/web/internal/request/filter/SecurityFilter.java +++ b/modules/dxp/apps/osb/osb-faro/osb-faro-web/src/main/java/com/liferay/osb/faro/web/internal/request/filter/SecurityFilter.java @@ -209,11 +209,7 @@ private boolean _isSiteMember(String roleName) { } private boolean _isSiteOwner(String roleName) { - if (StringUtil.equals(roleName, RoleConstants.SITE_OWNER)) { - return true; - } - - return false; + return StringUtil.equals(roleName, RoleConstants.SITE_OWNER); } private static final Log _log = LogFactoryUtil.getLog(SecurityFilter.class); diff --git a/modules/dxp/apps/osb/osb-faro/osb-faro-web/src/main/java/com/liferay/osb/faro/web/internal/util/SchemaOrgUtil.java b/modules/dxp/apps/osb/osb-faro/osb-faro-web/src/main/java/com/liferay/osb/faro/web/internal/util/SchemaOrgUtil.java index b0aba3aa7ab195..4d6302aa435b25 100644 --- a/modules/dxp/apps/osb/osb-faro/osb-faro-web/src/main/java/com/liferay/osb/faro/web/internal/util/SchemaOrgUtil.java +++ b/modules/dxp/apps/osb/osb-faro/osb-faro-web/src/main/java/com/liferay/osb/faro/web/internal/util/SchemaOrgUtil.java @@ -54,11 +54,7 @@ else if (StringUtil.equalsIgnoreCase( } public static boolean isSubtype(String type, String rawType) { - if (rawType.equals(getRawType(type, type))) { - return true; - } - - return false; + return rawType.equals(getRawType(type, type)); } private static final String _SCHEMA_ORG_URL = "http://schema.org/"; diff --git a/modules/dxp/apps/osb/osb-spring-boot/osb-spring-boot-client-zendesk/src/main/java/com/liferay/osb/spring/boot/client/zendesk/model/ZendeskTicket.java b/modules/dxp/apps/osb/osb-spring-boot/osb-spring-boot-client-zendesk/src/main/java/com/liferay/osb/spring/boot/client/zendesk/model/ZendeskTicket.java index 870d13f6257e6c..aeb8606a672a89 100644 --- a/modules/dxp/apps/osb/osb-spring-boot/osb-spring-boot-client-zendesk/src/main/java/com/liferay/osb/spring/boot/client/zendesk/model/ZendeskTicket.java +++ b/modules/dxp/apps/osb/osb-spring-boot/osb-spring-boot-client-zendesk/src/main/java/com/liferay/osb/spring/boot/client/zendesk/model/ZendeskTicket.java @@ -33,11 +33,7 @@ public long getZendeskTicketId() { } public boolean isClosed() { - if (_status.equals(STATUS_CLOSED)) { - return true; - } - - return false; + return _status.equals(STATUS_CLOSED); } private final String _status; diff --git a/modules/dxp/apps/osb/osb-spring-boot/osb-spring-boot-client-zendesk/src/main/java/com/liferay/osb/spring/boot/client/zendesk/model/ZendeskUser.java b/modules/dxp/apps/osb/osb-spring-boot/osb-spring-boot-client-zendesk/src/main/java/com/liferay/osb/spring/boot/client/zendesk/model/ZendeskUser.java index 351b9ddd5a10b7..adf4e550eb2a4c 100644 --- a/modules/dxp/apps/osb/osb-spring-boot/osb-spring-boot-client-zendesk/src/main/java/com/liferay/osb/spring/boot/client/zendesk/model/ZendeskUser.java +++ b/modules/dxp/apps/osb/osb-spring-boot/osb-spring-boot-client-zendesk/src/main/java/com/liferay/osb/spring/boot/client/zendesk/model/ZendeskUser.java @@ -31,11 +31,7 @@ public long getZendeskUserId() { } public boolean isEndUser() { - if (_role.equals("end-user")) { - return true; - } - - return false; + return _role.equals("end-user"); } private final String _emailAddress; diff --git a/modules/dxp/apps/portal-reports-engine-console/portal-reports-engine-console-web/src/main/java/com/liferay/portal/reports/engine/console/web/internal/admin/display/context/ReportsEngineDisplayContext.java b/modules/dxp/apps/portal-reports-engine-console/portal-reports-engine-console-web/src/main/java/com/liferay/portal/reports/engine/console/web/internal/admin/display/context/ReportsEngineDisplayContext.java index 4a574f8bedbd83..3b2a9a513eb22b 100644 --- a/modules/dxp/apps/portal-reports-engine-console/portal-reports-engine-console-web/src/main/java/com/liferay/portal/reports/engine/console/web/internal/admin/display/context/ReportsEngineDisplayContext.java +++ b/modules/dxp/apps/portal-reports-engine-console/portal-reports-engine-console-web/src/main/java/com/liferay/portal/reports/engine/console/web/internal/admin/display/context/ReportsEngineDisplayContext.java @@ -294,11 +294,7 @@ public boolean isAdminPortlet() { public boolean isDefinitionsTabSelected() { String tabs1 = _getTabs1(); - if (tabs1.equals("definitions")) { - return true; - } - - return false; + return tabs1.equals("definitions"); } public boolean isDisabled() throws PortalException { @@ -312,21 +308,13 @@ public boolean isDisabled() throws PortalException { public boolean isReportsTabSelected() { String tabs1 = _getTabs1(); - if (tabs1.equals("reports")) { - return true; - } - - return false; + return tabs1.equals("reports"); } public boolean isSourcesTabSelected() { String tabs1 = _getTabs1(); - if (tabs1.equals("sources")) { - return true; - } - - return false; + return tabs1.equals("sources"); } private DefinitionSearch _getDefinitionSearch() throws PortalException { diff --git a/modules/dxp/apps/portal-search-tuning/portal-search-tuning-rankings-web/src/main/java/com/liferay/portal/search/tuning/rankings/web/internal/display/context/RankingPortletDisplayBuilder.java b/modules/dxp/apps/portal-search-tuning/portal-search-tuning-rankings-web/src/main/java/com/liferay/portal/search/tuning/rankings/web/internal/display/context/RankingPortletDisplayBuilder.java index 8ed4358d7d7d27..c0065b30d7a3fd 100644 --- a/modules/dxp/apps/portal-search-tuning/portal-search-tuning-rankings-web/src/main/java/com/liferay/portal/search/tuning/rankings/web/internal/display/context/RankingPortletDisplayBuilder.java +++ b/modules/dxp/apps/portal-search-tuning/portal-search-tuning-rankings-web/src/main/java/com/liferay/portal/search/tuning/rankings/web/internal/display/context/RankingPortletDisplayBuilder.java @@ -531,11 +531,7 @@ private boolean _hasResults( } private boolean _isSearch(String keywords) { - if (!Validator.isBlank(keywords)) { - return true; - } - - return false; + return !Validator.isBlank(keywords); } private SearchContainer _search() { diff --git a/modules/dxp/apps/portal-search-tuning/portal-search-tuning-rankings-web/src/main/java/com/liferay/portal/search/tuning/rankings/web/internal/portlet/action/EditRankingMVCActionCommand.java b/modules/dxp/apps/portal-search-tuning/portal-search-tuning-rankings-web/src/main/java/com/liferay/portal/search/tuning/rankings/web/internal/portlet/action/EditRankingMVCActionCommand.java index 72543f0b498191..0538fe2bd0d136 100644 --- a/modules/dxp/apps/portal-search-tuning/portal-search-tuning-rankings-web/src/main/java/com/liferay/portal/search/tuning/rankings/web/internal/portlet/action/EditRankingMVCActionCommand.java +++ b/modules/dxp/apps/portal-search-tuning/portal-search-tuning-rankings-web/src/main/java/com/liferay/portal/search/tuning/rankings/web/internal/portlet/action/EditRankingMVCActionCommand.java @@ -424,14 +424,9 @@ private boolean _hasDuplicateQueryString( private boolean _isInactive( EditRankingMVCActionRequest editRankingMVCActionRequest) { - if (Objects.equals( - editRankingMVCActionRequest.getStatus(), - ResultRankingsConstants.STATUS_ACTIVE)) { - - return false; - } - - return true; + return !Objects.equals( + editRankingMVCActionRequest.getStatus(), + ResultRankingsConstants.STATUS_ACTIVE); } private boolean _isUpdateSpecial(String string) { diff --git a/modules/dxp/apps/portal-search-tuning/portal-search-tuning-synonyms-web/src/main/java/com/liferay/portal/search/tuning/synonyms/web/internal/display/context/SynonymsDisplayBuilder.java b/modules/dxp/apps/portal-search-tuning/portal-search-tuning-synonyms-web/src/main/java/com/liferay/portal/search/tuning/synonyms/web/internal/display/context/SynonymsDisplayBuilder.java index 3b898d4ec9d0d5..ab559ed8515620 100644 --- a/modules/dxp/apps/portal-search-tuning/portal-search-tuning-synonyms-web/src/main/java/com/liferay/portal/search/tuning/synonyms/web/internal/display/context/SynonymsDisplayBuilder.java +++ b/modules/dxp/apps/portal-search-tuning/portal-search-tuning-synonyms-web/src/main/java/com/liferay/portal/search/tuning/synonyms/web/internal/display/context/SynonymsDisplayBuilder.java @@ -122,11 +122,7 @@ protected List getDropdownItems() { protected boolean isDisabledManagementBar( List synonymSetDisplayContexts) { - if (synonymSetDisplayContexts.isEmpty()) { - return true; - } - - return false; + return synonymSetDisplayContexts.isEmpty(); } private RenderURL _buildEditRenderURL(SynonymSet synonymSet) { diff --git a/modules/dxp/apps/portal-workflow-kaleo-forms/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/display/context/KaleoFormsAdminDisplayContext.java b/modules/dxp/apps/portal-workflow-kaleo-forms/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/display/context/KaleoFormsAdminDisplayContext.java index a939d1a7bcb943..aa7a5349b47705 100644 --- a/modules/dxp/apps/portal-workflow-kaleo-forms/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/display/context/KaleoFormsAdminDisplayContext.java +++ b/modules/dxp/apps/portal-workflow-kaleo-forms/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/display/context/KaleoFormsAdminDisplayContext.java @@ -496,11 +496,7 @@ protected boolean hasResults() { } protected boolean isSearch() { - if (Validator.isNotNull(getKeywords())) { - return true; - } - - return false; + return Validator.isNotNull(getKeywords()); } private PortletURL _getIteratorURL() { diff --git a/modules/dxp/apps/portal-workflow-kaleo-forms/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/display/context/KaleoFormsViewRecordsDisplayContext.java b/modules/dxp/apps/portal-workflow-kaleo-forms/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/display/context/KaleoFormsViewRecordsDisplayContext.java index 224107affa16f3..b976e3b0d12c96 100644 --- a/modules/dxp/apps/portal-workflow-kaleo-forms/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/display/context/KaleoFormsViewRecordsDisplayContext.java +++ b/modules/dxp/apps/portal-workflow-kaleo-forms/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/display/context/KaleoFormsViewRecordsDisplayContext.java @@ -456,11 +456,7 @@ protected boolean hasResults() throws Exception { } protected boolean isSearch() { - if (Validator.isNotNull(getKeywords())) { - return true; - } - - return false; + return Validator.isNotNull(getKeywords()); } private SearchContext _getSearchContext( @@ -503,11 +499,7 @@ private ThemeDisplay _getThemeDisplay() { } private boolean _isDDMFormFieldTransient(DDMFormField ddmFormField) { - if (Validator.isNull(ddmFormField.getDataType())) { - return true; - } - - return false; + return Validator.isNull(ddmFormField.getDataType()); } private static final int _TOTAL_COLUMNS = 5; diff --git a/modules/dxp/apps/portal-workflow-kaleo-forms/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/portlet/configuration/icon/FieldSetsPortletConfigurationIcon.java b/modules/dxp/apps/portal-workflow-kaleo-forms/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/portlet/configuration/icon/FieldSetsPortletConfigurationIcon.java index 18fe27f20ffc05..48de65bdadadf9 100644 --- a/modules/dxp/apps/portal-workflow-kaleo-forms/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/portlet/configuration/icon/FieldSetsPortletConfigurationIcon.java +++ b/modules/dxp/apps/portal-workflow-kaleo-forms/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/portlet/configuration/icon/FieldSetsPortletConfigurationIcon.java @@ -96,11 +96,7 @@ public boolean isShow(PortletRequest portletRequest) { User user = themeDisplay.getUser(); - if (user.isGuestUser()) { - return false; - } - - return true; + return !user.isGuestUser(); } @Reference diff --git a/modules/dxp/apps/portal-workflow-kaleo-forms/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/util/KaleoFormsUtil.java b/modules/dxp/apps/portal-workflow-kaleo-forms/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/util/KaleoFormsUtil.java index a834d0cadbb186..71e5a5034a89b0 100644 --- a/modules/dxp/apps/portal-workflow-kaleo-forms/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/util/KaleoFormsUtil.java +++ b/modules/dxp/apps/portal-workflow-kaleo-forms/portal-workflow-kaleo-forms-web/src/main/java/com/liferay/portal/workflow/kaleo/forms/web/internal/util/KaleoFormsUtil.java @@ -128,14 +128,8 @@ public static String getInitialStateName( List nodeNames = _getNodeNames( companyId, workflowDefinitionName, workflowDefinitionVersion, workflowNode -> { - if (Objects.equals( - workflowNode.getType(), - WorkflowNode.Type.INITIAL_STATE)) { - - return true; - } - - return false; + return Objects.equals( + workflowNode.getType(), WorkflowNode.Type.INITIAL_STATE); }); return nodeNames.get(0); @@ -491,13 +485,8 @@ private static List _getTaskNames( return _getNodeNames( companyId, workflowDefinitionName, workflowDefinitionVersion, workflowNode -> { - if (Objects.equals( - workflowNode.getType(), WorkflowNode.Type.TASK)) { - - return true; - } - - return false; + return Objects.equals( + workflowNode.getType(), WorkflowNode.Type.TASK); }); } diff --git a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-service/src/main/java/com/liferay/portal/workflow/metrics/internal/sla/processor/WorkflowMetricsSLAProcessor.java b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-service/src/main/java/com/liferay/portal/workflow/metrics/internal/sla/processor/WorkflowMetricsSLAProcessor.java index befa63c683d089..4518045bd0dafc 100644 --- a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-service/src/main/java/com/liferay/portal/workflow/metrics/internal/sla/processor/WorkflowMetricsSLAProcessor.java +++ b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-service/src/main/java/com/liferay/portal/workflow/metrics/internal/sla/processor/WorkflowMetricsSLAProcessor.java @@ -152,11 +152,7 @@ protected boolean isBreached( LocalDateTime completionDateLocalDateTime = LocalDateTime.parse( document.getDate("completionDate"), _dateTimeFormatter); - if (completionDateLocalDateTime.isAfter(overdueLocalDateTime)) { - return true; - } - - return false; + return completionDateLocalDateTime.isAfter(overdueLocalDateTime); } protected boolean isOnTime( diff --git a/modules/dxp/apps/saml/saml-impl/src/main/java/com/liferay/saml/internal/servlet/filter/IdpSsoSamlPortalFilter.java b/modules/dxp/apps/saml/saml-impl/src/main/java/com/liferay/saml/internal/servlet/filter/IdpSsoSamlPortalFilter.java index 0245af90be5701..b140c4f3461c22 100644 --- a/modules/dxp/apps/saml/saml-impl/src/main/java/com/liferay/saml/internal/servlet/filter/IdpSsoSamlPortalFilter.java +++ b/modules/dxp/apps/saml/saml-impl/src/main/java/com/liferay/saml/internal/servlet/filter/IdpSsoSamlPortalFilter.java @@ -65,11 +65,7 @@ public boolean isFilterEnabled( String requestPath = _samlHttpRequestHelper.getRequestPath( httpServletRequest); - if (requestPath.equals("/c/portal/logout")) { - return true; - } - - return false; + return requestPath.equals("/c/portal/logout"); } @Override diff --git a/modules/dxp/apps/saml/saml-opensaml-integration/src/main/java/com/liferay/saml/opensaml/integration/internal/metadata/KeyStoreLocalEntityManager.java b/modules/dxp/apps/saml/saml-opensaml-integration/src/main/java/com/liferay/saml/opensaml/integration/internal/metadata/KeyStoreLocalEntityManager.java index a38466c239027d..577c182380e04f 100644 --- a/modules/dxp/apps/saml/saml-opensaml-integration/src/main/java/com/liferay/saml/opensaml/integration/internal/metadata/KeyStoreLocalEntityManager.java +++ b/modules/dxp/apps/saml/saml-opensaml-integration/src/main/java/com/liferay/saml/opensaml/integration/internal/metadata/KeyStoreLocalEntityManager.java @@ -164,11 +164,7 @@ public boolean hasDefaultIdpRole() { _samlSpIdpConnectionLocalService.getSamlSpIdpConnections( CompanyThreadLocal.getCompanyId()); - if (samlSpIdpConnections.isEmpty()) { - return false; - } - - return true; + return !samlSpIdpConnections.isEmpty(); } @Override diff --git a/modules/dxp/apps/search-experiences/search-experiences-service/src/main/java/com/liferay/search/experiences/internal/blueprint/condition/SXPConditionEvaluator.java b/modules/dxp/apps/search-experiences/search-experiences-service/src/main/java/com/liferay/search/experiences/internal/blueprint/condition/SXPConditionEvaluator.java index 4366aba4599b5e..46ad8e8a6379c9 100644 --- a/modules/dxp/apps/search-experiences/search-experiences-service/src/main/java/com/liferay/search/experiences/internal/blueprint/condition/SXPConditionEvaluator.java +++ b/modules/dxp/apps/search-experiences/search-experiences-service/src/main/java/com/liferay/search/experiences/internal/blueprint/condition/SXPConditionEvaluator.java @@ -107,14 +107,8 @@ private boolean _evaluateExists(Exists exists) { return true; } - if (Objects.isNull( - _sxpParameterData.getSXPParameterByName( - exists.getParameterName()))) { - - return false; - } - - return true; + return !Objects.isNull( + _sxpParameterData.getSXPParameterByName(exists.getParameterName())); } private boolean _evaluateIn(In in) { @@ -132,11 +126,7 @@ private boolean _evaluateNot(Condition condition) { return true; } - if (evaluate(condition)) { - return false; - } - - return true; + return !evaluate(condition); } private boolean _evaluateRange(Range range) { diff --git a/modules/dxp/apps/search-experiences/search-experiences-service/src/main/java/com/liferay/search/experiences/internal/security/permission/resource/SXPBlueprintAdminPortletResourcePermissionWrapper.java b/modules/dxp/apps/search-experiences/search-experiences-service/src/main/java/com/liferay/search/experiences/internal/security/permission/resource/SXPBlueprintAdminPortletResourcePermissionWrapper.java index c4cdf60a4b0dc7..d6979c3379629d 100644 --- a/modules/dxp/apps/search-experiences/search-experiences-service/src/main/java/com/liferay/search/experiences/internal/security/permission/resource/SXPBlueprintAdminPortletResourcePermissionWrapper.java +++ b/modules/dxp/apps/search-experiences/search-experiences-service/src/main/java/com/liferay/search/experiences/internal/security/permission/resource/SXPBlueprintAdminPortletResourcePermissionWrapper.java @@ -40,11 +40,7 @@ public Boolean contains( PermissionChecker permissionChecker, String name, Group group, String actionId) { - if (permissionChecker.hasPermission(group, name, 0, actionId)) { - return true; - } - - return false; + return permissionChecker.hasPermission(group, name, 0, actionId); } } diff --git a/modules/dxp/apps/search-experiences/search-experiences-web/src/main/java/com/liferay/search/experiences/web/internal/blueprint/admin/portlet/configuration/icon/ImportPortletConfigurationIcon.java b/modules/dxp/apps/search-experiences/search-experiences-web/src/main/java/com/liferay/search/experiences/web/internal/blueprint/admin/portlet/configuration/icon/ImportPortletConfigurationIcon.java index a760a1106844b7..3f618c90d05114 100644 --- a/modules/dxp/apps/search-experiences/search-experiences-web/src/main/java/com/liferay/search/experiences/web/internal/blueprint/admin/portlet/configuration/icon/ImportPortletConfigurationIcon.java +++ b/modules/dxp/apps/search-experiences/search-experiences-web/src/main/java/com/liferay/search/experiences/web/internal/blueprint/admin/portlet/configuration/icon/ImportPortletConfigurationIcon.java @@ -69,15 +69,9 @@ public boolean isShow(PortletRequest portletRequest) { ThemeDisplay themeDisplay = (ThemeDisplay)portletRequest.getAttribute( WebKeys.THEME_DISPLAY); - if (_portletResourcePermission.contains( - themeDisplay.getPermissionChecker(), - themeDisplay.getScopeGroup(), - SXPActionKeys.ADD_SXP_BLUEPRINT)) { - - return true; - } - - return false; + return _portletResourcePermission.contains( + themeDisplay.getPermissionChecker(), themeDisplay.getScopeGroup(), + SXPActionKeys.ADD_SXP_BLUEPRINT); } @Override diff --git a/modules/dxp/apps/segments/segments-experiment-web/src/main/java/com/liferay/segments/experiment/web/internal/product/navigation/control/menu/SegmentsExperimentProductNavigationControlMenuEntry.java b/modules/dxp/apps/segments/segments-experiment-web/src/main/java/com/liferay/segments/experiment/web/internal/product/navigation/control/menu/SegmentsExperimentProductNavigationControlMenuEntry.java index 135421ccdd6234..163249353f902d 100644 --- a/modules/dxp/apps/segments/segments-experiment-web/src/main/java/com/liferay/segments/experiment/web/internal/product/navigation/control/menu/SegmentsExperimentProductNavigationControlMenuEntry.java +++ b/modules/dxp/apps/segments/segments-experiment-web/src/main/java/com/liferay/segments/experiment/web/internal/product/navigation/control/menu/SegmentsExperimentProductNavigationControlMenuEntry.java @@ -183,11 +183,7 @@ public boolean isPanelStateOpen( String segmentsExperimentKey = ParamUtil.getString( originalHttpServletRequest, "segmentsExperimentKey"); - if (Validator.isNotNull(segmentsExperimentKey)) { - return true; - } - - return false; + return Validator.isNotNull(segmentsExperimentKey); } @Override diff --git a/modules/dxp/apps/sharepoint-rest/sharepoint-rest-repository/src/main/java/com/liferay/sharepoint/rest/repository/internal/document/library/repository/authorization/capability/SharepointRepositoryAuthorizationCapability.java b/modules/dxp/apps/sharepoint-rest/sharepoint-rest-repository/src/main/java/com/liferay/sharepoint/rest/repository/internal/document/library/repository/authorization/capability/SharepointRepositoryAuthorizationCapability.java index b0b206b472e7e2..fc3cfe38a4e51d 100644 --- a/modules/dxp/apps/sharepoint-rest/sharepoint-rest-repository/src/main/java/com/liferay/sharepoint/rest/repository/internal/document/library/repository/authorization/capability/SharepointRepositoryAuthorizationCapability.java +++ b/modules/dxp/apps/sharepoint-rest/sharepoint-rest-repository/src/main/java/com/liferay/sharepoint/rest/repository/internal/document/library/repository/authorization/capability/SharepointRepositoryAuthorizationCapability.java @@ -86,11 +86,7 @@ public boolean hasCustomRedirectFlow( return true; } else if (token.isExpired()) { - if (Validator.isNotNull(token.getRefreshToken())) { - return false; - } - - return true; + return !Validator.isNotNull(token.getRefreshToken()); } return false; @@ -157,11 +153,7 @@ private boolean _hasAuthorizationGrant( String code = ParamUtil.getString(httpServletRequest, "code"); - if (Validator.isNull(code)) { - return false; - } - - return true; + return !Validator.isNull(code); } private void _refreshAccessToken( diff --git a/modules/dxp/apps/sharepoint-soap/sharepoint-soap-repository/src/main/java/com/liferay/sharepoint/soap/repository/search/SharepointQueryBuilder.java b/modules/dxp/apps/sharepoint-soap/sharepoint-soap-repository/src/main/java/com/liferay/sharepoint/soap/repository/search/SharepointQueryBuilder.java index ba999431aa9004..38c7da9e3e7a39 100644 --- a/modules/dxp/apps/sharepoint-soap/sharepoint-soap-repository/src/main/java/com/liferay/sharepoint/soap/repository/search/SharepointQueryBuilder.java +++ b/modules/dxp/apps/sharepoint-soap/sharepoint-soap-repository/src/main/java/com/liferay/sharepoint/soap/repository/search/SharepointQueryBuilder.java @@ -291,13 +291,8 @@ protected String getSharepointFieldName(String fieldName) { protected boolean isServerVersion( SharepointConnection.ServerVersion serverVersion) { - if (serverVersion.equals( - _sharepointConnectionInfo.getServerVersion())) { - - return true; - } - - return false; + return serverVersion.equals( + _sharepointConnectionInfo.getServerVersion()); } protected boolean isSupportedField(String field) { diff --git a/modules/etl/talend/talend-common/src/main/java/com/liferay/talend/common/headless/HeadlessUtil.java b/modules/etl/talend/talend-common/src/main/java/com/liferay/talend/common/headless/HeadlessUtil.java index 86024f2f68b100..9c45840085fcb4 100644 --- a/modules/etl/talend/talend-common/src/main/java/com/liferay/talend/common/headless/HeadlessUtil.java +++ b/modules/etl/talend/talend-common/src/main/java/com/liferay/talend/common/headless/HeadlessUtil.java @@ -26,11 +26,7 @@ public class HeadlessUtil { public static boolean isValidOpenAPISpecURL(String url) { Matcher serverURLMatcher = _liferayOpenAPIURLPattern.matcher(url); - if (serverURLMatcher.matches()) { - return true; - } - - return false; + return serverURLMatcher.matches(); } public static String sanitizeOpenAPIModuleURI(String uri) { diff --git a/modules/etl/talend/talend-common/src/main/java/com/liferay/talend/common/schema/SchemaBuilder.java b/modules/etl/talend/talend-common/src/main/java/com/liferay/talend/common/schema/SchemaBuilder.java index d06b516f6398b8..f869202c8c1f5d 100644 --- a/modules/etl/talend/talend-common/src/main/java/com/liferay/talend/common/schema/SchemaBuilder.java +++ b/modules/etl/talend/talend-common/src/main/java/com/liferay/talend/common/schema/SchemaBuilder.java @@ -337,11 +337,7 @@ else if (oasFormat == OASFormat.STRING) { } private boolean _isExtensionField(String name) { - if (name.startsWith("x-")) { - return true; - } - - return false; + return name.startsWith("x-"); } private void _processSchemaJsonObject( diff --git a/modules/etl/talend/talend-common/src/main/java/com/liferay/talend/common/util/StringUtil.java b/modules/etl/talend/talend-common/src/main/java/com/liferay/talend/common/util/StringUtil.java index a71b0f23f692c3..c51d57f2fe7c3d 100644 --- a/modules/etl/talend/talend-common/src/main/java/com/liferay/talend/common/util/StringUtil.java +++ b/modules/etl/talend/talend-common/src/main/java/com/liferay/talend/common/util/StringUtil.java @@ -22,11 +22,7 @@ public static boolean isEmpty(String value) { String trimmedValue = value.trim(); - if (trimmedValue.isEmpty()) { - return true; - } - - return false; + return trimmedValue.isEmpty(); } public static String removeQuotes(String s) { diff --git a/modules/etl/talend/talend-definition/src/main/java/com/liferay/talend/properties/parameters/RequestParameter.java b/modules/etl/talend/talend-definition/src/main/java/com/liferay/talend/properties/parameters/RequestParameter.java index ff3c42a3b88bf8..8dca711d02b55f 100644 --- a/modules/etl/talend/talend-definition/src/main/java/com/liferay/talend/properties/parameters/RequestParameter.java +++ b/modules/etl/talend/talend-definition/src/main/java/com/liferay/talend/properties/parameters/RequestParameter.java @@ -46,11 +46,7 @@ public String getValue() { } public boolean isPathLocation() { - if (Objects.equals(_location, "path")) { - return true; - } - - return false; + return Objects.equals(_location, "path"); } private final String _location; diff --git a/modules/etl/talend/talend-runtime/src/main/java/com/liferay/talend/runtime/client/ResponseHandler.java b/modules/etl/talend/talend-runtime/src/main/java/com/liferay/talend/runtime/client/ResponseHandler.java index 01d93fdf458333..0585b99c2658b3 100644 --- a/modules/etl/talend/talend-runtime/src/main/java/com/liferay/talend/runtime/client/ResponseHandler.java +++ b/modules/etl/talend/talend-runtime/src/main/java/com/liferay/talend/runtime/client/ResponseHandler.java @@ -89,11 +89,7 @@ public Response.Status.Family getResponseStatusFamily(Response response) { public boolean isApplicationJsonContentType(Response response) { List strings = getContentType(response); - if (strings.contains("application/json")) { - return true; - } - - return false; + return strings.contains("application/json"); } public boolean isRedirect(Response response) { diff --git a/modules/sdk/ant-get-file-set/src/main/java/com/liferay/ant/get/file/set/GetFileSetTask.java b/modules/sdk/ant-get-file-set/src/main/java/com/liferay/ant/get/file/set/GetFileSetTask.java index f684504bb4292b..b512a45e0eddf5 100644 --- a/modules/sdk/ant-get-file-set/src/main/java/com/liferay/ant/get/file/set/GetFileSetTask.java +++ b/modules/sdk/ant-get-file-set/src/main/java/com/liferay/ant/get/file/set/GetFileSetTask.java @@ -205,11 +205,7 @@ private boolean _hasInvalidClassNames( } } - if (!invalidClassNames.isEmpty()) { - return false; - } - - return true; + return invalidClassNames.isEmpty(); } private boolean _isClass(String className, String fileName) { diff --git a/modules/sdk/ant-mirrors-get/src/main/java/com/liferay/ant/mirrors/get/MirrorsGetTask.java b/modules/sdk/ant-mirrors-get/src/main/java/com/liferay/ant/mirrors/get/MirrorsGetTask.java index ce013dc27fab55..720087191fed1d 100644 --- a/modules/sdk/ant-mirrors-get/src/main/java/com/liferay/ant/mirrors/get/MirrorsGetTask.java +++ b/modules/sdk/ant-mirrors-get/src/main/java/com/liferay/ant/mirrors/get/MirrorsGetTask.java @@ -896,11 +896,7 @@ private boolean _is7zFile(File file) { } private boolean _is7zFileName(String fileName) { - if (fileName.endsWith(".7z")) { - return true; - } - - return false; + return fileName.endsWith(".7z"); } private boolean _isTarGzFile(File file) throws IOException { diff --git a/modules/sdk/gradle-plugins-app-docker/src/main/java/com/liferay/gradle/plugins/app/docker/AppDockerExtension.java b/modules/sdk/gradle-plugins-app-docker/src/main/java/com/liferay/gradle/plugins/app/docker/AppDockerExtension.java index 0587719611604c..72bc5c4ff5e9dd 100644 --- a/modules/sdk/gradle-plugins-app-docker/src/main/java/com/liferay/gradle/plugins/app/docker/AppDockerExtension.java +++ b/modules/sdk/gradle-plugins-app-docker/src/main/java/com/liferay/gradle/plugins/app/docker/AppDockerExtension.java @@ -61,11 +61,7 @@ public Object call() throws Exception { public boolean isSatisfiedBy(Project project) { Set subprojects = project.getSubprojects(); - if (subprojects.isEmpty()) { - return true; - } - - return false; + return subprojects.isEmpty(); } }); diff --git a/modules/sdk/gradle-plugins-baseline/src/main/java/com/liferay/gradle/plugins/baseline/internal/util/GradleUtil.java b/modules/sdk/gradle-plugins-baseline/src/main/java/com/liferay/gradle/plugins/baseline/internal/util/GradleUtil.java index c6c157e4145a0e..dfb322fd771f0b 100644 --- a/modules/sdk/gradle-plugins-baseline/src/main/java/com/liferay/gradle/plugins/baseline/internal/util/GradleUtil.java +++ b/modules/sdk/gradle-plugins-baseline/src/main/java/com/liferay/gradle/plugins/baseline/internal/util/GradleUtil.java @@ -50,11 +50,7 @@ public static boolean isFromMavenLocal(Project project, File file) { Path repositoryPath = Paths.get(mavenArtifactRepository.getUrl()); - if (FileUtil.isChild(file, repositoryPath.toFile())) { - return true; - } - - return false; + return FileUtil.isChild(file, repositoryPath.toFile()); } public static boolean toBoolean(Object object) { diff --git a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/LiferayOSGiDefaultsPlugin.java b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/LiferayOSGiDefaultsPlugin.java index 366912f56dbf64..dd702b0a5be9ac 100644 --- a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/LiferayOSGiDefaultsPlugin.java +++ b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/LiferayOSGiDefaultsPlugin.java @@ -1556,11 +1556,7 @@ public boolean isSatisfiedBy(Task task) { String version = String.valueOf(project.getVersion()); - if (version.contains("LIFERAY-PATCHED-")) { - return false; - } - - return true; + return !version.contains("LIFERAY-PATCHED-"); } }); @@ -1894,11 +1890,7 @@ private void _configureArtifacts( public boolean isSatisfiedBy(File file) { String fileName = file.getName(); - if (fileName.equals("MANIFEST.MF")) { - return false; - } - - return true; + return !fileName.equals("MANIFEST.MF"); } }; @@ -3011,11 +3003,7 @@ public void execute(PublicationContainer publicationContainer) { public boolean isSatisfiedBy(File file) { String fileName = file.getName(); - if (fileName.equals("MANIFEST.MF")) { - return false; - } - - return true; + return !fileName.equals("MANIFEST.MF"); } }; @@ -3272,11 +3260,7 @@ private boolean _hasPackageInfoFiles(Project project) { FileTree fileTree = project.fileTree(args); - if (!fileTree.isEmpty()) { - return true; - } - - return false; + return !fileTree.isEmpty(); } private void _removeDuplicates( @@ -4818,11 +4802,7 @@ private boolean _hasTests(Project project) { sourceDirectorySet = sourceSet.getAllSource(); - if (!sourceDirectorySet.isEmpty()) { - return true; - } - - return false; + return !sourceDirectorySet.isEmpty(); } private boolean _isPublishing(Project project) { diff --git a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/LiferaySettingsPlugin.java b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/LiferaySettingsPlugin.java index 1071e8b976a71a..6d4618af858ece 100644 --- a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/LiferaySettingsPlugin.java +++ b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/LiferaySettingsPlugin.java @@ -157,11 +157,7 @@ private boolean _includeDXPProjects( File buildProfileDXPPropertiesFile = new File( portalRootDir, "build.profile-dxp.properties"); - if (!buildProfileDXPPropertiesFile.exists()) { - return false; - } - - return true; + return buildProfileDXPPropertiesFile.exists(); } return Objects.equals(buildProfile, "dxp"); diff --git a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/BaselineDefaultsPlugin.java b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/BaselineDefaultsPlugin.java index 6da70930cfdd51..013a8eeb157150 100644 --- a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/BaselineDefaultsPlugin.java +++ b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/BaselineDefaultsPlugin.java @@ -57,11 +57,7 @@ public boolean isSatisfiedBy(Task task) { String exportPackage = bundleExtension.getInstruction( Constants.EXPORT_PACKAGE); - if (Validator.isNull(exportPackage)) { - return false; - } - - return true; + return !Validator.isNull(exportPackage); } }); diff --git a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/LicenseReportDefaultsPlugin.java b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/LicenseReportDefaultsPlugin.java index 7f01d5606c611a..f7fd572cda092a 100644 --- a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/LicenseReportDefaultsPlugin.java +++ b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/LicenseReportDefaultsPlugin.java @@ -385,11 +385,7 @@ protected boolean isExcluded( return true; } - if (Validator.isNull(getLicenseName(moduleFileName, moduleData))) { - return true; - } - - return false; + return Validator.isNull(getLicenseName(moduleFileName, moduleData)); } private final Properties _overrideProperties; diff --git a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/LiferayRelengPlugin.java b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/LiferayRelengPlugin.java index 83ccd50c21a8c1..e9ef2919d9f776 100644 --- a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/LiferayRelengPlugin.java +++ b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/LiferayRelengPlugin.java @@ -492,13 +492,8 @@ public boolean isSatisfiedBy(Task task) { return true; } - if (LiferayRelengUtil.hasStaleUnstyledTheme( - project, recordArtifactTask.getOutputFile())) { - - return true; - } - - return false; + return LiferayRelengUtil.hasStaleUnstyledTheme( + project, recordArtifactTask.getOutputFile()); } }; diff --git a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/PublishPluginDefaultsPlugin.java b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/PublishPluginDefaultsPlugin.java index 94b1b21334f0a1..40ce8c0b270f62 100644 --- a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/PublishPluginDefaultsPlugin.java +++ b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/PublishPluginDefaultsPlugin.java @@ -152,13 +152,8 @@ private void _configureTaskPublishPlugins(Project project) { @Override public boolean isSatisfiedBy(Task task) { - if (GradlePluginsDefaultsUtil.isSnapshot( - task.getProject())) { - - return false; - } - - return true; + return !GradlePluginsDefaultsUtil.isSnapshot( + task.getProject()); } }); diff --git a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/util/CIUtil.java b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/util/CIUtil.java index 449bab21495053..5b70bc91e5c7bf 100644 --- a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/util/CIUtil.java +++ b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/util/CIUtil.java @@ -70,21 +70,12 @@ public static boolean isExcludedDependencyProject( } public static boolean isRunningInCIEnvironment() { - if (Validator.isNotNull(System.getenv("JENKINS_HOME"))) { - return true; - } - - return false; + return Validator.isNotNull(System.getenv("JENKINS_HOME")); } public static boolean isRunningInCIPatcherEnvironment() { - if (Validator.isNotNull( - System.getenv("FIX_PACKS_RELEASE_ENVIRONMENT"))) { - - return true; - } - - return false; + return Validator.isNotNull( + System.getenv("FIX_PACKS_RELEASE_ENVIRONMENT")); } } \ No newline at end of file diff --git a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/util/FileUtil.java b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/util/FileUtil.java index a7d96e3693da85..c509bc13384e49 100644 --- a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/util/FileUtil.java +++ b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/util/FileUtil.java @@ -54,11 +54,7 @@ public static boolean contains(File file, String s) throws IOException { String content = new String( Files.readAllBytes(path), StandardCharsets.UTF_8); - if (content.contains(s)) { - return true; - } - - return false; + return content.contains(s); } public static File findFile(File dir, final String fileName) @@ -96,11 +92,7 @@ public static File[] getDirectories(File dir) { @Override public boolean accept(File file) { - if (file.isDirectory()) { - return true; - } - - return false; + return file.isDirectory(); } }); @@ -171,11 +163,7 @@ public static boolean hasFiles( fileCollection = fileCollection.filter(spec); - if (fileCollection.isEmpty()) { - return false; - } - - return true; + return !fileCollection.isEmpty(); } public static boolean hasSourceFiles(Task task, Spec spec) { diff --git a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/util/GradlePluginsDefaultsUtil.java b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/util/GradlePluginsDefaultsUtil.java index c11fb5b8d4658a..f769c592407493 100644 --- a/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/util/GradlePluginsDefaultsUtil.java +++ b/modules/sdk/gradle-plugins-defaults/src/main/java/com/liferay/gradle/plugins/defaults/internal/util/GradlePluginsDefaultsUtil.java @@ -247,11 +247,7 @@ public static boolean isPrivateProject(Project project) { public static boolean isSnapshot(Project project) { String version = String.valueOf(project.getVersion()); - if (version.endsWith(SNAPSHOT_VERSION_SUFFIX)) { - return true; - } - - return false; + return version.endsWith(SNAPSHOT_VERSION_SUFFIX); } public static boolean isSnapshot(Project project, String... propertyNames) { @@ -299,21 +295,13 @@ public static boolean isSubrepository(Project project) { public static boolean isTestProject(File dir) { String dirName = dir.getName(); - if (dirName.endsWith(_TEST_PROJECT_SUFFIX)) { - return true; - } - - return false; + return dirName.endsWith(_TEST_PROJECT_SUFFIX); } public static boolean isTestProject(Project project) { String projectName = project.getName(); - if (projectName.endsWith(_TEST_PROJECT_SUFFIX)) { - return true; - } - - return false; + return projectName.endsWith(_TEST_PROJECT_SUFFIX); } public static void setProjectSnapshotVersion( diff --git a/modules/sdk/gradle-plugins-go/src/main/java/com/liferay/gradle/plugins/go/internal/util/FileUtil.java b/modules/sdk/gradle-plugins-go/src/main/java/com/liferay/gradle/plugins/go/internal/util/FileUtil.java index ef72cbf3b6513c..75f355af1e0912 100644 --- a/modules/sdk/gradle-plugins-go/src/main/java/com/liferay/gradle/plugins/go/internal/util/FileUtil.java +++ b/modules/sdk/gradle-plugins-go/src/main/java/com/liferay/gradle/plugins/go/internal/util/FileUtil.java @@ -25,11 +25,7 @@ public boolean accept(File file) { String fileName = file.getName(); - if (!fileName.endsWith("." + extension)) { - return false; - } - - return true; + return fileName.endsWith("." + extension); } }); diff --git a/modules/sdk/gradle-plugins-node/src/main/java/com/liferay/gradle/plugins/node/NodePlugin.java b/modules/sdk/gradle-plugins-node/src/main/java/com/liferay/gradle/plugins/node/NodePlugin.java index ac553e89cc262f..5fa015f1e70d58 100644 --- a/modules/sdk/gradle-plugins-node/src/main/java/com/liferay/gradle/plugins/node/NodePlugin.java +++ b/modules/sdk/gradle-plugins-node/src/main/java/com/liferay/gradle/plugins/node/NodePlugin.java @@ -1114,11 +1114,7 @@ private boolean _hasLiferayNpmScripts12Dependency( packageJSONFile = new File(yarnWorkingDir, "package.json"); - if (_hasLiferayNpmScripts12Dependency(packageJSONFile)) { - return true; - } - - return false; + return _hasLiferayNpmScripts12Dependency(packageJSONFile); } @SuppressWarnings("unchecked") diff --git a/modules/sdk/gradle-plugins-node/src/main/java/com/liferay/gradle/plugins/node/task/DownloadNodeModuleTask.java b/modules/sdk/gradle-plugins-node/src/main/java/com/liferay/gradle/plugins/node/task/DownloadNodeModuleTask.java index 9eda524ba4d001..40b85a1bf6b58f 100644 --- a/modules/sdk/gradle-plugins-node/src/main/java/com/liferay/gradle/plugins/node/task/DownloadNodeModuleTask.java +++ b/modules/sdk/gradle-plugins-node/src/main/java/com/liferay/gradle/plugins/node/task/DownloadNodeModuleTask.java @@ -46,13 +46,8 @@ public boolean isSatisfiedBy(Task task) { String version = getModuleVersion(); - if (packageJSON.contains( - "\"version\": \"" + version + "\"")) { - - return false; - } - - return true; + return !packageJSON.contains( + "\"version\": \"" + version + "\""); } catch (Exception exception) { throw new GradleException( diff --git a/modules/sdk/gradle-plugins-node/src/main/java/com/liferay/gradle/plugins/node/task/NpmInstallTask.java b/modules/sdk/gradle-plugins-node/src/main/java/com/liferay/gradle/plugins/node/task/NpmInstallTask.java index 9735a8511849b0..b32d8c36bb4a20 100644 --- a/modules/sdk/gradle-plugins-node/src/main/java/com/liferay/gradle/plugins/node/task/NpmInstallTask.java +++ b/modules/sdk/gradle-plugins-node/src/main/java/com/liferay/gradle/plugins/node/task/NpmInstallTask.java @@ -51,11 +51,7 @@ public NpmInstallTask() { @Override public Boolean call() throws Exception { - if (Validator.isNotNull(getRegistry())) { - return true; - } - - return false; + return Validator.isNotNull(getRegistry()); } }; diff --git a/modules/sdk/gradle-plugins-patcher/src/main/java/com/liferay/gradle/plugins/patcher/PatcherPlugin.java b/modules/sdk/gradle-plugins-patcher/src/main/java/com/liferay/gradle/plugins/patcher/PatcherPlugin.java index f7083875bf111c..a111c7b439cc2f 100644 --- a/modules/sdk/gradle-plugins-patcher/src/main/java/com/liferay/gradle/plugins/patcher/PatcherPlugin.java +++ b/modules/sdk/gradle-plugins-patcher/src/main/java/com/liferay/gradle/plugins/patcher/PatcherPlugin.java @@ -144,11 +144,7 @@ public File call() throws Exception { @Override public boolean isSatisfiedBy(Task task) { - if (patchTask.isCopyOriginalLibClasses()) { - return true; - } - - return false; + return patchTask.isCopyOriginalLibClasses(); } }); diff --git a/modules/sdk/gradle-plugins-test-integration/src/main/java/com/liferay/gradle/plugins/test/integration/TestIntegrationPlugin.java b/modules/sdk/gradle-plugins-test-integration/src/main/java/com/liferay/gradle/plugins/test/integration/TestIntegrationPlugin.java index dd7cbd0848745c..a61939913cb454 100644 --- a/modules/sdk/gradle-plugins-test-integration/src/main/java/com/liferay/gradle/plugins/test/integration/TestIntegrationPlugin.java +++ b/modules/sdk/gradle-plugins-test-integration/src/main/java/com/liferay/gradle/plugins/test/integration/TestIntegrationPlugin.java @@ -289,13 +289,8 @@ public boolean isSatisfiedBy(Task task) { _startedAppServersReentrantLock.lock(); try { - if (_startedAppServerBinDirs.contains( - setUpTestableTomcatTask.getBinDir())) { - - return false; - } - - return true; + return !_startedAppServerBinDirs.contains( + setUpTestableTomcatTask.getBinDir()); } finally { _startedAppServersReentrantLock.unlock(); @@ -406,11 +401,7 @@ public boolean isSatisfiedBy(Task task) { StartTestableTomcatTask startTestableTomcatTask = (StartTestableTomcatTask)task; - if (startTestableTomcatTask.isReachable()) { - return false; - } - - return true; + return !startTestableTomcatTask.isReachable(); } }); diff --git a/modules/sdk/gradle-plugins-test-integration/src/main/java/com/liferay/gradle/plugins/test/integration/task/SetUpArquillianTask.java b/modules/sdk/gradle-plugins-test-integration/src/main/java/com/liferay/gradle/plugins/test/integration/task/SetUpArquillianTask.java index 3563ea2f15a35a..ba6a0dd9d6d6a2 100644 --- a/modules/sdk/gradle-plugins-test-integration/src/main/java/com/liferay/gradle/plugins/test/integration/task/SetUpArquillianTask.java +++ b/modules/sdk/gradle-plugins-test-integration/src/main/java/com/liferay/gradle/plugins/test/integration/task/SetUpArquillianTask.java @@ -38,11 +38,7 @@ public SetUpArquillianTask() { public boolean isSatisfiedBy(Task task) { File outputFile = _getOutputFile(); - if (outputFile.exists()) { - return false; - } - - return true; + return !outputFile.exists(); } }); diff --git a/modules/sdk/gradle-plugins-test-integration/src/main/java/com/liferay/gradle/plugins/test/integration/task/SetUpTestableTomcatTask.java b/modules/sdk/gradle-plugins-test-integration/src/main/java/com/liferay/gradle/plugins/test/integration/task/SetUpTestableTomcatTask.java index 292c040ff0cde1..8dec4ca2cf460b 100644 --- a/modules/sdk/gradle-plugins-test-integration/src/main/java/com/liferay/gradle/plugins/test/integration/task/SetUpTestableTomcatTask.java +++ b/modules/sdk/gradle-plugins-test-integration/src/main/java/com/liferay/gradle/plugins/test/integration/task/SetUpTestableTomcatTask.java @@ -233,11 +233,7 @@ private boolean _contains(String fileName, String s) throws Exception { String fileContent = new String(Files.readAllBytes(file.toPath())); - if (fileContent.contains(s)) { - return true; - } - - return false; + return fileContent.contains(s); } private PrintWriter _getAppendPrintWriter(String fileName) diff --git a/modules/sdk/gradle-plugins-test-integration/src/main/java/com/liferay/gradle/plugins/test/integration/task/StartTestableTomcatTask.java b/modules/sdk/gradle-plugins-test-integration/src/main/java/com/liferay/gradle/plugins/test/integration/task/StartTestableTomcatTask.java index d1e1296b981d1d..bb6fbd3a5308fa 100644 --- a/modules/sdk/gradle-plugins-test-integration/src/main/java/com/liferay/gradle/plugins/test/integration/task/StartTestableTomcatTask.java +++ b/modules/sdk/gradle-plugins-test-integration/src/main/java/com/liferay/gradle/plugins/test/integration/task/StartTestableTomcatTask.java @@ -60,11 +60,7 @@ protected void waitForStarted( @Override public Boolean call() throws Exception { - if (isReachable()) { - return true; - } - - return false; + return isReachable(); } }); diff --git a/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/LiferayExtPlugin.java b/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/LiferayExtPlugin.java index 1c4676bb444052..752f1a2c08a63a 100644 --- a/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/LiferayExtPlugin.java +++ b/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/LiferayExtPlugin.java @@ -285,13 +285,8 @@ public boolean isSatisfiedBy( String outputFileName = outputFile.getName(); - if (outputFileName.equals( - fileTreeElement.getPath())) { - - return true; - } - - return false; + return outputFileName.equals( + fileTreeElement.getPath()); } }); diff --git a/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/configurator/ClientExtensionProjectConfigurator.java b/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/configurator/ClientExtensionProjectConfigurator.java index e2c12ac3927ea9..433c9fd58b29f6 100644 --- a/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/configurator/ClientExtensionProjectConfigurator.java +++ b/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/configurator/ClientExtensionProjectConfigurator.java @@ -1142,14 +1142,9 @@ private JsonNode _getJsonNode(File file) { } private boolean _isActiveProfile(Project project, String profileName) { - if (Objects.equals( - profileName, - GradleUtil.getProperty(project, "profileName", "default"))) { - - return true; - } - - return false; + return Objects.equals( + profileName, + GradleUtil.getProperty(project, "profileName", "default")); } private boolean _isLanguageProject(File rootDir, File projectDir) { diff --git a/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/configurator/RootProjectConfigurator.java b/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/configurator/RootProjectConfigurator.java index 968c590fda0331..7ab883842ed98f 100644 --- a/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/configurator/RootProjectConfigurator.java +++ b/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/configurator/RootProjectConfigurator.java @@ -1535,11 +1535,7 @@ public boolean isSatisfiedBy(Task task) { workspaceExtension.getProduct(), ReleaseEntry::getBundleURL))) { - if (Objects.nonNull(_bundleCheckSumSHA512)) { - return true; - } - - return false; + return Objects.nonNull(_bundleCheckSumSHA512); } return Validator.isNotNull(verifyBundleTask.getChecksum()); diff --git a/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/internal/configurator/TargetPlatformRootProjectConfigurator.java b/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/internal/configurator/TargetPlatformRootProjectConfigurator.java index ac9af92f19e682..f46850a9a9164d 100644 --- a/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/internal/configurator/TargetPlatformRootProjectConfigurator.java +++ b/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/internal/configurator/TargetPlatformRootProjectConfigurator.java @@ -139,11 +139,7 @@ private void _configureTargetPlatform(Project project) { public boolean isSatisfiedBy(Project project) { String projectName = project.getName(); - if (projectName.endsWith("-test")) { - return false; - } - - return true; + return !projectName.endsWith("-test"); } }); @@ -155,11 +151,7 @@ public boolean isSatisfiedBy(Project project) { public boolean isSatisfiedBy(Project project) { PluginContainer pluginContainer = project.getPlugins(); - if (pluginContainer.hasPlugin(LiferayOSGiPlugin.class)) { - return true; - } - - return false; + return pluginContainer.hasPlugin(LiferayOSGiPlugin.class); } }); diff --git a/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/internal/util/FileUtil.java b/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/internal/util/FileUtil.java index d692b7a1883601..f478815fd0f603 100644 --- a/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/internal/util/FileUtil.java +++ b/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/internal/util/FileUtil.java @@ -111,11 +111,7 @@ private static boolean _isExcludedDirName( return false; } - if (excludes.contains(dirName)) { - return true; - } - - return false; + return excludes.contains(dirName); } private static void _moveTree( diff --git a/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/internal/util/VersionUtil.java b/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/internal/util/VersionUtil.java index cd4fa64f081b1a..42d7826b5faff8 100644 --- a/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/internal/util/VersionUtil.java +++ b/modules/sdk/gradle-plugins-workspace/src/main/java/com/liferay/gradle/plugins/workspace/internal/util/VersionUtil.java @@ -26,11 +26,7 @@ public static boolean isDXPVersion(String targetPlatformVersion) { Matcher dxpVersionMatcher = _dxpVersionPattern.matcher( targetPlatformVersion); - if (dxpVersionMatcher.matches()) { - return true; - } - - return false; + return dxpVersionMatcher.matches(); } public static String normalizeTargetPlatformVersion( diff --git a/modules/sdk/gradle-plugins/src/main/java/com/liferay/gradle/plugins/LiferayPlugin.java b/modules/sdk/gradle-plugins/src/main/java/com/liferay/gradle/plugins/LiferayPlugin.java index 792709831db2e5..9d7f41498a26ec 100644 --- a/modules/sdk/gradle-plugins/src/main/java/com/liferay/gradle/plugins/LiferayPlugin.java +++ b/modules/sdk/gradle-plugins/src/main/java/com/liferay/gradle/plugins/LiferayPlugin.java @@ -111,19 +111,11 @@ private void _configurePluginJava(Project project) { } private boolean _isAnt(Project project) { - if (FileUtil.exists(project, "build.xml")) { - return true; - } - - return false; + return FileUtil.exists(project, "build.xml"); } private boolean _isOSGi(Project project) { - if (FileUtil.exists(project, "bnd.bnd")) { - return true; - } - - return false; + return FileUtil.exists(project, "bnd.bnd"); } private boolean _isTheme(Project project) { @@ -143,11 +135,7 @@ private boolean _isTheme(Project project) { throw new UncheckedIOException(ioException); } - if (gulpFileContent.contains("require('liferay-theme-tasks')")) { - return true; - } - - return false; + return gulpFileContent.contains("require('liferay-theme-tasks')"); } } \ No newline at end of file diff --git a/modules/sdk/gradle-plugins/src/main/java/com/liferay/gradle/plugins/internal/util/FileUtil.java b/modules/sdk/gradle-plugins/src/main/java/com/liferay/gradle/plugins/internal/util/FileUtil.java index c2a4a632df3be1..1dabf689316a16 100644 --- a/modules/sdk/gradle-plugins/src/main/java/com/liferay/gradle/plugins/internal/util/FileUtil.java +++ b/modules/sdk/gradle-plugins/src/main/java/com/liferay/gradle/plugins/internal/util/FileUtil.java @@ -41,11 +41,7 @@ public static File[] getDirectories(File dir) { @Override public boolean accept(File file) { - if (file.isDirectory()) { - return true; - } - - return false; + return file.isDirectory(); } }); diff --git a/modules/sdk/gradle-util/src/main/java/com/liferay/gradle/util/FileUtil.java b/modules/sdk/gradle-util/src/main/java/com/liferay/gradle/util/FileUtil.java index 5813628a133c47..ed99ff1753cd92 100644 --- a/modules/sdk/gradle-util/src/main/java/com/liferay/gradle/util/FileUtil.java +++ b/modules/sdk/gradle-util/src/main/java/com/liferay/gradle/util/FileUtil.java @@ -231,11 +231,7 @@ public static boolean isChild(File file, File parentFile) { parentPath = parentPath.toAbsolutePath(); - if (path.startsWith(parentPath)) { - return true; - } - - return false; + return path.startsWith(parentPath); } public static boolean isUpToDate( diff --git a/modules/sdk/project-templates/project-templates/src/test/java/com/liferay/project/templates/BaseProjectTemplatesTestCase.java b/modules/sdk/project-templates/project-templates/src/test/java/com/liferay/project/templates/BaseProjectTemplatesTestCase.java index 943eb4c5edd779..8c714233f8ddac 100644 --- a/modules/sdk/project-templates/project-templates/src/test/java/com/liferay/project/templates/BaseProjectTemplatesTestCase.java +++ b/modules/sdk/project-templates/project-templates/src/test/java/com/liferay/project/templates/BaseProjectTemplatesTestCase.java @@ -227,11 +227,7 @@ public static boolean isWindows() { osName = osName.toLowerCase(); - if (osName.contains("win")) { - return true; - } - - return false; + return osName.contains("win"); } public default void addCssBuilderConfigurationElement( diff --git a/modules/sdk/project-templates/project-templates/src/test/java/com/liferay/project/templates/ProjectTemplatesBomTest.java b/modules/sdk/project-templates/project-templates/src/test/java/com/liferay/project/templates/ProjectTemplatesBomTest.java index 6d5f484d20a77a..c7c013a4a1488e 100644 --- a/modules/sdk/project-templates/project-templates/src/test/java/com/liferay/project/templates/ProjectTemplatesBomTest.java +++ b/modules/sdk/project-templates/project-templates/src/test/java/com/liferay/project/templates/ProjectTemplatesBomTest.java @@ -182,11 +182,7 @@ private void _buildTemplateTestOutput( } private boolean _isBomTest() { - if (Validator.isNotNull(_BOM_VERSION)) { - return true; - } - - return false; + return Validator.isNotNull(_BOM_VERSION); } private void _resolveProject(String projectName, File workspaceDir) diff --git a/modules/test/jenkins-plugin-events/src/main/java/com/liferay/jenkins/plugin/events/JenkinsEventsDescriptor.java b/modules/test/jenkins-plugin-events/src/main/java/com/liferay/jenkins/plugin/events/JenkinsEventsDescriptor.java index 1bc9f3f3864623..e8b5b6df8cfdc9 100644 --- a/modules/test/jenkins-plugin-events/src/main/java/com/liferay/jenkins/plugin/events/JenkinsEventsDescriptor.java +++ b/modules/test/jenkins-plugin-events/src/main/java/com/liferay/jenkins/plugin/events/JenkinsEventsDescriptor.java @@ -49,11 +49,7 @@ public boolean containsEventType(EventType eventType) { return false; } - if (_eventTypes.contains(eventType)) { - return true; - } - - return false; + return _eventTypes.contains(eventType); } public boolean containsEventType(String eventTypeString) { diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/BaseBuild.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/BaseBuild.java index 23003c35536e5a..2b57ebef1f6993 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/BaseBuild.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/BaseBuild.java @@ -98,11 +98,7 @@ public boolean equals(Object object) { BaseBuild baseBuild = (BaseBuild)object; - if (Objects.equals(getBuildURL(), baseBuild.getBuildURL())) { - return true; - } - - return false; + return Objects.equals(getBuildURL(), baseBuild.getBuildURL()); } @Override @@ -1473,11 +1469,7 @@ public boolean isCompleted() { @Override public boolean isFailing() { - if (!Objects.equals(getResult(), "SUCCESS")) { - return true; - } - - return false; + return !Objects.equals(getResult(), "SUCCESS"); } @Override @@ -3296,11 +3288,7 @@ private boolean _isDifferent(String newValue, String oldValue) { return false; } - if (oldValue.equals(newValue)) { - return false; - } - - return true; + return !oldValue.equals(newValue); } private void _setBuildURL(String buildURL) { diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/BaseGitCommit.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/BaseGitCommit.java index 22ff7a05977ce0..bf97832b5f80e0 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/BaseGitCommit.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/BaseGitCommit.java @@ -25,11 +25,7 @@ public boolean equals(Object object) { return false; } - if (Objects.equals(hashCode(), object.hashCode())) { - return true; - } - - return false; + return Objects.equals(hashCode(), object.hashCode()); } @Override diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/BaseGitRepository.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/BaseGitRepository.java index af05a6c40c6c14..5361336c41b7d9 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/BaseGitRepository.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/BaseGitRepository.java @@ -29,11 +29,7 @@ public String getName() { public boolean isSubrepository() { String name = getName(); - if (name.startsWith("com-liferay-")) { - return true; - } - - return false; + return name.startsWith("com-liferay-"); } protected BaseGitRepository(JSONObject jsonObject) { diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/BaseTestResult.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/BaseTestResult.java index df3538da89f95b..3d3338ad9ab836 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/BaseTestResult.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/BaseTestResult.java @@ -102,11 +102,7 @@ public boolean isFailing() { public boolean isSkipped() { String status = getStatus(); - if (status.equals("SKIPPED")) { - return true; - } - - return false; + return status.equals("SKIPPED"); } @Override diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/CIForwardProcessor.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/CIForwardProcessor.java index 18338e45ddd8d3..0d064cedafbfae 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/CIForwardProcessor.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/CIForwardProcessor.java @@ -732,11 +732,7 @@ private boolean _isForwardEligible() throws IOException { List failedRequiredPassingTestSuiteNames = _getFailedRequiredPassingTestSuiteNames(); - if (!failedRequiredPassingTestSuiteNames.isEmpty()) { - return false; - } - - return true; + return failedRequiredPassingTestSuiteNames.isEmpty(); } private static final long _RETRY_PERIOD = 1000L * 60L; diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/CentralGitSubrepository.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/CentralGitSubrepository.java index 351bbd03f7fe71..2b3995caf96aac 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/CentralGitSubrepository.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/CentralGitSubrepository.java @@ -154,13 +154,8 @@ public boolean isGitSubrepositoryUpstreamCommitMerged() throws IOException { String gitSubrepositoryMergedCommit = _gitrepoProperties.getProperty( "commit", ""); - if (gitSubrepositoryMergedCommit.equals( - getGitSubrepositoryUpstreamCommit())) { - - return true; - } - - return false; + return gitSubrepositoryMergedCommit.equals( + getGitSubrepositoryUpstreamCommit()); } private String _getGitSubrepositoryName() { diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/GitUtil.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/GitUtil.java index 2b83ab34d5a02b..4c3f6164d675f0 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/GitUtil.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/GitUtil.java @@ -286,11 +286,7 @@ public static String getUserRemoteURL( public static boolean isValidGitHubRefURL(String gitHubURL) { Matcher matcher = _gitHubRefURLPattern.matcher(gitHubURL); - if (!matcher.find()) { - return false; - } - - return true; + return matcher.find(); } public static boolean isValidRemoteURL(String remoteURL) { diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/GitWorkingDirectory.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/GitWorkingDirectory.java index c27e8436863e10..51ab64fa3fbdaa 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/GitWorkingDirectory.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/GitWorkingDirectory.java @@ -2042,11 +2042,7 @@ public boolean localGitBranchExists(String branchName) { if (executionResult.getExitValue() == 0) { String standardOut = executionResult.getStandardOut(); - if (standardOut.isEmpty()) { - return false; - } - - return true; + return !standardOut.isEmpty(); } return false; diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/JenkinsResultsParserUtil.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/JenkinsResultsParserUtil.java index 38f5044a71af85..3b5daf6fddd9ce 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/JenkinsResultsParserUtil.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/JenkinsResultsParserUtil.java @@ -3746,11 +3746,7 @@ public static boolean isFileInDirectory(File directory, File file) { String directoryCanonicalPath = getCanonicalPath(directory) + "/"; String fileCanonicalPath = getCanonicalPath(file); - if (fileCanonicalPath.startsWith(directoryCanonicalPath)) { - return true; - } - - return false; + return fileCanonicalPath.startsWith(directoryCanonicalPath); } public static boolean isInteger(String string) { @@ -3783,11 +3779,7 @@ public static boolean isJenkinsSlaveInNetwork( "/master.network.name)"); if (!isNullOrEmpty(jenkinsMasterNetworkName)) { - if (jenkinsMasterNetworkName.equals(networkName)) { - return true; - } - - return false; + return jenkinsMasterNetworkName.equals(networkName); } } catch (IOException ioException) { @@ -3889,11 +3881,7 @@ public static boolean isNullOrEmpty(String string) { String trimmedString = string.trim(); - if (trimmedString.isEmpty()) { - return true; - } - - return false; + return trimmedString.isEmpty(); } public static boolean isOSX() { @@ -3904,11 +3892,7 @@ public static boolean isPoshiFile(File file) { Matcher poshiFileNamePatternMatcher = _poshiFileNamePattern.matcher( file.getName()); - if (poshiFileNamePatternMatcher.matches()) { - return true; - } - - return false; + return poshiFileNamePatternMatcher.matches(); } public static boolean isReachable(String hostname) { @@ -4128,11 +4112,7 @@ public static FilenameFilter newFilenameFilter(String patternString) { public boolean accept(File dir, String name) { Matcher matcher = pattern.matcher(name); - if (matcher.matches()) { - return true; - } - - return false; + return matcher.matches(); } }; diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/Jethr0BuildUpdater.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/Jethr0BuildUpdater.java index 76c12a02e47121..5e74a374d2f7f4 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/Jethr0BuildUpdater.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/Jethr0BuildUpdater.java @@ -92,38 +92,22 @@ protected Jethr0BuildUpdater(Build build, long jethr0JobId) { @Override protected boolean isBuildCompleted() { - if (Objects.equals(_jethr0Status, "completed")) { - return true; - } - - return false; + return Objects.equals(_jethr0Status, "completed"); } @Override protected boolean isBuildFailing() { - if (!Objects.equals(_jethr0Result, "passed")) { - return true; - } - - return false; + return !Objects.equals(_jethr0Result, "passed"); } @Override protected boolean isBuildQueued() { - if (Objects.equals(_jethr0Status, "queued")) { - return true; - } - - return false; + return Objects.equals(_jethr0Status, "queued"); } @Override protected boolean isBuildRunning() { - if (Objects.equals(_jethr0Status, "running")) { - return true; - } - - return false; + return Objects.equals(_jethr0Status, "running"); } @Override diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/LegacyDataArchive.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/LegacyDataArchive.java index f6ec29bb4d1716..1e24e85dac0ebb 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/LegacyDataArchive.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/LegacyDataArchive.java @@ -54,13 +54,8 @@ public boolean isUpdated() { String gitCommitMessage = localGitCommit.getMessage(); - if (gitCommitMessage.contains( - latestTestLocalGitCommit.getAbbreviatedSHA())) { - - return true; - } - - return false; + return gitCommitMessage.contains( + latestTestLocalGitCommit.getAbbreviatedSHA()); } public void stageLegacyDataArchive() throws IOException { diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PortalTestSuiteUpstreamControllerBuildRunner.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PortalTestSuiteUpstreamControllerBuildRunner.java index f834cb4ad7c886..d7cf7773abaaca 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PortalTestSuiteUpstreamControllerBuildRunner.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PortalTestSuiteUpstreamControllerBuildRunner.java @@ -490,11 +490,7 @@ private boolean _previousBuildHasCurrentSHA( String previousPortalBranchSHA = matcher.group("branchSHA"); - if (portalBranchSHA.equals(previousPortalBranchSHA)) { - return true; - } - - return false; + return portalBranchSHA.equals(previousPortalBranchSHA); } private static final Pattern _portalBranchSHAPattern = Pattern.compile( diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PortalTestSuiteUpstreamControllerSingleSuiteBuildRunner.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PortalTestSuiteUpstreamControllerSingleSuiteBuildRunner.java index a510461abfa14d..8851ae7eeabfa4 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PortalTestSuiteUpstreamControllerSingleSuiteBuildRunner.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PortalTestSuiteUpstreamControllerSingleSuiteBuildRunner.java @@ -222,11 +222,7 @@ private boolean _allowConcurrentBuilds() { allowConcurrentBuildsString = allowConcurrentBuildsString.toLowerCase(); allowConcurrentBuildsString = allowConcurrentBuildsString.trim(); - if (!allowConcurrentBuildsString.equals("true")) { - return false; - } - - return true; + return allowConcurrentBuildsString.equals("true"); } private boolean _expirePreviousBuild() { diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PortalWorkspaceGitRepository.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PortalWorkspaceGitRepository.java index dcb796dd4031e9..abf6d1a153e4b7 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PortalWorkspaceGitRepository.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PortalWorkspaceGitRepository.java @@ -73,11 +73,7 @@ public boolean bypassCITestRelevant() { JenkinsResultsParserUtil.getCanonicalPath(deletedFile)); } - if (!multiPattern.matchesAll(filePaths.toArray(new String[0]))) { - return false; - } - - return true; + return multiPattern.matchesAll(filePaths.toArray(new String[0])); } public String getLiferayFacesAlloyURL() { diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PullRequest.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PullRequest.java index 122349ce361f7a..9918d78c78041b 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PullRequest.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PullRequest.java @@ -58,11 +58,7 @@ public static String getURL( public static boolean isValidGitHubPullRequestURL(String gitHubURL) { Matcher matcher = _gitHubPullRequestURLPattern.matcher(gitHubURL); - if (matcher.find()) { - return true; - } - - return false; + return matcher.find(); } public Comment addComment(String body) { diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PullRequestPortalTopLevelBuild.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PullRequestPortalTopLevelBuild.java index 1a2fcc004253b1..1ef35afa86c148 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PullRequestPortalTopLevelBuild.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/PullRequestPortalTopLevelBuild.java @@ -277,11 +277,7 @@ public boolean isUniqueFailure() { } } - if (failedDownstreamBuilds.isEmpty()) { - return true; - } - - return false; + return failedDownstreamBuilds.isEmpty(); } protected Element getFailedStableJobSummaryElement() { diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/QAWebsitesControllerBuildRunner.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/QAWebsitesControllerBuildRunner.java index 78b1f13300e5e0..3dc8ece6a6e769 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/QAWebsitesControllerBuildRunner.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/QAWebsitesControllerBuildRunner.java @@ -201,11 +201,7 @@ private boolean _allowConcurrentBuilds() { allowConcurrentBuildsString = allowConcurrentBuildsString.toLowerCase(); allowConcurrentBuildsString = allowConcurrentBuildsString.trim(); - if (!allowConcurrentBuildsString.equals("true")) { - return false; - } - - return true; + return allowConcurrentBuildsString.equals("true"); } private boolean _expirePreviousBuild() { diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/RootCauseAnalysisToolTopLevelBuildRunner.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/RootCauseAnalysisToolTopLevelBuildRunner.java index 68ab754ad28388..22abe2e163f2c1 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/RootCauseAnalysisToolTopLevelBuildRunner.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/RootCauseAnalysisToolTopLevelBuildRunner.java @@ -460,11 +460,7 @@ private boolean _isFunctionalBatch() { String portalBatchName = getBuildParameter( _NAME_BUILD_PARAMETER_PORTAL_BATCH); - if (portalBatchName.startsWith("functional")) { - return true; - } - - return false; + return portalBatchName.startsWith("functional"); } private boolean _isJUnitBatch() { diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/github/webhook/GitHubWebhookPayloadProcessor.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/github/webhook/GitHubWebhookPayloadProcessor.java index 736f60a8f25998..7ce85815f25101 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/github/webhook/GitHubWebhookPayloadProcessor.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/github/webhook/GitHubWebhookPayloadProcessor.java @@ -303,11 +303,7 @@ public boolean isJenkinsJobEnabled() { } public boolean isValidAutopull(String repo) { - if (repo.startsWith("com-liferay-")) { - return true; - } - - return false; + return repo.startsWith("com-liferay-"); } public boolean isValidCIMergeFile(PullRequest pullRequest) { @@ -707,21 +703,12 @@ protected boolean isBlank(String string) { string = string.trim(); - if (string.isEmpty()) { - return true; - } - - return false; + return string.isEmpty(); } protected boolean isBotPush(PushEventPayload pushEventPayload) { - if (JenkinsResultsParserUtil.isNullOrEmpty( - getSubrepoPath(pushEventPayload))) { - - return false; - } - - return true; + return !JenkinsResultsParserUtil.isNullOrEmpty( + getSubrepoPath(pushEventPayload)); } protected boolean isLiferayUser(String gitHubUsername) { @@ -762,11 +749,7 @@ protected boolean isLiferayUser(String gitHubUsername) { protected boolean isSynchronizeablePullRequest(PullRequest pullRequest) { String receiverUsername = pullRequest.getReceiverUsername(); - if (receiverUsername.equals("brianchandotcom")) { - return false; - } - - return true; + return !receiverUsername.equals("brianchandotcom"); } protected boolean isTestablePullRequest(PullRequest pullRequest) { @@ -1058,11 +1041,7 @@ protected boolean isValidPullRequestRefSHA( JSONObject commitJSONObject = new JSONObject(processURL(sb.toString())); - if (!commitJSONObject.has("sha")) { - return false; - } - - return true; + return commitJSONObject.has("sha"); } protected String join(String[] array) { diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/BaseTestClass.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/BaseTestClass.java index bef20cfbec6dc5..de42ab0d7e0c50 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/BaseTestClass.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/BaseTestClass.java @@ -49,11 +49,7 @@ public boolean equals(Object object) { return false; } - if (Objects.equals(hashCode(), object.hashCode())) { - return true; - } - - return false; + return Objects.equals(hashCode(), object.hashCode()); } @Override diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/BatchTestClassGroup.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/BatchTestClassGroup.java index 7f299f47d0fbda..5b01bf05029041 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/BatchTestClassGroup.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/BatchTestClassGroup.java @@ -797,11 +797,7 @@ protected boolean isStableTestSuiteBatch(String batchName) { Collections.addAll(testBatchNames, jobPropertyValue.split(",")); } - if (testBatchNames.contains(batchName)) { - return true; - } - - return false; + return testBatchNames.contains(batchName); } protected void recordJobProperties(List jobProperties) { diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/FunctionalBatchTestClassGroup.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/FunctionalBatchTestClassGroup.java index 270dc73df369e3..710c1c04497b8b 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/FunctionalBatchTestClassGroup.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/FunctionalBatchTestClassGroup.java @@ -139,11 +139,7 @@ public String getWorkspaceName() { public boolean isUpgradeFile(File file) { Matcher matcher = _upgradeFileNamePattern.matcher(file.toString()); - if (matcher.find()) { - return true; - } - - return false; + return matcher.find(); } protected FunctionalBatchTestClassGroup( diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/SemVerModulesBatchTestClassGroup.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/SemVerModulesBatchTestClassGroup.java index 77c261e8312095..352182dcd1fe50 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/SemVerModulesBatchTestClassGroup.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/SemVerModulesBatchTestClassGroup.java @@ -63,11 +63,7 @@ protected boolean isQuarterlyReleaseBranch() { _quarterlyReleaseNamePattern.matcher( portalGitWorkingDirectory.getUpstreamBranchName()); - if (quarterlyReleaseNameMatcher.find()) { - return true; - } - - return false; + return quarterlyReleaseNameMatcher.find(); } @Override diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/SemanticVersioningTestClassGroup.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/SemanticVersioningTestClassGroup.java index 1d3a67e47f724e..97886a8f3fbe5a 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/SemanticVersioningTestClassGroup.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/test/clazz/group/SemanticVersioningTestClassGroup.java @@ -66,11 +66,7 @@ protected boolean isQuarterlyReleaseBranch() { _quarterlyReleaseNamePattern.matcher( portalGitWorkingDirectory.getUpstreamBranchName()); - if (quarterlyReleaseNameMatcher.find()) { - return true; - } - - return false; + return quarterlyReleaseNameMatcher.find(); } private static final Pattern _quarterlyReleaseNamePattern = Pattern.compile( diff --git a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/testray/TestrayCaseResult.java b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/testray/TestrayCaseResult.java index 500b465d044f2e..eb6b216a6d8e3d 100644 --- a/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/testray/TestrayCaseResult.java +++ b/modules/test/jenkins-results-parser/src/main/java/com/liferay/jenkins/results/parser/testray/TestrayCaseResult.java @@ -448,11 +448,7 @@ private boolean _isSimilarError( return false; } catch (IllegalArgumentException illegalArgumentException) { - if (Objects.equals(thisErrors, previousErrors)) { - return true; - } - - return false; + return Objects.equals(thisErrors, previousErrors); } } diff --git a/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/PoshiGetterUtil.java b/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/PoshiGetterUtil.java index 051f367a1e050d..fd055e3b588b73 100644 --- a/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/PoshiGetterUtil.java +++ b/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/PoshiGetterUtil.java @@ -401,11 +401,7 @@ public static String getUtilityClassName(String simpleClassName) { } public static boolean isValidUtilityClass(String className) { - if (_utilityClassMap.containsValue(className)) { - return true; - } - - return false; + return _utilityClassMap.containsValue(className); } private static Element _preparePoshiXMLElement( diff --git a/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/elements/InlinePoshiComment.java b/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/elements/InlinePoshiComment.java index 665cf06c48b535..e062efcd269129 100644 --- a/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/elements/InlinePoshiComment.java +++ b/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/elements/InlinePoshiComment.java @@ -41,11 +41,7 @@ public PoshiComment clone(String poshiScript) public boolean isPoshiScriptComment(String poshiScript) { poshiScript = poshiScript.trim(); - if (poshiScript.startsWith("//")) { - return true; - } - - return false; + return poshiScript.startsWith("//"); } @Override diff --git a/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/elements/PoshiElement.java b/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/elements/PoshiElement.java index 3bccf1a18fad1e..1be840b930b0eb 100644 --- a/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/elements/PoshiElement.java +++ b/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/elements/PoshiElement.java @@ -783,11 +783,7 @@ protected boolean isConditionValidInParent( } protected boolean isElementType(String name, Element element) { - if (name.equals(element.getName())) { - return true; - } - - return false; + return name.equals(element.getName()); } protected boolean isNestedCondition(String poshiScript) { @@ -910,11 +906,7 @@ protected boolean isValidPoshiScriptStatement( Matcher poshiScriptStatementMatcher = poshiScriptStatementPattern.matcher(poshiScript); - if (poshiScriptStatementMatcher.find()) { - return true; - } - - return false; + return poshiScriptStatementMatcher.find(); } protected boolean isVarAssignedToMacroInvocation(String poshiScript) { diff --git a/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/elements/ReturnPoshiElement.java b/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/elements/ReturnPoshiElement.java index 1e8839b87391fe..79adcdb914e3c9 100644 --- a/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/elements/ReturnPoshiElement.java +++ b/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/elements/ReturnPoshiElement.java @@ -140,11 +140,7 @@ private boolean _isElementType( return false; } - if (isVarAssignedToMacroInvocation(poshiScript)) { - return true; - } - - return false; + return isVarAssignedToMacroInvocation(poshiScript); } return isValidPoshiScriptStatement(_returnPattern, poshiScript); diff --git a/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/elements/VarPoshiElement.java b/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/elements/VarPoshiElement.java index 388987ee1430c7..a355e5924f5d59 100644 --- a/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/elements/VarPoshiElement.java +++ b/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/elements/VarPoshiElement.java @@ -100,11 +100,7 @@ public boolean isDoubleQuotedVar(String value) { return true; } - if (value.matches(_VAR_VALUE_VARIABLE_REGEX)) { - return false; - } - - return true; + return !value.matches(_VAR_VALUE_VARIABLE_REGEX); } @Override diff --git a/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/pql/PQLVariable.java b/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/pql/PQLVariable.java index 0e359c53c204d1..262e7413e8060e 100644 --- a/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/pql/PQLVariable.java +++ b/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/pql/PQLVariable.java @@ -22,11 +22,7 @@ public static boolean isVariable(String variable) { List poshiPropertyNames = PoshiContext.getPoshiPropertyNames(); - if (poshiPropertyNames.contains(variable)) { - return true; - } - - return false; + return poshiPropertyNames.contains(variable); } public PQLVariable(String variable) throws Exception { diff --git a/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/util/StringUtil.java b/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/util/StringUtil.java index 51abc9947649a4..4a2a385bdf60c8 100644 --- a/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/util/StringUtil.java +++ b/modules/test/poshi/poshi-core/src/main/java/com/liferay/poshi/core/util/StringUtil.java @@ -145,11 +145,7 @@ public static boolean contains(String s, String text, String delimiter) { if (pos == -1) { String td = text.concat(delimiter); - if (s.startsWith(td)) { - return true; - } - - return false; + return s.startsWith(td); } return true; @@ -210,11 +206,7 @@ public static boolean endsWith(String s, String end) { String temp = s.substring(s.length() - end.length()); - if (equalsIgnoreCase(temp, end)) { - return true; - } - - return false; + return equalsIgnoreCase(temp, end); } public static boolean equals(String s, String text) { @@ -911,11 +903,7 @@ public static boolean startsWith(String s, String start) { String temp = s.substring(0, start.length()); - if (equalsIgnoreCase(temp, start)) { - return true; - } - - return false; + return equalsIgnoreCase(temp, start); } public static String stripBetween(String s, String begin, String end) { diff --git a/modules/test/poshi/poshi-runner/src/main/java/com/liferay/poshi/runner/selenium/BaseWebDriverImpl.java b/modules/test/poshi/poshi-runner/src/main/java/com/liferay/poshi/runner/selenium/BaseWebDriverImpl.java index ad8b903a8d94b7..a42e8193c3d8ad 100644 --- a/modules/test/poshi/poshi-runner/src/main/java/com/liferay/poshi/runner/selenium/BaseWebDriverImpl.java +++ b/modules/test/poshi/poshi-runner/src/main/java/com/liferay/poshi/runner/selenium/BaseWebDriverImpl.java @@ -1649,11 +1649,7 @@ public boolean isElementPresentAfterWait(String locator) throws Exception { public boolean isHTMLSourceTextPresent(String value) throws Exception { String pageSource = getPageSource(); - if (pageSource.contains(value)) { - return true; - } - - return false; + return pageSource.contains(value); } @Override diff --git a/modules/util/portal-tools-db-partition-schema-validator/src/main/java/com/liferay/portal/tools/db/partition/schema/validator/DBPartitionSchemaValidator.java b/modules/util/portal-tools-db-partition-schema-validator/src/main/java/com/liferay/portal/tools/db/partition/schema/validator/DBPartitionSchemaValidator.java index 1864b4fcfdb5d1..aec75da8ca68ea 100644 --- a/modules/util/portal-tools-db-partition-schema-validator/src/main/java/com/liferay/portal/tools/db/partition/schema/validator/DBPartitionSchemaValidator.java +++ b/modules/util/portal-tools-db-partition-schema-validator/src/main/java/com/liferay/portal/tools/db/partition/schema/validator/DBPartitionSchemaValidator.java @@ -215,11 +215,7 @@ private static boolean _hasColumn( _normalizeName(databaseMetaData, tableName), _normalizeName(databaseMetaData, columnName))) { - if (!resultSet.next()) { - return false; - } - - return true; + return resultSet.next(); } } diff --git a/modules/util/portal-tools-java-parser/src/main/java/com/liferay/portal/tools/java/parser/JavaParser.java b/modules/util/portal-tools-java-parser/src/main/java/com/liferay/portal/tools/java/parser/JavaParser.java index 6d1dc560bf82cb..efbe94f50205fc 100644 --- a/modules/util/portal-tools-java-parser/src/main/java/com/liferay/portal/tools/java/parser/JavaParser.java +++ b/modules/util/portal-tools-java-parser/src/main/java/com/liferay/portal/tools/java/parser/JavaParser.java @@ -933,11 +933,7 @@ private static boolean _isAtLineEnd(String line, int x) { } private static boolean _isAtLineStart(String line, int x) { - if (Validator.isNull(StringUtil.trim(line.substring(0, x)))) { - return true; - } - - return false; + return Validator.isNull(StringUtil.trim(line.substring(0, x))); } private static boolean _isExcludedJavaTerm(ParsedJavaTerm parsedJavaTerm) { diff --git a/modules/util/portal-tools-rest-builder/src/main/java/com/liferay/portal/tools/rest/builder/internal/freemarker/tool/FreeMarkerTool.java b/modules/util/portal-tools-rest-builder/src/main/java/com/liferay/portal/tools/rest/builder/internal/freemarker/tool/FreeMarkerTool.java index fae59962385dc9..2ed77e64aca557 100644 --- a/modules/util/portal-tools-rest-builder/src/main/java/com/liferay/portal/tools/rest/builder/internal/freemarker/tool/FreeMarkerTool.java +++ b/modules/util/portal-tools-rest-builder/src/main/java/com/liferay/portal/tools/rest/builder/internal/freemarker/tool/FreeMarkerTool.java @@ -400,11 +400,7 @@ public List getGraphQLJavaMethodSignatures( requiredType = "query"; } - if (requiredType.equals(graphQLType)) { - return true; - } - - return false; + return requiredType.equals(graphQLType); }); } @@ -1010,11 +1006,7 @@ public boolean hasRequestBodyMediaType( Set mediaTypes = contents.keySet(); - if (!mediaTypes.contains(mediaType)) { - return false; - } - - return true; + return mediaTypes.contains(mediaType); } public boolean isCollection( diff --git a/modules/util/portal-tools-rest-builder/src/main/java/com/liferay/portal/tools/rest/builder/internal/freemarker/tool/java/parser/DTOOpenAPIParser.java b/modules/util/portal-tools-rest-builder/src/main/java/com/liferay/portal/tools/rest/builder/internal/freemarker/tool/java/parser/DTOOpenAPIParser.java index 9b27848d71ae57..84e4ba20e8f4c5 100644 --- a/modules/util/portal-tools-rest-builder/src/main/java/com/liferay/portal/tools/rest/builder/internal/freemarker/tool/java/parser/DTOOpenAPIParser.java +++ b/modules/util/portal-tools-rest-builder/src/main/java/com/liferay/portal/tools/rest/builder/internal/freemarker/tool/java/parser/DTOOpenAPIParser.java @@ -128,11 +128,7 @@ public static boolean isSchemaProperty( String propertySchemaName = entry.getKey(); if (propertySchemaName.equals(propertyName)) { - if (_isSchema(entry.getValue())) { - return true; - } - - return false; + return _isSchema(entry.getValue()); } } diff --git a/modules/util/portal-tools-rest-builder/src/main/java/com/liferay/portal/tools/rest/builder/internal/freemarker/tool/java/parser/ResourceOpenAPIParser.java b/modules/util/portal-tools-rest-builder/src/main/java/com/liferay/portal/tools/rest/builder/internal/freemarker/tool/java/parser/ResourceOpenAPIParser.java index f900fc5f18c91d..c5694a10eeea80 100644 --- a/modules/util/portal-tools-rest-builder/src/main/java/com/liferay/portal/tools/rest/builder/internal/freemarker/tool/java/parser/ResourceOpenAPIParser.java +++ b/modules/util/portal-tools-rest-builder/src/main/java/com/liferay/portal/tools/rest/builder/internal/freemarker/tool/java/parser/ResourceOpenAPIParser.java @@ -1384,11 +1384,7 @@ private static boolean _isSchemaMethod( String schemaName, List tags) { if (!tags.isEmpty()) { - if (tags.contains(schemaName)) { - return true; - } - - return false; + return tags.contains(schemaName); } if (returnType.equals(javaDataTypeMap.get(schemaName))) { diff --git a/modules/util/portal-tools-service-builder/src/main/java/com/liferay/portal/tools/service/builder/Entity.java b/modules/util/portal-tools-service-builder/src/main/java/com/liferay/portal/tools/service/builder/Entity.java index 7d41f732939cd8..2056056ec2a028 100644 --- a/modules/util/portal-tools-service-builder/src/main/java/com/liferay/portal/tools/service/builder/Entity.java +++ b/modules/util/portal-tools-service-builder/src/main/java/com/liferay/portal/tools/service/builder/Entity.java @@ -251,11 +251,7 @@ public boolean equals(Object object) { Entity entity = (Entity)object; - if (_name.equals(entity.getName())) { - return true; - } - - return false; + return _name.equals(entity.getName()); } public String getAlias() { @@ -871,11 +867,7 @@ public boolean hasEntityColumn(String name, String type) { } public boolean hasEntityColumns() { - if (ListUtil.isEmpty(_entityColumns)) { - return false; - } - - return true; + return !ListUtil.isEmpty(_entityColumns); } public boolean hasExternalReferenceCode() { @@ -883,11 +875,7 @@ public boolean hasExternalReferenceCode() { } public boolean hasFinderClassName() { - if (Validator.isNull(_finderClassName)) { - return false; - } - - return true; + return !Validator.isNull(_finderClassName); } @Override @@ -928,11 +916,7 @@ public boolean hasPrimitivePK(boolean includeWrappers) { EntityColumn entityColumn = _getPKEntityColumn(); - if (entityColumn.isPrimitiveType(includeWrappers)) { - return true; - } - - return false; + return entityColumn.isPrimitiveType(includeWrappers); } public boolean hasRemoteService() { @@ -990,27 +974,15 @@ public boolean isContainerModel() { } public boolean isDefaultDataSource() { - if (_dataSource.equals(_DATA_SOURCE_DEFAULT)) { - return true; - } - - return false; + return _dataSource.equals(_DATA_SOURCE_DEFAULT); } public boolean isDefaultSessionFactory() { - if (_sessionFactory.equals(_SESSION_FACTORY_DEFAULT)) { - return true; - } - - return false; + return _sessionFactory.equals(_SESSION_FACTORY_DEFAULT); } public boolean isDefaultTXManager() { - if (_txManager.equals(_TX_MANAGER_DEFAULT)) { - return true; - } - - return false; + return _txManager.equals(_TX_MANAGER_DEFAULT); } public boolean isDeprecated() { @@ -1219,11 +1191,7 @@ public boolean isTrashEnabled() { } public boolean isTreeModel() { - if (hasEntityColumn("treePath")) { - return true; - } - - return false; + return hasEntityColumn("treePath"); } public boolean isTypedModel() { diff --git a/modules/util/portal-tools-service-builder/src/main/java/com/liferay/portal/tools/service/builder/EntityColumn.java b/modules/util/portal-tools-service-builder/src/main/java/com/liferay/portal/tools/service/builder/EntityColumn.java index a0390b4d903ff5..7964df18b35be6 100644 --- a/modules/util/portal-tools-service-builder/src/main/java/com/liferay/portal/tools/service/builder/EntityColumn.java +++ b/modules/util/portal-tools-service-builder/src/main/java/com/liferay/portal/tools/service/builder/EntityColumn.java @@ -145,11 +145,7 @@ public boolean equals(Object object) { EntityColumn entityColumn = (EntityColumn)object; - if (_name.equals(entityColumn.getName())) { - return true; - } - - return false; + return _name.equals(entityColumn.getName()); } public String getAccessorName(String className) { @@ -299,11 +295,7 @@ public String getUserUuidName() { } public boolean hasArrayableOperator() { - if (Validator.isNotNull(_arrayableOperator)) { - return true; - } - - return false; + return Validator.isNotNull(_arrayableOperator); } public boolean hasArrayablePagination() { @@ -320,11 +312,7 @@ public boolean isAccessor() { } public boolean isArrayableAndOperator() { - if (_arrayableOperator.equals("AND")) { - return true; - } - - return false; + return _arrayableOperator.equals("AND"); } public boolean isCaseSensitive() { @@ -332,11 +320,7 @@ public boolean isCaseSensitive() { } public boolean isCollection() { - if (_type.equals("Collection")) { - return true; - } - - return false; + return _type.equals("Collection"); } public boolean isContainerModel() { diff --git a/modules/util/portal-tools-service-builder/src/main/java/com/liferay/portal/tools/service/builder/ServiceBuilder.java b/modules/util/portal-tools-service-builder/src/main/java/com/liferay/portal/tools/service/builder/ServiceBuilder.java index 8c33220db50f97..17595cd708fc54 100644 --- a/modules/util/portal-tools-service-builder/src/main/java/com/liferay/portal/tools/service/builder/ServiceBuilder.java +++ b/modules/util/portal-tools-service-builder/src/main/java/com/liferay/portal/tools/service/builder/ServiceBuilder.java @@ -1788,13 +1788,8 @@ public boolean isCacheFieldPermanent(JavaField javaField) { String className = type.getFullyQualifiedName(); if (className.equals(CacheField.class.getName())) { - if (GetterUtil.getBoolean( - javaAnnotation.getNamedParameter("permanent"))) { - - return true; - } - - return false; + return GetterUtil.getBoolean( + javaAnnotation.getNamedParameter("permanent")); } } @@ -2042,11 +2037,7 @@ public boolean isTxRequiredMethod( return false; } - if (txRequiredMethodNames.contains(javaMethod.getName())) { - return true; - } - - return false; + return txRequiredMethodNames.contains(javaMethod.getName()); } public boolean isVersionGTE_7_0_0() { diff --git a/modules/util/portal-tools-upgrade-table-builder/src/main/java/com/liferay/portal/tools/upgrade/table/builder/UpgradeTableBuilder.java b/modules/util/portal-tools-upgrade-table-builder/src/main/java/com/liferay/portal/tools/upgrade/table/builder/UpgradeTableBuilder.java index e7a61721d81739..902fb47cc301ad 100644 --- a/modules/util/portal-tools-upgrade-table-builder/src/main/java/com/liferay/portal/tools/upgrade/table/builder/UpgradeTableBuilder.java +++ b/modules/util/portal-tools-upgrade-table-builder/src/main/java/com/liferay/portal/tools/upgrade/table/builder/UpgradeTableBuilder.java @@ -554,11 +554,7 @@ private boolean _isRelevantUpgradePackage(String upgradeFileVersion) currentVersion = _releaseInfoVersion.substring(0, 3); } - if (!upgradeFileVersion.startsWith(currentVersion)) { - return false; - } - - return true; + return upgradeFileVersion.startsWith(currentVersion); } private String _read(Path path) throws IOException { diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/ExcludeSyntaxPattern.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/ExcludeSyntaxPattern.java index c7a24ae94a6a30..86ca5244e6949e 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/ExcludeSyntaxPattern.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/ExcludeSyntaxPattern.java @@ -52,11 +52,7 @@ public boolean equals(Object object) { String excludePattern = excludeSyntaxPattern.getExcludePattern(); - if (!excludePattern.equals(_excludePattern)) { - return false; - } - - return true; + return excludePattern.equals(_excludePattern); } public String getExcludePattern() { diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/BNDExportsCheck.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/BNDExportsCheck.java index 0588336bd2cb7a..0c6c09c3e06690 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/BNDExportsCheck.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/BNDExportsCheck.java @@ -317,11 +317,7 @@ public boolean accept(File file) { String fileName = file.getName(); - if (fileName.endsWith(".java")) { - return true; - } - - return false; + return fileName.endsWith(".java"); } }); diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/BaseJSPTermsCheck.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/BaseJSPTermsCheck.java index e166b205c37ea3..b5dd2dbe8d3732 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/BaseJSPTermsCheck.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/BaseJSPTermsCheck.java @@ -262,11 +262,7 @@ private boolean _isInsideComment(String content, int pos) { s = s.substring(0, x); - if (!s.contains("/*")) { - return true; - } - - return false; + return !s.contains("/*"); } private boolean _isJSPTermRequired( diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/BaseServiceImplCheck.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/BaseServiceImplCheck.java index f440f570406401..288acd22a05f3d 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/BaseServiceImplCheck.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/BaseServiceImplCheck.java @@ -137,11 +137,7 @@ protected boolean isInsideComment(String content, int pos) { s = s.substring(0, x); - if (!s.contains("/*")) { - return true; - } - - return false; + return !s.contains("/*"); } } \ No newline at end of file diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/GradleDependencyArtifactsCheck.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/GradleDependencyArtifactsCheck.java index 30755ec577b88b..b25522b0967139 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/GradleDependencyArtifactsCheck.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/GradleDependencyArtifactsCheck.java @@ -303,11 +303,7 @@ private boolean _isTestUtilModule(String absolutePath) { String moduleName = absolutePath.substring(y + 1, x); - if (!moduleName.endsWith("-test-util")) { - return false; - } - - return true; + return moduleName.endsWith("-test-util"); } private String _renameDependencyNames( diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/GradleStylingCheck.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/GradleStylingCheck.java index 8b4d86d8199bfd..6b4b8a1fc9d3cc 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/GradleStylingCheck.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/GradleStylingCheck.java @@ -184,11 +184,7 @@ private boolean _isInSingleLineComment(String content, int position) { line = line.trim(); - if (line.startsWith("//")) { - return true; - } - - return false; + return line.startsWith("//"); } private String _sortFileNames(String content) { diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/IfStatementCheck.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/IfStatementCheck.java index 2b99868585d1b1..33c604b69ae4fa 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/IfStatementCheck.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/IfStatementCheck.java @@ -48,28 +48,51 @@ protected String doProcess( getLineNumber(content, matcher.start())); } - if (!followingCode.startsWith("if (")) { - continue; + if (followingCode.startsWith("if (")) { + IfStatement ifStatement2 = _getIfStatement( + content, ifStatement1.getEnd()); + + String newContent = _combineStatementsWithSameBodies( + content, ifStatement1, ifStatement2); + + if (!content.equals(newContent)) { + if (getSourceProcessor() instanceof JSPSourceProcessor) { + addMessage( + fileName, + "Merge consecutive if-statements when executing " + + "identical code", + getLineNumber(content, matcher.start())); + + continue; + } + + return newContent; + } } + else if (followingCode.startsWith("return false;") || + followingCode.startsWith("return true;")) { - IfStatement ifStatement2 = _getIfStatement( - content, ifStatement1.getEnd()); + String clause = ifStatement1.getClause(); - String newContent = _combineStatementsWithSameBodies( - content, ifStatement1, ifStatement2); + if (clause.contains("instanceof")) { + continue; + } - if (!content.equals(newContent)) { - if (getSourceProcessor() instanceof JSPSourceProcessor) { - addMessage( - fileName, - "Merge consecutive if-statements when executing " + - "identical code", - getLineNumber(content, matcher.start())); + int x = StringUtil.indexOfAny( + clause, new String[] {"&", "<", "=", ">", "|", "^"}); + if (x != -1) { continue; } - return newContent; + String returnStatement = _moveStatementInsideReturn( + ifStatement1.getBody(), clause, followingCode); + + if (returnStatement != null) { + return content.substring(0, ifStatement1.getStart()) + + returnStatement + + followingCode.substring(followingCode.indexOf(";")); + } } } @@ -175,6 +198,30 @@ private IfStatement _getIfStatement(String content, int pos) { StringUtil.trim(content.substring(y + 1)), pos, y + 1); } + private String _moveStatementInsideReturn( + String body, String clause, String followingCode) { + + String strippedParenthesesClause = clause.substring( + 1, clause.length() - 1); + + if (body.equals("return true;") && + followingCode.startsWith("return false;")) { + + return "return " + strippedParenthesesClause; + } + else if (body.equals("return false;") && + followingCode.startsWith("return true;")) { + + if (strippedParenthesesClause.startsWith("!")) { + return "return " + strippedParenthesesClause.substring(1); + } + + return "return !" + strippedParenthesesClause; + } + + return null; + } + private static final Pattern _assignStatementPattern = Pattern.compile( "^(\\w+) =[^;]+;$"); private static final Pattern _ifStatementPattern = Pattern.compile( diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/JavaInnerClassImportsCheck.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/JavaInnerClassImportsCheck.java index 033a452c8cbac1..cce9c6f7031348 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/JavaInnerClassImportsCheck.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/JavaInnerClassImportsCheck.java @@ -169,11 +169,7 @@ private boolean _isRedundantImport( return false; } - if (!fullyQualifiedName.equals(outerClassFullyQualifiedName)) { - return false; - } - - return true; + return fullyQualifiedName.equals(outerClassFullyQualifiedName); } private String _removeInnerClassImport( diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/util/SourceUtil.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/util/SourceUtil.java index 9ab93bd4fe8eaf..e4d9dffd756bcb 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/util/SourceUtil.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/check/util/SourceUtil.java @@ -271,11 +271,7 @@ public static boolean hasTypo(String s1, String s2) { Arrays.sort(chars1); Arrays.sort(chars2); - if (!Arrays.equals(chars1, chars2)) { - return false; - } - - return true; + return Arrays.equals(chars1, chars2); } } } diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/BaseAsUsedCheck.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/BaseAsUsedCheck.java index ad480ad918290b..40ce1a707a5150 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/BaseAsUsedCheck.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/BaseAsUsedCheck.java @@ -633,11 +633,7 @@ private boolean _matchesGetOrSetCall( methodName = getMethodName(parentDetailAST); - if (methodName.matches("(?i)_?set" + variableName)) { - return true; - } - - return false; + return methodName.matches("(?i)_?set" + variableName); } private static final String _MSG_ADD_TO_STRING = "to.string.add"; diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/ComponentAnnotationCheck.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/ComponentAnnotationCheck.java index cff6966a174f5e..8e765da4fe0d4f 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/ComponentAnnotationCheck.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/ComponentAnnotationCheck.java @@ -196,13 +196,8 @@ private boolean _isExceptionMapperService(DetailAST annotationDetailAST) { FullIdent fullIdent = FullIdent.createFullIdent(firstChildDetailAST); - if (!Objects.equals( - fullIdent.getText(), _OSGI_SERVICE_NAME + ".class")) { - - return false; - } - - return true; + return Objects.equals( + fullIdent.getText(), _OSGI_SERVICE_NAME + ".class"); } private static final String _MSG_INCORRECT_CONFIGURATION_POLICY = diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/SelfReferenceCheck.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/SelfReferenceCheck.java index e41ec15ca51295..f0814064bd8299 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/SelfReferenceCheck.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/SelfReferenceCheck.java @@ -109,11 +109,7 @@ private boolean _isInsideInnerClass( (parentDetailAST.getType() == TokenTypes.ENUM_DEF) || (parentDetailAST.getType() == TokenTypes.INTERFACE_DEF)) { - if (className.equals(getName(parentDetailAST))) { - return false; - } - - return true; + return !className.equals(getName(parentDetailAST)); } parentDetailAST = parentDetailAST.getParent(); diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/URLInputStreamCheck.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/URLInputStreamCheck.java index ea0eb6b2104ce7..458652db546039 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/URLInputStreamCheck.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/URLInputStreamCheck.java @@ -133,11 +133,7 @@ private boolean _isURLOpenStream(DetailAST methodCallDetailAST) { return false; } - if (Objects.equals(getTypeName(variableTypeDetailAST, false), "URL")) { - return true; - } - - return false; + return Objects.equals(getTypeName(variableTypeDetailAST, false), "URL"); } private static final String _MSG_REPLACE_USAGE = "replace.usage"; diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/UnnecessaryAssignCheck.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/UnnecessaryAssignCheck.java index 69e8ce8486d9a6..d2aa3f3995f5d4 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/UnnecessaryAssignCheck.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/checkstyle/check/UnnecessaryAssignCheck.java @@ -168,11 +168,7 @@ private boolean _hasPrecedingAssignStatement( firstChildDetailAST = firstChildDetailAST.getFirstChild(); - if (variableName.equals(firstChildDetailAST.getText())) { - return true; - } - - return false; + return variableName.equals(firstChildDetailAST.getText()); } private boolean _isUsedInFinallyStatement( diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/parser/BaseJavaTerm.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/parser/BaseJavaTerm.java index ffc05a7a305cf8..4cec122d632c7f 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/parser/BaseJavaTerm.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/parser/BaseJavaTerm.java @@ -96,11 +96,7 @@ public boolean hasAnnotation() { Matcher matcher = pattern.matcher(_content); - if (matcher.find()) { - return true; - } - - return false; + return matcher.find(); } @Override @@ -128,11 +124,8 @@ public boolean isAbstract() { @Override public boolean isDefault() { - if (Objects.equals(_accessModifier, JavaTerm.ACCESS_MODIFIER_DEFAULT)) { - return true; - } - - return false; + return Objects.equals( + _accessModifier, JavaTerm.ACCESS_MODIFIER_DEFAULT); } @Override @@ -187,31 +180,19 @@ public boolean isJavaVariable() { @Override public boolean isPrivate() { - if (Objects.equals(_accessModifier, JavaTerm.ACCESS_MODIFIER_PRIVATE)) { - return true; - } - - return false; + return Objects.equals( + _accessModifier, JavaTerm.ACCESS_MODIFIER_PRIVATE); } @Override public boolean isProtected() { - if (Objects.equals( - _accessModifier, JavaTerm.ACCESS_MODIFIER_PROTECTED)) { - - return true; - } - - return false; + return Objects.equals( + _accessModifier, JavaTerm.ACCESS_MODIFIER_PROTECTED); } @Override public boolean isPublic() { - if (Objects.equals(_accessModifier, JavaTerm.ACCESS_MODIFIER_PUBLIC)) { - return true; - } - - return false; + return Objects.equals(_accessModifier, JavaTerm.ACCESS_MODIFIER_PUBLIC); } @Override diff --git a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/processor/BNDSourceProcessor.java b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/processor/BNDSourceProcessor.java index 8ad4a6d05dd75b..738132a2d9c6d5 100644 --- a/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/processor/BNDSourceProcessor.java +++ b/modules/util/source-formatter/src/main/java/com/liferay/source/formatter/processor/BNDSourceProcessor.java @@ -57,11 +57,7 @@ private boolean _checkModulesPropertiesFile() { List fileExtensions = sourceFormatterArgs.getFileExtensions(); - if (!fileExtensions.contains("bnd")) { - return false; - } - - return true; + return fileExtensions.contains("bnd"); } private static final String[] _INCLUDES = {"**/*.bnd"}; diff --git a/portal-impl/src/com/liferay/portal/dao/jdbc/DataSourceFactoryImpl.java b/portal-impl/src/com/liferay/portal/dao/jdbc/DataSourceFactoryImpl.java index ee96dac3a23e52..a6badfe712439c 100644 --- a/portal-impl/src/com/liferay/portal/dao/jdbc/DataSourceFactoryImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/jdbc/DataSourceFactoryImpl.java @@ -264,11 +264,7 @@ protected DataSource initDataSourceHikariCP(Properties properties) } protected boolean isPropertyLiferay(String key) { - if (StringUtil.equalsIgnoreCase(key, "jndi.name")) { - return true; - } - - return false; + return StringUtil.equalsIgnoreCase(key, "jndi.name"); } protected void testDatabaseClass(String driverClassName) throws Exception { diff --git a/portal-impl/src/com/liferay/portal/dao/jdbc/postgresql/PostgreSQLJDBCUtil.java b/portal-impl/src/com/liferay/portal/dao/jdbc/postgresql/PostgreSQLJDBCUtil.java index 1cd73a4d951c0d..088b2defe50874 100644 --- a/portal-impl/src/com/liferay/portal/dao/jdbc/postgresql/PostgreSQLJDBCUtil.java +++ b/portal-impl/src/com/liferay/portal/dao/jdbc/postgresql/PostgreSQLJDBCUtil.java @@ -67,11 +67,7 @@ public static byte[] getLargeObject(ResultSet resultSet, String name) public static boolean isPGStatement(Statement statement) throws SQLException { - if (statement.isWrapperFor(PGStatement.class)) { - return true; - } - - return false; + return statement.isWrapperFor(PGStatement.class); } public static void setLargeObject( diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/PluginAutoDeployListenerHelper.java b/portal-impl/src/com/liferay/portal/deploy/auto/PluginAutoDeployListenerHelper.java index 9df28791ce604e..1c0d5beeb90862 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/PluginAutoDeployListenerHelper.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/PluginAutoDeployListenerHelper.java @@ -53,11 +53,7 @@ public boolean isLayoutTemplatePlugin() throws AutoDeployException { public boolean isLiferayPackage() { String fileName = _file.getName(); - if (fileName.endsWith(".lpkg")) { - return true; - } - - return false; + return fileName.endsWith(".lpkg"); } public boolean isMatchingFile(String checkXmlFile) diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/HookHotDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/hot/HookHotDeployListener.java index 814485d79097de..c3f06d670f641b 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/HookHotDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/HookHotDeployListener.java @@ -2243,11 +2243,7 @@ public String[] getStringArray() { } public boolean isOverridden() { - if (Validator.isNotNull(_servletContextName)) { - return true; - } - - return false; + return Validator.isNotNull(_servletContextName); } @Override diff --git a/portal-impl/src/com/liferay/portal/format/util/PhoneNumberFormatUtil.java b/portal-impl/src/com/liferay/portal/format/util/PhoneNumberFormatUtil.java index c0923b6b69c160..39c18197becb66 100644 --- a/portal-impl/src/com/liferay/portal/format/util/PhoneNumberFormatUtil.java +++ b/portal-impl/src/com/liferay/portal/format/util/PhoneNumberFormatUtil.java @@ -43,11 +43,7 @@ public static boolean validate(String phoneNumber) { return phoneNumberFormat.validate(phoneNumber); } - if (Validator.isNull(phoneNumber)) { - return false; - } - - return true; + return !Validator.isNull(phoneNumber); } private PhoneNumberFormatUtil() { diff --git a/portal-impl/src/com/liferay/portal/model/BaseModelHintsImpl.java b/portal-impl/src/com/liferay/portal/model/BaseModelHintsImpl.java index f0d1819a990c70..9ccc0ae971ea75 100644 --- a/portal-impl/src/com/liferay/portal/model/BaseModelHintsImpl.java +++ b/portal-impl/src/com/liferay/portal/model/BaseModelHintsImpl.java @@ -293,11 +293,7 @@ public boolean hasField(String model, String field) { @Override public boolean isCustomValidator(String validatorName) { - if (validatorName.equals("custom")) { - return true; - } - - return false; + return validatorName.equals("custom"); } @Override diff --git a/portal-impl/src/com/liferay/portal/model/impl/GroupImpl.java b/portal-impl/src/com/liferay/portal/model/impl/GroupImpl.java index 2f1fb565cd1fba..0e732be8410006 100644 --- a/portal-impl/src/com/liferay/portal/model/impl/GroupImpl.java +++ b/portal-impl/src/com/liferay/portal/model/impl/GroupImpl.java @@ -916,11 +916,7 @@ public boolean isContentSharingWithChildrenEnabled() { public boolean isControlPanel() { String groupKey = getGroupKey(); - if (groupKey.equals(GroupConstants.CONTROL_PANEL)) { - return true; - } - - return false; + return groupKey.equals(GroupConstants.CONTROL_PANEL); } @Override @@ -936,11 +932,7 @@ public boolean isDepot() { public boolean isGuest() { String groupKey = getGroupKey(); - if (groupKey.equals(GroupConstants.GUEST)) { - return true; - } - - return false; + return groupKey.equals(GroupConstants.GUEST); } @Override diff --git a/portal-impl/src/com/liferay/portal/model/impl/LayoutImpl.java b/portal-impl/src/com/liferay/portal/model/impl/LayoutImpl.java index 73b3ab2b7228cf..3ee5efcda9ac02 100644 --- a/portal-impl/src/com/liferay/portal/model/impl/LayoutImpl.java +++ b/portal-impl/src/com/liferay/portal/model/impl/LayoutImpl.java @@ -119,11 +119,7 @@ public class LayoutImpl extends LayoutBaseImpl { public static boolean hasFriendlyURLKeyword(String friendlyURL) { String keyword = _getFriendlyURLKeyword(friendlyURL); - if (Validator.isNotNull(keyword)) { - return true; - } - - return false; + return Validator.isNotNull(keyword); } public static int validateFriendlyURL(String friendlyURL) { @@ -1062,11 +1058,7 @@ public boolean isContentDisplayPage() { typeSettingsUnicodeProperties.getProperty( LayoutTypePortletConstants.DEFAULT_ASSET_PUBLISHER_PORTLET_ID); - if (Validator.isNotNull(defaultAssetPublisherPortletId)) { - return true; - } - - return false; + return Validator.isNotNull(defaultAssetPublisherPortletId); } @Override @@ -1084,11 +1076,7 @@ public boolean isCustomizable() { LayoutTypePortlet layoutTypePortlet = (LayoutTypePortlet)getLayoutType(); - if (layoutTypePortlet.isCustomizable()) { - return true; - } - - return false; + return layoutTypePortlet.isCustomizable(); } @Override @@ -1506,20 +1494,12 @@ public boolean isTypePortlet() { @Override public boolean isTypeURL() { - if (Objects.equals(getType(), LayoutConstants.TYPE_URL)) { - return true; - } - - return false; + return Objects.equals(getType(), LayoutConstants.TYPE_URL); } @Override public boolean isTypeUtility() { - if (Objects.equals(getType(), LayoutConstants.TYPE_UTILITY)) { - return true; - } - - return false; + return Objects.equals(getType(), LayoutConstants.TYPE_UTILITY); } @Override diff --git a/portal-impl/src/com/liferay/portal/model/impl/LayoutRevisionImpl.java b/portal-impl/src/com/liferay/portal/model/impl/LayoutRevisionImpl.java index 75a59f730e785e..ea5e3b805700c5 100644 --- a/portal-impl/src/com/liferay/portal/model/impl/LayoutRevisionImpl.java +++ b/portal-impl/src/com/liferay/portal/model/impl/LayoutRevisionImpl.java @@ -274,11 +274,7 @@ public String getTypeSettingsProperty(String key, String defaultValue) { @Override public boolean hasChildren() { - if (!getChildren().isEmpty()) { - return true; - } - - return false; + return !getChildren().isEmpty(); } @Override @@ -290,11 +286,7 @@ public boolean isContentDisplayPage() { typeSettingsUnicodeProperties.getProperty( LayoutTypePortletConstants.DEFAULT_ASSET_PUBLISHER_PORTLET_ID); - if (Validator.isNotNull(defaultAssetPublisherPortletId)) { - return true; - } - - return false; + return Validator.isNotNull(defaultAssetPublisherPortletId); } @Override @@ -314,11 +306,7 @@ public boolean isCustomizable() throws PortalException { LayoutTypePortlet layoutTypePortlet = (LayoutTypePortlet)layout.getLayoutType(); - if (layoutTypePortlet.isCustomizable()) { - return true; - } - - return false; + return layoutTypePortlet.isCustomizable(); } @Override diff --git a/portal-impl/src/com/liferay/portal/model/impl/LayoutTemplateImpl.java b/portal-impl/src/com/liferay/portal/model/impl/LayoutTemplateImpl.java index 03c8a25b03aa4c..a0f190dcc6c349 100644 --- a/portal-impl/src/com/liferay/portal/model/impl/LayoutTemplateImpl.java +++ b/portal-impl/src/com/liferay/portal/model/impl/LayoutTemplateImpl.java @@ -63,13 +63,8 @@ public boolean equals(LayoutTemplate layoutTemplate) { return false; } - if (Objects.equals( - getLayoutTemplateId(), layoutTemplate.getLayoutTemplateId())) { - - return true; - } - - return false; + return Objects.equals( + getLayoutTemplateId(), layoutTemplate.getLayoutTemplateId()); } @Override diff --git a/portal-impl/src/com/liferay/portal/model/impl/LayoutTypePortletImpl.java b/portal-impl/src/com/liferay/portal/model/impl/LayoutTypePortletImpl.java index 38b4d6a39a5b37..9cd720742320d5 100644 --- a/portal-impl/src/com/liferay/portal/model/impl/LayoutTypePortletImpl.java +++ b/portal-impl/src/com/liferay/portal/model/impl/LayoutTypePortletImpl.java @@ -840,11 +840,7 @@ public boolean hasStateMax() { @Override public boolean hasStateMaxPortletId(String portletId) { - if (StringUtil.contains(getStateMax(), portletId)) { - return true; - } - - return false; + return StringUtil.contains(getStateMax(), portletId); } @Override @@ -860,11 +856,7 @@ public boolean hasStateMin() { @Override public boolean hasStateMinPortletId(String portletId) { - if (StringUtil.contains(getStateMin(), portletId)) { - return true; - } - - return false; + return StringUtil.contains(getStateMin(), portletId); } @Override @@ -933,11 +925,7 @@ public boolean isColumnCustomizable(String columnId) { boolean customizable = GetterUtil.getBoolean(customizableString); if (customizable) { - if (isLayoutSetPrototype()) { - return false; - } - - return true; + return !isLayoutSetPrototype(); } if (hasUserPreferences()) { diff --git a/portal-impl/src/com/liferay/portal/model/impl/PortletImpl.java b/portal-impl/src/com/liferay/portal/model/impl/PortletImpl.java index 548d13f51ab165..5ba64f2816951e 100644 --- a/portal-impl/src/com/liferay/portal/model/impl/PortletImpl.java +++ b/portal-impl/src/com/liferay/portal/model/impl/PortletImpl.java @@ -2334,11 +2334,7 @@ public boolean hasPortletMode(String mimeType, PortletMode portletMode) { return false; } - if (mimeTypePortletModes.contains(portletMode.toString())) { - return true; - } - - return false; + return mimeTypePortletModes.contains(portletMode.toString()); } /** @@ -2385,11 +2381,7 @@ public boolean hasWindowState(String mimeType, WindowState windowState) { return false; } - if (mimeTypeWindowStates.contains(windowState.toString())) { - return true; - } - - return false; + return mimeTypeWindowStates.contains(windowState.toString()); } /** diff --git a/portal-impl/src/com/liferay/portal/model/impl/ThemeImpl.java b/portal-impl/src/com/liferay/portal/model/impl/ThemeImpl.java index 00f9f644721084..43ff97f776e2a1 100644 --- a/portal-impl/src/com/liferay/portal/model/impl/ThemeImpl.java +++ b/portal-impl/src/com/liferay/portal/model/impl/ThemeImpl.java @@ -89,11 +89,7 @@ public boolean equals(Object object) { Theme theme = (Theme)object; - if (Objects.equals(getThemeId(), theme.getThemeId())) { - return true; - } - - return false; + return Objects.equals(getThemeId(), theme.getThemeId()); } @Override @@ -402,11 +398,7 @@ public boolean getWARFile() { @Override public boolean hasColorSchemes() { - if (!_colorSchemesMap.isEmpty()) { - return true; - } - - return false; + return !_colorSchemesMap.isEmpty(); } @Override diff --git a/portal-impl/src/com/liferay/portal/model/impl/UserImpl.java b/portal-impl/src/com/liferay/portal/model/impl/UserImpl.java index 1805572e9649ac..1c9fc732c1b45d 100644 --- a/portal-impl/src/com/liferay/portal/model/impl/UserImpl.java +++ b/portal-impl/src/com/liferay/portal/model/impl/UserImpl.java @@ -1006,11 +1006,7 @@ public boolean isTermsOfUseComplete() { getCompanyId(), PropsKeys.TERMS_OF_USE_REQUIRED, PropsValues.TERMS_OF_USE_REQUIRED); - if (termsOfUseRequired) { - return false; - } - - return true; + return !termsOfUseRequired; } @Override diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileEntry.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileEntry.java index a6e349c9530ba7..f84b232c9eeb2d 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileEntry.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileEntry.java @@ -87,11 +87,7 @@ public boolean equals(Object object) { LiferayFileEntry liferayFileEntry = (LiferayFileEntry)object; - if (Objects.equals(_dlFileEntry, liferayFileEntry._dlFileEntry)) { - return true; - } - - return false; + return Objects.equals(_dlFileEntry, liferayFileEntry._dlFileEntry); } @Override diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileShortcut.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileShortcut.java index 8285432b6dd997..d32bae8c6a8556 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileShortcut.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileShortcut.java @@ -72,13 +72,8 @@ public boolean equals(Object object) { LiferayFileShortcut liferayFileShortcut = (LiferayFileShortcut)object; - if (Objects.equals( - _dlFileShortcut, liferayFileShortcut._dlFileShortcut)) { - - return true; - } - - return false; + return Objects.equals( + _dlFileShortcut, liferayFileShortcut._dlFileShortcut); } @Override diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileVersion.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileVersion.java index 0f8bff886909b9..b9370319211052 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileVersion.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFileVersion.java @@ -58,11 +58,8 @@ public boolean equals(Object object) { LiferayFileVersion liferayFileVersion = (LiferayFileVersion)object; - if (Objects.equals(_dlFileVersion, liferayFileVersion._dlFileVersion)) { - return true; - } - - return false; + return Objects.equals( + _dlFileVersion, liferayFileVersion._dlFileVersion); } @Override diff --git a/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFolder.java b/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFolder.java index 8ef48ae1559dba..4b14e3589c8579 100644 --- a/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFolder.java +++ b/portal-impl/src/com/liferay/portal/repository/liferayrepository/model/LiferayFolder.java @@ -79,11 +79,7 @@ public boolean equals(Object object) { LiferayFolder liferayFolder = (LiferayFolder)object; - if (Objects.equals(_dlFolder, liferayFolder._dlFolder)) { - return true; - } - - return false; + return Objects.equals(_dlFolder, liferayFolder._dlFolder); } @Override @@ -300,56 +296,32 @@ public boolean isRoot() { @Override public boolean isSupportsLocking() { - if (isMountPoint()) { - return false; - } - - return true; + return !isMountPoint(); } @Override public boolean isSupportsMetadata() { - if (isMountPoint()) { - return false; - } - - return true; + return !isMountPoint(); } @Override public boolean isSupportsMultipleUpload() { - if (isMountPoint()) { - return false; - } - - return true; + return !isMountPoint(); } @Override public boolean isSupportsShortcuts() { - if (isMountPoint()) { - return false; - } - - return true; + return !isMountPoint(); } @Override public boolean isSupportsSocial() { - if (isMountPoint()) { - return false; - } - - return true; + return !isMountPoint(); } @Override public boolean isSupportsSubscribing() { - if (isMountPoint()) { - return false; - } - - return true; + return !isMountPoint(); } @Override diff --git a/portal-impl/src/com/liferay/portal/security/permission/AdvancedPermissionChecker.java b/portal-impl/src/com/liferay/portal/security/permission/AdvancedPermissionChecker.java index 49121991aac52d..dc21063769efbe 100644 --- a/portal-impl/src/com/liferay/portal/security/permission/AdvancedPermissionChecker.java +++ b/portal-impl/src/com/liferay/portal/security/permission/AdvancedPermissionChecker.java @@ -823,29 +823,15 @@ protected boolean isGroupAdminImpl(Group group) throws Exception { } if (group.isCompany()) { - if (isCompanyAdmin()) { - return true; - } - - return false; + return isCompanyAdmin(); } else if (group.isLayoutPrototype()) { - if (LayoutPrototypePermissionUtil.contains( - this, group.getClassPK(), ActionKeys.UPDATE)) { - - return true; - } - - return false; + return LayoutPrototypePermissionUtil.contains( + this, group.getClassPK(), ActionKeys.UPDATE); } else if (group.isLayoutSetPrototype()) { - if (LayoutSetPrototypePermissionUtil.contains( - this, group.getClassPK(), ActionKeys.UPDATE)) { - - return true; - } - - return false; + return LayoutSetPrototypePermissionUtil.contains( + this, group.getClassPK(), ActionKeys.UPDATE); } else if (group.isOrganization()) { long organizationId = group.getOrganizationId(); @@ -941,22 +927,12 @@ protected boolean isGroupOwnerImpl(Group group) throws PortalException { } if (group.isLayoutPrototype()) { - if (LayoutPrototypePermissionUtil.contains( - this, group.getClassPK(), ActionKeys.UPDATE)) { - - return true; - } - - return false; + return LayoutPrototypePermissionUtil.contains( + this, group.getClassPK(), ActionKeys.UPDATE); } else if (group.isLayoutSetPrototype()) { - if (LayoutSetPrototypePermissionUtil.contains( - this, group.getClassPK(), ActionKeys.UPDATE)) { - - return true; - } - - return false; + return LayoutSetPrototypePermissionUtil.contains( + this, group.getClassPK(), ActionKeys.UPDATE); } else if (group.isOrganization()) { long organizationId = group.getOrganizationId(); diff --git a/portal-impl/src/com/liferay/portal/security/permission/ResourceActionsImpl.java b/portal-impl/src/com/liferay/portal/security/permission/ResourceActionsImpl.java index 649ca3de4ab41c..285d5dd9f5e495 100644 --- a/portal-impl/src/com/liferay/portal/security/permission/ResourceActionsImpl.java +++ b/portal-impl/src/com/liferay/portal/security/permission/ResourceActionsImpl.java @@ -420,11 +420,7 @@ public List getRoles( @Override public boolean isPortalModelResource(String modelResource) { - if (_portalModelResources.contains(modelResource)) { - return true; - } - - return false; + return _portalModelResources.contains(modelResource); } @Override @@ -432,11 +428,7 @@ public boolean isRootModelResource(String modelResource) { Collection rootModelResources = _portletRootModelResources.values(); - if (rootModelResources.contains(modelResource)) { - return true; - } - - return false; + return rootModelResources.contains(modelResource); } @Override diff --git a/portal-impl/src/com/liferay/portal/security/pwd/PwdAuthenticator.java b/portal-impl/src/com/liferay/portal/security/pwd/PwdAuthenticator.java index f80791e5839a5c..dded70a9738801 100644 --- a/portal-impl/src/com/liferay/portal/security/pwd/PwdAuthenticator.java +++ b/portal-impl/src/com/liferay/portal/security/pwd/PwdAuthenticator.java @@ -62,11 +62,7 @@ else if (GetterUtil.getBoolean( encryptedPassword = Base64.encode( digester.digest(shardKey.getBytes(StringPool.UTF8))); - if (clearTextPassword.equals(encryptedPassword)) { - return true; - } - - return false; + return clearTextPassword.equals(encryptedPassword); } catch (NoSuchAlgorithmException noSuchAlgorithmException) { throw new SystemException(noSuchAlgorithmException); diff --git a/portal-impl/src/com/liferay/portal/service/impl/GroupLocalServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/GroupLocalServiceImpl.java index 6a1f6fa4ef2134..d3c20c25e14ae4 100644 --- a/portal-impl/src/com/liferay/portal/service/impl/GroupLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portal/service/impl/GroupLocalServiceImpl.java @@ -4747,11 +4747,7 @@ protected boolean isCompanyGroup(HttpPrincipal httpPrincipal, Group group) { ClassName className = ClassNameServiceHttp.fetchByClassNameId( httpPrincipal, group.getClassNameId()); - if (Objects.equals(className.getValue(), Company.class.getName())) { - return true; - } - - return false; + return Objects.equals(className.getValue(), Company.class.getName()); } protected boolean isParentGroup(long parentGroupId, long groupId) @@ -4767,13 +4763,8 @@ protected boolean isParentGroup(long parentGroupId, long groupId) String treePath = group.getTreePath(); - if (treePath.contains( - StringPool.SLASH + parentGroupId + StringPool.SLASH)) { - - return true; - } - - return false; + return treePath.contains( + StringPool.SLASH + parentGroupId + StringPool.SLASH); } protected boolean isStaging(ServiceContext serviceContext) { diff --git a/portal-impl/src/com/liferay/portal/service/impl/LayoutRevisionLocalServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/LayoutRevisionLocalServiceImpl.java index 9f5980575bae37..1fc48c647198e6 100644 --- a/portal-impl/src/com/liferay/portal/service/impl/LayoutRevisionLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portal/service/impl/LayoutRevisionLocalServiceImpl.java @@ -730,11 +730,7 @@ protected boolean isWorkflowEnabled(long plid) throws PortalException { LayoutTypeControllerTracker.getLayoutTypeController( layout.getType()); - if (layoutTypeController.isWorkflowEnabled()) { - return true; - } - - return false; + return layoutTypeController.isWorkflowEnabled(); } protected LayoutRevision updateMajor(LayoutRevision layoutRevision) diff --git a/portal-impl/src/com/liferay/portal/service/impl/MembershipRequestLocalServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/MembershipRequestLocalServiceImpl.java index 7c94f39b57bc89..3418b45376cd4a 100644 --- a/portal-impl/src/com/liferay/portal/service/impl/MembershipRequestLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portal/service/impl/MembershipRequestLocalServiceImpl.java @@ -144,11 +144,7 @@ public boolean hasMembershipRequest( List membershipRequests = getMembershipRequests( userId, groupId, statusId); - if (membershipRequests.isEmpty()) { - return false; - } - - return true; + return !membershipRequests.isEmpty(); } @Override diff --git a/portal-impl/src/com/liferay/portal/service/impl/OrganizationLocalServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/OrganizationLocalServiceImpl.java index 086c6cf66c5604..12c5b34543df5b 100644 --- a/portal-impl/src/com/liferay/portal/service/impl/OrganizationLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portal/service/impl/OrganizationLocalServiceImpl.java @@ -2503,21 +2503,12 @@ protected boolean isParentOrganization( String treePath = organization.getTreePath(); - if (treePath.contains( - StringPool.SLASH + parentOrganizationId + StringPool.SLASH)) { - - return true; - } - - return false; + return treePath.contains( + StringPool.SLASH + parentOrganizationId + StringPool.SLASH); } protected boolean isUseCustomSQL(LinkedHashMap params) { - if (MapUtil.isEmpty(params)) { - return false; - } - - return true; + return !MapUtil.isEmpty(params); } protected void reindex(long companyId, long[] userIds) diff --git a/portal-impl/src/com/liferay/portal/service/impl/PasswordTrackerLocalServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/PasswordTrackerLocalServiceImpl.java index 5de5a6877e0db0..ad5a7a5bdd1f84 100644 --- a/portal-impl/src/com/liferay/portal/service/impl/PasswordTrackerLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portal/service/impl/PasswordTrackerLocalServiceImpl.java @@ -42,18 +42,10 @@ public boolean isSameAsCurrentPassword(long userId, String newClearTextPwd) String newEncPwd = PasswordEncryptorUtil.encrypt( newClearTextPwd, user.getPassword()); - if (currentPwd.equals(newEncPwd)) { - return true; - } - - return false; - } - - if (currentPwd.equals(newClearTextPwd)) { - return true; + return currentPwd.equals(newEncPwd); } - return false; + return currentPwd.equals(newClearTextPwd); } @Override diff --git a/portal-impl/src/com/liferay/portal/service/impl/PluginSettingLocalServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/PluginSettingLocalServiceImpl.java index 0872772e518fd5..8fa542f53ae3bb 100644 --- a/portal-impl/src/com/liferay/portal/service/impl/PluginSettingLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portal/service/impl/PluginSettingLocalServiceImpl.java @@ -94,11 +94,7 @@ public boolean hasPermission( PluginSetting pluginSetting = getPluginSetting( user.getCompanyId(), pluginId, pluginType); - if (!pluginSetting.hasPermission(userId)) { - return false; - } - - return true; + return pluginSetting.hasPermission(userId); } catch (Exception exception) { if (_log.isWarnEnabled()) { diff --git a/portal-impl/src/com/liferay/portal/service/impl/ResourcePermissionLocalServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/ResourcePermissionLocalServiceImpl.java index 7a5896c3f02eb2..259e3fab87e1f7 100644 --- a/portal-impl/src/com/liferay/portal/service/impl/ResourcePermissionLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portal/service/impl/ResourcePermissionLocalServiceImpl.java @@ -1150,14 +1150,8 @@ public boolean hasResourcePermission( return false; } - if (resourcePermission.hasAction( - _resourceActionLocalService.getResourceAction( - name, actionId))) { - - return true; - } - - return false; + return resourcePermission.hasAction( + _resourceActionLocalService.getResourceAction(name, actionId)); } /** diff --git a/portal-impl/src/com/liferay/portal/service/impl/RoleLocalServiceImpl.java b/portal-impl/src/com/liferay/portal/service/impl/RoleLocalServiceImpl.java index 7ee8ecf1d6010c..f7272af51f650a 100644 --- a/portal-impl/src/com/liferay/portal/service/impl/RoleLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portal/service/impl/RoleLocalServiceImpl.java @@ -1400,11 +1400,7 @@ public boolean hasUserRole( long guestUserId = _userLocalService.getGuestUserId(companyId); if (userId == guestUserId) { - if (name.equals(RoleConstants.GUEST)) { - return true; - } - - return false; + return name.equals(RoleConstants.GUEST); } if (inherited) { diff --git a/portal-impl/src/com/liferay/portal/service/permission/LayoutPermissionImpl.java b/portal-impl/src/com/liferay/portal/service/permission/LayoutPermissionImpl.java index 7acf1e04d20a1e..07ec6df925e338 100644 --- a/portal-impl/src/com/liferay/portal/service/permission/LayoutPermissionImpl.java +++ b/portal-impl/src/com/liferay/portal/service/permission/LayoutPermissionImpl.java @@ -478,11 +478,7 @@ protected boolean isViewableGroup( Group group = GroupLocalServiceUtil.getGroup(layout.getGroupId()); if (group.isControlPanel() && layout.isTypeControlPanel()) { - if (!permissionChecker.isSignedIn()) { - return false; - } - - return true; + return permissionChecker.isSignedIn(); } // Inactive sites are not viewable @@ -525,13 +521,8 @@ protected boolean isViewableGroup( // access it if (group.isStagingGroup()) { - if (GroupPermissionUtil.contains( - permissionChecker, group, ActionKeys.VIEW_STAGING)) { - - return true; - } - - return false; + return GroupPermissionUtil.contains( + permissionChecker, group, ActionKeys.VIEW_STAGING); } // Site layouts are only viewable by users who are members of the site @@ -560,22 +551,12 @@ protected boolean isViewableGroup( return false; } else if (group.isLayoutPrototype()) { - if (LayoutPrototypePermissionUtil.contains( - permissionChecker, group.getClassPK(), ActionKeys.VIEW)) { - - return true; - } - - return false; + return LayoutPrototypePermissionUtil.contains( + permissionChecker, group.getClassPK(), ActionKeys.VIEW); } else if (group.isLayoutSetPrototype()) { - if (LayoutSetPrototypePermissionUtil.contains( - permissionChecker, group.getClassPK(), ActionKeys.VIEW)) { - - return true; - } - - return false; + return LayoutSetPrototypePermissionUtil.contains( + permissionChecker, group.getClassPK(), ActionKeys.VIEW); } else if (group.isOrganization()) { long organizationId = group.getOrganizationId(); diff --git a/portal-impl/src/com/liferay/portal/service/permission/LayoutSetPrototypePermissionImpl.java b/portal-impl/src/com/liferay/portal/service/permission/LayoutSetPrototypePermissionImpl.java index 7a159aef12bffa..58273e52c72bf4 100644 --- a/portal-impl/src/com/liferay/portal/service/permission/LayoutSetPrototypePermissionImpl.java +++ b/portal-impl/src/com/liferay/portal/service/permission/LayoutSetPrototypePermissionImpl.java @@ -34,14 +34,9 @@ public boolean contains( PermissionChecker permissionChecker, long layoutSetPrototypeId, String actionId) { - if (permissionChecker.hasPermission( - null, LayoutSetPrototype.class.getName(), layoutSetPrototypeId, - actionId)) { - - return true; - } - - return false; + return permissionChecker.hasPermission( + null, LayoutSetPrototype.class.getName(), layoutSetPrototypeId, + actionId); } } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/servlet/filters/IgnoreModuleRequestFilter.java b/portal-impl/src/com/liferay/portal/servlet/filters/IgnoreModuleRequestFilter.java index 19cbc449990af3..6b9133d350770e 100644 --- a/portal-impl/src/com/liferay/portal/servlet/filters/IgnoreModuleRequestFilter.java +++ b/portal-impl/src/com/liferay/portal/servlet/filters/IgnoreModuleRequestFilter.java @@ -40,11 +40,7 @@ protected boolean isModuleRequest(HttpServletRequest httpServletRequest) { resourcePath = resourcePath.substring(contextPath.length()); } - if (resourcePath.startsWith(_MODULE_REQUEST_PREFIX)) { - return true; - } - - return false; + return resourcePath.startsWith(_MODULE_REQUEST_PREFIX); } private static final String _MODULE_REQUEST_PREFIX = diff --git a/portal-impl/src/com/liferay/portal/servlet/filters/fragment/FragmentFilter.java b/portal-impl/src/com/liferay/portal/servlet/filters/fragment/FragmentFilter.java index 50280528bc9124..d5c5556122ab33 100644 --- a/portal-impl/src/com/liferay/portal/servlet/filters/fragment/FragmentFilter.java +++ b/portal-impl/src/com/liferay/portal/servlet/filters/fragment/FragmentFilter.java @@ -71,11 +71,7 @@ protected boolean isFragment( String fragmentId = ParamUtil.getString(httpServletRequest, "p_f_id"); - if (Validator.isNotNull(fragmentId)) { - return true; - } - - return false; + return Validator.isNotNull(fragmentId); } @Override diff --git a/portal-impl/src/com/liferay/portal/servlet/filters/gzip/GZipFilter.java b/portal-impl/src/com/liferay/portal/servlet/filters/gzip/GZipFilter.java index 802cf5fdd43375..7721e50178e6fa 100644 --- a/portal-impl/src/com/liferay/portal/servlet/filters/gzip/GZipFilter.java +++ b/portal-impl/src/com/liferay/portal/servlet/filters/gzip/GZipFilter.java @@ -73,11 +73,7 @@ protected boolean isAlreadyFiltered(HttpServletRequest httpServletRequest) { } protected boolean isCompress(HttpServletRequest httpServletRequest) { - if (ParamUtil.getBoolean(httpServletRequest, _COMPRESS, true)) { - return true; - } - - return false; + return ParamUtil.getBoolean(httpServletRequest, _COMPRESS, true); } protected boolean isInclude(HttpServletRequest httpServletRequest) { diff --git a/portal-impl/src/com/liferay/portal/servlet/filters/secure/NonceUtil.java b/portal-impl/src/com/liferay/portal/servlet/filters/secure/NonceUtil.java index 61b263247be15f..9ec65a2f234f8d 100644 --- a/portal-impl/src/com/liferay/portal/servlet/filters/secure/NonceUtil.java +++ b/portal-impl/src/com/liferay/portal/servlet/filters/secure/NonceUtil.java @@ -171,11 +171,7 @@ else if (result > 0) { public boolean equals(Object object) { NonceDelayed nonceDelayed = (NonceDelayed)object; - if (_nonce.equals(nonceDelayed._nonce)) { - return true; - } - - return false; + return _nonce.equals(nonceDelayed._nonce); } @Override diff --git a/portal-impl/src/com/liferay/portal/servlet/filters/strip/StripFilter.java b/portal-impl/src/com/liferay/portal/servlet/filters/strip/StripFilter.java index 4e10bcd6763b5e..78a066078ecefd 100644 --- a/portal-impl/src/com/liferay/portal/servlet/filters/strip/StripFilter.java +++ b/portal-impl/src/com/liferay/portal/servlet/filters/strip/StripFilter.java @@ -415,11 +415,7 @@ protected boolean hasLanguageAttribute( Matcher matcher = _javaScriptPattern.matcher(charBuffer); - if (matcher.find()) { - return true; - } - - return false; + return matcher.find(); } protected boolean hasMarker(CharBuffer charBuffer, char[] marker) { diff --git a/portal-impl/src/com/liferay/portal/servlet/filters/themepreview/ThemePreviewFilter.java b/portal-impl/src/com/liferay/portal/servlet/filters/themepreview/ThemePreviewFilter.java index 88527c312e4611..16105c24e36a12 100644 --- a/portal-impl/src/com/liferay/portal/servlet/filters/themepreview/ThemePreviewFilter.java +++ b/portal-impl/src/com/liferay/portal/servlet/filters/themepreview/ThemePreviewFilter.java @@ -30,11 +30,7 @@ public boolean isFilterEnabled( HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { - if (isThemePreview(httpServletRequest)) { - return true; - } - - return false; + return isThemePreview(httpServletRequest); } protected String getContent( @@ -59,11 +55,7 @@ protected String getContent( } protected boolean isThemePreview(HttpServletRequest httpServletRequest) { - if (ParamUtil.getBoolean(httpServletRequest, _THEME_PREVIEW)) { - return true; - } - - return false; + return ParamUtil.getBoolean(httpServletRequest, _THEME_PREVIEW); } @Override diff --git a/portal-impl/src/com/liferay/portal/sharepoint/SharepointFilter.java b/portal-impl/src/com/liferay/portal/sharepoint/SharepointFilter.java index aa6945579cee60..447d47ca749cb3 100644 --- a/portal-impl/src/com/liferay/portal/sharepoint/SharepointFilter.java +++ b/portal-impl/src/com/liferay/portal/sharepoint/SharepointFilter.java @@ -47,11 +47,7 @@ protected boolean isSharepointRequest(String uri) { } protected boolean isWebDAVRequest(String uri) { - if (uri.startsWith("/webdav")) { - return true; - } - - return false; + return uri.startsWith("/webdav"); } @Override diff --git a/portal-impl/src/com/liferay/portal/template/CacheTemplateResource.java b/portal-impl/src/com/liferay/portal/template/CacheTemplateResource.java index ee6426a31e6f02..491db490b9b187 100644 --- a/portal-impl/src/com/liferay/portal/template/CacheTemplateResource.java +++ b/portal-impl/src/com/liferay/portal/template/CacheTemplateResource.java @@ -49,11 +49,8 @@ public boolean equals(Object object) { CacheTemplateResource cacheTemplateResource = (CacheTemplateResource)object; - if (_templateResource.equals(cacheTemplateResource._templateResource)) { - return true; - } - - return false; + return _templateResource.equals( + cacheTemplateResource._templateResource); } public TemplateResource getInnerTemplateResource() { diff --git a/portal-impl/src/com/liferay/portal/tools/ConfigurationEnvBuilder.java b/portal-impl/src/com/liferay/portal/tools/ConfigurationEnvBuilder.java index 05172c86bf99c1..11fa61b4fa0907 100644 --- a/portal-impl/src/com/liferay/portal/tools/ConfigurationEnvBuilder.java +++ b/portal-impl/src/com/liferay/portal/tools/ConfigurationEnvBuilder.java @@ -403,13 +403,8 @@ private static void _setFieldValue( } private static boolean _toBoolean(Object object) { - if (Objects.equals( - String.valueOf(object), String.valueOf(Boolean.TRUE))) { - - return true; - } - - return false; + return Objects.equals( + String.valueOf(object), String.valueOf(Boolean.TRUE)); } private static Number _toNumber(Object object) { @@ -676,13 +671,8 @@ public int compareTo(ObjectDef objectDef) { } protected boolean extendsObjectDef(ObjectDef superObjectDef) { - if (Objects.equals( - extendsInterfaceName, superObjectDef.interfaceName)) { - - return true; - } - - return false; + return Objects.equals( + extendsInterfaceName, superObjectDef.interfaceName); } protected JSONObject toJSONObject() { diff --git a/portal-impl/src/com/liferay/portal/tools/ImportPackage.java b/portal-impl/src/com/liferay/portal/tools/ImportPackage.java index 37857ad2b6f21c..a2881d85ab3b91 100644 --- a/portal-impl/src/com/liferay/portal/tools/ImportPackage.java +++ b/portal-impl/src/com/liferay/portal/tools/ImportPackage.java @@ -119,11 +119,7 @@ public boolean isGroupedWith(ImportPackage importPackage) { String packageLevel = getPackageLevel(); - if (packageLevel.equals(importPackage.getPackageLevel())) { - return true; - } - - return false; + return packageLevel.equals(importPackage.getPackageLevel()); } public boolean isStatic() { diff --git a/portal-impl/src/com/liferay/portal/upgrade/PortalUpgradeProcess.java b/portal-impl/src/com/liferay/portal/upgrade/PortalUpgradeProcess.java index fd2c20afda6535..45e9b10faf4e57 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/PortalUpgradeProcess.java +++ b/portal-impl/src/com/liferay/portal/upgrade/PortalUpgradeProcess.java @@ -206,11 +206,7 @@ public static boolean isInLatestSchemaVersion(Connection connection) Version latestSchemaVersion = getLatestSchemaVersion(); - if (latestSchemaVersion.equals(getCurrentSchemaVersion(connection))) { - return true; - } - - return false; + return latestSchemaVersion.equals(getCurrentSchemaVersion(connection)); } public static boolean isInRequiredSchemaVersion(Connection connection) diff --git a/portal-impl/src/com/liferay/portal/upgrade/UpgradeProcess_7_0_6.java b/portal-impl/src/com/liferay/portal/upgrade/UpgradeProcess_7_0_6.java index b5605bbe569335..aa87a5472c784e 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/UpgradeProcess_7_0_6.java +++ b/portal-impl/src/com/liferay/portal/upgrade/UpgradeProcess_7_0_6.java @@ -32,11 +32,7 @@ protected void doUpgrade() throws Exception { @Override protected boolean isSkipUpgradeProcess() throws Exception { - if (hasColumnType("Repository", "name", "VARCHAR(200) null")) { - return true; - } - - return false; + return hasColumnType("Repository", "name", "VARCHAR(200) null"); } } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/util/PortalImpl.java b/portal-impl/src/com/liferay/portal/util/PortalImpl.java index 8e474fe8bdc80d..be68ef79d43e13 100644 --- a/portal-impl/src/com/liferay/portal/util/PortalImpl.java +++ b/portal-impl/src/com/liferay/portal/util/PortalImpl.java @@ -5683,11 +5683,8 @@ public boolean isLayoutSitemapable(Layout layout) { public boolean isLoginRedirectRequired( HttpServletRequest httpServletRequest) { - if (SSOUtil.isLoginRedirectRequired(getCompanyId(httpServletRequest))) { - return true; - } - - return false; + return SSOUtil.isLoginRedirectRequired( + getCompanyId(httpServletRequest)); } @Override diff --git a/portal-impl/src/com/liferay/portal/util/PortalInstances.java b/portal-impl/src/com/liferay/portal/util/PortalInstances.java index 205543c630a034..9895e6228c0d93 100644 --- a/portal-impl/src/com/liferay/portal/util/PortalInstances.java +++ b/portal-impl/src/com/liferay/portal/util/PortalInstances.java @@ -494,11 +494,7 @@ private static boolean _isCompanyVirtualHostname( virtualHostname = "localhost"; } - if (Objects.equals(virtualHostname, serverName)) { - return true; - } - - return false; + return Objects.equals(virtualHostname, serverName); } private static void _setAttributes( diff --git a/portal-impl/src/com/liferay/portal/util/ShutdownUtil.java b/portal-impl/src/com/liferay/portal/util/ShutdownUtil.java index f72e29b207f589..0fef94f5dea122 100644 --- a/portal-impl/src/com/liferay/portal/util/ShutdownUtil.java +++ b/portal-impl/src/com/liferay/portal/util/ShutdownUtil.java @@ -38,11 +38,7 @@ public static boolean isInProcess() { return false; } - if (_date.after(new Date())) { - return true; - } - - return false; + return _date.after(new Date()); } public static boolean isShutdown() { @@ -50,11 +46,7 @@ public static boolean isShutdown() { return false; } - if (_date.before(new Date())) { - return true; - } - - return false; + return _date.before(new Date()); } public static void shutdown(long milliseconds) { diff --git a/portal-impl/src/com/liferay/portal/webdav/BaseWebDAVStorageImpl.java b/portal-impl/src/com/liferay/portal/webdav/BaseWebDAVStorageImpl.java index 22da5d5166aa31..543d5addd00494 100644 --- a/portal-impl/src/com/liferay/portal/webdav/BaseWebDAVStorageImpl.java +++ b/portal-impl/src/com/liferay/portal/webdav/BaseWebDAVStorageImpl.java @@ -144,11 +144,7 @@ protected long getPlid(long groupId) { protected boolean isAddGroupPermissions(long groupId) throws Exception { Group group = GroupLocalServiceUtil.getGroup(groupId); - if (!group.isUser()) { - return true; - } - - return false; + return !group.isUser(); } private String _rootPath; diff --git a/portal-impl/src/com/liferay/portal/xml/DocumentTypeImpl.java b/portal-impl/src/com/liferay/portal/xml/DocumentTypeImpl.java index ed2263cead4e41..7bcba31be645c6 100644 --- a/portal-impl/src/com/liferay/portal/xml/DocumentTypeImpl.java +++ b/portal-impl/src/com/liferay/portal/xml/DocumentTypeImpl.java @@ -31,11 +31,7 @@ public boolean equals(Object object) { DocumentTypeImpl documentTypeImpl = (DocumentTypeImpl)object; - if (Objects.equals(_documentType, documentTypeImpl._documentType)) { - return true; - } - - return false; + return Objects.equals(_documentType, documentTypeImpl._documentType); } @Override diff --git a/portal-impl/src/com/liferay/portlet/PortletPreferencesWrapper.java b/portal-impl/src/com/liferay/portlet/PortletPreferencesWrapper.java index c98299174944ba..0d3879f0da3278 100644 --- a/portal-impl/src/com/liferay/portlet/PortletPreferencesWrapper.java +++ b/portal-impl/src/com/liferay/portlet/PortletPreferencesWrapper.java @@ -39,14 +39,9 @@ public boolean equals(Object object) { PortletPreferencesWrapper portletPreferencesWrapper = (PortletPreferencesWrapper)object; - if (Objects.equals( - getPortletPreferencesImpl(), - portletPreferencesWrapper.getPortletPreferencesImpl())) { - - return true; - } - - return false; + return Objects.equals( + getPortletPreferencesImpl(), + portletPreferencesWrapper.getPortletPreferencesImpl()); } @Override diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryLocalServiceImpl.java index eb0c26117a05b0..9c623c122b9359 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/service/impl/DLFileEntryLocalServiceImpl.java @@ -2264,11 +2264,7 @@ public boolean verifyFileEntryLock(long fileEntryId, String lockUuid) DLFileEntry.class.getName(), fileEntryId); if (lock != null) { - if (Objects.equals(lock.getUuid(), lockUuid)) { - return true; - } - - return false; + return Objects.equals(lock.getUuid(), lockUuid); } DLFileEntry dlFileEntry = dlFileEntryLocalService.getFileEntry( @@ -3120,11 +3116,7 @@ private boolean _isValidFileVersionNumber(String version) { Matcher matcher = _fileVersionPattern.matcher(version); - if (matcher.matches()) { - return true; - } - - return false; + return matcher.matches(); } private DLFileEntry _moveFileEntryImpl( diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/Atom.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/Atom.java index 2f461879fbcbb2..5462177faa5682 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/Atom.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/Atom.java @@ -154,11 +154,7 @@ protected long bytesToLong(byte[] buffer) { protected boolean hasCompressedMoovAtom() { String type = new String(ArrayUtil.clone(_buffer, 12, 15)); - if (StringUtil.equalsIgnoreCase(type, Atom.CMOV)) { - return true; - } - - return false; + return StringUtil.equalsIgnoreCase(type, Atom.CMOV); } protected int patchCo64Atom(int index) { diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLImpl.java index 87573d4a7c347a..86e912cc78d151 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLImpl.java @@ -743,11 +743,7 @@ public boolean hasWorkflowDefinitionLink( public boolean isAutoGeneratedDLFileEntryTypeDDMStructureKey( String ddmStructureKey) { - if (ddmStructureKey.startsWith(_STRUCTURE_KEY_PREFIX)) { - return true; - } - - return false; + return ddmStructureKey.startsWith(_STRUCTURE_KEY_PREFIX); } @Override diff --git a/portal-impl/src/com/liferay/portlet/expando/model/impl/ExpandoTableImpl.java b/portal-impl/src/com/liferay/portlet/expando/model/impl/ExpandoTableImpl.java index eddbe282b70866..d7173987f848c1 100644 --- a/portal-impl/src/com/liferay/portlet/expando/model/impl/ExpandoTableImpl.java +++ b/portal-impl/src/com/liferay/portlet/expando/model/impl/ExpandoTableImpl.java @@ -16,13 +16,8 @@ public class ExpandoTableImpl extends ExpandoTableBaseImpl { @Override public boolean isDefaultTable() { - if (Objects.equals( - getName(), ExpandoTableConstants.DEFAULT_TABLE_NAME)) { - - return true; - } - - return false; + return Objects.equals( + getName(), ExpandoTableConstants.DEFAULT_TABLE_NAME); } } \ No newline at end of file diff --git a/portal-impl/test/unit/com/liferay/portal/service/ServiceXMLTest.java b/portal-impl/test/unit/com/liferay/portal/service/ServiceXMLTest.java index 5af0b57deeb714..6d0765ddf1a1b6 100644 --- a/portal-impl/test/unit/com/liferay/portal/service/ServiceXMLTest.java +++ b/portal-impl/test/unit/com/liferay/portal/service/ServiceXMLTest.java @@ -82,11 +82,7 @@ private void _assertNoTXRequiredElement(File file) throws IOException { private boolean _isServiceXml(Path path) { Path fileNamePath = path.getFileName(); - if (Objects.equals(fileNamePath.toString(), "service.xml")) { - return true; - } - - return false; + return Objects.equals(fileNamePath.toString(), "service.xml"); } } \ No newline at end of file diff --git a/portal-test/src/com/liferay/portal/kernel/test/rule/ArquillianUtil.java b/portal-test/src/com/liferay/portal/kernel/test/rule/ArquillianUtil.java index c990e14d50eb37..3190e4121e2820 100644 --- a/portal-test/src/com/liferay/portal/kernel/test/rule/ArquillianUtil.java +++ b/portal-test/src/com/liferay/portal/kernel/test/rule/ArquillianUtil.java @@ -27,14 +27,9 @@ public static boolean isArquillianTest(Description description) { String runnerClassName = runnerClass.getName(); - if (runnerClassName.equals( - "com.liferay.arquillian.extension.junit.bridge.junit." + - "Arquillian")) { - - return true; - } - - return false; + return runnerClassName.equals( + "com.liferay.arquillian.extension.junit.bridge.junit." + + "Arquillian"); } } \ No newline at end of file diff --git a/portal-test/src/com/liferay/portal/test/randomizerbumpers/BBCodeRandomizerBumper.java b/portal-test/src/com/liferay/portal/test/randomizerbumpers/BBCodeRandomizerBumper.java index 1ef92c744fc552..19a85706491958 100644 --- a/portal-test/src/com/liferay/portal/test/randomizerbumpers/BBCodeRandomizerBumper.java +++ b/portal-test/src/com/liferay/portal/test/randomizerbumpers/BBCodeRandomizerBumper.java @@ -18,11 +18,7 @@ public class BBCodeRandomizerBumper implements RandomizerBumper { @Override public boolean accept(String randomValue) { - if (randomValue.equals(BBCodeTranslatorUtil.getHTML(randomValue))) { - return true; - } - - return false; + return randomValue.equals(BBCodeTranslatorUtil.getHTML(randomValue)); } } \ No newline at end of file diff --git a/util-taglib/src/com/liferay/taglib/util/CustomAttributesUtil.java b/util-taglib/src/com/liferay/taglib/util/CustomAttributesUtil.java index 418446d6d78f36..cc8377135c416a 100644 --- a/util-taglib/src/com/liferay/taglib/util/CustomAttributesUtil.java +++ b/util-taglib/src/com/liferay/taglib/util/CustomAttributesUtil.java @@ -30,11 +30,7 @@ public static boolean hasCustomAttributes( Collections.list(expandoBridge.getAttributeNames()), ListUtil.fromString(ignoreAttributeNames, StringPool.COMMA)); - if (ListUtil.isEmpty(attributeNames)) { - return false; - } - - return true; + return !ListUtil.isEmpty(attributeNames); } } \ No newline at end of file diff --git a/util-taglib/src/com/liferay/taglib/util/PositionTagSupport.java b/util-taglib/src/com/liferay/taglib/util/PositionTagSupport.java index b4ea0301ec53a2..6f70cfeb205db9 100644 --- a/util-taglib/src/com/liferay/taglib/util/PositionTagSupport.java +++ b/util-taglib/src/com/liferay/taglib/util/PositionTagSupport.java @@ -27,21 +27,13 @@ public String getPosition() { public boolean isPositionAuto() { String position = getPosition(); - if (position.equals(_POSITION_AUTO)) { - return true; - } - - return false; + return position.equals(_POSITION_AUTO); } public boolean isPositionInLine() { String position = getPosition(); - if (position.equals(_POSITION_INLINE)) { - return true; - } - - return false; + return position.equals(_POSITION_INLINE); } public void setPosition(String position) { diff --git a/workspaces/liferay-customer-workspace/client-extensions/liferay-customer-etc-spring-boot/src/main/java/com/liferay/customer/JiraRestController.java b/workspaces/liferay-customer-workspace/client-extensions/liferay-customer-etc-spring-boot/src/main/java/com/liferay/customer/JiraRestController.java index 9775a6f62829e9..93e783693b76c9 100644 --- a/workspaces/liferay-customer-workspace/client-extensions/liferay-customer-etc-spring-boot/src/main/java/com/liferay/customer/JiraRestController.java +++ b/workspaces/liferay-customer-workspace/client-extensions/liferay-customer-etc-spring-boot/src/main/java/com/liferay/customer/JiraRestController.java @@ -186,11 +186,7 @@ private List _getUserRoleNames(Jwt jwt) { private boolean _hasAdministrator(Jwt jwt) { List userRoleNames = _getUserRoleNames(jwt); - if (userRoleNames.contains(RoleConstants.NAME_ADMINISTRATOR)) { - return true; - } - - return false; + return userRoleNames.contains(RoleConstants.NAME_ADMINISTRATOR); } private boolean _hasEarlyPublishAccess(Jwt jwt) { diff --git a/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/entity/repository/BaseEntityRepository.java b/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/entity/repository/BaseEntityRepository.java index c13bcfcc56308f..25cf6e5d2bc416 100644 --- a/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/entity/repository/BaseEntityRepository.java +++ b/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/entity/repository/BaseEntityRepository.java @@ -41,11 +41,7 @@ public T add(JSONObject jsonObject) { @Override public boolean contains(long id) { - if (_entitiesMap.containsKey(id)) { - return true; - } - - return false; + return _entitiesMap.containsKey(id); } @Override diff --git a/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/event/github/BaseGitHubCommentEventHandler.java b/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/event/github/BaseGitHubCommentEventHandler.java index 86c35cb344a54f..1758fffc197034 100644 --- a/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/event/github/BaseGitHubCommentEventHandler.java +++ b/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/event/github/BaseGitHubCommentEventHandler.java @@ -26,11 +26,7 @@ public boolean isCommenterLiferayGitHubUser() throws InvalidJSONException { GitHubUser commenterGitHubUser = gitHubComment.getCommenterGitHubUser(); - if (!commenterGitHubUser.isLiferayUser()) { - return false; - } - - return true; + return commenterGitHubUser.isLiferayUser(); } protected BaseGitHubCommentEventHandler(JSONObject messageJSONObject) { diff --git a/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/event/github/BaseGitHubIssueEventHandler.java b/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/event/github/BaseGitHubIssueEventHandler.java index cc321180240ecd..afe47ea2974d3d 100644 --- a/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/event/github/BaseGitHubIssueEventHandler.java +++ b/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/event/github/BaseGitHubIssueEventHandler.java @@ -51,11 +51,7 @@ public boolean isReceiverLiferayGitHubUser() throws InvalidJSONException { GitHubUser receiverGitHubUser = gitHubPullRequest.getReceiverGitHubUser(); - if (!receiverGitHubUser.isLiferayUser()) { - return false; - } - - return true; + return receiverGitHubUser.isLiferayUser(); } public boolean isSenderLiferayGitHubUser() throws InvalidJSONException { @@ -67,11 +63,7 @@ public boolean isSenderLiferayGitHubUser() throws InvalidJSONException { GitHubUser senderGitHubUser = gitHubPullRequest.getSenderGitHubUser(); - if (!senderGitHubUser.isLiferayUser()) { - return false; - } - - return true; + return senderGitHubUser.isLiferayUser(); } protected BaseGitHubIssueEventHandler(JSONObject messageJSONObject) { diff --git a/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/event/github/MergeGitHubCommentEventHandler.java b/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/event/github/MergeGitHubCommentEventHandler.java index 8e65d459834d6a..615a5de7df3ace 100644 --- a/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/event/github/MergeGitHubCommentEventHandler.java +++ b/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/event/github/MergeGitHubCommentEventHandler.java @@ -194,11 +194,7 @@ private boolean _forceMerge() throws InvalidJSONException { String gitHubCommentBody = gitHubComment.getBody(); - if (gitHubCommentBody.startsWith("ci:merge:force")) { - return true; - } - - return false; + return gitHubCommentBody.startsWith("ci:merge:force"); } private Set _getCIMergeForceUserNames() throws IOException { diff --git a/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/event/github/PusherGitHubEventHandler.java b/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/event/github/PusherGitHubEventHandler.java index 9a76ad94495c48..3ca11deccc6d82 100644 --- a/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/event/github/PusherGitHubEventHandler.java +++ b/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/event/github/PusherGitHubEventHandler.java @@ -166,11 +166,7 @@ private boolean _isGitHubRepositoryMirrorCandidate() String gitHubRepositoryName = gitHubRepository.getName(); - if (!gitHubRepositoryName.equals("liferay-jenkins-ee")) { - return false; - } - - return true; + return gitHubRepositoryName.equals("liferay-jenkins-ee"); } private boolean _isGitHubUserMirrorCandidate() throws InvalidJSONException { @@ -180,11 +176,7 @@ private boolean _isGitHubUserMirrorCandidate() throws InvalidJSONException { String gitHubUserName = gitHubUser.getName(); - if (!gitHubUserName.equals("liferay")) { - return false; - } - - return true; + return gitHubUserName.equals("liferay"); } private boolean _isUpstreamGitBranchEntity() throws InvalidJSONException { diff --git a/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/routine/scheduler/RoutineEntityScheduler.java b/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/routine/scheduler/RoutineEntityScheduler.java index 92305b0afc4b3e..2f09e2765d58fc 100644 --- a/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/routine/scheduler/RoutineEntityScheduler.java +++ b/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/routine/scheduler/RoutineEntityScheduler.java @@ -207,11 +207,7 @@ private boolean _isRoutineCron(RoutineEntity routineEntity) { CronRoutineEntity cronRoutineEntity = (CronRoutineEntity)routineEntity; - if (StringUtil.isNullOrEmpty(cronRoutineEntity.getCron())) { - return false; - } - - return true; + return !StringUtil.isNullOrEmpty(cronRoutineEntity.getCron()); } private static final Log _log = LogFactory.getLog(JobQueue.class); diff --git a/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/util/StringUtil.java b/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/util/StringUtil.java index 1eb9315fecb948..843fc2564945f9 100644 --- a/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/util/StringUtil.java +++ b/workspaces/liferay-jethr0-workspace/client-extensions/liferay-jethr0-etc-spring-boot/src/main/java/com/liferay/jethr0/util/StringUtil.java @@ -36,11 +36,7 @@ public static String combine(Object... objects) { } public static boolean equals(URL url1, URL url2) { - if (Objects.equals(fixURL(url1), fixURL(url2))) { - return true; - } - - return false; + return Objects.equals(fixURL(url1), fixURL(url2)); } public static URL fixURL(URL url) { @@ -60,11 +56,7 @@ public static boolean isNullOrEmpty(String string) { String trimmedString = string.trim(); - if (trimmedString.isEmpty()) { - return true; - } - - return false; + return trimmedString.isEmpty(); } public static String join(String delimiter, Collection strings) { diff --git a/workspaces/liferay-paypal-workspace/client-extensions/liferay-paypal-commerce-payment-integration/src/main/java/com/liferay/paypal/NotificationsRestController.java b/workspaces/liferay-paypal-workspace/client-extensions/liferay-paypal-commerce-payment-integration/src/main/java/com/liferay/paypal/NotificationsRestController.java index 416b35d56093dd..f8e2bf068a7ac7 100644 --- a/workspaces/liferay-paypal-workspace/client-extensions/liferay-paypal-commerce-payment-integration/src/main/java/com/liferay/paypal/NotificationsRestController.java +++ b/workspaces/liferay-paypal-workspace/client-extensions/liferay-paypal-commerce-payment-integration/src/main/java/com/liferay/paypal/NotificationsRestController.java @@ -140,15 +140,10 @@ private boolean _hasAuthentication( String.class ).block()); - if (Objects.equals( - verifyWebhookSignatureResponseJSONObject.getString( - "verification_status"), - "SUCCESS")) { - - return true; - } - - return false; + return Objects.equals( + verifyWebhookSignatureResponseJSONObject.getString( + "verification_status"), + "SUCCESS"); } private void _updatePayment(