Merge pull request #30 from neo4j-contrib/java_format_fix

Preserve newline in generated Java concatenation code

Author: JMHReif

src/main/java/com/neo4j/sandbox/updater/Updater.java

@@ -88,14 +88,11 @@ private String withToken(String repositoryUri) {
  }
 
  private QueryIndenter newQueryFormatter(String languageName) {
- QueryIndenter queryIndenter;
  IndentDetector indentDetector = new IndentDetector();
  if (languageName.equals("java")) {
- queryIndenter = new JavaQueryIndenter(indentDetector);
- } else {
- queryIndenter = new DefaultQueryIndenter(indentDetector);
+ return new JavaQueryIndenter(indentDetector);
  }
- return queryIndenter;
+ return new DefaultQueryIndenter(indentDetector);
  }
 
  private String substituteValues(Path sandboxRepositoryRootFolder,

src/main/java/com/neo4j/sandbox/updater/formatting/JavaQueryIndenter.java

@@ -25,7 +25,7 @@ public String indent(String initialCode, String newQuery) {
 
  private String quote(String indentedQuery) {
  String prefix = "\"";
- String intermediateLineSuffix = "\" +";
+ String intermediateLineSuffix = "\\n\" +";
  String finalSuffix = "\";";
  String[] lines = indentedQuery.split("\n");
  StringBuilder result = new StringBuilder();

src/test/java/com/neo4j/sandbox/updater/UpdaterIT.java

@@ -102,8 +102,8 @@ void updates_Java_example() throws Exception {
  " try (Session session = driver.session(SessionConfig.forDatabase(\"neo4j\"))) {\n" +
  "\n" +
  " String cypherQuery =\n" +
- " \"MATCH (p:Product)-[:PART_OF]->(:Category)-[:PARENT*0..]->\" +\n" +
- " \" (:Category {categoryName:$category})\" +\n" +
+ " \"MATCH (p:Product)-[:PART_OF]->(:Category)-[:PARENT*0..]->\\n\" +\n" +
+ " \" (:Category {categoryName:$category})\\n\" +\n" +
  " \" RETURN p.productName as product\";\n" +
  "\n" +
  " var result = session.readTransaction(\n" +

src/test/java/com/neo4j/sandbox/updater/formatting/JavaQueryIndenterTest.java

@@ -0,0 +1,23 @@
+package com.neo4j.sandbox.updater.formatting;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class JavaQueryIndenterTest {
+
+ private final JavaQueryIndenter indenter = new JavaQueryIndenter(new IndentDetector());
+
+ private final String templateQuery = "MATCH (m:Movie {title:$movie})<-[:RATED]-(u:User)-[:RATED]->(rec:Movie)\nRETURN distinct rec.title AS recommendation LIMIT 20";
+
+ @Test
+ void includes_newlines_in_query_lines() {
+ String multilineQuery = "MATCH (m:Merchant{name:$name})<-[:TO]-(:Transaction)<-[:PERFORMED]-(c:Client)\n" +
+ "RETURN c.name as client";
+
+ String result = indenter.indent(templateQuery, multilineQuery);
+
+ assertThat(result).isEqualTo("MATCH (m:Merchant{name:$name})<-[:TO]-(:Transaction)<-[:PERFORMED]-(c:Client)\\n\" +\n" +
+ "\"RETURN c.name as client\";");
+ }
+}