Merge branch 'master' into 1760_add_back_id_attribute_to_head_and_body

action/src/main/java/org/eclipse/mojarra/action/DefaultActionMappingMatcher.java

@@ -39,10 +39,12 @@ public class DefaultActionMappingMatcher implements ActionMappingMatcher {
      * @param bean the bean.
      * @return the action mapping match, or null if not found.
      */
+    @SuppressWarnings("rawtypes")
     private ActionMappingMatch determineActionMappingMatch(FacesContext facesContext, Bean<?> bean) {
         ActionMappingMatch result = null;
         Class<?> clazz = bean.getBeanClass();
         AnnotatedType annotatedType = CDI.current().getBeanManager().createAnnotatedType(clazz);
+        @SuppressWarnings("unchecked")
         Set<AnnotatedMethod> annotatedMethodSet = annotatedType.getMethods();
         for (AnnotatedMethod method : annotatedMethodSet) {
             if (method.isAnnotationPresent(ActionMapping.class)) {

action/src/main/java/org/eclipse/mojarra/action/DefaultActionMethodExecutor.java

@@ -44,7 +44,7 @@ public class DefaultActionMethodExecutor implements ActionMethodExecutor {
      */
     @Override
     public void execute(FacesContext facesContext, ActionMappingMatch actionMappingMatch) {
-        Instance instance = CDI.current().select(
+        Instance<?> instance = CDI.current().select(
                 actionMappingMatch.getBean().getBeanClass(), Any.Literal.INSTANCE);
         String viewId;
         try {

impl/src/main/java/com/sun/faces/application/resource/ResourcePathsIterator.java

@@ -64,7 +64,10 @@ public String next() {
     }
 
     private void visit(String resourcePath) {
-        stack.addAll(externalContext.getResourcePaths(resourcePath));
+        java.util.Set<String> set = externalContext.getResourcePaths(resourcePath);
+        if(set != null) {
+            stack.addAll(set);
+        }
     }
 
     private void tryTake() {

impl/src/test/java/com/sun/faces/application/FacesMessageTest.java

@@ -16,6 +16,8 @@
 
 package com.sun.faces.application;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
@@ -26,8 +28,6 @@
 
 import jakarta.faces.application.FacesMessage;
 
-import static org.junit.Assert.*;
-
 public class FacesMessageTest {
 
     // Case 0 (nothing)
@@ -69,7 +69,6 @@ private void persistAndCheck(FacesMessage message) {
         String mDetail, mDetail1 = null;
         String severity, severity1 = null;
         ByteArrayOutputStream bos = null;
-        ByteArrayInputStream bis = null;
 
         mSummary = message.getSummary();
         mDetail = message.getDetail();

impl/src/test/java/com/sun/faces/config/DigesterFactory.java

@@ -16,11 +16,13 @@
 
 package com.sun.faces.config;
 
-import javax.xml.parsers.ParserConfigurationException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.apache.commons.digester.Digester;
 import org.apache.commons.logging.impl.NoOpLog;
 import org.xml.sax.ErrorHandler;
@@ -30,6 +32,7 @@
 import org.xml.sax.SAXNotSupportedException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.helpers.DefaultHandler;
+
 import com.sun.faces.util.ToolsUtil;
 
 /**
@@ -88,9 +91,9 @@ public class DigesterFactory {
      * The <code>ThreadLocal</code> variable used to record the VersionListener
      * instance for each processing thread.</p>
      */
-    private static ThreadLocal versionListener = new ThreadLocal() {
+    private static ThreadLocal<VersionListener> versionListener = new ThreadLocal<>() {
         @Override
-        protected Object initialValue() {
+        protected VersionListener initialValue() {
             return (null);
         }
     };
@@ -165,7 +168,7 @@ public static DigesterFactory newInstance(boolean isValidating,
     } // END newInstance
 
     public static VersionListener getVersionListener() {
-        return ((VersionListener) versionListener.get());
+        return (versionListener.get());
     }
 
     public static void releaseDigester(Digester toRelease) {
@@ -200,7 +203,7 @@ public interface VersionListener {
          * Called from the EntityResolver when we know one of the XML Grammar
          * elements to which this config file conforms.</p>
          * @param grammar       */
-        public void takeActionOnGrammar(String grammar);
+        void takeActionOnGrammar(String grammar);
 
         /**
          * <p>
@@ -209,7 +212,7 @@ public interface VersionListener {
          * parsed.</p>
          * @param artifactName
          */
-        public void takeActionOnArtifact(String artifactName);
+        void takeActionOnArtifact(String artifactName);
     }
 
     // --------------------------------------------------------- Private Methods
@@ -337,7 +340,7 @@ private static class JsfEntityResolver extends DefaultHandler {
          * Contains mapping between grammar name and the local URL to the
          * physical resource.</p>
          */
-        private HashMap<String, String> entities = new HashMap<String, String>();
+        private HashMap<String, String> entities = new HashMap<>();
 
         // -------------------------------------------------------- Constructors
         public JsfEntityResolver() {

impl/src/test/java/com/sun/faces/context/ExternalContextImplTest.java

@@ -16,24 +16,27 @@
 
 package com.sun.faces.context;
 
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
+
+import org.junit.Test;
+import org.powermock.api.easymock.PowerMock;
+
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import org.junit.Test;
-import org.powermock.api.easymock.PowerMock;
 
 /**
  * The JUnit tests for the ExternalContextImpl class.
@@ -128,13 +131,6 @@ public void testGetRequestCookieMap3() {
             assertTrue(e instanceof UnsupportedOperationException);
         }
 
-        try {
-            requestCookieMap.entrySet().remove("test");
-            fail();
-        } catch (Exception e) {
-            assertTrue(e instanceof UnsupportedOperationException);
-        }
-
         try {
             requestCookieMap.keySet().remove("test");
             fail();

impl/src/test/java/com/sun/faces/el/CompositeComponentAttributesELResolverTest.java

@@ -16,23 +16,27 @@
 
 package com.sun.faces.el;
 
-import com.sun.faces.facelets.tag.composite.CompositeComponentBeanInfo;
-
-import jakarta.faces.application.Resource;
-import jakarta.faces.component.UIComponent;
-import jakarta.faces.component.UIPanel;
-import jakarta.faces.context.FacesContext;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.beans.BeanDescriptor;
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
-import jakarta.el.ELContext;
 
 import org.easymock.EasyMock;
 import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.easymock.EasyMock.*;
+
+import com.sun.faces.facelets.tag.composite.CompositeComponentBeanInfo;
+
+import jakarta.el.ELContext;
+import jakarta.faces.application.Resource;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIPanel;
+import jakarta.faces.context.FacesContext;
 
 /**
  * The JUnit tests for the CompositeComponentAttributesELResolver class.
@@ -50,8 +54,8 @@ public void testGetValue() throws Exception {
         FacesContext facesContext1 = EasyMock.createNiceMock(FacesContext.class);
         ELContext elContext2 = EasyMock.createNiceMock(ELContext.class);
         FacesContext facesContext2 = EasyMock.createNiceMock(FacesContext.class);
-        
-        HashMap<Object, Object> ctxAttributes1 = new HashMap<Object, Object>();
+
+        HashMap<Object, Object> ctxAttributes1 = new HashMap<>();
         UIPanel composite = new UIPanel();
         CompositeComponentBeanInfo compositeBeanInfo = new CompositeComponentBeanInfo();
         BeanDescriptor beanDescriptor = new BeanDescriptor(composite.getClass());
@@ -65,15 +69,17 @@ public void testGetValue() throws Exception {
         expect(elContext2.getContext(FacesContext.class)).andReturn(facesContext2);
         expect(facesContext2.getAttributes()).andReturn(ctxAttributes1);
         replay(elContext1, facesContext1, elContext2, facesContext2);
-        
+
         CompositeComponentAttributesELResolver elResolver = new CompositeComponentAttributesELResolver();
+        @SuppressWarnings("unchecked")
         Map<String, Object> evalMap1 = (Map<String, Object>) elResolver.getValue(elContext1, composite, property);
         assertNotNull(evalMap1);
+        @SuppressWarnings("unchecked")
         Map<String, Object> evalMap2 = (Map<String, Object>) elResolver.getValue(elContext2, composite, property);
         assertNotNull(evalMap2);
-        
+
         Field ctxField1 = evalMap1.getClass().getDeclaredField("ctx");
-        ctxField1.setAccessible(true);       
+        ctxField1.setAccessible(true);
         Field ctxField2 = evalMap2.getClass().getDeclaredField("ctx");
         ctxField2.setAccessible(true);
 
@@ -82,7 +88,7 @@ public void testGetValue() throws Exception {
         assertTrue(facesContext2 == ctxField1.get(evalMap1));
         assertTrue(facesContext1 != ctxField2.get(evalMap2));
         assertTrue(facesContext2 == ctxField2.get(evalMap2));
-        
+
         verify(elContext1, facesContext1, elContext2, facesContext2);
     }
 }

impl/src/test/java/com/sun/faces/junit/JUnitFacesTestCaseBase.java

@@ -16,6 +16,10 @@
 
 package com.sun.faces.junit;
 
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
 import com.sun.faces.mock.MockApplication;
 import com.sun.faces.mock.MockExternalContext;
 import com.sun.faces.mock.MockFacesContext;
@@ -30,11 +34,6 @@
 import jakarta.faces.application.ApplicationFactory;
 import jakarta.faces.context.FacesContextFactory;
 import jakarta.faces.lifecycle.LifecycleFactory;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
 import junit.framework.TestCase;
 
 public class JUnitFacesTestCaseBase extends TestCase {
@@ -91,7 +90,7 @@ public void setUp() throws Exception {
         lifecycle = (MockLifecycle) lFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE);
         facesContext = (MockFacesContext) fcFactory.getFacesContext(servletContext, request, response, lifecycle);
         externalContext = (MockExternalContext) facesContext.getExternalContext();
-        Map map = new HashMap();
+        Map<String, String> map = new HashMap<>();
         externalContext.setRequestParameterMap(map);
 
         ApplicationFactory applicationFactory = (ApplicationFactory) FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY);

impl/src/test/java/com/sun/faces/mock/MockResultSetMetaData.java

@@ -36,7 +36,7 @@ public class MockResultSetMetaData implements ResultSetMetaData {
      *
      * @param clazz Class whose properties we treat like columns
      */
-    public MockResultSetMetaData(Class clazz) throws SQLException {
+    public MockResultSetMetaData(Class<?> clazz) throws SQLException {
         try {
             descriptors
                     = Introspector.getBeanInfo(clazz).getPropertyDescriptors();

impl/src/test/java/com/sun/faces/mock/MockServletConfig.java

@@ -18,6 +18,7 @@
 
 import java.util.Enumeration;
 import java.util.Hashtable;
+
 import jakarta.servlet.ServletConfig;
 import jakarta.servlet.ServletContext;
 
@@ -31,7 +32,7 @@ public MockServletConfig(ServletContext context) {
         setServletContext(context);
     }
 
-    private Hashtable parameters = new Hashtable();
+    private Hashtable<String, String> parameters = new Hashtable<>();
     private ServletContext context;
 
     // --------------------------------------------------------- Public Methods
@@ -46,11 +47,11 @@ public void setServletContext(ServletContext context) {
     // -------------------------------------------------- ServletConfig Methods
     @Override
     public String getInitParameter(String name) {
-        return ((String) parameters.get(name));
+        return (parameters.get(name));
     }
 
     @Override
-    public Enumeration getInitParameterNames() {
+    public Enumeration<String> getInitParameterNames() {
         return (parameters.keys());
     }
 

impl/src/test/java/com/sun/faces/renderkit/html_basic/BodyRendererTest.java

@@ -63,14 +63,14 @@ public void testEncodeBegin() throws Exception {
         BodyRenderer bodyRenderer = new BodyRenderer();
         HtmlBody htmlBody = new HtmlBody();
         htmlBody.getAttributes().put("styleClass", "myclass");
-        
+
         expect(facesContext.getResponseWriter()).andReturn(testResponseWriter).anyTimes();
         expect(facesContext.getViewRoot()).andReturn(viewRoot).anyTimes();
         expect(viewRoot.getDoctype()).andReturn(doctype).anyTimes();
         expect(doctype.getRootElement()).andReturn("html").anyTimes();
         expect(doctype.getPublic()).andReturn(null).anyTimes();
         expect(doctype.getSystem()).andReturn(null).anyTimes();
-        
+
         PowerMock.replay(facesContext);
         bodyRenderer.encodeBegin(facesContext, htmlBody);
         PowerMock.verify(facesContext);
@@ -110,14 +110,15 @@ public void testEncodeEnd() throws Exception {
         Application application = PowerMock.createMock(Application.class);
         BodyRenderer bodyRenderer = new BodyRenderer();
         HtmlBody htmlBody = new HtmlBody();
-        
+
         expect(facesContext.getApplication()).andReturn(application).anyTimes();
-        expect(facesContext.getClientIdsWithMessages()).andReturn(Collections.EMPTY_LIST.iterator()).anyTimes();
+        expect(facesContext.getClientIdsWithMessages()).andReturn(Collections.<String>emptyList().iterator())
+                .anyTimes();
         expect(facesContext.getResponseWriter()).andReturn(testResponseWriter).anyTimes();
         expect(facesContext.getViewRoot()).andReturn(viewRoot).anyTimes();
         expect(facesContext.isProjectStage(ProjectStage.Development)).andReturn(false).anyTimes();
-        expect(viewRoot.getComponentResources(facesContext, "body")).andReturn(Collections.EMPTY_LIST).anyTimes();
-       
+        expect(viewRoot.getComponentResources(facesContext, "body")).andReturn(Collections.emptyList()).anyTimes();
+
         PowerMock.replay(facesContext, viewRoot, application);
         bodyRenderer.encodeEnd(facesContext, htmlBody);
         PowerMock.verify(facesContext, viewRoot, application);

impl/src/test/java/com/sun/faces/renderkit/html_basic/HeadRendererTest.java

@@ -104,11 +104,11 @@ public void testEncodeEnd() throws Exception {
         UIViewRoot viewRoot = PowerMock.createMock(UIViewRoot.class);
         HeadRenderer headRenderer = new HeadRenderer();
         HtmlHead htmlHead = new HtmlHead();
-        
+
         expect(facesContext.getResponseWriter()).andReturn(testResponseWriter).anyTimes();
         expect(facesContext.getViewRoot()).andReturn(viewRoot).anyTimes();
-        expect(viewRoot.getComponentResources(facesContext, "head")).andReturn(Collections.EMPTY_LIST).anyTimes();
-        
+        expect(viewRoot.getComponentResources(facesContext, "head")).andReturn(Collections.emptyList()).anyTimes();
+
         PowerMock.replay(facesContext, viewRoot);
         headRenderer.encodeEnd(facesContext, htmlHead);
         PowerMock.verify(facesContext, viewRoot);