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
2b18e99a
Commit
2b18e99a
authored
Feb 08, 2016
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
77d426c2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
11 deletions
+10
-11
JerseyAutoConfiguration.java
...rk/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
+0
-1
JerseyAutoConfigurationCustomObjectMapperProviderTests.java
...rseyAutoConfigurationCustomObjectMapperProviderTests.java
+4
-5
JerseyAutoConfigurationObjectMapperProviderTests.java
...sey/JerseyAutoConfigurationObjectMapperProviderTests.java
+6
-1
SampleSimpleApplication.java
.../src/main/java/sample/simple/SampleSimpleApplication.java
+0
-4
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
View file @
2b18e99a
...
...
@@ -31,7 +31,6 @@ import javax.ws.rs.ext.ContextResolver;
import
javax.ws.rs.ext.Provider
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
import
org.glassfish.jersey.CommonProperties
;
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomObjectMapperProviderTests.java
View file @
2b18e99a
...
...
@@ -49,8 +49,9 @@ import org.springframework.web.client.RestTemplate;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
/**
* Tests for {@link JerseyAutoConfiguration} when using custom ObjectMapper.
*
* @author Eddú Meléndez
*/
@RunWith
(
SpringJUnit4ClassRunner
.
class
)
...
...
@@ -98,10 +99,6 @@ public class JerseyAutoConfigurationCustomObjectMapperProviderTests {
private
String
body
;
public
Message
()
{
}
public
Message
(
String
subject
,
String
body
)
{
this
.
subject
=
subject
;
this
.
body
=
body
;
...
...
@@ -122,6 +119,7 @@ public class JerseyAutoConfigurationCustomObjectMapperProviderTests {
public
void
setBody
(
String
body
)
{
this
.
body
=
body
;
}
}
@Target
(
ElementType
.
TYPE
)
...
...
@@ -131,6 +129,7 @@ public class JerseyAutoConfigurationCustomObjectMapperProviderTests {
JacksonAutoConfiguration
.
class
,
ServerPropertiesAutoConfiguration
.
class
,
JerseyAutoConfiguration
.
class
,
PropertyPlaceholderAutoConfiguration
.
class
})
protected
@interface
MinimalWebConfiguration
{
}
}
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationObjectMapperProviderTests.java
View file @
2b18e99a
...
...
@@ -50,6 +50,8 @@ import org.springframework.web.client.RestTemplate;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
/**
* Tests for {@link JerseyAutoConfiguration} with a ObjectMapper.
*
* @author Eddú Meléndez
*/
@RunWith
(
SpringJUnit4ClassRunner
.
class
)
...
...
@@ -68,7 +70,8 @@ public class JerseyAutoConfigurationObjectMapperProviderTests {
ResponseEntity
<
String
>
response
=
this
.
restTemplate
.
getForEntity
(
"http://localhost:"
+
this
.
port
+
"/rest/message"
,
String
.
class
);
assertThat
(
HttpStatus
.
OK
).
isEqualTo
(
response
.
getStatusCode
());
assertThat
(
"{\"subject\":\"Jersey\",\"body\":null}"
).
isEqualTo
(
response
.
getBody
());
assertThat
(
"{\"subject\":\"Jersey\",\"body\":null}"
)
.
isEqualTo
(
response
.
getBody
());
}
@MinimalWebConfiguration
...
...
@@ -121,6 +124,7 @@ public class JerseyAutoConfigurationObjectMapperProviderTests {
public
void
setBody
(
String
body
)
{
this
.
body
=
body
;
}
}
@Target
(
ElementType
.
TYPE
)
...
...
@@ -130,6 +134,7 @@ public class JerseyAutoConfigurationObjectMapperProviderTests {
JacksonAutoConfiguration
.
class
,
ServerPropertiesAutoConfiguration
.
class
,
JerseyAutoConfiguration
.
class
,
PropertyPlaceholderAutoConfiguration
.
class
})
protected
@interface
MinimalWebConfiguration
{
}
}
spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleSimpleApplication.java
View file @
2b18e99a
...
...
@@ -22,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.boot.CommandLineRunner
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
@SpringBootApplication
public
class
SampleSimpleApplication
implements
CommandLineRunner
{
...
...
@@ -43,9 +42,6 @@ public class SampleSimpleApplication implements CommandLineRunner {
}
public
static
void
main
(
String
[]
args
)
throws
Exception
{
SpringApplication
application
=
new
SpringApplication
(
SampleSimpleApplication
.
class
);
application
.
setApplicationContextClass
(
AnnotationConfigApplicationContext
.
class
);
SpringApplication
.
run
(
SampleSimpleApplication
.
class
,
args
);
}
...
...
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