Skip to content

Commit b906549

Browse files
csviricsviri
committed
apply works
Signed-off-by: Attila Mészáros <[email protected]>
1 parent 56e55c7 commit b906549

File tree

472 files changed

+3546
-2940
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

472 files changed

+3546
-2940
lines changed

‎bootstrapper-maven-plugin/pom.xml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
6-
<artifactId>java-operator-sdk</artifactId>
76
<groupId>io.javaoperatorsdk</groupId>
7+
<artifactId>java-operator-sdk</artifactId>
88
<version>5.0.0-SNAPSHOT</version>
99
</parent>
1010

@@ -72,29 +72,29 @@
7272
</dependencies>
7373

7474
<build>
75-
<plugins>
76-
<plugin>
77-
<groupId>org.apache.maven.plugins</groupId>
78-
<artifactId>maven-plugin-plugin</artifactId>
79-
<version>${maven-plugin-plugin.version}</version>
80-
<configuration>
81-
<goalPrefix>josdk-bootstrapper</goalPrefix>
82-
</configuration>
83-
</plugin>
84-
<plugin>
85-
<groupId>org.codehaus.mojo</groupId>
86-
<artifactId>templating-maven-plugin</artifactId>
87-
<version>${templating-maven-plugin.version}</version>
88-
<executions>
89-
<execution>
90-
<id>filtering-java-templates</id>
91-
<goals>
92-
<goal>filter-sources</goal>
93-
</goals>
94-
</execution>
95-
</executions>
96-
</plugin>
75+
<plugins>
76+
<plugin>
77+
<groupId>org.apache.maven.plugins</groupId>
78+
<artifactId>maven-plugin-plugin</artifactId>
79+
<version>${maven-plugin-plugin.version}</version>
80+
<configuration>
81+
<goalPrefix>josdk-bootstrapper</goalPrefix>
82+
</configuration>
83+
</plugin>
84+
<plugin>
85+
<groupId>org.codehaus.mojo</groupId>
86+
<artifactId>templating-maven-plugin</artifactId>
87+
<version>${templating-maven-plugin.version}</version>
88+
<executions>
89+
<execution>
90+
<id>filtering-java-templates</id>
91+
<goals>
92+
<goal>filter-sources</goal>
93+
</goals>
94+
</execution>
95+
</executions>
96+
</plugin>
9797

98-
</plugins>
98+
</plugins>
9999
</build>
100100
</project>

‎bootstrapper-maven-plugin/src/main/java/io/javaoperatorsdk/boostrapper/Bootstrapper.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
package io.javaoperatorsdk.boostrapper;
22

3-
import com.github.mustachejava.DefaultMustacheFactory;
4-
import com.github.mustachejava.MustacheFactory;
5-
import io.javaoperatorsdk.bootstrapper.Versions;
63
import java.io.File;
74
import java.io.FileWriter;
85
import java.io.IOException;
96
import java.util.Arrays;
107
import java.util.List;
118
import java.util.Map;
129
import java.util.stream.Collectors;
10+
1311
import org.apache.commons.io.FileUtils;
1412
import org.slf4j.Logger;
1513
import org.slf4j.LoggerFactory;
1614

15+
import io.javaoperatorsdk.bootstrapper.Versions;
16+
17+
import com.github.mustachejava.DefaultMustacheFactory;
18+
import com.github.mustachejava.MustacheFactory;
19+
1720
public class Bootstrapper {
1821

1922
private static final Logger log = LoggerFactory.getLogger(Bootstrapper.class);

‎bootstrapper-maven-plugin/src/main/java/io/javaoperatorsdk/boostrapper/BootstrapperMojo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.javaoperatorsdk.boostrapper;
22

33
import java.io.File;
4+
45
import org.apache.maven.plugin.AbstractMojo;
56
import org.apache.maven.plugin.MojoExecutionException;
67
import org.apache.maven.plugins.annotations.Mojo;

‎bootstrapper-maven-plugin/src/test/java/io/javaoperatorsdk/bootstrapper/BootstrapperTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package io.javaoperatorsdk.bootstrapper;
22

3-
import static org.assertj.core.api.Assertions.assertThat;
4-
5-
import io.javaoperatorsdk.boostrapper.Bootstrapper;
63
import java.io.BufferedReader;
74
import java.io.File;
85
import java.io.IOException;
96
import java.io.InputStreamReader;
7+
108
import org.junit.jupiter.api.Test;
119
import org.slf4j.Logger;
1210
import org.slf4j.LoggerFactory;
1311

12+
import io.javaoperatorsdk.boostrapper.Bootstrapper;
13+
14+
import static org.assertj.core.api.Assertions.assertThat;
15+
1416
class BootstrapperTest {
1517

1618
private static final Logger log = LoggerFactory.getLogger(BootstrapperTest.class);

‎caffeine-bounded-cache-support/pom.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
54
<parent>
6-
<artifactId>java-operator-sdk</artifactId>
75
<groupId>io.javaoperatorsdk</groupId>
6+
<artifactId>java-operator-sdk</artifactId>
87
<version>5.0.0-SNAPSHOT</version>
98
</parent>
10-
<modelVersion>4.0.0</modelVersion>
119

1210
<artifactId>caffeine-bounded-cache-support</artifactId>
1311
<name>Operator SDK - Caffeine Bounded Cache Support</name>
@@ -65,10 +63,10 @@
6563
However, this is needed to compile the tests so let's disable apt just for the compile phase -->
6664
<execution>
6765
<id>default-compile</id>
68-
<phase>compile</phase>
6966
<goals>
7067
<goal>compile</goal>
7168
</goals>
69+
<phase>compile</phase>
7270
<configuration>
7371
<compilerArgs>
7472
<arg>-proc:none</arg>
@@ -80,4 +78,4 @@
8078
</plugins>
8179
</build>
8280

83-
</project>
81+
</project>

‎caffeine-bounded-cache-support/src/main/java/io/javaoperatorsdk/operator/processing/event/source/cache/CaffeineBoundedItemStores.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package io.javaoperatorsdk.operator.processing.event.source.cache;
22

3-
import com.github.benmanes.caffeine.cache.Cache;
4-
import com.github.benmanes.caffeine.cache.Caffeine;
3+
import java.time.Duration;
4+
55
import io.fabric8.kubernetes.api.model.HasMetadata;
66
import io.fabric8.kubernetes.client.KubernetesClient;
7-
import java.time.Duration;
7+
8+
import com.github.benmanes.caffeine.cache.Cache;
9+
import com.github.benmanes.caffeine.cache.Caffeine;
810

911
/**
1012
* A factory for <a href="https://github.com/ben-manes/caffeine">Caffeine</a>-backed

‎caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/BoundedCacheTestBase.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
package io.javaoperatorsdk.operator.processing.event.source.cache;
22

3-
import static io.javaoperatorsdk.operator.processing.event.source.cache.sample.AbstractTestReconciler.DATA_KEY;
4-
import static org.assertj.core.api.Assertions.assertThat;
5-
import static org.awaitility.Awaitility.await;
3+
import java.time.Duration;
4+
import java.util.stream.IntStream;
5+
6+
import org.junit.jupiter.api.Test;
7+
import org.slf4j.Logger;
8+
import org.slf4j.LoggerFactory;
69

710
import io.fabric8.kubernetes.api.model.ConfigMap;
811
import io.fabric8.kubernetes.client.CustomResource;
912
import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
1013
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestSpec;
1114
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestStatus;
12-
import java.time.Duration;
13-
import java.util.stream.IntStream;
14-
import org.junit.jupiter.api.Test;
15-
import org.slf4j.Logger;
16-
import org.slf4j.LoggerFactory;
15+
16+
import static io.javaoperatorsdk.operator.processing.event.source.cache.sample.AbstractTestReconciler.DATA_KEY;
17+
import static org.assertj.core.api.Assertions.assertThat;
18+
import static org.awaitility.Awaitility.await;
1719

1820
public abstract class BoundedCacheTestBase<P extends CustomResource<BoundedCacheTestSpec, BoundedCacheTestStatus>> {
1921

‎caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/CaffeineBoundedCacheClusterScopeIT.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
package io.javaoperatorsdk.operator.processing.event.source.cache;
22

3-
import static io.javaoperatorsdk.operator.processing.event.source.cache.sample.AbstractTestReconciler.boundedItemStore;
3+
import java.time.Duration;
4+
5+
import org.junit.jupiter.api.extension.RegisterExtension;
46

57
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
68
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
79
import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
810
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.clusterscope.BoundedCacheClusterScopeTestCustomResource;
911
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.clusterscope.BoundedCacheClusterScopeTestReconciler;
1012
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestSpec;
11-
import java.time.Duration;
12-
import org.junit.jupiter.api.extension.RegisterExtension;
13+
14+
import static io.javaoperatorsdk.operator.processing.event.source.cache.sample.AbstractTestReconciler.boundedItemStore;
1315

1416
public class CaffeineBoundedCacheClusterScopeIT
1517
extends BoundedCacheTestBase<BoundedCacheClusterScopeTestCustomResource> {

‎caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/CaffeineBoundedCacheNamespacedIT.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
package io.javaoperatorsdk.operator.processing.event.source.cache;
22

3-
import static io.javaoperatorsdk.operator.processing.event.source.cache.sample.AbstractTestReconciler.boundedItemStore;
3+
import java.time.Duration;
4+
5+
import org.junit.jupiter.api.extension.RegisterExtension;
46

57
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
68
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
79
import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
810
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestCustomResource;
911
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestReconciler;
1012
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestSpec;
11-
import java.time.Duration;
12-
import org.junit.jupiter.api.extension.RegisterExtension;
13+
14+
import static io.javaoperatorsdk.operator.processing.event.source.cache.sample.AbstractTestReconciler.boundedItemStore;
1315

1416
class CaffeineBoundedCacheNamespacedIT
1517
extends BoundedCacheTestBase<BoundedCacheTestCustomResource> {

‎caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/sample/AbstractTestReconciler.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package io.javaoperatorsdk.operator.processing.event.source.cache.sample;
22

3-
import com.github.benmanes.caffeine.cache.Cache;
4-
import com.github.benmanes.caffeine.cache.Caffeine;
3+
import java.time.Duration;
4+
import java.util.Map;
5+
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
8+
59
import io.fabric8.kubernetes.api.model.ConfigMap;
610
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
711
import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -19,10 +23,9 @@
1923
import io.javaoperatorsdk.operator.processing.event.source.cache.sample.namespacescope.BoundedCacheTestStatus;
2024
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
2125
import io.javaoperatorsdk.operator.processing.event.source.informer.Mappers;
22-
import java.time.Duration;
23-
import java.util.Map;
24-
import org.slf4j.Logger;
25-
import org.slf4j.LoggerFactory;
26+
27+
import com.github.benmanes.caffeine.cache.Cache;
28+
import com.github.benmanes.caffeine.cache.Caffeine;
2629

2730
public abstract class AbstractTestReconciler<P extends CustomResource<BoundedCacheTestSpec, BoundedCacheTestStatus>>
2831
implements Reconciler<P> {

‎micrometer-support/pom.xml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
54
<parent>
6-
<artifactId>java-operator-sdk</artifactId>
75
<groupId>io.javaoperatorsdk</groupId>
6+
<artifactId>java-operator-sdk</artifactId>
87
<version>5.0.0-SNAPSHOT</version>
98
</parent>
10-
<modelVersion>4.0.0</modelVersion>
119

1210
<artifactId>micrometer-support</artifactId>
1311
<name>Operator SDK - Micrometer Support</name>
14-
12+
1513
<dependencies>
1614
<dependency>
1715
<groupId>io.micrometer</groupId>
@@ -37,9 +35,9 @@
3735
<scope>test</scope>
3836
</dependency>
3937
<dependency>
40-
<groupId>org.awaitility</groupId>
41-
<artifactId>awaitility</artifactId>
42-
<scope>test</scope>
38+
<groupId>org.awaitility</groupId>
39+
<artifactId>awaitility</artifactId>
40+
<scope>test</scope>
4341
</dependency>
4442
<dependency>
4543
<groupId>io.javaoperatorsdk</groupId>
@@ -54,4 +52,4 @@
5452
</dependency>
5553
</dependencies>
5654

57-
</project>
55+
</project>

‎micrometer-support/src/main/java/io/javaoperatorsdk/operator/monitoring/micrometer/MicrometerMetrics.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
package io.javaoperatorsdk.operator.monitoring.micrometer;
22

3-
import static io.javaoperatorsdk.operator.api.reconciler.Constants.CONTROLLER_NAME;
3+
import java.util.*;
4+
import java.util.concurrent.ConcurrentHashMap;
5+
import java.util.concurrent.Executors;
6+
import java.util.concurrent.ScheduledExecutorService;
7+
import java.util.concurrent.TimeUnit;
8+
import java.util.concurrent.atomic.AtomicInteger;
49

510
import io.fabric8.kubernetes.api.model.HasMetadata;
611
import io.javaoperatorsdk.operator.OperatorException;
@@ -16,12 +21,8 @@
1621
import io.micrometer.core.instrument.MeterRegistry;
1722
import io.micrometer.core.instrument.Tag;
1823
import io.micrometer.core.instrument.Timer;
19-
import java.util.*;
20-
import java.util.concurrent.ConcurrentHashMap;
21-
import java.util.concurrent.Executors;
22-
import java.util.concurrent.ScheduledExecutorService;
23-
import java.util.concurrent.TimeUnit;
24-
import java.util.concurrent.atomic.AtomicInteger;
24+
25+
import static io.javaoperatorsdk.operator.api.reconciler.Constants.CONTROLLER_NAME;
2526

2627
public class MicrometerMetrics implements Metrics {
2728

‎micrometer-support/src/test/java/io/javaoperatorsdk/operator/monitoring/micrometer/AbstractMicrometerMetricsTestFixture.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package io.javaoperatorsdk.operator.monitoring.micrometer;
22

3-
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.awaitility.Awaitility.await;
3+
import java.util.HashSet;
4+
import java.util.Set;
5+
6+
import org.junit.jupiter.api.Test;
7+
import org.junit.jupiter.api.TestInstance;
8+
import org.junit.jupiter.api.extension.RegisterExtension;
59

610
import io.fabric8.kubernetes.api.model.ConfigMap;
711
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
@@ -10,11 +14,9 @@
1014
import io.javaoperatorsdk.operator.processing.event.ResourceID;
1115
import io.micrometer.core.instrument.Meter;
1216
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
13-
import java.util.HashSet;
14-
import java.util.Set;
15-
import org.junit.jupiter.api.Test;
16-
import org.junit.jupiter.api.TestInstance;
17-
import org.junit.jupiter.api.extension.RegisterExtension;
17+
18+
import static org.assertj.core.api.Assertions.assertThat;
19+
import static org.awaitility.Awaitility.await;
1820

1921
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2022
public abstract class AbstractMicrometerMetricsTestFixture {

‎micrometer-support/src/test/java/io/javaoperatorsdk/operator/monitoring/micrometer/DefaultBehaviorIT.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package io.javaoperatorsdk.operator.monitoring.micrometer;
22

3-
import static org.assertj.core.api.Assertions.assertThat;
3+
import java.util.Collections;
4+
import java.util.Set;
45

56
import io.javaoperatorsdk.operator.processing.event.ResourceID;
67
import io.micrometer.core.instrument.Meter;
7-
import java.util.Collections;
8-
import java.util.Set;
8+
9+
import static org.assertj.core.api.Assertions.assertThat;
910

1011
public class DefaultBehaviorIT extends AbstractMicrometerMetricsTestFixture {
1112
@Override

0 commit comments

Comments
 (0)