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 2015/03/05 19:20:03 UTC
[4/5] incubator-tamaya git commit: TAMAYA-60 Added JavaDoc.
TAMAYA-60 Added JavaDoc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/8130dd02
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/8130dd02
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/8130dd02
Branch: refs/heads/master
Commit: 8130dd023c2a2678febea025ca3b4e2065e70e1f
Parents: 411c438
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Thu Mar 5 20:48:10 2015 +0100
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Thu Mar 5 19:19:49 2015 +0100
----------------------------------------------------------------------
.../modules/builder/ConfigurationBuilder.java | 22 ++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/8130dd02/modules/builder/src/main/java/org/apache/tamaya/modules/builder/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/main/java/org/apache/tamaya/modules/builder/ConfigurationBuilder.java b/modules/builder/src/main/java/org/apache/tamaya/modules/builder/ConfigurationBuilder.java
index 3774976..e739282 100644
--- a/modules/builder/src/main/java/org/apache/tamaya/modules/builder/ConfigurationBuilder.java
+++ b/modules/builder/src/main/java/org/apache/tamaya/modules/builder/ConfigurationBuilder.java
@@ -125,6 +125,28 @@ public class ConfigurationBuilder {
return data;
}
+ /**
+ * Adds one or more resources with properties in an arbitrary format
+ * to the configuration to be build.
+ *
+ * <p>If a specific format is supported depends on the available
+ * {@link org.apache.tamaya.format.ConfigurationFormat} implementations.</p>
+ *
+ *<pre>
+ * URL first = new URL("file:/etc/service/config.json");
+ * URL second = new URL(file:/etc/defaults/values.properties");
+ *
+ * builder.addPropertySources(first, second);
+ *</pre>
+ *
+ * @param url first resource with properties for the the configuration to be build.
+ * @param urls list additional of resources with properties for the configuration to be
+ * build.
+ * @return the builder instance currently used
+ *
+ * @see org.apache.tamaya.format.ConfigurationFormat
+ * @see org.apache.tamaya.format.ConfigurationFormats#getFormats()
+ */
public ConfigurationBuilder addPropertySource(URL url, URL... urls) {
Stream.of(Collections.singletonList(url), Arrays.asList(urls))
.flatMap(Collection::stream)