Skip to content

Commit a46bdf1

Browse files
JohannesRabauerJohannesRabauer
committed
Implemented LazyRepositories, new EntityData and refactoring
1 parent 10c285c commit a46bdf1

26 files changed

Lines changed: 412 additions & 302 deletions

‎spring-data-eclipse-store-jpa/src/test/java/software/xdev/spring/data/eclipse/store/jpa/integration/JpaImportExplicitTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void testEclipseStoreImportExplicitNoComponent()
6363
this.configuration.getStorageInstance().stop();
6464
Assertions.assertEquals(
6565
1,
66-
this.configuration.getStorageInstance().getEntityCount(PersonToTestInJpa.class),
66+
this.configuration.getStorageInstance().getNonLazyCommunicator().getEntityCount(PersonToTestInJpa.class),
6767
"After restart the imported entities are not there anymore.");
6868
}
6969
}

‎spring-data-eclipse-store-jpa/src/test/java/software/xdev/spring/data/eclipse/store/jpa/integration/JpaImportTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void testEclipseStoreImport(@Autowired final EclipseStoreDataImporterComponent e
7272
this.configuration.getStorageInstance().stop();
7373
Assertions.assertEquals(
7474
1,
75-
this.configuration.getStorageInstance().getEntityCount(PersonToTestInJpa.class),
75+
this.configuration.getStorageInstance().getNonLazyCommunicator().getEntityCount(PersonToTestInJpa.class),
7676
"After restart the imported entities are not there anymore.");
7777
}
7878

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,4 @@
1818
public interface EntityListProvider
1919
{
2020
<T, ID> EntityProvider<T, ID> getEntityProvider(final Class<T> clazz);
21-
22-
<T> long getEntityCount(final Class<T> clazz);
2321
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.stream.Collectors;
2424
import java.util.stream.Stream;
2525

26-
import software.xdev.spring.data.eclipse.store.repository.root.EntityData;
26+
import software.xdev.spring.data.eclipse.store.repository.root.v2_4.EntityData;
2727

2828

2929
@SuppressWarnings("java:S119")
@@ -56,6 +56,7 @@ public long size()
5656
return this.stream().count();
5757
}
5858

59+
@SuppressWarnings("unchecked")
5960
public Optional<T> findAnyEntityWithId(final ID id)
6061
{
6162
return (Optional<T>)this.entityDataList

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@
2525
import software.xdev.micromigration.version.MigrationVersion;
2626
import software.xdev.spring.data.eclipse.store.repository.root.VersionedRoot;
2727
import software.xdev.spring.data.eclipse.store.repository.root.update.scripts.v2_0_0_InitializeVersioning;
28+
import software.xdev.spring.data.eclipse.store.repository.root.update.scripts.v2_4_0_InitializeLazy;
2829

2930

3031
public final class EclipseStoreMigrator
3132
{
3233
public static final VersionAgnosticMigrationScript<?, ?>[] SCRIPTS =
3334
new VersionAgnosticMigrationScript[]{
34-
new v2_0_0_InitializeVersioning()
35+
new v2_0_0_InitializeVersioning(),
36+
new v2_4_0_InitializeLazy()
3537
};
3638

3739
private EclipseStoreMigrator()

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

Lines changed: 37 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@
3939
import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreClientConfiguration;
4040
import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreStorageFoundationProvider;
4141
import software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreRepository;
42-
import software.xdev.spring.data.eclipse.store.repository.root.EntityData;
4342
import software.xdev.spring.data.eclipse.store.repository.root.VersionedRoot;
43+
import software.xdev.spring.data.eclipse.store.repository.root.v2_4.EntityData;
44+
import software.xdev.spring.data.eclipse.store.repository.support.SimpleEclipseStoreRepository;
4445
import software.xdev.spring.data.eclipse.store.repository.support.concurrency.ReadWriteLock;
4546
import software.xdev.spring.data.eclipse.store.repository.support.concurrency.ReentrantJavaReadWriteLock;
4647
import software.xdev.spring.data.eclipse.store.repository.support.copier.version.EntityVersionIncrementer;
@@ -55,11 +56,15 @@
5556

5657
@SuppressWarnings("java:S119")
5758
public class EclipseStoreStorage
58-
implements EntityListProvider, IdManagerProvider, VersionManagerProvider, PersistableChecker, ObjectSwizzling
59+
implements EntityListProvider,
60+
IdManagerProvider,
61+
VersionManagerProvider,
62+
PersistableChecker,
63+
ObjectSwizzling,
64+
StorageCommunicator
5965
{
6066
private static final Logger LOG = LoggerFactory.getLogger(EclipseStoreStorage.class);
61-
private final Map<Class<?>, EclipseStoreRepository<?, ?>> entityClassToRepository = new HashMap<>();
62-
private final Map<Class<?>, EclipseStoreRepository<?, ?>> lazyEntityClassToRepository = new HashMap<>();
67+
private final Map<Class<?>, SimpleEclipseStoreRepository<?, ?>> entityClassToRepository = new HashMap<>();
6368
/**
6469
* "Why are the IdManagers seperated from the repositories?" - Because there might be entities for which there are
6570
* no repositories, but they still have IDs.
@@ -107,8 +112,7 @@ private synchronized void ensureEntitiesInRoot()
107112
{
108113
if(this.storageManager == null)
109114
{
110-
final EmbeddedStorageFoundation<?> embeddedStorageFoundation =
111-
this.startStorageManager();
115+
final EmbeddedStorageFoundation<?> embeddedStorageFoundation = this.startStorageManager();
112116
this.persistenceChecker = new RelayedPersistenceChecker(embeddedStorageFoundation);
113117
this.initRoot();
114118
LOG.info(
@@ -120,6 +124,7 @@ private synchronized void ensureEntitiesInRoot()
120124
}
121125
}
122126

127+
@SuppressWarnings("deprecation")
123128
private EmbeddedStorageFoundation<?> startStorageManager()
124129
{
125130
LOG.info("Starting storage...");
@@ -161,11 +166,6 @@ else if(!(embeddedStorageManager.root() instanceof VersionedRoot))
161166
return this.entityClassToRepository.get(entityClass);
162167
}
163168

164-
public <T> EclipseStoreRepository<?, ?> getLazyRepository(final Class<T> entityClass)
165-
{
166-
return this.lazyEntityClassToRepository.get(entityClass);
167-
}
168-
169169
private void initRoot()
170170
{
171171
if(LOG.isDebugEnabled())
@@ -175,7 +175,6 @@ private void initRoot()
175175
this.repositorySynchronizer =
176176
new SimpleRepositorySynchronizer(this.root.getCurrentRootData());
177177
this.ensureEntityData();
178-
this.ensureLazyEntityData();
179178
this.entitySetCollector =
180179
new EntitySetCollector(
181180
this.root.getCurrentRootData()::getEntityData,
@@ -207,39 +206,19 @@ private void ensureEntityData()
207206
}
208207
}
209208

210-
private void ensureLazyEntityData()
209+
public <T, ID> void createNewEntityData(final Class<T> entityClass, final VersionedRoot root)
211210
{
212-
boolean entityListMustGetStored = false;
213-
for(final Class<?> entityClass : this.lazyEntityClassToRepository.keySet())
211+
final IdManager<T, ID> idManager = this.ensureIdManager(entityClass);
212+
if(this.entityClassToRepository.get(entityClass).isLazy())
214213
{
215-
if(this.root.getCurrentRootData().getLazyEntityData(entityClass) == null)
216-
{
217-
this.createNewLazyEntityData(entityClass, this.root);
218-
entityListMustGetStored = true;
219-
}
220-
else
221-
{
222-
this.setIdManagerForEntityData(entityClass, this.root);
223-
}
214+
root.getCurrentRootData().createNewLazyEntityData(entityClass, idManager::getId);
224215
}
225-
if(entityListMustGetStored)
216+
else
226217
{
227-
this.storageManager.store(this.root.getCurrentRootData().getLazyEntityListsToStore());
218+
root.getCurrentRootData().createNewEntityData(entityClass, idManager::getId);
228219
}
229220
}
230221

231-
private <T, ID> void createNewEntityData(final Class<T> entityClass, final VersionedRoot root)
232-
{
233-
final IdManager<T, ID> idManager = this.ensureIdManager(entityClass);
234-
root.getCurrentRootData().createNewEntityData(entityClass, idManager::getId);
235-
}
236-
237-
private <T, ID> void createNewLazyEntityData(final Class<T> entityClass, final VersionedRoot root)
238-
{
239-
final IdManager<T, ID> idManager = this.ensureIdManager(entityClass);
240-
root.getCurrentRootData().createNewLazyEntityData(entityClass, idManager::getId);
241-
}
242-
243222
private <T, ID> void setIdManagerForEntityData(final Class<T> entityClass, final VersionedRoot root)
244223
{
245224
final IdManager<T, ID> idManager = this.ensureIdManager(entityClass);
@@ -254,9 +233,10 @@ private <T, ID> void setIdManagerForEntityData(final Class<T> entityClass, final
254233
}
255234
}
256235

257-
public synchronized <T> void registerEntity(
236+
@Override
237+
public synchronized <T, ID> void registerEntity(
258238
final Class<T> classToRegister,
259-
final EclipseStoreRepository<?, ?> repository)
239+
final SimpleEclipseStoreRepository<T, ID> repository)
260240
{
261241
if(this.entityClassToRepository.containsKey(classToRegister))
262242
{
@@ -278,33 +258,24 @@ private <T, ID> EntityData<T, ID> getEntityData(final Class<T> clazz)
278258
return this.readWriteLock.read(() -> this.root.getCurrentRootData().getEntityData(clazz));
279259
}
280260

281-
private <T, ID> EntityData<T, ID> getLazyEntityData(final Class<T> clazz)
282-
{
283-
this.ensureEntitiesInRoot();
284-
return this.readWriteLock.read(() -> this.root.getCurrentRootData().getLazyEntityData(clazz));
285-
}
286-
287261
@Override
288262
public <T, ID> EntityProvider<T, ID> getEntityProvider(final Class<T> clazz)
289263
{
290264
this.ensureEntitiesInRoot();
291265
return this.entitySetCollector.getRelatedIdentitySets(clazz);
292266
}
293267

294-
@SuppressWarnings("unchecked")
295268
@Override
296269
public <T> long getEntityCount(final Class<T> clazz)
297270
{
298271
this.ensureEntitiesInRoot();
299-
return this.readWriteLock.read(
300-
() ->
301-
{
302-
final EntityData<T, Object> entityData = this.root.getCurrentRootData().getEntityData(clazz);
303-
return entityData == null ? 0 : entityData.getEntityCount();
304-
}
305-
);
272+
return this.readWriteLock.read(() -> {
273+
final EntityData<T, Object> entityData = this.getEntityData(clazz);
274+
return entityData == null ? 0 : entityData.getEntityCount();
275+
});
306276
}
307277

278+
@Override
308279
public <T> void store(
309280
final Collection<Object> nonEntitiesToStore,
310281
final Class<T> clazz,
@@ -315,7 +286,10 @@ public <T> void store(
315286
() ->
316287
{
317288
final Collection<Object> entitiesAndPossiblyNonEntitiesToStore =
318-
this.collectRootEntitiesToStore(clazz, entitiesToStore);
289+
this.collectRootEntitiesToStore(
290+
this.getEntityData(clazz),
291+
clazz,
292+
entitiesToStore);
319293
entitiesAndPossiblyNonEntitiesToStore.addAll(nonEntitiesToStore);
320294
if(LOG.isDebugEnabled())
321295
{
@@ -336,16 +310,14 @@ public <T> void store(
336310
* Also collects the object-list to store, if necessary.
337311
*/
338312
private <T, ID> Collection<Object> collectRootEntitiesToStore(
313+
final EntityData<T, ID> entityData,
339314
final Class<T> clazz,
340315
final Iterable<T> entitiesToStore)
341316
{
342-
final EntityData<T, ID> entityData = this.getEntityData(clazz);
343-
final EntityData<T, ID> lazyEntityData = this.getLazyEntityData(clazz);
344317
final Collection<Object> objectsToStore = new ArrayList<>();
345318
for(final T entityToStore : entitiesToStore)
346319
{
347320
objectsToStore.addAll(entityData.ensureEntityAndReturnObjectsToStore(entityToStore));
348-
objectsToStore.addAll(lazyEntityData.ensureEntityAndReturnObjectsToStore(entityToStore));
349321
objectsToStore.add(entityToStore);
350322
// Add the separate lists of entities to store.
351323
this.repositorySynchronizer.syncAndReturnChangedObjectLists(entityToStore).forEach(
@@ -355,13 +327,14 @@ private <T, ID> Collection<Object> collectRootEntitiesToStore(
355327
return objectsToStore;
356328
}
357329

358-
public <T, ID> void delete(final Class<T> clazz, final T entityToRemove)
330+
@Override
331+
public <T> void delete(final Class<T> clazz, final T entityToRemove)
359332
{
360333
this.ensureEntitiesInRoot();
361334
this.readWriteLock.write(
362335
() ->
363336
{
364-
final EntityData<T, ID> entityData = this.getEntityData(clazz);
337+
final EntityData<T, ?> entityData = this.getEntityData(clazz);
365338
this.storageManager.storeAll(entityData.removeEntityAndReturnObjectsToStore(entityToRemove));
366339
if(LOG.isDebugEnabled())
367340
{
@@ -371,13 +344,14 @@ public <T, ID> void delete(final Class<T> clazz, final T entityToRemove)
371344
);
372345
}
373346

374-
public <T, ID> void deleteAll(final Class<T> clazz)
347+
@Override
348+
public <T> void deleteAll(final Class<T> clazz)
375349
{
376350
this.ensureEntitiesInRoot();
377351
this.readWriteLock.write(
378352
() ->
379353
{
380-
final EntityData<T, ID> entityData = this.getEntityData(clazz);
354+
final EntityData<T, ?> entityData = this.getEntityData(clazz);
381355
final long oldSize = entityData.getEntityCount();
382356
this.storageManager.storeAll(entityData.removeAllEntitiesAndReturnObjectsToStore());
383357
if(LOG.isDebugEnabled())
@@ -518,6 +492,7 @@ public Object getObject(final long objectId)
518492
return this.storageManager.getObject(objectId);
519493
}
520494

495+
@Override
521496
public ReadWriteLock getReadWriteLock()
522497
{
523498
return this.readWriteLock;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.slf4j.LoggerFactory;
2525

2626
import software.xdev.spring.data.eclipse.store.core.EntityProvider;
27-
import software.xdev.spring.data.eclipse.store.repository.root.EntityData;
27+
import software.xdev.spring.data.eclipse.store.repository.root.v2_4.EntityData;
2828

2929

3030
@SuppressWarnings("java:S119")

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

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,34 @@
1+
/*
2+
* Copyright © 2024 XDEV Software (https://xdev.software)
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package software.xdev.spring.data.eclipse.store.repository;
217

3-
import java.util.List;
4-
import java.util.Set;
5-
import java.util.stream.Collectors;
18+
import java.util.Collection;
619

720
import software.xdev.spring.data.eclipse.store.core.EntityProvider;
21+
import software.xdev.spring.data.eclipse.store.repository.support.SimpleEclipseStoreRepository;
822
import software.xdev.spring.data.eclipse.store.repository.support.concurrency.ReadWriteLock;
923

1024

1125
public interface StorageCommunicator
1226
{
1327
ReadWriteLock getReadWriteLock();
1428

15-
<T> void store(Set<Object> nonEntitiesToStore, Class<T> domainClass, List<T> entitiesToStore);
29+
<T> void store(
30+
final Collection<Object> nonEntitiesToStore, final Class<T> clazz,
31+
final Iterable<T> entitiesToStore);
1632

1733
<T, ID> EntityProvider<T, ID> getEntityProvider(final Class<T> clazz);
1834

@@ -21,4 +37,6 @@ public interface StorageCommunicator
2137
<T> void delete(Class<T> domainClass, T foundEntity);
2238

2339
<T> void deleteAll(Class<T> domainClass);
40+
41+
<T, ID> void registerEntity(Class<T> domainClass, SimpleEclipseStoreRepository<T, ID> repository);
2442
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
import software.xdev.spring.data.eclipse.store.repository.interfaces.lazy.LazyEclipseStoreCrudRepository;
4141
import software.xdev.spring.data.eclipse.store.repository.interfaces.lazy.LazyEclipseStoreCustomRepository;
4242
import software.xdev.spring.data.eclipse.store.repository.interfaces.lazy.LazyEclipseStoreListCrudRepository;
43-
import software.xdev.spring.data.eclipse.store.repository.interfaces.lazy.LazyEclipseStoreListPagingAndSortingRepositoryRepository;
44-
import software.xdev.spring.data.eclipse.store.repository.interfaces.lazy.LazyEclipseStorePagingAndSortingRepositoryRepository;
43+
import software.xdev.spring.data.eclipse.store.repository.interfaces.lazy.LazyEclipseStoreListPagingAndSortingRepository;
44+
import software.xdev.spring.data.eclipse.store.repository.interfaces.lazy.LazyEclipseStorePagingAndSortingRepository;
4545
import software.xdev.spring.data.eclipse.store.repository.interfaces.lazy.LazyEclipseStoreRepository;
4646
import software.xdev.spring.data.eclipse.store.repository.support.EclipseStoreRepositoryFactoryBean;
4747

@@ -64,6 +64,7 @@ public String getModuleName()
6464
*/
6565
@Override
6666
@Nonnull
67+
@SuppressWarnings("deprecation")
6768
public String getModulePrefix()
6869
{
6970
return this.getModuleIdentifier();
@@ -130,8 +131,8 @@ protected Collection<Class<?>> getIdentifyingTypes()
130131
EclipseStoreListCrudRepository.class,
131132
LazyEclipseStoreRepository.class,
132133
LazyEclipseStoreCustomRepository.class,
133-
LazyEclipseStorePagingAndSortingRepositoryRepository.class,
134-
LazyEclipseStoreListPagingAndSortingRepositoryRepository.class,
134+
LazyEclipseStorePagingAndSortingRepository.class,
135+
LazyEclipseStoreListPagingAndSortingRepository.class,
135136
LazyEclipseStoreCrudRepository.class,
136137
LazyEclipseStoreListCrudRepository.class
137138
);

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/lazy/LazyEclipseStoreListPagingAndSortingRepositoryRepository.java renamed to spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/interfaces/lazy/LazyEclipseStoreListPagingAndSortingRepository.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
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.ListPagingAndSortingRepository;
2019
import org.springframework.data.repository.NoRepositoryBean;
2120

2221

2322
@SuppressWarnings("java:S119")
2423
@NoRepositoryBean
25-
public interface LazyEclipseStoreListPagingAndSortingRepositoryRepository<T, ID>
24+
public interface LazyEclipseStoreListPagingAndSortingRepository<T, ID>
2625
extends ListPagingAndSortingRepository<T, ID>
2726
{
2827
}

0 commit comments

Comments
 (0)