From 9ff45524e8f9e74fae5935e64e38d99e2683441a Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 11 May 2022 13:26:10 +0200 Subject: [PATCH] Renamed Observed -> Observation --- ...Runner.java => ObservationApplicationRunner.java} | 4 ++-- ...servationApplicationRunnerBeanPostProcessor.java} | 8 ++++---- ...Runner.java => ObservationCommandLineRunner.java} | 4 ++-- ...servationCommandLineRunnerBeanPostProcessor.java} | 8 ++++---- .../ObservationTaskAutoConfiguration.java | 12 ++++++------ ...er.java => ObservationTaskExecutionListener.java} | 6 +++--- ...va => ObservationTaskExecutionListenerTests.java} | 6 +++--- 7 files changed, 24 insertions(+), 24 deletions(-) rename spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/{ObservedApplicationRunner.java => ObservationApplicationRunner.java} (90%) rename spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/{ObservedApplicationRunnerBeanPostProcessor.java => ObservationApplicationRunnerBeanPostProcessor.java} (81%) rename spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/{ObservedCommandLineRunner.java => ObservationCommandLineRunner.java} (90%) rename spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/{ObservedCommandLineRunnerBeanPostProcessor.java => ObservationCommandLineRunnerBeanPostProcessor.java} (81%) rename spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/{ObservedTaskExecutionListener.java => ObservationTaskExecutionListener.java} (90%) rename spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/{ObservedTaskExecutionListenerTests.java => ObservationTaskExecutionListenerTests.java} (88%) diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservedApplicationRunner.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationApplicationRunner.java similarity index 90% rename from spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservedApplicationRunner.java rename to spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationApplicationRunner.java index 4fd6dc41..7909ca48 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservedApplicationRunner.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationApplicationRunner.java @@ -28,7 +28,7 @@ import org.springframework.boot.ApplicationRunner; * * @author Marcin Grzejszczak */ -class ObservedApplicationRunner implements ApplicationRunner, Observation.KeyValuesProviderAware { +class ObservationApplicationRunner implements ApplicationRunner, Observation.KeyValuesProviderAware { private final BeanFactory beanFactory; @@ -40,7 +40,7 @@ class ObservedApplicationRunner implements ApplicationRunner, Observation.KeyVal private TaskKeyValuesProvider keyValuesProvider = new DefaultTaskKeyValuesProvider(); - ObservedApplicationRunner(BeanFactory beanFactory, ApplicationRunner delegate, String beanName) { + ObservationApplicationRunner(BeanFactory beanFactory, ApplicationRunner delegate, String beanName) { this.beanFactory = beanFactory; this.delegate = delegate; this.beanName = beanName; diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservedApplicationRunnerBeanPostProcessor.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationApplicationRunnerBeanPostProcessor.java similarity index 81% rename from spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservedApplicationRunnerBeanPostProcessor.java rename to spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationApplicationRunnerBeanPostProcessor.java index bbdfb760..c56af98f 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservedApplicationRunnerBeanPostProcessor.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationApplicationRunnerBeanPostProcessor.java @@ -26,18 +26,18 @@ import org.springframework.boot.ApplicationRunner; * * @author Marcin Grzejszczak */ -class ObservedApplicationRunnerBeanPostProcessor implements BeanPostProcessor { +class ObservationApplicationRunnerBeanPostProcessor implements BeanPostProcessor { private final BeanFactory beanFactory; - ObservedApplicationRunnerBeanPostProcessor(BeanFactory beanFactory) { + ObservationApplicationRunnerBeanPostProcessor(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { - if (bean instanceof ApplicationRunner applicationRunner && !(bean instanceof ObservedApplicationRunner)) { - return new ObservedApplicationRunner(this.beanFactory, applicationRunner, beanName); + if (bean instanceof ApplicationRunner applicationRunner && !(bean instanceof ObservationApplicationRunner)) { + return new ObservationApplicationRunner(this.beanFactory, applicationRunner, beanName); } return bean; } diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservedCommandLineRunner.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationCommandLineRunner.java similarity index 90% rename from spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservedCommandLineRunner.java rename to spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationCommandLineRunner.java index 868ef496..82b3ae5c 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservedCommandLineRunner.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationCommandLineRunner.java @@ -27,7 +27,7 @@ import org.springframework.boot.CommandLineRunner; * * @author Marcin Grzejszczak */ -class ObservedCommandLineRunner implements CommandLineRunner, Observation.KeyValuesProviderAware { +class ObservationCommandLineRunner implements CommandLineRunner, Observation.KeyValuesProviderAware { private final BeanFactory beanFactory; @@ -39,7 +39,7 @@ class ObservedCommandLineRunner implements CommandLineRunner, Observation.KeyVal private TaskKeyValuesProvider keyValuesProvider = new DefaultTaskKeyValuesProvider(); - ObservedCommandLineRunner(BeanFactory beanFactory, CommandLineRunner delegate, String beanName) { + ObservationCommandLineRunner(BeanFactory beanFactory, CommandLineRunner delegate, String beanName) { this.beanFactory = beanFactory; this.delegate = delegate; this.beanName = beanName; diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservedCommandLineRunnerBeanPostProcessor.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationCommandLineRunnerBeanPostProcessor.java similarity index 81% rename from spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservedCommandLineRunnerBeanPostProcessor.java rename to spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationCommandLineRunnerBeanPostProcessor.java index 0f5c5a03..01da4490 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservedCommandLineRunnerBeanPostProcessor.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationCommandLineRunnerBeanPostProcessor.java @@ -26,18 +26,18 @@ import org.springframework.boot.CommandLineRunner; * * @author Marcin Grzejszczak */ -class ObservedCommandLineRunnerBeanPostProcessor implements BeanPostProcessor { +class ObservationCommandLineRunnerBeanPostProcessor implements BeanPostProcessor { private final BeanFactory beanFactory; - ObservedCommandLineRunnerBeanPostProcessor(BeanFactory beanFactory) { + ObservationCommandLineRunnerBeanPostProcessor(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { - if (bean instanceof CommandLineRunner commandLineRunner && !(bean instanceof ObservedCommandLineRunner)) { - return new ObservedCommandLineRunner(this.beanFactory, commandLineRunner, beanName); + if (bean instanceof CommandLineRunner commandLineRunner && !(bean instanceof ObservationCommandLineRunner)) { + return new ObservationCommandLineRunner(this.beanFactory, commandLineRunner, beanName); } return bean; } diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationTaskAutoConfiguration.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationTaskAutoConfiguration.java index 04ec7403..cca4730b 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationTaskAutoConfiguration.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationTaskAutoConfiguration.java @@ -43,19 +43,19 @@ import org.springframework.context.annotation.Configuration; public class ObservationTaskAutoConfiguration { @Bean - ObservedTaskExecutionListener traceTaskExecutionListener(ObservationRegistry registry, + ObservationTaskExecutionListener traceTaskExecutionListener(ObservationRegistry registry, @Value("${spring.application.name:default}") String appName) { - return new ObservedTaskExecutionListener(registry, appName); + return new ObservationTaskExecutionListener(registry, appName); } @Bean - static ObservedCommandLineRunnerBeanPostProcessor observedCommandLineRunnerBeanPostProcessor(BeanFactory beanFactory) { - return new ObservedCommandLineRunnerBeanPostProcessor(beanFactory); + static ObservationCommandLineRunnerBeanPostProcessor observedCommandLineRunnerBeanPostProcessor(BeanFactory beanFactory) { + return new ObservationCommandLineRunnerBeanPostProcessor(beanFactory); } @Bean - static ObservedApplicationRunnerBeanPostProcessor observedApplicationRunnerBeanPostProcessor(BeanFactory beanFactory) { - return new ObservedApplicationRunnerBeanPostProcessor(beanFactory); + static ObservationApplicationRunnerBeanPostProcessor observedApplicationRunnerBeanPostProcessor(BeanFactory beanFactory) { + return new ObservationApplicationRunnerBeanPostProcessor(beanFactory); } } diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservedTaskExecutionListener.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationTaskExecutionListener.java similarity index 90% rename from spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservedTaskExecutionListener.java rename to spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationTaskExecutionListener.java index 369acf68..36b03836 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservedTaskExecutionListener.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/ObservationTaskExecutionListener.java @@ -31,15 +31,15 @@ import org.springframework.core.Ordered; * @author Marcin Grzejszczak * @since 3.1.0 */ -class ObservedTaskExecutionListener implements TaskExecutionListener, Ordered { +class ObservationTaskExecutionListener implements TaskExecutionListener, Ordered { - private static final Log log = LogFactory.getLog(ObservedTaskExecutionListener.class); + private static final Log log = LogFactory.getLog(ObservationTaskExecutionListener.class); private final ObservationRegistry registry; private final String projectName; - ObservedTaskExecutionListener(ObservationRegistry registry, String projectName) { + ObservationTaskExecutionListener(ObservationRegistry registry, String projectName) { this.registry = registry; this.projectName = projectName; } diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/ObservedTaskExecutionListenerTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/ObservationTaskExecutionListenerTests.java similarity index 88% rename from spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/ObservedTaskExecutionListenerTests.java rename to spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/ObservationTaskExecutionListenerTests.java index d8a90865..881062e3 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/ObservedTaskExecutionListenerTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/ObservationTaskExecutionListenerTests.java @@ -26,12 +26,12 @@ import org.springframework.cloud.task.repository.TaskExecution; import static io.micrometer.core.tck.TestObservationRegistryAssert.then; -class ObservedTaskExecutionListenerTests { +class ObservationTaskExecutionListenerTests { @Test void testSuccessfulObservation() { TestObservationRegistry registry = TestObservationRegistry.create(); - ObservedTaskExecutionListener listener = new ObservedTaskExecutionListener(registry, "my-project"); + ObservationTaskExecutionListener listener = new ObservationTaskExecutionListener(registry, "my-project"); TaskExecution taskExecution = taskExecution(); listener.onTaskStartup(taskExecution); @@ -46,7 +46,7 @@ class ObservedTaskExecutionListenerTests { @Test void testErrorObservation() { TestObservationRegistry registry = TestObservationRegistry.create(); - ObservedTaskExecutionListener listener = new ObservedTaskExecutionListener(registry, "my-project"); + ObservationTaskExecutionListener listener = new ObservationTaskExecutionListener(registry, "my-project"); TaskExecution taskExecution = taskExecution(); listener.onTaskStartup(taskExecution);