Refactor the ProcessSemgrexRequest and make the CoreNLPServer use it as well

Author: AngledLuffa

src/edu/stanford/nlp/pipeline/StanfordCoreNLPServer.java

@@ -1348,18 +1348,12 @@ public void handle(HttpExchange httpExchange) throws IOException {
               return Pair.makePair("".getBytes(), null);
             }
 
-            CoreNLPProtos.SemgrexResponse.Builder responseBuilder = CoreNLPProtos.SemgrexResponse.newBuilder();
-            int sentenceIdx = 0;
-            for (CoreMap sentence : doc.get(CoreAnnotations.SentencesAnnotation.class)) {
-              SemanticGraph graph = sentence.get(dependenciesType.annotation());
-              CoreNLPProtos.SemgrexResponse.GraphResult.Builder graphResultBuilder = CoreNLPProtos.SemgrexResponse.GraphResult.newBuilder();
-              graphResultBuilder.addResult(ProcessSemgrexRequest.matchSentence(regex, graph, 0, sentenceIdx));
-              responseBuilder.addResult(graphResultBuilder.build());
-              ++sentenceIdx;
-            }
+            List<CoreMap> sentences = doc.get(CoreAnnotations.SentencesAnnotation.class);
+            List<SemgrexPattern> patterns = Collections.singletonList(regex);
+            CoreNLPProtos.SemgrexResponse semgrexResponse = ProcessSemgrexRequest.processRequest(sentences, patterns);
 
             ByteArrayOutputStream os = new ByteArrayOutputStream();
-            responseBuilder.build().writeTo(os);
+            semgrexResponse.writeTo(os);
             os.close();
 
             return Pair.makePair(os.toByteArray(), doc);

src/edu/stanford/nlp/semgraph/semgrex/ProcessSemgrexRequest.java

@@ -79,31 +79,8 @@ public static CoreNLPProtos.SemgrexResponse.SemgrexResult matchSentence(SemgrexP
     return semgrexResultBuilder.build();
   }
 
-  /**
-   * For a single request, iterate through the SemanticGraphs it
-   * includes, and add the results of each Semgrex operation included
-   * in the request.
-   */
-  public static CoreNLPProtos.SemgrexResponse processRequest(CoreNLPProtos.SemgrexRequest request) {
-    ProtobufAnnotationSerializer serializer = new ProtobufAnnotationSerializer();
+  public static CoreNLPProtos.SemgrexResponse processRequest(List<CoreMap> sentences, List<SemgrexPattern> patterns) {
     CoreNLPProtos.SemgrexResponse.Builder responseBuilder = CoreNLPProtos.SemgrexResponse.newBuilder();
-
-    List<CoreMap> sentences = new ArrayList<>();
-    for (CoreNLPProtos.SemgrexRequest.Dependencies sentence : request.getQueryList()) {
-      final List<CoreLabel> tokens;
-      if (sentence.getGraph().getTokenList().size() > 0) {
-        tokens = sentence.getGraph().getTokenList().stream().map(serializer::fromProto).collect(Collectors.toList());
-      } else {
-        tokens = sentence.getTokenList().stream().map(serializer::fromProto).collect(Collectors.toList());
-      }
-      SemanticGraph graph = ProtobufAnnotationSerializer.fromProto(sentence.getGraph(), tokens, "semgrex");
-      CoreMap coremap = new ArrayCoreMap();
-      coremap.set(SemanticGraphCoreAnnotations.BasicDependenciesAnnotation.class, graph);
-      coremap.set(CoreAnnotations.TokensAnnotation.class, tokens);
-      sentences.add(coremap);
-    }
-
-    List<SemgrexPattern> patterns = request.getSemgrexList().stream().map(SemgrexPattern::compile).collect(Collectors.toList());
     List<Pair<CoreMap, List<Pair<SemgrexPattern, List<SemgrexMatch>>>>> allMatches = new ArrayList<>();
     for (CoreMap sentence : sentences) {
       allMatches.add(new Pair<>(sentence, new ArrayList<>()));
@@ -134,6 +111,33 @@ public static CoreNLPProtos.SemgrexResponse processRequest(CoreNLPProtos.Semgrex
     return responseBuilder.build();
   }
 
+  /**
+   * For a single request, iterate through the SemanticGraphs it
+   * includes, and add the results of each Semgrex operation included
+   * in the request.
+   */
+  public static CoreNLPProtos.SemgrexResponse processRequest(CoreNLPProtos.SemgrexRequest request) {
+    ProtobufAnnotationSerializer serializer = new ProtobufAnnotationSerializer();
+
+    List<CoreMap> sentences = new ArrayList<>();
+    for (CoreNLPProtos.SemgrexRequest.Dependencies sentence : request.getQueryList()) {
+      final List<CoreLabel> tokens;
+      if (sentence.getGraph().getTokenList().size() > 0) {
+        tokens = sentence.getGraph().getTokenList().stream().map(serializer::fromProto).collect(Collectors.toList());
+      } else {
+        tokens = sentence.getTokenList().stream().map(serializer::fromProto).collect(Collectors.toList());
+      }
+      SemanticGraph graph = ProtobufAnnotationSerializer.fromProto(sentence.getGraph(), tokens, "semgrex");
+      CoreMap coremap = new ArrayCoreMap();
+      coremap.set(SemanticGraphCoreAnnotations.BasicDependenciesAnnotation.class, graph);
+      coremap.set(CoreAnnotations.TokensAnnotation.class, tokens);
+      sentences.add(coremap);
+    }
+
+    List<SemgrexPattern> patterns = request.getSemgrexList().stream().map(SemgrexPattern::compile).collect(Collectors.toList());
+    return processRequest(sentences, patterns);
+  }
+
   /**
    * Reads a single request from the InputStream, then writes back a single response.
    */