You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2012/06/13 23:36:09 UTC
[1/5] git commit: DELTASPIKE-196 add more Boolean conversions and
unit test
Updated Branches:
refs/heads/master 62e6a00b8 -> e405e7002
DELTASPIKE-196 add more Boolean conversions and unit test
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/e405e700
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/e405e700
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/e405e700
Branch: refs/heads/master
Commit: e405e700277221e12a5f86fac27fb0b4ee396930
Parents: 289250c
Author: Mark Struberg <st...@apache.org>
Authored: Wed Jun 13 22:50:22 2012 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Wed Jun 13 22:50:22 2012 +0200
----------------------------------------------------------------------
.../impl/config/DefaultConfigPropertyProducer.java | 11 ++-
.../injectable/InjectableConfigPropertyTest.java | 17 +++
.../core/api/config/injectable/SettingsBean.java | 92 +++++++++++++++
.../META-INF/apache-deltaspike.properties | 9 ++
4 files changed, 127 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e405e700/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigPropertyProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigPropertyProducer.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigPropertyProducer.java
index e995bfd..29d30f0 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigPropertyProducer.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigPropertyProducer.java
@@ -82,8 +82,15 @@ public class DefaultConfigPropertyProducer extends BaseConfigPropertyProducer
return null;
}
- //X TODO do we like to support more than just "true" ?
- return Boolean.parseBoolean(configuredValue);
+ Boolean isTrue = "TRUE".equalsIgnoreCase(configuredValue);
+ isTrue |= "1".equalsIgnoreCase(configuredValue);
+ isTrue |= "YES".equalsIgnoreCase(configuredValue);
+ isTrue |= "Y".equalsIgnoreCase(configuredValue);
+ isTrue |= "JA".equalsIgnoreCase(configuredValue);
+ isTrue |= "J".equalsIgnoreCase(configuredValue);
+ isTrue |= "OUI".equalsIgnoreCase(configuredValue);
+
+ return isTrue;
}
@Produces
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e405e700/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java
index 2b974b9..ba095ed 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java
@@ -74,4 +74,21 @@ public class InjectableConfigPropertyTest
Assert.assertEquals("myDefaultValue", settingsBean.getProperty3Defaulted());
Assert.assertEquals(42, settingsBean.getProperty4Defaulted());
}
+
+ @Test
+ public void testBooleanPropertyInjection()
+ {
+ SettingsBean settingsBean = BeanProvider.getContextualReference(SettingsBean.class, false);
+ Assert.assertEquals(Boolean.FALSE, settingsBean.getBooleanPropertyFalse());
+
+ Assert.assertEquals(Boolean.TRUE, settingsBean.getBooleanPropertyTrue1());
+ Assert.assertEquals(Boolean.TRUE, settingsBean.getBooleanPropertyTrue2());
+ Assert.assertEquals(Boolean.TRUE, settingsBean.getBooleanPropertyTrue3());
+ Assert.assertEquals(Boolean.TRUE, settingsBean.getBooleanPropertyTrue4());
+ Assert.assertEquals(Boolean.TRUE, settingsBean.getBooleanPropertyTrue5());
+ Assert.assertEquals(Boolean.TRUE, settingsBean.getBooleanPropertyTrue6());
+ Assert.assertEquals(Boolean.TRUE, settingsBean.getBooleanPropertyTrue7());
+ Assert.assertEquals(Boolean.TRUE, settingsBean.getBooleanPropertyTrue8());
+
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e405e700/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java
index fede9b7..0978a1f 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java
@@ -48,6 +48,47 @@ public class SettingsBean
private Long inverseProperty2;
+ @Inject
+ @ConfigProperty(name = "configProperty1")
+ private Boolean booleanPropertyNull;
+
+ @Inject
+ @ConfigProperty(name = "configProperty1", defaultValue = "false")
+ private Boolean booleanPropertyFalse;
+
+ @Inject
+ @ConfigProperty(name = "configPropertyTrue1")
+ private Boolean booleanPropertyTrue1;
+
+ @Inject
+ @ConfigProperty(name = "configPropertyTrue2")
+ private Boolean booleanPropertyTrue2;
+
+ @Inject
+ @ConfigProperty(name = "configPropertyTrue3")
+ private Boolean booleanPropertyTrue3;
+
+ @Inject
+ @ConfigProperty(name = "configPropertyTrue4")
+ private Boolean booleanPropertyTrue4;
+
+ @Inject
+ @ConfigProperty(name = "configPropertyTrue5")
+ private Boolean booleanPropertyTrue5;
+
+ @Inject
+ @ConfigProperty(name = "configPropertyTrue6")
+ private Boolean booleanPropertyTrue6;
+
+ @Inject
+ @ConfigProperty(name = "configPropertyTrue7")
+ private Boolean booleanPropertyTrue7;
+
+ @Inject
+ @ConfigProperty(name = "configPropertyTrue8")
+ private Boolean booleanPropertyTrue8;
+
+
protected SettingsBean()
{
}
@@ -94,4 +135,55 @@ public class SettingsBean
{
return intProperty4Defaulted;
}
+
+
+ public Boolean getBooleanPropertyNull()
+ {
+ return booleanPropertyNull;
+ }
+
+ public boolean getBooleanPropertyFalse()
+ {
+ return booleanPropertyFalse;
+ }
+
+ public Boolean getBooleanPropertyTrue1()
+ {
+ return booleanPropertyTrue1;
+ }
+
+ public Boolean getBooleanPropertyTrue2()
+ {
+ return booleanPropertyTrue2;
+ }
+
+ public Boolean getBooleanPropertyTrue3()
+ {
+ return booleanPropertyTrue3;
+ }
+
+ public Boolean getBooleanPropertyTrue4()
+ {
+ return booleanPropertyTrue4;
+ }
+
+ public Boolean getBooleanPropertyTrue5()
+ {
+ return booleanPropertyTrue5;
+ }
+
+ public Boolean getBooleanPropertyTrue6()
+ {
+ return booleanPropertyTrue6;
+ }
+
+ public Boolean getBooleanPropertyTrue7()
+ {
+ return booleanPropertyTrue7;
+ }
+
+ public Boolean getBooleanPropertyTrue8()
+ {
+ return booleanPropertyTrue8;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e405e700/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties b/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties
index 2afad36..66bafc1 100644
--- a/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties
+++ b/deltaspike/core/impl/src/test/resources/META-INF/apache-deltaspike.properties
@@ -27,3 +27,12 @@ org.apache.deltaspike.test.core.api.alternative.global.qualifier.BaseInterface=o
configProperty1=14
configProperty2=7
+
+configPropertyTrue1=Yes
+configPropertyTrue2=yes
+configPropertyTrue3=YES
+configPropertyTrue4=Y
+configPropertyTrue5=JA
+configPropertyTrue6=OUI
+configPropertyTrue7=True
+configPropertyTrue8=1