Polishing

Closes gh-59

Author: rstoyanchev

samples/webmvc-http/src/main/java/io/spring/sample/graphql/repository/ArtifactRepositories.java

@@ -3,6 +3,7 @@
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.data.repository.CrudRepository;
 
-public interface ArtifactRepositories extends CrudRepository<ArtifactRepository, String>, QuerydslPredicateExecutor<ArtifactRepository> {
+public interface ArtifactRepositories extends
+		CrudRepository<ArtifactRepository, String>, QuerydslPredicateExecutor<ArtifactRepository> {
 
 }

samples/webmvc-http/src/main/java/io/spring/sample/graphql/repository/ArtifactRepositoryDataWiring.java

@@ -17,11 +17,9 @@ public ArtifactRepositoryDataWiring(ArtifactRepositories repositories) {
 
 	@Override
 	public void customize(RuntimeWiring.Builder builder) {
-		builder.type("Query",
-				typeWiring -> typeWiring.dataFetcher("artifactRepositories", QuerydslDataFetcher
-						.builder(repositories).many())
-						.dataFetcher("artifactRepository", QuerydslDataFetcher
-						.builder(repositories).single()));
+		builder.type("Query", typeWiring -> typeWiring
+				.dataFetcher("artifactRepositories", QuerydslDataFetcher.builder(repositories).many())
+				.dataFetcher("artifactRepository", QuerydslDataFetcher.builder(repositories).single()));
 	}
 
 }

spring-graphql/src/main/java/org/springframework/graphql/data/DtoInstantiatingConverter.java

@@ -51,10 +51,10 @@ class DtoInstantiatingConverter<T> implements Converter<Object, T> {
 	public DtoInstantiatingConverter(Class<T> dtoType,
 			MappingContext<? extends PersistentEntity<?, ?>, ? extends PersistentProperty<?>> context,
 			EntityInstantiators entityInstantiators) {
+
 		this.targetType = dtoType;
 		this.context = context;
-		this.instantiator = entityInstantiators
-				.getInstantiatorFor(context.getRequiredPersistentEntity(dtoType));
+		this.instantiator = entityInstantiators.getInstantiatorFor(context.getRequiredPersistentEntity(dtoType));
 	}
 
 	@SuppressWarnings("unchecked")
@@ -65,39 +65,32 @@ public T convert(Object source) {
 			return (T) source;
 		}
 
-		PersistentEntity<?, ?> sourceEntity = context
-				.getRequiredPersistentEntity(source.getClass());
+		PersistentEntity<?, ?> sourceEntity = this.context.getRequiredPersistentEntity(source.getClass());
 
-		PersistentPropertyAccessor<?> sourceAccessor = sourceEntity
-				.getPropertyAccessor(source);
-		PersistentEntity<?, ?> targetEntity = context
-				.getRequiredPersistentEntity(targetType);
-		PreferredConstructor<?, ? extends PersistentProperty<?>> constructor = targetEntity
-				.getPersistenceConstructor();
+		PersistentPropertyAccessor<?> sourceAccessor = sourceEntity.getPropertyAccessor(source);
+		PersistentEntity<?, ?> entity = this.context.getRequiredPersistentEntity(this.targetType);
+		PreferredConstructor<?, ? extends PersistentProperty<?>> constructor = entity.getPersistenceConstructor();
 
 		@SuppressWarnings({"rawtypes", "unchecked"})
-		Object dto = instantiator
-				.createInstance(targetEntity, new ParameterValueProvider() {
+		Object dto = this.instantiator.createInstance(entity, new ParameterValueProvider() {
 
 					@Override
 					public Object getParameterValue(Parameter parameter) {
-						return sourceAccessor.getProperty(sourceEntity
-								.getRequiredPersistentProperty(parameter.getName()));
+						return sourceAccessor.getProperty(
+								sourceEntity.getRequiredPersistentProperty(parameter.getName()));
 					}
 				});
 
-		PersistentPropertyAccessor<?> dtoAccessor = targetEntity
-				.getPropertyAccessor(dto);
+		PersistentPropertyAccessor<?> dtoAccessor = entity.getPropertyAccessor(dto);
 
-		targetEntity.doWithProperties((SimplePropertyHandler) property -> {
+		entity.doWithProperties((SimplePropertyHandler) property -> {
 
 			if (constructor.isConstructorParameter(property)) {
 				return;
 			}
 
 			dtoAccessor.setProperty(property,
-					sourceAccessor.getProperty(sourceEntity
-							.getRequiredPersistentProperty(property.getName())));
+					sourceAccessor.getProperty(sourceEntity.getRequiredPersistentProperty(property.getName())));
 		});
 
 		return (T) dto;

spring-graphql/src/main/java/org/springframework/graphql/data/DtoMappingContext.java

@@ -39,8 +39,7 @@ class DtoMappingContext extends AbstractMappingContext<DtoMappingContext.DtoPers
 	protected boolean shouldCreatePersistentEntityFor(TypeInformation<?> type) {
 		// No Java std lib type introspection to not interfere with encapsulation.
 		// We do not want to get into the business of materializing Java types.
-		if (type.getType().getName().startsWith("java.") || type.getType().getName()
-				.startsWith("javax.")) {
+		if (type.getType().getName().startsWith("java.") || type.getType().getName().startsWith("javax.")) {
 			return false;
 		}
 		return super.shouldCreatePersistentEntityFor(type);
@@ -52,8 +51,9 @@ protected <T> DtoPersistentEntity<?> createPersistentEntity(TypeInformation<T> t
 	}
 
 	@Override
-	protected DtoPersistentProperty createPersistentProperty(Property property, DtoPersistentEntity<?> owner,
-			SimpleTypeHolder simpleTypeHolder) {
+	protected DtoPersistentProperty createPersistentProperty(
+			Property property, DtoPersistentEntity<?> owner, SimpleTypeHolder simpleTypeHolder) {
+
 		return new DtoPersistentProperty(property, owner, simpleTypeHolder);
 	}
 
@@ -67,8 +67,10 @@ public DtoPersistentEntity(TypeInformation<T> information) {
 
 	static class DtoPersistentProperty extends AnnotationBasedPersistentProperty<DtoPersistentProperty> {
 
-		public DtoPersistentProperty(Property property, PersistentEntity<?, DtoPersistentProperty> owner,
+		public DtoPersistentProperty(
+				Property property, PersistentEntity<?, DtoPersistentProperty> owner,
 				SimpleTypeHolder simpleTypeHolder) {
+
 			super(property, owner, simpleTypeHolder);
 		}