Review changes.

Author: Sergey Kovtun

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/metadata/DataSourceMetadataUi.java

@@ -8,15 +8,32 @@
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.metadata.tree.MutableTreeNodeProducers;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.metadata.tree.Root;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.metadata.tree.TreeNodeDirectory;
-import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.*;
+import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.LabelTreeNodeModel;
+import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.MetadataTreeNodeModel;
+import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.Neo4jTreeNodeType;
+import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.RelationshipTypeTreeNodeModel;
+import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.TreeNodeModelApi;
 import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
 
 import javax.swing.tree.MutableTreeNode;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.Neo4jTreeNodeType.*;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.Neo4jTreeNodeType.CONSTRAINT;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.Neo4jTreeNodeType.CONSTRAINTS;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.Neo4jTreeNodeType.INDEX;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.Neo4jTreeNodeType.INDEXES;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.Neo4jTreeNodeType.LABEL;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.Neo4jTreeNodeType.LABELS;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.Neo4jTreeNodeType.PROPERTY_KEY;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.Neo4jTreeNodeType.PROPERTY_KEYS;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.Neo4jTreeNodeType.RELATIONSHIP;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.Neo4jTreeNodeType.RELATIONSHIPS;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.Neo4jTreeNodeType.STORED_PROCEDURE;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.Neo4jTreeNodeType.STORED_PROCEDURES;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.Neo4jTreeNodeType.USER_FUNCTION;
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.Neo4jTreeNodeType.USER_FUNCTIONS;
 
 public class DataSourceMetadataUi {
 
@@ -175,4 +192,4 @@ private MutableTreeNode createConstraintsNode(DataSourceMetadata dataSourceMetad
     private PatchedDefaultMutableTreeNode of(MetadataTreeNodeModel model) {
         return new PatchedDefaultMutableTreeNode(model);
     }
-}
+}

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/metadata/tree/Directory.java

@@ -14,7 +14,7 @@ class Directory implements TreeNode, TreeNodeDirectory {
     private final Function<TreeNode, DefaultMutableTreeNode> directoryProducer;
     private final Function<TreeNode, DefaultMutableTreeNode> functionProducer;
 
-    public Directory(
+    Directory(
             String name,
             Function<TreeNode, DefaultMutableTreeNode> directoryProducer,
             Function<TreeNode, DefaultMutableTreeNode> functionProducer
@@ -30,7 +30,7 @@ public Directory(
     public Directory getDirectory(String name) {
         return directories.computeIfAbsent(
                 name,
-                (k) -> new Directory(k, directoryProducer, functionProducer)
+                (newName) -> new Directory(newName, directoryProducer, functionProducer)
         );
     }
 

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/metadata/tree/Leaf.java

@@ -5,9 +5,9 @@
 
 class Leaf implements TreeNode {
     private final String name;
-    private Function<TreeNode, DefaultMutableTreeNode> mutableTreeNodeProducer;
+    private final Function<TreeNode, DefaultMutableTreeNode> mutableTreeNodeProducer;
 
-    public Leaf(String name, Function<TreeNode, DefaultMutableTreeNode> mutableTreeNodeProducer) {
+    Leaf(String name, Function<TreeNode, DefaultMutableTreeNode> mutableTreeNodeProducer) {
         this.name = name;
         this.mutableTreeNodeProducer = mutableTreeNodeProducer;
     }

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/metadata/tree/MutableTreeNodeProducers.java

@@ -11,6 +11,9 @@
 
 public final class MutableTreeNodeProducers {
 
+    private MutableTreeNodeProducers() {
+    }
+
     public static Function<TreeNode, DefaultMutableTreeNode> function(Neo4jTreeNodeType type, DataSourceApi dataSourceApi) {
         return treeNode -> new PatchedDefaultMutableTreeNode(
                 new MetadataTreeNodeModel(type, dataSourceApi, treeNode.getName(), AllIcons.Nodes.Function)
@@ -23,6 +26,4 @@ public static Function<TreeNode, DefaultMutableTreeNode> directory(Neo4jTreeNode
         );
     }
 
-    private MutableTreeNodeProducers() {
-    }
 }

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/metadata/tree/Root.java

@@ -31,7 +31,7 @@ public Root(
     public Directory getDirectory(String name) {
         return directories.computeIfAbsent(
                 name,
-                (k) -> new Directory(k, directoryProducer, functionProducer)
+                (newName) -> new Directory(newName, directoryProducer, functionProducer)
         );
     }
 

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/metadata/tree/TreeNode.java

@@ -4,8 +4,8 @@
 
 public interface TreeNode {
 
-    public String getName();
+    String getName();
 
-    public DefaultMutableTreeNode getMutableTreeNode();
+    DefaultMutableTreeNode getMutableTreeNode();
 
 }

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/metadata/tree/TreeNodeDirectory.java

@@ -2,8 +2,8 @@
 
 public interface TreeNodeDirectory extends TreeNode {
 
-    public void addLeaf(String name);
+    void addLeaf(String name);
 
-    public TreeNodeDirectory getDirectory(String name);
+    TreeNodeDirectory getDirectory(String name);
 
 }