Expanded @Version tests

Author: JohannesRabauer

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.0.10
+
+* Optimistic locking with @Version now possible
+
 # 1.0.9
 
 * Inherited entities with repositories are now realized by reading (finding coherent repositories) and not by writing

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

@@ -23,7 +23,7 @@ public Integer increment(final Integer original)
 	{
 		if(original == null || original == Integer.MAX_VALUE)
 		{
-			return 0;
+			return 1;
 		}
 		return original + 1;
 	}

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

@@ -23,7 +23,7 @@ public Long increment(final Long original)
 	{
 		if(original == null || original == Long.MAX_VALUE)
 		{
-			return 0L;
+			return 1L;
 		}
 		return original + 1;
 	}

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

@@ -16,23 +16,86 @@
 package software.xdev.spring.data.eclipse.store.integration.isolated.tests.version;
 
 import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Stream;
 
 import jakarta.persistence.OptimisticLockException;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 
 import software.xdev.spring.data.eclipse.store.helper.TestData;
 import software.xdev.spring.data.eclipse.store.helper.TestUtil;
 import software.xdev.spring.data.eclipse.store.integration.isolated.IsolatedTestAnnotations;
+import software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreRepository;
 
 
 @IsolatedTestAnnotations
 @ContextConfiguration(classes = {VersionTestConfiguration.class})
 class VersionTest
 {
+	public static Stream<Arguments> generateData()
+	{
+		return List.of(
+			new SingleTestDataset<>(
+				name -> new VersionedEntityWithInteger(name),
+				context -> context.getBean(VersionedEntityWithIntegerRepository.class),
+				1,
+				2
+			).toArguments(),
+			new SingleTestDataset<>(
+				name -> new VersionedEntityWithLong(name),
+				context -> context.getBean(VersionedEntityWithLongRepository.class),
+				1L,
+				2L
+			).toArguments(),
+			new SingleTestDataset<>(
+				name -> new VersionedEntityWithPrimitiveInteger(name),
+				context -> context.getBean(VersionedEntityWithPrimitiveIntegerRepository.class),
+				1,
+				2
+			).toArguments(),
+			new SingleTestDataset<>(
+				name -> new VersionedEntityWithPrimitiveLong(name),
+				context -> context.getBean(VersionedEntityWithPrimitiveLongRepository.class),
+				1L,
+				2L
+			).toArguments(),
+			new SingleTestDataset<>(
+				name -> new VersionedEntityWithString(name),
+				context -> context.getBean(VersionedEntityWithStringRepository.class),
+				null,
+				null
+			).toArguments(),
+			new SingleTestDataset<>(
+				name -> new VersionedEntityWithUuid(name),
+				context -> context.getBean(VersionedEntityWithUuidRepository.class),
+				null,
+				null
+			).toArguments()
+		).stream();
+	}
+	
+	private record SingleTestDataset<T extends VersionedEntity>(
+		Function<String, T> enitityGenerator,
+		Function<ApplicationContext, EclipseStoreRepository<T, Void>> repositoryGenerator,
+		Object firstVersion,
+		Object secondVersion
+	)
+	{
+		public Arguments toArguments()
+		{
+			return Arguments.of(this);
+		}
+	}
+	
+	
 	private final VersionTestConfiguration configuration;
 
 	@Autowired
@@ -41,45 +104,68 @@ public VersionTest(final VersionTestConfiguration configuration)
 		this.configuration = configuration;
 	}
 
-	@Test
-	void simpleSave(@Autowired final VersionedEntityWithIntegerRepository repository)
+	@ParameterizedTest
+	@MethodSource("generateData")
+	<T extends VersionedEntity> void simpleSave(
+		final SingleTestDataset<T> data, @Autowired final ApplicationContext context)
 	{
-		final VersionedEntityWithInteger entity = new VersionedEntityWithInteger(TestData.FIRST_NAME);
+		final EclipseStoreRepository<T, Void> repository = data.repositoryGenerator.apply(context);
+		final T entity = data.enitityGenerator.apply(TestData.FIRST_NAME);
 		repository.save(entity);
 		TestUtil.doBeforeAndAfterRestartOfDatastore(
 			this.configuration,
 			() -> {
-				final List<VersionedEntityWithInteger> allEntities = repository.findAll();
+				final List<T> allEntities = repository.findAll();
 				Assertions.assertEquals(1, allEntities.size());
-				Assertions.assertEquals(1, allEntities.get(0).getVersion());
+				if(data.firstVersion != null)
+				{
+					Assertions.assertEquals(data.firstVersion, allEntities.get(0).getVersion());
+				}
+				else
+				{
+					Assertions.assertNotNull(allEntities.get(0).getVersion());
+				}
 			}
 		);
 	}
 
-	@Test
-	void doubleSave(@Autowired final VersionedEntityWithIntegerRepository repository)
+	@ParameterizedTest
+	@MethodSource("generateData")
+	<T extends VersionedEntity> void doubleSave(
+		final SingleTestDataset<T> data, @Autowired final ApplicationContext context)
 	{
-		final VersionedEntityWithInteger entity = new VersionedEntityWithInteger(TestData.FIRST_NAME);
+		final EclipseStoreRepository<T, Void> repository = data.repositoryGenerator.apply(context);
+		final T entity = data.enitityGenerator.apply(TestData.FIRST_NAME);
 		repository.save(entity);
 		repository.save(repository.findAll().get(0));
 		TestUtil.doBeforeAndAfterRestartOfDatastore(
 			this.configuration,
 			() -> {
-				final List<VersionedEntityWithInteger> allEntities = repository.findAll();
+				final List<T> allEntities = repository.findAll();
 				Assertions.assertEquals(1, allEntities.size());
-				Assertions.assertEquals(2, allEntities.get(0).getVersion());
+				if(data.secondVersion != null)
+				{
+					Assertions.assertEquals(data.secondVersion, allEntities.get(0).getVersion());
+				}
+				else
+				{
+					Assertions.assertNotNull(allEntities.get(0).getVersion());
+				}
 			}
 		);
 	}
 
-	@Test
-	void saveButLocked(@Autowired final VersionedEntityWithIntegerRepository repository)
+	@ParameterizedTest
+	@MethodSource("generateData")
+	<T extends VersionedEntity> void saveButLocked(
+		final SingleTestDataset<T> data, @Autowired final ApplicationContext context)
 	{
-		final VersionedEntityWithInteger entity = new VersionedEntityWithInteger(TestData.FIRST_NAME);
+		final EclipseStoreRepository<T, Void> repository = data.repositoryGenerator.apply(context);
+		final T entity = data.enitityGenerator.apply(TestData.FIRST_NAME);
 		repository.save(entity);
 
-		final VersionedEntityWithInteger firstLoadedEntry = repository.findAll().get(0);
-		final VersionedEntityWithInteger secondLoadedEntry = repository.findAll().get(0);
+		final T firstLoadedEntry = repository.findAll().get(0);
+		final T secondLoadedEntry = repository.findAll().get(0);
 
 		firstLoadedEntry.setName(TestData.FIRST_NAME_ALTERNATIVE);
 		repository.save(firstLoadedEntry);

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

@@ -18,7 +18,7 @@
 import jakarta.persistence.Version;
 
 
-public class VersionedChildEntityWithLong
+public class VersionedChildEntityWithLong implements VersionedEntity<Long>
 {
 	@Version
 	private long version;
@@ -29,7 +29,8 @@ public VersionedChildEntityWithLong(final String name)
 		this.name = name;
 	}
 
-	public long getVersion()
+	@Override
+	public Long getVersion()
 	{
 		return this.version;
 	}
@@ -44,6 +45,7 @@ public void setVersion(final int version)
 		this.version = version;
 	}
 
+	@Override
 	public void setName(final String name)
 	{
 		this.name = name;

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

@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2024 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.spring.data.eclipse.store.integration.isolated.tests.version;
+
+public interface VersionedEntity<T>
+{
+	T getVersion();
+	
+	void setName(String name);
+}

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

@@ -18,18 +18,19 @@
 import jakarta.persistence.Version;
 
 
-public class VersionedEntityWithInteger
+public class VersionedEntityWithInteger implements VersionedEntity<Integer>
 {
 	@Version
-	private int version;
+	private Integer version;
 	private String name;
 
 	public VersionedEntityWithInteger(final String name)
 	{
 		this.name = name;
 	}
 
-	public int getVersion()
+	@Override
+	public Integer getVersion()
 	{
 		return this.version;
 	}
@@ -44,6 +45,7 @@ public void setVersion(final int version)
 		this.version = version;
 	}
 
+	@Override
 	public void setName(final String name)
 	{
 		this.name = name;

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

@@ -18,7 +18,7 @@
 import jakarta.persistence.Version;
 
 
-public class VersionedEntityWithIntegerAndVersionedChild
+public class VersionedEntityWithIntegerAndVersionedChild implements VersionedEntity<Integer>
 {
 	@Version
 	private int version;
@@ -31,7 +31,8 @@ public VersionedEntityWithIntegerAndVersionedChild(final String name, final Vers
 		this.child = child;
 	}
 
-	public int getVersion()
+	@Override
+	public Integer getVersion()
 	{
 		return this.version;
 	}
@@ -46,6 +47,7 @@ public void setVersion(final int version)
 		this.version = version;
 	}
 
+	@Override
 	public void setName(final String name)
 	{
 		this.name = name;

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

@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2024 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.spring.data.eclipse.store.integration.isolated.tests.version;
+
+import jakarta.persistence.Version;
+
+
+public class VersionedEntityWithLong implements VersionedEntity<Long>
+{
+	@Version
+	private Long version;
+	private String name;
+	
+	public VersionedEntityWithLong(final String name)
+	{
+		this.name = name;
+	}
+	
+	@Override
+	public Long getVersion()
+	{
+		return this.version;
+	}
+	
+	public String getName()
+	{
+		return this.name;
+	}
+	
+	public void setVersion(final Long version)
+	{
+		this.version = version;
+	}
+	
+	@Override
+	public void setName(final String name)
+	{
+		this.name = name;
+	}
+}

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

@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2024 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.spring.data.eclipse.store.integration.isolated.tests.version;
+
+import software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreRepository;
+
+
+public interface VersionedEntityWithLongRepository extends EclipseStoreRepository<VersionedEntityWithLong, Void>
+{
+}