From 3f34a1343674e0df680b370aa065f2fa35214273 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Mon, 15 Apr 2024 16:30:51 +0200 Subject: [PATCH] Polishing --- .../org/springframework/expression/spel/SpelMessage.java | 2 +- .../expression/spel/ast/BeanReference.java | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java index 0ed9f8586b8..ae7fcd56b83 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java @@ -212,7 +212,7 @@ public enum SpelMessage { "No bean resolver registered in the context to resolve access to bean ''{0}''"), EXCEPTION_DURING_BEAN_RESOLUTION(Kind.ERROR, 1058, - "A problem occurred when trying to resolve bean ''{0}'':''{1}''"), + "A problem occurred when trying to resolve bean ''{0}'': ''{1}''"), INVALID_BEAN_REFERENCE(Kind.ERROR, 1059, "@ or & can only be followed by an identifier or a quoted name"), diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java index 5f1d2adeb31..c0b49d25d78 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 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. @@ -25,8 +25,11 @@ import org.springframework.expression.spel.SpelEvaluationException; import org.springframework.expression.spel.SpelMessage; /** - * Represents a bean reference to a type, for example {@code @foo} or {@code @'foo.bar'}. - * For a FactoryBean the syntax {@code &foo} can be used to access the factory itself. + * Represents a reference to a bean, for example {@code @orderService} or + * {@code @'order.service'}. + * + *

For a {@link org.springframework.beans.factory.FactoryBean FactoryBean}, the + * syntax {@code &orderServiceFactory} can be used to access the factory itself. * * @author Andy Clement */