Skip to content

Commit a038110

Browse files
committed
Adapts Autoconfiguration
1 parent f96d7c4 commit a038110

4 files changed

Lines changed: 28 additions & 4 deletions

File tree

basyx.aasregistry/basyx.aasregistry-feature-search/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/feature/search/DisableSearchAasRegistryConfiguration.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,16 @@
2525

2626
package org.eclipse.digitaltwin.basyx.aasregistry.feature.search;
2727

28+
import org.springframework.boot.actuate.autoconfigure.data.elasticsearch.ElasticsearchReactiveHealthContributorAutoConfiguration;
29+
import org.springframework.boot.actuate.autoconfigure.metrics.export.elastic.ElasticMetricsExportAutoConfiguration;
2830
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2931
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3032
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
3133
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration;
34+
import org.springframework.boot.autoconfigure.data.elasticsearch.ReactiveElasticsearchRepositoriesAutoConfiguration;
3235
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchClientAutoConfiguration;
3336
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
37+
import org.springframework.boot.autoconfigure.elasticsearch.ReactiveElasticsearchClientAutoConfiguration;
3438
import org.springframework.context.annotation.Configuration;
3539

3640
/**
@@ -43,7 +47,11 @@
4347
ElasticsearchClientAutoConfiguration.class,
4448
ElasticsearchRepositoriesAutoConfiguration.class,
4549
ElasticsearchDataAutoConfiguration.class,
46-
ElasticsearchRestClientAutoConfiguration.class
50+
ElasticsearchRestClientAutoConfiguration.class,
51+
ElasticsearchReactiveHealthContributorAutoConfiguration.class,
52+
ElasticMetricsExportAutoConfiguration.class,
53+
ReactiveElasticsearchClientAutoConfiguration.class,
54+
ReactiveElasticsearchRepositoriesAutoConfiguration.class
4755
})
4856
public class DisableSearchAasRegistryConfiguration {
4957
}

basyx.aasrepository/basyx.aasrepository-feature-search/src/main/java/org/eclipse/digitaltwin/basyx/aasrepository/feature/search/DisableSearchAasRepositoryConfiguration.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@
3030
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3131
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
3232
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration;
33+
import org.springframework.boot.autoconfigure.data.elasticsearch.ReactiveElasticsearchRepositoriesAutoConfiguration;
3334
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchClientAutoConfiguration;
3435
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
36+
import org.springframework.boot.autoconfigure.elasticsearch.ReactiveElasticsearchClientAutoConfiguration;
3537
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
3638
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
3739
import org.springframework.context.annotation.Configuration;
@@ -46,7 +48,9 @@
4648
ElasticsearchClientAutoConfiguration.class,
4749
ElasticsearchRepositoriesAutoConfiguration.class,
4850
ElasticsearchDataAutoConfiguration.class,
49-
ElasticsearchRestClientAutoConfiguration.class
51+
ElasticsearchRestClientAutoConfiguration.class,
52+
ReactiveElasticsearchClientAutoConfiguration.class,
53+
ReactiveElasticsearchRepositoriesAutoConfiguration.class
5054
})
5155
public class DisableSearchAasRepositoryConfiguration {
5256
}

basyx.submodelregistry/basyx.submodelregistry-feature-search/src/main/java/org/eclipse/digitaltwin/basyx/submodelregistry/feature/search/DisableSearchSubmodelRegistryConfiguration.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,16 @@
2525

2626
package org.eclipse.digitaltwin.basyx.submodelregistry.feature.search;
2727

28+
import org.springframework.boot.actuate.autoconfigure.data.elasticsearch.ElasticsearchReactiveHealthContributorAutoConfiguration;
29+
import org.springframework.boot.actuate.autoconfigure.metrics.export.elastic.ElasticMetricsExportAutoConfiguration;
2830
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2931
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3032
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
3133
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration;
34+
import org.springframework.boot.autoconfigure.data.elasticsearch.ReactiveElasticsearchRepositoriesAutoConfiguration;
3235
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchClientAutoConfiguration;
3336
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
37+
import org.springframework.boot.autoconfigure.elasticsearch.ReactiveElasticsearchClientAutoConfiguration;
3438
import org.springframework.context.annotation.Configuration;
3539

3640
/**
@@ -43,7 +47,11 @@
4347
ElasticsearchClientAutoConfiguration.class,
4448
ElasticsearchRepositoriesAutoConfiguration.class,
4549
ElasticsearchDataAutoConfiguration.class,
46-
ElasticsearchRestClientAutoConfiguration.class
50+
ElasticsearchRestClientAutoConfiguration.class,
51+
ElasticsearchReactiveHealthContributorAutoConfiguration.class,
52+
ElasticMetricsExportAutoConfiguration.class,
53+
ReactiveElasticsearchClientAutoConfiguration.class,
54+
ReactiveElasticsearchRepositoriesAutoConfiguration.class
4755
})
4856
public class DisableSearchSubmodelRegistryConfiguration {
4957
}

basyx.submodelrepository/basyx.submodelrepository-feature-search/src/main/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/search/DisableSearchSubmodelRepositoryConfiguration.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@
2929
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3030
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
3131
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration;
32+
import org.springframework.boot.autoconfigure.data.elasticsearch.ReactiveElasticsearchRepositoriesAutoConfiguration;
3233
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchClientAutoConfiguration;
3334
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
35+
import org.springframework.boot.autoconfigure.elasticsearch.ReactiveElasticsearchClientAutoConfiguration;
3436
import org.springframework.context.annotation.Configuration;
3537

3638
/**
@@ -43,7 +45,9 @@
4345
ElasticsearchClientAutoConfiguration.class,
4446
ElasticsearchRepositoriesAutoConfiguration.class,
4547
ElasticsearchDataAutoConfiguration.class,
46-
ElasticsearchRestClientAutoConfiguration.class
48+
ElasticsearchRestClientAutoConfiguration.class,
49+
ReactiveElasticsearchClientAutoConfiguration.class,
50+
ReactiveElasticsearchRepositoriesAutoConfiguration.class
4751
})
4852
public class DisableSearchSubmodelRepositoryConfiguration {
4953
}

0 commit comments

Comments
 (0)