Cleanup

Author: JohannesRabauer

.run/Run Benchmark.run.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="Run Benchmark" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="software.xdev.spring.data.eclipse.store.benchmark.BenchmarkRunner" />
     <module name="spring-data-eclipse-store-benchmark" />
-    <option name="VM_PARAMETERS" value="-Xmx24g --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED" />
+    <option name="VM_PARAMETERS" value="--add-opens java.base/java.util=ALL-UNNAMED" />
     <extension name="coverage">
       <pattern>
         <option name="PATTERN" value="software.xdev.spring.data.eclipse.store.benchmark.benchmarks.simple.user.*" />

.run/Run Complex Demo.run.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="Run Complex Demo" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="software.xdev.spring.data.eclipse.store.demo.complex.ComplexDemoApplication" />
     <module name="spring-data-eclipse-store-demo" />
-    <option name="VM_PARAMETERS" value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED" />
+    <option name="VM_PARAMETERS" value="--add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED" />
     <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
     <extension name="coverage">
       <pattern>

.run/Run Simple Demo.run.xml

@@ -2,7 +2,6 @@
   <configuration default="false" name="Run Simple Demo" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="software.xdev.spring.data.eclipse.store.demo.simple.SimpleDemoApplication" />
     <module name="spring-data-eclipse-store-demo" />
-    <option name="VM_PARAMETERS" value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED" />
     <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
     <extension name="coverage">
       <pattern>

README.md

@@ -76,15 +76,17 @@ more [complex demo](./spring-data-eclipse-store-demo/src/main/java/software/xdev
 > [!NOTE]  
 > Since the library is using reflection to copy data, the following JVM-Arguments may have to be set:
 > ```
-> --add-opens=java.base/java.lang=ALL-UNNAMED
-> --add-opens=java.base/java.lang.reflect=ALL-UNNAMED
 > --add-opens=java.base/java.util=ALL-UNNAMED
+> --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
+> --add-opens=java.base/java.lang=ALL-UNNAMED
 > --add-opens=java.base/java.time=ALL-UNNAMED 
 > ```
 
 
 ## Support
-If you need support as soon as possible and you can't wait for any pull request, feel free to use [our support](https://xdev.software/en/services/support).
+
+If you need support as soon as possible, and you can't wait for any pull request, feel free to
+use [our support](https://xdev.software/en/services/support).
 
 ## Contributing
 See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how to get started with our project.

spring-data-eclipse-store/pom.xml

@@ -295,10 +295,7 @@
 				<configuration>
 					<argLine>
 						--add-opens java.base/java.util=ALL-UNNAMED
-						--add-opens java.base/java.lang=ALL-UNNAMED
-						--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
 						--add-exports java.base/jdk.internal.misc=ALL-UNNAMED
-						-Djdk.reflect.useDirectMethodHandle=false
 					</argLine>
 				</configuration>
 			</plugin>

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/exceptions/MergeFailedException.java

@@ -21,7 +21,7 @@ public MergeFailedException(final Object sourceObject, final Object targetObject
 	{
 		super(
 			String.format(
-				"Could not merge values of object %s# with object %s",
+				"Could not merge values of object %s with object %s",
 				sourceObject.getClass().getName(),
 				targetObject.getClass().getName()
 			),

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

@@ -26,6 +26,8 @@
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 
+import org.eclipse.serializer.persistence.binary.jdk17.java.util.BinaryHandlerImmutableCollectionsList12;
+import org.eclipse.serializer.persistence.binary.jdk17.java.util.BinaryHandlerImmutableCollectionsSet12;
 import org.eclipse.serializer.persistence.types.Storer;
 import org.eclipse.store.integrations.spring.boot.types.EclipseStoreProvider;
 import org.eclipse.store.integrations.spring.boot.types.configuration.EclipseStoreProperties;
@@ -88,6 +90,8 @@ private synchronized void ensureEntitiesInRoot()
 			this.root = new Root();
 			final EmbeddedStorageFoundation<?> embeddedStorageFoundation =
 				this.storeProvider.createStorageFoundation(this.storeConfiguration);
+			embeddedStorageFoundation.registerTypeHandler(BinaryHandlerImmutableCollectionsSet12.New());
+			embeddedStorageFoundation.registerTypeHandler(BinaryHandlerImmutableCollectionsList12.New());
 			this.storageManager = embeddedStorageFoundation.start(this.root);
 			this.persistenceChecker = new RelayedPersistenceChecker(embeddedStorageFoundation);
 			this.initRoot();

spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/repositories/CustomerRepositoryWithNonFinalHashSet.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2023 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.repositories;
+
+import org.springframework.data.repository.CrudRepository;
+
+
+public interface CustomerRepositoryWithNonFinalHashSet extends CrudRepository<CustomerWithNonFinalHashSet, String>
+{
+}

spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/repositories/CustomerWithNonFinalHashSet.java

@@ -0,0 +1,105 @@
+/*
+ * Copyright © 2023 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.repositories;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+
+public class CustomerWithNonFinalHashSet
+{
+	private String firstName;
+	private String lastName;
+	
+	private Set<String> values = new HashSet<>();
+	
+	public CustomerWithNonFinalHashSet(final String firstName, final String lastName)
+	{
+		this.firstName = firstName;
+		this.lastName = lastName;
+	}
+	
+	public void setValues(final Set<String> values)
+	{
+		this.values = values;
+	}
+	
+	public String getFirstName()
+	{
+		return this.firstName;
+	}
+	
+	public void setFirstName(final String firstName)
+	{
+		this.firstName = firstName;
+	}
+	
+	public String getLastName()
+	{
+		return this.lastName;
+	}
+	
+	public void setLastName(final String lastName)
+	{
+		this.lastName = lastName;
+	}
+	
+	public Set<String> getValues()
+	{
+		return this.values;
+	}
+	
+	@Override
+	public String toString()
+	{
+		return String.format(
+			"Customer[firstName='%s', lastName='%s']",
+			this.firstName, this.lastName);
+	}
+	
+	@Override
+	public boolean equals(final Object o)
+	{
+		if(this == o)
+		{
+			return true;
+		}
+		if(o == null || this.getClass() != o.getClass())
+		{
+			return false;
+		}
+		final CustomerWithNonFinalHashSet customer = (CustomerWithNonFinalHashSet)o;
+		return Objects.equals(this.firstName, customer.firstName) && Objects.equals(
+			this.lastName,
+			customer.lastName);
+	}
+	
+	@Override
+	public int hashCode()
+	{
+		return Objects.hash(this.firstName, this.lastName);
+	}
+	
+	@SuppressWarnings("OptionalGetWithoutIsPresent")
+	public static CustomerWithNonFinalHashSet getCustomerWithFirstName(
+		final List<CustomerWithNonFinalHashSet> customers,
+		final String firstName)
+	{
+		return customers.stream().filter(customer -> customer.getFirstName().equals(firstName)).findFirst().get();
+	}
+}

spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/repositories/Node.java

@@ -24,7 +24,7 @@ public class Node
 {
 	private String name;
 
-	private final List<Node> children;
+	private List<Node> children;
 
 	public Node(final String name, final List<Node> children)
 	{
@@ -47,6 +47,11 @@ public void setName(final String name)
 		this.name = name;
 	}
 
+	public void setChildren(final List<Node> children)
+	{
+		this.children = children;
+	}
+	
 	public List<Node> getChildren()
 	{
 		return this.children;

spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/tests/HashSetTest.java

@@ -16,17 +16,21 @@
 package software.xdev.spring.data.eclipse.store.integration.tests;
 
 import java.util.List;
+import java.util.Set;
+
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import jakarta.inject.Inject;
 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.DefaultTestAnnotations;
 import software.xdev.spring.data.eclipse.store.integration.repositories.CustomerRepositoryWithHashSet;
+import software.xdev.spring.data.eclipse.store.integration.repositories.CustomerRepositoryWithNonFinalHashSet;
 import software.xdev.spring.data.eclipse.store.integration.repositories.CustomerWithHashSet;
+import software.xdev.spring.data.eclipse.store.integration.repositories.CustomerWithNonFinalHashSet;
 import software.xdev.spring.data.eclipse.store.repository.EclipseStoreStorage;
 
 
@@ -35,6 +39,8 @@ class HashSetTest
 {
 	@Inject
 	private CustomerRepositoryWithHashSet repository;
+	@Inject
+	private CustomerRepositoryWithNonFinalHashSet nonFinalRepository;
 
 	@Inject
 	private EclipseStoreStorage storage;
@@ -56,6 +62,109 @@ void testSaveAndFindAll()
 		);
 	}
 
+	@Test
+	void testSaveAndResaveFindAll()
+	{
+		final CustomerWithHashSet customer = new CustomerWithHashSet(TestData.FIRST_NAME, TestData.LAST_NAME);
+		customer.getValues().add("Test");
+		this.repository.save(customer);
+		
+		final CustomerWithHashSet customerWithHashSet =
+			TestUtil.iterableToList(this.repository.findAll()).stream().findFirst().get();
+		customerWithHashSet.getValues().add("Test2");
+		this.repository.save(customerWithHashSet);
+		
+		TestUtil.doBeforeAndAfterRestartOfDatastore(
+			this.storage,
+			() -> {
+				final List<CustomerWithHashSet> customers = TestUtil.iterableToList(this.repository.findAll());
+				Assertions.assertEquals(1, customers.size());
+				Assertions.assertEquals(2, customers.get(0).getValues().size());
+			}
+		);
+	}
+	
+	@Test
+	void testSaveAndFindAllNonFinal()
+	{
+		final CustomerWithNonFinalHashSet customer =
+			new CustomerWithNonFinalHashSet(TestData.FIRST_NAME, TestData.LAST_NAME);
+		customer.getValues().add("Test");
+		this.nonFinalRepository.save(customer);
+		
+		TestUtil.doBeforeAndAfterRestartOfDatastore(
+			this.storage,
+			() -> {
+				final List<CustomerWithNonFinalHashSet> customers =
+					TestUtil.iterableToList(this.nonFinalRepository.findAll());
+				Assertions.assertEquals(1, customers.size());
+				Assertions.assertEquals(1, customers.get(0).getValues().size());
+			}
+		);
+	}
+	
+	@Test
+	void testSaveAndSetAndFindAllNonFinal()
+	{
+		final CustomerWithNonFinalHashSet customer =
+			new CustomerWithNonFinalHashSet(TestData.FIRST_NAME, TestData.LAST_NAME);
+		customer.setValues(Set.of("Test"));
+		this.nonFinalRepository.save(customer);
+		
+		TestUtil.doBeforeAndAfterRestartOfDatastore(
+			this.storage,
+			() -> {
+				final List<CustomerWithNonFinalHashSet> customers =
+					TestUtil.iterableToList(this.nonFinalRepository.findAll());
+				Assertions.assertEquals(1, customers.size());
+				Assertions.assertEquals(1, customers.get(0).getValues().size());
+			}
+		);
+	}
+	
+	@Test
+	void testSaveAndResetAndFindAllNonFinal()
+	{
+		final CustomerWithNonFinalHashSet customer =
+			new CustomerWithNonFinalHashSet(TestData.FIRST_NAME, TestData.LAST_NAME);
+		customer.setValues(Set.of("Test"));
+		this.nonFinalRepository.save(customer);
+		
+		final CustomerWithNonFinalHashSet customerWithHashSet =
+			TestUtil.iterableToList(this.nonFinalRepository.findAll()).stream().findFirst().get();
+		customerWithHashSet.setValues(Set.of("Test", "Test2"));
+		this.nonFinalRepository.save(customerWithHashSet);
+		
+		TestUtil.doBeforeAndAfterRestartOfDatastore(
+			this.storage,
+			() -> {
+				final List<CustomerWithNonFinalHashSet> customers =
+					TestUtil.iterableToList(this.nonFinalRepository.findAll());
+				Assertions.assertEquals(1, customers.size());
+				Assertions.assertEquals(2, customers.get(0).getValues().size());
+			}
+		);
+	}
+	
+	@Test
+	void testSaveAndSetNullAndFindAllNonFinal()
+	{
+		final CustomerWithNonFinalHashSet customer =
+			new CustomerWithNonFinalHashSet(TestData.FIRST_NAME, TestData.LAST_NAME);
+		customer.setValues(null);
+		this.nonFinalRepository.save(customer);
+		
+		TestUtil.doBeforeAndAfterRestartOfDatastore(
+			this.storage,
+			() -> {
+				final List<CustomerWithNonFinalHashSet> customers =
+					TestUtil.iterableToList(this.nonFinalRepository.findAll());
+				Assertions.assertEquals(1, customers.size());
+				Assertions.assertNull(customers.get(0).getValues());
+			}
+		);
+	}
+	
 	// TODO: Fix this.
 	@Test
 	@Disabled("Is not fixed yet, but will be.")