Merge pull request #6 from thisoares/master

Implementação para os registros 743, 744 e 745 do mantis.

Merge pull request #6 from thisoares/master
Implementação para os registros 743, 744 e 745 do mantis.
Cleverson Sacramento
2 parents 8f2f1f04 2841e89f
Showing 4 changed files with 28 additions and 18 deletions Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/ExceptionHandlerInterceptor.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/util/Beans.java
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/template/AbstractEditPageBean.java
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/Faces.java
@@ -74,7 +74,7 @@ public class ExceptionHandlerInterceptor implements Serializable {
 	private final Map<Class<?>, Map<Class<?>, Method>> cache = new HashMap<Class<?>, Map<Class<?>, Method>>();
-	private final boolean handleException(final Exception cause, final InvocationContext ic) throws Throwable {
+	private final boolean handleException(final Exception cause, final InvocationContext ic) throws Exception {
 		logger.info(bundle.getString("handling-exception", cause.getClass().getCanonicalName()));
 		boolean handled = false;
@@ -164,21 +164,26 @@ public class ExceptionHandlerInterceptor implements Serializable {
 		return cache.containsKey(type);
 	}
-	private final void invoke(final Method method, final Object object, final Exception param) throws Throwable {
+	private final void invoke(final Method method, final Object object, final Exception param) throws Exception {
 		boolean accessible = method.isAccessible();
 		method.setAccessible(true);
 		try {
 			method.invoke(object, param);
 		} catch (InvocationTargetException cause) {
-			throw cause.getTargetException();
+			Throwable targetTrowable = cause.getTargetException();
+			if (targetTrowable instanceof Exception) {
+				throw (Exception) targetTrowable;
+			} else {
+				throw new Exception(targetTrowable);
+			}
 		}
 		method.setAccessible(accessible);
 	}
 	@AroundInvoke
-	public Object manage(final InvocationContext ic) throws Throwable {
+	public Object manage(final InvocationContext ic) throws Exception {
 		Object result = null;
 		try {
@@ -65,26 +65,24 @@ public class Beans {
 		return manager;
 	}
-	@SuppressWarnings("unchecked")
 	public static <T> T getReference(final Class<T> beanClass, Annotation... qualifiers) {
 		Bean<?> bean = manager.getBeans(beanClass, qualifiers).iterator().next();
-		return (T) getReference(bean);
+		return (T) getReference(bean, beanClass);
 	}
-	@SuppressWarnings("unchecked")
 	public static <T> T getReference(final Class<T> beanClass) {
 		Bean<?> bean = manager.getBeans(beanClass).iterator().next();
-		return (T) getReference(bean);
+		return (T) getReference(bean, beanClass);
 	}
 	@SuppressWarnings("unchecked")
 	public static <T> T getReference(String beanName) {
 		Bean<?> bean = manager.getBeans(beanName).iterator().next();
-		return (T) getReference(bean);
+		return (T) getReference(bean, bean.getBeanClass());
 	}
 	@SuppressWarnings("unchecked")
-	private static <T> T getReference(Bean<?> bean) {
-		return (T) manager.getReference(bean, bean.getBeanClass(), manager.createCreationalContext(bean));
+	private static <T> T getReference(Bean<?> bean, final Class<T> beanClass) {
+		return (T) manager.getReference(bean, beanClass, manager.createCreationalContext(bean));
 	}
 }
@@ -43,12 +43,11 @@ import javax.inject.Inject;
 import br.gov.frameworkdemoiselle.DemoiselleException;
 import br.gov.frameworkdemoiselle.annotation.Name;
 import br.gov.frameworkdemoiselle.util.Beans;
+import br.gov.frameworkdemoiselle.util.Faces;
 import br.gov.frameworkdemoiselle.util.Parameter;
 import br.gov.frameworkdemoiselle.util.Reflections;
 import br.gov.frameworkdemoiselle.util.ResourceBundle;
-import com.sun.faces.util.Util;
-
 public abstract class AbstractEditPageBean<T, I> extends AbstractPageBean implements EditPageBean<T> {
 	private static final long serialVersionUID = 1L;
@@ -120,7 +119,7 @@ public abstract class AbstractEditPageBean&lt;T, I&gt; extends AbstractPageBean implem
 	}
 	private Converter getIdConverter() {
-		return Util.getConverterForClass(getIdClass(), facesContext);
+		return Faces.getConverter(getIdClass());
 	}
 	protected abstract void handleLoad();
@@ -44,6 +44,7 @@ import static javax.faces.application.FacesMessage.SEVERITY_WARN;
 import java.util.List;
 import java.util.Map;
+import javax.faces.application.Application;
 import javax.faces.application.FacesMessage;
 import javax.faces.application.FacesMessage.Severity;
 import javax.faces.component.UIViewRoot;
@@ -54,8 +55,6 @@ import br.gov.frameworkdemoiselle.exception.ApplicationException;
 import br.gov.frameworkdemoiselle.message.Message;
 import br.gov.frameworkdemoiselle.message.SeverityType;
-import com.sun.faces.util.Util;
-
 public class Faces {
 	public static void addMessages(final List<Message> messages) {
@@ -147,9 +146,18 @@ public class Faces {
 	}
 	public static Converter getConverter(Class<?> clazz) {
-		return Util.getConverterForClass(clazz, getFacesContext());
+		FacesContext context = getFacesContext();
+		if (clazz == null) {
+			return null;
+		}
+		try {
+			Application application = context.getApplication();
+			return application.createConverter(clazz);
+		} catch (Exception e) {
+			return null;
+		}
 	}
-
+	
 	public static Map<String, Object> getViewMap() {
 		UIViewRoot viewRoot = getFacesContext().getViewRoot();
 		return viewRoot.getViewMap(true);