Metadata refactoring (#42)

Further refactoring metadata logic

Author: albertoventurini

database/api/src/main/java/com/albertoventurini/graphdbplugin/database/api/query/GraphQueryResultRow.java

@@ -10,7 +10,6 @@
 import com.albertoventurini.graphdbplugin.database.api.data.GraphRelationship;
 
 import java.util.List;
-import java.util.Optional;
 
 public interface GraphQueryResultRow {
 

testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/database/common/AbstractDataSourceMetadataTest.java

@@ -7,7 +7,7 @@
 package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.database.common;
 
 import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.DataSourceMetadata;
-import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.Neo4jProcedureMetadata;
+import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jProcedureMetadata;
 import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi;
 import com.albertoventurini.graphdbplugin.test.integration.neo4j.util.base.BaseIntegrationTest;
 

testing/integration-neo4j/src/test/java/com/albertoventurini/graphdbplugin/test/integration/neo4j/tests/database/neo4j/DataSourceMetadataTest.java

@@ -7,7 +7,7 @@
 package com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.database.neo4j;
 
 import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.DataSourceMetadata;
-import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.Neo4jFunctionMetadata;
+import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jFunctionMetadata;
 import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi;
 import com.albertoventurini.graphdbplugin.test.integration.neo4j.tests.database.common.AbstractDataSourceMetadataTest;
 

ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/DataSourceMetadata.java

@@ -6,18 +6,20 @@
  */
 package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata;
 
+import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jConstraintMetadata;
+import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jFunctionMetadata;
+import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jIndexMetadata;
+import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jProcedureMetadata;
+
 import java.util.List;
-import java.util.Map;
 
 public interface DataSourceMetadata {
 
-    List<Map<String, String>> getMetadata(String metadataKey);
-
     List<Neo4jFunctionMetadata> getFunctions();
 
     List<Neo4jProcedureMetadata> getProcedures();
 
     List<Neo4jIndexMetadata> getIndexes();
 
-    boolean isMetadataExists(String metadataKey);
+    List<Neo4jConstraintMetadata> getConstraints();
 }

ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/DataSourcesComponentMetadata.java

@@ -7,29 +7,23 @@
 package com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata;
 
 import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.DataSourceType;
+import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jBoltCypherDataSourceMetadata;
+import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jLabelMetadata;
+import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jMetadataBuilder;
+import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.metadata.neo4j.Neo4jRelationshipTypeMetadata;
 import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi;
-import com.albertoventurini.graphdbplugin.jetbrains.database.DatabaseManagerService;
 import com.albertoventurini.graphdbplugin.jetbrains.services.ExecutorService;
 import com.albertoventurini.graphdbplugin.jetbrains.ui.datasource.metadata.MetadataRetrieveEvent;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.messages.MessageBus;
-import com.albertoventurini.graphdbplugin.database.api.GraphDatabaseApi;
-import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResult;
-import com.albertoventurini.graphdbplugin.database.api.query.GraphQueryResultColumn;
 import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.CypherMetadataContainer;
 import com.albertoventurini.graphdbplugin.language.cypher.completion.metadata.CypherMetadataProviderService;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import static java.util.stream.Collectors.toList;
 
 public class DataSourcesComponentMetadata {
 
@@ -80,16 +74,14 @@ private void updateNeo4jBoltMetadata(DataSourceApi dataSource, Neo4jBoltCypherDa
 
         metadata.getLabels()
                 .stream()
-                .map(Neo4jLabelMetadata::getName)
+                .map(Neo4jLabelMetadata::name)
                 .forEach(container::addLabel);
         metadata.getRelationshipTypes()
                 .stream()
-                .map(Neo4jRelationshipTypeMetadata::getName)
+                .map(Neo4jRelationshipTypeMetadata::name)
                 .forEach(container::addRelationshipType);
-        metadata.getMetadata(Neo4jBoltCypherDataSourceMetadata.PROPERTY_KEYS).stream()
-                .map((row) -> row.get("propertyKey"))
-                .forEach(container::addPropertyKey);
 
+        metadata.getPropertyKeys().forEach(container::addPropertyKey);
         metadata.getProcedures().forEach(p -> container.addProcedure(p.name(), p.signature(), p.description()));
         metadata.getFunctions().forEach(f -> container.addFunction(f.name(), f.signature(), f.description()));
     }

ui/jetbrains/src/main/java/com/albertoventurini/graphdbplugin/jetbrains/component/datasource/metadata/MetadataBuilder.java

@@ -2,6 +2,6 @@
 
 import com.albertoventurini.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi;
 
-interface MetadataBuilder {
+public interface MetadataBuilder {
     DataSourceMetadata buildMetadata(DataSourceApi dataSource);
 }