Skip to content

Commit

Permalink
Polish "Fix deriving DataSources from custom type"
Browse files Browse the repository at this point in the history
  • Loading branch information
wilkinsona committed Jul 22, 2021
1 parent d0e2823 commit 18b4898
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -281,22 +281,17 @@ public String toString() {
}

Method findSetter(Class<?> type) {
return extracted("set", type, true);
return extracted("set", type, String.class);
}

Method findGetter(Class<?> type) {
return extracted("get", type, false);
return extracted("get", type);
}

private Method extracted(String prefix, Class<?> type, boolean hasParameter) {
private Method extracted(String prefix, Class<?> type, Class<?>... paramTypes) {
for (String candidate : this.names) {
Method method;
if (hasParameter) {
method = ReflectionUtils.findMethod(type, prefix + StringUtils.capitalize(candidate), String.class);
}
else {
method = ReflectionUtils.findMethod(type, prefix + StringUtils.capitalize(candidate));
}
Method method = ReflectionUtils.findMethod(type, prefix + StringUtils.capitalize(candidate),
paramTypes);
if (method != null) {
return method;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,23 @@ void buildWhenDerivedFromExistingDatabaseWithTypeChange() {
assertThat(built.getUrl()).isEqualTo("jdbc:postgresql://localhost:5432/postgres");
}

@Test // gh -27295
void buildWhenDerivedFromCustomTypeSpecifiedReturnsDataSource() {
@Test // gh-27295
void buildWhenDerivedFromCustomType() {
CustomDataSource dataSource = new CustomDataSource();
dataSource.setUsername("test");
dataSource.setPassword("secret");
dataSource.setUrl("jdbc:postgresql://localhost:5432/postgres");
DataSourceBuilder<?> builder = DataSourceBuilder.derivedFrom(dataSource).username("alice")
.password("confidential");
CustomDataSource testSource = (CustomDataSource) builder.build();
assertThat(testSource).isNotSameAs(dataSource);
assertThat(testSource.getUsername()).isEqualTo("alice");
assertThat(testSource.getUrl()).isEqualTo("jdbc:postgresql://localhost:5432/postgres");
assertThat(testSource.getPassword()).isEqualTo("confidential");
}

@Test // gh-27295
void buildWhenDerivedFromCustomTypeWithTypeChange() {
CustomDataSource dataSource = new CustomDataSource();
dataSource.setUsername("test");
dataSource.setPassword("secret");
Expand Down

0 comments on commit 18b4898

Please sign in to comment.