Make naming great again

AB-xdev · AB-xdev · commit c59d0636bbc5 · 2026-01-28T15:46:23.000+01:00
this fixes CS

Also what the heck is the difference between `CustomerWithHashSet customer ` and `CustomerWithHashSet customerWithHashSet`?
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/core/EntityProvider.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/core/EntityProvider.java
@@ -29,6 +29,7 @@
 @SuppressWarnings("java:S119")
 public class EntityProvider<T, ID>
 {
+	@SuppressWarnings("checkstyle:IllegalIdentifierName")
 	private final List<EntityData<? extends T, ID>> entityDataList = new ArrayList<>();
 	
 	public void addEntityData(final EntityData<? extends T, ID> entityData)
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/core/IdentitySet.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/core/IdentitySet.java
@@ -34,6 +34,7 @@
  **/
 public class IdentitySet<E> implements Set<E>
 {
+	@SuppressWarnings("checkstyle:IllegalIdentifierName")
 	private final IdentityHashMap<E, Boolean> internalMap;
 	
 	public IdentitySet()
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/importer/EclipseStoreDataImporter.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/importer/EclipseStoreDataImporter.java
@@ -223,33 +223,33 @@ private <T> void copyData(
 	private EntityManagerSupplierRepositoryListPair createEclipseStoreRepositoriesFromEntityManagerFactory(
 		final EntityManagerFactory entityManagerFactory)
 	{
-		final List<ClassRepositoryPair<?>> repositoryList = new ArrayList<>();
+		final List<ClassRepositoryPair<?>> repositories = new ArrayList<>();
 		entityManagerFactory.getMetamodel().getEntities().forEach(
-			entityType -> this.createRepositoryForType(entityType, repositoryList)
+			entityType -> this.createRepositoryForType(entityType, repositories)
 		);
 		
 		return new EntityManagerSupplierRepositoryListPair(
 			entityManagerFactory::createEntityManager,
-			repositoryList);
+			repositories);
 	}
 	
 	private EntityManagerSupplierRepositoryListPair createEclipseStoreRepositoriesFromEntityManager(
 		final EntityManager entityManager)
 	{
-		final List<ClassRepositoryPair<?>> repositoryList = new ArrayList<>();
+		final List<ClassRepositoryPair<?>> repositories = new ArrayList<>();
 		entityManager.getMetamodel().getEntities().forEach(
-			entityType -> this.createRepositoryForType(entityType, repositoryList)
+			entityType -> this.createRepositoryForType(entityType, repositories)
 		);
 		
-		return new EntityManagerSupplierRepositoryListPair(()->entityManager, repositoryList);
+		return new EntityManagerSupplierRepositoryListPair(() -> entityManager, repositories);
 	}
 	
 	private <T> void createRepositoryForType(
 		final EntityType<T> entityType,
-		final List<ClassRepositoryPair<?>> repositoryList)
+		final List<ClassRepositoryPair<?>> repositories)
 	{
 		final Class<T> javaType = entityType.getJavaType();
-		repositoryList.add(new ClassRepositoryPair<>(javaType, this.createEclipseStoreRepo(javaType)));
+		repositories.add(new ClassRepositoryPair<>(javaType, this.createEclipseStoreRepo(javaType)));
 	}
 	
 	private <T> SimpleEclipseStoreRepository<T, ?> createEclipseStoreRepo(final Class<T> domainClass)
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
@@ -322,7 +322,7 @@ private <T, ID> Collection<Object> collectRootEntitiesToStore(
 			objectsToStore.add(entityToStore);
 			// Add the separate lists of entities to store.
 			this.repositorySynchronizer.syncAndReturnChangedObjectLists(entityToStore).forEach(
-				changedEntityList -> objectsToStore.addAll(changedEntityList.getObjectsToStore())
+				changedEntities -> objectsToStore.addAll(changedEntities.getObjectsToStore())
 			);
 		}
 		return objectsToStore;
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/IdTest.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/IdTest.java
@@ -401,9 +401,9 @@ void createMultipleWithAutoIdLong(@Autowired final CustomerWithIdLongRepository
 					TestUtil.iterableToList(customerRepository.findAllById(List.of(1L, 2L)));
 				Assertions.assertEquals(2, loadedCustomers.size());
 				Assertions.assertNotEquals(loadedCustomers.get(0), loadedCustomers.get(1));
-				final List<Long> idList = loadedCustomers.stream().map(CustomerWithIdLong::getId).toList();
-				Assertions.assertTrue(idList.contains(1L));
-				Assertions.assertTrue(idList.contains(2L));
+				final List<Long> ids = loadedCustomers.stream().map(CustomerWithIdLong::getId).toList();
+				Assertions.assertTrue(ids.contains(1L));
+				Assertions.assertTrue(ids.contains(2L));
 			}
 		);
 	}
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/lazy/LazyTest.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/lazy/LazyTest.java
@@ -54,6 +54,7 @@ class LazyTest
 	@Autowired
 	private LazyTestConfiguration configuration;
 	
+	@SuppressWarnings("checkstyle:IllegalIdentifierName")
 	@Test
 	@Disabled("This should work at some point. At least a warning should be displayed.")
 	void lazyListStore(@Autowired final ObjectWithLazyListRepository repository)
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/lazy/ObjectWithLazyHashMap.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/lazy/ObjectWithLazyHashMap.java
@@ -18,6 +18,7 @@
 import org.eclipse.serializer.collections.lazy.LazyHashMap;
 
 
+@SuppressWarnings("checkstyle:IllegalIdentifierName")
 public class ObjectWithLazyHashMap
 {
 	private LazyHashMap<String, SimpleObject> lazyHashMap;
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/lazy/ObjectWithLazyHashSet.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/lazy/ObjectWithLazyHashSet.java
@@ -18,6 +18,7 @@
 import org.eclipse.serializer.collections.lazy.LazyHashSet;
 
 
+@SuppressWarnings("checkstyle:IllegalIdentifierName")
 public class ObjectWithLazyHashSet
 {
 	private LazyHashSet<SimpleObject> lazyHashSet;
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/lazy/ObjectWithLazyList.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/lazy/ObjectWithLazyList.java
@@ -18,6 +18,7 @@
 import org.eclipse.serializer.collections.lazy.LazyList;
 
 
+@SuppressWarnings("checkstyle:IllegalIdentifierName")
 public class ObjectWithLazyList
 {
 	private LazyList<SimpleObject> lazyList;
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/special/types/TypesData.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/special/types/TypesData.java
@@ -443,19 +443,19 @@ public static Stream<Arguments> generateNotWorkingData()
 				new TestArguments<>(
 					MapRepository.class,
 					id -> {
-						final LazyHashMap<String, String> lazyHashMap = new LazyHashMap<>();
-						lazyHashMap.put("1", "1");
-						return new MapDaoObject(id, lazyHashMap);
+						final LazyHashMap<String, String> values = new LazyHashMap<>();
+						values.put("1", "1");
+						return new MapDaoObject(id, values);
 					},
 					set -> set.getValue().put("2", "2")
 				),
 				new TestArguments<>(
 					MapRepository.class,
 					id -> {
-						final LazyHashMap<String, String> lazyHashMap = new LazyHashMap<>();
-						lazyHashMap.put("1", "1");
-						lazyHashMap.put("2", "2");
-						return new MapDaoObject(id, lazyHashMap);
+						final LazyHashMap<String, String> values = new LazyHashMap<>();
+						values.put("1", "1");
+						values.put("2", "2");
+						return new MapDaoObject(id, values);
 					},
 					set -> set.getValue().put("3", "3")
 				),
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/special/types/TypesTest.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/special/types/TypesTest.java
@@ -161,13 +161,13 @@ private <T extends ComplexObject<?>> void dynamicAssertEquals(
 	{
 		final Optional<T> storedObject2 = repository.findById(id);
 		Assertions.assertTrue(storedObject2.isPresent());
-		if(storedObject2.get().getValue() instanceof final Map<?, ?> storedMap)
+		if(storedObject2.get().getValue() instanceof final Map<?, ?> stored)
 		{
-			Assertions.assertEquals(((Map<?, ?>)objectToStore.getValue()).size(), storedMap.size());
+			Assertions.assertEquals(((Map<?, ?>)objectToStore.getValue()).size(), stored.size());
 		}
-		else if(storedObject2.get().getValue() instanceof final Collection<?> storedList)
+		else if(storedObject2.get().getValue() instanceof final Collection<?> stored)
 		{
-			Assertions.assertEquals(((Collection<?>)objectToStore.getValue()).size(), storedList.size());
+			Assertions.assertEquals(((Collection<?>)objectToStore.getValue()).size(), stored.size());
 		}
 		else
 		{
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/tests/HashSetTest.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/tests/HashSetTest.java
@@ -63,14 +63,14 @@ void testSaveAndFindAll()
 	@Test
 	void testSaveAndResaveFindAll()
 	{
-		final CustomerWithHashSet customer = new CustomerWithHashSet(TestData.FIRST_NAME, TestData.LAST_NAME);
-		customer.getValues().add("Test");
-		this.repository.save(customer);
+		final CustomerWithHashSet initial = new CustomerWithHashSet(TestData.FIRST_NAME, TestData.LAST_NAME);
+		initial.getValues().add("Test");
+		this.repository.save(initial);
 		
-		final CustomerWithHashSet customerWithHashSet =
+		final CustomerWithHashSet resolved =
 			TestUtil.iterableToList(this.repository.findAll()).stream().findFirst().get();
-		customerWithHashSet.getValues().add("Test2");
-		this.repository.save(customerWithHashSet);
+		resolved.getValues().add("Test2");
+		this.repository.save(resolved);
 		
 		TestUtil.doBeforeAndAfterRestartOfDatastore(
 			this.configuration,
@@ -123,15 +123,15 @@ void testSaveAndSetAndFindAllNonFinal()
 	@Test
 	void testSaveAndResetAndFindAllNonFinal()
 	{
-		final CustomerWithNonFinalHashSet customer =
+		final CustomerWithNonFinalHashSet initial =
 			new CustomerWithNonFinalHashSet(TestData.FIRST_NAME, TestData.LAST_NAME);
-		customer.setValues(Set.of("Test"));
-		this.nonFinalRepository.save(customer);
+		initial.setValues(Set.of("Test"));
+		this.nonFinalRepository.save(initial);
 		
-		final CustomerWithNonFinalHashSet customerWithHashSet =
+		final CustomerWithNonFinalHashSet resolved =
 			TestUtil.iterableToList(this.nonFinalRepository.findAll()).stream().findFirst().get();
-		customerWithHashSet.setValues(Set.of("Test", "Test2"));
-		this.nonFinalRepository.save(customerWithHashSet);
+		resolved.setValues(Set.of("Test", "Test2"));
+		this.nonFinalRepository.save(resolved);
 		
 		TestUtil.doBeforeAndAfterRestartOfDatastore(
 			this.configuration,

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`@SuppressWarnings("java:S119")`
`30`	`30`	`public class EntityProvider<T, ID>`
`31`	`31`	`{`
	`32`	`+ @SuppressWarnings("checkstyle:IllegalIdentifierName")`
`32`	`33`	`private final List<EntityData<? extends T, ID>> entityDataList = new ArrayList<>();`
`33`	`34`
`34`	`35`	`public void addEntityData(final EntityData<? extends T, ID> entityData)`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`**/`
`35`	`35`	`public class IdentitySet<E> implements Set<E>`
`36`	`36`	`{`
	`37`	`+ @SuppressWarnings("checkstyle:IllegalIdentifierName")`
`37`	`38`	`private final IdentityHashMap<E, Boolean> internalMap;`
`38`	`39`
`39`	`40`	`public IdentitySet()`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ private <T, ID> Collection<Object> collectRootEntitiesToStore(`
`322`	`322`	`objectsToStore.add(entityToStore);`
`323`	`323`	`// Add the separate lists of entities to store.`
`324`	`324`	`this.repositorySynchronizer.syncAndReturnChangedObjectLists(entityToStore).forEach(`
`325`		`- changedEntityList -> objectsToStore.addAll(changedEntityList.getObjectsToStore())`
	`325`	`+ changedEntities -> objectsToStore.addAll(changedEntities.getObjectsToStore())`
`326`	`326`	`);`
`327`	`327`	`}`
`328`	`328`	`return objectsToStore;`
Original file line number	Diff line number	Diff line change
`@@ -401,9 +401,9 @@ void createMultipleWithAutoIdLong(@Autowired final CustomerWithIdLongRepository`
`401`	`401`	`TestUtil.iterableToList(customerRepository.findAllById(List.of(1L, 2L)));`
`402`	`402`	`Assertions.assertEquals(2, loadedCustomers.size());`
`403`	`403`	`Assertions.assertNotEquals(loadedCustomers.get(0), loadedCustomers.get(1));`
`404`		`- final List<Long> idList = loadedCustomers.stream().map(CustomerWithIdLong::getId).toList();`
`405`		`- Assertions.assertTrue(idList.contains(1L));`
`406`		`- Assertions.assertTrue(idList.contains(2L));`
	`404`	`+ final List<Long> ids = loadedCustomers.stream().map(CustomerWithIdLong::getId).toList();`
	`405`	`+ Assertions.assertTrue(ids.contains(1L));`
	`406`	`+ Assertions.assertTrue(ids.contains(2L));`
`407`	`407`	`}`
`408`	`408`	`);`
`409`	`409`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`import org.eclipse.serializer.collections.lazy.LazyHashMap;`
`19`	`19`
`20`	`20`
	`21`	`+@SuppressWarnings("checkstyle:IllegalIdentifierName")`
`21`	`22`	`public class ObjectWithLazyHashMap`
`22`	`23`	`{`
`23`	`24`	`private LazyHashMap<String, SimpleObject> lazyHashMap;`