root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Upgrade to Neo4j Java Driver 4.3.3 

Closes gh-27278
This commit is contained in:
Stephane Nicoll 2021-07-12 07:54:15 +02:00
parent ee347768dc
commit c16ef0a006
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/neo4j/Neo4jHealthDetailsHandler.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -36,6 +36,7 @@ class Neo4jHealthDetailsHandler {
* @param edition the edition of the server * @param edition the edition of the server
* @param resultSummary server information * @param resultSummary server information
*/ */
@SuppressWarnings("deprecation")
void addHealthDetails(Builder builder, String edition, ResultSummary resultSummary) { void addHealthDetails(Builder builder, String edition, ResultSummary resultSummary) {
ServerInfo serverInfo = resultSummary.server(); ServerInfo serverInfo = resultSummary.server();
builder.up().withDetail("server", serverInfo.version() + "@" + serverInfo.address()).withDetail("edition", builder.up().withDetail("server", serverInfo.version() + "@" + serverInfo.address()).withDetail("edition",

3
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/neo4j/ResultSummaryMock.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -33,6 +33,7 @@ final class ResultSummaryMock {
private ResultSummaryMock() { private ResultSummaryMock() {
} }
@SuppressWarnings("deprecation")
static ResultSummary createResultSummary(String serverVersion, String serverAddress, String databaseName) { static ResultSummary createResultSummary(String serverVersion, String serverAddress, String databaseName) {
ServerInfo serverInfo = mock(ServerInfo.class); ServerInfo serverInfo = mock(ServerInfo.class);
given(serverInfo.version()).willReturn(serverVersion); given(serverInfo.version()).willReturn(serverVersion);

9
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/neo4j/Neo4jSpringJclLogging.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -80,6 +80,13 @@ class Neo4jSpringJclLogging implements Logging {
} }
} }
@Override
public void debug(String message, Throwable throwable) {
if (isDebugEnabled()) {
this.delegate.debug(message, throwable);
}
}
@Override @Override
public void trace(String format, Object... params) { public void trace(String format, Object... params) {
if (isTraceEnabled()) { if (isTraceEnabled()) {

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -1269,7 +1269,7 @@ bom {
] ]
} }
} }
library("Neo4j Java Driver", "4.2.6") { library("Neo4j Java Driver", "4.3.3") {
group("org.neo4j.driver") { group("org.neo4j.driver") {
modules = [ modules = [
"neo4j-java-driver" "neo4j-java-driver"