Cleaning up code and test

Juliano-Prado · Juliano-Prado · commit affc1b827c06 · 2024-02-07T12:14:04.000+10:00
diff --git a/src/main/java/graphql/validation/rules/DeferDirectiveLabel.java b/src/main/java/graphql/validation/rules/DeferDirectiveLabel.java
@@ -16,7 +16,6 @@
 
 @Internal
 public class DeferDirectiveLabel extends AbstractRule {
-
     private Set<String> labels = new LinkedHashSet<>();
     public DeferDirectiveLabel(ValidationContext validationContext, ValidationErrorCollector validationErrorCollector) {
         super(validationContext, validationErrorCollector);
@@ -27,7 +26,6 @@ public void checkDirective(Directive directive, List<Node> ancestors) {
         if (!directive.getName().equals("defer") || directive.getArguments().size() == 0) {
             return;
         }
-
         Argument labelArgument = directive.getArgument("label");
         // argument type is validated in DeferDirectiveArgumentType
         if (labelArgument != null && labelArgument.getValue() instanceof StringValue) {
diff --git a/src/main/java/graphql/validation/rules/DeferDirectiveOnRootLevel.java b/src/main/java/graphql/validation/rules/DeferDirectiveOnRootLevel.java
@@ -53,6 +53,5 @@ protected Optional<Node> getFragmentAncestor(List<Node> ancestors){
                                 node instanceof FragmentDefinition
                 )
         ).findFirst();
-
     }
 }
diff --git a/src/main/java/graphql/validation/rules/DeferDirectiveOnValidOperation.java b/src/main/java/graphql/validation/rules/DeferDirectiveOnValidOperation.java
@@ -26,11 +26,6 @@ public DeferDirectiveOnValidOperation(ValidationContext validationContext, Valid
         this.setVisitFragmentSpreads(true);
     }
 
-    @Override
-    public void documentFinished(Document document) {
-        super.documentFinished(document);
-    }
-
     @Override
     public void checkDirective(Directive directive, List<Node> ancestors) {
         if (!directive.getName().equals("defer") ||
@@ -45,13 +40,12 @@ public void checkDirective(Directive directive, List<Node> ancestors) {
         }
     }
 
-
     /**
      * Extract from ancestors the OperationDefinition using the document ancestor.
      * @param ancestors list of ancestors
      * @return OperationDefinition
      */
-    protected Optional<OperationDefinition> getOperation(List<Node> ancestors) {
+    private Optional<OperationDefinition> getOperation(List<Node> ancestors) {
         return ancestors.stream()
                 .filter(doc -> doc instanceof OperationDefinition)
                 .map((def -> (OperationDefinition) def))
diff --git a/src/test/groovy/graphql/validation/rules/UniqueOperationNamesTest.groovy b/src/test/groovy/graphql/validation/rules/UniqueOperationNamesTest.groovy
@@ -46,8 +46,8 @@ class UniqueOperationNamesTest extends Specification {
         }
 
         mutation dogOperation {
-            mutateDog {
-                id
+            createDog(input: {id: "1"}) {
+                name
             }
         }
         """.stripIndent()

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,5 @@ protected Optional<Node> getFragmentAncestor(List<Node> ancestors){`
`53`	`53`	`node instanceof FragmentDefinition`
`54`	`54`	`)`
`55`	`55`	`).findFirst();`
`56`		`-`
`57`	`56`	`}`
`58`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ class UniqueOperationNamesTest extends Specification {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`mutation dogOperation {`
`49`		`- mutateDog {`
`50`		`- id`
	`49`	`+ createDog(input: {id: "1"}) {`
	`50`	`+ name`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`""".stripIndent()`