Skip to content

Commit 211f0bb

Browse files
committed
Fix invalid characters in source files
Closes gh-27475
1 parent b0c424b commit 211f0bb

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2020 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.
@@ -361,7 +361,7 @@ else if (mbd.isPrototype()) {
361361
else {
362362
String scopeName = mbd.getScope();
363363
if (!StringUtils.hasLength(scopeName)) {
364-
throw new IllegalStateException("No scope name defined for bean ´" + beanName + "'");
364+
throw new IllegalStateException("No scope name defined for bean '" + beanName + "'");
365365
}
366366
Scope scope = this.scopes.get(scopeName);
367367
if (scope == null) {

spring-expression/src/main/java/org/springframework/expression/BeanResolver.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2018 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.
@@ -19,7 +19,7 @@
1919
/**
2020
* A bean resolver can be registered with the evaluation context and will kick in
2121
* for bean references: {@code @myBeanName} and {@code &myBeanName} expressions.
22-
* The <tt>&</tt> variant syntax allows access to the factory bean where relevant.
22+
* The {@code &} variant syntax allows access to the factory bean where relevant.
2323
*
2424
* @author Andy Clement
2525
* @since 3.0.3
@@ -28,7 +28,7 @@ public interface BeanResolver {
2828

2929
/**
3030
* Look up a bean by the given name and return a corresponding instance for it.
31-
* For attempting access to a factory bean, the name needs a <tt>&</tt> prefix.
31+
* For attempting access to a factory bean, the name needs a {@code &} prefix.
3232
* @param context the current evaluation context
3333
* @param beanName the name of the bean to look up
3434
* @return an object representing the bean

spring-expression/src/main/java/org/springframework/expression/TypeComparator.java

Lines changed: 4 additions & 3 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.
@@ -40,10 +40,11 @@ public interface TypeComparator {
4040
* Compare two given objects.
4141
* @param firstObject the first object
4242
* @param secondObject the second object
43-
* @return 0 if they are equal, <0 if the first is smaller than the second,
44-
* or >0 if the first is larger than the second
43+
* @return 0 if they are equal, a negative integer if the first is smaller than
44+
* the second, or a positive integer if the first is larger than the second
4545
* @throws EvaluationException if a problem occurs during comparison
4646
* (or if they are not comparable in the first place)
47+
* @see Comparable#compareTo
4748
*/
4849
int compare(@Nullable Object firstObject, @Nullable Object secondObject) throws EvaluationException;
4950

spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import org.springframework.expression.spel.SpelMessage;
2626

2727
/**
28-
* Represents a bean reference to a type, for example <tt>@foo</tt> or <tt>@'foo.bar'</tt>.
29-
* For a FactoryBean the syntax <tt>&foo</tt> can be used to access the factory itself.
28+
* Represents a bean reference to a type, for example {@code @foo} or {@code @'foo.bar'}.
29+
* For a FactoryBean the syntax {@code &foo} can be used to access the factory itself.
3030
*
3131
* @author Andy Clement
3232
*/

0 commit comments

Comments
 (0)