Showing
15 changed files
with
27 additions
and
32 deletions
| @@ -7,8 +7,8 @@ import com.yoho.search.base.utils.ProductIndexEsField; | @@ -7,8 +7,8 @@ import com.yoho.search.base.utils.ProductIndexEsField; | ||
| 7 | import com.yoho.search.core.es.model.SearchParam; | 7 | import com.yoho.search.core.es.model.SearchParam; |
| 8 | import com.yoho.search.core.es.model.SearchResult; | 8 | import com.yoho.search.core.es.model.SearchResult; |
| 9 | import com.yoho.search.models.SearchApiResult; | 9 | import com.yoho.search.models.SearchApiResult; |
| 10 | -import com.yoho.search.recall.scene.cache.beans.CacheRecallSknRequestResponseBean; | ||
| 11 | -import com.yoho.search.recall.scene.cache.beans.CacheSknInfoRequestResponseBean; | 10 | +import com.yoho.search.recall.scene.cache.CacheRecallSknRequestResponseBean; |
| 11 | +import com.yoho.search.recall.scene.cache.CacheSknInfoRequestResponseBean; | ||
| 12 | import com.yoho.search.recall.scene.strategy.helper.SortBuilderHelper; | 12 | import com.yoho.search.recall.scene.strategy.helper.SortBuilderHelper; |
| 13 | import com.yoho.search.recall.scene.models.*; | 13 | import com.yoho.search.recall.scene.models.*; |
| 14 | import com.yoho.search.recall.scene.builder.request.RecallParamsBuilder; | 14 | import com.yoho.search.recall.scene.builder.request.RecallParamsBuilder; |
| 1 | package com.yoho.search.recall.scene.builder.response; | 1 | package com.yoho.search.recall.scene.builder.response; |
| 2 | 2 | ||
| 3 | -import com.yoho.search.recall.scene.cache.beans.CacheRecallRequestResponse; | 3 | +import com.yoho.search.recall.scene.cache.CacheRecallRequestResponse; |
| 4 | import com.yoho.search.recall.scene.models.RecallRequest; | 4 | import com.yoho.search.recall.scene.models.RecallRequest; |
| 5 | import com.yoho.search.recall.scene.models.RecallResponse; | 5 | import com.yoho.search.recall.scene.models.RecallResponse; |
| 6 | import com.yoho.search.recall.scene.models.RecallResponseBatch; | 6 | import com.yoho.search.recall.scene.models.RecallResponseBatch; |
| 1 | package com.yoho.search.recall.scene.cache; | 1 | package com.yoho.search.recall.scene.cache; |
| 2 | 2 | ||
| 3 | -public abstract class CacheRequestResponse<K extends ICacheRequest,V> extends ICacheResponse<V> { | 3 | +import com.yoho.search.recall.scene.models.ICacheRequest; |
| 4 | + | ||
| 5 | +public abstract class AbstractCacheRequestResponse<K extends ICacheRequest,V> extends AbstractCacheResponse<V> { | ||
| 4 | 6 | ||
| 5 | private K request; | 7 | private K request; |
| 6 | private V response; | 8 | private V response; |
| 7 | private boolean needRecache = false; | 9 | private boolean needRecache = false; |
| 8 | 10 | ||
| 9 | - public CacheRequestResponse(K request){ | 11 | + public AbstractCacheRequestResponse(K request){ |
| 10 | this.request = request; | 12 | this.request = request; |
| 11 | } | 13 | } |
| 12 | 14 |
| @@ -5,6 +5,7 @@ import com.yoho.search.base.utils.CollectionUtils; | @@ -5,6 +5,7 @@ import com.yoho.search.base.utils.CollectionUtils; | ||
| 5 | import com.yoho.search.base.utils.Transfer; | 5 | import com.yoho.search.base.utils.Transfer; |
| 6 | import com.yoho.search.common.cache.impls.EhCache; | 6 | import com.yoho.search.common.cache.impls.EhCache; |
| 7 | import com.yoho.search.core.redis.components.YohoSearchRedisComponent; | 7 | import com.yoho.search.core.redis.components.YohoSearchRedisComponent; |
| 8 | +import com.yoho.search.recall.scene.models.ICacheRequest; | ||
| 8 | import org.apache.commons.lang.StringUtils; | 9 | import org.apache.commons.lang.StringUtils; |
| 9 | import org.slf4j.Logger; | 10 | import org.slf4j.Logger; |
| 10 | import org.slf4j.LoggerFactory; | 11 | import org.slf4j.LoggerFactory; |
| @@ -12,9 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired; | @@ -12,9 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired; | ||
| 12 | 13 | ||
| 13 | import java.util.*; | 14 | import java.util.*; |
| 14 | 15 | ||
| 15 | -public abstract class CacheRequestResponseComponent<K extends ICacheRequest, V,T extends CacheRequestResponse<K, V>> { | 16 | +public abstract class AbstractCacheRequestResponseComponent<K extends ICacheRequest, V,T extends AbstractCacheRequestResponse<K, V>> { |
| 16 | 17 | ||
| 17 | - private static final Logger logger = LoggerFactory.getLogger(CacheRequestResponseComponent.class); | 18 | + private static final Logger logger = LoggerFactory.getLogger(AbstractCacheRequestResponseComponent.class); |
| 18 | 19 | ||
| 19 | @Autowired | 20 | @Autowired |
| 20 | private YohoSearchRedisComponent yohoSearchRedisComponent; | 21 | private YohoSearchRedisComponent yohoSearchRedisComponent; |
| @@ -2,7 +2,7 @@ package com.yoho.search.recall.scene.cache; | @@ -2,7 +2,7 @@ package com.yoho.search.recall.scene.cache; | ||
| 2 | 2 | ||
| 3 | import com.yoho.search.base.utils.Transfer; | 3 | import com.yoho.search.base.utils.Transfer; |
| 4 | 4 | ||
| 5 | -public abstract class ICacheResponse<V> { | 5 | +public abstract class AbstractCacheResponse<V> { |
| 6 | 6 | ||
| 7 | public abstract Transfer<String, V> getToResponseTransfer(); | 7 | public abstract Transfer<String, V> getToResponseTransfer(); |
| 8 | 8 |
| 1 | -package com.yoho.search.recall.scene.cache.beans; | 1 | +package com.yoho.search.recall.scene.cache; |
| 2 | 2 | ||
| 3 | import com.alibaba.fastjson.JSON; | 3 | import com.alibaba.fastjson.JSON; |
| 4 | -import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder; | ||
| 5 | import com.yoho.search.base.utils.Transfer; | 4 | import com.yoho.search.base.utils.Transfer; |
| 6 | -import com.yoho.search.recall.scene.cache.CacheRequestResponse; | 5 | +import com.yoho.search.recall.scene.cache.AbstractCacheRequestResponse; |
| 7 | import com.yoho.search.recall.scene.models.RecallRequest; | 6 | import com.yoho.search.recall.scene.models.RecallRequest; |
| 8 | import com.yoho.search.recall.scene.models.RecallResponse; | 7 | import com.yoho.search.recall.scene.models.RecallResponse; |
| 9 | 8 | ||
| 10 | -public class CacheRecallRequestResponse extends CacheRequestResponse<RecallRequest,RecallResponse> { | 9 | +public class CacheRecallRequestResponse extends AbstractCacheRequestResponse<RecallRequest,RecallResponse> { |
| 11 | 10 | ||
| 12 | public CacheRecallRequestResponse(RecallRequest request) { | 11 | public CacheRecallRequestResponse(RecallRequest request) { |
| 13 | super(request); | 12 | super(request); |
| 1 | -package com.yoho.search.recall.scene.cache.beans; | 1 | +package com.yoho.search.recall.scene.cache; |
| 2 | 2 | ||
| 3 | import com.yoho.search.base.utils.ISearchConstants; | 3 | import com.yoho.search.base.utils.ISearchConstants; |
| 4 | import com.yoho.search.base.utils.ProductIndexEsField; | 4 | import com.yoho.search.base.utils.ProductIndexEsField; |
| 5 | import com.yoho.search.core.es.model.SearchParam; | 5 | import com.yoho.search.core.es.model.SearchParam; |
| 6 | import com.yoho.search.core.es.model.SearchResult; | 6 | import com.yoho.search.core.es.model.SearchResult; |
| 7 | -import com.yoho.search.recall.scene.cache.CacheRequestResponseComponent; | ||
| 8 | import com.yoho.search.recall.scene.models.RecallRequest; | 7 | import com.yoho.search.recall.scene.models.RecallRequest; |
| 9 | import com.yoho.search.recall.scene.models.RecallResponse; | 8 | import com.yoho.search.recall.scene.models.RecallResponse; |
| 10 | import com.yoho.search.service.base.SearchCommonService; | 9 | import com.yoho.search.service.base.SearchCommonService; |
| @@ -18,7 +17,7 @@ import java.util.List; | @@ -18,7 +17,7 @@ import java.util.List; | ||
| 18 | import java.util.Map; | 17 | import java.util.Map; |
| 19 | 18 | ||
| 20 | @Component | 19 | @Component |
| 21 | -public class CacheRecallRequestResponseBean extends CacheRequestResponseComponent<RecallRequest,RecallResponse,CacheRecallRequestResponse>{ | 20 | +public class CacheRecallRequestResponseBean extends AbstractCacheRequestResponseComponent<RecallRequest,RecallResponse,CacheRecallRequestResponse> { |
| 22 | 21 | ||
| 23 | @Autowired | 22 | @Autowired |
| 24 | private SearchCommonService searchCommonService; | 23 | private SearchCommonService searchCommonService; |
| 1 | -package com.yoho.search.recall.scene.cache.beans; | 1 | +package com.yoho.search.recall.scene.cache; |
| 2 | 2 | ||
| 3 | import com.alibaba.fastjson.JSON; | 3 | import com.alibaba.fastjson.JSON; |
| 4 | import com.yoho.search.base.utils.Transfer; | 4 | import com.yoho.search.base.utils.Transfer; |
| 5 | -import com.yoho.search.recall.scene.cache.CacheRequestResponse; | 5 | +import com.yoho.search.recall.scene.cache.AbstractCacheRequestResponse; |
| 6 | import com.yoho.search.recall.scene.models.RecallSknParams; | 6 | import com.yoho.search.recall.scene.models.RecallSknParams; |
| 7 | import com.yoho.search.recall.scene.models.RecallSknResult; | 7 | import com.yoho.search.recall.scene.models.RecallSknResult; |
| 8 | 8 | ||
| 9 | -public class CacheRecallSknRequestResponse extends CacheRequestResponse<RecallSknParams,RecallSknResult> { | 9 | +public class CacheRecallSknRequestResponse extends AbstractCacheRequestResponse<RecallSknParams,RecallSknResult> { |
| 10 | 10 | ||
| 11 | public CacheRecallSknRequestResponse(RecallSknParams request) { | 11 | public CacheRecallSknRequestResponse(RecallSknParams request) { |
| 12 | super(request); | 12 | super(request); |
| 1 | -package com.yoho.search.recall.scene.cache.beans; | 1 | +package com.yoho.search.recall.scene.cache; |
| 2 | 2 | ||
| 3 | import com.yoho.search.recall.scene.builder.request.BrandRecallRequestBuilder; | 3 | import com.yoho.search.recall.scene.builder.request.BrandRecallRequestBuilder; |
| 4 | import com.yoho.search.recall.scene.builder.request.CommonRecallRequestBuilder; | 4 | import com.yoho.search.recall.scene.builder.request.CommonRecallRequestBuilder; |
| 5 | import com.yoho.search.recall.scene.builder.request.SortPriceRecallRequestBuilder; | 5 | import com.yoho.search.recall.scene.builder.request.SortPriceRecallRequestBuilder; |
| 6 | import com.yoho.search.recall.scene.builder.response.RecallResponseBatchBuilder; | 6 | import com.yoho.search.recall.scene.builder.response.RecallResponseBatchBuilder; |
| 7 | import com.yoho.search.recall.scene.builder.response.RecallSknResultBuilder; | 7 | import com.yoho.search.recall.scene.builder.response.RecallSknResultBuilder; |
| 8 | -import com.yoho.search.recall.scene.cache.CacheRequestResponseComponent; | ||
| 9 | import com.yoho.search.recall.scene.models.RecallRequest; | 8 | import com.yoho.search.recall.scene.models.RecallRequest; |
| 10 | import com.yoho.search.recall.scene.models.RecallResponseBatch; | 9 | import com.yoho.search.recall.scene.models.RecallResponseBatch; |
| 11 | import com.yoho.search.recall.scene.models.RecallSknParams; | 10 | import com.yoho.search.recall.scene.models.RecallSknParams; |
| @@ -21,7 +20,7 @@ import java.util.List; | @@ -21,7 +20,7 @@ import java.util.List; | ||
| 21 | import java.util.Map; | 20 | import java.util.Map; |
| 22 | 21 | ||
| 23 | @Component | 22 | @Component |
| 24 | -public class CacheRecallSknRequestResponseBean extends CacheRequestResponseComponent<RecallSknParams,RecallSknResult,CacheRecallSknRequestResponse>{ | 23 | +public class CacheRecallSknRequestResponseBean extends AbstractCacheRequestResponseComponent<RecallSknParams,RecallSknResult,CacheRecallSknRequestResponse> { |
| 25 | 24 | ||
| 26 | @Autowired | 25 | @Autowired |
| 27 | private RecallPersionalService recallPersionalService; | 26 | private RecallPersionalService recallPersionalService; |
| 1 | -package com.yoho.search.recall.scene.cache.beans; | 1 | +package com.yoho.search.recall.scene.cache; |
| 2 | 2 | ||
| 3 | import com.alibaba.fastjson.JSON; | 3 | import com.alibaba.fastjson.JSON; |
| 4 | import com.alibaba.fastjson.JSONObject; | 4 | import com.alibaba.fastjson.JSONObject; |
| 5 | -import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder; | ||
| 6 | import com.yoho.search.base.utils.Transfer; | 5 | import com.yoho.search.base.utils.Transfer; |
| 7 | -import com.yoho.search.recall.scene.cache.CacheRequestResponse; | 6 | +import com.yoho.search.recall.scene.cache.AbstractCacheRequestResponse; |
| 8 | import com.yoho.search.recall.scene.models.SknInfoRequest; | 7 | import com.yoho.search.recall.scene.models.SknInfoRequest; |
| 9 | 8 | ||
| 10 | import java.util.HashMap; | 9 | import java.util.HashMap; |
| 11 | import java.util.Map; | 10 | import java.util.Map; |
| 12 | 11 | ||
| 13 | -public class CacheSknInfoRequestResponse extends CacheRequestResponse<SknInfoRequest, Map<String, Object>> { | 12 | +public class CacheSknInfoRequestResponse extends AbstractCacheRequestResponse<SknInfoRequest, Map<String, Object>> { |
| 14 | 13 | ||
| 15 | public CacheSknInfoRequestResponse(SknInfoRequest sknInfoRequest) { | 14 | public CacheSknInfoRequestResponse(SknInfoRequest sknInfoRequest) { |
| 16 | super(sknInfoRequest); | 15 | super(sknInfoRequest); |
| 1 | -package com.yoho.search.recall.scene.cache.beans; | 1 | +package com.yoho.search.recall.scene.cache; |
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | import com.yoho.search.base.utils.ISearchConstants; | 4 | import com.yoho.search.base.utils.ISearchConstants; |
| 5 | import com.yoho.search.base.utils.ProductIndexEsField; | 5 | import com.yoho.search.base.utils.ProductIndexEsField; |
| 6 | import com.yoho.search.core.es.model.SearchParam; | 6 | import com.yoho.search.core.es.model.SearchParam; |
| 7 | import com.yoho.search.core.es.model.SearchResult; | 7 | import com.yoho.search.core.es.model.SearchResult; |
| 8 | -import com.yoho.search.recall.scene.cache.CacheRequestResponseComponent; | ||
| 9 | import com.yoho.search.recall.scene.models.SknInfoRequest; | 8 | import com.yoho.search.recall.scene.models.SknInfoRequest; |
| 10 | import com.yoho.search.service.base.SearchCommonService; | 9 | import com.yoho.search.service.base.SearchCommonService; |
| 11 | import com.yoho.search.service.base.index.ProductIndexBaseService; | 10 | import com.yoho.search.service.base.index.ProductIndexBaseService; |
| @@ -20,7 +19,7 @@ import java.util.List; | @@ -20,7 +19,7 @@ import java.util.List; | ||
| 20 | import java.util.Map; | 19 | import java.util.Map; |
| 21 | 20 | ||
| 22 | @Component | 21 | @Component |
| 23 | -public class CacheSknInfoRequestResponseBean extends CacheRequestResponseComponent<SknInfoRequest,Map<String, Object>,CacheSknInfoRequestResponse>{ | 22 | +public class CacheSknInfoRequestResponseBean extends AbstractCacheRequestResponseComponent<SknInfoRequest,Map<String, Object>,CacheSknInfoRequestResponse> { |
| 24 | 23 | ||
| 25 | @Autowired | 24 | @Autowired |
| 26 | private SearchCommonService searchCommonService; | 25 | private SearchCommonService searchCommonService; |
| @@ -3,7 +3,6 @@ package com.yoho.search.recall.scene.models; | @@ -3,7 +3,6 @@ package com.yoho.search.recall.scene.models; | ||
| 3 | import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder; | 3 | import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder; |
| 4 | import com.yoho.search.base.utils.MD5Util; | 4 | import com.yoho.search.base.utils.MD5Util; |
| 5 | import com.yoho.search.core.es.model.SearchParam; | 5 | import com.yoho.search.core.es.model.SearchParam; |
| 6 | -import com.yoho.search.recall.scene.cache.ICacheRequest; | ||
| 7 | import com.yoho.search.recall.scene.strategy.IStrategy; | 6 | import com.yoho.search.recall.scene.strategy.IStrategy; |
| 8 | import org.elasticsearch.index.query.BoolQueryBuilder; | 7 | import org.elasticsearch.index.query.BoolQueryBuilder; |
| 9 | import org.elasticsearch.index.query.QueryBuilder; | 8 | import org.elasticsearch.index.query.QueryBuilder; |
| @@ -3,7 +3,6 @@ package com.yoho.search.recall.scene.models; | @@ -3,7 +3,6 @@ package com.yoho.search.recall.scene.models; | ||
| 3 | import com.alibaba.fastjson.JSON; | 3 | import com.alibaba.fastjson.JSON; |
| 4 | import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder; | 4 | import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder; |
| 5 | import com.yoho.search.base.utils.MD5Util; | 5 | import com.yoho.search.base.utils.MD5Util; |
| 6 | -import com.yoho.search.recall.scene.cache.ICacheRequest; | ||
| 7 | import com.yoho.search.recall.scene.constants.CacheTimeConstants; | 6 | import com.yoho.search.recall.scene.constants.CacheTimeConstants; |
| 8 | 7 | ||
| 9 | import java.util.List; | 8 | import java.util.List; |
| 1 | package com.yoho.search.recall.scene.models; | 1 | package com.yoho.search.recall.scene.models; |
| 2 | 2 | ||
| 3 | import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder; | 3 | import com.yoho.core.redis.cluster.operations.serializer.RedisKeyBuilder; |
| 4 | -import com.yoho.search.recall.scene.cache.ICacheRequest; | ||
| 5 | import com.yoho.search.recall.scene.constants.CacheTimeConstants; | 4 | import com.yoho.search.recall.scene.constants.CacheTimeConstants; |
| 6 | 5 | ||
| 7 | public class SknInfoRequest implements ICacheRequest { | 6 | public class SknInfoRequest implements ICacheRequest { |
-
Please register or login to post a comment