Skip to content

Commit eef06df

Browse files
brendandburnsbrendandburns
committed
Update to the latest sundr generator.
1 parent 672431f commit eef06df

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed

‎.github/workflows/maven.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ jobs:
4040
uses: actions/[email protected]
4141
with:
4242
path: ~/.m2/repository
43-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
43+
key: ${{ runner.os }}-mvn-${{ hashFiles('pom.xml', '**/pom.xml') }}
4444
restore-keys: |
45-
${{ runner.os }}-maven-
45+
${{ runner.os }}-mvn-
4646
- name: Build with Maven
4747
run: mvn -q test -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
4848
build-graalvm:

‎extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventAggregator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414

1515
import com.github.benmanes.caffeine.cache.Cache;
1616
import com.github.benmanes.caffeine.cache.Caffeine;
17-
import io.kubernetes.client.fluent.Function;
1817
import io.kubernetes.client.openapi.models.CoreV1Event;
1918
import io.kubernetes.client.openapi.models.CoreV1EventBuilder;
2019
import io.kubernetes.client.openapi.models.V1ObjectMetaBuilder;
2120
import java.time.OffsetDateTime;
2221
import java.util.HashSet;
2322
import java.util.Objects;
2423
import java.util.Set;
24+
import java.util.function.Function;
2525
import org.apache.commons.lang3.tuple.MutablePair;
2626

2727
public class EventAggregator {

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<jsr305.version>3.0.2</jsr305.version>
5252
<okhttp3.version>4.9.1</okhttp3.version>
5353
<swagger-core.version>1.6.2</swagger-core.version>
54-
<sundrio.version>0.22.1</sundrio.version>
54+
<sundrio.version>0.40.1</sundrio.version>
5555
<gsonfire.version>1.8.5</gsonfire.version>
5656
<apache.commons.lang3.version>3.12.0</apache.commons.lang3.version>
5757
<apache.commons.collections4.version>4.4</apache.commons.collections4.version>

‎util/src/main/java/io/kubernetes/client/util/labels/LabelSelector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
*/
1313
package io.kubernetes.client.util.labels;
1414

15-
import io.kubernetes.client.fluent.Predicate;
1615
import java.util.Arrays;
1716
import java.util.Map;
17+
import java.util.function.Predicate;
1818
import java.util.stream.Collectors;
1919

2020
/**
@@ -49,7 +49,7 @@ public static LabelSelector empty() {
4949
private LabelMatcher[] labelMatchers;
5050

5151
@Override
52-
public Boolean apply(Map<String, String> labels) {
52+
public boolean test(Map<String, String> labels) {
5353
return Arrays.stream(labelMatchers)
5454
.allMatch(matcher -> matcher.test(labels.get(matcher.getKey())));
5555
}

‎util/src/test/java/io/kubernetes/client/util/labels/LabelSelectorTest.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ public class LabelSelectorTest {
2626
public void normalLabelSelectionEqualShouldWork() {
2727
LabelSelector labelSelector = LabelSelector.and(equal("foo", "v1"));
2828
assertTrue(
29-
labelSelector.apply(
29+
labelSelector.test(
3030
new HashMap<String, String>() {
3131
{
3232
put("foo", "v1");
3333
}
3434
}));
3535
assertFalse(
36-
labelSelector.apply(
36+
labelSelector.test(
3737
new HashMap<String, String>() {
3838
{
3939
put("foo", "v2");
@@ -46,14 +46,14 @@ public void normalLabelSelectionEqualShouldWork() {
4646
public void normalLabelSelectionNotEqualShouldWork() {
4747
LabelSelector labelSelector = LabelSelector.and(notEqual("foo", "v1"));
4848
assertTrue(
49-
labelSelector.apply(
49+
labelSelector.test(
5050
new HashMap<String, String>() {
5151
{
5252
put("foo", "v2");
5353
}
5454
}));
5555
assertFalse(
56-
labelSelector.apply(
56+
labelSelector.test(
5757
new HashMap<String, String>() {
5858
{
5959
put("foo", "v1");
@@ -66,21 +66,21 @@ public void normalLabelSelectionNotEqualShouldWork() {
6666
public void normalLabelSelectionInShouldWork() {
6767
LabelSelector labelSelector = LabelSelector.and(in("foo", "v1", "v2"));
6868
assertTrue(
69-
labelSelector.apply(
69+
labelSelector.test(
7070
new HashMap<String, String>() {
7171
{
7272
put("foo", "v1");
7373
}
7474
}));
7575
assertTrue(
76-
labelSelector.apply(
76+
labelSelector.test(
7777
new HashMap<String, String>() {
7878
{
7979
put("foo", "v2");
8080
}
8181
}));
8282
assertFalse(
83-
labelSelector.apply(
83+
labelSelector.test(
8484
new HashMap<String, String>() {
8585
{
8686
put("foo", "v3");
@@ -93,21 +93,21 @@ public void normalLabelSelectionInShouldWork() {
9393
public void normalLabelSelectionNotInShouldWork() {
9494
LabelSelector labelSelector = LabelSelector.and(notIn("foo", "v1", "v2"));
9595
assertFalse(
96-
labelSelector.apply(
96+
labelSelector.test(
9797
new HashMap<String, String>() {
9898
{
9999
put("foo", "v1");
100100
}
101101
}));
102102
assertFalse(
103-
labelSelector.apply(
103+
labelSelector.test(
104104
new HashMap<String, String>() {
105105
{
106106
put("foo", "v2");
107107
}
108108
}));
109109
assertTrue(
110-
labelSelector.apply(
110+
labelSelector.test(
111111
new HashMap<String, String>() {
112112
{
113113
put("foo", "v3");
@@ -120,22 +120,22 @@ public void normalLabelSelectionNotInShouldWork() {
120120
public void normalLabelSelectionConjuctionShouldWork() {
121121
LabelSelector labelSelector = LabelSelector.and(in("foo", "v1", "v2"), equal("fok", "v1"));
122122
assertTrue(
123-
labelSelector.apply(
123+
labelSelector.test(
124124
new HashMap<String, String>() {
125125
{
126126
put("foo", "v1");
127127
put("fok", "v1");
128128
}
129129
}));
130130
assertFalse(
131-
labelSelector.apply(
131+
labelSelector.test(
132132
new HashMap<String, String>() {
133133
{
134134
put("foo", "v2");
135135
}
136136
}));
137137
assertFalse(
138-
labelSelector.apply(
138+
labelSelector.test(
139139
new HashMap<String, String>() {
140140
{
141141
put("fok", "v1");
@@ -148,15 +148,15 @@ public void normalLabelSelectionConjuctionShouldWork() {
148148
public void normalLabelSelectionExistsShouldWork() {
149149
LabelSelector labelSelector = LabelSelector.and(exists("foo"));
150150
assertTrue(
151-
labelSelector.apply(
151+
labelSelector.test(
152152
new HashMap<String, String>() {
153153
{
154154
put("foo", "v1");
155155
}
156156
}));
157-
assertFalse(labelSelector.apply(new HashMap<String, String>()));
157+
assertFalse(labelSelector.test(new HashMap<String, String>()));
158158
assertFalse(
159-
labelSelector.apply(
159+
labelSelector.test(
160160
new HashMap<String, String>() {
161161
{
162162
put("fok", "v1");
@@ -169,15 +169,15 @@ public void normalLabelSelectionExistsShouldWork() {
169169
public void normalLabelSelectionNotExistsShouldWork() {
170170
LabelSelector labelSelector = LabelSelector.and(notExists("foo"));
171171
assertFalse(
172-
labelSelector.apply(
172+
labelSelector.test(
173173
new HashMap<String, String>() {
174174
{
175175
put("foo", "v1");
176176
}
177177
}));
178-
assertTrue(labelSelector.apply(new HashMap<String, String>()));
178+
assertTrue(labelSelector.test(new HashMap<String, String>()));
179179
assertTrue(
180-
labelSelector.apply(
180+
labelSelector.test(
181181
new HashMap<String, String>() {
182182
{
183183
put("fok", "v1");
@@ -190,7 +190,7 @@ public void normalLabelSelectionNotExistsShouldWork() {
190190
public void emptyLabelSelectorShouldWork() {
191191
LabelSelector labelSelector = LabelSelector.empty();
192192
assertTrue(
193-
labelSelector.apply(
193+
labelSelector.test(
194194
new HashMap<String, String>() {
195195
{
196196
put("foo", "v1");

0 commit comments

Comments
 (0)