diff --git a/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java b/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java
index a40b19885..025bc5952 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java
@@ -501,15 +501,14 @@ public abstract class QueryUtils {
 	 */
 	public static List<javax.persistence.criteria.Order> toOrders(Sort sort, From<?, ?> from, CriteriaBuilder cb) {
 
-		List<javax.persistence.criteria.Order> orders = new ArrayList<>();
-
 		if (sort.isUnsorted()) {
-			return orders;
+			return Collections.emptyList();
 		}
 
 		Assert.notNull(from, "From must not be null!");
 		Assert.notNull(cb, "CriteriaBuilder must not be null!");
 
+		List<javax.persistence.criteria.Order> orders = new ArrayList<>();
 		for (org.springframework.data.domain.Sort.Order order : sort) {
 			orders.add(toJpaOrder(order, from, cb));
 		}
@@ -654,7 +653,7 @@ public abstract class QueryUtils {
 
 			boolean sameName = join.getAttribute().getName().equals(attribute);
 
-			if (sameName && join.getJoinType().equals(JoinType.LEFT)) {
+			if (sameName && join.getJoinType() == JoinType.LEFT) {
 				return join;
 			}
 		}
diff --git a/src/main/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessor.java b/src/main/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessor.java
index 08daeaa84..0136f6d6c 100644
--- a/src/main/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessor.java
+++ b/src/main/java/org/springframework/data/jpa/support/ClasspathScanningPersistenceUnitPostProcessor.java
@@ -163,7 +163,6 @@ public class ClasspathScanningPersistenceUnitPostProcessor
 		String basePackagePathComponent = basePackage.replace('.', slash);
 		String path = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + basePackagePathComponent + slash
 				+ mappingFileNamePattern;
-		Set<String> mappingFileUris = new HashSet<String>();
 		Resource[] scannedResources;
 
 		try {
@@ -172,6 +171,7 @@ public class ClasspathScanningPersistenceUnitPostProcessor
 			throw new IllegalStateException(String.format("Cannot load mapping files from path %s!", path), e);
 		}
 
+		Set<String> mappingFileUris = new HashSet<>();
 		for (Resource resource : scannedResources) {
 			try {
 				String resourcePath = getResourcePath(resource.getURI());