Fix SonarClound-Warnings

JohannesRabauer · JohannesRabauer · commit 8ca29aeb9f67 · 2024-07-25T14:29:34.000+02:00
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
@@ -26,6 +26,7 @@
 import software.xdev.spring.data.eclipse.store.repository.root.EntityData;
 
 
+@SuppressWarnings("java:S119")
 public class EntityProvider<T, ID>
 {
 	private final List<EntityData<? extends T, ID>> entityDataList = new ArrayList<>();
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
@@ -52,6 +52,7 @@
 import software.xdev.spring.data.eclipse.store.repository.support.reposyncer.SimpleRepositorySynchronizer;
 
 
+@SuppressWarnings("java:S119")
 public class EclipseStoreStorage
 	implements EntityListProvider, IdManagerProvider, VersionManagerProvider, PersistableChecker, ObjectSwizzling
 {
@@ -170,7 +171,7 @@ private void initRoot()
 		}
 		if(entityListMustGetStored)
 		{
-			this.storageManager.store(this.root.getCurrentRootData().getEntityLists());
+			this.storageManager.store(this.root.getCurrentRootData().getEntityListsToStore());
 		}
 		this.entitySetCollector =
 			new EntitySetCollector(
@@ -185,7 +186,7 @@ private void initRoot()
 	private <T, ID> void createNewEntityList(final Class<T> entityClass)
 	{
 		final IdManager<T, ID> idManager = this.ensureIdManager(entityClass);
-		this.root.getCurrentRootData().createNewEntityList(entityClass, e -> idManager.getId(e));
+		this.root.getCurrentRootData().createNewEntityList(entityClass, idManager::getId);
 	}
 	
 	public synchronized <T> void registerEntity(
@@ -418,7 +419,7 @@ public void setLastId(final Class<?> entityClass, final Object lastId)
 				if(entityData == null)
 				{
 					this.createNewEntityList(entityClass);
-					this.storageManager.store(this.root.getCurrentRootData().getEntityLists());
+					this.storageManager.store(this.root.getCurrentRootData().getEntityListsToStore());
 				}
 				this.root.getCurrentRootData().setLastId(entityClass, lastId);
 				this.storageManager.store(this.root.getCurrentRootData().getObjectsToStoreAfterNewLastId(entityClass));
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
@@ -27,6 +27,7 @@
 import software.xdev.spring.data.eclipse.store.repository.root.EntityData;
 
 
+@SuppressWarnings("java:S119")
 public class EntitySetCollector
 {
 	private static final Logger LOG = LoggerFactory.getLogger(EntitySetCollector.class);
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/Root.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/Root.java
@@ -25,7 +25,7 @@
  * This is the root object for all versions <2.0.0 and is used for upgrading to the new root.
  * @deprecated should not be initialised any more. Version for <2.0.0
  */
-@Deprecated
+@Deprecated(forRemoval = false, since = "2.0.0")
 public class Root
 {
 	private final Map<String, IdentitySet<Object>> entityLists;
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreCrudRepository.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreCrudRepository.java
@@ -19,6 +19,7 @@
 import org.springframework.data.repository.NoRepositoryBean;
 
 
+@SuppressWarnings("java:S119")
 @NoRepositoryBean
 public interface EclipseStoreCrudRepository<T, ID> extends CrudRepository<T, ID>
 {
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreCustomRepository.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreCustomRepository.java
@@ -19,6 +19,7 @@
 import org.springframework.data.repository.Repository;
 
 
+@SuppressWarnings("java:S119")
 @NoRepositoryBean
 public interface EclipseStoreCustomRepository<T, ID> extends Repository<T, ID>
 {
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreListCrudRepository.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreListCrudRepository.java
@@ -19,6 +19,7 @@
 import org.springframework.data.repository.NoRepositoryBean;
 
 
+@SuppressWarnings("java:S119")
 @NoRepositoryBean
 public interface EclipseStoreListCrudRepository<T, ID> extends ListCrudRepository<T, ID>
 {
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreListPagingAndSortingRepositoryRepository.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreListPagingAndSortingRepositoryRepository.java
@@ -19,6 +19,7 @@
 import org.springframework.data.repository.NoRepositoryBean;
 
 
+@SuppressWarnings("java:S119")
 @NoRepositoryBean
 public interface EclipseStoreListPagingAndSortingRepositoryRepository<T, ID>
 	extends ListPagingAndSortingRepository<T, ID>
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStorePagingAndSortingRepositoryRepository.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStorePagingAndSortingRepositoryRepository.java
@@ -19,6 +19,7 @@
 import org.springframework.data.repository.PagingAndSortingRepository;
 
 
+@SuppressWarnings("java:S119")
 @NoRepositoryBean
 public interface EclipseStorePagingAndSortingRepositoryRepository<T, ID>
 	extends PagingAndSortingRepository<T, ID>
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreQueryByExampleExecutor.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreQueryByExampleExecutor.java
@@ -19,6 +19,7 @@
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
 
+@SuppressWarnings("java:S119")
 @NoRepositoryBean
 public interface EclipseStoreQueryByExampleExecutor<T> extends QueryByExampleExecutor<T>
 {
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreRepository.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreRepository.java
@@ -18,6 +18,7 @@
 import org.springframework.data.repository.NoRepositoryBean;
 
 
+@SuppressWarnings("java:S119")
 @NoRepositoryBean
 public interface EclipseStoreRepository<T, ID>
 	extends
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/root/RootDataV2.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/root/RootDataV2.java
@@ -23,6 +23,7 @@
 /**
  * This is the actually stored object.
  */
+@SuppressWarnings("java:S119")
 public class RootDataV2
 {
 	private final Map<String, EntityData<?, ?>> entityLists;
@@ -32,7 +33,7 @@ public RootDataV2()
 		this.entityLists = new HashMap<>();
 	}
 	
-	public Map<String, EntityData<?, ?>> getEntityLists()
+	public Object getEntityListsToStore()
 	{
 		return this.entityLists;
 	}
@@ -57,7 +58,9 @@ public <T, ID> EntityData<T, ID> getEntityData(final String entityClassName)
 		return (EntityData<T, ID>)this.entityLists.get(entityClassName);
 	}
 	
-	public <T, ID> void createNewEntityList(final Class<T> entityClass, final Function<T, ID> idGetter)
+	public <T, ID> void createNewEntityList(
+		final Class<T> entityClass,
+		final Function<T, ID> idGetter)
 	{
 		this.entityLists.put(this.getEntityName(entityClass), new EntityData<>(idGetter));
 	}
@@ -78,7 +81,7 @@ public void setLastId(final Class<?> entityClass, final Object lastId)
 		this.entityLists.get(this.getEntityName(entityClass)).setLastId(lastId);
 	}
 	
-	public EntityData<?, ?> getObjectsToStoreAfterNewLastId(final Class<?> entityClass)
+	public Object getObjectsToStoreAfterNewLastId(final Class<?> entityClass)
 	{
 		return this.entityLists.get(this.getEntityName(entityClass));
 	}
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/EclipseStoreRepositoryFactory.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/EclipseStoreRepositoryFactory.java
@@ -41,6 +41,7 @@
 /**
  * Creates the correct repository instance for repository-interfaces.
  */
+@SuppressWarnings("java:S119")
 public class EclipseStoreRepositoryFactory extends RepositoryFactorySupport
 {
 	private final EclipseStoreStorage storage;
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/EclipseStoreRepositoryFactoryBean.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/EclipseStoreRepositoryFactoryBean.java
@@ -42,6 +42,7 @@
 	"software.xdev.spring.data.eclipse.store.transactions"
 })
 @Component
+@SuppressWarnings("java:S119")
 public class EclipseStoreRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable>
 	extends RepositoryFactoryBeanSupport<T, S, ID>
 {
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/SimpleEclipseStoreRepository.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/SimpleEclipseStoreRepository.java
@@ -57,6 +57,7 @@
 import software.xdev.spring.data.eclipse.store.transactions.EclipseStoreTransactionManager;
 
 
+@SuppressWarnings("java:S119")
 public class SimpleEclipseStoreRepository<T, ID>
 	implements
 	EclipseStoreRepository<T, ID>,
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/copier/version/incrementer/UUIDVersionIncrementer.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/copier/version/incrementer/UUIDVersionIncrementer.java
@@ -18,6 +18,7 @@
 import java.util.UUID;
 
 
+@SuppressWarnings("java:S119")
 public class UUIDVersionIncrementer implements VersionIncrementer<UUID>
 {
 	@Override
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/EntityGetterById.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/EntityGetterById.java
@@ -18,6 +18,7 @@
 import java.util.Optional;
 
 
+@SuppressWarnings("java:S119")
 public interface EntityGetterById<T, ID>
 {
 	Optional<T> findById(ID id);
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/IdGetter.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/IdGetter.java
@@ -17,5 +17,5 @@
 
 public interface IdGetter<T, ID>
 {
-	ID getId(T objectToSetIdIn) throws Exception;
+	ID getId(T objectToSetIdIn);
 }
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/IdManager.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/IdManager.java
@@ -31,6 +31,7 @@
 import software.xdev.spring.data.eclipse.store.repository.support.AnnotatedFieldFinder;
 
 
+@SuppressWarnings("java:S119")
 public class IdManager<T, ID> implements EntityGetterById<T, ID>, IdGetter<T, ID>
 {
 	private final Class<T> classWithId;
@@ -78,8 +79,8 @@ public List<T> findAllById(@Nonnull final Iterable<ID> idsToFind)
 		
 		return StreamSupport
 			.stream(idsToFind.spliterator(), false)
-			.map(idToFind -> this.findById(idToFind))
-			.filter(e -> e != null && e.isPresent())
+			.map(this::findById)
+			.filter(e -> e.isPresent())
 			.map(Optional::get)
 			.toList();
 	}
@@ -130,7 +131,7 @@ public <S extends T> void checkIds(final Collection<S> entities)
 		}
 		final List<ID> ids = entities
 			.stream()
-			.map(entity -> this.getId(entity))
+			.map(this::getId)
 			.toList();
 		
 		if(!this.getIdSetter().isAutomaticSetter() && ids.contains(null))
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/IdManagerProvider.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/IdManagerProvider.java
@@ -15,6 +15,7 @@
  */
 package software.xdev.spring.data.eclipse.store.repository.support.id;
 
+@SuppressWarnings("java:S119")
 public interface IdManagerProvider
 {
 	<T, ID> IdManager<T, ID> ensureIdManager(final Class<T> domainClass);
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/SimpleIdSetter.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/SimpleIdSetter.java
@@ -25,6 +25,7 @@
 import software.xdev.spring.data.eclipse.store.repository.support.id.strategy.IdFinder;
 
 
+@SuppressWarnings("java:S119")
 public class SimpleIdSetter<T, ID> implements IdSetter<T>
 {
 	private final IdFinder<ID> idFinder;
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/strategy/IdFinder.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/strategy/IdFinder.java
@@ -32,6 +32,7 @@
  * A IdFinder <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.
  */
+@SuppressWarnings("java:S119")
 public interface IdFinder<ID>
 {
 	@SuppressWarnings({"java:S1452", "TypeParameterExplicitlyExtendsObject"})
diff --git a/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/strategy/auto/AbstractAutoIdFinder.java b/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/strategy/auto/AbstractAutoIdFinder.java
@@ -24,6 +24,7 @@
 import software.xdev.spring.data.eclipse.store.repository.support.id.strategy.IdFinder;
 
 
+@SuppressWarnings("java:S119")
 public abstract class AbstractAutoIdFinder<ID> implements IdFinder<ID>
 {
 	private static final Logger LOG = LoggerFactory.getLogger(AbstractAutoIdFinder.class);
diff --git a/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/version/VersionedEntityWithUuid.java b/spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/version/VersionedEntityWithUuid.java
@@ -20,6 +20,7 @@
 import jakarta.persistence.Version;
 
 
+@SuppressWarnings("java:S119")
 public class VersionedEntityWithUuid implements VersionedEntity<UUID>
 {
 	@Version

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`import software.xdev.spring.data.eclipse.store.repository.root.EntityData;`
`27`	`27`
`28`	`28`
	`29`	`+@SuppressWarnings("java:S119")`
`29`	`30`	`public class EntityProvider<T, ID>`
`30`	`31`	`{`
`31`	`32`	`private final List<EntityData<? extends T, ID>> entityDataList = new ArrayList<>();`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@`
`52`	`52`	`import software.xdev.spring.data.eclipse.store.repository.support.reposyncer.SimpleRepositorySynchronizer;`
`53`	`53`
`54`	`54`
	`55`	`+@SuppressWarnings("java:S119")`
`55`	`56`	`public class EclipseStoreStorage`
`56`	`57`	`implements EntityListProvider, IdManagerProvider, VersionManagerProvider, PersistableChecker, ObjectSwizzling`
`57`	`58`	`{`
`@@ -170,7 +171,7 @@ private void initRoot()`
`170`	`171`	`}`
`171`	`172`	`if(entityListMustGetStored)`
`172`	`173`	`{`
`173`		`- this.storageManager.store(this.root.getCurrentRootData().getEntityLists());`
	`174`	`+ this.storageManager.store(this.root.getCurrentRootData().getEntityListsToStore());`
`174`	`175`	`}`
`175`	`176`	`this.entitySetCollector =`
`176`	`177`	`new EntitySetCollector(`
`@@ -185,7 +186,7 @@ private void initRoot()`
`185`	`186`	`private <T, ID> void createNewEntityList(final Class<T> entityClass)`
`186`	`187`	`{`
`187`	`188`	`final IdManager<T, ID> idManager = this.ensureIdManager(entityClass);`
`188`		`- this.root.getCurrentRootData().createNewEntityList(entityClass, e -> idManager.getId(e));`
	`189`	`+ this.root.getCurrentRootData().createNewEntityList(entityClass, idManager::getId);`
`189`	`190`	`}`
`190`	`191`
`191`	`192`	`public synchronized <T> void registerEntity(`
`@@ -418,7 +419,7 @@ public void setLastId(final Class<?> entityClass, final Object lastId)`
`418`	`419`	`if(entityData == null)`
`419`	`420`	`{`
`420`	`421`	`this.createNewEntityList(entityClass);`
`421`		`- this.storageManager.store(this.root.getCurrentRootData().getEntityLists());`
	`422`	`+ this.storageManager.store(this.root.getCurrentRootData().getEntityListsToStore());`
`422`	`423`	`}`
`423`	`424`	`this.root.getCurrentRootData().setLastId(entityClass, lastId);`
`424`	`425`	`this.storageManager.store(this.root.getCurrentRootData().getObjectsToStoreAfterNewLastId(entityClass));`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`import software.xdev.spring.data.eclipse.store.repository.root.EntityData;`
`28`	`28`
`29`	`29`
	`30`	`+@SuppressWarnings("java:S119")`
`30`	`31`	`public class EntitySetCollector`
`31`	`32`	`{`
`32`	`33`	`private static final Logger LOG = LoggerFactory.getLogger(EntitySetCollector.class);`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`* This is the root object for all versions <2.0.0 and is used for upgrading to the new root.`
`26`	`26`	`* @deprecated should not be initialised any more. Version for <2.0.0`
`27`	`27`	`*/`
`28`		`-@Deprecated`
	`28`	`+@Deprecated(forRemoval = false, since = "2.0.0")`
`29`	`29`	`public class Root`
`30`	`30`	`{`
`31`	`31`	`private final Map<String, IdentitySet<Object>> entityLists;`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`import org.springframework.data.repository.NoRepositoryBean;`
`20`	`20`
`21`	`21`
	`22`	`+@SuppressWarnings("java:S119")`
`22`	`23`	`@NoRepositoryBean`
`23`	`24`	`public interface EclipseStoreCrudRepository<T, ID> extends CrudRepository<T, ID>`
`24`	`25`	`{`