Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for PortletEventCoordinationHelper instantiation #2847

Merged
merged 2 commits into from
Sep 9, 2024
Merged

Fix for PortletEventCoordinationHelper instantiation #2847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84fcf2b
Fix for PortletEventCoordinationHelper instantiation
Naenyn Sep 9, 2024
9e52cef
Removed setters in favor of autowired fields.
Naenyn Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .../src/main/java/org/apereo/portal/portlet/rendering/PortletEventCoordinatationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,13 @@ public void setPortletEntityRegistry(IPortletEntityRegistry portletEntityRegistr
this.portletEntityRegistry = portletEntityRegistry;
}

protected final PortletEventCoordinationHelper portletEventCoordinationHelper =
new PortletEventCoordinationHelper(
this.xmlUtilities,
this.portletContextService,
this.portletWindowRegistry,
this.supportedEventCache,
this.portletDefinitionRegistry);
protected PortletEventCoordinationHelper portletEventCoordinationHelper;

@Autowired
public void setPortletEventCoordinationHelper(
PortletEventCoordinationHelper portletEventCoordinationHelper) {
this.portletEventCoordinationHelper = portletEventCoordinationHelper;
}

/**
* Returns a request scoped PortletEventQueue used to track events to process and events to
Expand Down
26 changes: 9 additions & 17 deletions ...web/src/main/java/org/apereo/portal/portlet/rendering/PortletEventCoordinationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,30 +28,22 @@
import org.apereo.portal.portlet.registry.IPortletWindowRegistry;
import org.apereo.portal.utils.Tuple;
import org.apereo.portal.xml.XmlUtilities;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;

@Component
public class PortletEventCoordinationHelper {
public static final String GLOBAL_EVENT__CONTAINER_OPTION = "org.apereo.portal.globalEvent";
private XmlUtilities xmlUtilities;
private PortletContextService portletContextService;
private IPortletWindowRegistry portletWindowRegistry;
private Ehcache supportedEventCache;
@Autowired private XmlUtilities xmlUtilities;
@Autowired private PortletContextService portletContextService;
@Autowired private IPortletWindowRegistry portletWindowRegistry;

public PortletEventCoordinationHelper(
XmlUtilities xmlUtilities,
PortletContextService portletContextService,
IPortletWindowRegistry portletWindowRegistry,
Ehcache supportedEventCache,
IPortletDefinitionRegistry portletDefinitionRegistry) {
this.xmlUtilities = xmlUtilities;
this.portletContextService = portletContextService;
this.portletWindowRegistry = portletWindowRegistry;
this.supportedEventCache = supportedEventCache;
this.portletDefinitionRegistry = portletDefinitionRegistry;
}
@Autowired
@Qualifier("org.apereo.portal.portlet.rendering.SupportedEventCache")
private Ehcache supportedEventCache;

private IPortletDefinitionRegistry portletDefinitionRegistry;
@Autowired private IPortletDefinitionRegistry portletDefinitionRegistry;

protected Event unmarshall(IPortletWindow portletWindow, Event event) {
// TODO make two types of Event impls, one for marshalled data and one for unmarshalled data
Expand Down