Not allowing NPEs for DataSource name resolution; fixes gh-2076

This commit is contained in:
Marcin Grzejszczak
2021-12-13 11:37:58 +01:00
parent d2126be347
commit cc1523505a
2 changed files with 33 additions and 0 deletions

View File

@@ -35,6 +35,9 @@ public class DataSourceNameResolver {
}
public String resolveDataSourceName(CommonDataSource dataSource) {
if (dataSource == null) {
return "dataSource";
}
return this.cachedNames.getOrDefault(dataSource, "dataSource");
}

View File

@@ -0,0 +1,30 @@
/*
* Copyright 2013-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.sleuth.instrument.jdbc;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.BDDAssertions.then;
class DataSourceNameResolverTests {
@Test
void should_return_default_string_exception_when_datasource_is_null() {
DataSourceNameResolver resolver = new DataSourceNameResolver();
then(resolver.resolveDataSourceName(null)).isNotBlank();
}
}