update processor

Author: h908714124

compiler/build.gradle

@@ -52,13 +52,13 @@ shadowJar {
 
 dependencies {
     def jbock = project(':jbock')
-    def simple_component = 'io.github.jbock-java:simple-component:1.014'
+    def simple_component = 'io.github.jbock-java:simple-component:1.015'
     def javapoet = 'io.github.jbock-java:javapoet:1.15'
     implementation(javapoet)
     implementation('io.github.jbock-java:auto-common:1.2.3')
     shadow(jbock)
     compileOnly(simple_component)
-    annotationProcessor('io.github.jbock-java:simple-component-compiler:1.014')
+    annotationProcessor('io.github.jbock-java:simple-component-compiler:1.015')
     testImplementation('io.github.jbock-java:compile-testing:0.19.12')
     testImplementation('org.junit.jupiter:junit-jupiter:5.9.1')
     testImplementation('org.mockito:mockito-core:4.8.0')

compiler/src/main/java/net/jbock/processor/CommandStep.java

@@ -9,7 +9,7 @@
 import net.jbock.common.TypeTool;
 import net.jbock.common.Util;
 import net.jbock.common.ValidationFailure;
-import net.jbock.validate.ValidateComponent;
+import net.jbock.validate.ValidateComponent_Impl;
 import net.jbock.writing.ContextComponent;
 
 import javax.annotation.processing.Messager;
@@ -72,7 +72,11 @@ public Set<? extends Element> process(Map<String, Set<Element>> elementsByAnnota
     }
 
     private void processSourceElement(SourceElement sourceElement) {
-        ValidateComponent.generate(util, tool, sourceElement)
+        ValidateComponent_Impl.builder()
+                .util(util)
+                .tool(tool)
+                .sourceElement(sourceElement)
+                .build().commandProcessor().generate()
                 .map(ContextComponent::parserClass)
                 .ifLeftOrElse(
                         this::printFailures,

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

@@ -25,7 +25,7 @@
  * This class is responsible for item validation.
  * If validation succeeds, a {@link CommandRepresentation} is created.
  */
-final class CommandProcessor {
+public final class CommandProcessor {
 
     private final ItemsFactory itemsFactory;
     private final SourceElement sourceElement;
@@ -47,7 +47,7 @@ final class CommandProcessor {
         this.varargsParameterValidator = varargsParameterValidator;
     }
 
-    Either<List<ValidationFailure>, CommandRepresentation> generate() {
+    public Either<List<ValidationFailure>, CommandRepresentation> generate() {
         return itemsFactory.createItems()
                 .filter(this::checkDuplicateDescriptionKeys)
                 .flatMap(items -> {

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

@@ -3,15 +3,11 @@
 import io.jbock.simple.Component;
 import io.jbock.simple.Named;
 import io.jbock.simple.Provides;
-import io.jbock.util.Either;
 import net.jbock.common.TypeTool;
 import net.jbock.common.Util;
-import net.jbock.common.ValidationFailure;
 import net.jbock.convert.match.Matcher;
 import net.jbock.processor.SourceElement;
-import net.jbock.writing.CommandRepresentation;
 
-import java.util.List;
 import java.util.Set;
 
 @Component
@@ -30,18 +26,6 @@ interface Builder {
         ValidateComponent build();
     }
 
-    static Either<List<ValidationFailure>, CommandRepresentation> generate(
-            Util util,
-            TypeTool tool,
-            SourceElement sourceElement) {
-        ValidateComponent component = ValidateComponent_Impl.builder()
-                .util(util)
-                .tool(tool)
-                .sourceElement(sourceElement)
-                .build();
-        return component.commandProcessor().generate();
-    }
-
     @Provides
     static Set<Matcher> allMatchers(
             @Named("optional") Matcher optionalMatcher,