From 6efc99fdd804e89ce93fd0fa09555fa5c22d0b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 17 Oct 2023 12:37:52 +0200 Subject: [PATCH] Harmonize BeanRegistrationAotContribution class names --- .../aot/KotlinReflectionBeanRegistrationAotProcessor.java | 6 +++--- .../BeanValidationBeanRegistrationAotProcessor.java | 6 +++--- .../RSocketExchangeBeanRegistrationAotProcessor.java | 6 +++--- .../TransactionBeanRegistrationAotProcessor.java | 8 ++++---- .../HttpExchangeBeanRegistrationAotProcessor.java | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/aot/KotlinReflectionBeanRegistrationAotProcessor.java b/spring-context/src/main/java/org/springframework/context/aot/KotlinReflectionBeanRegistrationAotProcessor.java index ca616b8e574..320bde37ff8 100644 --- a/spring-context/src/main/java/org/springframework/context/aot/KotlinReflectionBeanRegistrationAotProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/aot/KotlinReflectionBeanRegistrationAotProcessor.java @@ -40,16 +40,16 @@ class KotlinReflectionBeanRegistrationAotProcessor implements BeanRegistrationAo public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) { Class beanClass = registeredBean.getBeanClass(); if (KotlinDetector.isKotlinType(beanClass)) { - return new KotlinReflectionBeanRegistrationAotContribution(beanClass); + return new AotContribution(beanClass); } return null; } - private static class KotlinReflectionBeanRegistrationAotContribution implements BeanRegistrationAotContribution { + private static class AotContribution implements BeanRegistrationAotContribution { private final Class beanClass; - public KotlinReflectionBeanRegistrationAotContribution(Class beanClass) { + public AotContribution(Class beanClass) { this.beanClass = beanClass; } diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationBeanRegistrationAotProcessor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationBeanRegistrationAotProcessor.java index 7604efd54c7..d13639a0c08 100644 --- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationBeanRegistrationAotProcessor.java +++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationBeanRegistrationAotProcessor.java @@ -131,18 +131,18 @@ class BeanValidationBeanRegistrationAotProcessor implements BeanRegistrationAotP constraintDescriptors.addAll(propertyDescriptor.getConstraintDescriptors()); } if (!constraintDescriptors.isEmpty()) { - return new BeanValidationBeanRegistrationAotContribution(constraintDescriptors); + return new AotContribution(constraintDescriptors); } return null; } } - private static class BeanValidationBeanRegistrationAotContribution implements BeanRegistrationAotContribution { + private static class AotContribution implements BeanRegistrationAotContribution { private final Collection> constraintDescriptors; - public BeanValidationBeanRegistrationAotContribution(Collection> constraintDescriptors) { + public AotContribution(Collection> constraintDescriptors) { this.constraintDescriptors = constraintDescriptors; } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/service/RSocketExchangeBeanRegistrationAotProcessor.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/service/RSocketExchangeBeanRegistrationAotProcessor.java index 47bfa9f6776..d9ed6be3146 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/service/RSocketExchangeBeanRegistrationAotProcessor.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/service/RSocketExchangeBeanRegistrationAotProcessor.java @@ -61,17 +61,17 @@ class RSocketExchangeBeanRegistrationAotProcessor implements BeanRegistrationAot }); } if (!exchangeInterfaces.isEmpty()) { - return new RSocketExchangeBeanRegistrationContribution(exchangeInterfaces); + return new AotContribution(exchangeInterfaces); } return null; } - private static class RSocketExchangeBeanRegistrationContribution implements BeanRegistrationAotContribution { + private static class AotContribution implements BeanRegistrationAotContribution { private final Set> rSocketExchangeInterfaces; - public RSocketExchangeBeanRegistrationContribution(Set> rSocketExchangeInterfaces) { + public AotContribution(Set> rSocketExchangeInterfaces) { this.rSocketExchangeInterfaces = rSocketExchangeInterfaces; } diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessor.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessor.java index a1f0ec9b4c7..fa9bda81e6c 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessor.java +++ b/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"); * 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) { Class beanClass = registeredBean.getBeanClass(); if (isTransactional(beanClass)) { - return new TransactionBeanRegistrationAotContribution(beanClass); + return new AotContribution(beanClass); } 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; - public TransactionBeanRegistrationAotContribution(Class beanClass) { + public AotContribution(Class beanClass) { this.beanClass = beanClass; } diff --git a/spring-web/src/main/java/org/springframework/web/service/annotation/HttpExchangeBeanRegistrationAotProcessor.java b/spring-web/src/main/java/org/springframework/web/service/annotation/HttpExchangeBeanRegistrationAotProcessor.java index e23c534d90d..9839babcdf9 100644 --- a/spring-web/src/main/java/org/springframework/web/service/annotation/HttpExchangeBeanRegistrationAotProcessor.java +++ b/spring-web/src/main/java/org/springframework/web/service/annotation/HttpExchangeBeanRegistrationAotProcessor.java @@ -59,17 +59,17 @@ class HttpExchangeBeanRegistrationAotProcessor implements BeanRegistrationAotPro }); } if (!exchangeInterfaces.isEmpty()) { - return new HttpExchangeBeanRegistrationAotContribution(exchangeInterfaces); + return new AotContribution(exchangeInterfaces); } return null; } - private static class HttpExchangeBeanRegistrationAotContribution implements BeanRegistrationAotContribution { + private static class AotContribution implements BeanRegistrationAotContribution { private final List> httpExchangeInterfaces; - public HttpExchangeBeanRegistrationAotContribution(List> httpExchangeInterfaces) { + public AotContribution(List> httpExchangeInterfaces) { this.httpExchangeInterfaces = httpExchangeInterfaces; }