Skip to content
This repository was archived by the owner on Jul 6, 2023. It is now read-only.

Commit 91c2fbc

Browse files
committed
Fix typos
1 parent a38a6b1 commit 91c2fbc

File tree

4 files changed

+19
-16
lines changed

4 files changed

+19
-16
lines changed

cypher-shell/src/main/java/org/neo4j/shell/prettyprint/OutputFormatter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
public interface OutputFormatter {
2424

25-
enum Capablities {info, plan, result, footer, statistics}
25+
enum Capabilities {INFO, PLAN, RESULT, FOOTER, STATISTICS}
2626

2727
String COMMA_SEPARATOR = ", ";
2828
String COLON_SEPARATOR = ": ";
@@ -186,9 +186,9 @@ static boolean isNotBlank(String string) {
186186
return "";
187187
}
188188

189-
Set<Capablities> capabilities();
189+
Set<Capabilities> capabilities();
190190

191-
List<String> INFO = asList("Version", "Planner", "Runtime");
191+
List<String> INFO_SUMMARY = asList("Version", "Planner", "Runtime");
192192

193193
@Nonnull
194194
static Map<String, Value> info(@Nonnull ResultSummary summary) {
@@ -201,7 +201,7 @@ static Map<String, Value> info(@Nonnull ResultSummary summary) {
201201
Map<String, Value> arguments = plan.arguments();
202202
Value defaultValue = Values.value("");
203203

204-
for (String key : INFO) {
204+
for (String key : INFO_SUMMARY) {
205205
Value value = arguments.getOrDefault(key, arguments.getOrDefault(key.toLowerCase(), defaultValue));
206206
result.put(key, value);
207207
}
@@ -213,7 +213,7 @@ static Map<String, Value> info(@Nonnull ResultSummary summary) {
213213

214214
static long collectHits(@Nonnull ProfiledPlan operator ) {
215215
long hits = operator.dbHits();
216-
hits = operator.children().stream().map( OutputFormatter::collectHits ).reduce(hits, (acc, subHits) -> acc + subHits );
216+
hits = operator.children().stream().map( OutputFormatter::collectHits ).reduce(hits, Long::sum);
217217
return hits;
218218
}
219219

cypher-shell/src/main/java/org/neo4j/shell/prettyprint/PrettyPrinter.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
import org.neo4j.shell.state.BoltResult;
55

66
import javax.annotation.Nonnull;
7-
87
import java.util.Set;
98

9+
import static org.neo4j.shell.prettyprint.OutputFormatter.Capabilities.*;
10+
1011
/**
1112
* Print the result from neo4j in a intelligible fashion.
1213
*/
@@ -20,14 +21,14 @@ public PrettyPrinter(@Nonnull PrettyConfig prettyConfig) {
2021
}
2122

2223
public void format(@Nonnull final BoltResult result, LinePrinter linePrinter) {
23-
Set<OutputFormatter.Capablities> capabilities = outputFormatter.capabilities();
24+
Set<OutputFormatter.Capabilities> capabilities = outputFormatter.capabilities();
2425

25-
if (capabilities.contains(OutputFormatter.Capablities.result)) outputFormatter.format(result, linePrinter);
26+
if (capabilities.contains(RESULT)) outputFormatter.format(result, linePrinter);
2627

27-
if (capabilities.contains(OutputFormatter.Capablities.info)) linePrinter.printOut(outputFormatter.formatInfo(result.getSummary()));
28-
if (capabilities.contains(OutputFormatter.Capablities.plan)) linePrinter.printOut(outputFormatter.formatPlan(result.getSummary()));
29-
if (capabilities.contains(OutputFormatter.Capablities.footer)) linePrinter.printOut(outputFormatter.formatFooter(result));
30-
if (capabilities.contains(OutputFormatter.Capablities.statistics)) linePrinter.printOut(statisticsCollector.collect(result.getSummary()));
28+
if (capabilities.contains(INFO)) linePrinter.printOut(outputFormatter.formatInfo(result.getSummary()));
29+
if (capabilities.contains(PLAN)) linePrinter.printOut(outputFormatter.formatPlan(result.getSummary()));
30+
if (capabilities.contains(FOOTER)) linePrinter.printOut(outputFormatter.formatFooter(result));
31+
if (capabilities.contains(STATISTICS)) linePrinter.printOut(statisticsCollector.collect(result.getSummary()));
3132
}
3233

3334
// Helper for testing

cypher-shell/src/main/java/org/neo4j/shell/prettyprint/SimpleOutputFormatter.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import java.util.Set;
1313
import java.util.stream.Collectors;
1414

15+
import static org.neo4j.shell.prettyprint.OutputFormatter.Capabilities.*;
16+
1517
public class SimpleOutputFormatter implements OutputFormatter {
1618

1719
@Override
@@ -44,7 +46,7 @@ public String formatInfo(@Nonnull ResultSummary summary) {
4446
}
4547

4648
@Override
47-
public Set<Capablities> capabilities() {
48-
return EnumSet.of(Capablities.info, Capablities.statistics, Capablities.result);
49+
public Set<Capabilities> capabilities() {
50+
return EnumSet.of(INFO, STATISTICS, RESULT);
4951
}
5052
}

cypher-shell/src/main/java/org/neo4j/shell/prettyprint/TableOutputFormatter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public String formatPlan(@Nullable ResultSummary summary) {
169169
}
170170

171171
@Override
172-
public Set<Capablities> capabilities() {
173-
return EnumSet.allOf(Capablities.class);
172+
public Set<Capabilities> capabilities() {
173+
return EnumSet.allOf(Capabilities.class);
174174
}
175175
}

0 commit comments

Comments
 (0)