Skip to content

Restore supplier-disposal link in ClassRequestor without jakarta #2707

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

Merged
HannesWell merged 1 commit into from
Jun 4, 2026
Merged

Restore supplier-disposal link in ClassRequestor without jakarta #2707

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 19 additions & 1 deletion ...me/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/ClassRequestor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
*******************************************************************************/
package org.eclipse.e4.core.internal.di;

import java.lang.reflect.Field;
import org.eclipse.e4.core.di.IInjector;
import org.eclipse.e4.core.di.InjectionException;
import org.eclipse.e4.core.di.annotations.Optional;
import org.eclipse.e4.core.di.suppliers.IObjectDescriptor;
import org.eclipse.e4.core.di.suppliers.PrimaryObjectSupplier;

Expand All @@ -26,7 +28,23 @@
*/
public class ClassRequestor extends Requestor<Class<?>> {

private static IObjectDescriptor[] pseudoVariableDescriptor = {};
private interface InjectionLink {
// Marker type for the pseudo dependency. It is intentionally never available
// from any supplier, so the (optional) dependency never resolves to a value.
}

@Optional
private static final InjectionLink PSEUDO_VARIABLE = null;
static {
try {
Field field = ClassRequestor.class.getDeclaredField("PSEUDO_VARIABLE"); //$NON-NLS-1$
pseudoVariableDescriptor = new IObjectDescriptor[] {
new ObjectDescriptor(field.getGenericType(), field.getAnnotations()) };
} catch (NoSuchFieldException e) {
throw new IllegalStateException(e); // the field is declared right above, this cannot happen
}
}
private static final IObjectDescriptor[] pseudoVariableDescriptor;

public ClassRequestor(Class<?> clazz, IInjector injector, PrimaryObjectSupplier primarySupplier, PrimaryObjectSupplier tempSupplier, Object requestingObject, boolean track) {
super(clazz, injector, primarySupplier, tempSupplier, requestingObject, track);
Expand Down
Loading