Repository: zest-java Updated Branches: refs/heads/develop 45624ba49 -> 2646148c6
Exclude "Did you mean @Service injection scope?" when Service injection scope was actually used. Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/2646148c Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/2646148c Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/2646148c Branch: refs/heads/develop Commit: 2646148c64ef357a379ecc20844eb77dba19ed17 Parents: 45624ba Author: Niclas Hedhman <[email protected]> Authored: Fri Apr 15 07:55:55 2016 +0800 Committer: Niclas Hedhman <[email protected]> Committed: Fri Apr 15 07:55:55 2016 +0800 ---------------------------------------------------------------------- .../apache/zest/runtime/injection/DependencyModel.java | 11 +++++++++-- .../provider/ServiceInjectionProviderFactory.java | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/2646148c/core/runtime/src/main/java/org/apache/zest/runtime/injection/DependencyModel.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/injection/DependencyModel.java b/core/runtime/src/main/java/org/apache/zest/runtime/injection/DependencyModel.java index 73381bb..329be76 100644 --- a/core/runtime/src/main/java/org/apache/zest/runtime/injection/DependencyModel.java +++ b/core/runtime/src/main/java/org/apache/zest/runtime/injection/DependencyModel.java @@ -30,6 +30,7 @@ import org.apache.zest.functional.Iterables; import org.apache.zest.functional.Visitable; import org.apache.zest.functional.Visitor; import org.apache.zest.runtime.injection.provider.InjectionProviderException; +import org.apache.zest.runtime.injection.provider.ServiceInjectionProviderFactory; import org.apache.zest.runtime.model.Binder; import org.apache.zest.runtime.model.Resolution; @@ -297,7 +298,8 @@ public final class DependencyModel String message = "[Module " + context.module().name() + "] Non-optional @" + simpleName + " " + injectionType.toString() + " was null in " + injectedClass.getName(); - if( simpleName.toLowerCase().contains( "service" ) ) + if( simpleName.toLowerCase().contains( "service" ) + && !isServiceInjectionProvider() ) { message = message + ". Did you mean the @Service injection scope?"; } @@ -306,6 +308,11 @@ public final class DependencyModel return getInjectedValue( injectedValue ); } + private boolean isServiceInjectionProvider() + { + return ServiceInjectionProviderFactory.ServiceInjectionProvider.class.isAssignableFrom( injectionProvider.getClass() ); + } + @SuppressWarnings( "unchecked" ) private Object getInjectedValue( Object injectionResult ) { @@ -345,7 +352,7 @@ public final class DependencyModel double.class, Double.class, float.class, Float.class, int.class, Integer.class, - }; + }; private Class<?> mapPrimitiveTypes( Class<?> rawInjectionType ) { http://git-wip-us.apache.org/repos/asf/zest-java/blob/2646148c/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ServiceInjectionProviderFactory.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ServiceInjectionProviderFactory.java b/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ServiceInjectionProviderFactory.java index 4a7d455..c44807d 100644 --- a/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ServiceInjectionProviderFactory.java +++ b/core/runtime/src/main/java/org/apache/zest/runtime/injection/provider/ServiceInjectionProviderFactory.java @@ -176,7 +176,7 @@ public final class ServiceInjectionProviderFactory } } - private abstract static class ServiceInjectionProvider + public abstract static class ServiceInjectionProvider implements InjectionProvider { private final Type serviceType;
