Merge branch 'spring-data-moore'

Author: wilkinsona

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/neo4j/Neo4jHealthIndicatorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@
  *
  * @author Eric Spiegelberg
  * @author Stephane Nicoll
+ * @author Michael Simons
  */
 public class Neo4jHealthIndicatorTests {
 
@@ -77,9 +78,8 @@ public void neo4jUp() {
 
 	@Test
 	public void neo4jDown() {
-		CypherException cypherException = new CypherException("Error executing Cypher",
-				"Neo.ClientError.Statement.SyntaxError",
-				"Unable to execute invalid Cypher");
+		CypherException cypherException = new CypherException(
+				"Neo.ClientError.Statement.SyntaxError", "Error executing Cypher");
 		given(this.session.query(Neo4jHealthIndicator.CYPHER, Collections.emptyMap()))
 				.willThrow(cypherException);
 		Health health = this.neo4jHealthIndicator.health();

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.springframework.boot.autoconfigure.data.jdbc;
 
-import java.util.Optional;
-
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -27,29 +25,28 @@
 import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.jdbc.core.convert.JdbcCustomConversions;
+import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
 import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 import org.springframework.data.jdbc.repository.config.JdbcConfiguration;
 import org.springframework.data.jdbc.repository.config.JdbcRepositoryConfigExtension;
-import org.springframework.data.relational.core.conversion.RelationalConverter;
-import org.springframework.data.relational.core.mapping.NamingStrategy;
-import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's JDBC Repositories.
  * <p>
  * Once in effect, the auto-configuration is the equivalent of enabling JDBC repositories
- * using the {@link EnableJdbcRepositories} annotation and providing a
- * {@link JdbcConfiguration} subclass.
+ * using the {@link EnableJdbcRepositories} annotation and providing an
+ * {@link AbstractJdbcConfiguration} subclass.
  *
  * @author Andy Wilkinson
  * @since 2.1.0
  * @see EnableJdbcRepositories
  */
+@SuppressWarnings("deprecation")
 @Configuration
 @ConditionalOnBean(NamedParameterJdbcOperations.class)
-@ConditionalOnClass({ NamedParameterJdbcOperations.class, JdbcConfiguration.class })
+@ConditionalOnClass({ NamedParameterJdbcOperations.class,
+		AbstractJdbcConfiguration.class })
 @ConditionalOnProperty(prefix = "spring.data.jdbc.repositories", name = "enabled", havingValue = "true", matchIfMissing = true)
 @AutoConfigureAfter(JdbcTemplateAutoConfiguration.class)
 public class JdbcRepositoriesAutoConfiguration {
@@ -62,27 +59,9 @@ static class JdbcRepositoriesConfiguration {
 	}
 
 	@Configuration
-	@ConditionalOnMissingBean(JdbcConfiguration.class)
-	static class SpringBootJdbcConfiguration extends JdbcConfiguration {
-
-		// Remove these public methods when they are made
-		// public in Spring Data
-		@Override
-		public JdbcCustomConversions jdbcCustomConversions() {
-			return super.jdbcCustomConversions();
-		}
-
-		@Override
-		public RelationalMappingContext jdbcMappingContext(
-				Optional<NamingStrategy> namingStrategy) {
-			return super.jdbcMappingContext(namingStrategy);
-		}
-
-		@Override
-		public RelationalConverter relationalConverter(
-				RelationalMappingContext mappingContext) {
-			return super.relationalConverter(mappingContext);
-		}
+	@ConditionalOnMissingBean({ AbstractJdbcConfiguration.class,
+			JdbcConfiguration.class })
+	static class SpringBootJdbcConfiguration extends AbstractJdbcConfiguration {
 
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,8 +30,8 @@
 import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
 import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
-import org.springframework.data.jdbc.repository.config.JdbcConfiguration;
 import org.springframework.data.jdbc.repository.config.JdbcRepositoryConfigExtension;
 import org.springframework.data.repository.Repository;
 
@@ -78,7 +78,7 @@ public void basicAutoConfiguration() {
 						"spring.datasource.data=classpath:city.sql",
 						"spring.datasource.generate-unique-name:true")
 				.run((context) -> {
-					assertThat(context).hasSingleBean(JdbcConfiguration.class);
+					assertThat(context).hasSingleBean(AbstractJdbcConfiguration.class);
 					assertThat(context).hasSingleBean(CityRepository.class);
 					assertThat(context.getBean(CityRepository.class).findById(2000L))
 							.isPresent();
@@ -93,7 +93,7 @@ public void autoConfigurationWithNoRepositories() {
 				.withUserConfiguration(EmbeddedDataSourceConfiguration.class,
 						EmptyConfiguration.class)
 				.run((context) -> {
-					assertThat(context).hasSingleBean(JdbcConfiguration.class);
+					assertThat(context).hasSingleBean(AbstractJdbcConfiguration.class);
 					assertThat(context).doesNotHaveBean(Repository.class);
 				});
 	}
@@ -111,7 +111,7 @@ public void honoursUsersEnableJdbcRepositoriesConfiguration() {
 						"spring.datasource.data=classpath:city.sql",
 						"spring.datasource.generate-unique-name:true")
 				.run((context) -> {
-					assertThat(context).hasSingleBean(JdbcConfiguration.class);
+					assertThat(context).hasSingleBean(AbstractJdbcConfiguration.class);
 					assertThat(context).hasSingleBean(CityRepository.class);
 					assertThat(context.getBean(CityRepository.class).findById(2000L))
 							.isPresent();

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -61,7 +61,7 @@
 		<embedded-mongo.version>2.2.0</embedded-mongo.version>
 		<flyway.version>5.2.4</flyway.version>
 		<freemarker.version>2.3.28</freemarker.version>
-		<elasticsearch.version>6.4.3</elasticsearch.version>
+		<elasticsearch.version>6.5.4</elasticsearch.version>
 		<glassfish-el.version>3.0.0</glassfish-el.version>
 		<glassfish-jaxb.version>2.3.1</glassfish-jaxb.version>
 		<groovy.version>2.5.6</groovy.version>
@@ -101,7 +101,7 @@
 		<jboss-logging.version>3.3.2.Final</jboss-logging.version>
 		<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
 		<jdom2.version>2.0.6</jdom2.version>
-		<jedis.version>2.9.1</jedis.version>
+		<jedis.version>3.0.1</jedis.version>
 		<jersey.version>2.27</jersey.version>
 		<jest.version>6.3.1</jest.version>
 		<jetty.version>9.4.14.v20181114</jetty.version>
@@ -138,7 +138,7 @@
 		<mssql-jdbc.version>6.4.0.jre8</mssql-jdbc.version>
 		<mysql.version>8.0.15</mysql.version>
 		<nekohtml.version>1.9.22</nekohtml.version>
-		<neo4j-ogm.version>3.1.7</neo4j-ogm.version>
+		<neo4j-ogm.version>3.2.0-alpha04</neo4j-ogm.version>
 		<netty.version>4.1.33.Final</netty.version>
 		<netty-tcnative.version>2.0.20.Final</netty-tcnative.version>
 		<nio-multipart-parser.version>1.1.0</nio-multipart-parser.version>
@@ -166,13 +166,13 @@
 		<spring-amqp.version>2.1.4.BUILD-SNAPSHOT</spring-amqp.version>
 		<spring-batch.version>4.1.1.RELEASE</spring-batch.version>
 		<spring-cloud-connectors.version>2.0.4.RELEASE</spring-cloud-connectors.version>
-		<spring-data-releasetrain.version>Lovelace-BUILD-SNAPSHOT</spring-data-releasetrain.version>
+		<spring-data-releasetrain.version>Moore-BUILD-SNAPSHOT</spring-data-releasetrain.version>
 		<spring-framework.version>${spring.version}</spring-framework.version>
-		<spring-hateoas.version>0.25.0.RELEASE</spring-hateoas.version>
+		<spring-hateoas.version>1.0.0.BUILD-SNAPSHOT</spring-hateoas.version>
 		<spring-integration.version>5.1.3.BUILD-SNAPSHOT</spring-integration.version>
 		<spring-kafka.version>2.2.4.BUILD-SNAPSHOT</spring-kafka.version>
 		<spring-ldap.version>2.3.2.RELEASE</spring-ldap.version>
-		<spring-plugin.version>1.2.0.RELEASE</spring-plugin.version>
+		<spring-plugin.version>2.0.0.BUILD-SNAPSHOT</spring-plugin.version>
 		<spring-restdocs.version>2.0.3.RELEASE</spring-restdocs.version>
 		<spring-retry.version>1.2.4.RELEASE</spring-retry.version>
 		<spring-security.version>5.1.4.BUILD-SNAPSHOT</spring-security.version>