Refactor out query execution logic (#4)

QubitPi · Oct 3, 2024 · a646f01 · a646f01
1 parent 54a9c2a
commit a646f01
Showing 1 changed file with 27 additions and 17 deletions.
diff --git a/src/main/java/org/qubitpi/wilhelm/web/endpoints/DataServlet.java b/src/main/java/org/qubitpi/wilhelm/web/endpoints/DataServlet.java
@@ -127,32 +127,42 @@ public Response getVocabularyByLanguagePaged(
                 LANGUAGES.get(language), (Integer.parseInt(page) - 1) * Integer.parseInt(perPage), perPage
         );
 
+        return Response
+                .status(Response.Status.OK)
+                .entity(executeNativeQuery(query))
+                .build();
+    }
+
+    /**
+     * Runs a cypher query against Neo4J database and return the query result as a JSON-serializable object.
+     *
+     * @param query  A standard cypher query string
+     *
+     * @return query result
+     */
+    @NotNull
+    private Object executeNativeQuery(@NotNull final String query) {
         try (Driver driver = GraphDatabase.driver(NEO4J_URL, AuthTokens.basic(NEO4J_USERNAME, NEO4J_PASSWORD))) {
             driver.verifyConnectivity();
 
             final EagerResult result = driver.executableQuery(query)
                     .withConfig(QueryConfig.builder().withDatabase(NEO4J_DATABASE).build())
                     .execute();
 
-            return Response
-                    .status(Response.Status.OK)
-                    .entity(
-                            result
-                                    .records()
+            return result
+                    .records()
+                    .stream()
+                    .map(
+                            record -> record.keys()
                                     .stream()
-                                    .map(
-                                            record -> record.keys()
-                                                    .stream()
-                                                    .map(key -> new AbstractMap.SimpleImmutableEntry<>(
-                                                            key,
-                                                            expand(record.get(key))
-                                                    ))
-                                                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))
-
-                                    )
-                                    .collect(Collectors.toList())
+                                    .map(key -> new AbstractMap.SimpleImmutableEntry<>(
+                                            key,
+                                            expand(record.get(key))
+                                    ))
+                                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))
+
                     )
-                    .build();
+                    .collect(Collectors.toList());
         }
     }