You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by pl...@apache.org on 2016/09/25 21:24:20 UTC
[32/50] [abbrv] incubator-tamaya-sandbox git commit: TAMAYA-134:
Gitignore improvements and second batch of Javadoc fixes done by Philipp
Ottlinger.
TAMAYA-134: Gitignore improvements and second batch of
Javadoc fixes done by Philipp Ottlinger.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/19b7071d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/19b7071d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/19b7071d
Branch: refs/heads/master
Commit: 19b7071ddd8a48402a91a47b4cd275dd12b3f596
Parents: 25d8ce1
Author: anatole <an...@apache.org>
Authored: Tue Jan 19 01:11:27 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Jan 19 01:11:27 2016 +0100
----------------------------------------------------------------------
.../org/apache/tamaya/builder/ConfigurationBuilder.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/19b7071d/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java b/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
index cd457a1..afdc121 100644
--- a/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
+++ b/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
@@ -331,7 +331,8 @@ public class ConfigurationBuilder {
/**
- * @return the builder instance currently used
+ * @param propertyValueCombinationPolicy combination policy to use for this builder.
+ * @return the builder instance currently in use.
*/
public ConfigurationBuilder setPropertyValueCombinationPolicy(PropertyValueCombinationPolicy propertyValueCombinationPolicy){
contextBuilder.setPropertyValueCombinationPolicy(propertyValueCombinationPolicy);
@@ -347,6 +348,7 @@ public class ConfigurationBuilder {
* builder.addPropertyConverter(MyType.class, converter}
* </pre>
*
+ * @param <T> the type of the configuration
* @param type the required target type the converter should be applied to
* @param converter the converter to be used to convert the string property
* to the given target type.
@@ -364,6 +366,11 @@ public class ConfigurationBuilder {
}
/**
+ * Adds a propertyConverter of a given type.
+ *
+ * @param <T> the type of the configuration
+ * @param type type literal of this converter.
+ * @param propertyConverter property converter.
* @return the builder instance currently used
*/
public <T> ConfigurationBuilder addPropertyConverter(TypeLiteral<T> type, PropertyConverter<T> propertyConverter){
@@ -560,7 +567,7 @@ public class ConfigurationBuilder {
return loadProvidedPropertySourceProviders;
}
- //X TODO think on a functonality/API for using the default PropertyConverters and use the configured ones here
+ //X TODO think on a functionality/API for using the default PropertyConverters and use the configured ones here
//X TODO as overrides used first.