Skip to content

Commit 8ca29ae

Browse files
JohannesRabauerJohannesRabauer
committed
Fix SonarClound-Warnings
1 parent 261e34a commit 8ca29ae

24 files changed

+35
-11
lines changed

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/core/EntityProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import software.xdev.spring.data.eclipse.store.repository.root.EntityData;
2727

2828

29+
@SuppressWarnings("java:S119")
2930
public class EntityProvider<T, ID>
3031
{
3132
private final List<EntityData<? extends T, ID>> entityDataList = new ArrayList<>();

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/EclipseStoreStorage.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import software.xdev.spring.data.eclipse.store.repository.support.reposyncer.SimpleRepositorySynchronizer;
5353

5454

55+
@SuppressWarnings("java:S119")
5556
public class EclipseStoreStorage
5657
implements EntityListProvider, IdManagerProvider, VersionManagerProvider, PersistableChecker, ObjectSwizzling
5758
{
@@ -170,7 +171,7 @@ private void initRoot()
170171
}
171172
if(entityListMustGetStored)
172173
{
173-
this.storageManager.store(this.root.getCurrentRootData().getEntityLists());
174+
this.storageManager.store(this.root.getCurrentRootData().getEntityListsToStore());
174175
}
175176
this.entitySetCollector =
176177
new EntitySetCollector(
@@ -185,7 +186,7 @@ private void initRoot()
185186
private <T, ID> void createNewEntityList(final Class<T> entityClass)
186187
{
187188
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);
189190
}
190191

191192
public synchronized <T> void registerEntity(
@@ -418,7 +419,7 @@ public void setLastId(final Class<?> entityClass, final Object lastId)
418419
if(entityData == null)
419420
{
420421
this.createNewEntityList(entityClass);
421-
this.storageManager.store(this.root.getCurrentRootData().getEntityLists());
422+
this.storageManager.store(this.root.getCurrentRootData().getEntityListsToStore());
422423
}
423424
this.root.getCurrentRootData().setLastId(entityClass, lastId);
424425
this.storageManager.store(this.root.getCurrentRootData().getObjectsToStoreAfterNewLastId(entityClass));

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/EntitySetCollector.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import software.xdev.spring.data.eclipse.store.repository.root.EntityData;
2828

2929

30+
@SuppressWarnings("java:S119")
3031
public class EntitySetCollector
3132
{
3233
private static final Logger LOG = LoggerFactory.getLogger(EntitySetCollector.class);

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/Root.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* This is the root object for all versions <2.0.0 and is used for upgrading to the new root.
2626
* @deprecated should not be initialised any more. Version for <2.0.0
2727
*/
28-
@Deprecated
28+
@Deprecated(forRemoval = false, since = "2.0.0")
2929
public class Root
3030
{
3131
private final Map<String, IdentitySet<Object>> entityLists;

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreCrudRepository.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.springframework.data.repository.NoRepositoryBean;
2020

2121

22+
@SuppressWarnings("java:S119")
2223
@NoRepositoryBean
2324
public interface EclipseStoreCrudRepository<T, ID> extends CrudRepository<T, ID>
2425
{

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreCustomRepository.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.springframework.data.repository.Repository;
2020

2121

22+
@SuppressWarnings("java:S119")
2223
@NoRepositoryBean
2324
public interface EclipseStoreCustomRepository<T, ID> extends Repository<T, ID>
2425
{

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreListCrudRepository.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.springframework.data.repository.NoRepositoryBean;
2020

2121

22+
@SuppressWarnings("java:S119")
2223
@NoRepositoryBean
2324
public interface EclipseStoreListCrudRepository<T, ID> extends ListCrudRepository<T, ID>
2425
{

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreListPagingAndSortingRepositoryRepository.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.springframework.data.repository.NoRepositoryBean;
2020

2121

22+
@SuppressWarnings("java:S119")
2223
@NoRepositoryBean
2324
public interface EclipseStoreListPagingAndSortingRepositoryRepository<T, ID>
2425
extends ListPagingAndSortingRepository<T, ID>

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStorePagingAndSortingRepositoryRepository.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.springframework.data.repository.PagingAndSortingRepository;
2020

2121

22+
@SuppressWarnings("java:S119")
2223
@NoRepositoryBean
2324
public interface EclipseStorePagingAndSortingRepositoryRepository<T, ID>
2425
extends PagingAndSortingRepository<T, ID>

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreQueryByExampleExecutor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.springframework.data.repository.query.QueryByExampleExecutor;
2020

2121

22+
@SuppressWarnings("java:S119")
2223
@NoRepositoryBean
2324
public interface EclipseStoreQueryByExampleExecutor<T> extends QueryByExampleExecutor<T>
2425
{

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/EclipseStoreRepository.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.springframework.data.repository.NoRepositoryBean;
1919

2020

21+
@SuppressWarnings("java:S119")
2122
@NoRepositoryBean
2223
public interface EclipseStoreRepository<T, ID>
2324
extends

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/root/RootDataV2.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
/**
2424
* This is the actually stored object.
2525
*/
26+
@SuppressWarnings("java:S119")
2627
public class RootDataV2
2728
{
2829
private final Map<String, EntityData<?, ?>> entityLists;
@@ -32,7 +33,7 @@ public RootDataV2()
3233
this.entityLists = new HashMap<>();
3334
}
3435

35-
public Map<String, EntityData<?, ?>> getEntityLists()
36+
public Object getEntityListsToStore()
3637
{
3738
return this.entityLists;
3839
}
@@ -57,7 +58,9 @@ public <T, ID> EntityData<T, ID> getEntityData(final String entityClassName)
5758
return (EntityData<T, ID>)this.entityLists.get(entityClassName);
5859
}
5960

60-
public <T, ID> void createNewEntityList(final Class<T> entityClass, final Function<T, ID> idGetter)
61+
public <T, ID> void createNewEntityList(
62+
final Class<T> entityClass,
63+
final Function<T, ID> idGetter)
6164
{
6265
this.entityLists.put(this.getEntityName(entityClass), new EntityData<>(idGetter));
6366
}
@@ -78,7 +81,7 @@ public void setLastId(final Class<?> entityClass, final Object lastId)
7881
this.entityLists.get(this.getEntityName(entityClass)).setLastId(lastId);
7982
}
8083

81-
public EntityData<?, ?> getObjectsToStoreAfterNewLastId(final Class<?> entityClass)
84+
public Object getObjectsToStoreAfterNewLastId(final Class<?> entityClass)
8285
{
8386
return this.entityLists.get(this.getEntityName(entityClass));
8487
}

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/EclipseStoreRepositoryFactory.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
/**
4242
* Creates the correct repository instance for repository-interfaces.
4343
*/
44+
@SuppressWarnings("java:S119")
4445
public class EclipseStoreRepositoryFactory extends RepositoryFactorySupport
4546
{
4647
private final EclipseStoreStorage storage;

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/EclipseStoreRepositoryFactoryBean.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"software.xdev.spring.data.eclipse.store.transactions"
4343
})
4444
@Component
45+
@SuppressWarnings("java:S119")
4546
public class EclipseStoreRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable>
4647
extends RepositoryFactoryBeanSupport<T, S, ID>
4748
{

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/SimpleEclipseStoreRepository.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import software.xdev.spring.data.eclipse.store.transactions.EclipseStoreTransactionManager;
5858

5959

60+
@SuppressWarnings("java:S119")
6061
public class SimpleEclipseStoreRepository<T, ID>
6162
implements
6263
EclipseStoreRepository<T, ID>,

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/copier/version/incrementer/UUIDVersionIncrementer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.util.UUID;
1919

2020

21+
@SuppressWarnings("java:S119")
2122
public class UUIDVersionIncrementer implements VersionIncrementer<UUID>
2223
{
2324
@Override

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/EntityGetterById.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.util.Optional;
1919

2020

21+
@SuppressWarnings("java:S119")
2122
public interface EntityGetterById<T, ID>
2223
{
2324
Optional<T> findById(ID id);

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/IdGetter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717

1818
public interface IdGetter<T, ID>
1919
{
20-
ID getId(T objectToSetIdIn) throws Exception;
20+
ID getId(T objectToSetIdIn);
2121
}

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/IdManager.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import software.xdev.spring.data.eclipse.store.repository.support.AnnotatedFieldFinder;
3232

3333

34+
@SuppressWarnings("java:S119")
3435
public class IdManager<T, ID> implements EntityGetterById<T, ID>, IdGetter<T, ID>
3536
{
3637
private final Class<T> classWithId;
@@ -78,8 +79,8 @@ public List<T> findAllById(@Nonnull final Iterable<ID> idsToFind)
7879

7980
return StreamSupport
8081
.stream(idsToFind.spliterator(), false)
81-
.map(idToFind -> this.findById(idToFind))
82-
.filter(e -> e != null && e.isPresent())
82+
.map(this::findById)
83+
.filter(e -> e.isPresent())
8384
.map(Optional::get)
8485
.toList();
8586
}
@@ -130,7 +131,7 @@ public <S extends T> void checkIds(final Collection<S> entities)
130131
}
131132
final List<ID> ids = entities
132133
.stream()
133-
.map(entity -> this.getId(entity))
134+
.map(this::getId)
134135
.toList();
135136

136137
if(!this.getIdSetter().isAutomaticSetter() && ids.contains(null))

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/IdManagerProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package software.xdev.spring.data.eclipse.store.repository.support.id;
1717

18+
@SuppressWarnings("java:S119")
1819
public interface IdManagerProvider
1920
{
2021
<T, ID> IdManager<T, ID> ensureIdManager(final Class<T> domainClass);

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/SimpleIdSetter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import software.xdev.spring.data.eclipse.store.repository.support.id.strategy.IdFinder;
2626

2727

28+
@SuppressWarnings("java:S119")
2829
public class SimpleIdSetter<T, ID> implements IdSetter<T>
2930
{
3031
private final IdFinder<ID> idFinder;

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/strategy/IdFinder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
* A IdFinder <b>must be unique</b> in one storage for one entity-class. It creates Ids and therefore must know all
3333
* existing entities of one class.
3434
*/
35+
@SuppressWarnings("java:S119")
3536
public interface IdFinder<ID>
3637
{
3738
@SuppressWarnings({"java:S1452", "TypeParameterExplicitlyExtendsObject"})

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/id/strategy/auto/AbstractAutoIdFinder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import software.xdev.spring.data.eclipse.store.repository.support.id.strategy.IdFinder;
2525

2626

27+
@SuppressWarnings("java:S119")
2728
public abstract class AbstractAutoIdFinder<ID> implements IdFinder<ID>
2829
{
2930
private static final Logger LOG = LoggerFactory.getLogger(AbstractAutoIdFinder.class);

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/version/VersionedEntityWithUuid.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import jakarta.persistence.Version;
2121

2222

23+
@SuppressWarnings("java:S119")
2324
public class VersionedEntityWithUuid implements VersionedEntity<UUID>
2425
{
2526
@Version

0 commit comments

Comments
 (0)