Skip to content

Commit b98af3f

Browse files
wind57wind57
committed
fix
1 parent 9947014 commit b98af3f

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapErrorOnReadingSourceTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ void namedSingleConfigMapFails() {
112112

113113
stubFor(get(path).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
114114

115-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), List.of(),
115+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
116116
Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);
117117

118118
CoreV1Api api = new CoreV1Api();
@@ -157,7 +157,7 @@ void namedTwoConfigMapsOneFails(CapturedOutput output) {
157157
ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(configMapNameTwo, namespace,
158158
Map.of(), null, null, null);
159159

160-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
160+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
161161
List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
162162
RetryProperties.DEFAULT);
163163

@@ -203,7 +203,7 @@ void namedTwoConfigMapsBothFail(CapturedOutput output) {
203203
ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(configMapNameTwo, namespace,
204204
Map.of(), null, null, null);
205205

206-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
206+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
207207
List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
208208
RetryProperties.DEFAULT);
209209

@@ -248,7 +248,7 @@ void labeledSingleConfigMapFails(CapturedOutput output) {
248248
ConfigMapConfigProperties.Source configMapSource = new ConfigMapConfigProperties.Source(null, namespace, labels,
249249
null, null, null);
250250

251-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
251+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
252252
List.of(configMapSource), labels, true, null, namespace, false, true, false, RetryProperties.DEFAULT);
253253

254254
CoreV1Api api = new CoreV1Api();
@@ -300,7 +300,7 @@ void labeledTwoConfigMapsOneFails(CapturedOutput output) {
300300
ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(null, namespace,
301301
configMapTwoLabels, null, null, null);
302302

303-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
303+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
304304
List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
305305
false, RetryProperties.DEFAULT);
306306

@@ -355,7 +355,7 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
355355
ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(null, namespace,
356356
configMapTwoLabels, null, null, null);
357357

358-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
358+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
359359
List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
360360
false, RetryProperties.DEFAULT);
361361

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapErrorOnReadingSourceTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void namedSingleConfigMapFails() {
7373

7474
mockServer.expect().withPath(path).andReturn(500, "Internal Server Error").once();
7575

76-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), List.of(),
76+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
7777
Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);
7878

7979
Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
@@ -113,7 +113,7 @@ void namedTwoConfigMapsOneFails() {
113113
Source sourceOne = new Source(configMapNameOne, namespace, Map.of(), null, null, null);
114114
Source sourceTwo = new Source(configMapNameTwo, namespace, Map.of(), null, null, null);
115115

116-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
116+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
117117
List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
118118
RetryProperties.DEFAULT);
119119

@@ -148,7 +148,7 @@ void namedTwoConfigMapsBothFail() {
148148
Source sourceOne = new Source(configMapNameOne, namespace, Map.of(), null, null, null);
149149
Source sourceTwo = new Source(configMapNameTwo, namespace, Map.of(), null, null, null);
150150

151-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
151+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
152152
List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
153153
RetryProperties.DEFAULT);
154154

@@ -181,7 +181,7 @@ void labeledSingleConfigMapFails(CapturedOutput output) {
181181

182182
Source configMapSource = new Source(null, namespace, labels, null, null, null);
183183

184-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
184+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
185185
List.of(configMapSource), labels, true, null, namespace, false, true, false, RetryProperties.DEFAULT);
186186

187187
Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
@@ -226,7 +226,7 @@ void labeledTwoConfigMapsOneFails(CapturedOutput output) {
226226
Source sourceOne = new Source(null, namespace, configMapOneLabels, null, null, null);
227227
Source sourceTwo = new Source(null, namespace, configMapTwoLabels, null, null, null);
228228

229-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
229+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
230230
List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
231231
false, RetryProperties.DEFAULT);
232232

@@ -266,7 +266,7 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
266266
Source sourceOne = new Source(null, namespace, configMapOneLabels, null, null, null);
267267
Source sourceTwo = new Source(null, namespace, configMapTwoLabels, null, null, null);
268268

269-
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
269+
ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
270270
List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
271271
false, RetryProperties.DEFAULT);
272272

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretErrorOnReadingSourceTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void namedSingleSecretFails(CapturedOutput output) {
7373

7474
mockServer.expect().withPath(path).andReturn(500, "Internal Server Error").once();
7575

76-
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
76+
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(),
7777
List.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);
7878

7979
Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
@@ -112,7 +112,7 @@ void namedTwoSecretsOneFails() {
112112
Source sourceOne = new Source(secretNameOne, namespace, Map.of(), null, null, null);
113113
Source sourceTwo = new Source(secretNameTwo, namespace, Map.of(), null, null, null);
114114

115-
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
115+
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(),
116116
List.of(sourceOne, sourceTwo), true, null, namespace, false, true, false, RetryProperties.DEFAULT);
117117

118118
Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
@@ -146,7 +146,7 @@ void namedTwoSecretsBothFail() {
146146
Source sourceOne = new Source(secretNameOne, namespace, Map.of(), null, null, null);
147147
Source sourceTwo = new Source(secretNameTwo, namespace, Map.of(), null, null, null);
148148

149-
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
149+
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(),
150150
List.of(sourceOne, sourceTwo), true, null, namespace, false, true, false, RetryProperties.DEFAULT);
151151

152152
Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
@@ -178,7 +178,7 @@ void labeledSingleSecretFails(CapturedOutput output) {
178178

179179
Source secretSource = new Source(null, namespace, labels, null, null, null);
180180

181-
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, labels, List.of(),
181+
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, labels,
182182
List.of(secretSource), true, null, namespace, false, true, false, RetryProperties.DEFAULT);
183183

184184
Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
@@ -224,7 +224,7 @@ void labeledTwoSecretsOneFails(CapturedOutput output) {
224224
Source sourceTwo = new Source(null, namespace, secretTwoLabels, null, null, null);
225225

226226
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true,
227-
Map.of("one", "1", "two", "2"), List.of(), List.of(sourceOne, sourceTwo), true, null, namespace, false,
227+
Map.of("one", "1", "two", "2"), List.of(sourceOne, sourceTwo), true, null, namespace, false,
228228
true, false, RetryProperties.DEFAULT);
229229

230230
Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
@@ -264,7 +264,7 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
264264
Source sourceTwo = new Source(null, namespace, secretTwoLabels, null, null, null);
265265

266266
SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true,
267-
Map.of("one", "1", "two", "2"), List.of(), List.of(sourceOne, sourceTwo), true, null, namespace, false,
267+
Map.of("one", "1", "two", "2"), List.of(sourceOne, sourceTwo), true, null, namespace, false,
268268
true, false, RetryProperties.DEFAULT);
269269

270270
Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,

0 commit comments

Comments
 (0)