Skip to content

Catching neo4j related exceptions while executing explain query in ins… #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 11, 2017
Merged

Catching neo4j related exceptions while executing explain query in ins… #21

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5c13f3
Catching neo4j related exeptions while executing explain query in ins…
Metaur Jan 11, 2017
9b43d2c
Removed explicit data source setup
Metaur Jan 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...db/test/integration/neo4j/tests/cypher/inspection/CypherExplainWarningInspectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,9 @@ public void testDataSourceFile_UserCreatedDSLikeFile() {
addFileAndCheck(GraphConstants.BOUND_DATA_SOURCE_PREFIX + "ds-uuid-with-23-symbols.cypher",
"MATCH (a:Turbo)-->() RETURN *;");
}

public void testDataSourceFile_DBIsUnavailable() {
//no highlight and no exception
addUnavailableDataSourceFileAndCheck("MATCH (a:Turbo)-->() RETURN *;");
}
}
13 changes: 6 additions & 7 deletions ...jetbrains/plugin/graphdb/test/integration/neo4j/tests/cypher/util/BaseInspectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@
import com.neueda.jetbrains.plugin.graphdb.jetbrains.util.NameUtil;
import com.neueda.jetbrains.plugin.graphdb.test.integration.neo4j.util.base.BaseIntegrationTest;

import java.util.Optional;
import java.util.Set;

public abstract class BaseInspectionTest extends BaseIntegrationTest {
private String dsApiUUID;

@Override
public void setUp() throws Exception {
super.setUp();
this.dsApiUUID = dataSource().neo4j31().getUUID();
dataSource().neo4j31();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? Explicit call is not need in setup.

myFixture.enableInspections(provideInspectionClasses());
}

Expand All @@ -27,11 +25,12 @@ protected void addFileAndCheck(String filePath, String fileContent) {
}

protected void addDataSourceFileAndCheck(String fileContent) {
String fileName = Optional.of(dsApiUUID)
.flatMap(uuid -> component().dataSources().getDataSourceContainer().findDataSource(uuid))
.map(NameUtil::createDataSourceFileName)
.orElseThrow(IllegalStateException::new);
String fileName = NameUtil.createDataSourceFileName(dataSource().neo4j31());
addFileAndCheck(fileName, fileContent);
}

protected void addUnavailableDataSourceFileAndCheck(String fileContent) {
String fileName = NameUtil.createDataSourceFileName(dataSource().unavailable());
addFileAndCheck(fileName, fileContent);
}

Expand Down
47 changes: 36 additions & 11 deletions ...neueda/jetbrains/plugin/graphdb/test/integration/neo4j/util/base/BaseIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.neueda.jetbrains.plugin.graphdb.test.integration.neo4j.util.base;

import java.util.*;

import com.intellij.openapi.components.ServiceManager;
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
import com.neueda.jetbrains.plugin.graphdb.database.neo4j.bolt.Neo4jBoltConfiguration;
Expand All @@ -14,10 +12,16 @@
import com.neueda.jetbrains.plugin.graphdb.test.integration.neo4j.util.server.Neo4j30ServerLoader;
import com.neueda.jetbrains.plugin.graphdb.test.integration.neo4j.util.server.Neo4j31ServerLoader;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

public abstract class BaseIntegrationTest extends LightCodeInsightFixtureTestCase {

private static final String NEO4J30 = "neo4j30";
private static final String NEO4J31 = "neo4j31";
private static final String UNAVAILABLE_DS = "unavailable";

private Components components;
private DataSources dataSources;
Expand Down Expand Up @@ -48,21 +52,25 @@ public DataSources dataSource() {
return dataSources;
}

private DataSourceApi createDataSource(String name, Neo4jServer neo4jServer) {
private DataSourceApi createDataSource(String name, String host, String port, String user, String password) {
Map<String, String> configuration = new HashMap<>();
configuration.put(Neo4jBoltConfiguration.HOST, neo4jServer.getBoltHost());
configuration.put(Neo4jBoltConfiguration.PORT, neo4jServer.getBoltPort());
configuration.put(Neo4jBoltConfiguration.USER, null);
configuration.put(Neo4jBoltConfiguration.PASSWORD, null);
configuration.put(Neo4jBoltConfiguration.HOST, host);
configuration.put(Neo4jBoltConfiguration.PORT, port);
configuration.put(Neo4jBoltConfiguration.USER, user);
configuration.put(Neo4jBoltConfiguration.PASSWORD, password);

return component().dataSources().getDataSourceContainer().createDataSource(
null,
DataSourceType.NEO4J_BOLT,
name,
configuration
null,
DataSourceType.NEO4J_BOLT,
name,
configuration
);
}

private DataSourceApi createDataSource(String name, Neo4jServer neo4jServer) {
return createDataSource(name, neo4jServer.getBoltHost(), neo4jServer.getBoltPort(), null, null);
}

public final class Services {
public CypherMetadataProviderService cypherMetadataProvider() {
return ServiceManager.getService(getProject(), CypherMetadataProviderService.class);
Expand All @@ -86,6 +94,7 @@ public DataSourcesComponentMetadata dataSourcesMetadata() {
public final class DataSources {
private DataSourceApi neo4j30DataSource;
private DataSourceApi neo4j31DataSource;
private DataSourceApi unavalableDataSource;

public DataSourceApi neo4j30() {
if (neo4j30DataSource == null) {
Expand Down Expand Up @@ -116,5 +125,21 @@ public DataSourceApi neo4j31() {
}
return neo4j31DataSource;
}

public DataSourceApi unavailable() {
if (unavalableDataSource == null) {
unavalableDataSource = component().dataSources()
.getDataSourceContainer()
.getDataSource(UNAVAILABLE_DS)
.orElseGet(() -> {
DataSourceApi dataSource = createDataSource(UNAVAILABLE_DS, "unexisting.domain.dev",
"7474", null, null);
component().dataSources().getDataSourceContainer().addDataSource(dataSource);
component().dataSources().refreshAllMetadata();
return dataSource;
});
}
return unavalableDataSource;
}
}
}
4 changes: 2 additions & 2 deletions .../neueda/jetbrains/plugin/graphdb/jetbrains/inspection/CypherExplainWarningInspection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import com.neueda.jetbrains.plugin.graphdb.language.cypher.psi.CypherTypes;
import com.neueda.jetbrains.plugin.graphdb.platform.GraphConstants;
import org.jetbrains.annotations.NotNull;
import org.neo4j.driver.v1.exceptions.ClientException;
import org.neo4j.driver.v1.exceptions.Neo4jException;

import java.util.Objects;
import java.util.Optional;
Expand Down Expand Up @@ -78,7 +78,7 @@ private void checkStatement(@NotNull PsiElement statement, @NotNull ProblemsHold
private GraphQueryResult executeExplainQuery(GraphDatabaseApi api, String query) {
try {
return api.execute("EXPLAIN " + query);
} catch (ClientException ex) {
} catch (Neo4jException ex) {
return null;
}
}
Expand Down