Refactoring (#1476)

Author: injectives

CONTRIBUTING.md

@@ -47,7 +47,7 @@ If you want to contribute a pull request, we have a little bit of process you'll
 - Take a moment to read and sign our [CLA](http://neo4j.com/developer/cla)
 
 We can't guarantee that we'll accept pull requests and may ask you to make some changes before they go in.
-Occasionally, we might also have logistical, commercial, or legal reasons why we can't accept your work but we'll try to find an alternative way for you to contribute in that case.
+Occasionally, we might also have logistical, commercial, or legal reasons why we can't accept your work, but we'll try to find an alternative way for you to contribute in that case.
 Remember that many community members have become regular contributors and some are now even Neo employees!
 
 

ISSUE_TEMPLATE.md

@@ -15,15 +15,15 @@ To help us understand your issue, please specify important details, primarily:
 
 - Neo4j version: Community/Enterprise X.Y.Z
 - Neo4j Mode: Single instance/HA cluster with X members/Casual cluster with X core Y read-replica
-- Driver version: X lanaguage driver X.Y.Z (If you use some other library that wraps around this driver, you might want to raise an issue there first)
+- Driver version: X language driver X.Y.Z (If you use some other library that wraps around this driver, you might want to raise an issue there first)
 - Operating system: (for example Windows 10/Ubuntu 16.10 on AWS)
 - **Steps to reproduce**
 - Expected behavior
 - Actual behavior
 
 Additionally, include (as appropriate) log-files, stacktraces, and other debug output.
 Always check the server logs to see if there is any stacktrace related to the driver error too.
-Aslo add any solutions you've tried to solve the problem yourself.
+Also, add any solutions you've tried to solve the problem yourself.
 
 ## Example bug report
 
@@ -35,7 +35,7 @@ I got connection reset by peer errors.
 **Operating System:** Ubuntu 16.10 on AWS  
 
 ### Steps to reproduce
-1. Start Neo4j on a AWS instance
+1. Start Neo4j on an AWS instance
 2. Run a query with the driver
 3. Put the driver idle for 2h
 4. Run another query

README.md

@@ -142,7 +142,7 @@ There are 2 ways of running Testkit tests:
 
 ##### Using the testkit-tests module
 
-The `testkit-tests` module will automatically checkout Testkit and run it during Maven build.
+The `testkit-tests` module will automatically check out Testkit and run it during Maven build.
 
 Prerequisites:
 - Docker
@@ -189,7 +189,7 @@ TEST_DOCKER_RMI=true \
 python3 main.py --tests TESTKIT_TESTS UNIT_TESTS --configs 4.3-enterprise
 ````
 
-On Windows or in the abscence of a Bash-compatible environment, the required steps are probably different.
+On Windows or in the absence of a Bash-compatible environment, the required steps are probably different.
 A simple `mvn clean install` will require admin rights on Windows, because our integration tests require admin privileges to install and start a service.
 
 If all of this fails and you only want to try out a local development version of the driver, you could skip all tests like this:

driver/pom.xml

@@ -69,7 +69,7 @@
     <!-- Test dependencies -->
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-junit</artifactId>
+      <artifactId>hamcrest</artifactId>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>

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

@@ -390,6 +390,7 @@ public ConfigBuilder withLogging(Logging logging) {
          *
          * @return this builder
          */
+        @SuppressWarnings("deprecation")
         public ConfigBuilder withLeakedSessionsLogging() {
             this.logLeakedSessions = true;
             return this;

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

@@ -377,6 +377,7 @@ default AsyncSession asyncSession(SessionConfig sessionConfig) {
      */
     @Experimental
     @Deprecated
+    @SuppressWarnings("SameReturnValue")
     TypeSystem defaultTypeSystem();
 
     /**

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

@@ -143,6 +143,7 @@ static Logging console(Level level) {
      *
      * @return new logging implementation.
      */
+    @SuppressWarnings("SameReturnValue")
     static Logging none() {
         return DEV_NULL_LOGGING;
     }

driver/src/main/java/org/neo4j/driver/exceptions/AuthTokenManagerExecutionException.java

@@ -29,7 +29,7 @@
  * <ul>
  *     <li>{@link AuthTokenManager#getToken()} returned {@code null}</li>
  *     <li>{@link AuthTokenManager#getToken()} returned a {@link java.util.concurrent.CompletionStage} that completed with {@code null}</li>
- *     <li>{@link AuthTokenManager#getToken()} returned a {@link java.util.concurrent.CompletionStage} that completed with a token that was not creeated using {@link org.neo4j.driver.AuthTokens}</li>
+ *     <li>{@link AuthTokenManager#getToken()} returned a {@link java.util.concurrent.CompletionStage} that completed with a token that was not created using {@link org.neo4j.driver.AuthTokens}</li>
  *     <li>{@link AuthTokenManager#getToken()} has thrown an exception</li>
  *     <li>{@link AuthTokenManager#getToken()} returned a {@link java.util.concurrent.CompletionStage} that completed exceptionally</li>
  * </ul>

driver/src/main/java/org/neo4j/driver/internal/InternalPath.java

@@ -89,7 +89,7 @@ public InternalPath(List<Entity> alternatingNodeAndRel) {
                 // even index - this should be a node
                 try {
                     lastNode = (Node) entity;
-                    if (nodes.isEmpty() || isEndpoint(lastNode, lastRelationship)) {
+                    if (nodes.isEmpty() || (lastRelationship != null && isEndpoint(lastNode, lastRelationship))) {
                         nodes.add(lastNode);
                     } else {
                         throw new IllegalArgumentException("Node argument " + index

driver/src/main/java/org/neo4j/driver/internal/async/connection/NettyDomainNameResolverGroup.java

@@ -32,6 +32,7 @@ public NettyDomainNameResolverGroup(DomainNameResolver domainNameResolver) {
     }
 
     @Override
+    @SuppressWarnings("resource")
     protected AddressResolver<InetSocketAddress> newResolver(EventExecutor executor) {
         return new NettyDomainNameResolver(executor, domainNameResolver).asAddressResolver();
     }