yoho-search / yoho-search-service · Commits

Go to a project

Authored by 胡古飞
Commit 533eed6ecd318bb7246011f6bb284a167f623463 1 parent b3ba508e

fix getCacheInterface

Inline Side-by-side
Showing 5 changed files with 43 additions and 43 deletions
... ... @@ -41,7 +41,7 @@ public class GroupBrandAggregation extends AbstractAggregation {
}
@Override
public String aggName() {
public final String aggName() {
return "groupBrandAgg";
}
... ...
... ... @@ -40,7 +40,7 @@ public class GroupShopAggregation extends AbstractAggregation {
}
@Override
public String aggName() {
public final String aggName() {
return "groupShopAgg";
}
... ...
... ... @@ -33,7 +33,7 @@ public class RecommendBrandAggregation extends AbstractAggregation {
}
@Override
public String aggName() {
public final String aggName() {
return "recommendBrandAgg";
}
... ...
... ... @@ -34,7 +34,7 @@ public class RecommendShopAggregation extends AbstractAggregation {
}
@Override
public String aggName() {
public final String aggName() {
return "shopAgg";
}
... ...
... ... @@ -3,10 +3,6 @@ package com.yoho.search.service.cache;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.PostConstruct;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
... ... @@ -15,18 +11,46 @@ import com.yoho.search.service.cache.caches.EhCache;
import com.yoho.search.service.cache.caches.SearchRedis;
import com.yoho.search.service.cache.caches.YohoRedis;
import com.yoho.search.service.cache.model.SearchCache;
import com.yoho.search.service.common.SearchPropertyPlaceholderConfigurer;
import com.yoho.search.service.common.SpringContextHolder;
@Service
public class SearchCacheFactory {
private static final Logger logger = LoggerFactory.getLogger(SearchCacheFactory.class);
@Autowired
private SpringContextHolder springContextHolder;
@Autowired
private SearchPropertyPlaceholderConfigurer searchPropertyPlaceholderConfigurer;
// private static final Logger logger =
// LoggerFactory.getLogger(SearchCacheFactory.class);
// @Autowired
// private SpringContextHolder springContextHolder;
// @Autowired
// private SearchPropertyPlaceholderConfigurer
// searchPropertyPlaceholderConfigurer;
// CacheType defaultCacheType = CacheType.YOHO_REDIS;
//
// @PostConstruct
// void init() {
// String searchCacheType = (String)
// searchPropertyPlaceholderConfigurer.getContextProperty("search.cache.type");
// logger.info("searchCacheType is [{}]", searchCacheType);
// if (searchCacheType != null &&
// searchCacheType.equalsIgnoreCase("searchRedis")) {
// defaultCacheType = CacheType.SEARCH_REDIS;
// logger.warn("search.cache.type is searchRedis");
// return;
// }
// if (searchCacheType != null &&
// searchCacheType.equalsIgnoreCase("yohoRedis")) {
// defaultCacheType = CacheType.YOHO_REDIS;
// logger.warn("search.cache.type is yohoRedis");
// return;
// }
// if (searchCacheType != null &&
// searchCacheType.equalsIgnoreCase("ehCache")) {
// defaultCacheType = CacheType.EHCACHE;
// logger.warn("search.cache.type is ehCache");
// return;
// }
// logger.warn("search.cache.type is illegal,use searchRedis as default");
// }
@Autowired
private EhCache ehCache;
... ... @@ -35,40 +59,16 @@ public class SearchCacheFactory {
@Autowired
private YohoRedis yohoRedis;
CacheType defaultCacheType = CacheType.YOHO_REDIS;
@PostConstruct
void init() {
String searchCacheType = (String) searchPropertyPlaceholderConfigurer.getContextProperty("search.cache.type");
logger.info("searchCacheType is [{}]", searchCacheType);
if (searchCacheType != null && searchCacheType.equalsIgnoreCase("searchRedis")) {
defaultCacheType = CacheType.SEARCH_REDIS;
logger.warn("search.cache.type is searchRedis");
return;
}
if (searchCacheType != null && searchCacheType.equalsIgnoreCase("yohoRedis")) {
defaultCacheType = CacheType.YOHO_REDIS;
logger.warn("search.cache.type is yohoRedis");
return;
}
if (searchCacheType != null && searchCacheType.equalsIgnoreCase("ehCache")) {
defaultCacheType = CacheType.EHCACHE;
logger.warn("search.cache.type is ehCache");
return;
}
logger.warn("search.cache.type is illegal,use searchRedis as default");
}
private Map<String, SearchCache> cacheMap = new ConcurrentHashMap<String, SearchCache>();
private CacheInterface getCacheInterface(CacheType cacheType) {
if (cacheType.equals(CacheType.EHCACHE)) {
if (cacheType == CacheType.EHCACHE) {
return ehCache;
}
if (cacheType.equals(CacheType.SEARCH_REDIS)) {
if (cacheType == CacheType.SEARCH_REDIS) {
return searchRedis;
}
if (cacheType.equals(CacheType.YOHO_REDIS)) {
if (cacheType == CacheType.YOHO_REDIS) {
return yohoRedis;
}
return null;
... ...