Download as
Browse Code »

Commit 787f13bec7654c77d8e7c7127b09a680052f7e72

Authored by Cleverson Sacramento
1 parent d17d341f
Exists in master

Depreciação de propriedade da persistência JPA.

Showing 5 changed files with 35 additions and 7 deletions   Show diff stats
impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/EntityManagerConfig.java
  Diff comments   View file @787f13b
... ... @@ -38,8 +38,12 @@ package br.gov.frameworkdemoiselle.internal.configuration;
38 38  
39 39 import java.io.Serializable;
40 40  
  41 +import org.slf4j.Logger;
  42 +
41 43 import br.gov.frameworkdemoiselle.annotation.Name;
42 44 import br.gov.frameworkdemoiselle.configuration.Configuration;
  45 +import br.gov.frameworkdemoiselle.util.Beans;
  46 +import br.gov.frameworkdemoiselle.util.Strings;
43 47  
44 48 /**
45 49 * Configuration class responsible for retrieving specific entity manager parameter values from properties file.
... ... @@ -49,13 +53,37 @@ public class EntityManagerConfig implements Serializable {
49 53  
50 54 private static final long serialVersionUID = 1L;
51 55  
  56 + // TODO Implementação apenas para manter a compatibilidade entre a versão 2.3 com a 2.4.
52 57 @Name("unit.name")
53 58 private String persistenceUnitName;
54 59  
  60 + @Name("default.unit.name")
  61 + private String defaultPersistenceUnitName;
  62 +
55 63 /**
56 64 * Getter for persistence unit name.
57 65 */
  66 + // TODO Implementação apenas para manter a compatibilidade entre a versão 2.3 com a 2.4.
58 67 public String getPersistenceUnitName() {
59 68 return persistenceUnitName;
60 69 }
  70 +
  71 + /**
  72 + * Getter for persistence unit name.
  73 + */
  74 + public String getDefaultPersistenceUnitName() {
  75 + // TODO Implementação apenas para manter a compatibilidade entre a versão 2.3 com a 2.4.
  76 + String persistenceUnitName = getPersistenceUnitName();
  77 + if (!Strings.isEmpty(persistenceUnitName)) {
  78 + Logger logger = Beans.getReference(Logger.class);
  79 + logger.info("A propriedade frameworkdemoiselle.persistence.unit.name="
  80 + + persistenceUnitName
  81 + + " não será suportada nas próximas versões do framework. Para evitar futuros problemas atualize a propriedade para frameworkdemoiselle.persistence.default.unit.name="
  82 + + persistenceUnitName);
  83 +
  84 + return persistenceUnitName;
  85 + }
  86 +
  87 + return defaultPersistenceUnitName;
  88 + }
61 89 }
... ...
impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerProducer.java
  Diff comments   View file @787f13b
... ... @@ -149,7 +149,7 @@ public class EntityManagerProducer implements Serializable {
149 149 * @return Persistence unit name.
150 150 */
151 151 private String getFromProperties(EntityManagerConfig config) {
152   - String persistenceUnit = config.getPersistenceUnitName();
  152 + String persistenceUnit = config.getDefaultPersistenceUnitName();
153 153  
154 154 if (persistenceUnit != null) {
155 155 this.logger.debug(bundle.getString("getting-persistence-unit-from-properties",
... ...
impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/EntityManagerConfigTest.java
  Diff comments   View file @787f13b
... ... @@ -93,10 +93,10 @@ public class EntityManagerConfigTest {
93 93  
94 94 /**
95 95 * Test method for
96   - * {@link br.gov.frameworkdemoiselle.internal.configuration.EntityManagerConfig#getPersistenceUnitName()}.
  96 + * {@link br.gov.frameworkdemoiselle.internal.configuration.EntityManagerConfig#getDefaultPersistenceUnitName()}.
97 97 */
98 98 @Test
99   - public void testGetPersistenceUnitName() {
100   - assertEquals("PersistenceUnitName", config.getPersistenceUnitName());
  99 + public void testGetDefaultPersistenceUnitName() {
  100 + assertEquals("PersistenceUnitName", config.getDefaultPersistenceUnitName());
101 101 }
102 102 }
... ...
impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerProducerTest.java
  Diff comments   View file @787f13b
... ... @@ -157,7 +157,7 @@ public class EntityManagerProducerTest {
157 157 public void testCreateWithPersistenceUnitNameFromDemoiselleProperties() {
158 158 expect(annotated.isAnnotationPresent(Name.class)).andReturn(false);
159 159 expect(ip.getAnnotated()).andReturn(annotated).anyTimes();
160   - expect(config.getPersistenceUnitName()).andReturn("pu1");
  160 + expect(config.getDefaultPersistenceUnitName()).andReturn("pu1");
161 161  
162 162 replay(annotated, ip, config);
163 163  
... ... @@ -179,7 +179,7 @@ public class EntityManagerProducerTest {
179 179  
180 180 expect(annotated.isAnnotationPresent(Name.class)).andReturn(false);
181 181 expect(ip.getAnnotated()).andReturn(annotated).anyTimes();
182   - expect(config.getPersistenceUnitName()).andReturn(null);
  182 + expect(config.getDefaultPersistenceUnitName()).andReturn(null);
183 183  
184 184 replay(annotated, ip, config, entityManagerFactoryProducer);
185 185  
... ...
impl/extension/jpa/src/test/resources/demoiselle.properties
  Diff comments   View file @787f13b
... ... @@ -33,4 +33,4 @@
33 33 # ou escreva para a Fundação do Software Livre (FSF) Inc.,
34 34 # 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
35 35  
36   -frameworkdemoiselle.persistence.unit.name=PersistenceUnitName
37 36 \ No newline at end of file
  37 +frameworkdemoiselle.persistence.default.unit.name=PersistenceUnitName
38 38 \ No newline at end of file
... ...