Merge branch 'NOJIRA-get-compilation-clean' of https://github.com/peculater/incubator-tamaya-extensions
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/4ebf7c2f Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/4ebf7c2f Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/4ebf7c2f Branch: refs/heads/master Commit: 4ebf7c2f6e3e8c1dcf3b55b182e67b89c399b1a0 Parents: beb3555 0213e7f Author: Phil Ottlinger <[email protected]> Authored: Wed Nov 21 20:20:39 2018 +0100 Committer: Phil Ottlinger <[email protected]> Committed: Wed Nov 21 20:20:39 2018 +0100 ---------------------------------------------------------------------- .../hazelcast/HazelcastPropertySource.java | 12 -- .../hazelcast/HazelcastPropertySourceTest.java | 206 +++++++++++++++++++ .../hazelcast/HazelcaszPropertySourceTest.java | 204 ------------------ .../tamaya/inject/internal/InjectionHelper.java | 7 +- 4 files changed, 211 insertions(+), 218 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/4ebf7c2f/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java ---------------------------------------------------------------------- diff --cc modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java index ba37bdd,8e01f9b..daedacb --- a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java +++ b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java @@@ -38,9 -38,13 +38,12 @@@ import org.apache.tamaya.inject.spi.Inj import org.apache.tamaya.inject.api.WithPropertyConverter; import org.apache.tamaya.inject.spi.ConfiguredType; import org.apache.tamaya.resolver.spi.ExpressionEvaluator; - import org.apache.tamaya.spi.*; - + import org.apache.tamaya.spi.ConfigurationContext; + import org.apache.tamaya.spi.ConversionContext; + import org.apache.tamaya.spi.PropertyConverter; + import org.apache.tamaya.spi.PropertyValue; + import org.apache.tamaya.spi.ServiceContextManager; - /** * Utility class containing several aspects used in this module. */
