-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
26 changed files
with
1,187 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
...k/cloud/kubernetes/commons/discovery/ConditionalOnHttpDiscoveryCatalogWatcherEnabled.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * Copyright 2019-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. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.cloud.kubernetes.commons.discovery; | ||
|
|
||
| import java.lang.annotation.Documented; | ||
| import java.lang.annotation.ElementType; | ||
| import java.lang.annotation.Inherited; | ||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.RetentionPolicy; | ||
| import java.lang.annotation.Target; | ||
|
|
||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; | ||
|
|
||
| /** | ||
| * Provides a more succinct conditional for: | ||
| * <code>spring.cloud.kubernetes.http.discovery.client.catalog.watcher.enabled</code>. | ||
| * | ||
| * @author wind57 | ||
| */ | ||
| @Target({ ElementType.TYPE, ElementType.METHOD }) | ||
| @Retention(RetentionPolicy.RUNTIME) | ||
| @Documented | ||
| @Inherited | ||
| @ConditionalOnProperty(value = "spring.cloud.kubernetes.http.discovery.catalog.watcher.enabled", matchIfMissing = false) | ||
| public @interface ConditionalOnHttpDiscoveryCatalogWatcherEnabled { | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
...g/springframework/cloud/kubernetes/discoveryserver/DiscoveryCatalogWatcherController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Copyright 2013-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. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.cloud.kubernetes.discoveryserver; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import reactor.core.publisher.Mono; | ||
|
|
||
| import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnHttpDiscoveryCatalogWatcherEnabled; | ||
| import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnKubernetesCatalogEnabled; | ||
| import org.springframework.cloud.kubernetes.commons.discovery.EndpointNameAndNamespace; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
|
|
||
| /** | ||
| * @author wind57 | ||
| */ | ||
| @RestController | ||
| @ConditionalOnKubernetesCatalogEnabled | ||
| @ConditionalOnHttpDiscoveryCatalogWatcherEnabled | ||
| class DiscoveryCatalogWatcherController { | ||
|
|
||
| private final HeartBeatListener heartBeatListener; | ||
|
|
||
| DiscoveryCatalogWatcherController(HeartBeatListener heartBeatListener) { | ||
| this.heartBeatListener = heartBeatListener; | ||
| } | ||
|
|
||
| @GetMapping("/state") | ||
| Mono<List<EndpointNameAndNamespace>> state() { | ||
| return Mono.defer(() -> Mono.just(heartBeatListener.lastState().get())); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
...src/main/java/org/springframework/cloud/kubernetes/discoveryserver/HeartBeatListener.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * Copyright 2013-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. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.cloud.kubernetes.discoveryserver; | ||
|
|
||
| import java.util.List; | ||
| import java.util.concurrent.atomic.AtomicReference; | ||
|
|
||
| import org.apache.commons.logging.LogFactory; | ||
|
|
||
| import org.springframework.cloud.client.discovery.event.HeartbeatEvent; | ||
| import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnHttpDiscoveryCatalogWatcherEnabled; | ||
| import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnKubernetesCatalogEnabled; | ||
| import org.springframework.cloud.kubernetes.commons.discovery.EndpointNameAndNamespace; | ||
| import org.springframework.context.ApplicationListener; | ||
| import org.springframework.core.env.Environment; | ||
| import org.springframework.core.log.LogAccessor; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.CATALOG_WATCHER_DEFAULT_DELAY; | ||
| import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.CATALOG_WATCH_PROPERTY_NAME; | ||
|
|
||
| /** | ||
| * Listener for a HeartbeatEvent that comes from KubernetesCatalogWatch. | ||
| * | ||
| * @author wind57 | ||
| */ | ||
| @Component | ||
| @ConditionalOnKubernetesCatalogEnabled | ||
| @ConditionalOnHttpDiscoveryCatalogWatcherEnabled | ||
| class HeartBeatListener implements ApplicationListener<HeartbeatEvent> { | ||
|
|
||
| private static final LogAccessor LOG = new LogAccessor(LogFactory.getLog(HeartBeatListener.class)); | ||
|
|
||
| private final AtomicReference<List<EndpointNameAndNamespace>> lastState = new AtomicReference<>(List.of()); | ||
|
|
||
| HeartBeatListener(Environment environment) { | ||
| String watchDelay = environment.getProperty(CATALOG_WATCH_PROPERTY_NAME); | ||
| if (watchDelay != null) { | ||
| LOG.debug("using delay : " + watchDelay); | ||
| } | ||
| else { | ||
| LOG.debug("using default watch delay : " + CATALOG_WATCHER_DEFAULT_DELAY); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| @SuppressWarnings("unchecked") | ||
| public void onApplicationEvent(HeartbeatEvent event) { | ||
| LOG.debug(() -> "received heartbeat event"); | ||
| List<EndpointNameAndNamespace> state = (List<EndpointNameAndNamespace>) event.getValue(); | ||
| LOG.debug(() -> "state received : " + state); | ||
| lastState.set(state); | ||
| } | ||
|
|
||
| AtomicReference<List<EndpointNameAndNamespace>> lastState() { | ||
| return lastState; | ||
| } | ||
|
|
||
| } |
47 changes: 47 additions & 0 deletions
47
...ingframework/cloud/kubernetes/discoveryserver/DiscoveryCatalogWatcherControllerTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Copyright 2013-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. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.cloud.kubernetes.discoveryserver; | ||
|
|
||
| import java.util.List; | ||
| import java.util.concurrent.atomic.AtomicReference; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.mockito.Mockito; | ||
| import reactor.test.StepVerifier; | ||
|
|
||
| import org.springframework.cloud.kubernetes.commons.discovery.EndpointNameAndNamespace; | ||
|
|
||
| /** | ||
| * @author wind57 | ||
| */ | ||
| class DiscoveryCatalogWatcherControllerTests { | ||
|
|
||
| private final HeartBeatListener heartBeatListener = Mockito.mock(HeartBeatListener.class); | ||
|
|
||
| @Test | ||
| void test() { | ||
| Mockito.when(heartBeatListener.lastState()) | ||
| .thenReturn(new AtomicReference<>(List.of(new EndpointNameAndNamespace("one", "two")))); | ||
|
|
||
| DiscoveryCatalogWatcherController catalogWatcherController = new DiscoveryCatalogWatcherController( | ||
| heartBeatListener); | ||
|
|
||
| StepVerifier.create(catalogWatcherController.state()) | ||
| .expectNext(List.of(new EndpointNameAndNamespace("one", "two"))).verifyComplete(); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.