Skip to content

Commit da98fcd

Browse files
aaronziaaronzi
authored
Adds experimental flag to the basyx.feature.search (AASQL) (#826)
1 parent fc127dd commit da98fcd

File tree

37 files changed

+93
-69
lines changed

37 files changed

+93
-69
lines changed

‎basyx.aasenvironment/basyx.aasenvironment.component/src/main/resources/application.properties‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,12 @@ basyx.backend = InMemory
103103
#springdoc.api-docs.enabled=false
104104

105105

106-
# basyx.aasrepository.feature.search.enabled=true
107-
# basyx.aasrepository.feature.search.indexname=aas-index-test
108-
# basyx.cdrepository.feature.search.enabled=true
109-
# basyx.cdrepository.feature.search.indexname=cd-index-test
110-
# basyx.submodelrepository.feature.search.enabled=true
111-
# basyx.submodelrepository.feature.search.indexname=sm-index-test
106+
# basyx.aasrepository.feature.experimental.search.enabled=true
107+
# basyx.aasrepository.feature.experimental.search.indexname=aas-index-test
108+
# basyx.cdrepository.feature.experimental.search.enabled=true
109+
# basyx.cdrepository.feature.experimental.search.indexname=cd-index-test
110+
# basyx.submodelrepository.feature.experimental.search.enabled=true
111+
# basyx.submodelrepository.feature.experimental.search.indexname=sm-index-test
112112
# spring.elasticsearch.uris=http://localhost:9200
113113
# spring.elasticsearch.username=elastic
114114
# spring.elasticsearch.password=vtzJFt1b

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
*
4343
*/
4444
@Configuration
45-
@ConditionalOnExpression("!(${" + SearchAasRegistryFeature.FEATURENAME + ".enabled:false} || ${basyx.feature.search.enabled:false})")
45+
@ConditionalOnExpression("!(${" + SearchAasRegistryFeature.FEATURENAME + ".enabled:false} || ${basyx.feature.experimental.search.enabled:false})")
4646
@EnableAutoConfiguration(exclude = {
4747
ElasticsearchClientAutoConfiguration.class,
4848
ElasticsearchRepositoriesAutoConfiguration.class,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import java.util.List;
4848

4949
@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2025-06-18T09:42:17.580283867Z[GMT]")
50-
@ConditionalOnExpression("#{${" + SearchAasRegistryFeature.FEATURENAME + ".enabled:false} or ${basyx.feature.search.enabled:false}}")
50+
@ConditionalOnExpression("#{${" + SearchAasRegistryFeature.FEATURENAME + ".enabled:false} or ${basyx.feature.experimental.search.enabled:false}}")
5151
@RestController
5252
public class SearchAasRegistryApiHTTPController implements SearchAasRegistryHTTPApi {
5353

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
2929
import org.springframework.context.annotation.Configuration;
3030

31-
@ConditionalOnExpression("#{${" + SearchAasRegistryFeature.FEATURENAME + ".enabled:false} or ${basyx.feature.search.enabled:false}}")
31+
@ConditionalOnExpression("#{${" + SearchAasRegistryFeature.FEATURENAME + ".enabled:false} or ${basyx.feature.experimental.search.enabled:false}}")
3232
@Configuration
3333
public class SearchAasRegistryConfiguration {
3434

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* @author jannisjung, aaronzi
3939
*/
4040
@Component
41-
@ConditionalOnExpression("#{${" + SearchAasRegistryFeature.FEATURENAME + ".enabled:false} or ${basyx.feature.search.enabled:false}}")
41+
@ConditionalOnExpression("#{${" + SearchAasRegistryFeature.FEATURENAME + ".enabled:false} or ${basyx.feature.experimental.search.enabled:false}}")
4242
public class SearchAasRegistryConfigurationGuard implements InitializingBean {
4343
private static final Logger logger = LoggerFactory.getLogger(SearchAasRegistryConfigurationGuard.class);
4444

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,18 @@
4343
*/
4444

4545
@Component
46-
@ConditionalOnExpression("#{${" + SearchAasRegistryFeature.FEATURENAME + ".enabled:false} or ${basyx.feature.search.enabled:false}}")
46+
@ConditionalOnExpression("#{${" + SearchAasRegistryFeature.FEATURENAME + ".enabled:false} or ${basyx.feature.experimental.search.enabled:false}}")
4747
@Order(1)
4848
public class SearchAasRegistryFeature implements AasRegistryStorageFeature {
49-
public final static String FEATURENAME = "basyx.aasregistry.feature.search";
49+
public final static String FEATURENAME = "basyx.aasregistry.feature.experimental.search";
5050
public static final String DEFAULT_INDEX = "aas-descr-index";
5151
private final ElasticsearchClient esclient;
5252

5353
public SearchAasRegistryFeature(ElasticsearchClient esclient) {
5454
this.esclient = esclient;
5555
}
5656

57-
@Value("#{${" + FEATURENAME + ".enabled:false} or ${basyx.feature.search.enabled:false}}")
57+
@Value("#{${" + FEATURENAME + ".enabled:false} or ${basyx.feature.experimental.search.enabled:false}}")
5858
private boolean enabled;
5959

6060
@Value("${" + FEATURENAME + ".indexname:" + DEFAULT_INDEX + "}")

‎basyx.aasregistry/basyx.aasregistry-feature-search/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/feature/search/DummySearchAasRegistryComponent.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* SPDX-License-Identifier: MIT
2424
******************************************************************************/
2525

26-
package org.eclipse.digitaltwin.basyx.aasregistry.feature.search;
26+
package org.eclipse.digitaltwin.basyx.aasregistry.feature.search;
2727

2828
import org.springframework.boot.SpringApplication;
2929
import org.springframework.boot.autoconfigure.SpringBootApplication;

‎basyx.aasregistry/basyx.aasregistry-feature-search/src/test/resources/application.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ basyx:
4949
cors:
5050
allowed-origins: "*"
5151
allowed-methods: "GET,POST,PATCH,DELETE,PUT,OPTIONS,HEAD"
52-
feature:
53-
search:
54-
enabled: true
55-
indexname: aasdesc-index-ci-test
52+
aasregistry:
53+
feature:
54+
experimental:
55+
search:
56+
enabled: true
57+
indexname: aasdesc-index-ci-test

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
*
4242
*/
4343
@Configuration
44-
@ConditionalOnExpression("!(${" + SearchAasRepositoryFeature.FEATURENAME + ".enabled:false} || ${basyx.feature.search.enabled:false})")
44+
@ConditionalOnExpression("!(${" + SearchAasRepositoryFeature.FEATURENAME + ".enabled:false} || ${basyx.feature.experimental.search.enabled:false})")
4545
@EnableAutoConfiguration(exclude = {
4646
ElasticsearchClientAutoConfiguration.class,
4747
ElasticsearchRepositoriesAutoConfiguration.class,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-01-10T15:59:05.892Z[GMT]")
4848
@RestController
49-
@ConditionalOnExpression("#{${" + SearchAasRepositoryFeature.FEATURENAME + ".enabled:false} or ${basyx.feature.search.enabled:false}}")
49+
@ConditionalOnExpression("#{${" + SearchAasRepositoryFeature.FEATURENAME + ".enabled:false} or ${basyx.feature.experimental.search.enabled:false}}")
5050
public class SearchAasRepositoryApiHTTPController implements SearchAasRepositoryHTTPApi {
5151

5252
private final ElasticsearchClient client;

0 commit comments

Comments
 (0)