Fix servlet30 tests 2 (#4449)

* 2nd round of fixes for Servlet 3.0 tests * 2nd round of fixes for Servlet 3.0 tests Signed-off-by: arjantijms <[email protected]>
eclipse-ee4j · Aug 29, 2018 · cd73631 · cd73631
1 parent ae66bb9
commit cd73631
Show file tree

Hide file tree

Showing 545 changed files with 6,929 additions and 8,976 deletions.
diff --git a/...main/java/com/sun/faces/test/servlet30/contractusingviewroot/ViewRootContractsELBean.java b/...main/java/com/sun/faces/test/servlet30/contractusingviewroot/ViewRootContractsELBean.java
@@ -16,14 +16,14 @@
 
 package com.sun.faces.test.servlet30.contractusingviewroot;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
 
+@Named
 @RequestScoped
-@ManagedBean(name = "viewRootConstractsELBean")
 public class ViewRootContractsELBean {
 
-    private String contracts = null;
+    private String contracts;
 
     public String getContracts() {
         return contracts;

diff --git a/...rc/main/java/com/sun/faces/test/servlet30/customresolvers/EagerApplicationScopedBean.java b/...rc/main/java/com/sun/faces/test/servlet30/customresolvers/EagerApplicationScopedBean.java
@@ -18,12 +18,12 @@
 
 import javax.annotation.PostConstruct;
 import javax.el.ELResolver;
+import javax.enterprise.context.ApplicationScoped;
 import javax.faces.application.Application;
-import javax.faces.bean.ApplicationScoped;
-import javax.faces.bean.ManagedBean;
 import javax.faces.context.FacesContext;
+import javax.inject.Named;
 
-@ManagedBean(eager=true)
+@Named
 @ApplicationScoped
 public class EagerApplicationScopedBean {
 
@@ -32,9 +32,6 @@ public void installProgrammaticListener() {
         Application app = null;
         FacesContext context = FacesContext.getCurrentInstance();
         app = context.getApplication();
-//        VariableResolver oldVr = app.getVariableResolver();
-//        VariableResolver newVr = new NewVariableResolver(oldVr, context);
-//        app.setVariableResolver(newVr);
         ELResolver newER = new NewELResolver(context);
         app.addELResolver(newER);
 

diff --git a/...et30/facelets/src/main/java/com/sun/faces/test/servlet30/facelets/ActionListenerBean.java b/...et30/facelets/src/main/java/com/sun/faces/test/servlet30/facelets/ActionListenerBean.java
@@ -16,10 +16,12 @@
 
 package com.sun.faces.test.servlet30.facelets;
 
-import javax.faces.bean.ManagedBean;
+import javax.enterprise.context.RequestScoped;
 import javax.faces.event.ActionEvent;
+import javax.inject.Named;
 
-@ManagedBean
+@Named
+@RequestScoped
 public class ActionListenerBean {
 
     private boolean invoked;

diff --git a/.../facelets/src/main/java/com/sun/faces/test/servlet30/facelets/CustomComponentHandler.java b/.../facelets/src/main/java/com/sun/faces/test/servlet30/facelets/CustomComponentHandler.java
@@ -55,20 +55,15 @@ public Tag getTag() {
             public String getTagId() {
                 return config.getTagId();
             }
-            
+
         });
     }
-
-
 
     @Override
     public void apply(FaceletContext ctx, UIComponent parent) throws IOException {
-        ctx.getFacesContext().getAttributes().put("tagHandlerMessage", CustomComponentHandler.class.getSimpleName() +
-                ".apply() called");
-
+        ctx.getFacesContext().getAttributes().put("tagHandlerMessage", CustomComponentHandler.class.getSimpleName() + ".apply() called");
+
         super.apply(ctx, parent);
     }
-
-
-
+
 }
diff --git a/...facelets/src/main/java/com/sun/faces/test/servlet30/facelets/DataTableCollectionBean.java b/...facelets/src/main/java/com/sun/faces/test/servlet30/facelets/DataTableCollectionBean.java
@@ -20,13 +20,16 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
 
-@ManagedBean(name = "dataTableCollectionBean")
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+
+@Named
 @RequestScoped
 public class DataTableCollectionBean implements Serializable {
-
+
+    private static final long serialVersionUID = 1L;
+
     Collection<DataTableCollectionItem> users;
 
     public Collection<DataTableCollectionItem> getUsers() {
@@ -36,33 +39,34 @@ public Collection<DataTableCollectionItem> getUsers() {
     public void setUsers(Collection<DataTableCollectionItem> users) {
         this.users = users;
     }
-    
+
     public DataTableCollectionBean() {
-        users = new MyCollection(new ArrayList<DataTableCollectionItem>());
+        users = new MyCollection<>(new ArrayList<DataTableCollectionItem>());
+
         DataTableCollectionItem b;
         for (int i = 0; i < 3; i++) {
             b = new DataTableCollectionItem();
             b.setFirstName("First" + i);
-            b.setLastName("Last"+i);
+            b.setLastName("Last" + i);
             users.add(b);
         }
     }
-    
-    private static class MyCollection implements Collection {
-        
-        private Collection inner;
-        
-        private MyCollection(Collection c) {
+
+    private static class MyCollection<T> implements Collection<T> {
+
+        private final Collection<T> inner;
+
+        private MyCollection(Collection<T> c) {
             inner = c;
         }
 
         @Override
-        public boolean add(Object e) {
+        public boolean add(T e) {
             return inner.add(e);
         }
 
         @Override
-        public boolean addAll(Collection c) {
+        public boolean addAll(Collection<? extends T> c) {
             return inner.addAll(c);
         }
 
@@ -77,7 +81,7 @@ public boolean contains(Object o) {
         }
 
         @Override
-        public boolean containsAll(Collection c) {
+        public boolean containsAll(Collection<?> c) {
             return inner.containsAll(c);
         }
 
@@ -87,7 +91,7 @@ public boolean isEmpty() {
         }
 
         @Override
-        public Iterator iterator() {
+        public Iterator<T> iterator() {
             return inner.iterator();
         }
 
@@ -97,12 +101,12 @@ public boolean remove(Object o) {
         }
 
         @Override
-        public boolean removeAll(Collection c) {
+        public boolean removeAll(Collection<?> c) {
             return inner.removeAll(c);
         }
 
         @Override
-        public boolean retainAll(Collection c) {
+        public boolean retainAll(Collection<?> c) {
             return inner.retainAll(c);
         }
 
@@ -117,8 +121,8 @@ public Object[] toArray() {
         }
 
         @Override
-        public Object[] toArray(Object[] a) {
+        public <E> E[] toArray(E[] a) {
             return inner.toArray(a);
-        }   
-    }    
+        }
+    }
 }
diff --git a/...facelets/src/main/java/com/sun/faces/test/servlet30/facelets/DataTableCollectionItem.java b/...facelets/src/main/java/com/sun/faces/test/servlet30/facelets/DataTableCollectionItem.java
@@ -19,11 +19,14 @@
 import java.io.Serializable;
 
 public class DataTableCollectionItem implements Serializable {
-
+
+    private static final long serialVersionUID = 1L;
+
     protected String firstName = "Duke";
     protected String lastName = "Java";
-
-    public DataTableCollectionItem() {}
+
+    public DataTableCollectionItem() {
+    }
 
     public String getFirstName() {
         return firstName;
@@ -41,4 +44,3 @@ public void setLastName(String lastName) {
         this.lastName = lastName;
     }
 }
-
diff --git a/...30/facelets/src/main/java/com/sun/faces/test/servlet30/facelets/DataTableDynamicBean.java b/...30/facelets/src/main/java/com/sun/faces/test/servlet30/facelets/DataTableDynamicBean.java
@@ -19,9 +19,9 @@
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.el.ValueExpression;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
+import javax.enterprise.context.SessionScoped;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UINamingContainer;
 import javax.faces.component.UIViewRoot;
@@ -30,9 +30,11 @@
 import javax.faces.component.html.HtmlOutputText;
 import javax.faces.component.html.HtmlPanelGroup;
 import javax.faces.context.FacesContext;
+import javax.inject.Named;
+
 
+@Named
 @SessionScoped
-@ManagedBean(name = "dataTableDynamicBean")
 public class DataTableDynamicBean implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -54,8 +56,8 @@ public void addTable() {
 
     public HtmlDataTable creatTable(FacesContext fc) {
         HtmlDataTable table = new HtmlDataTable();
-        ValueExpression ve = fc.getApplication().getExpressionFactory()
-                .createValueExpression(fc.getELContext(), "#{dataTableDynamicBean.testStrings}", Object.class);
+        ValueExpression ve = fc.getApplication().getExpressionFactory().createValueExpression(fc.getELContext(),
+                "#{dataTableDynamicBean.testStrings}", Object.class);
         table.setId("table");
         table.setValueExpression("value", ve);
         table.setVar("str");
@@ -68,8 +70,8 @@ public HtmlDataTable creatTable(FacesContext fc) {
 
         HtmlOutputText text = new HtmlOutputText();
         text.setId("strv");
-        ValueExpression textve = fc.getApplication().getExpressionFactory()
-                .createValueExpression(fc.getELContext(), "#{str}", Object.class);
+        ValueExpression textve = fc.getApplication().getExpressionFactory().createValueExpression(fc.getELContext(), "#{str}",
+                Object.class);
         text.setValueExpression("value", textve);
         ncPanel.getChildren().add(text);
 
@@ -85,7 +87,7 @@ public HtmlDataTable creatTable(FacesContext fc) {
     }
 
     public List<String> getTestStrings() {
-        String vs[] = {"one", "two", "three", "four"};
+        String vs[] = { "one", "two", "three", "four" };
         return Arrays.asList(vs);
     }
 }
diff --git a/...acelets/src/main/java/com/sun/faces/test/servlet30/facelets/DataTablePassthroughBean.java b/...acelets/src/main/java/com/sun/faces/test/servlet30/facelets/DataTablePassthroughBean.java
@@ -21,20 +21,30 @@
  */
 package com.sun.faces.test.servlet30.facelets;
 
-import java.util.Arrays;
+import static java.util.Arrays.asList;
+
 import java.util.Date;
 import java.util.List;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
 
-@ManagedBean
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+
+@Named
 @RequestScoped
 public class DataTablePassthroughBean {
 
+    private List<Entity> entities = asList(
+            new Entity("name1", new Date()),
+            new Entity("name2", new Date(new Date().getTime() + (1000 * 60 * 60 * 24))),
+            new Entity("name0", new Date(new Date().getTime() + (1000 * 60 * 60 * 48))));
+
+    public List<Entity> getEntities() {
+        return entities;
+    }
+
     public class Entity {
 
         private String name;
-
         private Date modifiedOn;
 
         public Entity(String name, Date modifiedOn) {
@@ -49,16 +59,5 @@ public Date getModifiedOn() {
         public String getName() {
             return name;
         }
-
-    }
-
-    public List<Entity> entities = Arrays.asList(
-            new Entity("name1", new Date()), new Entity("name2", new Date(
-                            new Date().getTime() + (1000 * 60 * 60 * 24))), new Entity(
-                    "name0", new Date(new Date().getTime()
-                            + (1000 * 60 * 60 * 48))));
-
-    public List<Entity> getEntities() {
-        return entities;
     }
 }
diff --git a/...ets/src/main/java/com/sun/faces/test/servlet30/facelets/DecorateWithNullTemplateBean.java b/...ets/src/main/java/com/sun/faces/test/servlet30/facelets/DecorateWithNullTemplateBean.java
@@ -16,14 +16,13 @@
 
 package com.sun.faces.test.servlet30.facelets;
 
-import java.io.Serializable;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
 
-@ManagedBean
+@Named
 @RequestScoped
-public class DecorateWithNullTemplateBean implements Serializable {
-    
+public class DecorateWithNullTemplateBean {
+
     public String getNullValue() {
         return null;
     }