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 2018/12/17 00:06:10 UTC
[incubator-tamaya-extensions] branch master updated (cebadf3 ->
6160ed8)
This is an automated email from the ASF dual-hosted git repository.
anatole pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-extensions.git.
from cebadf3 Added missing reset method.
new 8600c4f Fixed documentation issues (replaced createValue with value where approproate).
new 6160ed8 Fixed compile issue.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/tamay/ext/examples/resolver/Main.java | 2 +-
.../tamay/ext/examples/resolver/package-info.java | 2 +-
.../apache/tamaya/collections/ItemTokenizer.java | 30 +++++-----
.../tamaya/events/ConfigurationChangeTest.java | 2 +-
.../MappedConfigurationDataPropertySourceTest.java | 16 ++---
.../apache/tamaya/functions/PropertyMapper.java | 6 +-
.../apache/tamaya/cdi/CDIAwareServiceContext.java | 2 +-
.../apache/tamaya/cdi/ConfigurationProducer.java | 6 +-
.../org/apache/tamaya/cdi/DefaultDynamicValue.java | 12 ++--
.../tamaya/cdi/ServiceLoaderServiceContext.java | 2 +-
.../tamaya/cdi/TamayaCDIInjectionExtension.java | 2 +-
.../tamaya/cdi/ConfigurationProducerTest.java | 8 +--
.../apache/tamaya/inject/spi/BaseDynamicValue.java | 70 +++++++++++-----------
.../apache/tamaya/inject/spi/ConfiguredField.java | 2 +-
.../tamaya/inject/internal/InjectionHelper.java | 2 +-
.../apache/tamaya/inject/TamayaInjectionTest.java | 4 +-
16 files changed, 84 insertions(+), 84 deletions(-)
[incubator-tamaya-extensions] 02/02: Fixed compile issue.
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
anatole pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-extensions.git
commit 6160ed8b3231e88395633df9bb7a559c0310b23f
Author: Anatole Tresch <at...@gmail.com>
AuthorDate: Mon Dec 17 01:06:03 2018 +0100
Fixed compile issue.
---
.../apache/tamaya/ext/examples/events/FilePropertySourceProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/04-events-example/src/main/java/org/apache/tamaya/ext/examples/events/FilePropertySourceProvider.java b/examples/04-events-example/src/main/java/org/apache/tamaya/ext/examples/events/FilePropertySourceProvider.java
index fd117af..670e916 100644
--- a/examples/04-events-example/src/main/java/org/apache/tamaya/ext/examples/events/FilePropertySourceProvider.java
+++ b/examples/04-events-example/src/main/java/org/apache/tamaya/ext/examples/events/FilePropertySourceProvider.java
@@ -60,7 +60,7 @@ public class FilePropertySourceProvider extends AbstractPathPropertySourceProvid
}
for (String key : props.stringPropertyNames()) {
- properties.put(key, PropertyValue.value(key, props.getProperty(key)).setMeta("source", getName()));
+ properties.put(key, PropertyValue.createValue(key, props.getProperty(key)).setMeta("source", getName()));
}
} catch (IOException e) {
throw new ConfigException("Error loading properties from " + propertiesFile, e);
[incubator-tamaya-extensions] 01/02: Fixed documentation issues
(replaced createValue with value where approproate).
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
anatole pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-extensions.git
commit 8600c4f1ca99d80c0790f31fcca40e6b65de28af
Author: Anatole Tresch <at...@gmail.com>
AuthorDate: Mon Dec 17 00:59:58 2018 +0100
Fixed documentation issues (replaced createValue with value where approproate).
---
.../apache/tamay/ext/examples/resolver/Main.java | 2 +-
.../tamay/ext/examples/resolver/package-info.java | 2 +-
.../events/FilePropertySourceProvider.java | 2 +-
.../apache/tamaya/collections/ItemTokenizer.java | 30 +++++-----
.../tamaya/events/ConfigurationChangeTest.java | 2 +-
.../MappedConfigurationDataPropertySourceTest.java | 16 ++---
.../apache/tamaya/functions/PropertyMapper.java | 6 +-
.../apache/tamaya/cdi/CDIAwareServiceContext.java | 2 +-
.../apache/tamaya/cdi/ConfigurationProducer.java | 6 +-
.../org/apache/tamaya/cdi/DefaultDynamicValue.java | 12 ++--
.../tamaya/cdi/ServiceLoaderServiceContext.java | 2 +-
.../tamaya/cdi/TamayaCDIInjectionExtension.java | 2 +-
.../tamaya/cdi/ConfigurationProducerTest.java | 8 +--
.../apache/tamaya/inject/spi/BaseDynamicValue.java | 70 +++++++++++-----------
.../apache/tamaya/inject/spi/ConfiguredField.java | 2 +-
.../tamaya/inject/internal/InjectionHelper.java | 2 +-
.../apache/tamaya/inject/TamayaInjectionTest.java | 4 +-
17 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/examples/02-resolver-example/src/main/java/org/apache/tamay/ext/examples/resolver/Main.java b/examples/02-resolver-example/src/main/java/org/apache/tamay/ext/examples/resolver/Main.java
index 1cd9094..1d8fd9d 100644
--- a/examples/02-resolver-example/src/main/java/org/apache/tamay/ext/examples/resolver/Main.java
+++ b/examples/02-resolver-example/src/main/java/org/apache/tamay/ext/examples/resolver/Main.java
@@ -29,7 +29,7 @@ import java.util.logging.Logger;
import static java.lang.String.format;
/**
- * Example illustrating the usage of createValue resolver expressions (placeholders).
+ * Example illustrating the usage of value resolver expressions (placeholders).
*/
public class Main {
/*
diff --git a/examples/02-resolver-example/src/main/java/org/apache/tamay/ext/examples/resolver/package-info.java b/examples/02-resolver-example/src/main/java/org/apache/tamay/ext/examples/resolver/package-info.java
index 2f0cc42..9479876 100644
--- a/examples/02-resolver-example/src/main/java/org/apache/tamay/ext/examples/resolver/package-info.java
+++ b/examples/02-resolver-example/src/main/java/org/apache/tamay/ext/examples/resolver/package-info.java
@@ -18,6 +18,6 @@
*/
/**
- * Example illustrating the usage of createValue resolver expressions (placeholders).
+ * Example illustrating the usage of value resolver expressions (placeholders).
*/
package org.apache.tamay.ext.examples.resolver;
\ No newline at end of file
diff --git a/examples/04-events-example/src/main/java/org/apache/tamaya/ext/examples/events/FilePropertySourceProvider.java b/examples/04-events-example/src/main/java/org/apache/tamaya/ext/examples/events/FilePropertySourceProvider.java
index 670e916..fd117af 100644
--- a/examples/04-events-example/src/main/java/org/apache/tamaya/ext/examples/events/FilePropertySourceProvider.java
+++ b/examples/04-events-example/src/main/java/org/apache/tamaya/ext/examples/events/FilePropertySourceProvider.java
@@ -60,7 +60,7 @@ public class FilePropertySourceProvider extends AbstractPathPropertySourceProvid
}
for (String key : props.stringPropertyNames()) {
- properties.put(key, PropertyValue.createValue(key, props.getProperty(key)).setMeta("source", getName()));
+ properties.put(key, PropertyValue.value(key, props.getProperty(key)).setMeta("source", getName()));
}
} catch (IOException e) {
throw new ConfigException("Error loading properties from " + propertiesFile, e);
diff --git a/modules/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java b/modules/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java
index 176241e..9287497 100644
--- a/modules/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java
+++ b/modules/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java
@@ -28,7 +28,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
/**
- * Helper class that implements the tokenizing of the entries of a configuration createValue.
+ * Helper class that implements the tokenizing of the entries of a configuration value.
*/
final class ItemTokenizer {
@@ -46,11 +46,11 @@ final class ItemTokenizer {
private ItemTokenizer(){}
/**
- * Splits the given createValue using the given separator. Matcjhing is done by traversing the String createValue using
+ * Splits the given value using the given separator. Matcjhing is done by traversing the String value using
* {@code indexOf} calls, one by one. The last unresolvable item (without any next separator token)
* is added at the end of the createList.
- * @param value the createValue, not null.
- * @return the tokenized createValue as createList, in order of occurrence.
+ * @param value the value, not null.
+ * @return the tokenized value as createList, in order of occurrence.
*/
public static List<String> split(String value, ConversionContext ctx){
String itemSeparator = (String)ctx.getMeta().getOrDefault(ITEM_SEPARATOR, DEFAULT_LIST_ITEM_SEPARATOR);
@@ -58,7 +58,7 @@ final class ItemTokenizer {
}
/**
- * Splits the given createValue using the given separator. Matching is done by traversing the String value using
+ * Splits the given value using the given separator. Matching is done by traversing the String value using
* {@code indexOf} calls, one by one. The last unresolvable item (without any next separator token)
* is added at the end of the list.
* @param value the value, not null.
@@ -83,11 +83,11 @@ final class ItemTokenizer {
}
/**
- * Splits the given String createValue as a map entry, splitting it into key and createValue part with the given separator.
- * If the createValue cannot be split then {@code key = createValue = mapEntry} is used for further processing. key or createValue
+ * Splits the given String value as a map entry, splitting it into key and value part with the given separator.
+ * If the value cannot be split then {@code key = value = mapEntry} is used for further processing. key or value
* parts are normally trimmed, unless they are enclosed with brackets {@code []}.
* @param mapEntry the entry, not null.
- * @return an array of length 2, with the trimmed and parsed key/createValue pair.
+ * @return an array of length 2, with the trimmed and parsed key/value pair.
*/
public static String[] splitMapEntry(String mapEntry, ConversionContext ctx){
String entrySeparator = (String)ctx.getMeta().getOrDefault(MAP_ENTRY_SEPARATOR, DEFAULT_MAP_ENTRY_SEPARATOR);
@@ -95,12 +95,12 @@ final class ItemTokenizer {
}
/**
- * Splits the given String createValue as a map entry, splitting it into key and createValue part with the given separator.
- * If the createValue cannot be split then {@code key = createValue = mapEntry} is used for further processing. key or createValue
+ * Splits the given String value as a map entry, splitting it into key and value part with the given separator.
+ * If the value cannot be split then {@code key = value = mapEntry} is used for further processing. key or value
* parts are normally trimmed, unless they are enmcosed with brackets {@code []}.
* @param mapEntry the entry, not null.
* @param separator the separator, not null.
- * @return an array of length 2, with the trimmed and parsed key/createValue pair.
+ * @return an array of length 2, with the trimmed and parsed key/value pair.
*/
public static String[] splitMapEntry(final String mapEntry, final String separator) {
int index = mapEntry.indexOf(separator);
@@ -126,9 +126,9 @@ final class ItemTokenizer {
}
/**
- * Parses the given createValue into the required collection target type, defined by the context.
- * @param value the raw String createValue.
- * @return the parsed createValue, or null.
+ * Parses the given value into the required collection target type, defined by the context.
+ * @param value the raw String value.
+ * @return the parsed value, or null.
*/
public static <T> T convertValue(String value, TypeLiteral<T> targetType, ConversionContext context) {
String converterClass = context.getMeta().get(ITEM_CONVERTER);
@@ -161,7 +161,7 @@ final class ItemTokenizer {
}
}
}
- LOG.log(Level.SEVERE, "Failed to convert collection createValue type for '" + value + "'.");
+ LOG.log(Level.SEVERE, "Failed to convert collection value type for '" + value + "'.");
return null;
}
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java b/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java
index 203f058..6bfd782 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/ConfigurationChangeTest.java
@@ -48,7 +48,7 @@ public class ConfigurationChangeTest {
assertTrue(change.getChanges().size()==0);
for (Map.Entry<String, String> en : config.getProperties().entrySet()) {
if (!"[meta]frozenAt".equals(en.getKey())) {
- if(en.getKey().contains("random.new")){ // dynamic generated createValue!
+ if(en.getKey().contains("random.new")){ // dynamic generated value!
continue;
}
assertEquals("Error for " + en.getKey(), en.getValue(), change.getResource().get(en.getKey()));
diff --git a/modules/formats/base/src/test/java/org/apache/tamaya/format/MappedConfigurationDataPropertySourceTest.java b/modules/formats/base/src/test/java/org/apache/tamaya/format/MappedConfigurationDataPropertySourceTest.java
index 4cdf4f1..a952096 100644
--- a/modules/formats/base/src/test/java/org/apache/tamaya/format/MappedConfigurationDataPropertySourceTest.java
+++ b/modules/formats/base/src/test/java/org/apache/tamaya/format/MappedConfigurationDataPropertySourceTest.java
@@ -47,7 +47,7 @@ public class MappedConfigurationDataPropertySourceTest {
// private ConfigurationData createConfigurationData(String sourceName, int ordinal) {
// return ConfigurationDataBuilder.of(sourceName, new PropertiesFormat())
// .addDefaultProperty("a", "aValue").addSectionProperty("section1", "sectionKey1", "sectionValue11")
-// .addSections("section1", "section12").addDefaultProperty(PropertySource.TAMAYA_ORDINAL, String.createValue(ordinal))
+// .addSections("section1", "section12").addDefaultProperty(PropertySource.TAMAYA_ORDINAL, String.value(ordinal))
// .addSectionProperty("section2", "sectionKey1", "sectionValue21").build();
// }
//
@@ -68,12 +68,12 @@ public class MappedConfigurationDataPropertySourceTest {
// public void testGet() throws Exception {
// MappedConfigurationDataPropertySource ps = new MappedConfigurationDataPropertySource(createConfigurationData("test2"));
// assertEquals("aValue", ps.getValue("a").createValue());
-// assertNotNull(ps.getValue("section1.sectionKey1").createValue());
-// assertNotNull(ps.getValue("section2.sectionKey1").createValue());
+// assertNotNull(ps.getValue("section1.sectionKey1").value());
+// assertNotNull(ps.getValue("section2.sectionKey1").value());
// assertNull(ps.getValue("sectionKey1"));
// ps = new MappedConfigurationDataPropertySource(createConfigurationDataNoDefault("test2"));
-// assertEquals("sectionValue11", ps.getValue("section1.sectionKey1").createValue());
-// assertEquals("sectionValue21", ps.getValue("section2.sectionKey1").createValue());
+// assertEquals("sectionValue11", ps.getValue("section1.sectionKey1").value());
+// assertEquals("sectionValue21", ps.getValue("section2.sectionKey1").value());
// assertNull(ps.getValue("a"));
// assertNull(ps.getValue("section1"));
// }
@@ -82,7 +82,7 @@ public class MappedConfigurationDataPropertySourceTest {
// public void testGetProperties() throws Exception {
// MappedConfigurationDataPropertySource ps = new MappedConfigurationDataPropertySource(createConfigurationData("test3"));
// assertNotNull(ps.getProperties());
-// assertEquals("aValue", ps.getProperties().getValue("a").createValue());
+// assertEquals("aValue", ps.getProperties().getValue("a").value());
// assertNotNull(ps.getProperties().getValue("section1.sectionKey1"));
// assertNotNull(ps.getProperties().getValue("section2.sectionKey1"));
// assertNull(ps.getProperties().getValue("section1.sectionKey2"));
@@ -91,8 +91,8 @@ public class MappedConfigurationDataPropertySourceTest {
// assertNull(ps.getProperties().getValue("sectionKey2"));
// ps = new MappedConfigurationDataPropertySource(createConfigurationDataNoDefault("test3"));
// assertNotNull(ps.getProperties());
-// assertEquals("sectionValue11", ps.getProperties().getValue("section1.sectionKey1").createValue());
-// assertEquals("sectionValue21", ps.getProperties().getValue("section2.sectionKey1").createValue());
+// assertEquals("sectionValue11", ps.getProperties().getValue("section1.sectionKey1").value());
+// assertEquals("sectionValue21", ps.getProperties().getValue("section2.sectionKey1").value());
// assertNull(ps.getValue("section1"));
// }
}
\ No newline at end of file
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMapper.java b/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMapper.java
index 3e7dad4..dc5bd30 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMapper.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMapper.java
@@ -26,10 +26,10 @@ package org.apache.tamaya.functions;
public interface PropertyMapper {
/**
- * Maps the given key/createValue to another createValue.
+ * Maps the given key/value to another value.
* @param key the key, not null.
- * @param value the createValue, not null.
- * @return the new createValue, not null.
+ * @param value the value, not null.
+ * @return the new value, not null.
*/
String mapProperty(String key, String value);
diff --git a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/CDIAwareServiceContext.java b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/CDIAwareServiceContext.java
index 05620c9..d400c1e 100644
--- a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/CDIAwareServiceContext.java
+++ b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/CDIAwareServiceContext.java
@@ -162,7 +162,7 @@ public class CDIAwareServiceContext implements ServiceContext, ClassloaderAware
}
/**
- * Checks the given instance for a @Priority annotation. If present the annotation's createValue s evaluated. If no such
+ * Checks the given instance for a @Priority annotation. If present the annotation's value s evaluated. If no such
* annotation is present, a default priority is returned (1);
* @param o the instance, not null.
* @return a priority, by default 1.
diff --git a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ConfigurationProducer.java b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ConfigurationProducer.java
index c7523be..03a745d 100644
--- a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ConfigurationProducer.java
+++ b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ConfigurationProducer.java
@@ -93,7 +93,7 @@ public class ConfigurationProducer {
}
}
if(textValue==null) {
- LOGGER.info("Using default createValue: '" + defaultTextValue + "' for IP: " + injectionPoint );
+ LOGGER.info("Using default value: '" + defaultTextValue + "' for IP: " + injectionPoint );
textValue = defaultTextValue;
}
ConversionContext conversionContext = createConversionContext(keyFound, keys, injectionPoint);
@@ -167,12 +167,12 @@ public class ConfigurationProducer {
try {
value = converter.convert(textValue, conversionContext);
if (value != null) {
- LOGGER.log(Level.INFO, "Parsed createValue from '" + textValue + "' into " +
+ LOGGER.log(Level.INFO, "Parsed value from '" + textValue + "' into " +
injectionPoint);
break;
}
} catch (Exception e) {
- LOGGER.log(Level.INFO, "Failed to convert createValue '" + textValue + "' for " +
+ LOGGER.log(Level.INFO, "Failed to convert value '" + textValue + "' for " +
injectionPoint, e);
}
}
diff --git a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/DefaultDynamicValue.java b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/DefaultDynamicValue.java
index 5f31715..3a85ed0 100644
--- a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/DefaultDynamicValue.java
+++ b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/DefaultDynamicValue.java
@@ -36,10 +36,10 @@ import java.lang.reflect.Type;
import java.util.*;
/**
- * A accessor for a single configured createValue. This can be used to support values that may change during runtime,
+ * A accessor for a single configured value. This can be used to support values that may change during runtime,
* reconfigured or final. Hereby external code (could be Tamaya configuration listeners or client code), can setCurrent a
- * new createValue. Depending on the {@link UpdatePolicy} the new createValue is immediately active or it requires an active commit
- * by client code. Similarly an instance also can ignore all later changes to the createValue.
+ * new value. Depending on the {@link UpdatePolicy} the new value is immediately active or it requires an active commit
+ * by client code. Similarly an instance also can ignore all later changes to the value.
* <h3>Implementation Details</h3>
* This class is
* <ul>
@@ -47,7 +47,7 @@ import java.util.*;
* <li>Thread safe</li>
* </ul>
*
- * @param <T> The type of the createValue.
+ * @param <T> The type of the value.
*/
final class DefaultDynamicValue<T> extends BaseDynamicValue<T> {
@@ -180,8 +180,8 @@ final class DefaultDynamicValue<T> extends BaseDynamicValue<T> {
"configuration=" + getConfiguration() +
", customConverter=" + customConverter +
", loadPolicy=" + loadPolicy +
- ", createValue=" + value +
- ", createValue=" + newValue +
+ ", value=" + value +
+ ", value=" + newValue +
", defaultValue=" + getDefaultValue() +
", discarded=" + discarded +
", keys=" + getKeys() +
diff --git a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ServiceLoaderServiceContext.java b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ServiceLoaderServiceContext.java
index f8424c2..9e1a834 100644
--- a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ServiceLoaderServiceContext.java
+++ b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/ServiceLoaderServiceContext.java
@@ -141,7 +141,7 @@ final class ServiceLoaderServiceContext implements ServiceContext {
}
/**
- * Checks the given instance for a @Priority annotation. If present the annotation's createValue s evaluated. If no such
+ * Checks the given instance for a @Priority annotation. If present the annotation's value s evaluated. If no such
* annotation is present, a default priority is returned (1);
* @param o the instance, not null.
* @return a priority, by default 1.
diff --git a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/TamayaCDIInjectionExtension.java b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/TamayaCDIInjectionExtension.java
index 6b51061..23b05be 100644
--- a/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/TamayaCDIInjectionExtension.java
+++ b/modules/injection/cdi/src/main/java/org/apache/tamaya/cdi/TamayaCDIInjectionExtension.java
@@ -163,7 +163,7 @@ public class TamayaCDIInjectionExtension implements Extension {
* @param sections the default sections, may be empty. May also be null.
* @return the createList of keys to be finally used for configuration resolution in order of
* precedence. The first keys in the createList that could be successfully resolved define the final
- * configuration createValue.
+ * configuration value.
*/
public static List<String> evaluateKeys(String memberName, String[] keys, String[] sections) {
List<String> effKeys = new ArrayList<>();
diff --git a/modules/injection/cdi/src/test/java/org/apache/tamaya/cdi/ConfigurationProducerTest.java b/modules/injection/cdi/src/test/java/org/apache/tamaya/cdi/ConfigurationProducerTest.java
index 7c2ca66..b3459b7 100644
--- a/modules/injection/cdi/src/test/java/org/apache/tamaya/cdi/ConfigurationProducerTest.java
+++ b/modules/injection/cdi/src/test/java/org/apache/tamaya/cdi/ConfigurationProducerTest.java
@@ -128,7 +128,7 @@ public class ConfigurationProducerTest {
private Provider<String> providerString;
@Inject
- @Config(value = "defaultString.createValue", defaultValue = "defaultString")
+ @Config(value = "defaultString.value", defaultValue = "defaultString")
private String defaultString;
@Inject
@@ -136,7 +136,7 @@ public class ConfigurationProducerTest {
private File file;
@Inject
- @Config(value = "defaultFile.createValue", defaultValue = "./")
+ @Config(value = "defaultFile.value", defaultValue = "./")
private File defaultFile;
@Inject
@@ -144,7 +144,7 @@ public class ConfigurationProducerTest {
private Boolean aBoolean;
@Inject
- @Config(value = "defaultBoolean.createValue", defaultValue = "true")
+ @Config(value = "defaultBoolean.value", defaultValue = "true")
private Boolean defaultBoolean;
@Inject
@@ -152,7 +152,7 @@ public class ConfigurationProducerTest {
private Integer integer;
@Inject
- @Config(value = "defaultInteger.createValue", defaultValue = "45")
+ @Config(value = "defaultInteger.value", defaultValue = "45")
private Integer defaultInteger;
@Inject
diff --git a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java
index 1b21d01..b028ef1 100644
--- a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java
+++ b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java
@@ -38,10 +38,10 @@ import java.util.logging.Logger;
/**
* Basic abstract implementation skeleton for a {@link DynamicValue}. This can be used to support values that may
* change during runtime. Hereby external code (could be Tamaya configuration listners or client
- * code), can apply a new createValue. Depending on the {@link org.apache.tamaya.inject.api.UpdatePolicy} the new createValue is applied immedeately, when the
+ * code), can apply a new value. Depending on the {@link org.apache.tamaya.inject.api.UpdatePolicy} the new value is applied immedeately, when the
* change has been identified, or it requires an programmatic commit by client code to
* activate the change in the {@link DynamicValue}. Similarly an instance also can ignore all
- * later changes to the createValue.
+ * later changes to the value.
*
* <h3>Implementation Specification</h3>
* This class is
@@ -50,7 +50,7 @@ import java.util.logging.Logger;
* <li>Thread safe</li>
* </ul>
*
- * @param <T> The type of the createValue.
+ * @param <T> The type of the value.
*/
public abstract class BaseDynamicValue<T> implements DynamicValue<T> {
@@ -58,7 +58,7 @@ public abstract class BaseDynamicValue<T> implements DynamicValue<T> {
private static final Logger LOG = Logger.getLogger(DynamicValue.class.getName());
- /** The createValue owner used for PropertyChangeEvents. */
+ /** The value owner used for PropertyChangeEvents. */
private Object owner;
/**
* The property name of the entry.
@@ -75,14 +75,14 @@ public abstract class BaseDynamicValue<T> implements DynamicValue<T> {
/** The targe type. */
private TypeLiteral<T> targetType;
/**
- * The current createValue, never null.
+ * The current value, never null.
*/
protected transient T value;
- /** The last discarded createValue. */
+ /** The last discarded value. */
protected transient T discarded;
- /** Any new createValue, not yet applied. */
+ /** Any new value, not yet applied. */
protected transient T newValue;
- /** The configured default createValue, before type conversion. */
+ /** The configured default value, before type conversion. */
private String defaultValue;
/** The createList of candidate keys to be used. */
private List<String> keys = new ArrayList<>();
@@ -109,16 +109,16 @@ public abstract class BaseDynamicValue<T> implements DynamicValue<T> {
}
/**
- * Get the default createValue, used if no createValue could be evaluated.
- * @return the default createValue, or null.
+ * Get the default value, used if no value could be evaluated.
+ * @return the default value, or null.
*/
public String getDefaultValue() {
return defaultValue;
}
/**
- * Set the default createValue to be used.
- * @param defaultValue the default createValue.
+ * Set the default value to be used.
+ * @param defaultValue the default value.
*/
public void setDefaultValue(String defaultValue) {
this.defaultValue = defaultValue;
@@ -141,7 +141,7 @@ public abstract class BaseDynamicValue<T> implements DynamicValue<T> {
}
/**
- * Get the owner of this dynamic createValue instance.
+ * Get the owner of this dynamic value instance.
* @return the owner, never null.
*/
protected Object getOwner(){
@@ -218,10 +218,10 @@ public abstract class BaseDynamicValue<T> implements DynamicValue<T> {
value = val;
return true;
}else if(discarded!=null && discarded.equals(val)){
- // the evaluated createValue has been discarded and will be flagged out.
+ // the evaluated value has been discarded and will be flagged out.
return false;
}else{
- // Reset discarded state for a new createValue.
+ // Reset discarded state for a new value.
discarded = null;
}
if(!Objects.equals(val, value)){
@@ -234,10 +234,10 @@ public abstract class BaseDynamicValue<T> implements DynamicValue<T> {
publishChangeEvent(this.value, val);
break;
case LOG_ONLY:
- LOG.info("New config createValue for keys " + keys + " detected, but not yet applied.");
+ LOG.info("New config value for keys " + keys + " detected, but not yet applied.");
break;
case NEVER:
- LOG.finest("New config createValue for keys " + keys + " detected, but ignored.");
+ LOG.finest("New config value for keys " + keys + " detected, but ignored.");
break;
}
return true;
@@ -247,8 +247,8 @@ public abstract class BaseDynamicValue<T> implements DynamicValue<T> {
/**
* Publishes a change event to all listeners.
- * @param newValue the new createValue
- * @param oldValue the new old createValue
+ * @param newValue the new value
+ * @param oldValue the new old value
*/
protected void publishChangeEvent(T oldValue, T newValue) {
PropertyChangeEvent evt = new PropertyChangeEvent(getOwner(), getPropertyName(),oldValue, newValue);
@@ -326,10 +326,10 @@ public abstract class BaseDynamicValue<T> implements DynamicValue<T> {
}
/**
- * Performs a commit, if necessary, and returns the current createValue.
+ * Performs a commit, if necessary, and returns the current value.
*
- * @return the non-null createValue held by this {@code DynamicValue}
- * @throws org.apache.tamaya.ConfigException if there is no createValue present
+ * @return the non-null value held by this {@code DynamicValue}
+ * @throws org.apache.tamaya.ConfigException if there is no value present
* @see DynamicValue#isPresent()
*/
@Override
@@ -339,9 +339,9 @@ public abstract class BaseDynamicValue<T> implements DynamicValue<T> {
}
/**
- * Return {@code true} if there is a createValue present, otherwise {@code false}.
+ * Return {@code true} if there is a value present, otherwise {@code false}.
*
- * @return {@code true} if there is a createValue present, otherwise {@code false}
+ * @return {@code true} if there is a value present, otherwise {@code false}
*/
@Override
public boolean isPresent() {
@@ -350,11 +350,11 @@ public abstract class BaseDynamicValue<T> implements DynamicValue<T> {
/**
- * Return the createValue if present, otherwise return {@code other}.
+ * Return the value if present, otherwise return {@code other}.
*
- * @param other the createValue to be returned if there is no createValue present, may
+ * @param other the value to be returned if there is no value present, may
* be null
- * @return the createValue, if present, otherwise {@code other}
+ * @return the value, if present, otherwise {@code other}
*/
@Override
public T orElse(T other) {
@@ -366,13 +366,13 @@ public abstract class BaseDynamicValue<T> implements DynamicValue<T> {
}
/**
- * Return the createValue if present, otherwise invoke {@code other} and return
+ * Return the value if present, otherwise invoke {@code other} and return
* the result of that invocation.
*
- * @param other a {@code ConfiguredItemSupplier} whose result is returned if no createValue
+ * @param other a {@code ConfiguredItemSupplier} whose result is returned if no value
* is present
- * @return the createValue if present otherwise the result of {@code other.current()}
- * @throws NullPointerException if createValue is not present and {@code other} is
+ * @return the value if present otherwise the result of {@code other.current()}
+ * @throws NullPointerException if value is not present and {@code other} is
* null
*/
@Override
@@ -385,7 +385,7 @@ public abstract class BaseDynamicValue<T> implements DynamicValue<T> {
}
/**
- * Return the contained createValue, if present, otherwise throw an exception
+ * Return the contained value, if present, otherwise throw an exception
* to be created by the provided supplier.
* <p>
* NOTE A method reference to the exception constructor with an empty
@@ -395,9 +395,9 @@ public abstract class BaseDynamicValue<T> implements DynamicValue<T> {
* @param <X> Type of the exception to be thrown
* @param exceptionSupplier The supplier which will return the exception to
* be thrown
- * @return the present createValue
- * @throws X if there is no createValue present
- * @throws NullPointerException if no createValue is present and
+ * @return the present value
+ * @throws X if there is no value present
+ * @throws NullPointerException if no value is present and
* {@code exceptionSupplier} is null
*/
@Override
diff --git a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/ConfiguredField.java b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/ConfiguredField.java
index cc59d68..8f787dc 100644
--- a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/ConfiguredField.java
+++ b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/ConfiguredField.java
@@ -36,7 +36,7 @@ public interface ConfiguredField {
/**
* Get a createList of all target keys for the given field. The first resolvable key normally determines the
- * configuration createValue injected.
+ * configuration value injected.
* @return a createList of evaluated keys.
*/
Collection<String> getConfiguredKeys();
diff --git a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
index daedacb..c3df063 100644
--- a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
+++ b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java
@@ -204,7 +204,7 @@ final class InjectionHelper {
/**
* Method that allows to statically check, if the resolver module is loaded. If the module is loaded
- * createValue expressions are automatically forwarded to the resolver module for resolution.
+ * value expressions are automatically forwarded to the resolver module for resolution.
*
* @return true, if the resolver module is on the classpath.
*/
diff --git a/modules/injection/standalone/src/test/java/org/apache/tamaya/inject/TamayaInjectionTest.java b/modules/injection/standalone/src/test/java/org/apache/tamaya/inject/TamayaInjectionTest.java
index f56b43c..5b6d55d 100644
--- a/modules/injection/standalone/src/test/java/org/apache/tamaya/inject/TamayaInjectionTest.java
+++ b/modules/injection/standalone/src/test/java/org/apache/tamaya/inject/TamayaInjectionTest.java
@@ -117,7 +117,7 @@ public class TamayaInjectionTest {
public void testConfigTemplate_WithCustomConfig(){
Map<String,String> properties = new HashMap<>();
properties.put("env.stage", "custom-stage");
- properties.put("simple_value", "custom-createValue");
+ properties.put("simple_value", "custom-value");
properties.put("host.name", "custom-hostname");
properties.put("anotherValue", "custom-HALLO!");
properties.put("foo.bar.myprop", "custom-parameter");
@@ -129,7 +129,7 @@ public class TamayaInjectionTest {
.createTemplate(AnnotatedConfigTemplate.class, customConfig);
assertEquals(testInstance.hostName(), "custom-hostname");
assertEquals(testInstance.myParameter(), "custom-parameter");
- assertEquals(testInstance.simpleValue(), "custom-createValue");
+ assertEquals(testInstance.simpleValue(), "custom-value");
assertNotNull(testInstance.getDynamicValue());
assertTrue(testInstance.getDynamicValue().isPresent());
assertEquals(testInstance.getDynamicValue().get(), "custom-hostname");