You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2016/02/28 00:25:39 UTC
incubator-tamaya git commit: TAMAYA-134: Javadoc fixes.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master ebb7d90b0 -> 7ad4c36ee
TAMAYA-134: Javadoc fixes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/7ad4c36e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/7ad4c36e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/7ad4c36e
Branch: refs/heads/master
Commit: 7ad4c36ee74a945eb227f73371c0a6d407fb7b07
Parents: ebb7d90
Author: anatole <an...@apache.org>
Authored: Sun Feb 28 00:25:21 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Sun Feb 28 00:25:21 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/tamaya/spi/ConversionContext.java | 7 ++++---
.../yaml/src/main/java/org/apache/tamaya/json/YAMLFormat.java | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/7ad4c36e/code/api/src/main/java/org/apache/tamaya/spi/ConversionContext.java
----------------------------------------------------------------------
diff --git a/code/api/src/main/java/org/apache/tamaya/spi/ConversionContext.java b/code/api/src/main/java/org/apache/tamaya/spi/ConversionContext.java
index 4a470b0..436c9f1 100644
--- a/code/api/src/main/java/org/apache/tamaya/spi/ConversionContext.java
+++ b/code/api/src/main/java/org/apache/tamaya/spi/ConversionContext.java
@@ -59,7 +59,7 @@ public class ConversionContext {
* Get the key accessed. This information is very useful to evaluate additional metadata needed to determine/
* control further aspects of the conversion.
* @return the key. This may be null in case where a default value has to be converted and no unique underlying
- * key/value configuration is present..
+ * key/value configuration is present.
*/
public String getKey(){
return key;
@@ -75,7 +75,7 @@ public class ConversionContext {
/**
* Get the annotated element, if conversion is performed using injection mechanisms.
- * @return the annotated element, or null..
+ * @return the annotated element, or null.
*/
public AnnotatedElement getAnnotatedElement(){
return annotatedElement;
@@ -167,10 +167,11 @@ public class ConversionContext {
/**
* Creates a new Builder instance.
* @param configuration the configuration, not null.
+ * @param configurationContext configuration context, not null.
* @param key the requested key, may be null.
* @param targetType the target type
*/
- public Builder(Configuration configuration, ConfigurationContext context, String key, TypeLiteral<?> targetType){
+ public Builder(Configuration configuration, ConfigurationContext configurationContext, String key, TypeLiteral<?> targetType){
this.key = key;
this.configuration = configuration;
this.configurationContext = context;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/7ad4c36e/modules/yaml/src/main/java/org/apache/tamaya/json/YAMLFormat.java
----------------------------------------------------------------------
diff --git a/modules/yaml/src/main/java/org/apache/tamaya/json/YAMLFormat.java b/modules/yaml/src/main/java/org/apache/tamaya/json/YAMLFormat.java
index 20d52d1..06e431e 100644
--- a/modules/yaml/src/main/java/org/apache/tamaya/json/YAMLFormat.java
+++ b/modules/yaml/src/main/java/org/apache/tamaya/json/YAMLFormat.java
@@ -78,8 +78,9 @@ public class YAMLFormat implements ConfigurationFormat {
/**
* Reads the configuration.
* @param inputStream the input stream, not null.
- * @return the configuration read from the given resource URL.
- * @throws ConfigException if resource URL cannot be read.
+ * @param resource resource URI, not null.
+ * @return the configuration read from the given resource URI.
+ * @throws ConfigException if resource URI cannot be read.
*/
protected Map<String, String> readConfig(String resource, InputStream inputStream) {
try{