Skip to content

Commit 24184fe

Browse files
JohannesRabauerJohannesRabauer
authored
Merge pull request #77 from xdev-software/develop
v1.0.6
2 parents b3065d2 + 7a46626 commit 24184fe

10 files changed

Lines changed: 52 additions & 22 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# 1.0.6
2+
3+
* Fixed problem with missing configuration
4+
5+
# 1.0.5
6+
7+
* Added support for transactions
8+
19
# 1.0.4
210

311
* Added possibility to use multiple storages

‎docs/antora.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
name: ROOT
22
title: Spring-Data-Eclipse-Store
33
version: master
4-
display_version: '1.0.5'
4+
display_version: '1.0.6'
55
start_page: index.adoc
66
nav:
77
- modules/ROOT/nav.adoc
88
asciidoc:
99
attributes:
1010
product-name: 'Spring-Data-Eclipse-Store'
11-
display-version: '1.0.5'
12-
maven-version: '1.0.5'
11+
display-version: '1.0.6'
12+
maven-version: '1.0.6'
1313
page-editable: false
1414
page-out-of-support: false

‎docs/modules/ROOT/pages/transactions.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
= Transactions
22

3-
[quote,https://docs.spring.io/spring-framework/reference/data-access/transaction.html[spring - Transaction Management]]
3+
[quote, 'https://docs.spring.io/spring-framework/reference/data-access/transaction.html[Spring - Transaction Management]']
44

55
____
66
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‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.springframework.boot.CommandLineRunner;
2121
import org.springframework.boot.SpringApplication;
2222
import org.springframework.boot.autoconfigure.SpringBootApplication;
23-
import org.springframework.context.ConfigurableApplicationContext;
2423

2524

2625
@SpringBootApplication
@@ -41,8 +40,7 @@ public ComplexDemoApplication(
4140

4241
public static void main(final String[] args)
4342
{
44-
final ConfigurableApplicationContext run = SpringApplication.run(ComplexDemoApplication.class, args);
45-
run.close();
43+
SpringApplication.run(ComplexDemoApplication.class, args);
4644
}
4745

4846
@Override

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.springframework.boot.CommandLineRunner;
66
import org.springframework.boot.SpringApplication;
77
import org.springframework.boot.autoconfigure.SpringBootApplication;
8-
import org.springframework.context.ConfigurableApplicationContext;
98

109
import software.xdev.spring.data.eclipse.store.demo.dual.storage.invoice.Invoice;
1110
import software.xdev.spring.data.eclipse.store.demo.dual.storage.invoice.InvoiceRepository;
@@ -30,8 +29,7 @@ public DualStorageDemoApplication(
3029

3130
public static void main(final String[] args)
3231
{
33-
final ConfigurableApplicationContext run = SpringApplication.run(DualStorageDemoApplication.class, args);
34-
run.close();
32+
SpringApplication.run(DualStorageDemoApplication.class, args);
3533
}
3634

3735
@Override

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.springframework.boot.CommandLineRunner;
2222
import org.springframework.boot.SpringApplication;
2323
import org.springframework.boot.autoconfigure.SpringBootApplication;
24-
import org.springframework.context.ConfigurableApplicationContext;
2524

2625
import software.xdev.spring.data.eclipse.store.repository.config.EnableEclipseStoreRepositories;
2726

@@ -45,8 +44,7 @@ public SimpleDemoApplication(
4544

4645
public static void main(final String[] args)
4746
{
48-
final ConfigurableApplicationContext run = SpringApplication.run(SimpleDemoApplication.class, args);
49-
run.close();
47+
SpringApplication.run(SimpleDemoApplication.class, args);
5048
}
5149

5250
@Override

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.springframework.boot.CommandLineRunner;
2222
import org.springframework.boot.SpringApplication;
2323
import org.springframework.boot.autoconfigure.SpringBootApplication;
24-
import org.springframework.context.ConfigurableApplicationContext;
2524

2625
import software.xdev.spring.data.eclipse.store.repository.config.EnableEclipseStoreRepositories;
2726

@@ -50,8 +49,7 @@ public JpaDemoApplication(
5049

5150
public static void main(final String[] args)
5251
{
53-
final ConfigurableApplicationContext run = SpringApplication.run(JpaDemoApplication.class, args);
54-
run.close();
52+
SpringApplication.run(JpaDemoApplication.class, args);
5553
}
5654

5755
@Override

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
import org.eclipse.store.integrations.spring.boot.types.configuration.EclipseStoreProperties;
1919
import org.eclipse.store.integrations.spring.boot.types.factories.EmbeddedStorageFoundationFactory;
20-
import org.springframework.beans.factory.annotation.Autowired;
21-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2220
import org.springframework.context.annotation.Configuration;
2321

2422

@@ -27,11 +25,8 @@
2725
* of the {@link Configuration}-Annotation. It's mostly used to check if the user wants the default implementation or if
2826
* he created a different {@link EclipseStoreClientConfiguration}.
2927
*/
30-
@Configuration(proxyBeanMethods = false)
31-
@ConditionalOnMissingBean(EclipseStoreClientConfiguration.class)
3228
public class DefaultEclipseStoreClientConfiguration extends EclipseStoreClientConfiguration
3329
{
34-
@Autowired
3530
protected DefaultEclipseStoreClientConfiguration(
3631
final EclipseStoreProperties defaultEclipseStoreProperties,
3732
final EmbeddedStorageFoundationFactory defaultEclipseStoreProvider)

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*
2+
* Copyright © 2024 XDEV Software (https://xdev.software)
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package software.xdev.spring.data.eclipse.store.repository.config;
17+
18+
import org.eclipse.store.integrations.spring.boot.types.configuration.EclipseStoreProperties;
19+
import org.eclipse.store.integrations.spring.boot.types.factories.EmbeddedStorageFoundationFactory;
20+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
21+
import org.springframework.context.annotation.Bean;
22+
import org.springframework.stereotype.Component;
23+
24+
25+
@Component
26+
public class DefaultEclipseStoreClientConfigurationFactory
27+
{
28+
@Bean
29+
@ConditionalOnMissingBean(EclipseStoreClientConfiguration.class)
30+
public DefaultEclipseStoreClientConfiguration getDefaultConfiguration(
31+
final EclipseStoreProperties defaultEclipseStoreProperties,
32+
final EmbeddedStorageFoundationFactory defaultEclipseStoreProvider)
33+
{
34+
return new DefaultEclipseStoreClientConfiguration(defaultEclipseStoreProperties, defaultEclipseStoreProvider);
35+
}
36+
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ private EclipseStoreClientConfiguration ensureConfiguration()
104104
*/
105105
private EclipseStoreClientConfiguration createConfiguration()
106106
{
107-
Objects.requireNonNull(this.configurationClass);
108107
Objects.requireNonNull(this.beanFactory);
109108
try
110109
{

0 commit comments

Comments
 (0)