Skip to content

Commit c33f20c

Browse files
committed
fix main imports
Signed-off-by: wind57 <[email protected]>
1 parent 63877a3 commit c33f20c

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/PodReady.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ public final class PodReady {
3737
TimeUnit.SECONDS.toMillis(10));
3838

3939
/**
40-
* The resulting CompletableFuture is completed when pod is ready according to the BooleanSupplier.
41-
* You are supposed to properly get rid of this task, but calling the other public method
42-
* getPodReadyTask and cancel it, this will take care to shutdown the executor it was running in.
40+
* The resulting CompletableFuture is completed when pod is ready according to the
41+
* BooleanSupplier. You are supposed to properly get rid of this task, but calling the
42+
* other public method getPodReadyTask and cancel it, this will take care to shutdown
43+
* the executor it was running in.
4344
*/
4445
public CompletableFuture<Void> podReady(BooleanSupplier isPodReady, String holderIdentity, String podNamespace) {
4546

spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import io.fabric8.kubernetes.client.extended.leaderelection.resourcelock.LeaseLock;
2727
import io.fabric8.kubernetes.client.extended.leaderelection.resourcelock.Lock;
2828

29-
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
3029
import org.springframework.boot.actuate.info.InfoContributor;
3130
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
3231
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -35,6 +34,7 @@
3534
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3635
import org.springframework.boot.cloud.CloudPlatform;
3736
import org.springframework.boot.context.properties.EnableConfigurationProperties;
37+
import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator;
3838
import org.springframework.cloud.kubernetes.commons.leader.election.ConditionalOnLeaderElectionEnabled;
3939
import org.springframework.cloud.kubernetes.commons.leader.election.LeaderElectionProperties;
4040
import org.springframework.context.annotation.Bean;

spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionInfoContributorIsLeaderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.springframework.beans.factory.annotation.Autowired;
4040
import org.springframework.boot.test.context.SpringBootTest;
4141
import org.springframework.boot.test.context.TestConfiguration;
42-
import org.springframework.boot.test.web.server.LocalManagementPort;
42+
import org.springframework.boot.web.server.test.LocalManagementPort;
4343
import org.springframework.cloud.kubernetes.commons.leader.LeaderUtils;
4444
import org.springframework.context.annotation.Bean;
4545
import org.springframework.context.annotation.Primary;

spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionInfoContributorIsNotLeaderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.springframework.beans.factory.annotation.Autowired;
4040
import org.springframework.boot.test.context.SpringBootTest;
4141
import org.springframework.boot.test.context.TestConfiguration;
42-
import org.springframework.boot.test.web.server.LocalManagementPort;
42+
import org.springframework.boot.web.server.test.LocalManagementPort;
4343
import org.springframework.cloud.kubernetes.commons.leader.LeaderUtils;
4444
import org.springframework.context.annotation.Bean;
4545
import org.springframework.context.annotation.Primary;

0 commit comments

Comments
 (0)