Skip to content

Commit 30a39a7

Browse files
JohannesRabauerJohannesRabauer
authored
Merge pull request #233 from xdev-software/fix-sonar-quality-gate
Fix Sonar problems
2 parents 5c19b72 + c25d988 commit 30a39a7

File tree

26 files changed

+119
-132
lines changed

26 files changed

+119
-132
lines changed

‎spring-data-eclipse-store-benchmark/src/main/java/software/xdev/spring/data/eclipse/store/benchmark/benchmarks/simple/customer/StoringAndChangingSimpleCustomerBenchmark.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ public void saveSingleCustomer(final SpringState state)
2222
customerRepository2.findAll().forEach(
2323
customer ->
2424
{
25-
customer.setFirstName("Another" + customer.getFirstName());
26-
customer.setLastName("Another" + customer.getLastName());
25+
this.changeCustomerName(customer);
2726
customerRepository2.save(customer);
2827
});
2928
}
@@ -42,8 +41,7 @@ protected void saveCustomerInForEach(final SpringState state, final int entityCo
4241
customerRepository2.findAll().forEach(
4342
customer ->
4443
{
45-
customer.setFirstName("Another" + customer.getFirstName());
46-
customer.setLastName("Another" + customer.getLastName());
44+
this.changeCustomerName(customer);
4745
customerRepository2.save(customer);
4846
});
4947
}
@@ -62,13 +60,14 @@ protected void saveCustomerInSaveAll(final SpringState state, final int entityCo
6260

6361
final CustomerRepository customerRepository2 = state.getBean(CustomerRepository.class);
6462
final Iterable<Customer> all = customerRepository2.findAll();
65-
all.forEach(
66-
customer ->
67-
{
68-
customer.setFirstName("Another" + customer.getFirstName());
69-
customer.setLastName("Another" + customer.getLastName());
70-
});
63+
all.forEach(this::changeCustomerName);
7164

7265
customerRepository2.saveAll(all);
7366
}
67+
68+
private void changeCustomerName(final Customer customer)
69+
{
70+
customer.setFirstName("Another" + customer.getFirstName());
71+
customer.setLastName("Another" + customer.getLastName());
72+
}
7473
}

‎spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/complex/migration/v1_0_0_Init.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* In contrast to {@link CustomNameScript} the version of this script is defined by
3434
* <b>the name of the class defines the version</b>.
3535
*/
36-
@SuppressWarnings("checkstyle:TypeName")
36+
@SuppressWarnings({"checkstyle:TypeName", "java:S101"})
3737
@Component
3838
public class v1_0_0_Init extends ReflectiveDataMigrationScript
3939
{

‎spring-data-eclipse-store-demo/src/test/java/software/xdev/spring/data/eclipse/store/demo/complex/ComplexDemoApplicationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import java.io.File;
66

7+
import org.junit.jupiter.api.Assertions;
78
import org.junit.jupiter.api.BeforeAll;
89
import org.junit.jupiter.api.Test;
910
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +45,7 @@ static void clearPreviousData()
4445
void checkPossibilityToSimplyStartAndRestartApplication()
4546
{
4647
this.configuration.getStorageInstance().stop();
47-
ComplexDemoApplication.main(new String[]{});
48+
Assertions.assertDoesNotThrow(() -> ComplexDemoApplication.main(new String[]{}));
4849
}
4950

5051
@Test

‎spring-data-eclipse-store-demo/src/test/java/software/xdev/spring/data/eclipse/store/demo/dual/storage/DualStorageDemoApplicationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.io.File;
44

5+
import org.junit.jupiter.api.Assertions;
56
import org.junit.jupiter.api.BeforeAll;
67
import org.junit.jupiter.api.Test;
78
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +40,6 @@ void checkPossibilityToSimplyStartAndRestartApplication()
3940
{
4041
this.invoiceConfiguration.getStorageInstance().stop();
4142
this.personConfiguration.getStorageInstance().stop();
42-
DualStorageDemoApplication.main(new String[]{});
43+
Assertions.assertDoesNotThrow(() -> DualStorageDemoApplication.main(new String[]{}));
4344
}
4445
}

‎spring-data-eclipse-store-demo/src/test/java/software/xdev/spring/data/eclipse/store/demo/lazy/complex/LazyDemoApplicationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.io.File;
44

5+
import org.junit.jupiter.api.Assertions;
56
import org.junit.jupiter.api.BeforeAll;
67
import org.junit.jupiter.api.Test;
78
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,6 @@ static void clearPreviousData()
3435
void checkPossibilityToSimplyStartAndRestartApplication()
3536
{
3637
this.configuration.getStorageInstance().stop();
37-
LazyDemoApplication.main(new String[]{});
38+
Assertions.assertDoesNotThrow(() -> LazyDemoApplication.main(new String[]{}));
3839
}
3940
}

‎spring-data-eclipse-store-demo/src/test/java/software/xdev/spring/data/eclipse/store/demo/simple/SimpleDemoApplicationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.io.File;
44

5+
import org.junit.jupiter.api.Assertions;
56
import org.junit.jupiter.api.BeforeAll;
67
import org.junit.jupiter.api.Test;
78
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,6 @@ static void clearPreviousData()
3435
void checkPossibilityToSimplyStartAndRestartApplication()
3536
{
3637
this.configuration.getStorageInstance().stop();
37-
SimpleDemoApplication.main(new String[]{});
38+
Assertions.assertDoesNotThrow(() -> SimpleDemoApplication.main(new String[]{}));
3839
}
3940
}

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/importer/EclipseStoreDataImporter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ private EntityManagerSupplierRepositoryListPair createEclipseStoreRepositoriesFr
229229
);
230230

231231
return new EntityManagerSupplierRepositoryListPair(
232-
() -> entityManagerFactory.createEntityManager(),
232+
entityManagerFactory::createEntityManager,
233233
repositoryList);
234234
}
235235

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import software.xdev.spring.data.eclipse.store.repository.support.concurrency.ReadWriteLock;
2323

2424

25+
@SuppressWarnings("java:S119")
2526
public interface StorageCommunicator
2627
{
2728
ReadWriteLock getReadWriteLock();

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/access/modifier/FieldAccessibleMaker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void writeValueOfField(
9898
}
9999
}
100100

101-
private IllegalAccessException createIllegalAccessToField(final Field field) throws IllegalAccessException
101+
private IllegalAccessException createIllegalAccessToField(final Field field)
102102
{
103103
return new IllegalAccessException(
104104
("Could not access field %s#%s. Make sure that the module is open e.g. with following VM option: "

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource;
3030
import org.springframework.data.repository.config.RepositoryConfigurationExtension;
3131
import org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport;
32-
import org.springframework.data.repository.core.RepositoryMetadata;
3332

3433
import software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreCrudRepository;
3534
import software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreCustomRepository;
@@ -138,10 +137,4 @@ protected Collection<Class<?>> getIdentifyingTypes()
138137
LazyEclipseStoreListCrudRepository.class
139138
);
140139
}
141-
142-
@Override
143-
protected boolean useRepositoryConfiguration(final RepositoryMetadata metadata)
144-
{
145-
return super.useRepositoryConfiguration(metadata);
146-
}
147140
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import java.lang.reflect.Field;
1919
import java.util.Objects;
20-
import java.util.concurrent.locks.ReentrantLock;
2120
import java.util.function.Consumer;
2221

2322
import org.eclipse.serializer.collections.HashEnum;
@@ -77,7 +76,6 @@ final class Default<T> implements SpringDataEclipseStoreLazy<T>
7776
private transient ObjectSwizzling loader;
7877
private transient WorkingCopier<T> copier;
7978
private transient boolean isStored;
80-
private final transient ReentrantLock usageMarksLock = new ReentrantLock();
8179
private final transient HashEnum<Object> usageMarks = HashEnum.New();
8280

8381
private Default(final Lazy<T> lazySubject)

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/query/by/example/EclipseStoreFetchableFluentQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public EclipseStoreFetchableFluentQuery(
6464
@Override
6565
public FetchableFluentQuery<S> sortBy(final Sort sort)
6666
{
67-
return new EclipseStoreFetchableFluentQuery(
67+
return new EclipseStoreFetchableFluentQuery<>(
6868
this.copier,
6969
this.example,
7070
this.domainClass,

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/query/criteria/CriteriaByExample.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,19 @@ public boolean evaluate(final T object)
8181
return this.predicate.test(object);
8282
}
8383

84-
private <T> Predicate<ExampleMatcher.PropertySpecifier> createPredicateForSpecifier(
84+
@SuppressWarnings("unchecked")
85+
private <E> Predicate<ExampleMatcher.PropertySpecifier> createPredicateForSpecifier(
8586
final Example<S> example,
86-
final T entity)
87+
final E entity)
8788
{
8889
return specifier ->
8990
{
90-
final ReflectedField<T, Object> reflectedField =
91-
(ReflectedField<T, Object>)ReflectedField.createReflectedField(
91+
final ReflectedField<E, Object> reflectedField =
92+
(ReflectedField<E, Object>)ReflectedField.createReflectedField(
9293
example.getProbeType(),
9394
specifier.getPath());
9495

95-
final Object exampleValue = reflectedField.readValue((T)example.getProbe());
96+
final Object exampleValue = reflectedField.readValue((E)example.getProbe());
9697
final Optional<Object> transformedExampledValue =
9798
specifier.getPropertyValueTransformer().apply(Optional.ofNullable(exampleValue));
9899

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
public final class EclipseStoreMigrator
3333
{
34+
@SuppressWarnings("java:S2386")
3435
public static final VersionAgnosticMigrationScript<?, ?>[] SCRIPTS =
3536
new VersionAgnosticMigrationScript[]{
3637
new v2_0_0_InitializeVersioning(),

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/root/update/scripts/v2_0_0_InitializeVersioning.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void loggedMigrate(final Context<VersionedRoot, MigrationEmbeddedStorageM
5252
LOG.warn("Dropping entities {} because there is no repository in the new root.", entityName);
5353
return;
5454
}
55-
entities.forEach(entity -> entityData.ensureEntityAndReturnObjectsToStore(entity));
55+
entities.forEach(entityData::ensureEntityAndReturnObjectsToStore);
5656
context.getStorageManager().getNativeStorageManager().storeAll(entityData.getObjectsToStore());
5757
LOG.info("Migrated entities {}.", entityName);
5858
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.util.Collection;
1919
import java.util.HashMap;
2020
import java.util.List;
21+
import java.util.Map;
2122
import java.util.stream.Stream;
2223

2324
import org.eclipse.serializer.reference.Lazy;
@@ -187,8 +188,8 @@ public Collection<Object> removeAllEntitiesAndReturnObjectsToStore()
187188
return this.getObjectsToStore();
188189
}
189190

190-
public HashMap<ID, Lazy<T>> getNativeLazyEntitiesById()
191+
public Map<ID, Lazy<T>> getNativeLazyEntitiesById()
191192
{
192-
return entitiesById;
193+
return this.entitiesById;
193194
}
194195
}

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

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,9 @@
1717

1818
import java.io.Serializable;
1919
import java.util.List;
20-
import java.util.Optional;
2120

2221
import jakarta.annotation.Nonnull;
2322

24-
import org.slf4j.Logger;
25-
import org.slf4j.LoggerFactory;
2623
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
2724
import org.springframework.beans.factory.annotation.Autowired;
2825
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -47,7 +44,6 @@
4744
public class EclipseStoreRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable>
4845
extends RepositoryFactoryBeanSupport<T, S, ID>
4946
{
50-
private static final Logger LOG = LoggerFactory.getLogger(EclipseStoreRepositoryFactoryBean.class);
5147
private Class<?> configurationClass;
5248
@Autowired
5349
private List<EclipseStoreClientConfiguration> configurations;
@@ -90,30 +86,19 @@ protected RepositoryFactorySupport createRepositoryFactory()
9086
* should be injected into the {@link #configurations} and get returned.
9187
* </p>
9288
*/
89+
@SuppressWarnings("java:S1872")
9390
private EclipseStoreClientConfiguration getSuitableConfiguration()
9491
{
9592
if(this.configurationClass == null && this.configurations.size() == 1)
9693
{
9794
return this.configurations.get(0);
9895
}
99-
final Optional<EclipseStoreClientConfiguration> definedConfiguration = this.configurations
96+
97+
return this.configurations
10098
.stream()
101-
.filter(
102-
configuration ->
103-
{
104-
if(this.configurationClass != null)
105-
{
106-
return this.configurationClass.getName()
107-
.equals(ClassUtils.getUserClass(configuration).getName());
108-
}
109-
return false;
110-
}
111-
)
112-
.findAny();
113-
if(definedConfiguration.isEmpty())
114-
{
115-
throw new NoSuchBeanDefinitionException(this.configurationClass);
116-
}
117-
return definedConfiguration.get();
99+
.filter(configuration -> this.configurationClass != null
100+
&& this.configurationClass.getName().equals(ClassUtils.getUserClass(configuration).getName()))
101+
.findAny()
102+
.orElseThrow(() -> new NoSuchBeanDefinitionException(this.configurationClass));
118103
}
119104
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ private <S extends T> void uncachedStore(final Collection<S> entities)
148148
* and
149149
* would be stuck in a deadlock.
150150
*/
151-
private <S extends T> boolean isMergeParallelizable()
151+
private boolean isMergeParallelizable()
152152
{
153153
return !this.idManager.hasIdField();
154154
}
@@ -189,7 +189,7 @@ public Optional<T> findById(@Nonnull final ID id)
189189
{
190190
return this.storage.getReadWriteLock().read(
191191
() -> this.idManager.findById(id)
192-
.map(foundEntity -> this.copier.copy(foundEntity))
192+
.map(this.copier::copy)
193193
);
194194
}
195195

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/copier/registering/AbstractRegisteringCopier.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
public abstract class AbstractRegisteringCopier implements RegisteringObjectCopier
4141
{
4242
private final EclipseSerializerRegisteringCopier actualCopier;
43-
private ClassLoader currentClassLoader;
4443

4544
protected AbstractRegisteringCopier(
4645
final SupportedChecker supportedChecker,

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/data/migration/with/migrater/v1_0_0_Init.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import software.xdev.spring.data.eclipse.store.repository.root.data.version.ReflectiveDataMigrationScript;
2222

2323

24-
@SuppressWarnings("checkstyle:TypeName")
24+
@SuppressWarnings({"checkstyle:TypeName", "java:S101"})
2525
public class v1_0_0_Init extends ReflectiveDataMigrationScript
2626
{
2727
private final PersistedEntityRepository

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/data/migration/with/multiple/scripts/v1_0_0_Init.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
import software.xdev.spring.data.eclipse.store.repository.root.VersionedRoot;
2424
import software.xdev.spring.data.eclipse.store.repository.root.data.version.ReflectiveDataMigrationScript;
2525

26-
@SuppressWarnings("checkstyle:TypeName")
26+
27+
@SuppressWarnings({"checkstyle:TypeName", "java:S101"})
2728
@Component
2829
public class v1_0_0_Init extends ReflectiveDataMigrationScript
2930
{
30-
private final PersistedEntityRepository
31-
repository;
31+
private final PersistedEntityRepository repository;
3232

3333
public v1_0_0_Init(@Autowired final PersistedEntityRepository repository)
3434
{

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/data/migration/with/script/v1_0_0_Init.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import software.xdev.spring.data.eclipse.store.repository.root.data.version.ReflectiveDataMigrationScript;
2525

2626

27-
@SuppressWarnings("checkstyle:TypeName")
27+
@SuppressWarnings({"checkstyle:TypeName", "java:S101"})
2828
@Component
2929
public class v1_0_0_Init extends ReflectiveDataMigrationScript
3030
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ void saveBulkWithAutoIdInt(@Autowired final CustomerWithIdIntRepository customer
114114
this.configuration,
115115
() -> {
116116
Assertions.assertEquals(2, customerRepository.count());
117-
final Iterable<CustomerWithIdInt> all = customerRepository.findAll();
117+
customerRepository.findAll();
118118

119119
final Optional<CustomerWithIdInt> loadedCustomer1 = customerRepository.findById(1);
120120
Assertions.assertTrue(loadedCustomer1.isPresent());

0 commit comments

Comments
 (0)