Activate rest api for Eclipse Store in complexDemo

Author: JohannesRabauer

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.4.1
+
+* Updated EclipseStore to v2.1.0
+* Added EclipseStore-Rest-API to tests (storage-restservice-springboot)
+
 # 2.4.0
 
 * Updated org.springframework.boot.version to v3.4.0
@@ -8,6 +13,7 @@
 
 * Auto-Fix problems with adding ids to entities with existing data store.
 
+~~~~
 # 2.3.0
 
 * Add support for shutting down the storage during application shutdown

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

@@ -10,13 +10,12 @@
 import org.eclipse.store.storage.embedded.types.EmbeddedStorageFoundation;
 import org.eclipse.store.storage.embedded.types.EmbeddedStorageManager;
 import org.eclipse.store.storage.restadapter.types.StorageRestAdapter;
-import org.eclipse.store.storage.restservice.spring.boot.types.configuration.StoreDataRestServiceProperties;
-import org.eclipse.store.storage.restservice.spring.boot.types.rest.StoreDataRestController;
 import org.eclipse.store.storage.types.Storage;
 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.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -25,6 +24,7 @@
 import software.xdev.spring.data.eclipse.store.repository.config.EnableEclipseStoreRepositories;
 
 
+@ComponentScan({"org.eclipse.store.storage.restservice.spring.boot.types.rest"})
 @Configuration
 @EnableEclipseStoreRepositories
 public class ComplexConfiguration extends EclipseStoreClientConfiguration
@@ -59,25 +59,16 @@ public EmbeddedStorageFoundation<?> createEmbeddedStorageFoundation()
 		storageFoundation.getConnectionFoundation().setClassLoaderProvider(this.getClassLoaderProvider());
 		return storageFoundation;
 	}
-	
+
 	@Bean
 	@DependsOn({"embeddedStorageFoundationFactory"})
 	public Map<String, StorageRestAdapter> storageRestAdapters(final Map<String, EmbeddedStorageManager> storages)
 	{
 		return Map.of(
-			"default", StorageRestAdapter.New(this.storageInstance.getInstanceOfStorageManager())
+			"defaultStorageManager", StorageRestAdapter.New(this.storageInstance.getInstanceOfStorageManager())
 		);
 	}
 
-	@Bean
-	@DependsOn({"embeddedStorageFoundationFactory"})
-	public StoreDataRestController storageDataRestController(
-		final Map<String, StorageRestAdapter> storageRestAdapters,
-		final StoreDataRestServiceProperties properties)
-	{
-		return new StoreDataRestController(storageRestAdapters, properties);
-	}
-	
 	/**
 	 * Overriding {@link #transactionManager(ObjectProvider)} only to add the {@link Bean}-Annotation.
 	 */

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

@@ -1,19 +1,31 @@
 package software.xdev.spring.data.eclipse.store.demo.complex;
 
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
 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 org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.test.web.server.LocalServerPort;
 
 import software.xdev.spring.data.eclipse.store.demo.TestUtil;
 import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreClientConfiguration;
 
 
-@SpringBootTest(classes = ComplexDemoApplication.class)
+@SpringBootTest(
+	classes = ComplexDemoApplication.class,
+	webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT
+)
 class ComplexDemoApplicationTest
 {
+	@LocalServerPort
+	private int port;
+	@Autowired
+	private TestRestTemplate restTemplate;
+	
 	private final EclipseStoreClientConfiguration configuration;
 
 	@Autowired
@@ -34,4 +46,15 @@ void checkPossibilityToSimplyStartAndRestartApplication()
 		this.configuration.getStorageInstance().stop();
 		ComplexDemoApplication.main(new String[]{});
 	}
+	
+	@Test
+	void restEndpoint()
+	{
+		assertThat(
+			this.restTemplate.getForObject(
+				"http://localhost:" + this.port + "/store-data/default/root",
+				String.class
+			)
+		).contains("ROOT");
+	}
 }

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

@@ -0,0 +1,2 @@
+server:
+  port: 0