Skip to content

Commit

Permalink
LPD-33868 SF
Browse files Browse the repository at this point in the history
  • Loading branch information
gianmarcobrunialti committed Aug 16, 2024
1 parent 7fe2ca8 commit a2bec38
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,14 @@ public class FDSAdminDisplayContext {

public FDSAdminDisplayContext(
CETManager cetManager,
FDSAPIURLResolverRegistry
fdsAPIURLResolverRegistry,
FDSAPIURLResolverRegistry fdsAPIURLResolverRegistry,
ObjectDefinitionLocalService objectDefinitionLocalService,
RenderRequest renderRequest, RenderResponse renderResponse,
ServiceTrackerList<FDSAdminPortlet.CompanyScopedOpenAPIResource>
serviceTrackerList) {

_cetManager = cetManager;
_fdsAPIURLResolverRegistry =
fdsAPIURLResolverRegistry;
_fdsAPIURLResolverRegistry = fdsAPIURLResolverRegistry;
_renderRequest = renderRequest;
_renderResponse = renderResponse;
_serviceTrackerList = serviceTrackerList;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -1114,8 +1113,7 @@ private String _resolveParameters(
private CETManager _cetManager;

@Reference
private FDSAPIURLResolverRegistry
_fdsAPIURLResolverRegistry;
private FDSAPIURLResolverRegistry _fdsAPIURLResolverRegistry;

@Reference
private FragmentEntryConfigurationParser _fragmentEntryConfigurationParser;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -998,8 +998,7 @@ private synchronized void _generate(
private CETManager _cetManager;

@Reference
private FDSAPIURLResolverRegistry
_fdsAPIURLResolverRegistry;
private FDSAPIURLResolverRegistry _fdsAPIURLResolverRegistry;

@Reference
private Language _language;
Expand Down

0 comments on commit a2bec38

Please sign in to comment.