Review fixes

Author: Metaur

database/api/src/main/java/com/neueda/jetbrains/plugin/graphdb/database/api/query/GraphQueryResult.java

@@ -4,6 +4,7 @@
 import com.neueda.jetbrains.plugin.graphdb.database.api.data.GraphRelationship;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface GraphQueryResult {
 
@@ -23,7 +24,7 @@ public interface GraphQueryResult {
 
     boolean hasPlan();
 
-    boolean hasProfile();
+    boolean isProfilePlan();
 
-    GraphQueryPlan getPlan();
+    Optional<GraphQueryPlan> getPlan();
 }

database/neo4j/src/main/java/com/neueda/jetbrains/plugin/graphdb/database/neo4j/bolt/Neo4jBoltBuffer.java

@@ -114,20 +114,20 @@ public boolean hasPlan() {
                 .orElse(false);
     }
 
-    public boolean hasProfile() {
+    public boolean isProfilePlan() {
         return Optional.ofNullable(resultSummary)
                 .map(ResultSummary::hasProfile)
                 .orElse(false);
     }
 
-    public GraphQueryPlan getQueryPlan() {
+    public Optional<GraphQueryPlan> getQueryPlan() {
         if (!hasPlan()) {
-            return null;
+            return Optional.empty();
         }
 
         Plan plan = resultSummary.plan();
-        return new Neo4jBoltQueryPlan(plan.operatorType(), getArguments(plan), plan.identifiers(),
-                getPlanChildren(plan.children()));
+        return Optional.of(new Neo4jBoltQueryPlan(plan.operatorType(), getArguments(plan), plan.identifiers(),
+                getPlanChildren(plan.children())));
     }
 
     private static List<Neo4jBoltQueryPlan> getPlanChildren(List<? extends Plan> childrenPlans) {

database/neo4j/src/main/java/com/neueda/jetbrains/plugin/graphdb/database/neo4j/bolt/query/Neo4jBoltQueryResult.java

@@ -156,12 +156,12 @@ public boolean hasPlan() {
     }
 
     @Override
-    public boolean hasProfile() {
-        return buffer.hasProfile();
+    public boolean isProfilePlan() {
+        return buffer.isProfilePlan();
     }
 
     @Override
-    public GraphQueryPlan getPlan() {
+    public Optional<GraphQueryPlan> getPlan() {
         return buffer.getQueryPlan();
     }
 

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/GraphConsoleView.java

@@ -40,8 +40,8 @@
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
@@ -51,6 +51,8 @@
 
 public class GraphConsoleView implements Disposable {
 
+    public static final String PROFILE_PLAN_TITLE = "Profile";
+    public static final String EXPLAIN_PLAN_TITLE = "Explain";
     private boolean initialized;
 
     private ExecutionStatusBarWidget executionStatusBarWidget;
@@ -147,36 +149,20 @@ private void createUIComponents() {
         consoleTabsPane = new JBTabsPaneImpl(null, SwingConstants.TOP, this);
         consoleTabs = (JBTabsImpl) consoleTabsPane.getTabs();
 
-        consoleTabs.addTabMouseListener(new MouseListener() {
+        consoleTabs.addTabMouseListener(new MouseAdapter() {
             @Override
             public void mouseReleased(MouseEvent e) {
                 if (UIUtil.isCloseClick(e, MouseEvent.MOUSE_RELEASED)) {
                     final TabInfo info = consoleTabs.findInfo(e);
                     if (info != null) {
                         String tabTitle = info.getText();
-                        if (tabTitle.startsWith("Profile") || tabTitle.startsWith("Explain")) {
+                        if (tabTitle.startsWith(PROFILE_PLAN_TITLE) || tabTitle.startsWith(EXPLAIN_PLAN_TITLE)) {
                             IdeEventQueue.getInstance().blockNextEvents(e);
                             consoleTabs.removeTab(info);
                         }
                     }
                 }
             }
-
-            @Override
-            public void mouseClicked(MouseEvent e) {
-            }
-
-            @Override
-            public void mousePressed(MouseEvent e) {
-            }
-
-            @Override
-            public void mouseEntered(MouseEvent e) {
-            }
-
-            @Override
-            public void mouseExited(MouseEvent e) {
-            }
         });
     }
 
@@ -217,7 +203,7 @@ public void actionPerformed(AnActionEvent e) {
         });
         tabInfo.setTabLabelActions(tabActions, ActionPlaces.EDITOR_TAB);
 
-        String planType = result.hasProfile() ? "Profile" : "Explain";
+        String planType = result.isProfilePlan() ? PROFILE_PLAN_TITLE : EXPLAIN_PLAN_TITLE;
         consoleTabs.addTab(tabInfo.setText(String.format("%1s %2d - %3s", planType, tabId,
                 LocalDateTime.now().format(QUERY_PLAN_TIME_FORMAT))));
     }

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/plan/QueryPlanPanel.java

@@ -25,6 +25,7 @@
 import java.awt.*;
 import java.util.Collection;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Stream;
 
 import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.plan.ColumnDefinitions.getProfileQueryPlanColumns;
@@ -47,7 +48,12 @@ public void initialize(Container container) {
         queryLabel.setRows(3);
         queryLabel.setEditable(false);
 
-        ListTreeTableModelOnColumns model = createModel(result.getPlan(), result.hasProfile());
+        GraphQueryPlan graphQueryPlan = result.getPlan()
+                .orElseThrow(() ->
+                        new ShouldNeverHappenException("Sergey Ishchenko",
+                                "GraphQueryPanel is initialized when explain or profile queries are executed"));
+
+        ListTreeTableModelOnColumns model = createModel(graphQueryPlan, result.isProfilePlan());
 
         treeTable = new TreeTableView(model);
         treeTable.setAutoResizeMode(JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS);
@@ -131,16 +137,20 @@ private static long calculateTotalDbHits(GraphQueryPlan plan) {
 
     @NotNull
     private static String getStatusText(GraphQueryResult result) {
-        Map<String, Object> args = result.getPlan().getArguments();
         StringBuilder sb = new StringBuilder();
-        sb.append("Cypher version: ").append(args.getOrDefault(VERSION.getKey(), '-')).append(", ")
-                .append("planner: ").append(args.getOrDefault(PLANNER.getKey(), '-'))
-                .append("(").append(args.getOrDefault(PLANNER_IMPL.getKey(), '-')).append("), ")
-                .append("runtime: ").append(args.getOrDefault(RUNTIME.getKey(), '-'));
-
-        if (result.hasProfile()) {
-            sb.append(", ").append(calculateTotalDbHits(result.getPlan())).append(" total db hits in ")
-                    .append(result.getExecutionTimeMs()).append("ms.");
+
+        Optional<GraphQueryPlan> plan = result.getPlan();
+        if (plan.isPresent()) {
+            Map<String, Object> args = plan.get().getArguments();
+            sb.append("Cypher version: ").append(args.getOrDefault(VERSION.getKey(), '-')).append(", ")
+                    .append("planner: ").append(args.getOrDefault(PLANNER.getKey(), '-'))
+                    .append("(").append(args.getOrDefault(PLANNER_IMPL.getKey(), '-')).append("), ")
+                    .append("runtime: ").append(args.getOrDefault(RUNTIME.getKey(), '-'));
+
+            if (result.isProfilePlan()) {
+                sb.append(", ").append(calculateTotalDbHits(plan.get())).append(" total db hits in ")
+                        .append(result.getExecutionTimeMs()).append("ms.");
+            }
         }
 
         return sb.toString();