Skip to content

Commit 3060b54

Browse files
Fix for non existing configuration
1 parent be4cc0b commit 3060b54

5 files changed

Lines changed: 47 additions & 8 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

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

Lines changed: 0 additions & 4 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

@@ -28,10 +26,8 @@
2826
* he created a different {@link EclipseStoreClientConfiguration}.
2927
*/
3028
@Configuration(proxyBeanMethods = false)
31-
@ConditionalOnMissingBean(EclipseStoreClientConfiguration.class)
3229
public class DefaultEclipseStoreClientConfiguration extends EclipseStoreClientConfiguration
3330
{
34-
@Autowired
3531
protected DefaultEclipseStoreClientConfiguration(
3632
final EclipseStoreProperties defaultEclipseStoreProperties,
3733
final EmbeddedStorageFoundationFactory defaultEclipseStoreProvider)
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)