Merge pull request #174 from xdev-software/renovate/major-org.eclipse.store.version

Update org.eclipse.store.version to v2 (major)

Author: JohannesRabauer

spring-data-eclipse-store/pom.xml

@@ -52,8 +52,8 @@
 
 		<!-- Should be in sync with org.eclipse.store:integrations-spring-boot3 -->
 		<org.springframework.boot.version>3.4.0</org.springframework.boot.version>
-		<org.eclipse.store.version>1.4.0</org.eclipse.store.version>
-		<org.eclipse.serializer.version>1.4.0</org.eclipse.serializer.version>
+		<org.eclipse.store.version>2.0.0</org.eclipse.store.version>
+		<org.eclipse.serializer.version>2.0.0</org.eclipse.serializer.version>
 		<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
 		<jakarta.el-api.version>6.0.1</jakarta.el-api.version>
 		<expressly.version>6.0.0-M1</expressly.version>

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

@@ -17,7 +17,10 @@
 
 import java.lang.reflect.Field;
 import java.util.Objects;
+import java.util.function.Consumer;
 
+import org.eclipse.serializer.collections.HashEnum;
+import org.eclipse.serializer.collections.types.XGettingEnum;
 import org.eclipse.serializer.reference.Lazy;
 import org.eclipse.serializer.reference.ObjectSwizzling;
 import org.eclipse.serializer.reference.Swizzling;
@@ -73,6 +76,7 @@ final class Default<T> implements SpringDataEclipseStoreLazy<T>
 		private transient ObjectSwizzling loader;
 		private transient WorkingCopier<T> copier;
 		private transient boolean isStored;
+		private final transient HashEnum<Object> usageMarks = HashEnum.New();
 
 		private Default(final Lazy<T> lazySubject)
 		{
@@ -259,5 +263,65 @@ public boolean isOriginalObject()
 		{
 			return this.objectToBeWrapped != null;
 		}
+		
+		// region Copied from org.eclipse.serializer.reference.UsageMarkable#Default
+		@Override
+		public int markUsedFor(final Object instance)
+		{
+			// lock internal instance to avoid side effect deadlocks
+			synchronized(this.usageMarks)
+			{
+				final boolean added = this.usageMarks.add(instance);
+				
+				return this.usageMarks.intSize() * (added ? 1 : -1);
+			}
+		}
+		
+		@Override
+		public int unmarkUsedFor(final Object instance)
+		{
+			// lock internal instance to avoid side effect deadlocks
+			synchronized(this.usageMarks)
+			{
+				final boolean removed = this.usageMarks.removeOne(instance);
+				
+				return this.usageMarks.intSize() * (removed ? 1 : -1);
+			}
+		}
+		
+		@Override
+		public boolean isUsed()
+		{
+			// lock internal instance to avoid side effect deadlocks
+			synchronized(this.usageMarks)
+			{
+				return !this.usageMarks.isEmpty();
+			}
+		}
+		
+		@Override
+		public int markUnused()
+		{
+			// lock internal instance to avoid side effect deadlocks
+			synchronized(this.usageMarks)
+			{
+				final int currentSize = this.usageMarks.intSize();
+				this.usageMarks.clear();
+				
+				return currentSize;
+			}
+		}
+		
+		@Override
+		public void accessUsageMarks(final Consumer<? super XGettingEnum<Object>> logic)
+		{
+			// lock internal instance to avoid side effect deadlocks
+			synchronized(this.usageMarks)
+			{
+				// no null check to give logic a chance to notice no-marks case.
+				logic.accept(this.usageMarks);
+			}
+		}
+		// endregion
 	}
 }