Commit 715e563742889a6f425d3b1be604001de303a85e
1 parent
629fc2fd
Exists in
master
FWK-218: Movendo as anotações do Scoped para o pacote correto
Task-Url: https://demoiselle.atlassian.net/browse/FWK-218
Showing
7 changed files
with
19 additions
and
19 deletions
Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/configuration/Configuration.java
| ... | ... | @@ -47,7 +47,7 @@ import javax.enterprise.inject.Stereotype; |
| 47 | 47 | import javax.enterprise.util.Nonbinding; |
| 48 | 48 | import javax.inject.Named; |
| 49 | 49 | |
| 50 | -import br.gov.frameworkdemoiselle.annotation.StaticScoped; | |
| 50 | +import br.gov.frameworkdemoiselle.lifecycle.StaticScoped; | |
| 51 | 51 | |
| 52 | 52 | /** |
| 53 | 53 | * Identifies a <b>configuration class</b>, that is, a structure reserved to store configuration values retrieved from a | ... | ... |
impl/core/src/main/java/br/gov/frameworkdemoiselle/stereotype/ViewController.java
| ... | ... | @@ -46,7 +46,7 @@ import java.lang.annotation.Target; |
| 46 | 46 | import javax.enterprise.inject.Stereotype; |
| 47 | 47 | import javax.inject.Named; |
| 48 | 48 | |
| 49 | -import br.gov.frameworkdemoiselle.annotation.ViewScoped; | |
| 49 | +import br.gov.frameworkdemoiselle.lifecycle.ViewScoped; | |
| 50 | 50 | |
| 51 | 51 | /** |
| 52 | 52 | * Identifies a <b>view controller</b> class. A view controller class is intend to respond to events initiated in the | ... | ... |
impl/core/src/test/java/lifecycle/shutdown/simple/ShutdownSimple.java
| ... | ... | @@ -36,8 +36,8 @@ |
| 36 | 36 | */ |
| 37 | 37 | package lifecycle.shutdown.simple; |
| 38 | 38 | |
| 39 | -import java.util.ArrayList; | |
| 40 | -import java.util.List; | |
| 39 | +import java.util.HashSet; | |
| 40 | +import java.util.Set; | |
| 41 | 41 | |
| 42 | 42 | import javax.enterprise.context.ApplicationScoped; |
| 43 | 43 | |
| ... | ... | @@ -46,9 +46,9 @@ import br.gov.frameworkdemoiselle.lifecycle.Shutdown; |
| 46 | 46 | @ApplicationScoped |
| 47 | 47 | public class ShutdownSimple { |
| 48 | 48 | |
| 49 | - private List<Integer> listShutdown = new ArrayList<Integer>(); | |
| 49 | + private Set<Integer> listShutdown = new HashSet<Integer>(); | |
| 50 | 50 | |
| 51 | - public List<Integer> getListShutdown() { | |
| 51 | + public Set<Integer> getSet() { | |
| 52 | 52 | return listShutdown; |
| 53 | 53 | } |
| 54 | 54 | ... | ... |
impl/core/src/test/java/lifecycle/shutdown/simple/ShutdownSimpleTest.java
| ... | ... | @@ -36,8 +36,8 @@ |
| 36 | 36 | */ |
| 37 | 37 | package lifecycle.shutdown.simple; |
| 38 | 38 | |
| 39 | -import java.util.ArrayList; | |
| 40 | -import java.util.List; | |
| 39 | +import java.util.HashSet; | |
| 40 | +import java.util.Set; | |
| 41 | 41 | |
| 42 | 42 | import javax.inject.Inject; |
| 43 | 43 | |
| ... | ... | @@ -60,7 +60,7 @@ public class ShutdownSimpleTest { |
| 60 | 60 | @Inject |
| 61 | 61 | private ShutdownSimple shutdownSimple; |
| 62 | 62 | |
| 63 | - List<Integer> expected = new ArrayList<Integer>(); | |
| 63 | + private Set<Integer> expected = new HashSet<Integer>(); | |
| 64 | 64 | |
| 65 | 65 | @Deployment |
| 66 | 66 | public static JavaArchive createDeployment() { |
| ... | ... | @@ -80,6 +80,6 @@ public class ShutdownSimpleTest { |
| 80 | 80 | expected.add(2); |
| 81 | 81 | expected.add(1); |
| 82 | 82 | |
| 83 | - Assert.assertEquals(expected, shutdownSimple.getListShutdown()); | |
| 83 | + Assert.assertEquals(expected, shutdownSimple.getSet()); | |
| 84 | 84 | } |
| 85 | 85 | } | ... | ... |
impl/core/src/test/java/lifecycle/startup/simple/StartupSimple.java
| ... | ... | @@ -36,8 +36,8 @@ |
| 36 | 36 | */ |
| 37 | 37 | package lifecycle.startup.simple; |
| 38 | 38 | |
| 39 | -import java.util.ArrayList; | |
| 40 | -import java.util.List; | |
| 39 | +import java.util.HashSet; | |
| 40 | +import java.util.Set; | |
| 41 | 41 | |
| 42 | 42 | import javax.enterprise.context.ApplicationScoped; |
| 43 | 43 | |
| ... | ... | @@ -46,9 +46,9 @@ import br.gov.frameworkdemoiselle.lifecycle.Startup; |
| 46 | 46 | @ApplicationScoped |
| 47 | 47 | public class StartupSimple { |
| 48 | 48 | |
| 49 | - private List<Integer> listStartup = new ArrayList<Integer>(); | |
| 49 | + private Set<Integer> listStartup = new HashSet<Integer>(); | |
| 50 | 50 | |
| 51 | - public List<Integer> getListStartup() { | |
| 51 | + public Set<Integer> getSet() { | |
| 52 | 52 | return listStartup; |
| 53 | 53 | } |
| 54 | 54 | ... | ... |
impl/core/src/test/java/lifecycle/startup/simple/StartupSimpleTest.java
| ... | ... | @@ -36,8 +36,8 @@ |
| 36 | 36 | */ |
| 37 | 37 | package lifecycle.startup.simple; |
| 38 | 38 | |
| 39 | -import java.util.ArrayList; | |
| 40 | -import java.util.List; | |
| 39 | +import java.util.HashSet; | |
| 40 | +import java.util.Set; | |
| 41 | 41 | |
| 42 | 42 | import javax.inject.Inject; |
| 43 | 43 | |
| ... | ... | @@ -60,7 +60,7 @@ public class StartupSimpleTest { |
| 60 | 60 | @Inject |
| 61 | 61 | private StartupSimple startupSimple; |
| 62 | 62 | |
| 63 | - List<Integer> expected = new ArrayList<Integer>(); | |
| 63 | + private Set<Integer> expected = new HashSet<Integer>(); | |
| 64 | 64 | |
| 65 | 65 | @Deployment |
| 66 | 66 | public static JavaArchive createDeployment() { |
| ... | ... | @@ -80,6 +80,6 @@ public class StartupSimpleTest { |
| 80 | 80 | expected.add(3); |
| 81 | 81 | expected.add(2); |
| 82 | 82 | |
| 83 | - Assert.assertEquals(expected, startupSimple.getListStartup()); | |
| 83 | + Assert.assertEquals(expected, startupSimple.getSet()); | |
| 84 | 84 | } |
| 85 | 85 | } | ... | ... |
impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ViewEntityManagerStore.java
| ... | ... | @@ -39,7 +39,7 @@ package br.gov.frameworkdemoiselle.internal.producer; |
| 39 | 39 | import javax.annotation.PostConstruct; |
| 40 | 40 | import javax.annotation.PreDestroy; |
| 41 | 41 | |
| 42 | -import br.gov.frameworkdemoiselle.annotation.ViewScoped; | |
| 42 | +import br.gov.frameworkdemoiselle.lifecycle.ViewScoped; | |
| 43 | 43 | |
| 44 | 44 | /** |
| 45 | 45 | * | ... | ... |