diff --git a/spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java b/spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java index 259f510edb..334aa60ee8 100755 --- a/spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java +++ b/spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java @@ -169,8 +169,8 @@ public Page> findRevisions(ID id, Pageable pageable) { AuditQuery baseQuery = createBaseQuery(id); - List orderMapped = (pageable.getSort() instanceof RevisionSort) ? - Collections.singletonList(mapRevisionSort((RevisionSort) pageable.getSort())) : + List orderMapped = (pageable.getSort() instanceof RevisionSort revisionSort) ? + Collections.singletonList(mapRevisionSort(revisionSort)) : mapPropertySort(pageable.getSort()); orderMapped.forEach(baseQuery::addOrder); @@ -232,25 +232,20 @@ static class QueryResult { 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); } private static RevisionMetadata.RevisionType convertRevisionType(RevisionType datum) { - switch (datum) { - - case ADD: - return INSERT; - case MOD: - return UPDATE; - case DEL: - return DELETE; - default: - return UNKNOWN; - } + return switch (datum) { + case ADD -> INSERT; + case MOD -> UPDATE; + case DEL -> DELETE; + default -> UNKNOWN; + }; } } diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/HibernateUtils.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/HibernateUtils.java index 92983f1343..98e65c2d96 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/HibernateUtils.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/HibernateUtils.java @@ -45,8 +45,8 @@ public static String getHibernateQuery(Object query) { 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 diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/JpaClassUtils.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/JpaClassUtils.java index 771979c56c..10de0aad25 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/JpaClassUtils.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/JpaClassUtils.java @@ -48,8 +48,8 @@ public static boolean isEntityManagerOfType(EntityManager em, String type) { 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()); diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java index 9a218c4abc..2e345c22a0 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java @@ -68,7 +68,7 @@ void processBean(@Observes ProcessBean processBean) { Bean 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 qualifiers = new HashSet<>(bean.getQualifiers()); if (bean.isAlternative() || !entityManagers.containsKey(qualifiers)) { LOGGER.debug(String.format("Discovered '%s' with qualifiers %s", EntityManager.class.getName(), qualifiers)); diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryTransformerSupport.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryTransformerSupport.java index b791c4771e..13ad183fd2 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryTransformerSupport.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryTransformerSupport.java @@ -85,7 +85,7 @@ List generateOrderByArguments(String primaryFromAlias, Sor */ private void checkSortExpression(Sort.Order order) { - if (order instanceof JpaSort.JpaOrder && ((JpaSort.JpaOrder) order).isUnsafe()) { + if (order instanceof JpaSort.JpaOrder jpaOrder && jpaOrder.isUnsafe()) { return; } diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/Meta.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/Meta.java index a3e07cf14d..771d8b5827 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/Meta.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/Meta.java @@ -103,7 +103,7 @@ void setValue(String key, @Nullable Object value) { 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); diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java index b3737940f5..52cc951561 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java @@ -274,9 +274,8 @@ private static Collection toCollection(@Nullable Object value) { return null; } - if (value instanceof Collection) { + if (value instanceof Collection collection) { - Collection collection = (Collection) value; return collection.isEmpty() ? null : collection; } diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java index 0d2c65072b..0b781b33d4 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java @@ -846,12 +846,10 @@ private static boolean requiresOuterJoin(From from, PropertyPath property, 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 @@ private static T getAnnotationProperty(Attribute attribute, String pro 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 @@ private static boolean isAlreadyInnerJoined(From from, String attribute) { */ static void checkSortExpression(Order order) { - if (order instanceof JpaOrder && ((JpaOrder) order).isUnsafe()) { + if (order instanceof JpaOrder jpaOrder && jpaOrder.isUnsafe()) { return; } diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessor.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessor.java index f4e953576d..cf3ed03ff0 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessor.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/EntityManagerBeanDefinitionRegistrarPostProcessor.java @@ -64,12 +64,11 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) 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)) { diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java index 25fb4abec2..9cc1017a47 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/Querydsl.java @@ -137,8 +137,8 @@ public JPQLQuery applySorting(Sort sort, JPQLQuery query) { return query; } - if (sort instanceof QSort) { - return addOrderByFrom((QSort) sort, query); + if (sort instanceof QSort qsort) { + return addOrderByFrom(qsort, query); } return addOrderByFrom(sort, query); diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java index 779be14457..322cf3095d 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/util/BeanDefinitionUtils.java @@ -107,8 +107,8 @@ public static Collection getEntityManagerFac 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 static BeanDefinition getBeanDefinition(String name, ConfigurableListable 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;