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 2015/04/29 22:03:19 UTC
incubator-tamaya git commit: patch for synthetic field evaluation.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master 994f5ffd0 -> da1a31712
patch for synthetic field evaluation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/da1a3171
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/da1a3171
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/da1a3171
Branch: refs/heads/master
Commit: da1a317128a1de56b90557cb8e834399a20e65f5
Parents: 994f5ff
Author: anatole <an...@apache.org>
Authored: Wed Apr 29 22:03:07 2015 +0200
Committer: anatole <an...@apache.org>
Committed: Wed Apr 29 22:03:07 2015 +0200
----------------------------------------------------------------------
docs/images/Thumbs.db | Bin 308224 -> 310784 bytes
.../tamaya/inject/internal/ConfiguredType.java | 10 ++++++++++
.../java/annottext/AnnotatedConfigBean.java | 3 +++
3 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/da1a3171/docs/images/Thumbs.db
----------------------------------------------------------------------
diff --git a/docs/images/Thumbs.db b/docs/images/Thumbs.db
index ce5e659..2dfc4e5 100644
Binary files a/docs/images/Thumbs.db and b/docs/images/Thumbs.db differ
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/da1a3171/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredType.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredType.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredType.java
index 2932e04..dd773fb 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredType.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredType.java
@@ -20,6 +20,7 @@ package org.apache.tamaya.inject.internal;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.util.*;
import org.apache.tamaya.ConfigException;
@@ -70,6 +71,12 @@ public class ConfiguredType {
if (f.isAnnotationPresent(NoConfig.class)) {
continue;
}
+ if (Modifier.isFinal(f.getModifiers())) {
+ continue;
+ }
+ if (f.isSynthetic()) {
+ continue;
+ }
try {
ConfiguredField configuredField = new ConfiguredField(f);
configuredFields.add(configuredField);
@@ -86,6 +93,9 @@ public class ConfiguredType {
if (m.isAnnotationPresent(NoConfig.class)) {
continue;
}
+ if (m.isSynthetic()) {
+ continue;
+ }
ObservesConfigChange mAnnot = m.getAnnotation(ObservesConfigChange.class);
ConfiguredProperty prop = m.getAnnotation(ConfiguredProperty.class);
if (type.isInterface()) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/da1a3171/modules/injection/src/test/java/annottext/AnnotatedConfigBean.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/test/java/annottext/AnnotatedConfigBean.java b/modules/injection/src/test/java/annottext/AnnotatedConfigBean.java
index 94eb570..4cbf321 100644
--- a/modules/injection/src/test/java/annottext/AnnotatedConfigBean.java
+++ b/modules/injection/src/test/java/annottext/AnnotatedConfigBean.java
@@ -62,4 +62,7 @@ public class AnnotatedConfigBean {
return dynamicHostname;
}
+ // verify we don't try to inject final fields
+ public static final String CONSTANT = "a constant";
+
}