use set binding in ValidateComponent

Author: h908714124

compiler/src/main/java/net/jbock/convert/match/MatchFinder.java

@@ -13,7 +13,7 @@
 import javax.lang.model.type.PrimitiveType;
 import javax.lang.model.type.TypeMirror;
 import java.util.Optional;
-import java.util.stream.Stream;
+import java.util.Set;
 
 import static io.jbock.util.Either.right;
 import static javax.lang.model.type.TypeKind.BOOLEAN;
@@ -24,17 +24,14 @@
 @ValidateScope
 public class MatchFinder {
 
-    private final OptionalMatcher optionalMatcher;
-    private final ListMatcher listMatcher;
+    private final Set<Matcher> matchers;
     private final SafeTypes types;
 
     @Inject
     MatchFinder(
-            OptionalMatcher optionalMatcher,
-            ListMatcher listMatcher,
+            Set<Matcher> matchers,
             SafeTypes types) {
-        this.optionalMatcher = optionalMatcher;
-        this.listMatcher = listMatcher;
+        this.matchers = matchers;
         this.types = types;
     }
 
@@ -61,7 +58,7 @@ Either<ValidationFailure, Match<M>> findMatch(
     private <M extends AnnotatedMethod> Match<M>
     findMatchInternal(
             M sourceMethod) {
-        return Stream.of(optionalMatcher, listMatcher)
+        return matchers.stream()
                 .map(matcher -> matcher.tryMatch(sourceMethod))
                 .flatMap(Optional::stream)
                 .findFirst()

compiler/src/main/java/net/jbock/validate/ValidateComponent.java

@@ -6,7 +6,7 @@
 
 /* subcomponent of ProcessorComponent */
 @ValidateScope
-@Subcomponent
+@Subcomponent(modules = ValidateModule.class)
 public interface ValidateComponent {
 
     CommandProcessor processor();

compiler/src/main/java/net/jbock/validate/ValidateModule.java

@@ -0,0 +1,20 @@
+package net.jbock.validate;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.multibindings.IntoSet;
+import net.jbock.convert.match.ListMatcher;
+import net.jbock.convert.match.Matcher;
+import net.jbock.convert.match.OptionalMatcher;
+
+@Module
+public interface ValidateModule {
+
+    @Binds
+    @IntoSet
+    Matcher optionalMatcher(OptionalMatcher validator);
+
+    @Binds
+    @IntoSet
+    Matcher listMatcher(ListMatcher validator);
+}