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 2013/06/16 10:47:44 UTC
[1/2] git commit: DELTASPIKE-384 use
getProjectStageAwarePropertyValue where possible
Updated Branches:
refs/heads/master d99215c0b -> 6fa6080e6
DELTASPIKE-384 use getProjectStageAwarePropertyValue where possible
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/6fa6080e
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/6fa6080e
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/6fa6080e
Branch: refs/heads/master
Commit: 6fa6080e65f041a8f72dae9a831d2edab2770f43
Parents: f83662f
Author: Mark Struberg <st...@apache.org>
Authored: Sun Jun 16 10:46:33 2013 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sun Jun 16 10:47:21 2013 +0200
----------------------------------------------------------------------
.../deltaspike/core/spi/config/BaseConfigPropertyProducer.java | 4 ++--
.../core/impl/interpreter/PropertyExpressionInterpreter.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6fa6080e/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/BaseConfigPropertyProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/BaseConfigPropertyProducer.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/BaseConfigPropertyProducer.java
index 5a10b9f..1caced6 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/BaseConfigPropertyProducer.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/BaseConfigPropertyProducer.java
@@ -125,11 +125,11 @@ public abstract class BaseConfigPropertyProducer
if (ConfigProperty.NULL.equals(defaultValue))
{
// no special defaultValue has been configured
- configuredValue = ConfigResolver.getPropertyValue(propertyName);
+ configuredValue = ConfigResolver.getProjectStageAwarePropertyValue(propertyName);
}
else
{
- configuredValue = ConfigResolver.getPropertyValue(propertyName, defaultValue);
+ configuredValue = ConfigResolver.getProjectStageAwarePropertyValue(propertyName, defaultValue);
}
return configuredValue;
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6fa6080e/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interpreter/PropertyExpressionInterpreter.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interpreter/PropertyExpressionInterpreter.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interpreter/PropertyExpressionInterpreter.java
index 61e5558..8d64683 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interpreter/PropertyExpressionInterpreter.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interpreter/PropertyExpressionInterpreter.java
@@ -32,7 +32,7 @@ public class PropertyExpressionInterpreter extends BasePropertyExpressionInterpr
@Override
protected String getConfiguredValue(String key)
{
- return ConfigResolver.getPropertyValue(key);
+ return ConfigResolver.getProjectStageAwarePropertyValue(key);
}
}
[2/2] git commit: DELTASPIKE-378 unify handling of defaultValue
Posted by st...@apache.org.
DELTASPIKE-378 unify handling of defaultValue
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/f83662f5
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/f83662f5
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/f83662f5
Branch: refs/heads/master
Commit: f83662f51e2bbcb77a760d23695dda66fdfb6a11
Parents: d99215c
Author: Mark Struberg <st...@apache.org>
Authored: Thu Jun 13 09:07:43 2013 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sun Jun 16 10:47:21 2013 +0200
----------------------------------------------------------------------
.../core/api/config/ConfigResolver.java | 38 ++++++++++----------
1 file changed, 18 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f83662f5/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java
index 6b3ada2..b7802a3 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java
@@ -108,15 +108,9 @@ public final class ConfigResolver
*/
public static String getPropertyValue(String key, String defaultValue)
{
- String configuredValue = getPropertyValue(key);
- if (configuredValue == null)
- {
- LOG.log(Level.FINE, "no configured value found for key {0}, using default value {1}.",
- new Object[]{key, defaultValue});
+ String value = getPropertyValue(key);
- configuredValue = defaultValue;
- }
- return configuredValue;
+ return fallbackToDefaultIfEmpty(key, value, defaultValue);
}
/**
@@ -189,12 +183,7 @@ public final class ConfigResolver
{
String value = getProjectStageAwarePropertyValue(key);
- if (value == null || value.length() == 0)
- {
- value = defaultValue;
- }
-
- return value;
+ return fallbackToDefaultIfEmpty(key, value, defaultValue);
}
/**
@@ -263,12 +252,7 @@ public final class ConfigResolver
{
String value = getPropertyAwarePropertyValue(key, property);
- if (value == null || value.length() == 0)
- {
- value = defaultValue;
- }
-
- return value;
+ return fallbackToDefaultIfEmpty(key, value, defaultValue);
}
/**
@@ -402,4 +386,18 @@ public final class ConfigResolver
return projectStage;
}
+ private static String fallbackToDefaultIfEmpty(String key, String value, String defaultValue)
+ {
+ if (value == null || value.length() == 0)
+ {
+ LOG.log(Level.FINE, "no configured value found for key {0}, using default value {1}.",
+ new Object[]{key, defaultValue});
+
+ return defaultValue;
+ }
+
+ return value;
+ }
+
+
}