Polishing.

Remove superfluous `this.`.
Fix a broken test.

See #2329

Author: schauder

src/main/java/org/springframework/data/jpa/repository/support/FetchableFluentQueryByExample.java

@@ -94,9 +94,9 @@ public FetchableFluentQuery<R> sortBy(Sort sort) {
 
 		Assert.notNull(sort, "Sort must not be null!");
 
-		return new FetchableFluentQueryByExample<>(this.example, this.entityType, this.resultType, this.sort.and(sort),
-				this.properties, this.finder, this.countOperation, this.existsOperation, this.context, this.entityManager,
-				this.escapeCharacter, new TypedQueryProjector(entityManager));
+		return new FetchableFluentQueryByExample<>(example, entityType, resultType, sort.and(sort), properties, finder,
+				countOperation, existsOperation, context, entityManager, escapeCharacter,
+				new TypedQueryProjector(entityManager));
 	}
 
 	/* 
@@ -111,8 +111,8 @@ public <NR> FetchableFluentQuery<NR> as(Class<NR> resultType) {
 			throw new UnsupportedOperationException("Class-based DTOs are not yet supported.");
 		}
 
-		return new FetchableFluentQueryByExample<>(this.example, this.entityType, resultType, this.sort, this.properties,
-				this.finder, this.countOperation, this.existsOperation, this.context, this.entityManager, this.escapeCharacter,
+		return new FetchableFluentQueryByExample<>(example, entityType, resultType, sort, properties, finder,
+				countOperation, existsOperation, context, entityManager, escapeCharacter,
 				new TypedQueryProjector(entityManager));
 	}
 
@@ -123,9 +123,9 @@ public <NR> FetchableFluentQuery<NR> as(Class<NR> resultType) {
 	@Override
 	public FetchableFluentQuery<R> project(Collection<String> properties) {
 
-		return new FetchableFluentQueryByExample<>(this.example, this.entityType, this.resultType, this.sort,
-				mergeProperties(properties), this.finder, this.countOperation, this.existsOperation, this.context,
-				this.entityManager, this.escapeCharacter, new TypedQueryProjector(entityManager));
+		return new FetchableFluentQueryByExample<>(example, entityType, resultType, sort, mergeProperties(properties),
+				finder, countOperation, existsOperation, context, entityManager, escapeCharacter,
+				new TypedQueryProjector(entityManager));
 	}
 
 	/* 
@@ -201,7 +201,7 @@ public Stream<R> stream() {
 	 */
 	@Override
 	public long count() {
-		return this.countOperation.apply(example);
+		return countOperation.apply(example);
 	}
 
 	/* 
@@ -210,7 +210,7 @@ public long count() {
 	 */
 	@Override
 	public boolean exists() {
-		return this.existsOperation.apply(example);
+		return existsOperation.apply(example);
 	}
 
 	private Page<R> readPage(Pageable pageable) {
@@ -224,12 +224,12 @@ private Page<R> readPage(Pageable pageable) {
 
 		List<R> paginatedResults = convert(pagedQuery.getResultList());
 
-		return PageableExecutionUtils.getPage(paginatedResults, pageable, () -> this.countOperation.apply(this.example));
+		return PageableExecutionUtils.getPage(paginatedResults, pageable, () -> countOperation.apply(example));
 	}
 
 	private TypedQuery<S> createSortedAndProjectedQuery() {
 
-		TypedQuery<S> query = this.finder.apply(this.sort);
+		TypedQuery<S> query = finder.apply(sort);
 		projector.apply(entityType, query, properties);
 
 		return query;
@@ -247,7 +247,7 @@ private List<R> convert(List<S> resultList) {
 	}
 
 	private Function<Object, R> getConversionFunction() {
-		return getConversionFunction(this.example.getProbeType(), this.resultType);
+		return getConversionFunction(example.getProbeType(), resultType);
 	}
 
 }

src/main/java/org/springframework/data/jpa/repository/support/FetchableFluentQueryByPredicate.java

@@ -92,9 +92,8 @@ public FetchableFluentQuery<R> sortBy(Sort sort) {
 
 		Assert.notNull(sort, "Sort must not be null!");
 
-		return new FetchableFluentQueryByPredicate<>(this.predicate, this.entityType, this.resultType, this.sort.and(sort),
-				this.properties, this.finder, this.pagedFinder, this.countOperation, this.existsOperation, this.context,
-				this.projector);
+		return new FetchableFluentQueryByPredicate<>(predicate, entityType, resultType, sort.and(sort), properties, finder,
+				pagedFinder, countOperation, existsOperation, context, projector);
 	}
 
 	/* 
@@ -110,9 +109,8 @@ public <NR> FetchableFluentQuery<NR> as(Class<NR> resultType) {
 			throw new UnsupportedOperationException("Class-based DTOs are not yet supported.");
 		}
 
-		return new FetchableFluentQueryByPredicate<>(this.predicate, this.entityType, resultType, this.sort,
-				this.properties, this.finder, this.pagedFinder, this.countOperation, this.existsOperation, this.context,
-				this.projector);
+		return new FetchableFluentQueryByPredicate<>(predicate, entityType, resultType, sort, properties, finder,
+				pagedFinder, countOperation, existsOperation, context, projector);
 	}
 
 	/* 
@@ -122,9 +120,8 @@ public <NR> FetchableFluentQuery<NR> as(Class<NR> resultType) {
 	@Override
 	public FetchableFluentQuery<R> project(Collection<String> properties) {
 
-		return new FetchableFluentQueryByPredicate<>(this.predicate, this.entityType, this.resultType, this.sort,
-				mergeProperties(properties), this.finder, this.pagedFinder, this.countOperation, this.existsOperation,
-				this.context, this.projector);
+		return new FetchableFluentQueryByPredicate<>(predicate, entityType, resultType, sort, mergeProperties(properties),
+				finder, pagedFinder, countOperation, existsOperation, context, projector);
 	}
 
 	/* 
@@ -195,7 +192,7 @@ public Stream<R> stream() {
 	 */
 	@Override
 	public long count() {
-		return this.countOperation.apply(this.predicate);
+		return countOperation.apply(predicate);
 	}
 
 	/* 
@@ -204,22 +201,22 @@ public long count() {
 	 */
 	@Override
 	public boolean exists() {
-		return this.existsOperation.apply(this.predicate);
+		return existsOperation.apply(predicate);
 	}
 
 	private AbstractJPAQuery<?, ?> createSortedAndProjectedQuery() {
 
-		final AbstractJPAQuery<?, ?> query = this.finder.apply(this.sort);
+		final AbstractJPAQuery<?, ?> query = finder.apply(sort);
 		projector.apply(entityType, query, properties);
 		return query;
 	}
 
 	private Page<R> readPage(Pageable pageable) {
 
-		AbstractJPAQuery<?, ?> pagedQuery = this.pagedFinder.apply(this.sort, pageable);
+		AbstractJPAQuery<?, ?> pagedQuery = pagedFinder.apply(sort, pageable);
 		List<R> paginatedResults = convert(pagedQuery.fetch());
 
-		return PageableExecutionUtils.getPage(paginatedResults, pageable, () -> this.countOperation.apply(this.predicate));
+		return PageableExecutionUtils.getPage(paginatedResults, pageable, () -> countOperation.apply(predicate));
 	}
 
 	private List<R> convert(List<?> resultList) {
@@ -235,7 +232,7 @@ private List<R> convert(List<?> resultList) {
 	}
 
 	private Function<Object, R> getConversionFunction() {
-		return getConversionFunction(this.entityType, this.resultType);
+		return getConversionFunction(entityType, resultType);
 	}
 
 }

src/main/java/org/springframework/data/jpa/repository/support/FluentQuerySupport.java

@@ -67,7 +67,7 @@ abstract class FluentQuerySupport<S, R> {
 	final Collection<String> mergeProperties(Collection<String> additionalProperties) {
 
 		Set<String> newProperties = new HashSet<>();
-		newProperties.addAll(this.properties);
+		newProperties.addAll(properties);
 		newProperties.addAll(additionalProperties);
 		return Collections.unmodifiableCollection(newProperties);
 	}

src/test/java/org/springframework/data/jpa/repository/support/QuerydslProjectorUnitTests.java

@@ -58,13 +58,13 @@ void emptySetOfPropertiesDoesNotCreateEntityGraph() {
 	@Test
 	void simpleSetOfPropertiesGetRegistered() {
 
-		final HashSet<String> properties = new HashSet<>(asList("alpha", "beta"));
+		final HashSet<String> properties = new HashSet<>(asList("one", "two"));
 
 		new QuerydslProjector(em).apply(DummyEntity.class, jpaQuery, properties);
 
 		verify(jpaQuery).setHint("javax.persistence.fetchgraph", entityGraph);
-		verify(entityGraph).addAttributeNodes("alpha");
-		verify(entityGraph).addAttributeNodes("beta");
+		verify(entityGraph).addAttributeNodes("one");
+		verify(entityGraph).addAttributeNodes("two");
 	}
 
 	// GH-2329
@@ -88,5 +88,11 @@ void setOfCompositePropertiesGetRegisteredPiecewise() {
 		verify(zwei).addAttributeNodes("drei");
 	}
 
-	private static class DummyEntity {}
+	private static class DummyEntity {
+		DummyEntity one;
+		DummyEntity two;
+		DummyEntity eins;
+		DummyEntity zwei;
+		DummyEntity drei;
+	}
 }