generate public factory and builder method when component is public

Author: h908714124

compiler/src/main/java/io/jbock/simple/processor/writing/ComponentImpl.java

@@ -48,9 +48,11 @@ private ComponentImpl(
     }
 
     TypeSpec generate() {
-        TypeSpec.Builder spec = TypeSpec.classBuilder(component.generatedClass()).addSuperinterface(component.element().asType());
-        spec.addModifiers(component.element().getModifiers().stream()
-                .filter(m -> m == PUBLIC || m == PROTECTED).toArray(Modifier[]::new));
+        Modifier[] modifiers = component.element().getModifiers().stream()
+                .filter(m -> m == PUBLIC).toArray(Modifier[]::new);
+        TypeSpec.Builder spec = TypeSpec.classBuilder(component.generatedClass())
+                .addModifiers(modifiers)
+                .addSuperinterface(component.element().asType());
         MethodSpec.Builder constructor = MethodSpec.constructorBuilder().addModifiers(PRIVATE);
         for (NamedBinding namedBinding : sorted.values()) {
             Binding b = namedBinding.binding();
@@ -73,16 +75,13 @@ TypeSpec generate() {
             method.addStatement("return $L", sorted.get(r.key()).name());
             method.returns(r.key().typeName());
             method.addAnnotation(Override.class);
-            method.addModifiers(r.requestingElement().getModifiers().stream()
-                    .filter(m -> m == PUBLIC || m == PROTECTED)
-                    .collect(Collectors.toList()));
+            method.addModifiers(PUBLIC);
             spec.addMethod(method.build());
         }
         component.factoryElement().ifPresent(factory -> {
             spec.addMethod(MethodSpec.methodBuilder("factory")
                     .addModifiers(STATIC)
-                    .addModifiers(component.element().getModifiers().stream()
-                            .filter(m -> m == PUBLIC).toArray(Modifier[]::new))
+                    .addModifiers(modifiers)
                     .returns(TypeName.get(factory.element().asType()))
                     .addStatement("return new $T()", factory.generatedClass())
                     .build());
@@ -91,8 +90,7 @@ TypeSpec generate() {
         component.builderElement().ifPresent(builder -> {
             spec.addMethod(MethodSpec.methodBuilder("builder")
                     .addModifiers(STATIC)
-                    .addModifiers(component.element().getModifiers().stream()
-                            .filter(m -> m == PUBLIC).toArray(Modifier[]::new))
+                    .addModifiers(modifiers)
                     .returns(TypeName.get(builder.element().asType()))
                     .addStatement("return new $T()", builder.generatedClass())
                     .build());
@@ -101,6 +99,7 @@ TypeSpec generate() {
         if (component.factoryElement().isEmpty() && component.builderElement().isEmpty()) {
             spec.addMethod(MethodSpec.methodBuilder("create")
                     .addModifiers(STATIC)
+                    .addModifiers(modifiers)
                     .returns(TypeName.get(component.element().asType()))
                     .addStatement("return new $T()", component.generatedClass())
                     .build());

compiler/src/test/java/io/jbock/simple/processor/BuilderTest.java

@@ -77,7 +77,7 @@ void factoryParameterIdentity() {
                 "final class TestClass {",
                 "",
                 "  @Component",
-                "  interface AComponent {",
+                "  public interface AComponent {",
                 "    String getS();",
                 "",
                 "    @Component.Builder",
@@ -93,7 +93,7 @@ void factoryParameterIdentity() {
                 .containsLines(
                         "package test;",
                         "",
-                        "final class TestClass_AComponent_Impl implements TestClass.AComponent {",
+                        "public final class TestClass_AComponent_Impl implements TestClass.AComponent {",
                         "  private final String s;",
                         "",
                         "  private TestClass_AComponent_Impl(String s) {",
@@ -105,7 +105,7 @@ void factoryParameterIdentity() {
                         "    return s;",
                         "  }",
                         "",
-                        "  static TestClass.AComponent.Builder builder() {",
+                        "  public static TestClass.AComponent.Builder builder() {",
                         "    return new Builder_Impl();",
                         "  }",
                         "",

compiler/src/test/java/io/jbock/simple/processor/FactoryTest.java

@@ -77,7 +77,7 @@ void factoryParameterIdentity() {
                 "final class TestClass {",
                 "",
                 "  @Component",
-                "  interface AComponent {",
+                "  public interface AComponent {",
                 "    String getS();",
                 "",
                 "    @Component.Factory",
@@ -92,7 +92,7 @@ void factoryParameterIdentity() {
                 .containsLines(
                         "package test;",
                         "",
-                        "final class TestClass_AComponent_Impl implements TestClass.AComponent {",
+                        "public final class TestClass_AComponent_Impl implements TestClass.AComponent {",
                         "  private final String s;",
                         "",
                         "  private TestClass_AComponent_Impl(String s) {",
@@ -104,7 +104,7 @@ void factoryParameterIdentity() {
                         "    return s;",
                         "  }",
                         "",
-                        "  static TestClass.AComponent.Factory factory() {",
+                        "  public static TestClass.AComponent.Factory factory() {",
                         "    return new Factory_Impl();",
                         "  }",
                         "",

compiler/src/test/java/io/jbock/simple/processor/ProcessorComponentTest.java

@@ -37,7 +37,7 @@ void staticMethodBindings() {
                 "  }",
                 "",
                 "  @Component",
-                "  interface AComponent {",
+                "  public interface AComponent {",
                 "    A getA();",
                 "  }",
                 "}");
@@ -48,7 +48,7 @@ void staticMethodBindings() {
                 .containsLines(
                         "package test;",
                         "",
-                        "final class TestClass_AComponent_Impl implements TestClass.AComponent {",
+                        "public final class TestClass_AComponent_Impl implements TestClass.AComponent {",
                         "  private final TestClass.A a;",
                         "",
                         "  private TestClass_AComponent_Impl() {",
@@ -61,6 +61,10 @@ void staticMethodBindings() {
                         "  public TestClass.A getA() {",
                         "    return a;",
                         "  }",
+                        "",
+                        "  public static TestClass.AComponent create() {",
+                        "    return new TestClass_AComponent_Impl();",
+                        "  }",
                         "}");
     }