File tree Expand file tree Collapse file tree 4 files changed +11
-10
lines changed
spring-beans/src/main/java/org/springframework/beans/factory/support
spring-expression/src/main/java/org/springframework/expression Expand file tree Collapse file tree 4 files changed +11
-10
lines changed Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2002-2020 the original author or authors.
2
+ * Copyright 2002-2021 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
@@ -361,7 +361,7 @@ else if (mbd.isPrototype()) {
361
361
else {
362
362
String scopeName = mbd .getScope ();
363
363
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 + "'" );
365
365
}
366
366
Scope scope = this .scopes .get (scopeName );
367
367
if (scope == null ) {
Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2002-2018 the original author or authors.
2
+ * Copyright 2002-2021 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
19
19
/**
20
20
* A bean resolver can be registered with the evaluation context and will kick in
21
21
* 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.
23
23
*
24
24
* @author Andy Clement
25
25
* @since 3.0.3
@@ -28,7 +28,7 @@ public interface BeanResolver {
28
28
29
29
/**
30
30
* 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.
32
32
* @param context the current evaluation context
33
33
* @param beanName the name of the bean to look up
34
34
* @return an object representing the bean
Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2002-2017 the original author or authors.
2
+ * Copyright 2002-2021 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
@@ -40,10 +40,11 @@ public interface TypeComparator {
40
40
* Compare two given objects.
41
41
* @param firstObject the first object
42
42
* @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
45
45
* @throws EvaluationException if a problem occurs during comparison
46
46
* (or if they are not comparable in the first place)
47
+ * @see Comparable#compareTo
47
48
*/
48
49
int compare (@ Nullable Object firstObject , @ Nullable Object secondObject ) throws EvaluationException ;
49
50
Original file line number Diff line number Diff line change 25
25
import org .springframework .expression .spel .SpelMessage ;
26
26
27
27
/**
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.
30
30
*
31
31
* @author Andy Clement
32
32
*/
You can’t perform that action at this time.
0 commit comments