From c0b453bb2bcafafec85cfbc770da0026e2912639 Mon Sep 17 00:00:00 2001
From: Praveena G <praveena.gunasekhar@gmail.com>
Date: Wed, 1 Mar 2017 15:30:45 +0000
Subject: [PATCH] added @NonNull annotations for command sections.

---
 community/command-line/pom.xml                               | 5 ++++-
 .../main/java/org/neo4j/commandline/admin/AdminCommand.java  | 3 +++
 .../org/neo4j/commandline/admin/AdminCommandSection.java     | 2 ++
 .../src/main/java/org/neo4j/commandline/admin/Usage.java     | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/community/command-line/pom.xml b/community/command-line/pom.xml
index b25a5549ed85a..02d88a40b45e5 100644
--- a/community/command-line/pom.xml
+++ b/community/command-line/pom.xml
@@ -50,7 +50,10 @@
       <artifactId>neo4j-collections</artifactId>
       <version>${project.version}</version>
     </dependency>
-
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>annotations</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
diff --git a/community/command-line/src/main/java/org/neo4j/commandline/admin/AdminCommand.java b/community/command-line/src/main/java/org/neo4j/commandline/admin/AdminCommand.java
index ebefb374fe7a3..c00f5d8c7d68c 100644
--- a/community/command-line/src/main/java/org/neo4j/commandline/admin/AdminCommand.java
+++ b/community/command-line/src/main/java/org/neo4j/commandline/admin/AdminCommand.java
@@ -25,6 +25,8 @@
 import java.util.Set;
 import java.util.function.Consumer;
 
+import javax.annotation.Nonnull;
+
 import org.neo4j.commandline.arguments.Arguments;
 import org.neo4j.helpers.Service;
 import org.neo4j.helpers.collection.Iterables;
@@ -84,6 +86,7 @@ public List<Arguments> possibleArguments()
         /**
          * @return AdminCommandSection the command using the provider is grouped under
          */
+        @Nonnull
         public abstract AdminCommandSection commandSection();
 
         /**
diff --git a/community/command-line/src/main/java/org/neo4j/commandline/admin/AdminCommandSection.java b/community/command-line/src/main/java/org/neo4j/commandline/admin/AdminCommandSection.java
index cd6e310e120d4..488b69e53f3d0 100644
--- a/community/command-line/src/main/java/org/neo4j/commandline/admin/AdminCommandSection.java
+++ b/community/command-line/src/main/java/org/neo4j/commandline/admin/AdminCommandSection.java
@@ -22,11 +22,13 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.function.Consumer;
+import javax.annotation.Nonnull;
 
 public abstract class AdminCommandSection
 {
     private static final AdminCommandSection GENERAL = new GeneralSection();
 
+    @Nonnull
     public abstract String printable();
 
     public static AdminCommandSection general()
diff --git a/community/command-line/src/main/java/org/neo4j/commandline/admin/Usage.java b/community/command-line/src/main/java/org/neo4j/commandline/admin/Usage.java
index b85dc8e73e254..a5a9fb2c9cfb3 100644
--- a/community/command-line/src/main/java/org/neo4j/commandline/admin/Usage.java
+++ b/community/command-line/src/main/java/org/neo4j/commandline/admin/Usage.java
@@ -86,6 +86,6 @@ private Map<AdminCommandSection,List<AdminCommand.Provider>> groupProvidersBySec
     {
         List<AdminCommand.Provider> providers = new ArrayList<>();
         commands.getAllProviders().forEach( providers::add );
-        return providers.stream().collect( Collectors.groupingBy( ( provider ) -> provider.commandSection() ) );
+        return providers.stream().collect( Collectors.groupingBy( AdminCommand.Provider::commandSection ) );
     }
 }