From 7358bb880f32de2b97d75cf28845b4b2cedf838a Mon Sep 17 00:00:00 2001 From: jakimli Date: Fri, 7 Aug 2020 18:05:43 +0800 Subject: [PATCH] minor refactor --- .../com/github/jakimli/pandaria/domain/DataSources.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pandaria-db/src/main/java/com/github/jakimli/pandaria/domain/DataSources.java b/pandaria-db/src/main/java/com/github/jakimli/pandaria/domain/DataSources.java index 6b49f3f..62134a6 100644 --- a/pandaria-db/src/main/java/com/github/jakimli/pandaria/domain/DataSources.java +++ b/pandaria-db/src/main/java/com/github/jakimli/pandaria/domain/DataSources.java @@ -51,9 +51,14 @@ private DataSource buildDataSource(DatasourceProperties property) { @PostConstruct public void validateAdditionalDataSourceName() { - if (configuration.hasAdditional() && configuration.getAdditional().stream() - .anyMatch(property -> DEFAULT.equalsIgnoreCase(property.getName()))) { + if (configuration.hasAdditional() && usingReservedName(DEFAULT)) { throw new RuntimeException(String.format("datasource name: '%s' is reserved", DEFAULT)); } } + + private boolean usingReservedName(String name) { + return configuration.getAdditional() + .stream() + .anyMatch(property -> name.equalsIgnoreCase(property.getName())); + } }