From b40de756e7764402c3c8800ca85e03221148f282 Mon Sep 17 00:00:00 2001 From: Gianmarco Brunialti Date: Wed, 14 Aug 2024 18:43:49 +0200 Subject: [PATCH] LPD-33868 SF --- .../display/context/FDSAdminDisplayContext.java | 9 +++------ .../fragment/renderer/FDSAdminFragmentRenderer.java | 10 ++++------ .../admin/web/internal/portlet/FDSAdminPortlet.java | 3 +-- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/java/com/liferay/frontend/data/set/admin/web/internal/display/context/FDSAdminDisplayContext.java b/modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/java/com/liferay/frontend/data/set/admin/web/internal/display/context/FDSAdminDisplayContext.java index 27928f3adda87c..e0f2eb7eb597e6 100644 --- a/modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/java/com/liferay/frontend/data/set/admin/web/internal/display/context/FDSAdminDisplayContext.java +++ b/modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/java/com/liferay/frontend/data/set/admin/web/internal/display/context/FDSAdminDisplayContext.java @@ -45,16 +45,14 @@ public class FDSAdminDisplayContext { public FDSAdminDisplayContext( CETManager cetManager, - FDSAPIURLResolverRegistry - fdsAPIURLResolverRegistry, + FDSAPIURLResolverRegistry fdsAPIURLResolverRegistry, ObjectDefinitionLocalService objectDefinitionLocalService, RenderRequest renderRequest, RenderResponse renderResponse, ServiceTrackerList serviceTrackerList) { _cetManager = cetManager; - _fdsAPIURLResolverRegistry = - fdsAPIURLResolverRegistry; + _fdsAPIURLResolverRegistry = fdsAPIURLResolverRegistry; _renderRequest = renderRequest; _renderResponse = renderResponse; _serviceTrackerList = serviceTrackerList; @@ -277,9 +275,8 @@ public String getSaveFDSSortURL() { } private final CETManager _cetManager; + private final FDSAPIURLResolverRegistry _fdsAPIURLResolverRegistry; private final ObjectDefinition _fdsEntryObjectDefinition; - private final FDSAPIURLResolverRegistry - _fdsAPIURLResolverRegistry; private final ObjectDefinition _fdsViewObjectDefinition; private final RenderRequest _renderRequest; private final RenderResponse _renderResponse; 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 742a92904e5c0b..d35b533e88521d 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 @@ -1086,14 +1086,13 @@ private String _resolveParameters( HttpServletRequest httpServletRequest) { if (FeatureFlagManagerUtil.isEnabled("LPD-25230")) { - FDSAPIURLResolver - FDSAPIURLResolver = + FDSAPIURLResolver fdsAPIURLResolver = _fdsAPIURLResolverRegistry.getResolver( restApplication, restSchema); - if (FDSAPIURLResolver != null) { + if (fdsAPIURLResolver != null) { try { - return FDSAPIURLResolver.resolve( + return fdsAPIURLResolver.resolve( apiURL, httpServletRequest); } catch (PortalException portalException) { @@ -1114,8 +1113,7 @@ private String _resolveParameters( private CETManager _cetManager; @Reference - private FDSAPIURLResolverRegistry - _fdsAPIURLResolverRegistry; + private FDSAPIURLResolverRegistry _fdsAPIURLResolverRegistry; @Reference private FragmentEntryConfigurationParser _fragmentEntryConfigurationParser; diff --git a/modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/java/com/liferay/frontend/data/set/admin/web/internal/portlet/FDSAdminPortlet.java b/modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/java/com/liferay/frontend/data/set/admin/web/internal/portlet/FDSAdminPortlet.java index 977950629cb94b..f18689788d2112 100644 --- a/modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/java/com/liferay/frontend/data/set/admin/web/internal/portlet/FDSAdminPortlet.java +++ b/modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/java/com/liferay/frontend/data/set/admin/web/internal/portlet/FDSAdminPortlet.java @@ -998,8 +998,7 @@ private synchronized void _generate( private CETManager _cetManager; @Reference - private FDSAPIURLResolverRegistry - _fdsAPIURLResolverRegistry; + private FDSAPIURLResolverRegistry _fdsAPIURLResolverRegistry; @Reference private Language _language;