Skip to content

Commit c735b58

Browse files
mp911deschauder
mp911de
authored and
schauder
committed
Migrate code to Java 17 style.
Use var instead of explicit local types where applicable. Use pattern variable instead instanceof and cast. Prefer loops and nullable types over Stream and Optional. Convert classes to records where applicable. See #2465
1 parent d4036ec commit c735b58

File tree

463 files changed

+3670
-4014
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

463 files changed

+3670
-4014
lines changed

Diff for: ‎src/main/java/org/springframework/data/auditing/AnnotationAuditingMetadata.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ private void assertValidDateFieldType(Optional<Field> field) {
101101
return;
102102
}
103103

104-
Class<?> type = it.getType();
104+
var type = it.getType();
105105

106106
if (Jsr310Converters.supports(type)) {
107107
return;

Diff for: ‎src/main/java/org/springframework/data/auditing/AuditingHandlerSupport.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ protected final boolean isAuditable(Object source) {
107107
* @param auditor can be {@literal null}.
108108
* @param source must not be {@literal null}.
109109
*/
110-
<T> T markCreated(Auditor auditor, T source) {
110+
<T> T markCreated(Auditor<?> auditor, T source) {
111111

112112
Assert.notNull(source, "Source entity must not be null!");
113113

@@ -120,16 +120,16 @@ <T> T markCreated(Auditor auditor, T source) {
120120
* @param auditor
121121
* @param source
122122
*/
123-
<T> T markModified(Auditor auditor, T source) {
123+
<T> T markModified(Auditor<?> auditor, T source) {
124124

125125
Assert.notNull(source, "Source entity must not be null!");
126126

127127
return touch(auditor, source, false);
128128
}
129129

130-
private <T> T touch(Auditor auditor, T target, boolean isNew) {
130+
private <T> T touch(Auditor<?> auditor, T target, boolean isNew) {
131131

132-
Optional<AuditableBeanWrapper<T>> wrapper = factory.getBeanWrapperFor(target);
132+
var wrapper = factory.getBeanWrapperFor(target);
133133

134134
return wrapper.map(it -> {
135135

@@ -157,7 +157,7 @@ private <T> T touch(Auditor auditor, T target, boolean isNew) {
157157
* @param isNew
158158
* @return
159159
*/
160-
private void touchAuditor(Auditor auditor, AuditableBeanWrapper<?> wrapper, boolean isNew) {
160+
private void touchAuditor(Auditor<?> auditor, AuditableBeanWrapper<?> wrapper, boolean isNew) {
161161

162162
if(!auditor.isPresent()) {
163163
return;
@@ -185,7 +185,7 @@ private Optional<TemporalAccessor> touchDate(AuditableBeanWrapper<?> wrapper, bo
185185

186186
Assert.notNull(wrapper, "AuditableBeanWrapper must not be null!");
187187

188-
Optional<TemporalAccessor> now = dateTimeProvider.getNow();
188+
var now = dateTimeProvider.getNow();
189189

190190
Assert.notNull(now, () -> String.format("Now must not be null! Returned by: %s!", dateTimeProvider.getClass()));
191191

Diff for: ‎src/main/java/org/springframework/data/auditing/Auditor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public boolean equals(Object o) {
110110
if (o == null || getClass() != o.getClass())
111111
return false;
112112

113-
Auditor<?> auditor = (Auditor<?>) o;
113+
var auditor = (Auditor<?>) o;
114114

115115
return ObjectUtils.nullSafeEquals(value, auditor.value);
116116
}

Diff for: ‎src/main/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactory.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory
4646

4747
public DefaultAuditableBeanWrapperFactory() {
4848

49-
DefaultFormattingConversionService conversionService = new DefaultFormattingConversionService();
49+
var conversionService = new DefaultFormattingConversionService();
5050

5151
Jsr310Converters.getConvertersToRegister().forEach(conversionService::addConverter);
5252

@@ -75,7 +75,7 @@ public <T> Optional<AuditableBeanWrapper<T>> getBeanWrapperFor(T source) {
7575
return (AuditableBeanWrapper<T>) new AuditableInterfaceBeanWrapper(conversionService, (Auditable<Object, ?, TemporalAccessor>) it);
7676
}
7777

78-
AnnotationAuditingMetadata metadata = AnnotationAuditingMetadata.getMetadata(it.getClass());
78+
var metadata = AnnotationAuditingMetadata.getMetadata(it.getClass());
7979

8080
if (metadata.isAuditable()) {
8181
return new ReflectionAuditingBeanWrapper<T>(conversionService, it);
@@ -215,7 +215,7 @@ protected Object getDateValueToSet(TemporalAccessor value, Class<?> targetType,
215215
value.getClass(), targetType));
216216
}
217217

218-
Date date = conversionService.convert(value, Date.class);
218+
var date = conversionService.convert(value, Date.class);
219219
return conversionService.convert(date, targetType);
220220
}
221221

@@ -317,7 +317,7 @@ public Optional<TemporalAccessor> getLastModifiedDate() {
317317

318318
return getAsTemporalAccessor(metadata.getLastModifiedDateField().map(field -> {
319319

320-
Object value = org.springframework.util.ReflectionUtils.getField(field, target);
320+
var value = org.springframework.util.ReflectionUtils.getField(field, target);
321321
return value instanceof Optional ? ((Optional<?>) value).orElse(null) : value;
322322

323323
}), TemporalAccessor.class);

Diff for: ‎src/main/java/org/springframework/data/auditing/IsNewAwareAuditingHandler.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.springframework.data.auditing;
1717

1818
import org.springframework.data.mapping.PersistentEntity;
19-
import org.springframework.data.mapping.PersistentProperty;
2019
import org.springframework.data.mapping.context.MappingContext;
2120
import org.springframework.data.mapping.context.PersistentEntities;
2221
import org.springframework.data.support.IsNewStrategy;
@@ -62,7 +61,7 @@ public Object markAudited(Object object) {
6261
return object;
6362
}
6463

65-
PersistentEntity<?, ? extends PersistentProperty<?>> entity = entities
64+
var entity = entities
6665
.getRequiredPersistentEntity(object.getClass());
6766

6867
return entity.isNew(object) ? markCreated(object) : markModified(object);

Diff for: ‎src/main/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactory.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public <T> Optional<AuditableBeanWrapper<T>> getBeanWrapperFor(T source) {
8585

8686
return entities.mapOnContext(it.getClass(), (context, entity) -> {
8787

88-
MappingAuditingMetadata metadata = metadataCache.computeIfAbsent(it.getClass(),
88+
var metadata = metadataCache.computeIfAbsent(it.getClass(),
8989
key -> new MappingAuditingMetadata(context, it.getClass()));
9090

9191
return Optional.<AuditableBeanWrapper<T>> ofNullable(metadata.isAuditable() //
@@ -229,7 +229,7 @@ public Object setLastModifiedBy(Object value) {
229229
@Override
230230
public Optional<TemporalAccessor> getLastModifiedDate() {
231231

232-
Optional<Object> firstValue = metadata.lastModifiedDatePaths.getFirst() //
232+
var firstValue = metadata.lastModifiedDatePaths.getFirst() //
233233
.map(accessor::getProperty);
234234

235235
return getAsTemporalAccessor(firstValue, TemporalAccessor.class);
@@ -266,7 +266,7 @@ private TemporalAccessor setDateProperty(
266266

267267
property.forEach(it -> {
268268

269-
Class<?> type = it.getRequiredLeafProperty().getType();
269+
var type = it.getRequiredLeafProperty().getType();
270270

271271
this.accessor.setProperty(it, getDateValueToSet(value, type, accessor.getBean()), OPTIONS);
272272
});

Diff for: ‎src/main/java/org/springframework/data/auditing/ReactiveIsNewAwareAuditingHandler.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import reactor.core.publisher.Mono;
1919

2020
import org.springframework.data.mapping.PersistentEntity;
21-
import org.springframework.data.mapping.PersistentProperty;
2221
import org.springframework.data.mapping.context.MappingContext;
2322
import org.springframework.data.mapping.context.PersistentEntities;
2423
import org.springframework.data.support.IsNewStrategy;
@@ -62,7 +61,7 @@ public Mono<Object> markAudited(Object object) {
6261
return Mono.just(object);
6362
}
6463

65-
PersistentEntity<?, ? extends PersistentProperty<?>> entity = entities
64+
var entity = entities
6665
.getRequiredPersistentEntity(object.getClass());
6766

6867
return entity.isNew(object) ? markCreated(object) : markModified(object);

Diff for: ‎src/main/java/org/springframework/data/auditing/config/AnnotationAuditingConfiguration.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.springframework.data.auditing.config;
1717

1818
import java.lang.annotation.Annotation;
19-
import java.util.Map;
2019

2120
import org.springframework.core.annotation.AnnotationAttributes;
2221
import org.springframework.core.type.AnnotationMetadata;
@@ -47,7 +46,7 @@ public AnnotationAuditingConfiguration(AnnotationMetadata metadata, Class<? exte
4746
Assert.notNull(metadata, "AnnotationMetadata must not be null!");
4847
Assert.notNull(annotation, "Annotation must not be null!");
4948

50-
Map<String, Object> attributesSource = metadata.getAnnotationAttributes(annotation.getName());
49+
var attributesSource = metadata.getAnnotationAttributes(annotation.getName());
5150

5251
if (attributesSource == null) {
5352
throw new IllegalArgumentException(String.format(MISSING_ANNOTATION_ATTRIBUTES, annotation, metadata));

Diff for: ‎src/main/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupport.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanD
6060
Assert.notNull(annotationMetadata, "AnnotationMetadata must not be null!");
6161
Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
6262

63-
AbstractBeanDefinition ahbd = registerAuditHandlerBeanDefinition(registry, getConfiguration(annotationMetadata));
63+
var ahbd = registerAuditHandlerBeanDefinition(registry, getConfiguration(annotationMetadata));
6464
registerAuditListenerBeanDefinition(ahbd, registry);
6565
}
6666

@@ -77,7 +77,7 @@ private AbstractBeanDefinition registerAuditHandlerBeanDefinition(BeanDefinition
7777
Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
7878
Assert.notNull(configuration, "AuditingConfiguration must not be null!");
7979

80-
AbstractBeanDefinition ahbd = getAuditHandlerBeanDefinitionBuilder(configuration).getBeanDefinition();
80+
var ahbd = getAuditHandlerBeanDefinitionBuilder(configuration).getBeanDefinition();
8181
registry.registerBeanDefinition(getAuditingHandlerBeanName(), ahbd);
8282
return ahbd;
8383
}
@@ -178,10 +178,10 @@ protected void registerInfrastructureBeanWithId(AbstractBeanDefinition definitio
178178

179179
private BeanDefinition createLazyInitTargetSourceBeanDefinition(String auditorAwareRef) {
180180

181-
BeanDefinitionBuilder targetSourceBuilder = rootBeanDefinition(LazyInitTargetSource.class);
181+
var targetSourceBuilder = rootBeanDefinition(LazyInitTargetSource.class);
182182
targetSourceBuilder.addPropertyValue("targetBeanName", auditorAwareRef);
183183

184-
BeanDefinitionBuilder builder = rootBeanDefinition(ProxyFactoryBean.class);
184+
var builder = rootBeanDefinition(ProxyFactoryBean.class);
185185
builder.addPropertyValue("targetSource", targetSourceBuilder.getBeanDefinition());
186186

187187
return builder.getBeanDefinition();

Diff for: ‎src/main/java/org/springframework/data/auditing/config/AuditingHandlerBeanDefinitionParser.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ protected boolean shouldGenerateId() {
9595
@Override
9696
protected void doParse(Element element, BeanDefinitionBuilder builder) {
9797

98-
final BeanDefinitionBuilder persistentEntities = rootBeanDefinition(PersistentEntitiesFactoryBean.class);
98+
final var persistentEntities = rootBeanDefinition(PersistentEntitiesFactoryBean.class);
9999
persistentEntities.addConstructorArgReference(mappingContextBeanName);
100100
builder.addConstructorArgValue(persistentEntities.getBeanDefinition());
101101

102-
String auditorAwareRef = element.getAttribute(AUDITOR_AWARE_REF);
102+
var auditorAwareRef = element.getAttribute(AUDITOR_AWARE_REF);
103103

104104
if (StringUtils.hasText(auditorAwareRef)) {
105105
builder.addPropertyValue("auditorAware", createLazyInitTargetSourceBeanDefinition(auditorAwareRef));
@@ -123,10 +123,10 @@ protected String resolveId(Element element, AbstractBeanDefinition definition, P
123123

124124
private BeanDefinition createLazyInitTargetSourceBeanDefinition(String auditorAwareRef) {
125125

126-
BeanDefinitionBuilder targetSourceBuilder = rootBeanDefinition(LazyInitTargetSource.class);
126+
var targetSourceBuilder = rootBeanDefinition(LazyInitTargetSource.class);
127127
targetSourceBuilder.addPropertyValue("targetBeanName", auditorAwareRef);
128128

129-
BeanDefinitionBuilder builder = rootBeanDefinition(ProxyFactoryBean.class);
129+
var builder = rootBeanDefinition(ProxyFactoryBean.class);
130130
builder.addPropertyValue("targetSource", targetSourceBuilder.getBeanDefinition());
131131

132132
return builder.getBeanDefinition();

Diff for: ‎src/main/java/org/springframework/data/config/BeanComponentDefinitionBuilder.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
package org.springframework.data.config;
1717

1818
import org.springframework.beans.factory.parsing.BeanComponentDefinition;
19-
import org.springframework.beans.factory.support.AbstractBeanDefinition;
2019
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
2120
import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
2221
import org.springframework.beans.factory.xml.ParserContext;
2322
import org.springframework.util.Assert;
2423
import org.springframework.util.StringUtils;
24+
2525
import org.w3c.dom.Element;
2626

2727
/**
@@ -60,8 +60,8 @@ public BeanComponentDefinition getComponent(BeanDefinitionBuilder builder) {
6060

6161
Assert.notNull(builder, "Builder must not be null!");
6262

63-
AbstractBeanDefinition definition = builder.getRawBeanDefinition();
64-
String name = BeanDefinitionReaderUtils.generateBeanName(definition, context.getRegistry(), context.isNested());
63+
var definition = builder.getRawBeanDefinition();
64+
var name = BeanDefinitionReaderUtils.generateBeanName(definition, context.getRegistry(), context.isNested());
6565

6666
return getComponent(builder, name);
6767
}
@@ -78,7 +78,7 @@ public BeanComponentDefinition getComponentIdButFallback(BeanDefinitionBuilder b
7878

7979
Assert.hasText(fallback, "Fallback component id must not be null or empty!");
8080

81-
String id = defaultSource.getAttribute("id");
81+
var id = defaultSource.getAttribute("id");
8282
return getComponent(builder, StringUtils.hasText(id) ? id : fallback);
8383
}
8484

@@ -107,7 +107,7 @@ public BeanComponentDefinition getComponent(BeanDefinitionBuilder builder, Strin
107107
Assert.notNull(builder, "Builder must not be null!");
108108
Assert.hasText(name, "Name of bean must not be null or empty!");
109109

110-
AbstractBeanDefinition definition = builder.getRawBeanDefinition();
110+
var definition = builder.getRawBeanDefinition();
111111
definition.setSource(context.extractSource(rawSource));
112112

113113
return new BeanComponentDefinition(definition, name);

Diff for: ‎src/main/java/org/springframework/data/config/ConfigurationUtils.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static ResourceLoader getRequiredResourceLoader(XmlReaderContext context)
4141

4242
Assert.notNull(context, "XmlReaderContext must not be null!");
4343

44-
ResourceLoader resourceLoader = context.getResourceLoader();
44+
var resourceLoader = context.getResourceLoader();
4545

4646
if (resourceLoader == null) {
4747
throw new IllegalArgumentException("Could not obtain ResourceLoader from XmlReaderContext!");
@@ -72,7 +72,7 @@ public static ClassLoader getRequiredClassLoader(ResourceLoader resourceLoader)
7272

7373
Assert.notNull(resourceLoader, "ResourceLoader must not be null!");
7474

75-
ClassLoader classLoader = resourceLoader.getClassLoader();
75+
var classLoader = resourceLoader.getClassLoader();
7676

7777
if (classLoader == null) {
7878
throw new IllegalArgumentException("Could not obtain ClassLoader from ResourceLoader!");
@@ -92,7 +92,7 @@ public static String getRequiredBeanClassName(BeanDefinition beanDefinition) {
9292

9393
Assert.notNull(beanDefinition, "BeanDefinition must not be null!");
9494

95-
String result = beanDefinition.getBeanClassName();
95+
var result = beanDefinition.getBeanClassName();
9696

9797
if (result == null) {
9898
throw new IllegalArgumentException(

Diff for: ‎src/main/java/org/springframework/data/config/ParsingUtils.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static void setPropertyValue(BeanDefinitionBuilder builder, Element eleme
5555
Assert.hasText(attrName, "Attribute name must not be null!");
5656
Assert.hasText(propertyName, "Property name must not be null!");
5757

58-
String attr = element.getAttribute(attrName);
58+
var attr = element.getAttribute(attrName);
5959

6060
if (StringUtils.hasText(attr)) {
6161
builder.addPropertyValue(propertyName, attr);
@@ -90,7 +90,7 @@ public static void setPropertyReference(BeanDefinitionBuilder builder, Element e
9090
Assert.hasText(attribute, "Attribute name must not be null!");
9191
Assert.hasText(property, "Property name must not be null!");
9292

93-
String value = element.getAttribute(attribute);
93+
var value = element.getAttribute(attribute);
9494

9595
if (StringUtils.hasText(value)) {
9696
builder.addPropertyReference(property, value);
@@ -126,7 +126,7 @@ public static AbstractBeanDefinition getSourceBeanDefinition(BeanDefinitionBuild
126126

127127
Assert.notNull(builder, "Builder must not be null!");
128128

129-
AbstractBeanDefinition definition = builder.getRawBeanDefinition();
129+
var definition = builder.getRawBeanDefinition();
130130
definition.setSource(source);
131131
return definition;
132132
}
@@ -143,7 +143,7 @@ public static AbstractBeanDefinition getObjectFactoryBeanDefinition(String targe
143143

144144
Assert.hasText(targetBeanName, "Target bean name must not be null or empty!");
145145

146-
BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(ObjectFactoryCreatingFactoryBean.class);
146+
var builder = BeanDefinitionBuilder.rootBeanDefinition(ObjectFactoryCreatingFactoryBean.class);
147147
builder.addPropertyValue("targetBeanName", targetBeanName);
148148
builder.setRole(AbstractBeanDefinition.ROLE_INFRASTRUCTURE);
149149

0 commit comments

Comments
 (0)