Skip to content
Snippets Groups Projects
Verified Commit c68ac880 authored by Dominik František Bučík's avatar Dominik František Bučík
Browse files

fix: 🐛 Fix loading conditional beans

parent 558b1a2d
No related branches found
No related tags found
1 merge request!18fix: 🐛 Fix loading conditional beans
Pipeline #265754 passed with warnings with stages
in 7 minutes and 45 seconds
...@@ -27,7 +27,7 @@ import org.springframework.validation.annotation.Validated; ...@@ -27,7 +27,7 @@ import org.springframework.validation.annotation.Validated;
@Validated @Validated
@ConstructorBinding @ConstructorBinding
@ConfigurationProperties("mock-broker") @ConfigurationProperties("mock-broker")
@ConditionalOnProperty(prefix = "mock-broker", name = "enabled") @ConditionalOnProperty(prefix = "mock-broker", name = "enabled", havingValue = "True")
public class MockBrokerProperties { public class MockBrokerProperties {
@URL @URL
......
...@@ -19,11 +19,11 @@ import org.springframework.validation.annotation.Validated; ...@@ -19,11 +19,11 @@ import org.springframework.validation.annotation.Validated;
@Getter @Getter
@ToString @ToString
@Validated
@Slf4j @Slf4j
@ConfigurationProperties(prefix = "visa-writers") @Validated
@ConditionalOnProperty(prefix = "visa-writers", name = "enabled")
@ConstructorBinding @ConstructorBinding
@ConfigurationProperties(prefix = "visa-writers")
@ConditionalOnProperty(prefix = "visa-writers", name = "enabled", havingValue = "True")
public class VisaWritersProperties implements InitializingBean { public class VisaWritersProperties implements InitializingBean {
@NotNull @NotNull
......
...@@ -18,7 +18,7 @@ import org.springframework.validation.annotation.Validated; ...@@ -18,7 +18,7 @@ import org.springframework.validation.annotation.Validated;
@Validated @Validated
@ConstructorBinding @ConstructorBinding
@ConfigurationProperties(prefix = "perun") @ConfigurationProperties(prefix = "perun")
@ConditionalOnProperty(prefix = "perun", name = "enabled") @ConditionalOnProperty(prefix = "perun", name = "enabled", havingValue = "True")
public class PerunRpcConnectorProperties { public class PerunRpcConnectorProperties {
@NotBlank @NotBlank
......
...@@ -10,6 +10,7 @@ import javax.validation.constraints.NotNull; ...@@ -10,6 +10,7 @@ import javax.validation.constraints.NotNull;
import lombok.Getter; import lombok.Getter;
import lombok.ToString; import lombok.ToString;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.ConstructorBinding; import org.springframework.boot.context.properties.ConstructorBinding;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
...@@ -21,6 +22,7 @@ import org.springframework.validation.annotation.Validated; ...@@ -21,6 +22,7 @@ import org.springframework.validation.annotation.Validated;
@Validated @Validated
@ConstructorBinding @ConstructorBinding
@ConfigurationProperties(prefix = "passport-v1-0") @ConfigurationProperties(prefix = "passport-v1-0")
@ConditionalOnProperty(prefix = "passport-v1-0", value = "enabled", havingValue = "True")
public class V1_0EndpointProperties { public class V1_0EndpointProperties {
@NotEmpty @NotEmpty
......
...@@ -7,6 +7,7 @@ import javax.validation.constraints.NotNull; ...@@ -7,6 +7,7 @@ import javax.validation.constraints.NotNull;
import lombok.Getter; import lombok.Getter;
import lombok.ToString; import lombok.ToString;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.ConstructorBinding; import org.springframework.boot.context.properties.ConstructorBinding;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -18,6 +19,7 @@ import org.springframework.validation.annotation.Validated; ...@@ -18,6 +19,7 @@ import org.springframework.validation.annotation.Validated;
@Validated @Validated
@ConstructorBinding @ConstructorBinding
@ConfigurationProperties(prefix = "passport-v1-2") @ConfigurationProperties(prefix = "passport-v1-2")
@ConditionalOnProperty(prefix = "passport-v1-2", value = "enabled", havingValue = "True")
public class V1_2EndpointProperties { public class V1_2EndpointProperties {
@NotNull @NotNull
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment