Skip to content

Commit b0b992d

Browse files
authored
Fix autoconfiguration to repair CI build. (spring-attic#2185)
This fixes minor errors with Spring Cloud GCP autoconfiguration to repair the travis build.
1 parent 9c6cf54 commit b0b992d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/pubsub/health/PubSubHealthIndicatorAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* @since 1.3
3838
*/
3939
@Configuration
40-
@ConditionalOnClass(HealthIndicator.class)
40+
@ConditionalOnClass({HealthIndicator.class, PubSubTemplate.class})
4141
@ConditionalOnEnabledHealthIndicator("pubsub")
4242
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
4343
@AutoConfigureAfter(GcpPubSubAutoConfiguration.class)

spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/security/FirebaseAuthenticationAutoConfiguration.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2424
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
25+
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2526
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2627
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2728
import org.springframework.boot.autoconfigure.security.oauth2.resource.servlet.OAuth2ResourceServerAutoConfiguration;
@@ -48,6 +49,7 @@
4849
* @since 1.3
4950
*/
5051
@Configuration
52+
@ConditionalOnClass(JwtIssuerValidator.class)
5153
@ConditionalOnProperty(value = "spring.cloud.gcp.security.firebase.enabled", matchIfMissing = true)
5254
@AutoConfigureBefore(OAuth2ResourceServerAutoConfiguration.class)
5355
@AutoConfigureAfter(GcpContextAutoConfiguration.class)
@@ -67,7 +69,7 @@ public DelegatingOAuth2TokenValidator<Jwt> firebaseJwtDelegatingValidator(JwtIss
6769
}
6870

6971
@Bean
70-
@ConditionalOnMissingBean
72+
@ConditionalOnMissingBean(name = "firebaseAuthenticationJwtDecoder")
7173
public JwtDecoder firebaseAuthenticationJwtDecoder(
7274
DelegatingOAuth2TokenValidator<Jwt> firebaseJwtDelegatingValidator,
7375
FirebaseAuthenticationProperties properties) {

0 commit comments

Comments
 (0)