Skip to content

Commit 1ddfa08

Browse files
klbokenobodyiam
authored andcommitted
Remove spring dependencies from internal code(#3937)
1 parent f3512f9 commit 1ddfa08

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Release Notes.
55
Apollo 1.9.1
66

77
------------------
8+
* [Remove spring dependencies from internal code](https://github.com/apolloconfig/apollo/pull/3937)
89

910
------------------
1011
All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/9?closed=1)

apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfig.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
import com.ctrip.framework.apollo.util.ExceptionUtil;
4040
import com.google.common.collect.ImmutableMap;
4141
import com.google.common.util.concurrent.RateLimiter;
42-
import org.springframework.util.CollectionUtils;
43-
4442

4543
/**
4644
* @author Jason Song([email protected])
@@ -186,10 +184,10 @@ public Set<String> getPropertyNames() {
186184
// propertyNames include system property and system env might cause some compatibility issues, though that looks like the correct implementation.
187185
Set<String> fromRepository = this.getPropertyNamesFromRepository();
188186
Set<String> fromAdditional = this.getPropertyNamesFromAdditional();
189-
if (CollectionUtils.isEmpty(fromRepository)) {
187+
if (fromRepository == null || fromRepository.isEmpty()) {
190188
return fromAdditional;
191189
}
192-
if (CollectionUtils.isEmpty(fromAdditional)) {
190+
if (fromAdditional == null || fromAdditional.isEmpty()) {
193191
return fromRepository;
194192
}
195193
Set<String> propertyNames = Sets

0 commit comments

Comments
 (0)