Spring/spring-data-rest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREST-754 - Polishing.

Browse Source 
Upgraded to Groovy 2.4.4. Polished sample domain types and repositories. Removed obsolete format registration in test cases for schema creation. Keep inlined null checks to make sure the IDE doesn't create unnecessary can-be-null warnings.

Original pull request: #206.
This commit is contained in:
Oliver Gierke
2016-01-25 17:46:25 +01:00
parent 9fd62b5dbf
commit b866af762d
8 changed files with 26 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/PersistentEntityToJsonSchemaConverter.java
View File

@@ -188,25 +188,23 @@ public class PersistentEntityToJsonSchemaConverter implements ConditionalGeneric
}
}
boolean isPersistentPropertyNull = persistentProperty == null;
AnnotatedMember primaryMember = definition.getPrimaryMember();
if (primaryMember == null) { // Ignore bean definitions with neither a getter nor a setter
if (primaryMember == null) {
continue;
}
TypeInformation<?> propertyType = isPersistentPropertyNull
? ClassTypeInformation.from(primaryMember.getRawType())
: persistentProperty.getTypeInformation();
TypeInformation<?> propertyType = persistentProperty == null
? ClassTypeInformation.from(primaryMember.getRawType()) : persistentProperty.getTypeInformation();
TypeInformation<?> actualPropertyType = propertyType.getActualType();
Class<?> rawPropertyType = propertyType.getType();
JsonSchemaFormat format = configuration.getMetadataConfiguration().getSchemaFormatFor(rawPropertyType);
ResourceDescription description = isPersistentPropertyNull
ResourceDescription description = persistentProperty == null
? jackson.getFallbackDescription(metadata, definition) : getDescriptionFor(persistentProperty, metadata);
JsonSchemaProperty property = getSchemaProperty(definition, propertyType, description);
boolean isSyntheticProperty = isPersistentPropertyNull;
boolean isSyntheticProperty = persistentProperty == null;
boolean isNotWritable = !isSyntheticProperty && !persistentProperty.isWritable();
boolean isJacksonReadOnly = !isSyntheticProperty && jackson.isReadOnly(persistentProperty);
@@ -233,7 +231,7 @@ public class PersistentEntityToJsonSchemaConverter implements ConditionalGeneric
continue;
}
if (isPersistentPropertyNull) {
if (persistentProperty == null) {
registrar.register(property, actualPropertyType);
continue;
}