diff --git a/spring-data-envers/src/test/java/org/springframework/data/envers/Config.java b/spring-data-envers/src/test/java/org/springframework/data/envers/Config.java
index c8c1aa963..be69b3251 100755
--- a/spring-data-envers/src/test/java/org/springframework/data/envers/Config.java
+++ b/spring-data-envers/src/test/java/org/springframework/data/envers/Config.java
@@ -21,7 +21,7 @@ import java.util.Map;
 
 import javax.sql.DataSource;
 
-import org.hibernate.envers.strategy.ValidityAuditStrategy;
+import org.hibernate.envers.strategy.internal.ValidityAuditStrategy;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -31,7 +31,6 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 import org.springframework.orm.jpa.AbstractEntityManagerFactoryBean;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.orm.jpa.vendor.Database;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
 
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java
index f6cda8338..27a146e14 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java
@@ -357,7 +357,6 @@ public class JpaQueryCreator extends AbstractQueryCreator<String, JpqlQueryBuild
 		}
 	}
 
-	@org.springframework.lang.Nullable
 	private JpqlQueryBuilder.Expression getDistanceExpression() {
 
 		DistanceFunction distanceFunction = DISTANCE_FUNCTIONS.get(provider.getScoringFunction());
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java
index bbccb5b97..2729f085e 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java
@@ -38,6 +38,7 @@ import org.springframework.data.jpa.util.JpaMetamodel;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.querydsl.EntityPathResolver;
 import org.springframework.data.querydsl.SimpleEntityPathResolver;
+import org.springframework.data.repository.core.EntityInformation;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.core.support.QueryCreationListener;
@@ -260,8 +261,7 @@ public class JpaRepositoryFactory extends RepositoryFactorySupport {
 		JpaQueryConfiguration queryConfiguration = new JpaQueryConfiguration(queryRewriterProvider, queryEnhancerSelector,
 				new CachingValueExpressionDelegate(valueExpressionDelegate), escapeCharacter);
 
-		return Optional.of(JpaQueryLookupStrategy.create(entityManager, queryMethodFactory, key,
-				queryConfiguration));
+		return Optional.of(JpaQueryLookupStrategy.create(entityManager, queryMethodFactory, key, queryConfiguration));
 	}
 
 	@Override
@@ -270,6 +270,11 @@ public class JpaRepositoryFactory extends RepositoryFactorySupport {
 		return (JpaEntityInformation<T, ID>) JpaEntityInformationSupport.getEntityInformation(domainClass, entityManager);
 	}
 
+	@Override
+	public EntityInformation<?, ?> getEntityInformation(RepositoryMetadata metadata) {
+		return JpaEntityInformationSupport.getEntityInformation(metadata.getDomainType(), entityManager);
+	}
+
 	@Override
 	protected RepositoryFragments getRepositoryFragments(RepositoryMetadata metadata) {
 		return getRepositoryFragments(metadata, entityManager, entityPathResolver, this.crudMethodMetadata);