Fix checkstyle

AB-xdev · JohannesRabauer · AB-xdev · commit f7b75f2fdad4 · 2024-01-23T10:51:16.000+01:00
Co-Authored-By: Johannes Rabauer &lt;8188460+JohannesRabauer@users.noreply.github.com&gt;
diff --git a/spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/complex/ComplexDemoApplication.java b/spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/complex/ComplexDemoApplication.java
@@ -17,7 +17,6 @@
 package software.xdev.spring.data.eclipse.store.demo.complex;
 
 import java.time.LocalDate;
-import java.time.temporal.ChronoUnit;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -125,13 +124,14 @@ private static Vet createVet()
 		return vet;
 	}
 	
+	@SuppressWarnings("checkstyle:MagicNumber")
 	private static Owner createOwner()
 	{
 		final Owner owner = new Owner();
 		owner.setFirstName("Stevie");
 		owner.setLastName("Nicks");
 		final Pet pet = new Pet();
-		pet.setBirthDate(LocalDate.now().minus(6, ChronoUnit.WEEKS));
+		pet.setBirthDate(LocalDate.now().minusWeeks(6));
 		pet.setName("Peter");
 		final PetType petType = new PetType();
 		petType.setName("Dog");
diff --git a/spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/complex/model/BaseEntity.java b/spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/complex/model/BaseEntity.java
@@ -17,11 +17,11 @@
 
 import java.io.Serializable;
 
-import org.springframework.data.annotation.Id;
-
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 
+import org.springframework.data.annotation.Id;
+
 
 public class BaseEntity implements Serializable
 {
@@ -42,8 +42,8 @@ public boolean isNew()
 	@Override
 	public String toString()
 	{
-		return "BaseEntity{" +
-			"id=" + this.id +
-			'}';
+		return "BaseEntity{"
+			+ "id=" + this.id
+			+ '}';
 	}
 }
diff --git a/spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/complex/model/Person.java b/spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/complex/model/Person.java
@@ -44,9 +44,9 @@ public void setLastName(final String lastName)
 	@Override
 	public String toString()
 	{
-		return "Person{" +
-			"firstName='" + this.firstName + '\'' +
-			", lastName='" + this.lastName + '\'' +
-			'}';
+		return "Person{"
+			+ "firstName='" + this.firstName + '\''
+			+ ", lastName='" + this.lastName + '\''
+			+ '}';
 	}
 }
diff --git a/spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/simple/Customer.java b/spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/simple/Customer.java
@@ -6,7 +6,7 @@
 public class Customer
 {
 	@Id
-	public String id;
+	private String id;
 	
 	private final String firstName;
 	private final String lastName;
diff --git a/spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/simple/Pet.java b/spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/simple/Pet.java
@@ -6,7 +6,7 @@
 public class Pet
 {
 	@Id
-	public String id;
+	private String id;
 	
 	private String name;
 	private Integer age;
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/EclipseStoreStorage.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/EclipseStoreStorage.java
@@ -23,6 +23,9 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 import org.eclipse.serializer.persistence.types.Storer;
 import org.eclipse.store.integrations.spring.boot.types.EclipseStoreProvider;
 import org.eclipse.store.integrations.spring.boot.types.configuration.EclipseStoreProperties;
@@ -32,8 +35,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
 import software.xdev.spring.data.eclipse.store.core.IdentitySet;
 import software.xdev.spring.data.eclipse.store.exceptions.AlreadyRegisteredException;
 import software.xdev.spring.data.eclipse.store.repository.support.copier.id.IdSetter;
@@ -54,7 +55,7 @@ public class EclipseStoreStorage implements EntityListProvider, IdSetterProvider
 	private final EclipseStoreProvider storeProvider;
 	
 	private StorageManager storageManager;
-	private Root root = null;
+	private Root root;
 	
 	private final WorkingCopyRegistry registry = new WorkingCopyRegistry();
 	private RepositorySynchronizer repositorySynchronizer;
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/EntitySetCollector.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/EntitySetCollector.java
@@ -31,11 +31,9 @@ public class EntitySetCollector
 	private static final Logger LOG = LoggerFactory.getLogger(EntitySetCollector.class);
 	private final Map<Class<?>, List<IdentitySet<? super Object>>> childClassToParentSets = new HashMap<>();
 	
-	public EntitySetCollector
-		(
-			final Map<String, IdentitySet<Object>> entityLists,
-			final Map<Class<?>, String> entityClassToRepositoryName
-		)
+	public EntitySetCollector(
+		final Map<String, IdentitySet<Object>> entityLists,
+		final Map<Class<?>, String> entityClassToRepositoryName)
 	{
 		this.buildParentClassList(entityLists, entityClassToRepositoryName);
 	}
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/access/AccessHelper.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/access/AccessHelper.java
@@ -31,13 +31,12 @@
 /**
  * Helps finding and handling {@link Field}s.
  */
-public class AccessHelper
+public final class AccessHelper
 {
 	private static final Logger LOG = LoggerFactory.getLogger(AccessHelper.class);
 	
 	private AccessHelper()
 	{
-		// Only static methods
 	}
 	
 	/**
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/query/criteria/AbstractCriteriaNode.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/query/criteria/AbstractCriteriaNode.java
@@ -111,8 +111,8 @@ public AbstractCriteriaNode<T> between(final Object minValue, final Object maxVa
 		Objects.requireNonNull(maxValue);
 		this.predicates.add(entity -> {
 			final Object value = Objects.requireNonNull(this.field).readValue(entity);
-			return GenericObjectComparer.isLessOrEqualTo(value, maxValue) &&
-				GenericObjectComparer.isGreaterOrEqualTo(value, minValue);
+			return GenericObjectComparer.isLessOrEqualTo(value, maxValue)
+				&& GenericObjectComparer.isGreaterOrEqualTo(value, minValue);
 		});
 		return this;
 	}
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/query/executors/EntitySorter.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/query/executors/EntitySorter.java
@@ -26,14 +26,13 @@
 import software.xdev.spring.data.eclipse.store.util.GenericObjectComparer;
 
 
-public class EntitySorter
+public final class EntitySorter
 {
 	private EntitySorter()
 	{
-		// Only static methods
 	}
 	
-	public static <T> Stream<T> sortEntitiesStream(final Class<T> clazz, final Sort sort, Stream<T> entityStream)
+	public static <T> Stream<T> sortEntitiesStream(final Class<T> clazz, final Sort sort, final Stream<T> entityStream)
 	{
 		if(sort != null)
 		{
@@ -45,7 +44,7 @@ public static <T> Stream<T> sortEntitiesStream(final Class<T> clazz, final Sort
 						AccessHelper.getInheritedPrivateField(clazz, order.getProperty());
 					final Comparator<? super T> comparator =
 						EntitySorter.getComparator(fieldForOrder, order.getDirection());
-					entityStream = entityStream.sorted(comparator);
+					return entityStream.sorted(comparator);
 				}
 				catch(final NoSuchFieldException e)
 				{
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/query/executors/PageableSortableCollectionQuerier.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/query/executors/PageableSortableCollectionQuerier.java
@@ -21,13 +21,14 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
 import software.xdev.spring.data.eclipse.store.repository.query.criteria.Criteria;
 import software.xdev.spring.data.eclipse.store.repository.support.copier.working.WorkingCopier;
 
@@ -92,12 +93,12 @@ private List<T> copyEntities(final Stream<T> filteredEntityStream)
 			.toList();
 	}
 	
-	private Stream<T> pageEntityStream(final Pageable pageable, Stream<T> entityStream)
+	private Stream<T> pageEntityStream(final Pageable pageable, final Stream<T> entityStream)
 	{
 		if(pageable != null && pageable.isPaged())
 		{
 			final long skipCount = pageable.getOffset();
-			entityStream = entityStream
+			return entityStream
 				.skip(skipCount)
 				.limit(pageable.getPageSize());
 		}
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/query/executors/QueryExecutorCreator.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/query/executors/QueryExecutorCreator.java
@@ -27,13 +27,12 @@
 import software.xdev.spring.data.eclipse.store.repository.support.copier.working.WorkingCopier;
 
 
-public class QueryExecutorCreator
+public final class QueryExecutorCreator
 {
 	private static final Logger LOG = LoggerFactory.getLogger(QueryExecutorCreator.class);
 	
 	private QueryExecutorCreator()
 	{
-		// Only static methods
 	}
 	
 	/**
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/IdFieldFinder.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/IdFieldFinder.java
@@ -22,11 +22,10 @@
 import software.xdev.spring.data.eclipse.store.repository.access.AccessHelper;
 
 
-public class IdFieldFinder
+public final class IdFieldFinder
 {
 	private IdFieldFinder()
 	{
-		// Only static methods available
 	}
 	
 	/**
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/copier/DataTypeUtil.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/copier/DataTypeUtil.java
@@ -15,33 +15,29 @@
  */
 package software.xdev.spring.data.eclipse.store.repository.support.copier;
 
-import java.util.HashSet;
 import java.util.Objects;
+import java.util.Set;
 
 import jakarta.annotation.Nonnull;
 
-public class DataTypeUtil
+
+public final class DataTypeUtil
 {
-	private static final HashSet<Class<?>> WRAPPER_TYPES;
-	
-	static
-	{
-		WRAPPER_TYPES = new HashSet<>(10);
-		WRAPPER_TYPES.add(Integer.class);
-		WRAPPER_TYPES.add(Byte.class);
-		WRAPPER_TYPES.add(Character.class);
-		WRAPPER_TYPES.add(Boolean.class);
-		WRAPPER_TYPES.add(Double.class);
-		WRAPPER_TYPES.add(Float.class);
-		WRAPPER_TYPES.add(Long.class);
-		WRAPPER_TYPES.add(Short.class);
-		WRAPPER_TYPES.add(Void.class);
-		WRAPPER_TYPES.add(String.class);
-	}
+	private static final Set<Class<?>> WRAPPER_TYPES = Set.of(
+		Integer.class,
+		Byte.class,
+		Character.class,
+		Boolean.class,
+		Double.class,
+		Float.class,
+		Long.class,
+		Short.class,
+		Void.class,
+		String.class
+	);
 	
 	private DataTypeUtil()
 	{
-		// Only static methods available
 	}
 	
 	public static boolean isObjectArray(final Object obj)
@@ -51,11 +47,11 @@ public static boolean isObjectArray(final Object obj)
 	
 	public static boolean isPrimitiveArray(final Object obj)
 	{
-		return obj instanceof boolean[] ||
-			obj instanceof byte[] || obj instanceof short[] ||
-			obj instanceof char[] || obj instanceof int[] ||
-			obj instanceof long[] || obj instanceof float[] ||
-			obj instanceof double[];
+		return obj instanceof boolean[]
+			|| obj instanceof byte[] || obj instanceof short[]
+			|| obj instanceof char[] || obj instanceof int[]
+			|| obj instanceof long[] || obj instanceof float[]
+			|| obj instanceof double[];
 	}
 	
 	public static <T> boolean isPrimitiveType(@Nonnull final Class<T> source)
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/copier/id/IdSetter.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/copier/id/IdSetter.java
@@ -22,15 +22,14 @@
 import java.util.function.Supplier;
 
 import jakarta.persistence.GeneratedValue;
+
 import software.xdev.spring.data.eclipse.store.repository.support.IdFieldFinder;
 import software.xdev.spring.data.eclipse.store.repository.support.copier.id.strategy.IdFinder;
 
 
 /**
  * A IdSetter <b>must be unique</b> in one storage for one entity-class. It creates Ids and therefore must know all
  * existing entities of one class.
- *
- * @param <T>
  */
 public interface IdSetter<T>
 {
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/copier/working/RecursiveWorkingCopier.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/copier/working/RecursiveWorkingCopier.java
@@ -37,8 +37,6 @@
 
 /**
  * Creates copies and puts them back. Recognizes already persisted Objects and checks them for changes as well.
- *
- * @param <T>
  */
 public class RecursiveWorkingCopier<T> implements WorkingCopier<T>
 {
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/reposyncer/RepositorySynchronizer.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/reposyncer/RepositorySynchronizer.java
@@ -21,8 +21,8 @@
 
 
 /**
- * Since EclipseStore is not table-oriented, but the access through the repositories is, we must keep the lists/tables of
- * entities in sync with the existing entities in the graph.
+ * Since EclipseStore is not table-oriented, but the access through the repositories is, we must keep the lists/tables
+ * of entities in sync with the existing entities in the graph.
  * <p>
  * With every store we must check, if there is a new entity in the graph, that isn't yet in the entity-list.
  */
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/util/GenericObjectComparer.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/util/GenericObjectComparer.java
@@ -18,11 +18,10 @@
 import software.xdev.spring.data.eclipse.store.exceptions.NotComparableException;
 
 
-public class GenericObjectComparer
+public final class GenericObjectComparer
 {
 	private GenericObjectComparer()
 	{
-		// Only static methods
 	}
 	
 	public static <E> int compare(final E o1, final E o2)
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/util/StringUtil.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/util/StringUtil.java
@@ -20,11 +20,10 @@
 import software.xdev.spring.data.eclipse.store.exceptions.StringBlankException;
 
 
-public class StringUtil
+public final class StringUtil
 {
 	private StringUtil()
 	{
-		// Only static methods
 	}
 	
 	@SuppressWarnings("UnusedReturnValue")
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/helper/TestData.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/helper/TestData.java
@@ -15,10 +15,14 @@
  */
 package software.xdev.spring.data.eclipse.store.helper;
 
-public class TestData
+public final class TestData
 {
 	public static final String LAST_NAME = "Fleetwood";
 	public static final String FIRST_NAME = "Mick";
 	public static final String LAST_NAME_ALTERNATIVE = "Nicks";
 	public static final String FIRST_NAME_ALTERNATIVE = "Stevie";
+	
+	private TestData()
+	{
+	}
 }
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/helper/TestUtil.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/helper/TestUtil.java
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/repositories/Node.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/repositories/Node.java
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/tests/JpaCompatibilityTest.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/tests/JpaCompatibilityTest.java
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/tests/QueryTest.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/tests/QueryTest.java
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/repository/query/EclipseStoreQueryCreatorGreaterLessTest.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/repository/query/EclipseStoreQueryCreatorGreaterLessTest.java
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/repository/query/EclipseStoreQueryCreatorIsIsNotTest.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/repository/query/EclipseStoreQueryCreatorIsIsNotTest.java
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/repository/query/QueryCreatorUtil.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/repository/query/QueryCreatorUtil.java
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/repository/query/executors/PageableSortableCollectionQuerierTest.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/repository/query/executors/PageableSortableCollectionQuerierTest.java
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/repository/support/copier/object/MicroStreamRegisteringCopierTest.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/repository/support/copier/object/MicroStreamRegisteringCopierTest.java

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,11 @@`
`17`	`17`
`18`	`18`	`import java.io.Serializable;`
`19`	`19`
`20`		`-import org.springframework.data.annotation.Id;`
`21`		`-`
`22`	`20`	`import jakarta.persistence.GeneratedValue;`
`23`	`21`	`import jakarta.persistence.GenerationType;`
`24`	`22`
	`23`	`+import org.springframework.data.annotation.Id;`
	`24`	`+`
`25`	`25`
`26`	`26`	`public class BaseEntity implements Serializable`
`27`	`27`	`{`
`@@ -42,8 +42,8 @@ public boolean isNew()`
`42`	`42`	`@Override`
`43`	`43`	`public String toString()`
`44`	`44`	`{`
`45`		`- return "BaseEntity{" +`
`46`		`- "id=" + this.id +`
`47`		`- '}';`
	`45`	`+ return "BaseEntity{"`
	`46`	`+ + "id=" + this.id`
	`47`	`+ + '}';`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,9 @@ public void setLastName(final String lastName)`
`44`	`44`	`@Override`
`45`	`45`	`public String toString()`
`46`	`46`	`{`
`47`		`- return "Person{" +`
`48`		`- "firstName='" + this.firstName + '\'' +`
`49`		`- ", lastName='" + this.lastName + '\'' +`
`50`		`- '}';`
	`47`	`+ return "Person{"`
	`48`	`+ + "firstName='" + this.firstName + '\''`
	`49`	`+ + ", lastName='" + this.lastName + '\''`
	`50`	`+ + '}';`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`public class Customer`
`7`	`7`	`{`
`8`	`8`	`@Id`
`9`		`- public String id;`
	`9`	`+ private String id;`
`10`	`10`
`11`	`11`	`private final String firstName;`
`12`	`12`	`private final String lastName;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`public class Pet`
`7`	`7`	`{`
`8`	`8`	`@Id`
`9`		`- public String id;`
	`9`	`+ private String id;`
`10`	`10`
`11`	`11`	`private String name;`
`12`	`12`	`private Integer age;`
Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,9 @@ public class EntitySetCollector`
`31`	`31`	`private static final Logger LOG = LoggerFactory.getLogger(EntitySetCollector.class);`
`32`	`32`	`private final Map<Class<?>, List<IdentitySet<? super Object>>> childClassToParentSets = new HashMap<>();`
`33`	`33`
`34`		`- public EntitySetCollector`
`35`		`- (`
`36`		`- final Map<String, IdentitySet<Object>> entityLists,`
`37`		`- final Map<Class<?>, String> entityClassToRepositoryName`
`38`		`- )`
	`34`	`+ public EntitySetCollector(`
	`35`	`+ final Map<String, IdentitySet<Object>> entityLists,`
	`36`	`+ final Map<Class<?>, String> entityClassToRepositoryName)`
`39`	`37`	`{`
`40`	`38`	`this.buildParentClassList(entityLists, entityClassToRepositoryName);`
`41`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,12 @@`
`31`	`31`	`/**`
`32`	`32`	`* Helps finding and handling {@link Field}s.`
`33`	`33`	`*/`
`34`		`-public class AccessHelper`
	`34`	`+public final class AccessHelper`
`35`	`35`	`{`
`36`	`36`	`private static final Logger LOG = LoggerFactory.getLogger(AccessHelper.class);`
`37`	`37`
`38`	`38`	`private AccessHelper()`
`39`	`39`	`{`
`40`		`- // Only static methods`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -26,14 +26,13 @@`
`26`	`26`	`import software.xdev.spring.data.eclipse.store.util.GenericObjectComparer;`
`27`	`27`
`28`	`28`
`29`		`-public class EntitySorter`
	`29`	`+public final class EntitySorter`
`30`	`30`	`{`
`31`	`31`	`private EntitySorter()`
`32`	`32`	`{`
`33`		`- // Only static methods`
`34`	`33`	`}`
`35`	`34`
`36`		`- public static <T> Stream<T> sortEntitiesStream(final Class<T> clazz, final Sort sort, Stream<T> entityStream)`
	`35`	`+ public static <T> Stream<T> sortEntitiesStream(final Class<T> clazz, final Sort sort, final Stream<T> entityStream)`
`37`	`36`	`{`
`38`	`37`	`if(sort != null)`
`39`	`38`	`{`
`@@ -45,7 +44,7 @@ public static <T> Stream<T> sortEntitiesStream(final Class<T> clazz, final Sort`
`45`	`44`	`AccessHelper.getInheritedPrivateField(clazz, order.getProperty());`
`46`	`45`	`final Comparator<? super T> comparator =`
`47`	`46`	`EntitySorter.getComparator(fieldForOrder, order.getDirection());`
`48`		`- entityStream = entityStream.sorted(comparator);`
	`47`	`+ return entityStream.sorted(comparator);`
`49`	`48`	`}`
`50`	`49`	`catch(final NoSuchFieldException e)`
`51`	`50`	`{`