Merge pull request #77 from xdev-software/develop

v1.0.6

Author: JohannesRabauer

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.0.6
+
+* Fixed problem with missing configuration
+
+# 1.0.5
+
+* Added support for transactions
+
 # 1.0.4
 
 * Added possibility to use multiple storages

docs/antora.yml

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

docs/modules/ROOT/pages/transactions.adoc

@@ -1,6 +1,6 @@
 = Transactions
 
-[quote,https://docs.spring.io/spring-framework/reference/data-access/transaction.html[spring - Transaction Management]]
+[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.

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

@@ -20,7 +20,6 @@
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ConfigurableApplicationContext;
 
 
 @SpringBootApplication
@@ -41,8 +40,7 @@ public ComplexDemoApplication(
 
 	public static void main(final String[] args)
 	{
-		final ConfigurableApplicationContext run = SpringApplication.run(ComplexDemoApplication.class, args);
-		run.close();
+		SpringApplication.run(ComplexDemoApplication.class, args);
 	}
 
 	@Override

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

@@ -5,7 +5,6 @@
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ConfigurableApplicationContext;
 
 import software.xdev.spring.data.eclipse.store.demo.dual.storage.invoice.Invoice;
 import software.xdev.spring.data.eclipse.store.demo.dual.storage.invoice.InvoiceRepository;
@@ -30,8 +29,7 @@ public DualStorageDemoApplication(
 
 	public static void main(final String[] args)
 	{
-		final ConfigurableApplicationContext run = SpringApplication.run(DualStorageDemoApplication.class, args);
-		run.close();
+		SpringApplication.run(DualStorageDemoApplication.class, args);
 	}
 
 	@Override

spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/simple/SimpleDemoApplication.java

@@ -21,7 +21,6 @@
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ConfigurableApplicationContext;
 
 import software.xdev.spring.data.eclipse.store.repository.config.EnableEclipseStoreRepositories;
 
@@ -45,8 +44,7 @@ public SimpleDemoApplication(
 
 	public static void main(final String[] args)
 	{
-		final ConfigurableApplicationContext run = SpringApplication.run(SimpleDemoApplication.class, args);
-		run.close();
+		SpringApplication.run(SimpleDemoApplication.class, args);
 	}
 
 	@Override

spring-data-eclipse-store-jpa/src/main/java/software/xdev/spring/data/eclipse/store/jpa/JpaDemoApplication.java

@@ -21,7 +21,6 @@
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ConfigurableApplicationContext;
 
 import software.xdev.spring.data.eclipse.store.repository.config.EnableEclipseStoreRepositories;
 
@@ -50,8 +49,7 @@ public JpaDemoApplication(
 
 	public static void main(final String[] args)
 	{
-		final ConfigurableApplicationContext run = SpringApplication.run(JpaDemoApplication.class, args);
-		run.close();
+		SpringApplication.run(JpaDemoApplication.class, args);
 	}
 
 	@Override

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

@@ -17,8 +17,6 @@
 
 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.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Configuration;
 
 
@@ -27,11 +25,8 @@
  * of the {@link Configuration}-Annotation. It's mostly used to check if the user wants the default implementation or if
  * he created a different {@link EclipseStoreClientConfiguration}.
  */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnMissingBean(EclipseStoreClientConfiguration.class)
 public class DefaultEclipseStoreClientConfiguration extends EclipseStoreClientConfiguration
 {
-	@Autowired
 	protected DefaultEclipseStoreClientConfiguration(
 		final EclipseStoreProperties defaultEclipseStoreProperties,
 		final EmbeddedStorageFoundationFactory defaultEclipseStoreProvider)

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

@@ -0,0 +1,36 @@
+/*
+ * 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.repository.config;
+
+import org.eclipse.store.integrations.spring.boot.types.configuration.EclipseStoreProperties;
+import org.eclipse.store.integrations.spring.boot.types.factories.EmbeddedStorageFoundationFactory;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+
+@Component
+public class DefaultEclipseStoreClientConfigurationFactory
+{
+	@Bean
+	@ConditionalOnMissingBean(EclipseStoreClientConfiguration.class)
+	public DefaultEclipseStoreClientConfiguration getDefaultConfiguration(
+		final EclipseStoreProperties defaultEclipseStoreProperties,
+		final EmbeddedStorageFoundationFactory defaultEclipseStoreProvider)
+	{
+		return new DefaultEclipseStoreClientConfiguration(defaultEclipseStoreProperties, defaultEclipseStoreProvider);
+	}
+}

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

@@ -104,7 +104,6 @@ private EclipseStoreClientConfiguration ensureConfiguration()
 	 */
 	private EclipseStoreClientConfiguration createConfiguration()
 	{
-		Objects.requireNonNull(this.configurationClass);
 		Objects.requireNonNull(this.beanFactory);
 		try
 		{