AbstractRoutingDataSource should only use defaultTargetDataSource on key null and should fail-fast on a non-existing key [SPR-6809]

[spring-projects-issues]

Geoffrey De Smet opened SPR-6809 and commented

We got 2 dataSources:

• "productionDB" (also set as defaultTargetDataSource)
• "testDB"

Here is what we expected to return if we ask determineTargetDataSource:

• "productionDB" => the production DB
• "testDB" => the test DB
• null => the production DB
• "testDb" => Exception, but instead we got the production DB
• "nonsence" => Exception, but instead we got the production DB

I think this code:

protected DataSource determineTargetDataSource() {
     Assert.notNull(this.resolvedDataSources, "DataSource router not initialized");
     Object lookupKey = determineCurrentLookupKey();
     DataSource dataSource = (DataSource) this.resolvedDataSources.get(lookupKey);
     if (dataSource == null) {
          dataSource = this.resolvedDefaultDataSource;
     }
     if (dataSource == null) {
          throw new IllegalStateException("Cannot determine target DataSource for lookup key [" + lookupKey + "]");
     }
     return dataSource;
}

should change into this code:

protected DataSource determineTargetDataSource() {
     Assert.notNull(this.resolvedDataSources, "DataSource router not initialized");
     Object lookupKey = determineCurrentLookupKey();
     DataSource dataSource;
     if (lookupKey == null) {
         dataSource = this.resolvedDefaultDataSource;
     } else {
         dataSource = (DataSource) this.resolvedDataSources.get(lookupKey);
         if (dataSource == null) {
             throw new IllegalStateException("Cannot determine target DataSource for lookup key [" + lookupKey + "]");
         }
     }
     return dataSource;
}

---

Affects: 2.5.5

Referenced from: commits aafe8ef

[spring-projects-issues]

Juergen Hoeller commented

I've added a "lenientFallback" property to AbstractRoutingDataSource: This is still "true" by default but can be switched to "false" in order to enforce the presence of specific entries for each lookup key.

Juergen