Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
shiro: fix wiring of EhCache to all Shiro Realms
Make sure also all of Shiro caches are properly instrumented. Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
- Loading branch information
Showing
7 changed files
with
215 additions
and
63 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
60 changes: 60 additions & 0 deletions
60
...ll/src/main/java/org/killbill/billing/server/modules/KillbillJdbcTenantRealmProvider.java
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 |
---|---|---|
@@ -0,0 +1,60 @@ | ||
/* | ||
* Copyright 2014-2015 Groupon, Inc | ||
* Copyright 2014-2015 The Billing Project, LLC | ||
* | ||
* The Billing Project licenses this file to you 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: | ||
* | ||
* http://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.killbill.billing.server.modules; | ||
|
||
import javax.inject.Named; | ||
import javax.sql.DataSource; | ||
|
||
import org.apache.shiro.cache.CacheManager; | ||
import org.killbill.billing.server.security.KillbillJdbcTenantRealm; | ||
import org.killbill.billing.util.config.SecurityConfig; | ||
import org.killbill.billing.util.glue.ShiroEhCacheInstrumentor; | ||
|
||
import com.google.inject.Inject; | ||
import com.google.inject.Provider; | ||
|
||
public class KillbillJdbcTenantRealmProvider implements Provider<KillbillJdbcTenantRealm> { | ||
|
||
private final SecurityConfig securityConfig; | ||
private final CacheManager cacheManager; | ||
private final ShiroEhCacheInstrumentor ehCacheInstrumentor; | ||
private final DataSource dataSource; | ||
|
||
@Inject | ||
public KillbillJdbcTenantRealmProvider(final SecurityConfig securityConfig, final CacheManager cacheManager, final ShiroEhCacheInstrumentor ehCacheInstrumentor, @Named(KillbillPlatformModule.SHIRO_DATA_SOURCE_ID_NAMED) final DataSource dataSource) { | ||
this.securityConfig = securityConfig; | ||
this.cacheManager = cacheManager; | ||
this.ehCacheInstrumentor = ehCacheInstrumentor; | ||
this.dataSource = dataSource; | ||
} | ||
|
||
@Override | ||
public KillbillJdbcTenantRealm get() { | ||
final KillbillJdbcTenantRealm killbillJdbcTenantRealm = new KillbillJdbcTenantRealm(dataSource, securityConfig); | ||
|
||
// Set the cache manager | ||
// Note: the DefaultWebSecurityManager used for RBAC will have all of its realms (set in KillBillShiroWebModule) | ||
// automatically configured with the EhCache manager (see EhCacheManagerProvider) | ||
killbillJdbcTenantRealm.setCacheManager(cacheManager); | ||
|
||
// Instrument the cache | ||
ehCacheInstrumentor.instrument(killbillJdbcTenantRealm); | ||
|
||
return killbillJdbcTenantRealm; | ||
} | ||
} |
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
4 changes: 2 additions & 2 deletions
4
util/src/main/java/org/killbill/billing/util/glue/CacheModule.java
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
Oops, something went wrong.