Commit 2a9a7493 authored by Phillip Webb's avatar Phillip Webb

Polish

parent 5220f584
...@@ -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
......
...@@ -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,
......
...@@ -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")));
} }
......
...@@ -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
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment