Fixing member injector visibility issues

stephanenicolas · Jun 23, 2016 · 7275441 · 7275441
1 parent cce7cfe
commit 7275441
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/...r/src/main/java/toothpick/compiler/memberinjector/generators/MemberInjectorGenerator.java b/...r/src/main/java/toothpick/compiler/memberinjector/generators/MemberInjectorGenerator.java
@@ -62,10 +62,8 @@ public String brewJava() {
   private void emitSuperMemberInjectorFieldIfNeeded(TypeSpec.Builder scopeMemberTypeSpec) {
     if (superClassThatNeedsInjection != null) {
       ClassName superTypeThatNeedsInjection = ClassName.get(superClassThatNeedsInjection);
-      ParameterizedTypeName memberInjectorSuperParameterizedTypeName =
-          ParameterizedTypeName.get(ClassName.get(MemberInjector.class), superTypeThatNeedsInjection);
       FieldSpec.Builder superMemberInjectorField =
-          FieldSpec.builder(memberInjectorSuperParameterizedTypeName, "superMemberInjector", Modifier.PRIVATE)
+          FieldSpec.builder(MemberInjector.class, "superMemberInjector", Modifier.PRIVATE)
               //TODO use proper typing here
               .initializer("new $L$$$$MemberInjector()", superTypeThatNeedsInjection);
       scopeMemberTypeSpec.addField(superMemberInjectorField.build());

diff --git a/...ick-compiler/src/test/java/toothpick/compiler/memberinjector/FieldMemberInjectorTest.java b/...ick-compiler/src/test/java/toothpick/compiler/memberinjector/FieldMemberInjectorTest.java
@@ -450,7 +450,7 @@ public void testMemberInjection_shouldInjectAsAnInstanceOfSuperClass_whenSuperCl
         "import toothpick.Scope;", //
         "", //
         "public final class TestMemberInjection$$MemberInjector implements MemberInjector<TestMemberInjection> {", //
-        "  private MemberInjector<TestMemberInjectionParent> superMemberInjector " + "= new test.TestMemberInjectionParent$$MemberInjector();",
+        "  private MemberInjector superMemberInjector " + "= new test.TestMemberInjectionParent$$MemberInjector();",
         //
         "  @Override", //
         "  public void inject(TestMemberInjection target, Scope scope) {", //

diff --git a/...ck-compiler/src/test/java/toothpick/compiler/memberinjector/MethodMemberInjectorTest.java b/...ck-compiler/src/test/java/toothpick/compiler/memberinjector/MethodMemberInjectorTest.java
@@ -92,7 +92,7 @@ public void testOverrideMethodInjection() {
             "public final class TestMethodInjectionParent$TestMethodInjection$$MemberInjector "
                 + "implements MemberInjector<TestMethodInjectionParent.TestMethodInjection> {",
             //
-            "  private MemberInjector<TestMethodInjectionParent> superMemberInjector = new test.TestMethodInjectionParent$$MemberInjector();\n", //
+            "  private MemberInjector superMemberInjector = new test.TestMethodInjectionParent$$MemberInjector();\n", //
             "  @Override", //
             "  public void inject(TestMethodInjectionParent.TestMethodInjection target, Scope scope) {", //
             "    superMemberInjector.inject(target, scope);", //