Merge pull request #132 from xdev-software/develop

v2.0.1

Author: JohannesRabauer

.gitignore

@@ -65,7 +65,10 @@ hs_err_pid*
 storage
 storage-person
 storage-invoice
-storage-jpa
+storage-complex
+storage-eclipsestore
+spring-data-eclipse-store-jpa/storage-h2.mv.db
+spring-data-eclipse-store-jpa/storage-h2.trace.db
 
 # == IntelliJ ==
 *.iml
@@ -86,4 +89,3 @@ storage-jpa
 .idea/codeStyles/*
 !.idea/codeStyles/codeStyleConfig.xml
 !.idea/codeStyles/Project.xml
-/spring-data-eclipse-store-demo/storage-complex

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.1
+
+* Fix for Issue [#131](https://github.com/xdev-software/spring-data-eclipse-store/issues/131)
+
 # 2.0.0
 
 * Restructured root to improve performance with IDs in entities

pom.xml

@@ -93,12 +93,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.3.0</version>
+								<version>7.4.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.3.0</version>
+								<version>7.4.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

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

@@ -22,6 +22,9 @@
 @EnableEclipseStoreRepositories
 public class ComplexConfiguration extends EclipseStoreClientConfiguration
 {
+	
+	public static final String STORAGE_PATH = "storage-complex";
+	
 	@Autowired
 	public ComplexConfiguration(
 		final EclipseStoreProperties defaultEclipseStoreProperties,
@@ -42,7 +45,7 @@ public ComplexConfiguration(
 	@Override
 	public EmbeddedStorageFoundation<?> createEmbeddedStorageFoundation()
 	{
-		return EmbeddedStorage.Foundation(Storage.Configuration(Storage.FileProvider(Path.of("storage-complex"))));
+		return EmbeddedStorage.Foundation(Storage.Configuration(Storage.FileProvider(Path.of(STORAGE_PATH))));
 	}
 
 	/**

spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/dual/storage/invoice/PersistenceInvoiceConfiguration.java

@@ -24,6 +24,8 @@
 public class PersistenceInvoiceConfiguration extends EclipseStoreClientConfiguration
 {
 
+	public static final String STORAGE_PATH = "storage-invoice";
+	
 	@Autowired
 	protected PersistenceInvoiceConfiguration(
 		final EclipseStoreProperties defaultEclipseStoreProperties,
@@ -43,6 +45,6 @@ protected PersistenceInvoiceConfiguration(
 	@Override
 	public EmbeddedStorageFoundation<?> createEmbeddedStorageFoundation()
 	{
-		return EmbeddedStorage.Foundation(Storage.Configuration(Storage.FileProvider(Path.of("storage-invoice"))));
+		return EmbeddedStorage.Foundation(Storage.Configuration(Storage.FileProvider(Path.of(STORAGE_PATH))));
 	}
 }

spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/dual/storage/person/PersistencePersonConfiguration.java

@@ -22,6 +22,8 @@
 @EnableEclipseStoreRepositories
 public class PersistencePersonConfiguration extends EclipseStoreClientConfiguration
 {
+	public static final String STORAGE_PATH = "storage-person";
+	
 	private final EmbeddedStorageFoundationFactory foundation;
 	private final EclipseStoreProperties properties;
 
@@ -49,7 +51,7 @@ public EmbeddedStorageFoundation<?> createEmbeddedStorageFoundation()
 	{
 		final ConfigurationPair additionalProperties = new ConfigurationPair(
 			EmbeddedStorageConfigurationPropertyNames.STORAGE_DIRECTORY,
-			"storage-person");
+			STORAGE_PATH);
 		return this.foundation.createStorageFoundation(this.properties, additionalProperties);
 	}
 }

spring-data-eclipse-store-demo/src/test/java/software/xdev/spring/data/eclipse/store/demo/TestUtil.java

@@ -0,0 +1,47 @@
+/*
+ * 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.demo;
+
+import java.io.File;
+
+import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreClientConfiguration;
+
+
+public final class TestUtil
+{
+	public static boolean deleteDirectory(final File directoryToDelete)
+	{
+		final File[] allContents = directoryToDelete.listFiles();
+		if(allContents != null)
+		{
+			for(final File file : allContents)
+			{
+				deleteDirectory(file);
+			}
+		}
+		return directoryToDelete.delete();
+	}
+	
+	public static void restartDatastore(final EclipseStoreClientConfiguration configuration)
+	{
+		configuration.getStorageInstance().stop();
+		// Storage starts automatically again, if the repo is accessed
+	}
+	
+	private TestUtil()
+	{
+	}
+}

spring-data-eclipse-store-demo/src/test/java/software/xdev/spring/data/eclipse/store/demo/complex/ComplexDemoApplicationTest.java

@@ -1,17 +1,37 @@
 package software.xdev.spring.data.eclipse.store.demo.complex;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.io.File;
 
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import software.xdev.spring.data.eclipse.store.demo.TestUtil;
+import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreClientConfiguration;
+
 
 @SpringBootTest(classes = ComplexDemoApplication.class)
 class ComplexDemoApplicationTest
 {
+	private final EclipseStoreClientConfiguration configuration;
+	
+	@Autowired
+	public ComplexDemoApplicationTest(final ComplexConfiguration configuration)
+	{
+		this.configuration = configuration;
+	}
+	
+	@BeforeAll
+	static void clearPreviousData()
+	{
+		TestUtil.deleteDirectory(new File("./" + ComplexConfiguration.STORAGE_PATH));
+	}
+	
 	@Test
-	void checkPossibilityToSimplyStartApplication()
+	void checkPossibilityToSimplyStartAndRestartApplication()
 	{
-		assertTrue(true);
+		this.configuration.getStorageInstance().stop();
+		ComplexDemoApplication.main(new String[]{});
 	}
 }

spring-data-eclipse-store-demo/src/test/java/software/xdev/spring/data/eclipse/store/demo/simple/SimpleDemoApplicationTest.java

@@ -1,17 +1,39 @@
 package software.xdev.spring.data.eclipse.store.demo.simple;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.io.File;
 
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import software.xdev.spring.data.eclipse.store.demo.TestUtil;
+import software.xdev.spring.data.eclipse.store.repository.config.DefaultEclipseStoreClientConfiguration;
+import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreClientConfiguration;
+
 
 @SpringBootTest(classes = SimpleDemoApplication.class)
 class SimpleDemoApplicationTest
 {
+	public static final String STORAGE_PATH = "storage";
+	private final EclipseStoreClientConfiguration configuration;
+	
+	@Autowired
+	public SimpleDemoApplicationTest(final DefaultEclipseStoreClientConfiguration configuration)
+	{
+		this.configuration = configuration;
+	}
+	
+	@BeforeAll
+	static void clearPreviousData()
+	{
+		TestUtil.deleteDirectory(new File("./" + STORAGE_PATH));
+	}
+	
 	@Test
-	void checkPossibilityToSimplyStartApplication()
+	void checkPossibilityToSimplyStartAndRestartApplication()
 	{
-		assertTrue(true);
+		this.configuration.getStorageInstance().stop();
+		SimpleDemoApplication.main(new String[]{});
 	}
 }

spring-data-eclipse-store-jpa/src/main/resources/application.properties

@@ -1 +1,3 @@
-org.eclipse.store.storage-directory=./storage-jpa
+org.eclipse.store.storage-directory=./storage-eclipsestore
+spring.datasource.url=jdbc:h2:file:./storage-h2;
+spring.jpa.hibernate.ddl-auto=update