BUG inside restoreState: Object[].length is 2!

Generics Cosmetics Signed-off-by: pizzi80 <[email protected]>
pizzi80 · Dec 17, 2022 · a983e27 · a983e27
1 parent 2395077
commit a983e27
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 99 deletions.
diff --git a/impl/src/main/java/com/sun/faces/facelets/tag/composite/BehaviorHolderWrapper.java b/impl/src/main/java/com/sun/faces/facelets/tag/composite/BehaviorHolderWrapper.java
@@ -413,7 +413,7 @@ protected FacesListener[] getFacesListeners(Class clazz) {
     }
 
     @Override
-    protected Renderer getRenderer(FacesContext context) {
+    protected Renderer<? extends UIComponent> getRenderer(FacesContext context) {
         return null;
     }
 

diff --git a/impl/src/main/java/jakarta/faces/component/StateHolderSaver.java b/impl/src/main/java/jakarta/faces/component/StateHolderSaver.java
@@ -17,6 +17,7 @@
 package jakarta.faces.component;
 
 import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
 
 import jakarta.faces.context.FacesContext;
 
@@ -100,7 +101,7 @@ public StateHolderSaver(FacesContext context, Object toSave) {
 
     public Object restore(FacesContext context) throws IllegalStateException {
         Object result = null;
-        Class toRestoreClass;
+        Class<?> toRestoreClass;
 
         // if the Object to save implemented Serializable but not
         // StateHolder
@@ -124,11 +125,11 @@ public Object restore(FacesContext context) throws IllegalStateException {
 
         if (null != toRestoreClass) {
             try {
-                result = toRestoreClass.newInstance();
-            } catch (InstantiationException e) {
+                result = toRestoreClass.getDeclaredConstructor().newInstance();
+            } catch (InstantiationException | IllegalAccessException | NoSuchMethodException e) {
                 throw new IllegalStateException(e);
-            } catch (IllegalAccessException a) {
-                throw new IllegalStateException(a);
+            } catch (InvocationTargetException e) {
+                throw new RuntimeException(e);
             }
         }
 
@@ -141,7 +142,7 @@ public Object restore(FacesContext context) throws IllegalStateException {
         return result;
     }
 
-    private static Class loadClass(String name, Object fallbackClass) throws ClassNotFoundException {
+    private static Class<?> loadClass(String name, Object fallbackClass) throws ClassNotFoundException {
         ClassLoader loader = Thread.currentThread().getContextClassLoader();
         if (loader == null) {
             loader = fallbackClass.getClass().getClassLoader();

diff --git a/impl/src/main/java/jakarta/faces/component/UIComponent.java b/impl/src/main/java/jakarta/faces/component/UIComponent.java
@@ -1981,7 +1981,7 @@ public void processEvent(ComponentSystemEvent event) throws AbortProcessingExcep
      * @param context {@link FacesContext} for the current request
      * @return the renderer, or <code>null</code>.
      */
-    protected abstract Renderer getRenderer(FacesContext context);
+    protected abstract Renderer<? extends UIComponent> getRenderer(FacesContext context);
 
     // --------------------------------------------------------- Package Private