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/10/29 13:33:21 UTC
[2/2] incubator-tamaya git commit: Quality fixes.
Quality 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/ceffee08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/ceffee08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/ceffee08
Branch: refs/heads/master
Commit: ceffee089884d76cca49e81f141e6a5cbffb23db
Parents: bc3c94a
Author: Anatole Tresch <an...@apache.org>
Authored: Thu Oct 29 13:33:13 2015 +0100
Committer: Anatole Tresch <an...@apache.org>
Committed: Thu Oct 29 13:33:13 2015 +0100
----------------------------------------------------------------------
.../aspache/tamaya/examples/fileobserver/TestConfigView.java | 5 ++++-
.../org/apache/tamaya/integration/osgi/general/Activator.java | 6 ++++--
.../integration/osgi/general/TamayaConfigAdminImpl.java | 7 ++++++-
3 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ceffee08/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
----------------------------------------------------------------------
diff --git a/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java b/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
index 06a7733..0fdecbb 100644
--- a/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
+++ b/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
@@ -24,6 +24,7 @@ import org.apache.tamaya.ConfigQuery;
import org.apache.tamaya.Configuration;
import org.apache.tamaya.ConfigurationProvider;
import org.apache.tamaya.TypeLiteral;
+import org.apache.tamaya.spi.ConversionContext;
import org.apache.tamaya.spi.PropertyConverter;
import java.util.List;
@@ -109,9 +110,11 @@ public class TestConfigView implements ConfigOperator{
if (value != null) {
List<PropertyConverter<T>> converters = ConfigurationProvider.getConfigurationContext()
.getPropertyConverters(type);
+ ConversionContext ctx = new ConversionContext.Builder(ConfigurationProvider.getConfiguration(),
+ key, type).build();
for (PropertyConverter<T> converter : converters) {
try {
- T t = converter.convert(value);
+ T t = converter.convert(value, ctx);
if (t != null) {
return t;
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ceffee08/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/Activator.java
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/Activator.java b/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/Activator.java
index 564ac8a..c896c73 100644
--- a/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/Activator.java
+++ b/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/Activator.java
@@ -18,8 +18,10 @@
*/
package org.apache.tamaya.integration.osgi.general;
-import org.apache.tamaya.inject.ConfigurationInjection;
-import org.osgi.framework.*;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceRegistration;
import org.osgi.service.cm.ConfigurationAdmin;
import java.util.Dictionary;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ceffee08/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/TamayaConfigAdminImpl.java
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/TamayaConfigAdminImpl.java b/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/TamayaConfigAdminImpl.java
index 6a75dfe..8454e08 100644
--- a/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/TamayaConfigAdminImpl.java
+++ b/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/TamayaConfigAdminImpl.java
@@ -26,7 +26,12 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.osgi.framework.*;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Filter;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceFactory;
+import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.cm.ManagedService;