Skip to content

Commit c19256d

Browse files
author
Zhen Li
committed
Merge pull request #82 from neo4j/ready-to-release
Prepare for release
2 parents 55a21ec + 3eb34f5 commit c19256d

File tree

11 files changed

+74
-33
lines changed

11 files changed

+74
-33
lines changed

README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ Connect to a Neo4j 3.0.0+ database
4444

4545
# Building
4646

47+
## Java version
48+
4749
If you are running Java 8:
4850

4951
mvn clean install
@@ -56,3 +58,12 @@ Java 8, because Neo4j-the-database needs it to run.
5658

5759
# For instance
5860
export NEO4J_JAVA=$(/usr/libexec/java_home -v 1.8)
61+
62+
## Windows
63+
64+
If you are building on windows, you need to run install as admin so that Neo4j-the-database could be registered as a
65+
windows service and then be started and stopped correctly using its powershell scripts for windows.
66+
To be able to run powershell script on windows, you might need to enable running scripts on the system.
67+
This can for example be achieved by executing the following from an elevated PowerShell prompt:
68+
69+
Set-ExecutionPolicy -ExecutionPolicy RemoteSigned

driver/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<packaging>jar</packaging>
2020
<name>Neo4j Java Driver</name>
2121
<description>Access to the Neo4j graph database through Java</description>
22+
<url>https://github.com/neo4j/neo4j-java-driver</url>
2223

2324
<licenses>
2425
<license>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public ConfigBuilder withLogging( Logging logging )
161161

162162
/**
163163
* The max number of connections to open at any given time per Neo4j instance.
164-
* @param size
164+
* @param size the size of the connection pool
165165
* @return this builder
166166
*/
167167
public ConfigBuilder withConnectionPoolSize( int size )
@@ -189,7 +189,7 @@ public ConfigBuilder withMinIdleTimeBeforeConnectionTest( long milliSecond )
189189
* If no certificate is provided, then we will trust the first certificate received from the server.
190190
* See {@code withKnownCerts} for more info about what will happen when no trusted certificate is
191191
* provided.
192-
* @param value
192+
* @param value true to enable tls and flase to disable tls
193193
* @return this builder
194194
*/
195195
public ConfigBuilder withTlsEnabled( boolean value )
@@ -200,8 +200,8 @@ public ConfigBuilder withTlsEnabled( boolean value )
200200

201201
/**
202202
* Defines how to authenticate a server in TLS connections.
203-
* @param tlsAuthConfig
204-
* @return
203+
* @param tlsAuthConfig TLS authentication config
204+
* @return this builder
205205
*/
206206
public ConfigBuilder withTlsAuthConfig( TlsAuthenticationConfig tlsAuthConfig )
207207
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ public interface Identity
3737
int hashCode();
3838

3939
// NOTE: This should be removed, but is kept until the Identity CIP is played
40-
/** Return a long representation of this identity */
40+
// Return a long representation of this identity
4141
long asLong();
4242
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
* A <strong>Path</strong> is a directed sequence of relationships between two nodes. This generally
2323
* represents a <em>traversal</em> or <em>walk</em> through a graph and maintains a direction separate
2424
* from that of any relationships traversed.
25-
* <p>
25+
*
2626
* It is allowed to be of size 0, meaning there are no relationships in it. In this case,
2727
* it contains only a single node which is both the start and the end of the path.
28-
* <p>
28+
*
2929
* <pre>
3030
* Path routeToStockholm = ..;
3131
*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* what that part of the plan does - for instance, perform an index lookup or filter results. The Neo4j Manual contains
3232
* a reference of the available operator types, and these may differ across Neo4j versions.
3333
*
34-
* For a simple view of a plan, the {@link #toString()} will give a human-readable rendering of the tree.
34+
* For a simple view of a plan, the {@code toString} method will give a human-readable rendering of the tree.
3535
*/
3636
public interface Plan
3737
{

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
/**
2222
* The result of running a statement, a stream of records. The result interface can be used to iterate over all the
2323
* records in the stream, and for each record to access the fields within it using the {@link #get(int) get} methods.
24-
* <p>
24+
*
2525
* Results are valid until the next statement is run or until the end of the current transaction, whichever comes
2626
* first.
27-
* <p>
27+
*
2828
* To keep a result around while further statements are run, or to use a result outside the scope of the current
2929
* transaction, see {@link #retain()}.
3030
*/
@@ -33,7 +33,7 @@ public interface Result
3333
/**
3434
* Retrieve and store the entire result stream. This can be used if you want to
3535
* iterate over the stream multiple times or to store the whole result for later use.
36-
* <p>
36+
*
3737
* This cannot be used if you have already started iterating through the stream using {@link #next()}.
3838
*
3939
* @return {@link org.neo4j.driver.ReusableResult}
@@ -73,9 +73,9 @@ public interface Result
7373

7474
/**
7575
* Retrieve the first field of the next record in the stream, and close the stream.
76-
* <p>
76+
*
7777
* This is a utility for the common case of statements that are expected to yield a single output value.
78-
* <p>
78+
*
7979
* <pre>
8080
* {@code
8181
* Record record = statement.run( "MATCH (n:User {uid:..}) RETURN n.name" ).single();
@@ -89,9 +89,9 @@ public interface Result
8989

9090
/**
9191
* Summarize the result
92-
* <p>
92+
*
9393
* Any remaining (unprocessed) result records will be consumed.
94-
* <p>
94+
*
9595
* <pre class="doctest:ResultDocIT#summarizeUsage">
9696
* {@code
9797
* ResultSummary summary = session.run( "PROFILE MATCH (n:User {id: 12345}) RETURN n" ).summarize();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ public interface StatementRunner
3030
{
3131
/**
3232
* Run a statement and return a result stream.
33-
* <p>
33+
*
3434
* This method takes a set of parameters that will be injected into the
3535
* statement by Neo4j. Using parameters is highly encouraged, it helps avoid
3636
* dangerous cypher injection attacks and improves database performance as
3737
* Neo4j can re-use query plans more often.
38-
* <p>
38+
*
3939
* <h2>Example</h2>
4040
* <pre class="doctest:StatementRunnerDocIT#parameterTest">
4141
* {@code

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020

2121
/**
2222
* Represents a transaction in the Neo4j database.
23-
* <p>
23+
*
2424
* This interface may seem surprising in that it does not have explicit "commit" or "rollback" methods.
2525
* It is designed to minimize the complexity of the code you need to write to use transactions in a safe way, ensuring
2626
* that transactions are properly rolled back even if there is an exception while the transaction is running.
27-
* <p>
27+
*
2828
* <h2>Example:</h2>
29-
* <p>
29+
*
3030
* <pre class="docTest:TransactionDocIT#classDoc">
3131
* {@code
3232
* try( Transaction tx = session.newTransaction() )
@@ -47,13 +47,13 @@ public interface Transaction extends AutoCloseable, StatementRunner
4747

4848
/**
4949
* Mark this transaction as failed. When you call {@link #close()}, the transaction will get rolled back.
50-
* <p>
50+
*
5151
* After this method has been called, there is nothing that can be done to "un-mark" it. This is a safety feature
5252
* to make sure no other code calls {@link #success()} and makes a transaction commit that was meant to be rolled
5353
* back.
54-
* <p>
54+
*
5555
* Example:
56-
* <p>
56+
*
5757
* <pre class="docTest:TransactionDocIT#failure">
5858
* {@code
5959
* try(Transaction tx = session.newTransaction() )

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@
2323

2424
/**
2525
* Represents a value from Neo4j.
26-
* <p>
26+
*
2727
* This interface describes a number of <code>isType</code> methods along with
2828
* <code>typeValue</code> methods. The first set of these correlate with types from
2929
* the Neo4j Type System and are used to determine which Neo4j type is represented.
3030
* The second set of methods perform coercions to Java types (wherever possible).
3131
* For example, a common Text value should be tested for using <code>isText</code>
3232
* and extracted using <code>stringValue</code>.
33-
* <p>
33+
*
3434
* <h2>Navigating a tree structure</h2>
35-
* <p>
35+
*
3636
* Because Neo4j often handles dynamic structures, this interface is designed to help
3737
* you handle such structures in Java. Specifically, {@link org.neo4j.driver.Value} lets you navigate arbitrary tree
3838
* structures without having to resort to type casting.
39-
* <p>
39+
*
4040
* Given a tree structure like:
41-
* <p>
41+
*
4242
* <pre>
4343
* {@code
4444
* {
@@ -49,17 +49,17 @@
4949
* }
5050
* }
5151
* </pre>
52-
* <p>
52+
*
5353
* You can retrieve the name of the second user, John, like so:
54-
* <p>
54+
*
5555
* <pre class="docTest:ValueDocIT#classDocTreeExample">
5656
* {@code
5757
* String username = value.get("users").get(1).get("name").javaString();
5858
* }
5959
* </pre>
60-
* <p>
60+
*
6161
* You can also easily iterate over the users:
62-
* <p>
62+
*
6363
* <pre class="docTest:ValueDocIT#classDocIterationExample">
6464
* {@code
6565
* List<String> names = new LinkedList<>();

0 commit comments

Comments
 (0)