From a731ab8d793b6054477100d1fa1aeb36ba1ea555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A6=D1=8B=D0=BF?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Sat, 30 Dec 2017 13:45:44 +0200 Subject: [PATCH] DATAJPA-1295 - Improved readability. --- .../data/jpa/repository/query/QueryUtils.java | 7 +++---- .../ClasspathScanningPersistenceUnitPostProcessor.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) 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 toOrders(Sort sort, From from, CriteriaBuilder cb) { - List 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 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 mappingFileUris = new HashSet(); 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 mappingFileUris = new HashSet<>(); for (Resource resource : scannedResources) { try { String resourcePath = getResourcePath(resource.getURI());