Merge pull request #75 from xdev-software/develop

v1.0.5

Author: JohannesRabauer

README.md

@@ -51,7 +51,8 @@ instructions** are in the documentation](https://xdev-software.github.io/spring-
 | Spring-Data-Eclipse-Store | Java   | Spring Data | EclipseStore |
 |---------------------------|--------|-------------|--------------|
 | ``<= 1.0.2``              | ``17`` | ``3.2.2``   | ``1.1.0``    |
-| ``>= 1.0.3``              | ``17`` | ``3.2.3``   | ``1.2.0``    |
+| ``1.0.3/1.0.4``           | ``17`` | ``3.2.3``   | ``1.2.0``    |
+| ``>= 1.0.5``              | ``17`` | ``3.2.5``   | ``1.3.2``    |
 
 ## Demo
 

docs/antora.yml

@@ -1,14 +1,14 @@
 name: ROOT
 title: Spring-Data-Eclipse-Store
 version: master
-display_version: '1.0.3'
+display_version: '1.0.5'
 start_page: index.adoc
 nav:
   - modules/ROOT/nav.adoc
 asciidoc:
   attributes:
     product-name: 'Spring-Data-Eclipse-Store'
-    display-version: '1.0.3'
-    maven-version: '1.0.3'
+    display-version: '1.0.5'
+    maven-version: '1.0.5'
     page-editable: false
     page-out-of-support: false

docs/modules/ROOT/nav.adoc

@@ -3,5 +3,6 @@
 * xref:configuration.adoc[Configuration]
 * xref:working-copies.adoc[Working Copies]
 * xref:lazies.adoc[Lazy References]
+* xref:transactions.adoc[Transactions]
 * xref:migration.adoc[Migration]
 * xref:known-issues.adoc[Known issues]

docs/modules/ROOT/pages/configuration.adoc

@@ -15,7 +15,7 @@ import org.eclipse.store.storage.embedded.types.EmbeddedStorageFoundation;
 import org.eclipse.store.storage.types.Storage;
 ...
 @Configuration
-@EnableEclipseStoreRepositories(clientConfigurationClass = DemoConfiguration.class)
+@EnableEclipseStoreRepositories
 public class DemoConfiguration extends EclipseStoreClientConfiguration
 {
     @Override

docs/modules/ROOT/pages/installation.adoc

@@ -23,9 +23,10 @@ Also see the https://github.com/xdev-software/spring-data-eclipse-store/releases
 
 After adding the library in your dependencies, using it is as easy as adding the ``@EnableEclipseStoreRepositories`` annotation to your ``@SpringBootApplication`` annotation.
 
-[NOTE]
-====
-Since the library is using reflection to copy data, the following JVM-Arguments may have to be set.
+=== Merge behavior
+
+To merge data of the xref:working-copies.adoc[working copy] into the original object graph, the library is using reflection.
+Therefore, the following *JVM-Arguments* may have to be set:
 
 [source,title="JVM Arguments"]
 ----
@@ -34,6 +35,11 @@ Since the library is using reflection to copy data, the following JVM-Arguments
 --add-opens=java.base/java.lang=ALL-UNNAMED
 --add-opens=java.base/java.time=ALL-UNNAMED
 ----
+
+[NOTE]
+====
+To access ``private`` variables, the library uses reflection and sets the access level to ``public`` (see https://github.com/xdev-software/spring-data-eclipse-store/blob/develop/spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/access/modifier/FieldAccessibleMaker.java[FieldAccessibleMaker]).
+For performance reasons, *this change stays permanent* during runtime.
 ====
 
 == Demo

docs/modules/ROOT/pages/lazies.adoc

@@ -31,7 +31,7 @@ public class Owner extends Person
 	//...
 ----
 
-== Internas
+== Internals
 
 SpringDataEclipseStoreLazies work as a proxy for the EclipseStore-Lazies.
 As far as EclipseStore is concerned, a SpringDataEclipseStoreLazy-Object is a normal Java object that contains a Lazy-Reference.

docs/modules/ROOT/pages/transactions.adoc

@@ -0,0 +1,62 @@
+= Transactions
+
+[quote,https://docs.spring.io/spring-framework/reference/data-access/transaction.html[spring - Transaction Management]]
+
+____
+Comprehensive transaction support is among the *most compelling reasons* to use the Spring Framework.
+____
+
+That's why we implemented *Spring Transactions*.
+
+Just like Spring JPA you can use https://docs.spring.io/spring-framework/reference/data-access/transaction/declarative.html[declarative] or https://docs.spring.io/spring-framework/reference/data-access/transaction/programmatic.html[programmatic] transaction management.
+
+[source,java,title="https://github.com/xdev-software/spring-data-eclipse-store/blob/develop/spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/complex/VetService.java[Declarative example from complex demo]"]
+----
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+//...
+@Service
+@Transactional
+public class VetService
+{
+    //...
+	public void saveNewEntries()
+	{
+		final Vet vet = this.createVet();
+		this.vetRepository.save(vet);
+	}
+	//...
+----
+
+[source,java,title="https://github.com/xdev-software/spring-data-eclipse-store/blob/develop/spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/complex/OwnerService.java[Programmatic example from complex demo]"]
+----
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.PlatformTransactionManager;
+//...
+@Service
+public class OwnerService
+{
+    private final PlatformTransactionManager transactionManager;
+
+    @Autowired
+    public OwnerService(
+        final OwnerRepository ownerRepository,
+        final PlatformTransactionManager transactionManager)
+    {
+        this.ownerRepository = ownerRepository;
+        this.transactionManager = transactionManager;
+    }
+    //...
+    public void deleteAll()
+    {
+        new TransactionTemplate(this.transactionManager).execute(
+            status ->
+            {
+                this.ownerRepository.deleteAll();
+                return null;
+            });
+    }
+    //...
+----
+
+CAUTION: If you are using transaction, you need to define a ``Bean`` for ``PlatformTransactionManager``! This is easiest achieved by extending the ``EclipseStoreClientConfiguration``. See https://github.com/xdev-software/spring-data-eclipse-store/blob/develop/spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/complex/ComplexConfiguration.java[the complex demo].

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

@@ -20,7 +20,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <org.springframework.boot.version>3.2.3</org.springframework.boot.version>
+        <org.springframework.boot.version>3.2.5</org.springframework.boot.version>
         <jmh.version>1.37</jmh.version>
     </properties>
 

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

@@ -23,7 +23,7 @@
 
 		<mainClass>software.xdev.spring.data.eclipse.store.demo.complex.ComplexDemoApplication</mainClass>
 
-		<org.springframework.boot.version>3.2.3</org.springframework.boot.version>
+		<org.springframework.boot.version>3.2.5</org.springframework.boot.version>
 	</properties>
 
 	<dependencyManagement>

spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/complex/ComplexConfiguration.java

@@ -0,0 +1,40 @@
+package software.xdev.spring.data.eclipse.store.demo.complex;
+
+import org.eclipse.store.integrations.spring.boot.types.configuration.EclipseStoreProperties;
+import org.eclipse.store.integrations.spring.boot.types.factories.EmbeddedStorageFoundationFactory;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizers;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreClientConfiguration;
+import software.xdev.spring.data.eclipse.store.repository.config.EnableEclipseStoreRepositories;
+
+
+@Configuration
+@EnableEclipseStoreRepositories
+public class ComplexConfiguration extends EclipseStoreClientConfiguration
+{
+	@Autowired
+	public ComplexConfiguration(
+		final EclipseStoreProperties defaultEclipseStoreProperties,
+		final EmbeddedStorageFoundationFactory defaultEclipseStoreProvider
+	)
+	{
+		super(defaultEclipseStoreProperties, defaultEclipseStoreProvider);
+	}
+	
+	/**
+	 * Overriding {@link #transactionManager(ObjectProvider)} only to add the {@link Bean}-Annotation.
+	 */
+	@Bean
+	@Override
+	public PlatformTransactionManager transactionManager(
+		final ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers
+	)
+	{
+		return super.transactionManager(transactionManagerCustomizers);
+	}
+}