From 2a79aab7db98f9f6dfff2613a7866d52efd906fc Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Fri, 27 Sep 2013 08:49:27 -0300 Subject: [PATCH] RESOLVED - issue FWK-130: Classes anotadas com @ViewScoped ou @ViewController devem implementar Serializable --- impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/ViewScoped.java | 2 +- impl/extension/jsf/src/test/java/exception/handler/authentication/AuthenticationBean.java | 6 +++++- impl/extension/jsf/src/test/java/exception/handler/authorization/AuthorizationBean.java | 6 +++++- impl/extension/jsf/src/test/java/exception/handler/common/ExceptionHandlerConfigBean.java | 10 +++++++--- impl/extension/jsf/src/test/java/exception/handler/redirect/RedirectBean.java | 10 +++++++--- impl/extension/jsf/src/test/java/message/MessageBean.java | 6 +++++- impl/extension/jsf/src/test/java/test/Tests.java | 13 ++++++++----- impl/extension/jsf/src/test/java/xxxx/XServlet.java | 35 ----------------------------------- impl/extension/jsf/src/test/java/xxxx/XTest.java | 49 ------------------------------------------------- 9 files changed, 38 insertions(+), 99 deletions(-) delete mode 100644 impl/extension/jsf/src/test/java/xxxx/XServlet.java delete mode 100644 impl/extension/jsf/src/test/java/xxxx/XTest.java diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/ViewScoped.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/ViewScoped.java index 80ed2f1..75ca760 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/ViewScoped.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/ViewScoped.java @@ -55,7 +55,7 @@ import javax.enterprise.context.NormalScope; @Inherited @Target({ METHOD, TYPE, FIELD }) @Retention(RUNTIME) -@NormalScope(passivating=true) +@NormalScope(passivating = true) public @interface ViewScoped { } diff --git a/impl/extension/jsf/src/test/java/exception/handler/authentication/AuthenticationBean.java b/impl/extension/jsf/src/test/java/exception/handler/authentication/AuthenticationBean.java index 03c00da..dfc8c6f 100644 --- a/impl/extension/jsf/src/test/java/exception/handler/authentication/AuthenticationBean.java +++ b/impl/extension/jsf/src/test/java/exception/handler/authentication/AuthenticationBean.java @@ -36,11 +36,15 @@ */ package exception.handler.authentication; +import java.io.Serializable; + import br.gov.frameworkdemoiselle.security.NotLoggedInException; import br.gov.frameworkdemoiselle.stereotype.ViewController; @ViewController -public class AuthenticationBean { +public class AuthenticationBean implements Serializable { + + private static final long serialVersionUID = 1L; private String msg = "Authentication Exception"; diff --git a/impl/extension/jsf/src/test/java/exception/handler/authorization/AuthorizationBean.java b/impl/extension/jsf/src/test/java/exception/handler/authorization/AuthorizationBean.java index 20f8e79..b09d53f 100644 --- a/impl/extension/jsf/src/test/java/exception/handler/authorization/AuthorizationBean.java +++ b/impl/extension/jsf/src/test/java/exception/handler/authorization/AuthorizationBean.java @@ -36,11 +36,15 @@ */ package exception.handler.authorization; +import java.io.Serializable; + import br.gov.frameworkdemoiselle.security.AuthorizationException; import br.gov.frameworkdemoiselle.stereotype.ViewController; @ViewController -public class AuthorizationBean { +public class AuthorizationBean implements Serializable { + + private static final long serialVersionUID = 1L; private String correctMessage = "Authorization Message."; diff --git a/impl/extension/jsf/src/test/java/exception/handler/common/ExceptionHandlerConfigBean.java b/impl/extension/jsf/src/test/java/exception/handler/common/ExceptionHandlerConfigBean.java index 8c213cb..d4de757 100644 --- a/impl/extension/jsf/src/test/java/exception/handler/common/ExceptionHandlerConfigBean.java +++ b/impl/extension/jsf/src/test/java/exception/handler/common/ExceptionHandlerConfigBean.java @@ -36,17 +36,21 @@ */ package exception.handler.common; +import java.io.Serializable; + import org.junit.Ignore; import br.gov.frameworkdemoiselle.stereotype.ViewController; @Ignore @ViewController -public class ExceptionHandlerConfigBean{ - +public class ExceptionHandlerConfigBean implements Serializable { + + private static final long serialVersionUID = 1L; + @SuppressWarnings("unused") private String exp; - + public String getExp() throws DummyException { throw new DummyException("DummyException!"); } diff --git a/impl/extension/jsf/src/test/java/exception/handler/redirect/RedirectBean.java b/impl/extension/jsf/src/test/java/exception/handler/redirect/RedirectBean.java index 722cbb4..259c299 100644 --- a/impl/extension/jsf/src/test/java/exception/handler/redirect/RedirectBean.java +++ b/impl/extension/jsf/src/test/java/exception/handler/redirect/RedirectBean.java @@ -1,12 +1,16 @@ package exception.handler.redirect; +import java.io.Serializable; + import br.gov.frameworkdemoiselle.stereotype.ViewController; @ViewController -public class RedirectBean { +public class RedirectBean implements Serializable { + + private static final long serialVersionUID = 1L; private String redirectCorrectPage = "Correct Redirect Exception!"; - + private String redirectWrongPage = "Wrong Redirect Exception!"; public String getRedirectCorrectPage() { @@ -16,5 +20,5 @@ public class RedirectBean { public String getRedirectWrongPage() { throw new ExceptionWithWrongRedirect(redirectWrongPage); } - + } diff --git a/impl/extension/jsf/src/test/java/message/MessageBean.java b/impl/extension/jsf/src/test/java/message/MessageBean.java index c1c1496..4a3b2b2 100644 --- a/impl/extension/jsf/src/test/java/message/MessageBean.java +++ b/impl/extension/jsf/src/test/java/message/MessageBean.java @@ -36,13 +36,17 @@ */ package message; +import java.io.Serializable; + import javax.inject.Inject; import br.gov.frameworkdemoiselle.message.MessageContext; import br.gov.frameworkdemoiselle.stereotype.ViewController; @ViewController -public class MessageBean { +public class MessageBean implements Serializable { + + private static final long serialVersionUID = 1L; private String msg = "Message shown."; diff --git a/impl/extension/jsf/src/test/java/test/Tests.java b/impl/extension/jsf/src/test/java/test/Tests.java index cce625f..269d97d 100644 --- a/impl/extension/jsf/src/test/java/test/Tests.java +++ b/impl/extension/jsf/src/test/java/test/Tests.java @@ -48,8 +48,8 @@ import br.gov.frameworkdemoiselle.annotation.NextView; import br.gov.frameworkdemoiselle.annotation.PreviousView; import br.gov.frameworkdemoiselle.annotation.Redirect; import br.gov.frameworkdemoiselle.internal.bootstrap.JsfBootstrap; -import br.gov.frameworkdemoiselle.internal.configuration.ExceptionHandlerConfigCompatible; import br.gov.frameworkdemoiselle.internal.configuration.ExceptionHandlerConfig; +import br.gov.frameworkdemoiselle.internal.configuration.ExceptionHandlerConfigCompatible; import br.gov.frameworkdemoiselle.internal.configuration.JsfSecurityConfig; import br.gov.frameworkdemoiselle.internal.context.FacesViewContextImpl; import br.gov.frameworkdemoiselle.internal.implementation.AbstractExceptionHandler; @@ -134,10 +134,13 @@ public final class Tests { .addAsResource(createFileAsset("src/main/resources/demoiselle-jsf-bundle.properties"), "demoiselle-jsf-bundle.properties") .addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml") - .addAsManifestResource(createFileAsset("src/main/resources/META-INF/faces-config.xml"), "faces-config.xml") - .addAsManifestResource(createFileAsset("src/main/resources/META-INF/demoiselle-d.taglib.xml"), "demoiselle-d.taglib.xml") - .addAsManifestResource(createFileAsset("src/main/resources/META-INF/tags/br/gov/frameworkdemoiselle/checkLoggedIn.xhtml"), "checkedLoggedIn.xhtml") - .addAsLibraries(libs); + .addAsManifestResource(createFileAsset("src/main/resources/META-INF/faces-config.xml"), + "faces-config.xml") + .addAsManifestResource(createFileAsset("src/main/resources/META-INF/demoiselle-d.taglib.xml"), + "demoiselle-d.taglib.xml") + .addAsManifestResource( + createFileAsset("src/main/resources/META-INF/tags/br/gov/frameworkdemoiselle/checkLoggedIn.xhtml"), + "checkedLoggedIn.xhtml").addAsLibraries(libs); } public static FileAsset createFileAsset(final String pathname) { diff --git a/impl/extension/jsf/src/test/java/xxxx/XServlet.java b/impl/extension/jsf/src/test/java/xxxx/XServlet.java deleted file mode 100644 index 10b09ec..0000000 --- a/impl/extension/jsf/src/test/java/xxxx/XServlet.java +++ /dev/null @@ -1,35 +0,0 @@ -package xxxx; - -import java.io.IOException; - -import javax.inject.Inject; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import br.gov.frameworkdemoiselle.security.Credentials; -import br.gov.frameworkdemoiselle.security.SecurityContext; - -@WebServlet("/login") -public class XServlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - @Inject - private SecurityContext securityContext; - - @Inject - private Credentials credentials; - - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - super.doGet(request, response); - - credentials.setUsername("admin"); - credentials.setPassword("changeit"); - - securityContext.login(); - } -} diff --git a/impl/extension/jsf/src/test/java/xxxx/XTest.java b/impl/extension/jsf/src/test/java/xxxx/XTest.java deleted file mode 100644 index f34091e..0000000 --- a/impl/extension/jsf/src/test/java/xxxx/XTest.java +++ /dev/null @@ -1,49 +0,0 @@ -package xxxx; - -import org.junit.Ignore; - -//import java.net.URL; - -//import org.jboss.arquillian.container.test.api.Deployment; -//import org.jboss.arquillian.drone.api.annotation.Drone; -//import org.jboss.arquillian.junit.Arquillian; -//import org.jboss.arquillian.test.api.ArquillianResource; -//import org.jboss.shrinkwrap.api.spec.WebArchive; -//import org.junit.Test; -//import org.junit.runner.RunWith; - -//import test.Tests; - -//import com.thoughtworks.selenium.DefaultSelenium; - -//@RunWith(Arquillian.class) -@Ignore -public class XTest { - -// private static final String PATH = "src/test/resources/xxx"; -// -// @Drone -// private DefaultSelenium browser; -// -// @ArquillianResource -// private URL deploymentUrl; -// -// @Deployment(testable = false) -// public static WebArchive createDeployment() { -// return Tests.createDeployment().addClass(XServlet.class) -// .addAsWebInfResource(Tests.createFileAsset(PATH + "/web.xml"), "web.xml"); -// } -// -// @Test -// public void xxxx() { -// browser.open(deploymentUrl + "/login"); - - // browser.type("id=xxx-input", "demo"); - // browser.waitForPageToLoad("15000"); - - // assertTrue("User should be logged in!", - // browser.isElementPresent("xpath=//li[contains(text(), 'Welcome')]")); - // assertTrue("Username should be shown!", - // browser.isElementPresent("xpath=//p[contains(text(), 'You are signed in as demo.')]")); -// } -} -- libgit2 0.21.2