Merge @PerformWrites check into procedure processor

neo4j · Jun 23, 2017 · 0179ad6 · 0179ad6
1 parent becf0cb
commit 0179ad6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 142 deletions.
diff --git a/...-compiler/processor/src/main/java/org/neo4j/tooling/procedure/PerformsWriteProcessor.java b/...-compiler/processor/src/main/java/org/neo4j/tooling/procedure/PerformsWriteProcessor.java
diff --git a/.../processor/src/main/java/org/neo4j/tooling/procedure/visitors/StoredProcedureVisitor.java b/.../processor/src/main/java/org/neo4j/tooling/procedure/visitors/StoredProcedureVisitor.java
@@ -46,6 +46,7 @@ public class StoredProcedureVisitor extends SimpleElementVisitor8<Stream<Compila
     private final ElementVisitor<Stream<CompilationMessage>,Void> classVisitor;
     private final TypeVisitor<Stream<CompilationMessage>,Void> recordVisitor;
     private final ElementVisitor<Stream<CompilationMessage>,Void> parameterVisitor;
+    private final ElementVisitor<Stream<CompilationMessage>,Void> performsWriteVisitor;
 
     public StoredProcedureVisitor( Types typeUtils, Elements elementUtils, boolean ignoresWarnings )
     {
@@ -56,6 +57,7 @@ public StoredProcedureVisitor( Types typeUtils, Elements elementUtils, boolean i
         this.classVisitor = new StoredProcedureClassVisitor( typeUtils, elementUtils, ignoresWarnings );
         this.recordVisitor = new RecordTypeVisitor( typeUtils, typeMirrors );
         this.parameterVisitor = new ParameterVisitor( new ParameterTypeVisitor( typeUtils, typeMirrors ) );
+        this.performsWriteVisitor = new PerformsWriteMethodVisitor();
     }
 
     /**
@@ -66,7 +68,8 @@ public Stream<CompilationMessage> visitExecutable( ExecutableElement executableE
     {
         return Stream.of( classVisitor.visit( executableElement.getEnclosingElement() ),
                 validateParameters( executableElement.getParameters(), ignored ),
-                validateReturnType( executableElement ) ).flatMap( Function.identity() );
+                validateReturnType( executableElement ), validatePerformsWriteUsage( executableElement ) )
+                .flatMap( Function.identity() );
     }
 
     private Stream<CompilationMessage> validateParameters( List<? extends VariableElement> parameters, Void ignored )
@@ -97,6 +100,11 @@ private Stream<CompilationMessage> validateReturnType( ExecutableElement method
         return recordVisitor.visit( returnType );
     }
 
+    private Stream<CompilationMessage> validatePerformsWriteUsage( ExecutableElement executableElement )
+    {
+        return performsWriteVisitor.visit( executableElement );
+    }
+
     private AnnotationMirror annotationMirror( List<? extends AnnotationMirror> mirrors )
     {
         AnnotationTypeVisitor nameVisitor = new AnnotationTypeVisitor( Name.class );

diff --git a/...piler/processor/src/test/java/org/neo4j/tooling/procedure/PerformsWriteProcessorTest.java b/...piler/processor/src/test/java/org/neo4j/tooling/procedure/PerformsWriteProcessorTest.java
diff --git a/...-compiler/processor/src/test/java/org/neo4j/tooling/procedure/ProcedureProcessorTest.java b/...-compiler/processor/src/test/java/org/neo4j/tooling/procedure/ProcedureProcessorTest.java
@@ -256,4 +256,17 @@ public void fails_if_context_injected_fields_have_unsupported_types()
                                 "BadContextUnsupportedTypeError#foo, expected one of: <org.neo4j.graphdb.GraphDatabaseService>, <org.neo4j.logging.Log>, <org.neo4j.procedure.TerminationGuard>, <org.neo4j.kernel.api.security.SecurityContext>, <org.neo4j.procedure.ProcedureTransaction>" )
                 .in( sproc ).onLine( 28 );
     }
+
+    @Test
+    public void fails_with_conflicting_mode()
+    {
+        JavaFileObject procedure = JavaFileObjectUtils.INSTANCE.procedureSource(
+                "invalid/conflicting_mode/ConflictingMode.java" );
+
+        assert_().about( javaSource() ).that( procedure ).processedWith( processor ).failsToCompile()
+                .withErrorCount( 1 )
+                .withErrorContaining( "@PerformsWrites usage error: cannot use mode other than Mode.DEFAULT" )
+                .in( procedure ).onLine( 30 );
+
+    }
 }