Skip to content

Commit d6641b0

Browse files
authored
Revert "Dispatch empty query to server (#1195)" (#1204)
This reverts commit 34035cf.
1 parent e8de6ca commit d6641b0

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

driver/src/main/java/org/neo4j/driver/Query.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
import org.neo4j.driver.util.Immutable;
2626

2727
import static java.lang.String.format;
28-
import static org.neo4j.driver.Values.ofValue;
29-
import static org.neo4j.driver.Values.value;
3028
import static org.neo4j.driver.internal.util.Iterables.newHashMapWithSize;
3129
import static org.neo4j.driver.internal.util.Preconditions.checkArgument;
30+
import static org.neo4j.driver.Values.ofValue;
31+
import static org.neo4j.driver.Values.value;
3232

3333
/**
3434
* The components of a Cypher query, containing the query text and parameter map.
@@ -201,6 +201,7 @@ public String toString()
201201
private static String validateQueryText(String query )
202202
{
203203
checkArgument( query != null, "Cypher query text should not be null" );
204+
checkArgument( !query.isEmpty(), "Cypher query text should not be an empty string" );
204205
return query;
205206
}
206207
}

driver/src/test/java/org/neo4j/driver/QueryTest.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import static org.hamcrest.Matchers.equalTo;
2727
import static org.hamcrest.junit.MatcherAssert.assertThat;
28-
import static org.junit.jupiter.api.Assertions.assertNotNull;
2928
import static org.junit.jupiter.api.Assertions.assertThrows;
3029
import static org.neo4j.driver.Values.parameters;
3130

@@ -122,12 +121,8 @@ void shouldProhibitNullQuery()
122121
}
123122

124123
@Test
125-
void shouldAcceptEmptyQuery()
124+
void shouldProhibitEmptyQuery()
126125
{
127-
// when
128-
Query query = new Query( "" );
129-
130-
// then
131-
assertNotNull( query );
126+
assertThrows( IllegalArgumentException.class, () -> new Query( "" ) );
132127
}
133128
}

driver/src/test/java/org/neo4j/driver/integration/QueryIT.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@
1818
*/
1919
package org.neo4j.driver.integration;
2020

21+
import org.junit.jupiter.api.Assertions;
2122
import org.junit.jupiter.api.Test;
2223
import org.junit.jupiter.api.extension.RegisterExtension;
24+
import org.junit.jupiter.api.function.Executable;
2325

26+
import java.io.PrintWriter;
27+
import java.io.StringWriter;
2428
import java.util.Collections;
2529
import java.util.Iterator;
2630
import java.util.List;
@@ -30,13 +34,13 @@
3034
import org.neo4j.driver.Result;
3135
import org.neo4j.driver.Value;
3236
import org.neo4j.driver.Values;
33-
import org.neo4j.driver.exceptions.ClientException;
3437
import org.neo4j.driver.util.ParallelizableIT;
3538
import org.neo4j.driver.util.SessionExtension;
3639

3740
import static java.util.Arrays.asList;
3841
import static org.hamcrest.CoreMatchers.equalTo;
3942
import static org.hamcrest.MatcherAssert.assertThat;
43+
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
4044
import static org.junit.jupiter.api.Assertions.assertThrows;
4145
import static org.neo4j.driver.Values.parameters;
4246
import static org.neo4j.driver.util.TestUtil.assertNoCircularReferences;
@@ -182,7 +186,7 @@ void shouldRunSimpleQuery()
182186
void shouldFailForIllegalQueries()
183187
{
184188
assertThrows( IllegalArgumentException.class, () -> session.run( (String) null ) );
185-
assertThrows( ClientException.class, () -> session.run( "" ) );
189+
assertThrows( IllegalArgumentException.class, () -> session.run( "" ) );
186190
}
187191

188192
@Test

0 commit comments

Comments
 (0)