Skip to content

Commit f96d7c4

Browse files
committed
Adapts application.properties
- Adapts RestControllers of Registries
1 parent 2f43b9f commit f96d7c4

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.slf4j.LoggerFactory;
3737
import org.springframework.beans.factory.annotation.Autowired;
3838
import org.springframework.beans.factory.annotation.Value;
39+
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3940
import org.springframework.http.HttpStatus;
4041
import org.springframework.http.ResponseEntity;
4142
import org.springframework.web.bind.annotation.RestController;
@@ -46,6 +47,7 @@
4647

4748
@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2025-06-18T09:42:17.580283867Z[GMT]")
4849
@RestController
50+
@ConditionalOnProperty(name = {SearchAasRegistryFeature.FEATURENAME + ".enabled", "basyx.feature.search.enabled"}, havingValue = "true", matchIfMissing = false)
4951
public class SearchAasRegistryApiHTTPController implements SearchAasRegistryHTTPApi {
5052

5153
private static final Logger log = LoggerFactory.getLogger(SearchAasRegistryApiHTTPController.class);

basyx.aasrepository/basyx.aasrepository.component/src/main/resources/application.properties

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ basyx.aasrepo.name=aas-repo
66

77
basyx.backend = InMemory
88

9-
10-
119
#basyx.backend = MongoDB
1210
#spring.data.mongodb.host=127.0.0.1
1311
#spring.data.mongodb.port=27017
@@ -65,11 +63,11 @@ basyx.backend = InMemory
6563
####################################################################################
6664
# Feature: Search
6765
####################################################################################
68-
basyx.aasrepository.feature.search.enabled=true
69-
basyx.aasrepository.feature.search.indexname=aas-index-test
70-
spring.elasticsearch.uris=http://localhost:9200
71-
spring.elasticsearch.username=elastic
72-
spring.elasticsearch.password=vtzJFt1b
66+
# basyx.aasrepository.feature.search.enabled=true
67+
# basyx.aasrepository.feature.search.indexname=aas-index-test
68+
# spring.elasticsearch.uris=http://localhost:9200
69+
# spring.elasticsearch.username=elastic
70+
# spring.elasticsearch.password=vtzJFt1b
7371

7472
####################################################################################
7573
# Disable the Swagger UI

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.slf4j.LoggerFactory;
3838
import org.springframework.beans.factory.annotation.Autowired;
3939
import org.springframework.beans.factory.annotation.Value;
40+
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
4041
import org.springframework.http.HttpStatus;
4142
import org.springframework.http.ResponseEntity;
4243
import org.springframework.web.bind.annotation.RestController;
@@ -47,6 +48,7 @@
4748

4849
@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2025-06-18T09:42:17.580283867Z[GMT]")
4950
@RestController
51+
@ConditionalOnProperty(name = {SearchSubmodelRegistryFeature.FEATURENAME + ".enabled", "basyx.feature.search.enabled"}, havingValue = "true", matchIfMissing = false)
5052
public class SearchSubmodelRegistryApiHTTPController implements SearchSubmodelRegistryHTTPApi {
5153

5254
private static final Logger log = LoggerFactory.getLogger(SearchSubmodelRegistryApiHTTPController.class);

0 commit comments

Comments
 (0)