Skip to content

Commit c978fb4

Browse files
committed
Documentation fixes etc (backported from master)
1 parent 0fc831e commit c978fb4

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

spring-context/src/main/java/org/springframework/context/event/SourceFilteringListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -81,7 +81,7 @@ public boolean supportsEventType(ResolvableType eventType) {
8181

8282
@Override
8383
public boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
84-
return supportsEventType(ResolvableType.forType(eventType));
84+
return supportsEventType(ResolvableType.forClass(eventType));
8585
}
8686

8787
@Override

spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MatchableHandlerMapping.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2002-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
3333
public interface MatchableHandlerMapping extends HandlerMapping {
3434

3535
/**
36-
* Determine whether the given request matches the request criteria.
36+
* Determine whether the request matches the given pattern.
3737
* @param request the current request
3838
* @param pattern the pattern to match
3939
* @return the result from request matching, or {@code null} if none

src/docs/asciidoc/core/core-beans.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10803,15 +10803,15 @@ The following example shows how our notifier can be rewritten to be invoked only
1080310803
.Java
1080410804
----
1080510805
@EventListener(condition = "#blEvent.content == 'my-event'")
10806-
public void processBlockedListEvent(BlockedListEvent blockedListEvent) {
10806+
public void processBlockedListEvent(BlockedListEvent blEvent) {
1080710807
// notify appropriate parties via notificationAddress...
1080810808
}
1080910809
----
1081010810
[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
1081110811
.Kotlin
1081210812
----
1081310813
@EventListener(condition = "#blEvent.content == 'my-event'")
10814-
fun processBlockedListEvent(blockedListEvent: BlockedListEvent) {
10814+
fun processBlockedListEvent(blEvent: BlockedListEvent) {
1081510815
// notify appropriate parties via notificationAddress...
1081610816
}
1081710817
----

src/docs/asciidoc/core/core-validation.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,8 +1085,8 @@ on the target field, or you might want to run a `Converter` only if a specific m
10851085
interface ConditionalGenericConverter : GenericConverter, ConditionalConverter
10861086
----
10871087

1088-
A good example of a `ConditionalGenericConverter` is an `EntityConverter` that converts
1089-
between a persistent entity identifier and an entity reference. Such an `EntityConverter`
1088+
A good example of a `ConditionalGenericConverter` is an `IdToEntityConverter` that converts
1089+
between a persistent entity identifier and an entity reference. Such an `IdToEntityConverter`
10901090
might match only if the target entity type declares a static finder method (for example,
10911091
`findAccount(Long)`). You might perform such a finder method check in the implementation of
10921092
`matches(TypeDescriptor, TypeDescriptor)`.

0 commit comments

Comments
 (0)