-
-
Notifications
You must be signed in to change notification settings - Fork 10.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove spring dependencies from internal code(#3937)
- Loading branch information
Showing
2 changed files
with
3 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,8 +39,6 @@ | |
import com.ctrip.framework.apollo.util.ExceptionUtil; | ||
import com.google.common.collect.ImmutableMap; | ||
import com.google.common.util.concurrent.RateLimiter; | ||
import org.springframework.util.CollectionUtils; | ||
|
||
|
||
/** | ||
* @author Jason Song([email protected]) | ||
|
@@ -186,10 +184,10 @@ public Set<String> getPropertyNames() { | |
// propertyNames include system property and system env might cause some compatibility issues, though that looks like the correct implementation. | ||
Set<String> fromRepository = this.getPropertyNamesFromRepository(); | ||
Set<String> fromAdditional = this.getPropertyNamesFromAdditional(); | ||
if (CollectionUtils.isEmpty(fromRepository)) { | ||
if (fromRepository == null || fromRepository.isEmpty()) { | ||
return fromAdditional; | ||
} | ||
if (CollectionUtils.isEmpty(fromAdditional)) { | ||
if (fromAdditional == null || fromAdditional.isEmpty()) { | ||
return fromRepository; | ||
} | ||
Set<String> propertyNames = Sets | ||
|