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
2a9a7493
Commit
2a9a7493
authored
Nov 21, 2014
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
5220f584
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
8 deletions
+9
-8
HttpMapperProperties.java
...ramework/boot/autoconfigure/web/HttpMapperProperties.java
+1
-2
ConfigurationMetadataAnnotationProcessor.java
...onprocessor/ConfigurationMetadataAnnotationProcessor.java
+2
-2
ConfigurationMetadataAnnotationProcessorTests.java
...cessor/ConfigurationMetadataAnnotationProcessorTests.java
+4
-1
InnerClassProperties.java
...ot/configurationsample/specific/InnerClassProperties.java
+2
-3
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMapperProperties.java
View file @
2a9a7493
...
@@ -27,11 +27,10 @@ import com.fasterxml.jackson.databind.SerializationFeature;
...
@@ -27,11 +27,10 @@ import com.fasterxml.jackson.databind.SerializationFeature;
/**
/**
* Configuration properties to configure {@link HttpMessageConverter}s.
* Configuration properties to configure {@link HttpMessageConverter}s.
*
*
* @deprecated pleas use {@link JacksonProperties} instead
*
* @author Dave Syer
* @author Dave Syer
* @author Piotr Maj
* @author Piotr Maj
* @author Sebastien Deleuze
* @author Sebastien Deleuze
* @deprecated in favor of {@link JacksonProperties}
*/
*/
@ConfigurationProperties
(
prefix
=
"http.mappers"
,
ignoreUnknownFields
=
false
)
@ConfigurationProperties
(
prefix
=
"http.mappers"
,
ignoreUnknownFields
=
false
)
@Deprecated
@Deprecated
...
...
spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java
View file @
2a9a7493
...
@@ -208,8 +208,8 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
...
@@ -208,8 +208,8 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
if
(
returnType
!=
null
&&
returnType
instanceof
TypeElement
if
(
returnType
!=
null
&&
returnType
instanceof
TypeElement
&&
annotation
==
null
)
{
&&
annotation
==
null
)
{
TypeElement
returns
=
(
TypeElement
)
returnType
;
TypeElement
returns
=
(
TypeElement
)
returnType
;
if
((
this
.
typeUtils
.
isEnclosedIn
(
returnType
,
element
)
&&
returnType
.
getKind
()
!=
ElementKind
.
ENUM
)
if
((
this
.
typeUtils
.
isEnclosedIn
(
returnType
,
element
)
&&
returnType
||
isNested
)
{
.
getKind
()
!=
ElementKind
.
ENUM
)
||
isNested
)
{
String
nestedPrefix
=
ConfigurationMetadata
String
nestedPrefix
=
ConfigurationMetadata
.
nestedPrefix
(
prefix
,
name
);
.
nestedPrefix
(
prefix
,
name
);
this
.
metadata
.
add
(
ItemMetadata
.
newGroup
(
nestedPrefix
,
this
.
metadata
.
add
(
ItemMetadata
.
newGroup
(
nestedPrefix
,
...
...
spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java
View file @
2a9a7493
...
@@ -243,7 +243,10 @@ public class ConfigurationMetadataAnnotationProcessorTests {
...
@@ -243,7 +243,10 @@ public class ConfigurationMetadataAnnotationProcessorTests {
assertThat
(
metadata
,
containsGroup
(
"config.third"
).
ofType
(
SimplePojo
.
class
)
assertThat
(
metadata
,
containsGroup
(
"config.third"
).
ofType
(
SimplePojo
.
class
)
.
fromSource
(
InnerClassProperties
.
class
));
.
fromSource
(
InnerClassProperties
.
class
));
assertThat
(
metadata
,
containsProperty
(
"config.third.value"
));
assertThat
(
metadata
,
containsProperty
(
"config.third.value"
));
assertThat
(
metadata
,
containsProperty
(
"config.fourth"
).
ofType
(
InnerClassProperties
.
Fourth
.
class
));
assertThat
(
metadata
,
containsProperty
(
"config.fourth"
).
ofType
(
InnerClassProperties
.
Fourth
.
class
));
assertThat
(
metadata
,
not
(
containsGroup
(
"config.fourth"
)));
assertThat
(
metadata
,
not
(
containsGroup
(
"config.fourth"
)));
}
}
...
...
spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java
View file @
2a9a7493
...
@@ -53,7 +53,7 @@ public class InnerClassProperties {
...
@@ -53,7 +53,7 @@ public class InnerClassProperties {
}
}
public
Fourth
getFourth
()
{
public
Fourth
getFourth
()
{
return
fourth
;
return
this
.
fourth
;
}
}
public
void
setFourth
(
Fourth
fourth
)
{
public
void
setFourth
(
Fourth
fourth
)
{
...
@@ -94,8 +94,7 @@ public class InnerClassProperties {
...
@@ -94,8 +94,7 @@ public class InnerClassProperties {
}
}
public
static
enum
Fourth
{
public
static
enum
Fourth
{
YES
,
YES
,
NO
NO
}
}
}
}
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