Skip to content

Commit 0e5e869

Browse files
mp911demp911de
committed
Reintroduce explicit local variable types.
We now reinstate local variable types instead of var as general var usage removes contextual detail that cannot be omitted generally. See #2465
1 parent c85c4ef commit 0e5e869

File tree

249 files changed

+1662
-1507
lines changed

Some content is hidden

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

249 files changed

+1662
-1507
lines changed

‎src/main/java/org/springframework/data/auditing/AnnotationAuditingMetadata.java‎

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

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

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

‎src/main/java/org/springframework/data/auditing/AuditingHandlerSupport.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ <T> T markModified(Auditor<?> auditor, T source) {
129129

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

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

134134
return wrapper.map(it -> {
135135

@@ -185,7 +185,7 @@ private Optional<TemporalAccessor> touchDate(AuditableBeanWrapper<?> wrapper, bo
185185

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

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

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

‎src/main/java/org/springframework/data/auditing/Auditor.java‎

Lines changed: 1 addition & 1 deletion
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-
var auditor = (Auditor<?>) o;
113+
Auditor<?> auditor = (Auditor<?>) o;
114114

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

‎src/main/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactory.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory
4646

4747
public DefaultAuditableBeanWrapperFactory() {
4848

49-
var conversionService = new DefaultFormattingConversionService();
49+
DefaultFormattingConversionService 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-
var metadata = AnnotationAuditingMetadata.getMetadata(it.getClass());
78+
AnnotationAuditingMetadata metadata = AnnotationAuditingMetadata.getMetadata(it.getClass());
7979

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

194-
var date = conversionService.convert(value, Date.class);
194+
Date date = conversionService.convert(value, Date.class);
195195
return conversionService.convert(date, targetType);
196196
}
197197

@@ -277,7 +277,7 @@ public Optional<TemporalAccessor> getLastModifiedDate() {
277277

278278
return getAsTemporalAccessor(metadata.getLastModifiedDateField().map(field -> {
279279

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

283283
}), TemporalAccessor.class);

‎src/main/java/org/springframework/data/auditing/IsNewAwareAuditingHandler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package org.springframework.data.auditing;
1717

1818
import org.springframework.data.mapping.PersistentEntity;
19+
import org.springframework.data.mapping.PersistentProperty;
1920
import org.springframework.data.mapping.context.MappingContext;
2021
import org.springframework.data.mapping.context.PersistentEntities;
2122
import org.springframework.data.support.IsNewStrategy;
@@ -61,7 +62,7 @@ public Object markAudited(Object object) {
6162
return object;
6263
}
6364

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

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

‎src/main/java/org/springframework/data/auditing/MappingAuditableBeanWrapperFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public <T> Optional<AuditableBeanWrapper<T>> getBeanWrapperFor(T source) {
8181

8282
return entities.mapOnContext(it.getClass(), (context, entity) -> {
8383

84-
var metadata = metadataCache.computeIfAbsent(it.getClass(),
84+
MappingAuditingMetadata metadata = metadataCache.computeIfAbsent(it.getClass(),
8585
key -> new MappingAuditingMetadata(context, it.getClass()));
8686

8787
return Optional.<AuditableBeanWrapper<T>> ofNullable(metadata.isAuditable() //
@@ -209,7 +209,7 @@ public Object setLastModifiedBy(Object value) {
209209
@Override
210210
public Optional<TemporalAccessor> getLastModifiedDate() {
211211

212-
var firstValue = metadata.lastModifiedDatePaths.getFirst() //
212+
Optional<Object> firstValue = metadata.lastModifiedDatePaths.getFirst() //
213213
.map(accessor::getProperty);
214214

215215
return getAsTemporalAccessor(firstValue, TemporalAccessor.class);
@@ -238,7 +238,7 @@ private TemporalAccessor setDateProperty(
238238

239239
property.forEach(it -> {
240240

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

243243
this.accessor.setProperty(it, getDateValueToSet(value, type, accessor.getBean()), OPTIONS);
244244
});

‎src/main/java/org/springframework/data/auditing/ReactiveIsNewAwareAuditingHandler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import reactor.core.publisher.Mono;
1919

2020
import org.springframework.data.mapping.PersistentEntity;
21+
import org.springframework.data.mapping.PersistentProperty;
2122
import org.springframework.data.mapping.context.MappingContext;
2223
import org.springframework.data.mapping.context.PersistentEntities;
2324
import org.springframework.data.support.IsNewStrategy;
@@ -61,7 +62,7 @@ public Mono<Object> markAudited(Object object) {
6162
return Mono.just(object);
6263
}
6364

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

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

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

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

1818
import java.lang.annotation.Annotation;
19+
import java.util.Map;
1920

2021
import org.springframework.core.annotation.AnnotationAttributes;
2122
import org.springframework.core.type.AnnotationMetadata;
@@ -46,7 +47,7 @@ public AnnotationAuditingConfiguration(AnnotationMetadata metadata, Class<? exte
4647
Assert.notNull(metadata, "AnnotationMetadata must not be null!");
4748
Assert.notNull(annotation, "Annotation must not be null!");
4849

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

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanD
5656
Assert.notNull(annotationMetadata, "AnnotationMetadata must not be null!");
5757
Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
5858

59-
var ahbd = registerAuditHandlerBeanDefinition(registry, getConfiguration(annotationMetadata));
59+
AbstractBeanDefinition ahbd = registerAuditHandlerBeanDefinition(registry, getConfiguration(annotationMetadata));
6060
registerAuditListenerBeanDefinition(ahbd, registry);
6161
}
6262

@@ -73,7 +73,7 @@ private AbstractBeanDefinition registerAuditHandlerBeanDefinition(BeanDefinition
7373
Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
7474
Assert.notNull(configuration, "AuditingConfiguration must not be null!");
7575

76-
var ahbd = getAuditHandlerBeanDefinitionBuilder(configuration).getBeanDefinition();
76+
AbstractBeanDefinition ahbd = getAuditHandlerBeanDefinitionBuilder(configuration).getBeanDefinition();
7777
registry.registerBeanDefinition(getAuditingHandlerBeanName(), ahbd);
7878
return ahbd;
7979
}
@@ -174,10 +174,10 @@ protected void registerInfrastructureBeanWithId(AbstractBeanDefinition definitio
174174

175175
private BeanDefinition createLazyInitTargetSourceBeanDefinition(String auditorAwareRef) {
176176

177-
var targetSourceBuilder = rootBeanDefinition(LazyInitTargetSource.class);
177+
BeanDefinitionBuilder targetSourceBuilder = rootBeanDefinition(LazyInitTargetSource.class);
178178
targetSourceBuilder.addPropertyValue("targetBeanName", auditorAwareRef);
179179

180-
var builder = rootBeanDefinition(ProxyFactoryBean.class);
180+
BeanDefinitionBuilder builder = rootBeanDefinition(ProxyFactoryBean.class);
181181
builder.addPropertyValue("targetSource", targetSourceBuilder.getBeanDefinition());
182182

183183
return builder.getBeanDefinition();

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ protected boolean shouldGenerateId() {
8383
@Override
8484
protected void doParse(Element element, BeanDefinitionBuilder builder) {
8585

86-
final var persistentEntities = rootBeanDefinition(PersistentEntitiesFactoryBean.class);
86+
final BeanDefinitionBuilder persistentEntities = rootBeanDefinition(PersistentEntitiesFactoryBean.class);
8787
persistentEntities.addConstructorArgReference(mappingContextBeanName);
8888
builder.addConstructorArgValue(persistentEntities.getBeanDefinition());
8989

90-
var auditorAwareRef = element.getAttribute(AUDITOR_AWARE_REF);
90+
String auditorAwareRef = element.getAttribute(AUDITOR_AWARE_REF);
9191

9292
if (StringUtils.hasText(auditorAwareRef)) {
9393
builder.addPropertyValue("auditorAware", createLazyInitTargetSourceBeanDefinition(auditorAwareRef));
@@ -107,10 +107,10 @@ protected String resolveId(Element element, AbstractBeanDefinition definition, P
107107

108108
private BeanDefinition createLazyInitTargetSourceBeanDefinition(String auditorAwareRef) {
109109

110-
var targetSourceBuilder = rootBeanDefinition(LazyInitTargetSource.class);
110+
BeanDefinitionBuilder targetSourceBuilder = rootBeanDefinition(LazyInitTargetSource.class);
111111
targetSourceBuilder.addPropertyValue("targetBeanName", auditorAwareRef);
112112

113-
var builder = rootBeanDefinition(ProxyFactoryBean.class);
113+
BeanDefinitionBuilder builder = rootBeanDefinition(ProxyFactoryBean.class);
114114
builder.addPropertyValue("targetSource", targetSourceBuilder.getBeanDefinition());
115115

116116
return builder.getBeanDefinition();

0 commit comments

Comments
 (0)