Skip to content

Commit 41d1f56

Browse files
committed
Adds missing ConditionalOnExpression
1 parent a038110 commit 41d1f56

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.slf4j.LoggerFactory;
3030
import org.springframework.beans.factory.InitializingBean;
3131
import org.springframework.beans.factory.annotation.Value;
32+
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
3233
import org.springframework.stereotype.Component;
3334

3435
/**
@@ -37,6 +38,7 @@
3738
* @author jannisjung, aaronzi
3839
*/
3940
@Component
41+
@ConditionalOnExpression("#{${" + SearchAasRegistryFeature.FEATURENAME + ".enabled:false} or ${basyx.feature.search.enabled:false}}")
4042
public class SearchAasRegistryConfigurationGuard implements InitializingBean {
4143
private static final Logger logger = LoggerFactory.getLogger(SearchAasRegistryConfigurationGuard.class);
4244

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.slf4j.LoggerFactory;
3030
import org.springframework.beans.factory.InitializingBean;
3131
import org.springframework.beans.factory.annotation.Value;
32+
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
3233
import org.springframework.stereotype.Component;
3334

3435
/**
@@ -37,6 +38,7 @@
3738
* @author jannisjung, aaronzi
3839
*/
3940
@Component
41+
@ConditionalOnExpression("#{${" + SearchSubmodelRegistryFeature.FEATURENAME + ".enabled:false} or ${basyx.feature.search.enabled:false}}")
4042
public class SearchSubmodelRegistryConfigurationGuard implements InitializingBean {
4143
private static final Logger logger = LoggerFactory.getLogger(SearchSubmodelRegistryConfigurationGuard.class);
4244

0 commit comments

Comments
 (0)