Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Select the Grails MessageSource bean #13630

Merged
merged 2 commits into from
Sep 10, 2024
Merged

Select the Grails MessageSource bean #13630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff61c2b
Select the Grails messageSource when Micronaut creates a 2nd messageS…
jamesfredley Sep 10, 2024
f3448ec
Switch to @Qualifier annotation to help Spring select the right messa…
jamesfredley Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...ain/groovy/org/grails/plugins/domain/support/DefaultConstraintEvaluatorFactoryBean.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import org.springframework.context.MessageSource
class DefaultConstraintEvaluatorFactoryBean implements FactoryBean<ConstraintsEvaluator> {

@Autowired
@Qualifier("pluginAwareResourceBundleMessageSource")
MessageSource messageSource

@Autowired
Expand Down
2 changes: 2 additions & 0 deletions grails-plugin-rest/src/main/groovy/grails/rest/render/errors/AbstractVndErrorRenderer.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import groovy.transform.CompileStatic
import groovy.transform.TypeCheckingMode
import grails.web.mapping.LinkGenerator
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.beans.factory.annotation.Qualifier
import org.springframework.context.MessageSource
import org.springframework.validation.Errors
import org.springframework.validation.ObjectError
Expand All @@ -47,6 +48,7 @@ abstract class AbstractVndErrorRenderer implements ContainerRenderer<Errors, Ob
boolean prettyPrint = Environment.isDevelopmentMode()

@Autowired
@Qualifier("pluginAwareResourceBundleMessageSource")
MessageSource messageSource

@Autowired
Expand Down
1 change: 1 addition & 0 deletions grails-plugin-rest/src/main/groovy/grails/rest/render/util/AbstractLinkingRenderer.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ abstract class AbstractLinkingRenderer<T> extends AbstractIncludeExcludeRenderer
public static final String DEPRECATED_ATTRIBUTE = 'deprecated'

@Autowired
@Qualifier("pluginAwareResourceBundleMessageSource")
MessageSource messageSource

@Autowired
Expand Down
2 changes: 2 additions & 0 deletions grails-web-databinding/src/main/groovy/grails/web/databinding/GrailsWebDataBinder.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import org.grails.web.databinding.SpringConversionServiceAdapter
import org.grails.web.databinding.converters.ByteArrayMultipartFileValueConverter
import org.grails.web.servlet.mvc.GrailsWebRequest
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.beans.factory.annotation.Qualifier
import org.springframework.context.MessageSource
import org.springframework.validation.BeanPropertyBindingResult
import org.springframework.validation.BindingResult
Expand Down Expand Up @@ -645,6 +646,7 @@ class GrailsWebDataBinder extends SimpleDataBinder {
}

@Autowired
@Qualifier("pluginAwareResourceBundleMessageSource")
void setMessageSource(MessageSource messageSource) {
this.messageSource = messageSource
}
Expand Down
Loading