Skip to content

Commit be3ed08

Browse files
authored
Fix 1661 (#1662)
1 parent c86e5f6 commit be3ed08

File tree

2 files changed

+51
-1
lines changed

2 files changed

+51
-1
lines changed

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/leader/LeaderProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public void setNamespace(String namespace) {
106106
}
107107

108108
public String getNamespace(String defaultValue) {
109-
if (!StringUtils.hasText(defaultValue)) {
109+
if (!StringUtils.hasText(namespace)) {
110110
return defaultValue;
111111
}
112112

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/*
2+
* Copyright 2013-2024 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.cloud.kubernetes.commons.leader;
18+
19+
import org.junit.jupiter.api.Assertions;
20+
import org.junit.jupiter.api.Test;
21+
22+
/**
23+
* @author wind57
24+
*/
25+
class LeaderPropertiesTests {
26+
27+
@Test
28+
void getNamespaceNull() {
29+
LeaderProperties leaderProperties = new LeaderProperties();
30+
String namespace = leaderProperties.getNamespace("a");
31+
Assertions.assertEquals("a", namespace);
32+
}
33+
34+
@Test
35+
void getNamespaceEmpty() {
36+
LeaderProperties leaderProperties = new LeaderProperties();
37+
leaderProperties.setNamespace("");
38+
String namespace = leaderProperties.getNamespace("a");
39+
Assertions.assertEquals("a", namespace);
40+
}
41+
42+
@Test
43+
void getNamespacePresent() {
44+
LeaderProperties leaderProperties = new LeaderProperties();
45+
leaderProperties.setNamespace("c");
46+
String namespace = leaderProperties.getNamespace("a");
47+
Assertions.assertEquals("c", namespace);
48+
}
49+
50+
}

0 commit comments

Comments
 (0)