Permalink
Browse files

Fixes https://java.net/jira/browse/JAVASERVERFACES-3722, Add support …

…for generic types and injection of the applicationMap

git-svn-id: https://svn.java.net/svn/mojarra~svn/trunk@14257 761efcf2-d34d-6b61-9145-99dcacc3edf1
  • Loading branch information...
mriem
mriem committed Jan 27, 2015
1 parent 6402f3c commit 2944a51465df7608439052c7d58333283da6880d
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
* Copyright (c) 1997-2014 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
@@ -67,6 +67,15 @@
*/
public class ApplicationMapProducer extends CdiProducer implements Bean<Map<String, Object>> {
/**
* The set of types that this producer is capable of producing, and hence
* can be used as the type of an injection point.
*/
private final Set<Type> types = new HashSet<>(asList(
new ParameterizedTypeImpl(Map.class, new Type[]{String.class, Object.class}),
Map.class,
Object.class));
/**
* Inner class defining an annotation literal for @ApplicationMap.
*/
@@ -175,7 +184,7 @@ public String getName() {
*/
@Override
public Set<Type> getTypes() {
return new HashSet<>(asList(Map.class));
return types;
}
/**
@@ -0,0 +1,172 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
* Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
* and Distribution License("CDDL") (collectively, the "License"). You
* may not use this file except in compliance with the License. You can
* obtain a copy of the License at
* https://glassfish.java.net/public/CDDL+GPL_1_1.html
* or packager/legal/LICENSE.txt. See the License for the specific
* language governing permissions and limitations under the License.
*
* When distributing the software, include this License Header Notice in each
* file and include the License file at packager/legal/LICENSE.txt.
*
* GPL Classpath Exception:
* Oracle designates this particular file as subject to the "Classpath"
* exception as provided by Oracle in the GPL Version 2 section of the License
* file that accompanied this code.
*
* Modifications:
* If applicable, add the following below the License Header, with the fields
* enclosed by brackets [] replaced by your own identifying information:
* "Portions Copyright [year] [name of copyright owner]"
*
* Contributor(s):
* If you wish your version of this file to be governed by only the CDDL or
* only the GPL Version 2, indicate your decision by adding "[Contributor]
* elects to include this software in this distribution under the [CDDL or GPL
* Version 2] license." If you don't indicate a single choice of license, a
* recipient has the option to distribute your version of this file under
* either the CDDL, the GPL Version 2 or to extend the choice of license to
* its licensees as provided above. However, if you add GPL Version 2 code
* and therefore, elected the GPL Version 2 license, then the option applies
* only if the new code is made subject to such option by the copyright
* holder.
*/
package com.sun.faces.cdi;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Arrays;
import java.util.Objects;
/**
* <p class="changed_added_2_3">
* ParameterizedTypeImpl is a basic implementation of the ParameterizedType
* interface. It is used by the dynamic CDI producers that produce generic
* types.
* </p>
*
* @since 2.3
*/
public class ParameterizedTypeImpl implements ParameterizedType {
/**
* Stores the owner type.
*/
private final Type ownerType;
/**
* Stores the raw type.
*/
private final Class<?> rawType;
/**
* Stores the actual type arguments.
*/
private final Type[] actualTypeArguments;
/**
* Constructs an instance of ParameterizedType without an owner type
*
* @param rawType Type representing the class or interface that declares
* this type.
* @param actualTypeArguments Array of Types representing the actual type
* arguments for this type
*/
public ParameterizedTypeImpl(Class<?> rawType, Type[] actualTypeArguments) {
this(null, rawType, actualTypeArguments);
}
/**
* Constructs an instance of ParameterizedType
*
* @param ownerType the Type representing the type that this type is
* embedded in, if any. It can be null.
* @param rawType the Type representing the class or interface that declares
* this type.
* @param actualTypeArguments Array of Types representing the actual type
* arguments for this type
*/
public ParameterizedTypeImpl(Type ownerType, Class<?> rawType,
Type[] actualTypeArguments) {
this.ownerType = ownerType;
this.rawType = rawType;
this.actualTypeArguments = actualTypeArguments;
}
/**
* Get the owner type.
*
* @return the owner type.
*/
@Override
public Type getOwnerType() {
return ownerType;
}
/**
* Get the raw type.
*
* @return the raw type.
*/
@Override
public Type getRawType() {
return rawType;
}
/**
* Get the actual type arguments.
*
* @return the actual type arguments.
*/
@Override
public Type[] getActualTypeArguments() {
return actualTypeArguments;
}
/**
* Equals method.
*
* @param other the object to compare against.
* @return true if it is equals, false otherwise.
*/
@Override
public boolean equals(Object other) {
return other instanceof ParameterizedType
? equals((ParameterizedType) other) : false;
}
/**
*
* Tests if an other instance of ParameterizedType is "equal to" this
* instance.
*
* @param other the other instance of ParameterizedType
* @return true if instances equal, false otherwise.
*/
public boolean equals(ParameterizedType other) {
return this == other ? true
: Objects.equals(getOwnerType(), other.getOwnerType())
&& Objects.equals(getRawType(), other.getRawType())
&& Arrays.equals(getActualTypeArguments(),
other.getActualTypeArguments());
}
/**
* Hash code.
*
* @return the hash code.
*/
@Override
public int hashCode() {
return Objects.hashCode(getOwnerType())
^ Objects.hashCode(getRawType())
^ Arrays.hashCode(getActualTypeArguments());
}
}
@@ -0,0 +1,59 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
* Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
* and Distribution License("CDDL") (collectively, the "License"). You
* may not use this file except in compliance with the License. You can
* obtain a copy of the License at
* https://glassfish.java.net/public/CDDL+GPL_1_1.html
* or packager/legal/LICENSE.txt. See the License for the specific
* language governing permissions and limitations under the License.
*
* When distributing the software, include this License Header Notice in each
* file and include the License file at packager/legal/LICENSE.txt.
*
* GPL Classpath Exception:
* Oracle designates this particular file as subject to the "Classpath"
* exception as provided by Oracle in the GPL Version 2 section of the License
* file that accompanied this code.
*
* Modifications:
* If applicable, add the following below the License Header, with the fields
* enclosed by brackets [] replaced by your own identifying information:
* "Portions Copyright [year] [name of copyright owner]"
*
* Contributor(s):
* If you wish your version of this file to be governed by only the CDDL or
* only the GPL Version 2, indicate your decision by adding "[Contributor]
* elects to include this software in this distribution under the [CDDL or GPL
* Version 2] license." If you don't indicate a single choice of license, a
* recipient has the option to distribute your version of this file under
* either the CDDL, the GPL Version 2 or to extend the choice of license to
* its licensees as provided above. However, if you add GPL Version 2 code
* and therefore, elected the GPL Version 2 license, then the option applies
* only if the new code is made subject to such option by the copyright
* holder.
*/
package com.sun.faces.test.javaee8.cdi;
import java.util.Map;
import javax.enterprise.context.RequestScoped;
import javax.faces.application.ApplicationMap;
import javax.inject.Inject;
import javax.inject.Named;
@Named(value = "injectApplicationMap2Bean")
@RequestScoped
public class InjectApplicationMap2Bean {
@ApplicationMap
@Inject
Map<String, Object> applicationMap;
public String getValue() {
return Boolean.toString(applicationMap.containsKey("com.sun.faces.config.WebConfiguration"));
}
}
@@ -52,8 +52,8 @@
@ApplicationMap
@Inject
Map applicationMap;
public String getValue() {
return applicationMap.containsKey("com.sun.faces.config.WebConfiguration") ? "TRUE" : "FALSE";
return Boolean.toString(applicationMap.containsKey("com.sun.faces.config.WebConfiguration"));
}
}
@@ -0,0 +1,12 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://xmlns.jcp.org/jsf/html">
<h:head>
<title>Facelet Title</title>
</h:head>
<h:body>
<h:outputText value="#{injectApplicationMap2Bean.value}"/> <br/>
</h:body>
</html>
@@ -0,0 +1,79 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
* Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
* and Distribution License("CDDL") (collectively, the "License"). You
* may not use this file except in compliance with the License. You can
* obtain a copy of the License at
* https://glassfish.java.net/public/CDDLGPL_1_1.html
* or packager/legal/LICENSE.txt. See the License for the specific
* language governing permissions and limitations under the License.
*
* When distributing the software, include this License Header Notice in each
* file and include the License file at packager/legal/LICENSE.txt.
*
* GPL Classpath Exception:
* Oracle designates this particular file as subject to the "Classpath"
* exception as provided by Oracle in the GPL Version 2 section of the License
* file that accompanied this code.
*
* Modifications:
* If applicable, add the following below the License Header, with the fields
* enclosed by brackets [] replaced by your own identifying information:
* "Portions Copyright [year] [name of copyright owner]"
*
* Contributor(s):
* If you wish your version of this file to be governed by only the CDDL or
* only the GPL Version 2, indicate your decision by adding "[Contributor]
* elects to include this software in this distribution under the [CDDL or GPL
* Version 2] license." If you don't indicate a single choice of license, a
* recipient has the option to distribute your version of this file under
* either the CDDL, the GPL Version 2 or to extend the choice of license to
* its licensees as provided above. However, if you add GPL Version 2 code
* and therefore, elected the GPL Version 2 license, then the option applies
* only if the new code is made subject to such option by the copyright
* holder.
*/
package com.sun.faces.test.javaee8.cdi;
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import static com.sun.faces.test.junit.JsfServerExclude.WEBLOGIC_12_1_4;
import static com.sun.faces.test.junit.JsfServerExclude.WEBLOGIC_12_2_1;
import com.sun.faces.test.junit.JsfTest;
import com.sun.faces.test.junit.JsfTestRunner;
import com.sun.faces.test.junit.JsfVersion;
import org.junit.After;
import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@RunWith(JsfTestRunner.class)
public class Issue3722IT {
private String webUrl;
private WebClient webClient;
@Before
public void setUp() {
webUrl = System.getProperty("integration.url");
webClient = new WebClient();
}
@After
public void tearDown() {
webClient.closeAllWindows();
}
@Test
@JsfTest(value = JsfVersion.JSF_2_3_0_M01,
excludes = {WEBLOGIC_12_2_1, WEBLOGIC_12_1_4})
public void testInjectApplicationMap2() throws Exception {
HtmlPage page = webClient.getPage(webUrl + "faces/injectApplicationMap2.xhtml");
assertTrue(page.asXml().contains("true"));
}
}
@@ -74,6 +74,6 @@ public void tearDown() {
excludes = {WEBLOGIC_12_2_1, WEBLOGIC_12_1_4})
public void testInjectApplicationMap() throws Exception {
HtmlPage page = webClient.getPage(webUrl + "faces/injectApplicationMap.xhtml");
assertTrue(page.asXml().contains("TRUE"));
assertTrue(page.asXml().contains("true"));
}
}

0 comments on commit 2944a51

Please sign in to comment.