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-sandbox.git
The following commit(s) were added to refs/heads/master by this push:
new cd64d81 TAMAYA-378 Improved injection API for more transparent key
resolution.
cd64d81 is described below
commit cd64d81755237a8e0531ee85fec85803c1b24736
Author: Anatole Tresch <[email protected]>
AuthorDate: Fri Feb 22 09:39:56 2019 +0100
TAMAYA-378 Improved injection API for more transparent key resolution.
---
.../src/main/java/org/apache/tamaya/doc/ConfigDocumenter.java | 4 ++--
.../src/main/java/org/apache/tamaya/doc/DocFormat.java | 2 +-
.../src/main/java/org/apache/tamaya/doc/DocumentedArea.java | 2 +-
.../main/java/org/apache/tamaya/doc/DocumentedProperty.java | 2 +-
.../java/org/apache/tamaya/doc/formats/HtmlDocFormat.java | 6 +++---
.../java/org/apache/tamaya/doc/formats/TextDocFormat.java | 4 ++--
.../java/org/apache/tamaya/doc/AnnotatedDocConfigBean.java | 7 +++++--
.../test/java/org/apache/tamaya/doc/ConfigDocumenterTest.java | 11 ++++++-----
8 files changed, 21 insertions(+), 17 deletions(-)
diff --git
a/documentation/src/main/java/org/apache/tamaya/doc/ConfigDocumenter.java
b/documentation/src/main/java/org/apache/tamaya/doc/ConfigDocumenter.java
index 3973854..8e1892e 100644
--- a/documentation/src/main/java/org/apache/tamaya/doc/ConfigDocumenter.java
+++ b/documentation/src/main/java/org/apache/tamaya/doc/ConfigDocumenter.java
@@ -44,7 +44,7 @@ import java.util.List;
*/
public class ConfigDocumenter {
- private ConfigurationDocumentation docs = new ConfigurationDocumentation();
+ private DocumentedConfiguration docs = new DocumentedConfiguration();
public static ConfigDocumenter getInstance(){
@@ -111,7 +111,7 @@ public class ConfigDocumenter {
* Access the collected configuration documentation.
* @return the documentation, not null.
*/
- public ConfigurationDocumentation getDocumentation(){
+ public DocumentedConfiguration getDocumentation(){
return docs;
}
diff --git a/documentation/src/main/java/org/apache/tamaya/doc/DocFormat.java
b/documentation/src/main/java/org/apache/tamaya/doc/DocFormat.java
index f69d60f..c1dc646 100644
--- a/documentation/src/main/java/org/apache/tamaya/doc/DocFormat.java
+++ b/documentation/src/main/java/org/apache/tamaya/doc/DocFormat.java
@@ -24,6 +24,6 @@ import java.util.function.Function;
* An interface for configuration documentation.
* @param <T> the documentation format type
*/
-public interface DocFormat<T> extends Function<ConfigurationDocumentation, T> {
+public interface DocFormat<T> extends Function<DocumentedConfiguration, T> {
}
diff --git
a/documentation/src/main/java/org/apache/tamaya/doc/DocumentedArea.java
b/documentation/src/main/java/org/apache/tamaya/doc/DocumentedArea.java
index 06b7118..00ed95c 100644
--- a/documentation/src/main/java/org/apache/tamaya/doc/DocumentedArea.java
+++ b/documentation/src/main/java/org/apache/tamaya/doc/DocumentedArea.java
@@ -90,7 +90,7 @@ public final class DocumentedArea {
return "<root>";
}
- void resolve(ConfigurationDocumentation documentation){
+ void resolve(DocumentedConfiguration documentation){
if(configArea !=null){
for(String key: configArea.dependsOnAreas()){
this.dependsOnGroups.add(documentation.getArea(key));
diff --git
a/documentation/src/main/java/org/apache/tamaya/doc/DocumentedProperty.java
b/documentation/src/main/java/org/apache/tamaya/doc/DocumentedProperty.java
index c2589fd..7372cd5 100644
--- a/documentation/src/main/java/org/apache/tamaya/doc/DocumentedProperty.java
+++ b/documentation/src/main/java/org/apache/tamaya/doc/DocumentedProperty.java
@@ -83,7 +83,7 @@ public final class DocumentedProperty {
}
}
- void resolve(ConfigurationDocumentation documentation){
+ void resolve(DocumentedConfiguration documentation){
if(propertySpec !=null){
for(String key: propertySpec.dependsOnAreas()){
this.dependsOnGroups.add(documentation.getArea(key));
diff --git
a/documentation/src/main/java/org/apache/tamaya/doc/formats/HtmlDocFormat.java
b/documentation/src/main/java/org/apache/tamaya/doc/formats/HtmlDocFormat.java
index 8a32656..f92b53b 100644
---
a/documentation/src/main/java/org/apache/tamaya/doc/formats/HtmlDocFormat.java
+++
b/documentation/src/main/java/org/apache/tamaya/doc/formats/HtmlDocFormat.java
@@ -21,7 +21,7 @@ package org.apache.tamaya.doc.formats;
import j2html.tags.ContainerTag;
import org.apache.tamaya.doc.DocFormat;
import org.apache.tamaya.doc.DocumentedArea;
-import org.apache.tamaya.doc.ConfigurationDocumentation;
+import org.apache.tamaya.doc.DocumentedConfiguration;
import org.apache.tamaya.doc.DocumentedProperty;
import java.io.File;
@@ -57,7 +57,7 @@ import static j2html.TagCreator.ul;
*/
public class HtmlDocFormat implements DocFormat<String> {
@Override
- public String apply(ConfigurationDocumentation documentedConfiguration) {
+ public String apply(DocumentedConfiguration documentedConfiguration) {
List<ContainerTag> areaTags = new ArrayList<>();
for(DocumentedArea area:documentedConfiguration.getAllAreasSorted()) {
areaTags.addAll(createAreaEntries(area, null));
@@ -91,7 +91,7 @@ public class HtmlDocFormat implements DocFormat<String> {
}
}
- private ContainerTag createHead(ConfigurationDocumentation config) {
+ private ContainerTag createHead(DocumentedConfiguration config) {
return head(title("Tamaya Configuration - " + config.getName() + " " +
config.getVersion()),
meta().withCharset("utf-8"),
diff --git
a/documentation/src/main/java/org/apache/tamaya/doc/formats/TextDocFormat.java
b/documentation/src/main/java/org/apache/tamaya/doc/formats/TextDocFormat.java
index f818655..1db6900 100644
---
a/documentation/src/main/java/org/apache/tamaya/doc/formats/TextDocFormat.java
+++
b/documentation/src/main/java/org/apache/tamaya/doc/formats/TextDocFormat.java
@@ -19,8 +19,8 @@
package org.apache.tamaya.doc.formats;
import org.apache.tamaya.doc.DocFormat;
-import org.apache.tamaya.doc.ConfigurationDocumentation;
import org.apache.tamaya.doc.DocumentedArea;
+import org.apache.tamaya.doc.DocumentedConfiguration;
import org.apache.tamaya.doc.DocumentedProperty;
import java.lang.reflect.AnnotatedElement;
@@ -35,7 +35,7 @@ import java.util.stream.Stream;
*/
public class TextDocFormat implements DocFormat<String> {
@Override
- public String apply(ConfigurationDocumentation documentedConfiguration) {
+ public String apply(DocumentedConfiguration documentedConfiguration) {
StringBuilder b = new StringBuilder();
b.append("Configuration:\n");
b.append(" Spec :
").append(documentedConfiguration.getName()).append('\n');
diff --git
a/documentation/src/test/java/org/apache/tamaya/doc/AnnotatedDocConfigBean.java
b/documentation/src/test/java/org/apache/tamaya/doc/AnnotatedDocConfigBean.java
index a47358a..3e3da41 100644
---
a/documentation/src/test/java/org/apache/tamaya/doc/AnnotatedDocConfigBean.java
+++
b/documentation/src/test/java/org/apache/tamaya/doc/AnnotatedDocConfigBean.java
@@ -21,7 +21,10 @@ package org.apache.tamaya.doc;
import org.apache.tamaya.doc.annot.ConfigAreaSpec;
import org.apache.tamaya.doc.annot.ConfigPropertySpec;
import org.apache.tamaya.doc.annot.ConfigSpec;
-import org.apache.tamaya.inject.api.*;
+import org.apache.tamaya.inject.api.Config;
+import org.apache.tamaya.inject.api.ConfigSection;
+import org.apache.tamaya.inject.api.DynamicValue;
+import org.apache.tamaya.inject.api.NoConfig;
import org.apache.tamaya.spi.PropertyValue;
import java.util.ArrayList;
@@ -56,7 +59,7 @@ public class AnnotatedDocConfigBean {
String anotherValue;
@ConfigPropertySpec(description = "An explicit config parameter value.")
- @Config(key = "host.name", keyResolver = KeyResolution.ABSOLUTE)
+ @Config(key = "[host.name]")
private String hostName;
@ConfigPropertySpec(description = "An non String typed instance.")
diff --git
a/documentation/src/test/java/org/apache/tamaya/doc/ConfigDocumenterTest.java
b/documentation/src/test/java/org/apache/tamaya/doc/ConfigDocumenterTest.java
index 0f02db6..d0ec0e1 100644
---
a/documentation/src/test/java/org/apache/tamaya/doc/ConfigDocumenterTest.java
+++
b/documentation/src/test/java/org/apache/tamaya/doc/ConfigDocumenterTest.java
@@ -22,7 +22,8 @@ import org.apache.tamaya.doc.formats.HtmlDocFormat;
import org.apache.tamaya.doc.formats.TextDocFormat;
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
+
public class ConfigDocumenterTest {
@@ -30,7 +31,7 @@ public class ConfigDocumenterTest {
public void getDocumentationAndPrint_ConfigBean() {
ConfigDocumenter reader = new ConfigDocumenter();
reader.readClasses(AnnotatedDocConfigBean.class);
- ConfigurationDocumentation documentation = reader.getDocumentation();
+ DocumentedConfiguration documentation = reader.getDocumentation();
assertThat(documentation).isNotNull();
System.out.println(new TextDocFormat().apply(documentation));
}
@@ -39,7 +40,7 @@ public class ConfigDocumenterTest {
public void getDocumentationAndPrint_AnnotationType() {
ConfigDocumenter reader = new ConfigDocumenter();
reader.readClasses(AnnotBasedStandaloneConfigDocumentation.class);
- ConfigurationDocumentation documentation = reader.getDocumentation();
+ DocumentedConfiguration documentation = reader.getDocumentation();
assertThat(documentation).isNotNull();
System.out.println(new TextDocFormat().apply(documentation));
}
@@ -48,7 +49,7 @@ public class ConfigDocumenterTest {
public void getDocumentationAndPrint_Package() {
ConfigDocumenter reader = new ConfigDocumenter();
reader.readPackages("org.apache.tamaya.doc");
- ConfigurationDocumentation documentation = reader.getDocumentation();
+ DocumentedConfiguration documentation = reader.getDocumentation();
assertThat(documentation).isNotNull();
System.out.println(new TextDocFormat().apply(documentation));
}
@@ -57,7 +58,7 @@ public class ConfigDocumenterTest {
public void getDocumentationAndPrint_Package_html() {
ConfigDocumenter reader = new ConfigDocumenter();
reader.readPackages("org.apache.tamaya.doc");
- ConfigurationDocumentation documentation = reader.getDocumentation();
+ DocumentedConfiguration documentation = reader.getDocumentation();
assertThat(documentation).isNotNull();
System.out.println(new HtmlDocFormat().apply(documentation));
}
