Skip to content

MYFACES-4443: Delete FaceletsResourceResolver, ResourceResolver is removed already #289

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
tandraschko merged 1 commit into from
Aug 25, 2022
Merged

MYFACES-4443: Delete FaceletsResourceResolver, ResourceResolver is removed already #289

Show file tree
Hide file tree
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
33 changes: 0 additions & 33 deletions api/src/main/java/jakarta/faces/view/facelets/FaceletsResourceResolver.java
View file
Open in desktop

This file was deleted.

22 changes: 1 addition & 21 deletions impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import jakarta.faces.render.FacesRenderer;
import jakarta.faces.render.RenderKitFactory;
import jakarta.faces.validator.FacesValidator;
import jakarta.faces.view.facelets.FaceletsResourceResolver;

import org.apache.myfaces.config.impl.element.ApplicationImpl;
import org.apache.myfaces.config.impl.element.BehaviorImpl;
Expand Down Expand Up @@ -267,13 +266,7 @@ protected FacesConfigImpl createFacesConfig(Map<Class<? extends Annotation>, Set
{
handleFacesBehaviorRenderer(facesConfig, classes);
}

classes = map.get(FaceletsResourceResolver.class);
if (classes != null && !classes.isEmpty())
{
handleFaceletsResourceResolver(facesConfig, classes);
}


return facesConfig;
}

Expand Down Expand Up @@ -376,17 +369,4 @@ private void handleFacesBehaviorRenderer(FacesConfigImpl facesConfig, Set<Class<
}
}
}

private void handleFaceletsResourceResolver(FacesConfigImpl facesConfig, Set<Class<?>> classes)
{
for (Class<?> clazz : classes)
{
FaceletsResourceResolver faceletsResourceResolver =
(FaceletsResourceResolver) clazz.getAnnotation(FaceletsResourceResolver.class);
if (faceletsResourceResolver != null)
{
facesConfig.addResourceResolver(clazz.getName());
}
}
}
}
4 changes: 1 addition & 3 deletions impl/src/main/java/org/apache/myfaces/config/annotation/CdiAnnotationProviderExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import jakarta.faces.render.FacesBehaviorRenderer;
import jakarta.faces.render.FacesRenderer;
import jakarta.faces.validator.FacesValidator;
import jakarta.faces.view.facelets.FaceletsResourceResolver;
import org.apache.myfaces.config.element.NamedEvent;

public class CdiAnnotationProviderExtension implements Extension
Expand All @@ -50,8 +49,7 @@ public CdiAnnotationProviderExtension()
FacesValidator.class,
FacesRenderer.class,
NamedEvent.class,
FacesBehaviorRenderer.class,
FaceletsResourceResolver.class
FacesBehaviorRenderer.class
};
map = new HashMap<>(annotationsToScan.length, 1f);
}
Expand Down
3 changes: 0 additions & 3 deletions impl/src/main/java/org/apache/myfaces/config/annotation/DefaultAnnotationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
import jakarta.faces.render.FacesBehaviorRenderer;
import jakarta.faces.render.FacesRenderer;
import jakarta.faces.validator.FacesValidator;
import jakarta.faces.view.facelets.FaceletsResourceResolver;

import org.apache.myfaces.cdi.util.CDIUtils;
import org.apache.myfaces.config.MyfacesConfig;
Expand Down Expand Up @@ -108,7 +107,6 @@ public class DefaultAnnotationProvider extends AnnotationProvider
//bcan.add("Ljakarta/faces/event/ListenerFor;");
//bcan.add("Ljakarta/faces/event/ListenersFor;");
bcan.add("Ljakarta/faces/render/FacesBehaviorRenderer;");
bcan.add("Ljakarta/faces/view/facelets/FaceletsResourceResolver;");
JSF_ANNOTATION_NAMES = Collections.unmodifiableSet(bcan);

Set<Class<? extends Annotation>> ancl = new HashSet<>(10, 1f);
Expand All @@ -119,7 +117,6 @@ public class DefaultAnnotationProvider extends AnnotationProvider
ancl.add(FacesRenderer.class);
ancl.add(NamedEvent.class);
ancl.add(FacesBehaviorRenderer.class);
ancl.add(FaceletsResourceResolver.class);
JSF_ANNOTATION_CLASSES = Collections.unmodifiableSet(ancl);
}

Expand Down