Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
2a857902
Commit
2a857902
authored
Nov 20, 2014
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
182ce215
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
10 deletions
+12
-10
MessageSourceAutoConfiguration.java
...rk/boot/autoconfigure/MessageSourceAutoConfiguration.java
+1
-1
SpringApplicationLauncher.java
...ringframework/boot/cli/app/SpringApplicationLauncher.java
+3
-5
GsonJsonParser.java
...in/java/org/springframework/boot/json/GsonJsonParser.java
+5
-1
JsonParserFactory.java
...java/org/springframework/boot/json/JsonParserFactory.java
+1
-1
GsonJsonParserTests.java
...va/org/springframework/boot/json/GsonJsonParserTests.java
+2
-2
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java
View file @
2a857902
...
...
@@ -160,7 +160,7 @@ public class MessageSourceAutoConfiguration {
classLoader
=
classLoader
.
getParent
();
}
}
catch
(
Throwable
e
)
{
catch
(
Throwable
e
x
)
{
}
ROOT_CLASSLOADER
=
classLoader
;
}
...
...
spring-boot-cli/src/main/java/org/springframework/boot/cli/app/SpringApplicationLauncher.java
View file @
2a857902
...
...
@@ -16,6 +16,7 @@
package
org
.
springframework
.
boot
.
cli
.
app
;
import
java.lang.reflect.Constructor
;
import
java.lang.reflect.Method
;
import
java.util.HashMap
;
import
java.util.Map
;
...
...
@@ -36,7 +37,6 @@ public class SpringApplicationLauncher {
/**
* Creates a new launcher that will use the given {@code classLoader} to load
* {@code SpringApplication}.
*
* @param classLoader the {@code ClassLoader} to use
*/
public
SpringApplicationLauncher
(
ClassLoader
classLoader
)
{
...
...
@@ -46,7 +46,6 @@ public class SpringApplicationLauncher {
/**
* Launches the application created using the given {@code sources}. The application
* is launched with the given {@code args}.
*
* @param sources The sources for the application
* @param args The args for the application
* @return The application's {@code ApplicationContext}
...
...
@@ -55,10 +54,9 @@ public class SpringApplicationLauncher {
public
Object
launch
(
Object
[]
sources
,
String
[]
args
)
throws
Exception
{
Map
<
String
,
Object
>
defaultProperties
=
new
HashMap
<
String
,
Object
>();
defaultProperties
.
put
(
"spring.groovy.template.check-template-location"
,
"false"
);
Class
<?>
applicationClass
=
this
.
classLoader
.
loadClass
(
SPRING_APPLICATION_CLASS
);
Object
application
=
applicationClass
.
getConstructor
(
Object
[].
class
).
newInstance
(
(
Object
)
sources
);
Constructor
<?>
constructor
=
applicationClass
.
getConstructor
(
Object
[].
class
);
Object
application
=
constructor
.
newInstance
(
(
Object
)
sources
);
applicationClass
.
getMethod
(
"setDefaultProperties"
,
Map
.
class
).
invoke
(
application
,
defaultProperties
);
Method
method
=
applicationClass
.
getMethod
(
"run"
,
String
[].
class
);
...
...
spring-boot/src/main/java/org/springframework/boot/json/GsonJsonParser.java
View file @
2a857902
...
...
@@ -23,7 +23,11 @@ import com.google.gson.Gson;
import
com.google.gson.GsonBuilder
;
/**
* @author dsyer
* Thin wrapper to adapt {@link Gson} to a {@link JsonParser}.
*
* @author Dave Syer
* @since 1.2.0
* @see JsonParserFactory
*/
public
class
GsonJsonParser
implements
JsonParser
{
...
...
spring-boot/src/main/java/org/springframework/boot/json/JsonParserFactory.java
View file @
2a857902
/*
* Copyright 2012-201
3
the original author or authors.
* Copyright 2012-201
4
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.
...
...
spring-boot/src/test/java/org/springframework/boot/json/GsonJsonParserTests.java
View file @
2a857902
/*
* Copyright 2012-201
3
the original author or authors.
* Copyright 2012-201
4
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.
...
...
@@ -17,7 +17,7 @@
package
org
.
springframework
.
boot
.
json
;
/**
* Tests for {@link
Yaml
JsonParser}.
* Tests for {@link
Gson
JsonParser}.
*
* @author Dave Syer
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment