SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reload functionality clean-up part 2 (#1033)

Browse Source
This commit is contained in:
erabii
2022-06-17 14:56:25 +03:00
committed by GitHub
parent db67cb6abc
commit cb4d6cd2c7
13 changed files with 89 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigMapWatcherChangeDetector.java
View File

@@ -41,7 +41,7 @@ public abstract class ConfigMapWatcherChangeDetector extends EventBasedConfigMap
protected Log log = LogFactory.getLog(getClass());
private ScheduledExecutorService executorService;
private final ScheduledExecutorService executorService;
protected ConfigurationWatcherConfigurationProperties k8SConfigurationProperties;

28
spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/BusEventBasedConfigMapWatcherChangeDetectorTests.java
View File

@@ -19,12 +19,12 @@ package org.springframework.cloud.kubernetes.configuration.watcher;
import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.client.KubernetesClient;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.cloud.bus.BusProperties;
import org.springframework.cloud.bus.event.RefreshRemoteApplicationEvent;
@@ -42,15 +42,17 @@ import static org.mockito.Mockito.verify;
* @author Ryan Baxter
* @author Kris Iyer
*/
@RunWith(MockitoJUnitRunner.class)
public class BusEventBasedConfigMapWatcherChangeDetectorTests {
@ExtendWith(MockitoExtension.class)
class BusEventBasedConfigMapWatcherChangeDetectorTests {
private static final ConfigurationUpdateStrategy UPDATE_STRATEGY = new ConfigurationUpdateStrategy("strategy",
() -> {
});
@Mock
private KubernetesClient client;
@Mock
private ConfigurationUpdateStrategy updateStrategy;
@Mock
private Fabric8ConfigMapPropertySourceLocator fabric8ConfigMapPropertySourceLocator;
@@ -64,20 +66,20 @@ public class BusEventBasedConfigMapWatcherChangeDetectorTests {
private BusProperties busProperties;
@Before
public void setup() {
@BeforeEach
void setup() {
MockEnvironment mockEnvironment = new MockEnvironment();
ConfigReloadProperties configReloadProperties = new ConfigReloadProperties();
ConfigurationWatcherConfigurationProperties configurationWatcherConfigurationProperties = new ConfigurationWatcherConfigurationProperties();
busProperties = new BusProperties();
changeDetector = new BusEventBasedConfigMapWatcherChangeDetector(mockEnvironment, configReloadProperties,
client, updateStrategy, fabric8ConfigMapPropertySourceLocator, busProperties,
client, UPDATE_STRATEGY, fabric8ConfigMapPropertySourceLocator, busProperties,
configurationWatcherConfigurationProperties, threadPoolTaskExecutor);
changeDetector.setApplicationEventPublisher(applicationEventPublisher);
}
@Test
public void triggerRefreshWithConfigMap() {
void triggerRefreshWithConfigMap() {
ObjectMeta objectMeta = new ObjectMeta();
objectMeta.setName("foo");
ConfigMap configMap = new ConfigMap();

32
spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/BusEventBasedSecretsWatcherChangeDetectorTests.java
View File

@@ -19,12 +19,12 @@ package org.springframework.cloud.kubernetes.configuration.watcher;
import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.api.model.Secret;
import io.fabric8.kubernetes.client.KubernetesClient;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.cloud.bus.BusProperties;
import org.springframework.cloud.bus.event.RefreshRemoteApplicationEvent;
@@ -42,15 +42,17 @@ import static org.mockito.Mockito.verify;
* @author Ryan Baxter
* @author Kris Iyer
*/
@RunWith(MockitoJUnitRunner.class)
public class BusEventBasedSecretsWatcherChangeDetectorTests {
@ExtendWith(MockitoExtension.class)
class BusEventBasedSecretsWatcherChangeDetectorTests {
private static final ConfigurationUpdateStrategy UPDATE_STRATEGY = new ConfigurationUpdateStrategy("strategy",
() -> {
});
@Mock
private KubernetesClient client;
@Mock
private ConfigurationUpdateStrategy updateStrategy;
@Mock
private Fabric8SecretsPropertySourceLocator fabric8SecretsPropertySourceLocator;
@@ -62,24 +64,22 @@ public class BusEventBasedSecretsWatcherChangeDetectorTests {
private BusEventBasedSecretsWatcherChangeDetector changeDetector;
private ConfigurationWatcherConfigurationProperties configurationWatcherConfigurationProperties;
private BusProperties busProperties;
@Before
public void setup() {
@BeforeEach
void setup() {
MockEnvironment mockEnvironment = new MockEnvironment();
ConfigReloadProperties configReloadProperties = new ConfigReloadProperties();
configurationWatcherConfigurationProperties = new ConfigurationWatcherConfigurationProperties();
ConfigurationWatcherConfigurationProperties configurationWatcherConfigurationProperties = new ConfigurationWatcherConfigurationProperties();
busProperties = new BusProperties();
changeDetector = new BusEventBasedSecretsWatcherChangeDetector(mockEnvironment, configReloadProperties, client,
updateStrategy, fabric8SecretsPropertySourceLocator, busProperties,
UPDATE_STRATEGY, fabric8SecretsPropertySourceLocator, busProperties,
configurationWatcherConfigurationProperties, threadPoolTaskExecutor);
changeDetector.setApplicationEventPublisher(applicationEventPublisher);
}
@Test
public void triggerRefreshWithSecret() {
void triggerRefreshWithSecret() {
ObjectMeta objectMeta = new ObjectMeta();
objectMeta.setName("foo");
Secret secret = new Secret();

6
spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherConfigurationPropertiesTests.java
View File

@@ -16,17 +16,17 @@
package org.springframework.cloud.kubernetes.configuration.watcher;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Ryan Baxter
*/
public class ConfigurationWatcherConfigurationPropertiesTests {
class ConfigurationWatcherConfigurationPropertiesTests {
@Test
public void setActuatorPath() {
void setActuatorPath() {
ConfigurationWatcherConfigurationProperties properties = new ConfigurationWatcherConfigurationProperties();
properties.setActuatorPath("foo");
assertThat(properties.getActuatorPath()).isEqualTo("/foo");