Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions benchkit-backend/LICENSES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ Apache Software License, Version 2.0
Jackson-annotations
Jackson-core
jackson-databind
Neo4j Bolt Connection (Netty reference impl)
Neo4j Bolt Connection (Pooled provider impl)
Neo4j Bolt Connection (Bolt Provider reference impl)
Neo4j Bolt Connection (Pooled Source impl)
Neo4j Bolt Connection (Provider SPI)
Neo4j Bolt Connection (Routed provider impl)
Neo4j Bolt Connection (Routed Source impl)
Netty/Buffer
Netty/Codec
Netty/Codec/Base
Netty/Codec/Compression
Netty/Codec/HTTP
Netty/Common
Netty/Handler
Expand Down
9 changes: 5 additions & 4 deletions benchkit-backend/NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@ Apache Software License, Version 2.0
Jackson-annotations
Jackson-core
jackson-databind
Neo4j Bolt Connection (Netty reference impl)
Neo4j Bolt Connection (Pooled provider impl)
Neo4j Bolt Connection (Bolt Provider reference impl)
Neo4j Bolt Connection (Pooled Source impl)
Neo4j Bolt Connection (Provider SPI)
Neo4j Bolt Connection (Routed provider impl)
Neo4j Bolt Connection (Routed Source impl)
Netty/Buffer
Netty/Codec
Netty/Codec/Base
Netty/Codec/Compression
Netty/Codec/HTTP
Netty/Common
Netty/Handler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.MultiThreadIoEventLoopGroup;
import io.netty.channel.nio.NioIoHandler;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.handler.codec.http.HttpObjectAggregator;
Expand All @@ -33,12 +34,9 @@
public class Runner {
public static void main(String[] args) throws InterruptedException {
var config = Config.load();
var driver = GraphDatabase.driver(
config.uri(),
config.authToken(),
org.neo4j.driver.Config.builder().withLogging(config.logging()).build());
var driver = GraphDatabase.driver(config.uri(), config.authToken());

EventLoopGroup group = new NioEventLoopGroup();
EventLoopGroup group = new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory());
var logging = config.logging();
var executor = Executors.newCachedThreadPool();
var workloadHandler = new WorkloadHandler(driver, executor, logging);
Expand Down
8 changes: 4 additions & 4 deletions bundle/LICENSES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ libraries. For an overview of the licenses see the NOTICE.txt file.

------------------------------------------------------------------------------
Apache Software License, Version 2.0
Neo4j Bolt Connection (Netty reference impl)
Neo4j Bolt Connection (Pooled provider impl)
Neo4j Bolt Connection (Bolt Provider reference impl)
Neo4j Bolt Connection (Pooled Source impl)
Neo4j Bolt Connection (Provider SPI)
Neo4j Bolt Connection (Routed provider impl)
Neo4j Bolt Connection (Routed Source impl)
Netty/Buffer
Netty/Codec
Netty/Codec/Base
Netty/Common
Netty/Handler
Netty/Resolver
Expand Down
8 changes: 4 additions & 4 deletions bundle/NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ Third-party licenses
--------------------

Apache Software License, Version 2.0
Neo4j Bolt Connection (Netty reference impl)
Neo4j Bolt Connection (Pooled provider impl)
Neo4j Bolt Connection (Bolt Provider reference impl)
Neo4j Bolt Connection (Pooled Source impl)
Neo4j Bolt Connection (Provider SPI)
Neo4j Bolt Connection (Routed provider impl)
Neo4j Bolt Connection (Routed Source impl)
Netty/Buffer
Netty/Codec
Netty/Codec/Base
Netty/Common
Netty/Handler
Netty/Resolver
Expand Down
8 changes: 4 additions & 4 deletions driver/LICENSES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ libraries. For an overview of the licenses see the NOTICE.txt file.

------------------------------------------------------------------------------
Apache Software License, Version 2.0
Neo4j Bolt Connection (Netty reference impl)
Neo4j Bolt Connection (Pooled provider impl)
Neo4j Bolt Connection (Bolt Provider reference impl)
Neo4j Bolt Connection (Pooled Source impl)
Neo4j Bolt Connection (Provider SPI)
Neo4j Bolt Connection (Routed provider impl)
Neo4j Bolt Connection (Routed Source impl)
Netty/Buffer
Netty/Codec
Netty/Codec/Base
Netty/Common
Netty/Handler
Netty/Resolver
Expand Down
8 changes: 4 additions & 4 deletions driver/NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ Third-party licenses
--------------------

Apache Software License, Version 2.0
Neo4j Bolt Connection (Netty reference impl)
Neo4j Bolt Connection (Pooled provider impl)
Neo4j Bolt Connection (Bolt Provider reference impl)
Neo4j Bolt Connection (Pooled Source impl)
Neo4j Bolt Connection (Provider SPI)
Neo4j Bolt Connection (Routed provider impl)
Neo4j Bolt Connection (Routed Source impl)
Netty/Buffer
Netty/Codec
Netty/Codec/Base
Netty/Common
Netty/Handler
Netty/Resolver
Expand Down
26 changes: 25 additions & 1 deletion driver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
<rootDir>${project.basedir}/..</rootDir>
<api.classes.directory>${basedir}/target/classes-without-jpms</api.classes.directory>
<maven.compiler.xlint.extras>,-try</maven.compiler.xlint.extras>
<failsafe.parallelizable.jpms.args>--add-opens org.neo4j.driver/org.neo4j.driver.internal.util=ALL-UNNAMED --add-opens org.neo4j.driver/org.neo4j.driver.internal.async=ALL-UNNAMED</failsafe.parallelizable.jpms.args>
<surefire.jpms.args>--add-reads org.neo4j.driver=io.netty.common --add-reads org.neo4j.driver=org.bouncycastle.provider --add-reads org.neo4j.driver=org.bouncycastle.pkix</surefire.jpms.args>
<failsafe.parallelizable.jpms.args>--add-opens org.neo4j.driver/org.neo4j.driver.internal.util=ALL-UNNAMED --add-opens org.neo4j.driver/org.neo4j.driver.internal.async=ALL-UNNAMED --add-reads org.neo4j.driver=io.netty.common --add-reads org.neo4j.driver=org.bouncycastle.provider --add-reads org.neo4j.driver=org.bouncycastle.pkix</failsafe.parallelizable.jpms.args>
<failsafe.sequential.jpms.args>--add-reads org.neo4j.driver=org.bouncycastle.provider --add-reads org.neo4j.driver=org.bouncycastle.pkix</failsafe.sequential.jpms.args>
<blockhound.tag>blockHoundTest</blockhound.tag>
<maven.deploy.skip>false</maven.deploy.skip>
</properties>
Expand Down Expand Up @@ -264,6 +266,28 @@
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit-platform</artifactId>
<version>${surefire.and.failsafe.version}</version>
<exclusions>
<exclusion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
</exclusion>
<exclusion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
</exclusion>
<exclusion>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
</exclusion>
<exclusion>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
Expand Down
1 change: 0 additions & 1 deletion driver/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
requires org.neo4j.bolt.connection.pooled;
requires org.neo4j.bolt.connection.routed;
requires reactor.core;
requires io.netty.common;
requires transitive java.logging;
requires transitive org.reactivestreams;
requires static micrometer.core;
Expand Down
3 changes: 1 addition & 2 deletions driver/src/main/java/org/neo4j/driver/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING;
import static org.neo4j.driver.internal.util.DriverInfoUtil.driverVersion;

import io.netty.channel.EventLoop;
import java.io.File;
import java.io.Serial;
import java.io.Serializable;
Expand Down Expand Up @@ -349,7 +348,7 @@ public Set<NotificationClassification> disabledNotificationClassifications() {
}

/**
* Returns the number of {@link EventLoop} threads.
* Returns the number of EventLoop threads.
*
* @return the number of threads
*/
Expand Down
Loading