Skip to content

Set banner mode to OFF instead of overriding printBanner method #10274

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

Merged
merged 2 commits into from
Oct 26, 2016
Merged

Set banner mode to OFF instead of overriding printBanner method #10274

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3d71bb
Set banner mode to OFF instead of overriding printBanner method
jameskleeh Oct 25, 2016
bb56e52
Merge branch '3.2.x' into GRAILS-10223
jameskleeh Oct 25, 2016
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
38 changes: 31 additions & 7 deletions grails-core/src/main/groovy/grails/boot/GrailsApp.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import grails.util.BuildSettings
import grails.util.Environment
import groovy.transform.CompileDynamic
import groovy.transform.CompileStatic
import groovy.transform.InheritConstructors
import groovy.util.logging.Slf4j
import org.codehaus.groovy.control.CompilationFailedException
import org.codehaus.groovy.control.CompilationUnit
Expand All @@ -22,9 +21,11 @@ import org.grails.io.watch.DirectoryWatcher
import org.grails.io.watch.FileExtensionFileChangeListener
import org.grails.plugins.BinaryGrailsPlugin
import org.grails.plugins.support.WatchPattern
import org.springframework.boot.Banner
import org.springframework.boot.SpringApplication
import org.springframework.context.ConfigurableApplicationContext
import org.springframework.core.env.ConfigurableEnvironment
import org.springframework.core.io.ResourceLoader

import java.util.concurrent.ConcurrentLinkedQueue

Expand All @@ -36,7 +37,6 @@ import java.util.concurrent.ConcurrentLinkedQueue
* @since 3.0
*/
@CompileStatic
@InheritConstructors
@Slf4j
class GrailsApp extends SpringApplication {

Expand All @@ -45,6 +45,35 @@ class GrailsApp extends SpringApplication {

boolean enableBeanCreationProfiler = false

/**
* Create a new {@link GrailsApp} instance. The application context will load
* beans from the specified sources (see {@link SpringApplication class-level}
* documentation for details. The instance can be customized before calling
* {@link #run(String...)}.
* @param sources the bean sources
* @see #run(Object, String[])
* @see #GrailsApp(org.springframework.core.io.ResourceLoader, Object...)
*/
public GrailsApp(Object... sources) {
super(sources)
bannerMode = Banner.Mode.OFF
}

/**
* Create a new {@link GrailsApp} instance. The application context will load
* beans from the specified sources (see {@link SpringApplication class-level}
* documentation for details. The instance can be customized before calling
* {@link #run(String...)}.
* @param resourceLoader the resource loader to use
* @param sources the bean sources
* @see #run(Object, String[])
* @see #GrailsApp(org.springframework.core.io.ResourceLoader, Object...)
*/
public GrailsApp(ResourceLoader resourceLoader, Object... sources) {
super(resourceLoader, sources)
bannerMode = Banner.Mode.OFF
}

@Override
ConfigurableApplicationContext run(String... args) {
def applicationContext = super.run(args)
Expand Down Expand Up @@ -330,11 +359,6 @@ class GrailsApp extends SpringApplication {
}
}

@Override
protected void printBanner(org.springframework.core.env.Environment environment) {
// noop
}

/**
* Static helper that can be used to run a {@link GrailsApp} from the
* specified source using default settings.
Expand Down