From d4c56444991d7a196ecf827d2c2c5ea14c0c4296 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 14 Jul 2020 20:21:04 -0700 Subject: [PATCH] LPS-116757 rename --- .../web/internal/util/ConfigurationVisibilityUtil.java | 10 +++++----- ...erVisibilityConfigurationModelRetrieverWrapper.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/apps/configuration-admin/configuration-admin-web/src/main/java/com/liferay/configuration/admin/web/internal/util/ConfigurationVisibilityUtil.java b/modules/apps/configuration-admin/configuration-admin-web/src/main/java/com/liferay/configuration/admin/web/internal/util/ConfigurationVisibilityUtil.java index fd9f47e2520a67..8f218e14ac23e1 100644 --- a/modules/apps/configuration-admin/configuration-admin-web/src/main/java/com/liferay/configuration/admin/web/internal/util/ConfigurationVisibilityUtil.java +++ b/modules/apps/configuration-admin/configuration-admin-web/src/main/java/com/liferay/configuration/admin/web/internal/util/ConfigurationVisibilityUtil.java @@ -34,23 +34,23 @@ public static boolean isVisible( Serializable scopePK) { ConfigurationVisibilityController configurationVisibilityController = - _getVisibilityController(pid); + _getConfigurationVisibilityController(pid); return configurationVisibilityController.isVisible(scope, scopePK); } - private static ConfigurationVisibilityController _getVisibilityController( - String pid) { + private static ConfigurationVisibilityController + _getConfigurationVisibilityController(String pid) { if (_serviceTrackerMap.containsKey(pid)) { return _serviceTrackerMap.getService(pid); } - return _defaultVisibilityController; + return _configurationVisibilityController; } private static final ConfigurationVisibilityController - _defaultVisibilityController = (scope, scopePK) -> true; + _configurationVisibilityController = (scope, scopePK) -> true; private static final ServiceTrackerMap _serviceTrackerMap; diff --git a/modules/apps/configuration-admin/configuration-admin-web/src/main/java/com/liferay/configuration/admin/web/internal/util/FilterVisibilityConfigurationModelRetrieverWrapper.java b/modules/apps/configuration-admin/configuration-admin-web/src/main/java/com/liferay/configuration/admin/web/internal/util/FilterVisibilityConfigurationModelRetrieverWrapper.java index 5119e901e7988d..9421704403d59e 100644 --- a/modules/apps/configuration-admin/configuration-admin-web/src/main/java/com/liferay/configuration/admin/web/internal/util/FilterVisibilityConfigurationModelRetrieverWrapper.java +++ b/modules/apps/configuration-admin/configuration-admin-web/src/main/java/com/liferay/configuration/admin/web/internal/util/FilterVisibilityConfigurationModelRetrieverWrapper.java @@ -137,9 +137,9 @@ private void _filterVisibility( ExtendedObjectClassDefinition.Scope scope, Serializable scopePK, Map configurationModelMap) { - Set keySet = configurationModelMap.keySet(); + Set set = configurationModelMap.keySet(); - keySet.removeIf( + set.removeIf( key -> !ConfigurationVisibilityUtil.isVisible(key, scope, scopePK)); }