Skip to content

Commit 7c7fbe4

Browse files
JohannesRabauerJohannesRabauer
committed
Checkstyle fixes
1 parent c94f087 commit 7c7fbe4

File tree

21 files changed

+22
-52
lines changed

21 files changed

+22
-52
lines changed

‎docs/modules/ROOT/pages/features/lazies.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class Owner extends Person
2727
{
2828
private String address;
2929
30-
private Lazy<List<Pet>> pets = SpringDataEclipseStoreLazy.build(new ArrayList<>());
30+
private final Lazy<List<Pet>> pets = SpringDataEclipseStoreLazy.build(new ArrayList<>());
3131
//...
3232
----
3333

‎spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/lazy/LazyConfiguration.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@
88
import org.eclipse.store.storage.embedded.types.EmbeddedStorage;
99
import org.eclipse.store.storage.embedded.types.EmbeddedStorageFoundation;
1010
import org.eclipse.store.storage.types.Storage;
11-
import org.springframework.beans.factory.ObjectProvider;
1211
import org.springframework.beans.factory.annotation.Autowired;
13-
import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizers;
14-
import org.springframework.context.annotation.Bean;
1512
import org.springframework.context.annotation.Configuration;
16-
import org.springframework.transaction.PlatformTransactionManager;
1713

1814
import software.xdev.spring.data.eclipse.store.demo.dual.storage.person.PersistencePersonConfiguration;
1915
import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreClientConfiguration;
@@ -50,7 +46,7 @@ public EmbeddedStorageFoundation<?> createEmbeddedStorageFoundation()
5046
final EmbeddedStorageFoundation<?> storageFoundation =
5147
EmbeddedStorage.Foundation(Storage.Configuration(Storage.FileProvider(Path.of(STORAGE_PATH))));
5248
// This is only needed, if a different ClassLoader is used (e.g. when using spring-dev-tools)
53-
storageFoundation.getConnectionFoundation().setClassLoaderProvider(getClassLoaderProvider());
49+
storageFoundation.getConnectionFoundation().setClassLoaderProvider(this.getClassLoaderProvider());
5450
return storageFoundation;
5551
}
5652
}

‎spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/lazy/LazyDemoApplication.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
import org.springframework.boot.CommandLineRunner;
2222
import org.springframework.boot.SpringApplication;
2323
import org.springframework.boot.autoconfigure.SpringBootApplication;
24-
25-
import software.xdev.spring.data.eclipse.store.repository.config.EnableEclipseStoreRepositories;
26-
24+
2725

2826
@SpringBootApplication
2927
public class LazyDemoApplication implements CommandLineRunner

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
import software.xdev.spring.data.eclipse.store.repository.support.reposyncer.SimpleRepositorySynchronizer;
5555

5656

57-
@SuppressWarnings("java:S119")
57+
@SuppressWarnings({"java:S119", "PMD.GodClass"})
5858
public class EclipseStoreStorage
5959
implements EntityListProvider,
6060
IdManagerProvider,
@@ -505,6 +505,6 @@ public ReadWriteLock getReadWriteLock()
505505
*/
506506
public VersionedRoot getRoot()
507507
{
508-
return root;
508+
return this.root;
509509
}
510510
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616
package software.xdev.spring.data.eclipse.store.repository.config;
1717

18-
import org.eclipse.serializer.reflect.ClassLoaderProvider;
1918
import jakarta.validation.Validation;
2019
import jakarta.validation.Validator;
2120

21+
import org.eclipse.serializer.reflect.ClassLoaderProvider;
2222
import org.eclipse.store.integrations.spring.boot.types.configuration.EclipseStoreProperties;
2323
import org.eclipse.store.integrations.spring.boot.types.factories.EmbeddedStorageFoundationFactory;
2424
import org.eclipse.store.storage.embedded.types.EmbeddedStorageFoundation;
@@ -34,7 +34,6 @@
3434
import org.springframework.context.event.ContextClosedEvent;
3535
import org.springframework.context.event.EventListener;
3636
import org.springframework.transaction.PlatformTransactionManager;
37-
import org.springframework.transaction.TransactionManager;
3837

3938
import software.xdev.spring.data.eclipse.store.repository.EclipseStoreStorage;
4039
import software.xdev.spring.data.eclipse.store.transactions.EclipseStoreTransactionManager;
@@ -108,7 +107,7 @@ public EmbeddedStorageFoundationFactory getStoreProvider()
108107

109108
public ClassLoaderProvider getClassLoaderProvider()
110109
{
111-
return classLoaderProvider;
110+
return this.classLoaderProvider;
112111
}
113112

114113
/**
@@ -134,7 +133,7 @@ public PlatformTransactionManager transactionManager(
134133
final ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers)
135134
{
136135
final EclipseStoreTransactionManager tm = this.getTransactionManagerInstance();
137-
transactionManagerCustomizers.ifAvailable(customizers -> customizers.customize((TransactionManager)tm));
136+
transactionManagerCustomizers.ifAvailable(customizers -> customizers.customize(tm));
138137
return tm;
139138
}
140139

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

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

18-
import org.eclipse.serializer.reference.Lazy;
1918
import org.springframework.data.repository.NoRepositoryBean;
2019
import org.springframework.data.repository.Repository;
2120

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

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

18-
import org.eclipse.serializer.reference.Lazy;
1918
import org.springframework.data.repository.NoRepositoryBean;
2019
import org.springframework.data.repository.query.QueryByExampleExecutor;
2120

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ private <T> void updateStateT(
154154
}
155155

156156
@Override
157-
public final void complete(
157+
public void complete(
158158
final Binary data,
159159
final SpringDataEclipseStoreLazy.Default<?> instance,
160160
final PersistenceLoadHandler handler
@@ -164,25 +164,25 @@ public final void complete(
164164
}
165165

166166
@Override
167-
public final boolean hasPersistedReferences()
167+
public boolean hasPersistedReferences()
168168
{
169169
return true;
170170
}
171171

172172
@Override
173-
public final boolean hasPersistedVariableLength()
173+
public boolean hasPersistedVariableLength()
174174
{
175175
return false;
176176
}
177177

178178
@Override
179-
public final boolean hasVaryingPersistedLengthInstances()
179+
public boolean hasVaryingPersistedLengthInstances()
180180
{
181181
return false;
182182
}
183183

184184
@Override
185-
public final void iterateLoadableReferences(
185+
public void iterateLoadableReferences(
186186
final Binary data,
187187
final PersistenceReferenceLoader iterator
188188
)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public class VersionedRoot implements Versioned
3131

3232
private RootDataV2 rootDataV2;
3333

34+
@SuppressWarnings("checkstyle:MemberName")
3435
private final RootDataV2_4 rootDataV2_4;
3536

3637
public VersionedRoot()
@@ -63,6 +64,7 @@ public Root getRootDataV1()
6364
/**
6465
* @deprecated and is only used in tests
6566
*/
67+
@SuppressWarnings("DeprecatedIsStillUsed")
6668
@Deprecated
6769
public void setRootDataV2(final RootDataV2 rootDataV2)
6870
{

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@
1616
package software.xdev.spring.data.eclipse.store.repository.root.v2_4;
1717

1818
import java.util.Collection;
19-
import java.util.HashMap;
20-
import java.util.function.Function;
2119
import java.util.stream.Stream;
2220

23-
import software.xdev.spring.data.eclipse.store.core.IdentitySet;
2421
import software.xdev.spring.data.eclipse.store.repository.support.id.IdGetter;
2522

2623

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import java.util.Collection;
1919
import java.util.HashMap;
2020
import java.util.List;
21-
import java.util.function.Function;
2221
import java.util.stream.Stream;
2322

2423
import software.xdev.spring.data.eclipse.store.core.IdentitySet;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/**
2525
* This is the actually stored object.
2626
*/
27-
@SuppressWarnings("java:S119")
27+
@SuppressWarnings({"java:S119", "checkstyle:TypeName"})
2828
public class RootDataV2_4
2929
{
3030
private final Map<String, EntityData<?, ?>> entityLists;

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import jakarta.annotation.Nonnull;
2121
import jakarta.validation.Validator;
2222

23-
import org.eclipse.serializer.reference.Lazy;
2423
import org.springframework.data.mapping.model.BasicPersistentEntity;
2524
import org.springframework.data.repository.core.EntityInformation;
2625
import org.springframework.data.repository.core.RepositoryInformation;
@@ -35,7 +34,6 @@
3534
import org.springframework.transaction.PlatformTransactionManager;
3635

3736
import software.xdev.spring.data.eclipse.store.repository.EclipseStoreStorage;
38-
import software.xdev.spring.data.eclipse.store.repository.StorageCommunicator;
3937
import software.xdev.spring.data.eclipse.store.repository.SupportedChecker;
4038
import software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreRepository;
4139
import software.xdev.spring.data.eclipse.store.repository.interfaces.lazy.LazyEclipseStoreCrudRepository;
@@ -107,7 +105,7 @@ private <T> WorkingCopier<T> createWorkingCopier(
107105
@Nonnull
108106
protected Object getTargetRepository(@Nonnull final RepositoryInformation metadata)
109107
{
110-
Class<?> domainType = metadata.getDomainType();
108+
final Class<?> domainType = metadata.getDomainType();
111109

112110
final EclipseStoreRepository<?, ?> existingRepository = this.storage.getRepository(domainType);
113111
if(existingRepository != null)
@@ -129,7 +127,7 @@ protected Object getTargetRepository(@Nonnull final RepositoryInformation metada
129127
@Nonnull
130128
protected Class<?> getRepositoryBaseClass(@Nonnull final RepositoryMetadata metadata)
131129
{
132-
if(isLazyRepository(metadata))
130+
if(this.isLazyRepository(metadata))
133131
{
134132
return LazySimpleEclipseStoreRepository.class;
135133
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,10 @@
1919

2020
import org.junit.jupiter.api.Assertions;
2121
import org.junit.jupiter.api.Test;
22-
import org.springframework.beans.factory.annotation.Autowired;
23-
import org.springframework.test.context.ContextConfiguration;
2422

2523
import software.xdev.spring.data.eclipse.store.helper.TestData;
2624
import software.xdev.spring.data.eclipse.store.helper.TestUtil;
2725
import software.xdev.spring.data.eclipse.store.integration.TestConfiguration;
28-
import software.xdev.spring.data.eclipse.store.integration.isolated.IsolatedTestAnnotations;
29-
import software.xdev.spring.data.eclipse.store.integration.isolated.tests.simple.lazy.SimpleLazyTestConfiguration;
3026
import software.xdev.spring.data.eclipse.store.integration.isolated.tests.simple.model.Customer;
3127
import software.xdev.spring.data.eclipse.store.integration.isolated.tests.simple.model.CustomerRepository;
3228
import software.xdev.spring.data.eclipse.store.integration.isolated.tests.simple.model.Owner;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.junit.jupiter.api.Assertions;
2323
import org.junit.jupiter.api.Test;
24-
import org.springframework.beans.factory.annotation.Autowired;
2524

2625
import software.xdev.spring.data.eclipse.store.helper.TestData;
2726
import software.xdev.spring.data.eclipse.store.helper.TestUtil;
@@ -81,6 +80,7 @@ void testBasicSaveAndFindSingleRecords()
8180
);
8281
}
8382

83+
@SuppressWarnings("OptionalGetWithoutIsPresent")
8484
@Test
8585
void testBasicSaveAndFindMultipleRecords()
8686
{
@@ -186,12 +186,12 @@ void testDoubleSaveAndFindAll()
186186
void testBasicSaveAndFindAllWithNotCrudRepository()
187187
{
188188
final CustomerNotCrud customer = new CustomerNotCrud(TestData.FIRST_NAME, TestData.LAST_NAME);
189-
notCrudRepository.save(customer);
189+
this.notCrudRepository.save(customer);
190190

191191
TestUtil.doBeforeAndAfterRestartOfDatastore(
192192
this.configuration,
193193
() -> {
194-
final List<CustomerNotCrud> customers = TestUtil.iterableToList(notCrudRepository.findAll());
194+
final List<CustomerNotCrud> customers = TestUtil.iterableToList(this.notCrudRepository.findAll());
195195
Assertions.assertEquals(1, customers.size());
196196
Assertions.assertEquals(customer, customers.get(0));
197197
}

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/simple/lazy/CustomerAsRecordLazyRepository.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package software.xdev.spring.data.eclipse.store.integration.isolated.tests.simple.lazy;
1717

18-
import java.util.Optional;
19-
2018
import software.xdev.spring.data.eclipse.store.integration.isolated.tests.simple.model.CustomerAsRecord;
2119
import software.xdev.spring.data.eclipse.store.integration.isolated.tests.simple.model.CustomerAsRecordRepository;
2220
import software.xdev.spring.data.eclipse.store.repository.interfaces.lazy.LazyEclipseStoreCrudRepository;
@@ -26,3 +24,4 @@ public interface CustomerAsRecordLazyRepository
2624
extends LazyEclipseStoreCrudRepository<CustomerAsRecord, String>, CustomerAsRecordRepository
2725
{
2826
}
27+

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/simple/lazy/CustomerLazyRepository.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
*/
1616
package software.xdev.spring.data.eclipse.store.integration.isolated.tests.simple.lazy;
1717

18-
import java.util.Optional;
19-
20-
import org.springframework.data.domain.Page;
21-
import org.springframework.data.domain.Pageable;
22-
2318
import software.xdev.spring.data.eclipse.store.integration.isolated.tests.simple.model.Customer;
2419
import software.xdev.spring.data.eclipse.store.integration.isolated.tests.simple.model.CustomerRepository;
2520
import software.xdev.spring.data.eclipse.store.repository.interfaces.lazy.LazyEclipseStoreCrudRepository;

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/simple/model/CustomerRepository.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@
1515
*/
1616
package software.xdev.spring.data.eclipse.store.integration.isolated.tests.simple.model;
1717

18-
import java.util.List;
1918
import java.util.Optional;
2019

2120
import org.springframework.data.domain.Page;
2221
import org.springframework.data.domain.Pageable;
23-
import org.springframework.data.domain.Sort;
2422
import org.springframework.data.repository.CrudRepository;
2523
import org.springframework.data.repository.PagingAndSortingRepository;
2624

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/simple/nonlazy/CustomerAsRecordNonLazyRepository.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import software.xdev.spring.data.eclipse.store.integration.isolated.tests.simple.model.CustomerAsRecord;
1919
import software.xdev.spring.data.eclipse.store.integration.isolated.tests.simple.model.CustomerAsRecordRepository;
2020
import software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreCrudRepository;
21-
import software.xdev.spring.data.eclipse.store.repository.interfaces.lazy.LazyEclipseStoreCrudRepository;
2221

2322

2423
public interface CustomerAsRecordNonLazyRepository

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/simple/nonlazy/CustomerNonLazyRepository.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import software.xdev.spring.data.eclipse.store.integration.isolated.tests.simple.model.CustomerRepository;
2020
import software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreCrudRepository;
2121
import software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStorePagingAndSortingRepository;
22-
import software.xdev.spring.data.eclipse.store.repository.interfaces.lazy.LazyEclipseStoreCrudRepository;
23-
import software.xdev.spring.data.eclipse.store.repository.interfaces.lazy.LazyEclipseStorePagingAndSortingRepository;
2422

2523

2624
public interface CustomerNonLazyRepository

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/simple/nonlazy/CustomerNotCrudNonLazyRepository.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818
import software.xdev.spring.data.eclipse.store.integration.isolated.tests.simple.model.CustomerNotCrud;
1919
import software.xdev.spring.data.eclipse.store.integration.isolated.tests.simple.model.CustomerNotCrudRepository;
2020
import software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreRepository;
21-
import software.xdev.spring.data.eclipse.store.repository.interfaces.lazy.LazyEclipseStoreRepository;
2221

2322

2423
public interface CustomerNotCrudNonLazyRepository
2524
extends EclipseStoreRepository<CustomerNotCrud, String>, CustomerNotCrudRepository
2625
{
2726
}
28-

0 commit comments

Comments
 (0)