Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish code using instanceof pattern matching.

Browse Source 
See #3134
This commit is contained in:
shin-mallang
2023-08-31 20:43:02 +09:00
committed by Greg L. Turnquist
parent e5ec1aa0d3
commit 20cef9afd6
11 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java
View File

@@ -169,8 +169,8 @@ public class EnversRevisionRepositoryImpl<T, ID, N extends Number & Comparable<N
AuditQuery baseQuery = createBaseQuery(id);
List<AuditOrder> orderMapped = (pageable.getSort() instanceof RevisionSort) ?
Collections.singletonList(mapRevisionSort((RevisionSort) pageable.getSort())) :
List<AuditOrder> orderMapped = (pageable.getSort() instanceof RevisionSort revisionSort) ?
Collections.singletonList(mapRevisionSort(revisionSort)) :
mapPropertySort(pageable.getSort());
orderMapped.forEach(baseQuery::addOrder);
@@ -232,8 +232,8 @@ public class EnversRevisionRepositoryImpl<T, ID, N extends Number & Comparable<N
RevisionMetadata<?> createRevisionMetadata() {
return metadata instanceof DefaultRevisionEntity //
? new DefaultRevisionMetadata((DefaultRevisionEntity) metadata, revisionType) //
return metadata instanceof DefaultRevisionEntity defaultRevisionEntity //
? new DefaultRevisionMetadata(defaultRevisionEntity, revisionType) //
: new AnnotationRevisionMetadata<>(Hibernate.unproxy(metadata), RevisionNumber.class, RevisionTimestamp.class,
revisionType);
}

4
spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/HibernateUtils.java
View File

@@ -45,8 +45,8 @@ public abstract class HibernateUtils {
try {
// Try the new Hibernate implementation first
if (query instanceof SqmQuery) {
return ((SqmQuery) query).getSqmStatement().toHqlString();
if (query instanceof SqmQuery sqmQuery) {
return sqmQuery.getSqmStatement().toHqlString();
}
// Couple of cases in which this still breaks, see HHH-15389

4
spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/JpaClassUtils.java
View File

@@ -48,8 +48,8 @@ abstract class JpaClassUtils {
EntityManager entityManagerToUse = em;
Object delegate = em.getDelegate();
if (delegate instanceof EntityManager) {
entityManagerToUse = (EntityManager) delegate;
if (delegate instanceof EntityManager delegateEntityManager) {
entityManagerToUse = delegateEntityManager;
}
return isOfType(entityManagerToUse, type, entityManagerToUse.getClass().getClassLoader());

2
spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java
View File

@@ -68,7 +68,7 @@ public class JpaRepositoryExtension extends CdiRepositoryExtensionSupport {
Bean<X> bean = processBean.getBean();
for (Type type : bean.getTypes()) {
// Check if the bean is an EntityManager.
if (type instanceof Class<?> && EntityManager.class.isAssignableFrom((Class<?>) type)) {
if (type instanceof Class<?> classType && EntityManager.class.isAssignableFrom(classType)) {
Set<Annotation> qualifiers = new HashSet<>(bean.getQualifiers());
if (bean.isAlternative() || !entityManagers.containsKey(qualifiers)) {
LOGGER.debug(String.format("Discovered '%s' with qualifiers %s", EntityManager.class.getName(), qualifiers));

2
spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryTransformerSupport.java
View File

@@ -85,7 +85,7 @@ class JpaQueryTransformerSupport {
*/
private void checkSortExpression(Sort.Order order) {
if (order instanceof JpaSort.JpaOrder && ((JpaSort.JpaOrder) order).isUnsafe()) {
if (order instanceof JpaSort.JpaOrder jpaOrder && jpaOrder.isUnsafe()) {
return;
}

2
spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/Meta.java
View File

@@ -103,7 +103,7 @@ public class Meta {
values = new LinkedHashMap<>(2);
}
if (value == null || (value instanceof String && !StringUtils.hasText((String) value))) {
if (value == null || (value instanceof String stringValue && !StringUtils.hasText(stringValue))) {
this.values.remove(key);
}
this.values.put(key, value);

3
spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java
View File

@@ -274,9 +274,8 @@ class ParameterMetadataProvider {
return null;
}
if (value instanceof Collection) {
if (value instanceof Collection<?> collection) {
Collection<?> collection = (Collection<?>) value;
return collection.isEmpty() ? null : collection;
}

10
spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java
View File

@@ -846,12 +846,10 @@ public abstract class QueryUtils {
return true;
}
if (!(propertyPathModel instanceof Attribute)) {
if (!(propertyPathModel instanceof Attribute<?, ?> attribute)) {
return false;
}
Attribute<?, ?> attribute = (Attribute<?, ?>) propertyPathModel;
// not a persistent attribute type association (@OneToOne, @ManyToOne)
if (!ASSOCIATION_TYPES.containsKey(attribute.getPersistentAttributeType())) {
return false;
@@ -882,11 +880,11 @@ public abstract class QueryUtils {
Member member = attribute.getJavaMember();
if (!(member instanceof AnnotatedElement)) {
if (!(member instanceof AnnotatedElement annotatedMember)) {
return defaultValue;
}
Annotation annotation = AnnotationUtils.getAnnotation((AnnotatedElement) member, associationAnnotation);
Annotation annotation = AnnotationUtils.getAnnotation(annotatedMember, associationAnnotation);
return annotation == null ? defaultValue : (T) AnnotationUtils.getValue(annotation, propertyName);
}
@@ -945,7 +943,7 @@ public abstract class QueryUtils {
*/
static void checkSortExpression(Order order) {
if (order instanceof JpaOrder && ((JpaOrder) order).isUnsafe()) {
if (order instanceof JpaOrder jpaOrder && jpaOrder.isUnsafe()) {
return;
}

3
spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessor.java
View File

@@ -64,12 +64,11 @@ public class EntityManagerBeanDefinitionRegistrarPostProcessor implements BeanFa
BeanFactory definitionFactory = definition.getBeanFactory();
if (!(definitionFactory instanceof BeanDefinitionRegistry)) {
if (!(definitionFactory instanceof BeanDefinitionRegistry definitionRegistry)) {
continue;
}
String entityManagerBeanName = "jpaSharedEM_AWC_" + definition.getBeanName();
BeanDefinitionRegistry definitionRegistry = (BeanDefinitionRegistry) definitionFactory;
if (!beanFactory.containsBeanDefinition(entityManagerBeanName)
&& !definitionRegistry.containsBeanDefinition(entityManagerBeanName)) {

4
spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java
View File

@@ -137,8 +137,8 @@ public class Querydsl {
return query;
}
if (sort instanceof QSort) {
return addOrderByFrom((QSort) sort, query);
if (sort instanceof QSort qsort) {
return addOrderByFrom(qsort, query);
}
return addOrderByFrom(sort, query);

8
spring-data-jpa/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java
View File

@@ -107,8 +107,8 @@ public final class BeanDefinitionUtils {
BeanFactory parentBeanFactory = beanFactory.getParentBeanFactory();
if (parentBeanFactory instanceof ConfigurableListableBeanFactory) {
definitions.addAll(getEntityManagerFactoryBeanDefinitions((ConfigurableListableBeanFactory) parentBeanFactory));
if (parentBeanFactory instanceof ConfigurableListableBeanFactory parentConfigurableListableBeanFactory) {
definitions.addAll(getEntityManagerFactoryBeanDefinitions(parentConfigurableListableBeanFactory));
}
return definitions;
@@ -157,8 +157,8 @@ public final class BeanDefinitionUtils {
BeanFactory parentBeanFactory = beanFactory.getParentBeanFactory();
if (parentBeanFactory instanceof ConfigurableListableBeanFactory) {
return getBeanDefinition(name, (ConfigurableListableBeanFactory) parentBeanFactory);
if (parentBeanFactory instanceof ConfigurableListableBeanFactory parentConfigurableListableBeanFactory) {
return getBeanDefinition(name, parentConfigurableListableBeanFactory);
}
throw o_O;