Skip to content

Commit 0c899a9

Browse files
author
Dave Syer
committed
Remove annotation and related post processor
Signed-off-by: Dave Syer <dsyer@vmware.com>
1 parent b357471 commit 0c899a9

File tree

8 files changed

+21
-202
lines changed

8 files changed

+21
-202
lines changed

spring/src/main/java/io/kubernetes/client/spring/extended/network/KubernetesEndpointsLoadBalancerProcessor.java

Lines changed: 0 additions & 89 deletions
This file was deleted.

spring/src/main/java/io/kubernetes/client/spring/extended/network/annotation/KubernetesEndpointsLoadBalanced.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

spring/src/main/java/io/kubernetes/client/spring/extended/network/config/ConditionalOnKubernetesLoadBalancerEnabled.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

spring/src/main/java/io/kubernetes/client/spring/extended/network/config/KubernetesLoadBalancerAutoConfiguration.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

spring/src/main/java/io/kubernetes/client/spring/extended/network/endpoints/PollingEndpointsGetter.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,27 @@
1212
*/
1313
package io.kubernetes.client.spring.extended.network.endpoints;
1414

15+
import java.time.Duration;
16+
1517
import com.github.benmanes.caffeine.cache.Cache;
1618
import com.github.benmanes.caffeine.cache.Caffeine;
19+
1720
import io.kubernetes.client.apimachinery.NamespaceName;
1821
import io.kubernetes.client.openapi.ApiClient;
1922
import io.kubernetes.client.openapi.ApiException;
2023
import io.kubernetes.client.openapi.apis.CoreV1Api;
2124
import io.kubernetes.client.openapi.models.V1Endpoints;
22-
import java.time.Duration;
23-
import org.springframework.beans.factory.annotation.Autowired;
2425

2526
public class PollingEndpointsGetter implements EndpointsGetter {
2627

2728
private static final Cache<NamespaceName, V1Endpoints> lastObservedEndpoints =
2829
Caffeine.newBuilder().expireAfterWrite(Duration.ofMinutes(5)).build();
2930

30-
@Autowired private ApiClient apiClient;
31+
private final ApiClient apiClient;
32+
33+
public PollingEndpointsGetter(ApiClient apiClient) {
34+
this.apiClient = apiClient;
35+
}
3136

3237
@Override
3338
public V1Endpoints get(String namespace, String name) {
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
22
io.kubernetes.client.spring.extended.controller.config.KubernetesInformerAutoConfiguration, \
33
io.kubernetes.client.spring.extended.controller.config.KubernetesReconcilerAutoConfiguration, \
4-
io.kubernetes.client.spring.extended.network.config.KubernetesLoadBalancerAutoConfiguration, \
54
io.kubernetes.client.spring.extended.manifests.config.KubernetesManifestsAutoConfiguration

spring/src/test/java/io/kubernetes/client/spring/extended/controller/KubernetesInformerCreatorTest.java

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,21 @@
2222
import static org.junit.Assert.assertEquals;
2323
import static org.junit.Assert.assertNotNull;
2424

25+
import java.util.Arrays;
26+
2527
import com.github.tomakehurst.wiremock.junit.WireMockRule;
2628
import com.google.gson.Gson;
29+
30+
import org.junit.Rule;
31+
import org.junit.Test;
32+
import org.junit.runner.RunWith;
33+
import org.springframework.beans.factory.annotation.Autowired;
34+
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
35+
import org.springframework.boot.autoconfigure.SpringBootApplication;
36+
import org.springframework.boot.test.context.SpringBootTest;
37+
import org.springframework.context.annotation.Bean;
38+
import org.springframework.test.context.junit4.SpringRunner;
39+
2740
import io.kubernetes.client.informer.SharedInformer;
2841
import io.kubernetes.client.informer.SharedInformerFactory;
2942
import io.kubernetes.client.informer.cache.Lister;
@@ -38,16 +51,6 @@
3851
import io.kubernetes.client.spring.extended.controller.annotation.KubernetesInformer;
3952
import io.kubernetes.client.spring.extended.controller.annotation.KubernetesInformers;
4053
import io.kubernetes.client.util.ClientBuilder;
41-
import java.util.Arrays;
42-
import org.junit.Rule;
43-
import org.junit.Test;
44-
import org.junit.runner.RunWith;
45-
import org.springframework.beans.factory.annotation.Autowired;
46-
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
47-
import org.springframework.boot.autoconfigure.SpringBootApplication;
48-
import org.springframework.boot.test.context.SpringBootTest;
49-
import org.springframework.context.annotation.Bean;
50-
import org.springframework.test.context.junit4.SpringRunner;
5154

5255
@RunWith(SpringRunner.class)
5356
@SpringBootTest(classes = {KubernetesInformerCreatorTest.App.class})
@@ -99,8 +102,6 @@ static class TestSharedInformerFactory extends SharedInformerFactory {}
99102

100103
@Autowired private Lister<V1ConfigMap> configMapLister;
101104

102-
@Autowired private ApiClient apiClient;
103-
104105
@Test
105106
public void testInformerInjection() throws InterruptedException {
106107
assertNotNull(podInformer);

spring/src/test/java/io/kubernetes/client/spring/extended/network/TestApplication.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@
1212
*/
1313
package io.kubernetes.client.spring.extended.network;
1414

15-
import io.kubernetes.client.spring.extended.network.config.KubernetesLoadBalancerAutoConfiguration;
1615
import org.springframework.boot.SpringBootConfiguration;
17-
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
1816

1917
@SpringBootConfiguration
20-
@ImportAutoConfiguration({
21-
KubernetesLoadBalancerAutoConfiguration.class,
22-
})
2318
public class TestApplication {}

0 commit comments

Comments
 (0)