TAMAYA-323: Migrate to Microprofile config 1.2 Migrate to new ConfigurationBuilder and adapt to new microprofile version 1.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/3e1a1210 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/3e1a1210 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/3e1a1210 Branch: refs/heads/master Commit: 3e1a121022a719d88916475d5f0f5e4b4017f61c Parents: ec53940 Author: Phil Ottlinger <[email protected]> Authored: Tue Feb 20 22:33:19 2018 +0100 Committer: Phil Ottlinger <[email protected]> Committed: Tue Feb 20 22:33:19 2018 +0100 ---------------------------------------------------------------------- modules/microprofile/pom.xml | 2 +- .../microprofile/MicroprofileAdapter.java | 26 +++--- .../tamaya/microprofile/MicroprofileConfig.java | 3 +- .../microprofile/MicroprofileConfigBuilder.java | 92 ++++++++++++-------- .../MicroprofileConfigProviderResolver.java | 14 +-- .../MicroprofileConfigSourceProvider.java | 18 +--- .../converter/BooleanAsIntegerConverterFix.java | 11 +-- .../converter/ProviderConverter.java | 29 +++--- .../microprofile/BuildableConfigSource.java | 10 ++- .../microprofile/MicroprofileAdapterTest.java | 2 +- 10 files changed, 109 insertions(+), 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/3e1a1210/modules/microprofile/pom.xml ---------------------------------------------------------------------- diff --git a/modules/microprofile/pom.xml b/modules/microprofile/pom.xml index 86b6889..c2a46d4 100644 --- a/modules/microprofile/pom.xml +++ b/modules/microprofile/pom.xml @@ -32,7 +32,7 @@ under the License. <properties> <maven.compile.sourceLevel>1.8</maven.compile.sourceLevel> <maven.compile.targetLevel>1.8</maven.compile.targetLevel> - <microprofile.config.version>1.1</microprofile.config.version> + <microprofile.config.version>1.2</microprofile.config.version> <geronimo-atinject-1.0-spec.version>1.0</geronimo-atinject-1.0-spec.version> <geronimo-jcdi-1.1-spec.version>1.0</geronimo-jcdi-1.1-spec.version> <version.shrinkwrap.resolvers>2.2.6</version.shrinkwrap.resolvers> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/3e1a1210/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java ---------------------------------------------------------------------- diff --git a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java index 8f5002c..66e5112 100644 --- a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java +++ b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileAdapter.java @@ -19,8 +19,14 @@ package org.apache.tamaya.microprofile; -import org.apache.tamaya.*; -import org.apache.tamaya.spi.ConfigurationContextBuilder; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.tamaya.Configuration; +import org.apache.tamaya.spi.ConfigurationBuilder; import org.apache.tamaya.spi.PropertyConverter; import org.apache.tamaya.spi.PropertySource; import org.apache.tamaya.spi.PropertyValue; @@ -29,8 +35,6 @@ import org.eclipse.microprofile.config.spi.ConfigBuilder; import org.eclipse.microprofile.config.spi.ConfigSource; import org.eclipse.microprofile.config.spi.Converter; -import java.util.*; - /** * Utility class for adapting microprofile artifacts into Tamaya artifacts and vice versa. */ @@ -122,11 +126,12 @@ public final class MicroprofileAdapter{ * @param <T> the target type * @return the corresponding Tamaya {@link PropertyConverter} instance, never null. */ - public static <T> PropertyConverter<T> toPropertyConverter(Converter<T> converter) { + @SuppressWarnings({ "rawtypes", "unchecked" }) + public static <T> PropertyConverter<T> toPropertyConverter(Converter<T> converter) { if(converter instanceof MicroprofileConverter){ return ((MicroprofileConverter)converter).getPropertyConverter(); } - return new TamayaPropertyConverter(converter); + return new TamayaPropertyConverter<T>(converter); } /** @@ -135,7 +140,8 @@ public final class MicroprofileAdapter{ * @param <T> the target type * @return the corresponding Microprofile.io {@link Converter} instance, never null. */ - public static <T> Converter<T> toConverter(PropertyConverter<T> converter) { + @SuppressWarnings({ "rawtypes", "unchecked" }) + public static <T> Converter<T> toConverter(PropertyConverter<T> converter) { if(converter instanceof TamayaPropertyConverter){ return ((TamayaPropertyConverter)converter).getConverter(); } @@ -143,11 +149,11 @@ public final class MicroprofileAdapter{ } /** - * Converts a Tamaya {@link ConfigurationContextBuilder} into a Microprofile.io {@link ConfigBuilder}. - * @param builder the Tamaya {@link ConfigurationContextBuilder} instance, not null. + * Converts a Tamaya {@link ConfigurationBuilder} into a Microprofile.io {@link ConfigBuilder}. + * @param builder the Tamaya {@link ConfigurationBuilder} instance, not null. * @return the corresponding Microprofile.io {@link ConfigBuilder} instance, never null. */ - public static ConfigBuilder toConfigBuilder(ConfigurationContextBuilder builder) { + public static ConfigBuilder toConfigBuilder(ConfigurationBuilder builder) { return new MicroprofileConfigBuilder(builder); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/3e1a1210/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfig.java ---------------------------------------------------------------------- diff --git a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfig.java b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfig.java index 61c3cdc..103a8af 100644 --- a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfig.java +++ b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfig.java @@ -36,7 +36,8 @@ import java.util.*; */ public class MicroprofileConfig implements Config, Serializable { - private Configuration delegate; + private static final long serialVersionUID = -2811635734899431816L; + private Configuration delegate; public MicroprofileConfig(Configuration delegate){ this.delegate = Objects.requireNonNull(delegate); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/3e1a1210/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java ---------------------------------------------------------------------- diff --git a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java index 82209c3..8e0f22f 100644 --- a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java +++ b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigBuilder.java @@ -18,12 +18,14 @@ */ package org.apache.tamaya.microprofile; +import java.util.Objects; + import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.TypeLiteral; -import org.apache.tamaya.spi.ConfigurationContextBuilder; +import org.apache.tamaya.spi.ConfigurationBuilder; import org.apache.tamaya.spi.ServiceContextManager; -import org.apache.tamaya.spisupport.propertysource.EnvironmentPropertySource; import org.apache.tamaya.spisupport.PropertySourceComparator; +import org.apache.tamaya.spisupport.propertysource.EnvironmentPropertySource; import org.apache.tamaya.spisupport.propertysource.SystemPropertySource; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigBuilder; @@ -31,27 +33,26 @@ import org.eclipse.microprofile.config.spi.ConfigSource; import org.eclipse.microprofile.config.spi.ConfigSourceProvider; import org.eclipse.microprofile.config.spi.Converter; -import java.util.Objects; - /** * Created by atsticks on 23.03.17. */ -final class MicroprofileConfigBuilder implements ConfigBuilder{ +final class MicroprofileConfigBuilder implements ConfigBuilder { + + private ConfigurationBuilder configurationBuilder; + @SuppressWarnings("unused") + private ClassLoader classloader; - private ConfigurationContextBuilder contextBuilder; - private ClassLoader classLoader; - - MicroprofileConfigBuilder(ConfigurationContextBuilder contextBuilder){ - this.contextBuilder = Objects.requireNonNull(contextBuilder); - contextBuilder.addDefaultPropertyConverters(); + MicroprofileConfigBuilder(ConfigurationBuilder configurationBuilder){ + this.configurationBuilder = Objects.requireNonNull(configurationBuilder); + configurationBuilder.addDefaultPropertyConverters(); } - - public ConfigurationContextBuilder getConfigurationContextBuilder(){ - return contextBuilder; + + public ConfigurationBuilder getConfigurationBuilder() { + return configurationBuilder; } /** - * Add the default config sources appearing on the builder's classpath + * Add the default configuration sources appearing on the builder's classpath * including: * <ol> * <li>System properties</li> @@ -59,46 +60,51 @@ final class MicroprofileConfigBuilder implements ConfigBuilder{ * <li>/META-INF/microprofile-config.properties</li> * </ol> * - * @return the ConfigBuilder with the default config sources + * @return the ConfigBuilder with the default configuration sources */ @Override public ConfigBuilder addDefaultSources() { - contextBuilder.addPropertySources( - new SystemPropertySource(400), - new EnvironmentPropertySource(300), - new MicroprofileDefaultProperties()); - contextBuilder.sortPropertySources(PropertySourceComparator.getInstance()); + + configurationBuilder.addPropertySources( + new SystemPropertySource(400), // + new EnvironmentPropertySource(300), // + new MicroprofileDefaultProperties() // + ); + configurationBuilder.sortPropertySources(PropertySourceComparator.getInstance()); return this; } /** * Add ConfigSources registered using the ServiceLoader. - * @return the ConfigBuilder with the added config sources + * @return the ConfigBuilder with the added configuration sources */ @Override public ConfigBuilder addDiscoveredSources() { for(ConfigSource configSource: ServiceContextManager.getServiceContext().getServices(ConfigSource.class)){ - contextBuilder.addPropertySources(MicroprofileAdapter.toPropertySource(configSource)); + configurationBuilder.addPropertySources(MicroprofileAdapter.toPropertySource(configSource)); } + for(ConfigSourceProvider configSourceProvider: ServiceContextManager.getServiceContext().getServices(ConfigSourceProvider.class)){ - contextBuilder.addPropertySources(MicroprofileAdapter.toPropertySources(configSourceProvider.getConfigSources( + configurationBuilder.addPropertySources(MicroprofileAdapter.toPropertySources(configSourceProvider.getConfigSources( Thread.currentThread().getContextClassLoader() ))); } - contextBuilder.sortPropertySources(PropertySourceComparator.getInstance()); + configurationBuilder.sortPropertySources(PropertySourceComparator.getInstance()); return this; } /** * Add Converters registered using the ServiceLoader. - * @return the ConfigBuilder with the added config converters + * @return the ConfigBuilder with the added configuration converters */ - @Override + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override public ConfigBuilder addDiscoveredConverters() { for(Converter<?> converter: ServiceContextManager.getServiceContext().getServices(Converter.class)){ - TypeLiteral targetType = TypeLiteral.of( + TypeLiteral targetType = TypeLiteral.of( TypeLiteral.getGenericInterfaceTypeParameters(converter.getClass(),Converter.class)[0]); - contextBuilder.addPropertyConverters(targetType, + + configurationBuilder.addPropertyConverters(targetType, MicroprofileAdapter.toPropertyConverter(converter)); } return this; @@ -106,35 +112,45 @@ final class MicroprofileConfigBuilder implements ConfigBuilder{ @Override public ConfigBuilder forClassLoader(ClassLoader loader) { - this.classLoader = loader; + this.classloader = loader; return this; } @Override public ConfigBuilder withSources(ConfigSource... sources) { for(ConfigSource source:sources){ - contextBuilder.addPropertySources(MicroprofileAdapter.toPropertySource(source)); + configurationBuilder.addPropertySources(MicroprofileAdapter.toPropertySource(source)); } return this; } - @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Override public ConfigBuilder withConverters(Converter<?>... converters) { for(Converter<?> converter:converters){ TypeLiteral lit = TypeLiteral.of(converter.getClass()); TypeLiteral target = TypeLiteral.of(lit.getType()); - contextBuilder.removePropertyConverters(target); - contextBuilder.addPropertyConverters( - target, + + configurationBuilder.removePropertyConverters(target); + configurationBuilder.addPropertyConverters(target, MicroprofileAdapter.toPropertyConverter(converter)); } return this; } + @SuppressWarnings("unchecked") + @Override + public <T> ConfigBuilder withConverter(Class<T> type, int priority, Converter<T> converter) { + configurationBuilder.addPropertyConverters(TypeLiteral.of(type.getClass()), MicroprofileAdapter.toPropertyConverter(converter)); + return this; + } + @Override public Config build() { - return MicroprofileAdapter.toConfig(ConfigurationProvider.createConfiguration( - contextBuilder.build() - )); + ConfigurationProvider.setConfiguration( + getConfigurationBuilder().build()); + + return MicroprofileAdapter.toConfig(ConfigurationProvider.getConfiguration()); } + } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/3e1a1210/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigProviderResolver.java ---------------------------------------------------------------------- diff --git a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigProviderResolver.java b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigProviderResolver.java index 92a928a..3be49a1 100644 --- a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigProviderResolver.java +++ b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigProviderResolver.java @@ -18,16 +18,16 @@ */ package org.apache.tamaya.microprofile; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Logger; + import org.apache.tamaya.ConfigurationProvider; -import org.apache.tamaya.spi.ConfigurationContextBuilder; +import org.apache.tamaya.spi.ConfigurationBuilder; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.spi.ConfigBuilder; import org.eclipse.microprofile.config.spi.ConfigProviderResolver; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Logger; - /** * Created by atsticks on 23.03.17. */ @@ -44,7 +44,7 @@ public class MicroprofileConfigProviderResolver extends ConfigProviderResolver { public Config getConfig(ClassLoader loader) { Config config = this.configs.get(loader); if(config==null){ - ConfigurationContextBuilder builder = ConfigurationProvider.getConfigurationContextBuilder(); + ConfigurationBuilder builder = ConfigurationProvider.getConfigurationBuilder(); builder.addDefaultPropertyConverters(); MicroprofileConfigBuilder microConfigBuilder = new MicroprofileConfigBuilder(builder); microConfigBuilder.addDefaultSources(); @@ -57,7 +57,7 @@ public class MicroprofileConfigProviderResolver extends ConfigProviderResolver { @Override public ConfigBuilder getBuilder() { - return new MicroprofileConfigBuilder(ConfigurationProvider.getConfigurationContextBuilder()); + return new MicroprofileConfigBuilder(ConfigurationProvider.getConfigurationBuilder()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/3e1a1210/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigSourceProvider.java ---------------------------------------------------------------------- diff --git a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigSourceProvider.java b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigSourceProvider.java index 5176940..c2dd229 100644 --- a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigSourceProvider.java +++ b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/MicroprofileConfigSourceProvider.java @@ -18,14 +18,13 @@ */ package org.apache.tamaya.microprofile; +import java.util.Objects; + import org.apache.tamaya.spi.PropertySource; import org.apache.tamaya.spi.PropertySourceProvider; -import org.apache.tamaya.spi.PropertyValue; import org.eclipse.microprofile.config.spi.ConfigSource; import org.eclipse.microprofile.config.spi.ConfigSourceProvider; -import java.util.*; - /** * Microprofile {@link ConfigSource} implementation that wraps a {@link PropertySource} instance. */ @@ -41,23 +40,12 @@ public class MicroprofileConfigSourceProvider implements ConfigSourceProvider{ return this.delegate; } - - private Map<String, String> toMap(Map<String, PropertyValue> properties) { - Map<String, String> valueMap = new HashMap<>(properties.size()); - for(Map.Entry<String,PropertyValue> en:properties.entrySet()){ - if(en.getValue().getValue()!=null) { - valueMap.put(en.getKey(), en.getValue().getValue()); - } - } - return valueMap; - } - @Override public Iterable<ConfigSource> getConfigSources(ClassLoader forClassLoader) { if(delegate instanceof TamayaPropertySourceProvider){ return ((TamayaPropertySourceProvider)delegate).getConfigSourceProvider() .getConfigSources(forClassLoader); - }else { + } else { return MicroprofileAdapter.toConfigSources(delegate.getPropertySources()); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/3e1a1210/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/BooleanAsIntegerConverterFix.java ---------------------------------------------------------------------- diff --git a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/BooleanAsIntegerConverterFix.java b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/BooleanAsIntegerConverterFix.java index 1debc71..8f292bb 100644 --- a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/BooleanAsIntegerConverterFix.java +++ b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/BooleanAsIntegerConverterFix.java @@ -18,13 +18,12 @@ */ package org.apache.tamaya.microprofile.converter; -import org.apache.tamaya.spi.ConversionContext; -import org.apache.tamaya.spi.PropertyConverter; +import java.util.Objects; import javax.annotation.Priority; -import java.util.Locale; -import java.util.Objects; -import java.util.logging.Logger; + +import org.apache.tamaya.spi.ConversionContext; +import org.apache.tamaya.spi.PropertyConverter; /** * Converter, converting from String to Boolean for 1 = true, otherwise false. @@ -32,8 +31,6 @@ import java.util.logging.Logger; @Priority(-1) public class BooleanAsIntegerConverterFix implements PropertyConverter<Boolean> { - private final Logger LOG = Logger.getLogger(getClass().getName()); - @Override public Boolean convert(String value, ConversionContext context) { context.addSupportedFormats(getClass(), "'1' (true), otherwise false."); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/3e1a1210/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java ---------------------------------------------------------------------- diff --git a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java index 163481d..0bd13ba 100644 --- a/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java +++ b/modules/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java @@ -18,6 +18,15 @@ */ package org.apache.tamaya.microprofile.converter; +import java.lang.reflect.Type; +import java.util.List; +import java.util.Objects; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.annotation.Priority; +import javax.inject.Provider; + import org.apache.tamaya.ConfigException; import org.apache.tamaya.ConfigQuery; import org.apache.tamaya.Configuration; @@ -25,28 +34,19 @@ import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.ConversionContext; import org.apache.tamaya.spi.PropertyConverter; -import javax.annotation.Priority; -import javax.inject.Provider; -import java.lang.reflect.Type; -import java.util.List; -import java.util.Objects; -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * Converter, converting from String to Boolean for 1 = true, otherwise false. - */ +@SuppressWarnings("rawtypes") @Priority(-1) public class ProviderConverter implements PropertyConverter<Provider> { private static final Logger LOG = Logger.getLogger(ProviderConverter.class.getName()); - @Override + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override public Provider convert(String value, ConversionContext context) { return () -> { try{ Type targetType = context.getTargetType().getType(); - ConvertQuery converter = new ConvertQuery(value, TypeLiteral.of(targetType)); + ConvertQuery converter = new ConvertQuery(value, TypeLiteral.of(targetType)); return context.getConfiguration().query(converter); }catch(Exception e){ throw new ConfigException("Error evaluating config value.", e); @@ -84,7 +84,8 @@ public class ProviderConverter implements PropertyConverter<Provider> { if(conv instanceof ProviderConverter){ continue; } - T result = (T)conv.convert(rawValue, context); + @SuppressWarnings("unchecked") + T result = (T)conv.convert(rawValue, context); if(result!=null){ return result; } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/3e1a1210/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/BuildableConfigSource.java ---------------------------------------------------------------------- diff --git a/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/BuildableConfigSource.java b/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/BuildableConfigSource.java index 751a866..abca900 100644 --- a/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/BuildableConfigSource.java +++ b/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/BuildableConfigSource.java @@ -18,11 +18,13 @@ */ package org.apache.tamaya.microprofile; -import org.apache.tamaya.spi.PropertySource; -import org.apache.tamaya.spi.PropertyValue; -import org.eclipse.microprofile.config.spi.ConfigSource; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.UUID; -import java.util.*; +import org.eclipse.microprofile.config.spi.ConfigSource; /** * The Buildable config source. http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/3e1a1210/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/MicroprofileAdapterTest.java ---------------------------------------------------------------------- diff --git a/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/MicroprofileAdapterTest.java b/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/MicroprofileAdapterTest.java index a8e8488..d885621 100644 --- a/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/MicroprofileAdapterTest.java +++ b/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/MicroprofileAdapterTest.java @@ -154,7 +154,7 @@ public class MicroprofileAdapterTest { @Test public void toConfigBuilder() throws Exception { - ConfigBuilder builder = MicroprofileAdapter.toConfigBuilder(ConfigurationProvider.getConfigurationContextBuilder()); + ConfigBuilder builder = MicroprofileAdapter.toConfigBuilder(ConfigurationProvider.getConfigurationBuilder()); assertNotNull(builder); }
