Skip to content

Dispatch empty query to server #1195

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
injectives merged 1 commit into from
Mar 23, 2022
Merged

Dispatch empty query to server #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 3 deletions driver/src/main/java/org/neo4j/driver/Query.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
import org.neo4j.driver.util.Immutable;

import static java.lang.String.format;
import static org.neo4j.driver.internal.util.Iterables.newHashMapWithSize;
import static org.neo4j.driver.internal.util.Preconditions.checkArgument;
import static org.neo4j.driver.Values.ofValue;
import static org.neo4j.driver.Values.value;
import static org.neo4j.driver.internal.util.Iterables.newHashMapWithSize;
import static org.neo4j.driver.internal.util.Preconditions.checkArgument;

/**
* The components of a Cypher query, containing the query text and parameter map.
Expand Down Expand Up @@ -201,7 +201,6 @@ public String toString()
private static String validateQueryText(String query )
{
checkArgument( query != null, "Cypher query text should not be null" );
checkArgument( !query.isEmpty(), "Cypher query text should not be an empty string" );
return query;
}
}
9 changes: 7 additions & 2 deletions driver/src/test/java/org/neo4j/driver/QueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.junit.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.neo4j.driver.Values.parameters;

Expand Down Expand Up @@ -121,8 +122,12 @@ void shouldProhibitNullQuery()
}

@Test
void shouldProhibitEmptyQuery()
void shouldAcceptEmptyQuery()
{
assertThrows( IllegalArgumentException.class, () -> new Query( "" ) );
// when
Query query = new Query( "" );

// then
assertNotNull( query );
}
}
8 changes: 2 additions & 6 deletions driver/src/test/java/org/neo4j/driver/integration/QueryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,9 @@
*/
package org.neo4j.driver.integration;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.function.Executable;

import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
Expand All @@ -34,13 +30,13 @@
import org.neo4j.driver.Result;
import org.neo4j.driver.Value;
import org.neo4j.driver.Values;
import org.neo4j.driver.exceptions.ClientException;
import org.neo4j.driver.util.ParallelizableIT;
import org.neo4j.driver.util.SessionExtension;

import static java.util.Arrays.asList;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.neo4j.driver.Values.parameters;
import static org.neo4j.driver.util.TestUtil.assertNoCircularReferences;
Expand Down Expand Up @@ -186,7 +182,7 @@ void shouldRunSimpleQuery()
void shouldFailForIllegalQueries()
{
assertThrows( IllegalArgumentException.class, () -> session.run( (String) null ) );
assertThrows( IllegalArgumentException.class, () -> session.run( "" ) );
assertThrows( ClientException.class, () -> session.run( "" ) );
}

@Test
Expand Down