You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2018/01/29 21:01:10 UTC
[2/4] incubator-tamaya git commit: TAMAYA-154: Fix javadoc issues
TAMAYA-154: Fix javadoc issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/454f2afa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/454f2afa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/454f2afa
Branch: refs/heads/master
Commit: 454f2afa2279641a985b1891a21999c20daa40b1
Parents: 5529224
Author: Phil Ottlinger <po...@apache.org>
Authored: Mon Jan 29 22:00:27 2018 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Mon Jan 29 22:00:27 2018 +0100
----------------------------------------------------------------------
.../tamaya/spisupport/DefaultConfigurationBuilder.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/454f2afa/code/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationBuilder.java b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationBuilder.java
index ec26ba6..abde218 100644
--- a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationBuilder.java
+++ b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationBuilder.java
@@ -41,6 +41,7 @@ public class DefaultConfigurationBuilder implements ConfigurationBuilder {
/**
* Creates a new builder instance.
+ * @param context the configuration context to be used, not null.
*/
public DefaultConfigurationBuilder(ConfigurationContext context) {
this.contextBuilder = new DefaultConfigurationContextBuilder(context);
@@ -56,6 +57,7 @@ public class DefaultConfigurationBuilder implements ConfigurationBuilder {
/**
* Allows to set configuration context during unit tests.
+ * @param configuration the configuration to be used, not null.
*/
public ConfigurationBuilder setConfiguration(Configuration configuration) {
this.contextBuilder.setContext(configuration.getContext());
@@ -75,6 +77,12 @@ public class DefaultConfigurationBuilder implements ConfigurationBuilder {
return this;
}
+ /**
+ * Adds the given sources as property sources.
+ *
+ * @param sources property sources to add.
+ * @return the current configuration builder.
+ */
@Override
public ConfigurationBuilder addPropertySources(Collection<PropertySource> sources){
this.contextBuilder.addPropertySources(sources);