Skip to content

Commit 292d913

Browse files
csviricsviri
committed
fix: format
1 parent 6970a8e commit 292d913

File tree

7 files changed

+207
-208
lines changed

7 files changed

+207
-208
lines changed

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public class PollingEventSource<T> extends CachingFilteringEventSource<T> {
2424
private final long period;
2525

2626
public PollingEventSource(Supplier<Map<ResourceID, T>> supplier,
27-
long period, Cache<ResourceID, T> cache) {
28-
this(supplier,period,null, cache);
27+
long period, Cache<ResourceID, T> cache) {
28+
this(supplier, period, null, cache);
2929
}
3030

3131
public PollingEventSource(Supplier<Map<ResourceID, T>> supplier,

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CachingFilteringEventSourceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,13 @@ public void deleteSupportsFiltering() {
115115

116116
verify(eventHandlerMock, times(1)).handleEvent(eq(new Event(testResource1ID())));
117117
}
118-
118+
119119
public static class SimpleCachingFilteringEventSource
120120
extends CachingFilteringEventSource<SampleExternalResource> {
121121
public SimpleCachingFilteringEventSource(Cache<ResourceID, SampleExternalResource> cache,
122122
EventFilter<SampleExternalResource> eventFilter) {
123123
super(cache, eventFilter);
124124
}
125125
}
126-
126+
127127
}

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/SampleExternalResource.java

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,71 @@
11
package io.javaoperatorsdk.operator.processing.event.source;
22

3-
import io.javaoperatorsdk.operator.processing.event.ResourceID;
4-
53
import java.io.Serializable;
64
import java.util.Objects;
75

6+
import io.javaoperatorsdk.operator.processing.event.ResourceID;
7+
88
public class SampleExternalResource implements Serializable {
99

10-
public static final String DEFAULT_VALUE_1 = "value1";
11-
public static final String DEFAULT_VALUE_2 = "value2";
12-
public static final String NAME_1 = "name1";
13-
public static final String NAME_2 = "name2";
14-
15-
public static SampleExternalResource testResource1() {
16-
return new SampleExternalResource(NAME_1, DEFAULT_VALUE_1);
17-
}
18-
19-
public static SampleExternalResource testResource2() {
20-
return new SampleExternalResource(NAME_2, DEFAULT_VALUE_2);
21-
}
22-
23-
public static ResourceID testResource1ID() {
24-
return new ResourceID(NAME_1,"testns");
25-
}
26-
27-
public static ResourceID testResource2ID() {
28-
return new ResourceID(NAME_2,"testns");
29-
}
30-
31-
private String name;
32-
private String value;
33-
34-
public SampleExternalResource(String name, String value) {
35-
this.name = name;
36-
this.value = value;
37-
}
38-
39-
public String getName() {
40-
return name;
41-
}
42-
43-
public SampleExternalResource setName(String name) {
44-
this.name = name;
45-
return this;
46-
}
47-
48-
public String getValue() {
49-
return value;
50-
}
51-
52-
public SampleExternalResource setValue(String value) {
53-
this.value = value;
54-
return this;
55-
}
56-
57-
@Override
58-
public boolean equals(Object o) {
59-
if (this == o)
60-
return true;
61-
if (o == null || getClass() != o.getClass())
62-
return false;
63-
SampleExternalResource that = (SampleExternalResource) o;
64-
return Objects.equals(name, that.name) && Objects.equals(value, that.value);
65-
}
66-
67-
@Override
68-
public int hashCode() {
69-
return Objects.hash(name, value);
70-
}
71-
}
10+
public static final String DEFAULT_VALUE_1 = "value1";
11+
public static final String DEFAULT_VALUE_2 = "value2";
12+
public static final String NAME_1 = "name1";
13+
public static final String NAME_2 = "name2";
14+
15+
public static SampleExternalResource testResource1() {
16+
return new SampleExternalResource(NAME_1, DEFAULT_VALUE_1);
17+
}
18+
19+
public static SampleExternalResource testResource2() {
20+
return new SampleExternalResource(NAME_2, DEFAULT_VALUE_2);
21+
}
22+
23+
public static ResourceID testResource1ID() {
24+
return new ResourceID(NAME_1, "testns");
25+
}
26+
27+
public static ResourceID testResource2ID() {
28+
return new ResourceID(NAME_2, "testns");
29+
}
30+
31+
private String name;
32+
private String value;
33+
34+
public SampleExternalResource(String name, String value) {
35+
this.name = name;
36+
this.value = value;
37+
}
38+
39+
public String getName() {
40+
return name;
41+
}
42+
43+
public SampleExternalResource setName(String name) {
44+
this.name = name;
45+
return this;
46+
}
47+
48+
public String getValue() {
49+
return value;
50+
}
51+
52+
public SampleExternalResource setValue(String value) {
53+
this.value = value;
54+
return this;
55+
}
56+
57+
@Override
58+
public boolean equals(Object o) {
59+
if (this == o)
60+
return true;
61+
if (o == null || getClass() != o.getClass())
62+
return false;
63+
SampleExternalResource that = (SampleExternalResource) o;
64+
return Objects.equals(name, that.name) && Objects.equals(value, that.value);
65+
}
66+
67+
@Override
68+
public int hashCode() {
69+
return Objects.hash(name, value);
70+
}
71+
}

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSourceTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import io.javaoperatorsdk.operator.processing.event.EventHandler;
1818
import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
1919
import io.javaoperatorsdk.operator.processing.event.ResourceID;
20-
import io.javaoperatorsdk.operator.processing.event.source.controller.ControllerResourceEventSource;
21-
import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceAction;
2220
import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
2321

2422
import static org.mockito.ArgumentMatchers.eq;

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSourceTest.java

Lines changed: 76 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
package io.javaoperatorsdk.operator.processing.event.source.polling;
22

3-
import com.github.benmanes.caffeine.jcache.spi.CaffeineCachingProvider;
3+
import java.util.Optional;
4+
5+
import javax.cache.Cache;
6+
import javax.cache.CacheManager;
7+
import javax.cache.configuration.MutableConfiguration;
8+
import javax.cache.spi.CachingProvider;
9+
10+
import org.junit.jupiter.api.BeforeEach;
11+
import org.junit.jupiter.api.Test;
12+
413
import io.javaoperatorsdk.operator.TestUtils;
514
import io.javaoperatorsdk.operator.processing.event.EventHandler;
615
import io.javaoperatorsdk.operator.processing.event.ResourceID;
716
import io.javaoperatorsdk.operator.processing.event.source.SampleExternalResource;
817
import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceCache;
918
import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
10-
import org.junit.jupiter.api.BeforeEach;
11-
import org.junit.jupiter.api.Test;
12-
13-
import javax.cache.Cache;
14-
import javax.cache.CacheManager;
15-
import javax.cache.configuration.MutableConfiguration;
16-
import javax.cache.spi.CachingProvider;
1719

18-
import java.util.Optional;
19-
import java.util.function.Predicate;
20+
import com.github.benmanes.caffeine.jcache.spi.CaffeineCachingProvider;
2021

2122
import static org.junit.jupiter.api.Assertions.*;
2223
import static org.mockito.ArgumentMatchers.any;
@@ -25,68 +26,68 @@
2526

2627
class PerResourcePollingEventSourceTest {
2728

28-
public static final int PERIOD = 50;
29-
private PerResourcePollingEventSource<SampleExternalResource, TestCustomResource> pollingEventSource;
30-
private PerResourcePollingEventSource.ResourceSupplier<SampleExternalResource, TestCustomResource>
31-
supplier = mock(PerResourcePollingEventSource.ResourceSupplier.class);
32-
private ResourceCache<TestCustomResource> resourceCache = mock(ResourceCache.class);
33-
private Cache<ResourceID, SampleExternalResource> cache;
34-
private EventHandler eventHandler = mock(EventHandler.class);
35-
private TestCustomResource testCustomResource = TestUtils.testCustomResource();
36-
37-
@BeforeEach
38-
public void setup() {
39-
CachingProvider cachingProvider = new CaffeineCachingProvider();
40-
CacheManager cacheManager = cachingProvider.getCacheManager();
41-
cache = cacheManager.createCache("test-caching", new MutableConfiguration<>());
42-
43-
when(resourceCache.get(any())).thenReturn(Optional.of(testCustomResource));
44-
when(supplier.getResources(any())).thenReturn(Optional.of(SampleExternalResource.testResource1()));
45-
46-
pollingEventSource = new PerResourcePollingEventSource<>
47-
(supplier, resourceCache, PERIOD, cache);
48-
pollingEventSource.setEventHandler(eventHandler);
49-
}
50-
51-
@Test
52-
public void pollsTheResourceAfterAwareOfIt() throws InterruptedException {
53-
pollingEventSource.start();
54-
pollingEventSource.onResourceCreated(testCustomResource);
55-
56-
Thread.sleep(3*PERIOD);
57-
verify(supplier,atLeast(2)).getResources(eq(testCustomResource));
58-
verify(eventHandler, times(1)).handleEvent(any());
59-
}
60-
61-
@Test
62-
public void registeringTaskOnAPredicate() throws InterruptedException {
63-
pollingEventSource = new PerResourcePollingEventSource<>
64-
(supplier, resourceCache, PERIOD, cache,
65-
testCustomResource -> testCustomResource.getMetadata().getGeneration() > 1);
66-
pollingEventSource.setEventHandler(eventHandler);
67-
pollingEventSource.start();
68-
pollingEventSource.onResourceCreated(testCustomResource);
69-
Thread.sleep(2*PERIOD);
70-
71-
verify(supplier, times(0)).getResources(eq(testCustomResource));
72-
testCustomResource.getMetadata().setGeneration(2L);
73-
pollingEventSource.onResourceUpdated(testCustomResource, testCustomResource);
74-
75-
Thread.sleep(2*PERIOD);
76-
77-
verify(supplier, atLeast(1)).getResources(eq(testCustomResource));
78-
}
79-
80-
@Test
81-
public void propagateEventOnDeletedResource() throws InterruptedException {
82-
pollingEventSource.start();
83-
pollingEventSource.onResourceCreated(testCustomResource);
84-
when(supplier.getResources(any()))
85-
.thenReturn(Optional.of(SampleExternalResource.testResource1()))
86-
.thenReturn(Optional.empty());
87-
88-
Thread.sleep(3*PERIOD);
89-
verify(supplier,atLeast(2)).getResources(eq(testCustomResource));
90-
verify(eventHandler, times(2)).handleEvent(any());
91-
}
92-
}
29+
public static final int PERIOD = 50;
30+
private PerResourcePollingEventSource<SampleExternalResource, TestCustomResource> pollingEventSource;
31+
private PerResourcePollingEventSource.ResourceSupplier<SampleExternalResource, TestCustomResource> supplier =
32+
mock(PerResourcePollingEventSource.ResourceSupplier.class);
33+
private ResourceCache<TestCustomResource> resourceCache = mock(ResourceCache.class);
34+
private Cache<ResourceID, SampleExternalResource> cache;
35+
private EventHandler eventHandler = mock(EventHandler.class);
36+
private TestCustomResource testCustomResource = TestUtils.testCustomResource();
37+
38+
@BeforeEach
39+
public void setup() {
40+
CachingProvider cachingProvider = new CaffeineCachingProvider();
41+
CacheManager cacheManager = cachingProvider.getCacheManager();
42+
cache = cacheManager.createCache("test-caching", new MutableConfiguration<>());
43+
44+
when(resourceCache.get(any())).thenReturn(Optional.of(testCustomResource));
45+
when(supplier.getResources(any()))
46+
.thenReturn(Optional.of(SampleExternalResource.testResource1()));
47+
48+
pollingEventSource =
49+
new PerResourcePollingEventSource<>(supplier, resourceCache, PERIOD, cache);
50+
pollingEventSource.setEventHandler(eventHandler);
51+
}
52+
53+
@Test
54+
public void pollsTheResourceAfterAwareOfIt() throws InterruptedException {
55+
pollingEventSource.start();
56+
pollingEventSource.onResourceCreated(testCustomResource);
57+
58+
Thread.sleep(3 * PERIOD);
59+
verify(supplier, atLeast(2)).getResources(eq(testCustomResource));
60+
verify(eventHandler, times(1)).handleEvent(any());
61+
}
62+
63+
@Test
64+
public void registeringTaskOnAPredicate() throws InterruptedException {
65+
pollingEventSource = new PerResourcePollingEventSource<>(supplier, resourceCache, PERIOD, cache,
66+
testCustomResource -> testCustomResource.getMetadata().getGeneration() > 1);
67+
pollingEventSource.setEventHandler(eventHandler);
68+
pollingEventSource.start();
69+
pollingEventSource.onResourceCreated(testCustomResource);
70+
Thread.sleep(2 * PERIOD);
71+
72+
verify(supplier, times(0)).getResources(eq(testCustomResource));
73+
testCustomResource.getMetadata().setGeneration(2L);
74+
pollingEventSource.onResourceUpdated(testCustomResource, testCustomResource);
75+
76+
Thread.sleep(2 * PERIOD);
77+
78+
verify(supplier, atLeast(1)).getResources(eq(testCustomResource));
79+
}
80+
81+
@Test
82+
public void propagateEventOnDeletedResource() throws InterruptedException {
83+
pollingEventSource.start();
84+
pollingEventSource.onResourceCreated(testCustomResource);
85+
when(supplier.getResources(any()))
86+
.thenReturn(Optional.of(SampleExternalResource.testResource1()))
87+
.thenReturn(Optional.empty());
88+
89+
Thread.sleep(3 * PERIOD);
90+
verify(supplier, atLeast(2)).getResources(eq(testCustomResource));
91+
verify(eventHandler, times(2)).handleEvent(any());
92+
}
93+
}

0 commit comments

Comments
 (0)