Skip to content

Commit 93686a1

Browse files
Merge branch 'develop' into transactions
2 parents db103f0 + ab2674b commit 93686a1

10 files changed

Lines changed: 35 additions & 14 deletions

File tree

.gitattributes

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
11
# Auto detect text files and perform LF normalization
22
* text=auto
3+
4+
# Force sh files to have LF
5+
*.sh text eol=lf
6+
7+
# Force MVN Wrapper Linux files LF
8+
mvnw text eol=lf
9+
.mvn/wrapper/maven-wrapper.properties text eol=lf

CHANGELOG.md

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

33
* Added possibility to use multiple storages
44
* Added Lazy support
5-
* Updated EclipseStore to version 1.3.1
65

76
# 1.0.3
87

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ instructions** are in the documentation](https://xdev-software.github.io/spring-
5151
| Spring-Data-Eclipse-Store | Java | Spring Data | EclipseStore |
5252
|---------------------------|--------|-------------|--------------|
5353
| ``<= 1.0.2`` | ``17`` | ``3.2.2`` | ``1.1.0`` |
54-
| ``1.0.3`` | ``17`` | ``3.2.3`` | ``1.2.0`` |
54+
| ``>= 1.0.3`` | ``17`` | ``3.2.3`` | ``1.2.0`` |
5555

5656
## Demo
5757

docs/antora.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
name: ROOT
22
title: Spring-Data-Eclipse-Store
33
version: master
4-
display_version: '1.0.3'
4+
display_version: '1.0.4'
55
start_page: index.adoc
66
nav:
77
- modules/ROOT/nav.adoc
88
asciidoc:
99
attributes:
1010
product-name: 'Spring-Data-Eclipse-Store'
11-
display-version: '1.0.3'
12-
maven-version: '1.0.3'
11+
display-version: '1.0.4'
12+
maven-version: '1.0.4'
1313
page-editable: false
1414
page-out-of-support: false

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev</groupId>
88
<artifactId>spring-data-eclipse-store-root</artifactId>
9-
<version>1.0.4-SNAPSHOT</version>
9+
<version>1.0.5-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<organization>

spring-data-eclipse-store-benchmark/pom.xml

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

55
<groupId>com.xdev-software</groupId>
66
<artifactId>spring-data-eclipse-store-benchmark</artifactId>
7-
<version>1.0.4-SNAPSHOT</version>
7+
<version>1.0.5-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<inceptionYear>2023</inceptionYear>
@@ -96,7 +96,7 @@
9696
<dependency>
9797
<groupId>com.puppycrawl.tools</groupId>
9898
<artifactId>checkstyle</artifactId>
99-
<version>10.15.0</version>
99+
<version>10.16.0</version>
100100
</dependency>
101101
</dependencies>
102102
<configuration>

spring-data-eclipse-store-demo/pom.xml

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

77
<groupId>software.xdev</groupId>
88
<artifactId>spring-data-eclipse-store-demo</artifactId>
9-
<version>1.0.4-SNAPSHOT</version>
9+
<version>1.0.5-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<organization>
@@ -101,7 +101,7 @@
101101
<dependency>
102102
<groupId>com.puppycrawl.tools</groupId>
103103
<artifactId>checkstyle</artifactId>
104-
<version>10.15.0</version>
104+
<version>10.16.0</version>
105105
</dependency>
106106
</dependencies>
107107
<configuration>

spring-data-eclipse-store-jpa/pom.xml

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

77
<groupId>software.xdev</groupId>
88
<artifactId>spring-data-eclipse-store-jpa</artifactId>
9-
<version>1.0.4-SNAPSHOT</version>
9+
<version>1.0.5-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<inceptionYear>2023</inceptionYear>
@@ -123,7 +123,7 @@
123123
<dependency>
124124
<groupId>com.puppycrawl.tools</groupId>
125125
<artifactId>checkstyle</artifactId>
126-
<version>10.15.0</version>
126+
<version>10.16.0</version>
127127
</dependency>
128128
</dependencies>
129129
<configuration>

spring-data-eclipse-store/pom.xml

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

77
<groupId>software.xdev</groupId>
88
<artifactId>spring-data-eclipse-store</artifactId>
9-
<version>1.0.4-SNAPSHOT</version>
9+
<version>1.0.5-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>spring-data-eclipse-store</name>
@@ -353,7 +353,7 @@
353353
<dependency>
354354
<groupId>com.puppycrawl.tools</groupId>
355355
<artifactId>checkstyle</artifactId>
356-
<version>10.15.0</version>
356+
<version>10.16.0</version>
357357
</dependency>
358358
</dependencies>
359359
<configuration>

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,21 @@ void lazyClearAfterSave(@Autowired final ObjectWithLazyRepository<SimpleObject>
361361
);
362362
}
363363

364+
@Test
365+
void lazyClearThroughLazyManagerBeforeSave()
366+
{
367+
LazyReferenceManager.get().stop();
368+
this.configuration.getStorageInstance().start();
369+
final ObjectWithLazy<SimpleObject> newLazy = new ObjectWithLazy<>();
370+
final SimpleObject objectToStore = new SimpleObject(TestData.DUMMY_STRING);
371+
newLazy.setLazy(SpringDataEclipseStoreLazy.build(objectToStore));
372+
Assertions.assertTrue(newLazy.getLazy().isLoaded());
373+
Assertions.assertFalse(newLazy.getLazy().isStored());
374+
LazyReferenceManager.get().cleanUp();
375+
Assertions.assertTrue(newLazy.getLazy().isLoaded());
376+
Assertions.assertFalse(newLazy.getLazy().isStored());
377+
}
378+
364379
@Test
365380
void lazyClearThroughLazyManagerAfterSave(@Autowired final ObjectWithLazyRepository<SimpleObject> repository)
366381
{

0 commit comments

Comments
 (0)