Polish.

neo4j · Mar 13, 2024 · 1df1165 · 1df1165
1 parent 39549b4
commit 1df1165
Show file tree

Hide file tree

Showing 30 changed files with 14 additions and 13 deletions.
diff --git a/neo4j-jdbc-it/neo4j-jdbc-stub-it/pom.xml → neo4j-jdbc-it/neo4j-jdbc-it-stub/pom.xml b/neo4j-jdbc-it/neo4j-jdbc-stub-it/pom.xml → neo4j-jdbc-it/neo4j-jdbc-it-stub/pom.xml
@@ -27,9 +27,9 @@
 		<artifactId>neo4j-jdbc-it</artifactId>
 		<version>6.0.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>neo4j-jdbc-stub-it</artifactId>
+	<artifactId>neo4j-jdbc-it-stub</artifactId>
 
-	<name>Neo4j JDBC Driver Stub IT</name>
+	<name>Neo4j JDBC Driver (IT w/ stub server)</name>
 	<description>Integration tests using the stub server.</description>
 
 	<properties>

diff --git a/.../org/neo4j/jdbc/stub/it/ConnectionIT.java → .../org/neo4j/jdbc/it/stub/ConnectionIT.java b/.../org/neo4j/jdbc/stub/it/ConnectionIT.java → .../org/neo4j/jdbc/it/stub/ConnectionIT.java
@@ -16,13 +16,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.jdbc.stub.it;
+package org.neo4j.jdbc.it.stub;
 
 import java.sql.SQLException;
 
 import org.junit.jupiter.api.Test;
-import org.neo4j.jdbc.stub.it.server.IntegrationTestBase;
-import org.neo4j.jdbc.stub.it.server.StubScript;
+import org.neo4j.jdbc.it.stub.server.IntegrationTestBase;
+import org.neo4j.jdbc.it.stub.server.StubScript;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;

diff --git a/...c/stub/it/server/IntegrationTestBase.java → ...c/it/stub/server/IntegrationTestBase.java b/...c/stub/it/server/IntegrationTestBase.java → ...c/it/stub/server/IntegrationTestBase.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.jdbc.stub.it.server;
+package org.neo4j.jdbc.it.stub.server;
 
 import java.sql.Connection;
 import java.sql.DriverManager;

diff --git a/...neo4j/jdbc/stub/it/server/StubScript.java → ...neo4j/jdbc/it/stub/server/StubScript.java b/...neo4j/jdbc/stub/it/server/StubScript.java → ...neo4j/jdbc/it/stub/server/StubScript.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.jdbc.stub.it.server;
+package org.neo4j.jdbc.it.stub.server;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...jdbc/stub/it/server/StubScriptConfig.java → ...jdbc/it/stub/server/StubScriptConfig.java b/...jdbc/stub/it/server/StubScriptConfig.java → ...jdbc/it/stub/server/StubScriptConfig.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.jdbc.stub.it.server;
+package org.neo4j.jdbc.it.stub.server;
 
 record StubScriptConfig(String path) {
 }
diff --git a/...er/StubScriptConfigParameterResolver.java → ...er/StubScriptConfigParameterResolver.java b/...er/StubScriptConfigParameterResolver.java → ...er/StubScriptConfigParameterResolver.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.jdbc.stub.it.server;
+package org.neo4j.jdbc.it.stub.server;
 
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;

diff --git a/...c/stub/it/server/StubServerException.java → ...c/it/stub/server/StubServerException.java b/...c/stub/it/server/StubServerException.java → ...c/it/stub/server/StubServerException.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.jdbc.stub.it.server;
+package org.neo4j.jdbc.it.stub.server;
 
 import java.io.Serial;
 

diff --git a/.../StubServerExecutionExceptionHandler.java → .../StubServerExecutionExceptionHandler.java b/.../StubServerExecutionExceptionHandler.java → .../StubServerExecutionExceptionHandler.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.neo4j.jdbc.stub.it.server;
+package org.neo4j.jdbc.it.stub.server;
 
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.TestExecutionExceptionHandler;

diff --git a/...b-it/src/test/resources/docker/Dockerfile → ...stub/src/test/resources/docker/Dockerfile b/...b-it/src/test/resources/docker/Dockerfile → ...stub/src/test/resources/docker/Dockerfile
diff --git a/...t/src/test/resources/docker/entrypoint.sh → ...b/src/test/resources/docker/entrypoint.sh b/...t/src/test/resources/docker/entrypoint.sh → ...b/src/test/resources/docker/entrypoint.sh
diff --git a/...int/timeout/write_tx_with_1_delays.script → ...int/timeout/write_tx_with_1_delays.script b/...int/timeout/write_tx_with_1_delays.script → ...int/timeout/write_tx_with_1_delays.script
diff --git a/...meout/writer_tx_with_begin_2_delay.script → ...meout/writer_tx_with_begin_2_delay.script b/...meout/writer_tx_with_begin_2_delay.script → ...meout/writer_tx_with_begin_2_delay.script
diff --git a/...eout/writer_tx_with_commit_2_delay.script → ...eout/writer_tx_with_commit_2_delay.script b/...eout/writer_tx_with_commit_2_delay.script → ...eout/writer_tx_with_commit_2_delay.script
diff --git a/...imeout/writer_tx_with_pull_2_delay.script → ...imeout/writer_tx_with_pull_2_delay.script b/...imeout/writer_tx_with_pull_2_delay.script → ...imeout/writer_tx_with_pull_2_delay.script
diff --git a/...ut/writer_tx_with_rollback_2_delay.script → ...ut/writer_tx_with_rollback_2_delay.script b/...ut/writer_tx_with_rollback_2_delay.script → ...ut/writer_tx_with_rollback_2_delay.script
diff --git a/...timeout/writer_tx_with_run_2_delay.script → ...timeout/writer_tx_with_run_2_delay.script b/...timeout/writer_tx_with_run_2_delay.script → ...timeout/writer_tx_with_run_2_delay.script
diff --git a/...riter_tx_with_second_begin_timeout.script → ...riter_tx_with_second_begin_timeout.script b/...riter_tx_with_second_begin_timeout.script → ...riter_tx_with_second_begin_timeout.script
diff --git a/...docker/scripts/reader_tx_with_mode.script → ...docker/scripts/reader_tx_with_mode.script b/...docker/scripts/reader_tx_with_mode.script → ...docker/scripts/reader_tx_with_mode.script
diff --git a/.../scripts/server_with_reset_1_delay.script → .../scripts/server_with_reset_1_delay.script b/.../scripts/server_with_reset_1_delay.script → .../scripts/server_with_reset_1_delay.script
diff --git a/...ker/scripts/write_tx_with_1_delays.script → ...ker/scripts/write_tx_with_1_delays.script b/...ker/scripts/write_tx_with_1_delays.script → ...ker/scripts/write_tx_with_1_delays.script
diff --git a/...ts/writer_tx_with_2nd_pull_1_delay.script → ...ts/writer_tx_with_2nd_pull_1_delay.script b/...ts/writer_tx_with_2nd_pull_1_delay.script → ...ts/writer_tx_with_2nd_pull_1_delay.script
diff --git a/...pts/writer_tx_with_2nd_run_1_delay.script → ...pts/writer_tx_with_2nd_run_1_delay.script b/...pts/writer_tx_with_2nd_run_1_delay.script → ...pts/writer_tx_with_2nd_run_1_delay.script
diff --git a/...ripts/writer_tx_with_begin_1_delay.script → ...ripts/writer_tx_with_begin_1_delay.script b/...ripts/writer_tx_with_begin_1_delay.script → ...ripts/writer_tx_with_begin_1_delay.script
diff --git a/...ipts/writer_tx_with_commit_1_delay.script → ...ipts/writer_tx_with_commit_1_delay.script b/...ipts/writer_tx_with_commit_1_delay.script → ...ipts/writer_tx_with_commit_1_delay.script
diff --git a/...cripts/writer_tx_with_pull_1_delay.script → ...cripts/writer_tx_with_pull_1_delay.script b/...cripts/writer_tx_with_pull_1_delay.script → ...cripts/writer_tx_with_pull_1_delay.script
diff --git a/...ts/writer_tx_with_rollback_1_delay.script → ...ts/writer_tx_with_rollback_1_delay.script b/...ts/writer_tx_with_rollback_1_delay.script → ...ts/writer_tx_with_rollback_1_delay.script
diff --git a/...scripts/writer_tx_with_run_1_delay.script → ...scripts/writer_tx_with_run_1_delay.script b/...scripts/writer_tx_with_run_1_delay.script → ...scripts/writer_tx_with_run_1_delay.script
diff --git a/neo4j-jdbc-it/pom.xml b/neo4j-jdbc-it/pom.xml
@@ -34,7 +34,7 @@
 	<description>Parent project for the integration tests</description>
 
 	<modules>
-		<module>neo4j-jdbc-stub-it</module>
+		<module>neo4j-jdbc-it-stub</module>
 		<module>neo4j-jdbc-it-cp</module>
 		<module>neo4j-jdbc-it-mp</module>
 		<module>spring-boot-smoke-tests</module>

diff --git a/neo4j-jdbc/src/main/java/org/neo4j/jdbc/ConnectionImpl.java b/neo4j-jdbc/src/main/java/org/neo4j/jdbc/ConnectionImpl.java
@@ -623,7 +623,7 @@ public void abort(Executor ignored) throws SQLException {
 	public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
 		assertIsOpen();
 		if (milliseconds < 0) {
-			throw new SQLException("The network timeout must not be negative.");
+			throw new SQLException("The network timeout must not be negative");
 		}
 		this.networkTimeout = milliseconds;
 		if (milliseconds == 0) {

diff --git a/pom.xml b/pom.xml
@@ -317,6 +317,7 @@
 									<exclude>**/*.conf</exclude>
 									<exclude>**/*.csv</exclude>
 									<exclude>**/*.cypher</exclude>
+									<exclude>**/*.script</exclude>
 									<exclude>**/*.tpl</exclude>
 									<exclude>**/.env</exclude>
 									<exclude>**/org.mockito.plugins.MockMaker</exclude>