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
The following commit(s) were added to refs/heads/master by this push:
new 9f3d75b TAMAYA-378: Minor adjustments for inject API changes
new 224c714 Merge pull request #29 from acoburn/inject_api_changes
9f3d75b is described below
commit 9f3d75b310a992f0b4383077d8e8cbc49eb1ceef
Author: Aaron Coburn <[email protected]>
AuthorDate: Sat Feb 23 17:48:54 2019 -0500
TAMAYA-378: Minor adjustments for inject API changes
Updates to JavaDocs and some tests
---
.../java/org/apache/tamaya/ext/examples/injection/Example.java | 6 +++---
.../org/apache/tamaya/ext/examples/injection/ExampleTemplate.java | 6 +++---
.../java/org/apache/tamaya/springexample/WelcomeController.java | 8 ++++----
.../src/main/java/org/apache/tamaya/inject/api/Config.java | 4 ++--
.../test/java/org/apache/tamaya/inject/TamayaInjectionTest.java | 4 ++--
.../src/test/java/org/apache/tamaya/osgi/injection/Example.java | 4 ++--
.../java/org/apache/tamaya/osgi/injection/TemplateExample.java | 4 ++--
7 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/examples/03-injection-example/src/main/java/org/apache/tamaya/ext/examples/injection/Example.java
b/examples/03-injection-example/src/main/java/org/apache/tamaya/ext/examples/injection/Example.java
index 6f78e58..7b969fd 100644
---
a/examples/03-injection-example/src/main/java/org/apache/tamaya/ext/examples/injection/Example.java
+++
b/examples/03-injection-example/src/main/java/org/apache/tamaya/ext/examples/injection/Example.java
@@ -19,12 +19,12 @@
package org.apache.tamaya.ext.examples.injection;
import org.apache.tamaya.inject.api.Config;
-import org.apache.tamaya.inject.api.ConfigDefaultSections;
+import org.apache.tamaya.inject.api.ConfigSection;
/**
* Simple example bean, mapped by default names mostly.
*/
-@ConfigDefaultSections("example")
+@ConfigSection("example")
@SuppressWarnings("all")
public class Example {
@@ -33,7 +33,7 @@ public class Example {
@Config(defaultValue = "No description available.")
private String description;
private int version;
- @Config("author")
+ @Config(key = "author")
private String exampleAuthor;
@Override
diff --git
a/examples/03-injection-example/src/main/java/org/apache/tamaya/ext/examples/injection/ExampleTemplate.java
b/examples/03-injection-example/src/main/java/org/apache/tamaya/ext/examples/injection/ExampleTemplate.java
index 8eb6839..63684bb 100644
---
a/examples/03-injection-example/src/main/java/org/apache/tamaya/ext/examples/injection/ExampleTemplate.java
+++
b/examples/03-injection-example/src/main/java/org/apache/tamaya/ext/examples/injection/ExampleTemplate.java
@@ -19,12 +19,12 @@
package org.apache.tamaya.ext.examples.injection;
import org.apache.tamaya.inject.api.Config;
-import org.apache.tamaya.inject.api.ConfigDefaultSections;
+import org.apache.tamaya.inject.api.ConfigSection;
/**
* Simple example bean, mapped by default names mostly.
*/
-@ConfigDefaultSections("example")
+@ConfigSection("example")
public interface ExampleTemplate {
String getType();
@@ -36,7 +36,7 @@ public interface ExampleTemplate {
int getVersion();
- @Config("author")
+ @Config(key = "author")
String getExampleAuthor();
}
diff --git
a/examples/05-spring-example/src/main/java/org/apache/tamaya/springexample/WelcomeController.java
b/examples/05-spring-example/src/main/java/org/apache/tamaya/springexample/WelcomeController.java
index 352822b..7a50481 100644
---
a/examples/05-spring-example/src/main/java/org/apache/tamaya/springexample/WelcomeController.java
+++
b/examples/05-spring-example/src/main/java/org/apache/tamaya/springexample/WelcomeController.java
@@ -36,13 +36,13 @@ public class WelcomeController {
@Value("${application.message:Hello World}")
private String message = "Hello World";
- @Config(value = "background.color", required = false)
+ @Config(key = "background.color", required = false)
private String backgroundColor = "#BBBBBB";
- @Config(value = "foreground.color", required = false, defaultValue =
FOREGROUND_DEFAULT)
+ @Config(key = "foreground.color", required = false, defaultValue =
FOREGROUND_DEFAULT)
private DynamicValue<String> foregroundColor;
- @Config(value = "background.color", required = false)
+ @Config(key = "background.color", required = false)
private Color bgColor;
@GetMapping("/")
@@ -87,4 +87,4 @@ public class WelcomeController {
return "config";
}
-}
\ No newline at end of file
+}
diff --git
a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java
b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java
index d18f8bf..daa9b59 100644
---
a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java
+++
b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java
@@ -94,7 +94,7 @@ public @interface Config {
/**
* Defines the main configuration property key to be used. The final
target property is evaluated based on
- * the {@link #keyResolver()} strategy, by default {@link
KeyResolution#AUTO}.
+ * the {@link #keyResolver()} strategy.
*
* @return the main property key, not null. If empty, the field or
property name (of a setter method) being injected
* is used by default.
@@ -123,7 +123,7 @@ public @interface Config {
/**
* Defines the alternate configuration property keys to be used, if no
value could be evaluated using the main
- * {@link #key()}. All key values given are resolved using the {@link
KeyResolution#ABSOLUTE} strategy.
+ * {@link #key()}.
*
* @return the property keys, not null.
*/
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 c329093..86e9346 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
@@ -47,7 +47,7 @@ public class TamayaInjectionTest {
assertThat(testInstance.fullKey).isNull();
assertThat(testInstance.test2).isEqualTo("This is not setCurrent.");
ConfigurationInjection.getConfigurationInjector().configure(testInstance);
- assertThat(testInstance.simple_value).isEqualTo("aSimpleValue");
+ assertThat(testInstance.simple_value).isEqualTo("aSimpleValue3");
assertThat(testInstance.classFieldKey).isEqualTo("Class-Field-Value");
assertThat(testInstance.fieldKey).isEqualTo("Field-Value");
assertThat(testInstance.fullKey).isEqualTo("Fullkey-Value");
@@ -107,7 +107,7 @@ public class TamayaInjectionTest {
assertThat(testInstance.simpleValue()).isEqualTo("aSimpleValue");
assertThat(testInstance.getDynamicValue()).isNotNull();
assertThat(testInstance.getDynamicValue().isPresent()).isTrue();
-
assertThat(testInstance.getDynamicValue().get()).isEqualTo("tamaya01.incubator.apache.org");
+
assertThat(testInstance.getDynamicValue().get()).isEqualTo("tamaya02.incubator.apache.org");
assertThat(testInstance.hostName()).isEqualTo(testInstance.getDynamicValue().get());
}
diff --git
a/modules/osgi/injection/src/test/java/org/apache/tamaya/osgi/injection/Example.java
b/modules/osgi/injection/src/test/java/org/apache/tamaya/osgi/injection/Example.java
index ad06561..6bbe351 100644
---
a/modules/osgi/injection/src/test/java/org/apache/tamaya/osgi/injection/Example.java
+++
b/modules/osgi/injection/src/test/java/org/apache/tamaya/osgi/injection/Example.java
@@ -26,9 +26,9 @@ import static org.assertj.core.api.Assertions.assertThat;
* Example class to be configured with injection.
*/
final class Example {
- @Config(key="java.home")
+ @Config(key="[java.home]")
String javaHome;
- @Config(key="java.version")
+ @Config(key="[java.version]")
String javaVersion;
@Config(key = "java.used", defaultValue = "true")
boolean javaUsed;
diff --git
a/modules/osgi/injection/src/test/java/org/apache/tamaya/osgi/injection/TemplateExample.java
b/modules/osgi/injection/src/test/java/org/apache/tamaya/osgi/injection/TemplateExample.java
index 46a58a7..cbf53ea 100644
---
a/modules/osgi/injection/src/test/java/org/apache/tamaya/osgi/injection/TemplateExample.java
+++
b/modules/osgi/injection/src/test/java/org/apache/tamaya/osgi/injection/TemplateExample.java
@@ -25,10 +25,10 @@ import org.apache.tamaya.inject.api.Config;
*/
interface TemplateExample {
- @Config(key="java.home")
+ @Config(key="[java.home]")
String getJavaHome();
- @Config(key="java.version")
+ @Config(key="[java.version]")
String javaVersion();
@Config(key = "java.used", defaultValue = "true")
