Skip to content

Commit

Permalink
Merge pull request #34347 from acktsap
Browse files Browse the repository at this point in the history
* pr/34347:
  Polish "Back off if a custom ApplicationAvailability bean is present"
  Back off if a custom ApplicationAvailability bean is present

Closes gh-34347
  • Loading branch information
snicoll committed Apr 19, 2023
2 parents 098d338 + 1b832d8 commit da10c4e
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,6 +17,8 @@
package org.springframework.boot.autoconfigure.availability;

import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.availability.ApplicationAvailability;
import org.springframework.boot.availability.ApplicationAvailabilityBean;
import org.springframework.context.annotation.Bean;

Expand All @@ -25,13 +27,15 @@
* {@link ApplicationAvailabilityBean}.
*
* @author Brian Clozel
* @author Taeik Lim
* @since 2.3.0
*/
@AutoConfiguration
public class ApplicationAvailabilityAutoConfiguration {

@Bean
public ApplicationAvailabilityBean applicationAvailability() {
@ConditionalOnMissingBean
public ApplicationAvailability applicationAvailability() {
return new ApplicationAvailabilityBean();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,41 @@
* limitations under the License.
*/

package org.springframework.boot.autoconfigure.kubernetes;
package org.springframework.boot.autoconfigure.availability;

import org.junit.jupiter.api.Test;

import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.availability.ApplicationAvailabilityAutoConfiguration;
import org.springframework.boot.availability.ApplicationAvailability;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;

/**
* Tests for {@link ApplicationAvailabilityAutoConfiguration}
*
* @author Brian Clozel
* @author Taeik Lim
*/
class ApplicationAvailabilityAutoConfigurationTests {

private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ApplicationAvailabilityAutoConfiguration.class));

@Test
void providerIsPresent() {
this.contextRunner.run(((context) -> assertThat(context).hasSingleBean(ApplicationAvailability.class)));
void providerIsPresentWhenNotRegistered() {
this.contextRunner.run(((context) -> assertThat(context).hasSingleBean(ApplicationAvailability.class)
.hasBean("applicationAvailability")));
}

@Test
void providerIsNotConfiguredWhenCustomOneIsPresent() {
this.contextRunner
.withBean("customApplicationAvailability", ApplicationAvailability.class,
() -> mock(ApplicationAvailability.class))
.run(((context) -> assertThat(context).hasSingleBean(ApplicationAvailability.class)
.hasBean("customApplicationAvailability")));
}

}

0 comments on commit da10c4e

Please sign in to comment.