Browse Source

Polishing

pull/31953/head
Juergen Hoeller 2 years ago
parent
commit
07097976ef
  1. 4
      spring-context-indexer/src/test/java/org/springframework/context/index/sample/Scope.java
  2. 1
      spring-context/src/main/java/org/springframework/context/event/GenericApplicationListener.java
  3. 5
      spring-context/src/main/java/org/springframework/context/event/GenericApplicationListenerDelegate.java
  4. 4
      spring-context/src/main/java/org/springframework/scheduling/support/CronExpression.java
  5. 7
      spring-context/src/test/java/org/springframework/scheduling/support/CronTriggerTests.java
  6. 4
      spring-core-test/src/main/java/org/springframework/core/test/tools/CompileWithForkedClassLoader.java
  7. 4
      spring-core/src/main/java/org/springframework/aot/hint/annotation/RegisterReflectionForBinding.java
  8. 6
      spring-core/src/test/java/org/springframework/aot/hint/annotation/ReflectiveRuntimeHintsRegistrarTests.java
  9. 4
      spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
  10. 4
      spring-core/src/test/java/org/springframework/core/type/Scope.java
  11. 4
      spring-core/src/testFixtures/java/org/springframework/core/testfixture/EnabledForTestGroups.java
  12. 4
      spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledOnMac.java
  13. 4
      spring-test/src/test/java/org/springframework/test/context/junit/jupiter/EnabledOnMac.java
  14. 4
      spring-test/src/test/java/org/springframework/test/context/junit/jupiter/FailingTestCase.java

4
spring-context-indexer/src/test/java/org/springframework/context/index/sample/Scope.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2009 the original author or authors.
* Copyright 2002-2024 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.
@ -24,7 +24,7 @@ import java.lang.annotation.Target; @@ -24,7 +24,7 @@ import java.lang.annotation.Target;
/**
* Copy of the {@code @Scope} annotation for testing purposes.
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface Scope {

1
spring-context/src/main/java/org/springframework/context/event/GenericApplicationListener.java

@ -55,6 +55,7 @@ public interface GenericApplicationListener extends SmartApplicationListener { @@ -55,6 +55,7 @@ public interface GenericApplicationListener extends SmartApplicationListener {
*/
boolean supportsEventType(ResolvableType eventType);
/**
* Create a new {@code ApplicationListener} for the given event type.
* @param eventType the event to listen to

5
spring-context/src/main/java/org/springframework/context/event/GenericApplicationListenerDelegate.java

@ -22,8 +22,7 @@ import org.springframework.context.ApplicationEvent; @@ -22,8 +22,7 @@ import org.springframework.context.ApplicationEvent;
import org.springframework.core.ResolvableType;
/**
* A {@link GenericApplicationListener} implementation that supports a single
* event type.
* A {@link GenericApplicationListener} implementation that supports a single event type.
*
* @author Stephane Nicoll
* @since 6.1.3
@ -35,11 +34,13 @@ class GenericApplicationListenerDelegate<E extends ApplicationEvent> implements @@ -35,11 +34,13 @@ class GenericApplicationListenerDelegate<E extends ApplicationEvent> implements
private final Consumer<E> consumer;
GenericApplicationListenerDelegate(Class<E> supportedEventType, Consumer<E> consumer) {
this.supportedEventType = supportedEventType;
this.consumer = consumer;
}
@Override
public void onApplicationEvent(ApplicationEvent event) {
this.consumer.accept(this.supportedEventType.cast(event));

4
spring-context/src/main/java/org/springframework/scheduling/support/CronExpression.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@ -168,7 +168,7 @@ public final class CronExpression { @@ -168,7 +168,7 @@ public final class CronExpression {
* the cron format
*/
public static CronExpression parse(String expression) {
Assert.hasLength(expression, "Expression string must not be empty");
Assert.hasLength(expression, "Expression must not be empty");
expression = resolveMacros(expression);

7
spring-context/src/test/java/org/springframework/scheduling/support/CronTriggerTests.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 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.
@ -848,6 +848,7 @@ class CronTriggerTests { @@ -848,6 +848,7 @@ class CronTriggerTests {
assertThat(nextExecutionTime).isEqualTo(this.calendar.getTime());
}
private static void roundup(Calendar calendar) {
calendar.add(Calendar.SECOND, 1);
calendar.set(Calendar.MILLISECOND, 0);
@ -861,9 +862,7 @@ class CronTriggerTests { @@ -861,9 +862,7 @@ class CronTriggerTests {
}
private static TriggerContext getTriggerContext(Date lastCompletionTime) {
SimpleTriggerContext context = new SimpleTriggerContext();
context.update(null, null, lastCompletionTime);
return context;
return new SimpleTriggerContext(null, null, lastCompletionTime);
}

4
spring-core-test/src/main/java/org/springframework/core/test/tools/CompileWithForkedClassLoader.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 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.
@ -41,8 +41,8 @@ import org.junit.jupiter.api.extension.ExtendWith; @@ -41,8 +41,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
* @author Sam Brannen
* @since 6.0
*/
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE, ElementType.METHOD })
@Documented
@ExtendWith(CompileWithForkedClassLoaderExtension.class)
public @interface CompileWithForkedClassLoader {

4
spring-core/src/main/java/org/springframework/aot/hint/annotation/RegisterReflectionForBinding.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 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.
@ -63,7 +63,7 @@ import org.springframework.core.annotation.AliasFor; @@ -63,7 +63,7 @@ import org.springframework.core.annotation.AliasFor;
* @see org.springframework.aot.hint.BindingReflectionHintsRegistrar
* @see Reflective @Reflective
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Reflective(RegisterReflectionForBindingProcessor.class)

6
spring-core/src/test/java/org/springframework/aot/hint/annotation/ReflectiveRuntimeHintsRegistrarTests.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@ -224,7 +224,6 @@ class ReflectiveRuntimeHintsRegistrarTests { @@ -224,7 +224,6 @@ class ReflectiveRuntimeHintsRegistrarTests {
@interface SampleInvoker {
int retries() default 0;
}
@Target({ ElementType.METHOD })
@ -235,10 +234,9 @@ class ReflectiveRuntimeHintsRegistrarTests { @@ -235,10 +234,9 @@ class ReflectiveRuntimeHintsRegistrarTests {
@AliasFor(attribute = "retries", annotation = SampleInvoker.class)
int value() default 1;
}
@Target({ ElementType.TYPE })
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Reflective(TestTypeHintReflectiveProcessor.class)

4
spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java

@ -2273,8 +2273,8 @@ class MergedAnnotationsTests { @@ -2273,8 +2273,8 @@ class MergedAnnotationsTests {
// @formatter:off
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE, ElementType.METHOD })
@Inherited
@interface Transactional {
@ -2327,8 +2327,8 @@ class MergedAnnotationsTests { @@ -2327,8 +2327,8 @@ class MergedAnnotationsTests {
static class AliasedTransactionalComponentClass {
}
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE, ElementType.METHOD })
@Inherited
@interface AliasedTransactional {

4
spring-core/src/test/java/org/springframework/core/type/Scope.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2009 the original author or authors.
* Copyright 2002-2024 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.
@ -24,7 +24,7 @@ import java.lang.annotation.Target; @@ -24,7 +24,7 @@ import java.lang.annotation.Target;
/**
* Copy of the {@code @Scope} annotation for testing purposes.
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface Scope {

4
spring-core/src/testFixtures/java/org/springframework/core/testfixture/EnabledForTestGroups.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2024 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.
@ -32,7 +32,7 @@ import org.junit.jupiter.api.extension.ExtendWith; @@ -32,7 +32,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
* @author Sam Brannen
* @since 5.2
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Inherited

4
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledOnMac.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2024 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.
@ -30,7 +30,7 @@ import java.lang.annotation.Target; @@ -30,7 +30,7 @@ import java.lang.annotation.Target;
* @author Sam Brannen
* @since 5.0
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
@DisabledIf(expression = "#{systemProperties['os.name'].toLowerCase().contains('mac')}", reason = "Disabled on Mac OS")

4
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/EnabledOnMac.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2024 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.
@ -30,7 +30,7 @@ import java.lang.annotation.Target; @@ -30,7 +30,7 @@ import java.lang.annotation.Target;
* @author Sam Brannen
* @since 5.0
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
@EnabledIf(expression = "#{systemProperties['os.name'].toLowerCase().contains('mac')}", reason = "Enabled on Mac OS")

4
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/FailingTestCase.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2024 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.
@ -31,7 +31,7 @@ import org.junit.jupiter.api.Tag; @@ -31,7 +31,7 @@ import org.junit.jupiter.api.Tag;
* @author Sam Brannen
* @since 5.1
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Tag("failing-test-case")

Loading…
Cancel
Save