Browse Source

Harmonize BeanRegistrationAotContribution class names

pull/31455/head
Stéphane Nicoll 2 years ago
parent
commit
6efc99fdd8
  1. 6
      spring-context/src/main/java/org/springframework/context/aot/KotlinReflectionBeanRegistrationAotProcessor.java
  2. 6
      spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationBeanRegistrationAotProcessor.java
  3. 6
      spring-messaging/src/main/java/org/springframework/messaging/rsocket/service/RSocketExchangeBeanRegistrationAotProcessor.java
  4. 8
      spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessor.java
  5. 6
      spring-web/src/main/java/org/springframework/web/service/annotation/HttpExchangeBeanRegistrationAotProcessor.java

6
spring-context/src/main/java/org/springframework/context/aot/KotlinReflectionBeanRegistrationAotProcessor.java

@ -40,16 +40,16 @@ class KotlinReflectionBeanRegistrationAotProcessor implements BeanRegistrationAo
public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) { public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
Class<?> beanClass = registeredBean.getBeanClass(); Class<?> beanClass = registeredBean.getBeanClass();
if (KotlinDetector.isKotlinType(beanClass)) { if (KotlinDetector.isKotlinType(beanClass)) {
return new KotlinReflectionBeanRegistrationAotContribution(beanClass); return new AotContribution(beanClass);
} }
return null; return null;
} }
private static class KotlinReflectionBeanRegistrationAotContribution implements BeanRegistrationAotContribution { private static class AotContribution implements BeanRegistrationAotContribution {
private final Class<?> beanClass; private final Class<?> beanClass;
public KotlinReflectionBeanRegistrationAotContribution(Class<?> beanClass) { public AotContribution(Class<?> beanClass) {
this.beanClass = beanClass; this.beanClass = beanClass;
} }

6
spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationBeanRegistrationAotProcessor.java

@ -131,18 +131,18 @@ class BeanValidationBeanRegistrationAotProcessor implements BeanRegistrationAotP
constraintDescriptors.addAll(propertyDescriptor.getConstraintDescriptors()); constraintDescriptors.addAll(propertyDescriptor.getConstraintDescriptors());
} }
if (!constraintDescriptors.isEmpty()) { if (!constraintDescriptors.isEmpty()) {
return new BeanValidationBeanRegistrationAotContribution(constraintDescriptors); return new AotContribution(constraintDescriptors);
} }
return null; return null;
} }
} }
private static class BeanValidationBeanRegistrationAotContribution implements BeanRegistrationAotContribution { private static class AotContribution implements BeanRegistrationAotContribution {
private final Collection<ConstraintDescriptor<?>> constraintDescriptors; private final Collection<ConstraintDescriptor<?>> constraintDescriptors;
public BeanValidationBeanRegistrationAotContribution(Collection<ConstraintDescriptor<?>> constraintDescriptors) { public AotContribution(Collection<ConstraintDescriptor<?>> constraintDescriptors) {
this.constraintDescriptors = constraintDescriptors; this.constraintDescriptors = constraintDescriptors;
} }

6
spring-messaging/src/main/java/org/springframework/messaging/rsocket/service/RSocketExchangeBeanRegistrationAotProcessor.java

@ -61,17 +61,17 @@ class RSocketExchangeBeanRegistrationAotProcessor implements BeanRegistrationAot
}); });
} }
if (!exchangeInterfaces.isEmpty()) { if (!exchangeInterfaces.isEmpty()) {
return new RSocketExchangeBeanRegistrationContribution(exchangeInterfaces); return new AotContribution(exchangeInterfaces);
} }
return null; return null;
} }
private static class RSocketExchangeBeanRegistrationContribution implements BeanRegistrationAotContribution { private static class AotContribution implements BeanRegistrationAotContribution {
private final Set<Class<?>> rSocketExchangeInterfaces; private final Set<Class<?>> rSocketExchangeInterfaces;
public RSocketExchangeBeanRegistrationContribution(Set<Class<?>> rSocketExchangeInterfaces) { public AotContribution(Set<Class<?>> rSocketExchangeInterfaces) {
this.rSocketExchangeInterfaces = rSocketExchangeInterfaces; this.rSocketExchangeInterfaces = rSocketExchangeInterfaces;
} }

8
spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessor.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -49,7 +49,7 @@ class TransactionBeanRegistrationAotProcessor implements BeanRegistrationAotProc
public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) { public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
Class<?> beanClass = registeredBean.getBeanClass(); Class<?> beanClass = registeredBean.getBeanClass();
if (isTransactional(beanClass)) { if (isTransactional(beanClass)) {
return new TransactionBeanRegistrationAotContribution(beanClass); return new AotContribution(beanClass);
} }
return null; return null;
} }
@ -69,11 +69,11 @@ class TransactionBeanRegistrationAotProcessor implements BeanRegistrationAotProc
} }
private static class TransactionBeanRegistrationAotContribution implements BeanRegistrationAotContribution { private static class AotContribution implements BeanRegistrationAotContribution {
private final Class<?> beanClass; private final Class<?> beanClass;
public TransactionBeanRegistrationAotContribution(Class<?> beanClass) { public AotContribution(Class<?> beanClass) {
this.beanClass = beanClass; this.beanClass = beanClass;
} }

6
spring-web/src/main/java/org/springframework/web/service/annotation/HttpExchangeBeanRegistrationAotProcessor.java

@ -59,17 +59,17 @@ class HttpExchangeBeanRegistrationAotProcessor implements BeanRegistrationAotPro
}); });
} }
if (!exchangeInterfaces.isEmpty()) { if (!exchangeInterfaces.isEmpty()) {
return new HttpExchangeBeanRegistrationAotContribution(exchangeInterfaces); return new AotContribution(exchangeInterfaces);
} }
return null; return null;
} }
private static class HttpExchangeBeanRegistrationAotContribution implements BeanRegistrationAotContribution { private static class AotContribution implements BeanRegistrationAotContribution {
private final List<Class<?>> httpExchangeInterfaces; private final List<Class<?>> httpExchangeInterfaces;
public HttpExchangeBeanRegistrationAotContribution(List<Class<?>> httpExchangeInterfaces) { public AotContribution(List<Class<?>> httpExchangeInterfaces) {
this.httpExchangeInterfaces = httpExchangeInterfaces; this.httpExchangeInterfaces = httpExchangeInterfaces;
} }

Loading…
Cancel
Save