mirror of https://gitee.com/maxjhandsome/pig
🔥 删除无用的import
This commit is contained in:
parent
0cd66252cf
commit
44bb4e66ac
|
@ -4,8 +4,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
|||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.social.connect.Connection;
|
||||
import org.springframework.social.connect.ConnectionRepository;
|
||||
import org.springframework.social.connect.UsersConnectionRepository;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.servlet.view.AbstractView;
|
||||
|
||||
|
@ -14,7 +12,6 @@ import javax.servlet.http.HttpServletResponse;
|
|||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* 访问/connect会获取所有绑定社交的信息(显示是否绑定第三方社交信息)
|
||||
|
|
|
@ -1,19 +1,14 @@
|
|||
package com.github.pig.auth.component.social;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.github.pig.auth.config.AuthServerConfig;
|
||||
import com.github.pig.auth.config.PigAuthorizationConfig;
|
||||
import com.github.pig.common.constant.CommonConstant;
|
||||
import com.xiaoleilu.hutool.util.MapUtil;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.authentication.BadCredentialsException;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.security.crypto.codec.Base64;
|
||||
import org.springframework.security.oauth2.common.OAuth2AccessToken;
|
||||
import org.springframework.security.oauth2.common.exceptions.UnapprovedClientAuthenticationException;
|
||||
import org.springframework.security.oauth2.provider.*;
|
||||
import org.springframework.security.oauth2.provider.token.AuthorizationServerTokenServices;
|
||||
import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
|
||||
|
@ -22,7 +17,6 @@ import org.springframework.stereotype.Component;
|
|||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.IOException;
|
||||
import java.io.PrintWriter;
|
||||
|
||||
/**
|
||||
* @author lengleng
|
||||
|
|
|
@ -4,19 +4,15 @@ import com.github.pig.auth.component.social.SocialUserInfo;
|
|||
import com.github.pig.common.util.R;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.social.connect.Connection;
|
||||
import org.springframework.social.connect.web.ProviderSignInUtils;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
import org.springframework.web.bind.annotation.ResponseStatus;
|
||||
import org.springframework.web.context.request.ServletWebRequest;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
/**
|
||||
* @author lengleng
|
||||
|
|
|
@ -11,8 +11,6 @@ import org.springframework.web.bind.annotation.PostMapping;
|
|||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.security.Principal;
|
||||
|
||||
/**
|
||||
* @author lengleng
|
||||
* @date 2017/10/26
|
||||
|
|
|
@ -1,10 +1,7 @@
|
|||
package com.github.pig.common.bean.interceptor;
|
||||
|
||||
import com.baomidou.mybatisplus.plugins.SqlParserHandler;
|
||||
import com.baomidou.mybatisplus.plugins.pagination.PageHelper;
|
||||
import com.baomidou.mybatisplus.toolkit.PluginUtils;
|
||||
import com.github.pig.common.util.UserUtils;
|
||||
import com.github.pig.common.vo.UserVo;
|
||||
import com.xiaoleilu.hutool.util.CollectionUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.ibatis.executor.statement.StatementHandler;
|
||||
|
@ -14,12 +11,8 @@ import org.apache.ibatis.mapping.SqlCommandType;
|
|||
import org.apache.ibatis.plugin.*;
|
||||
import org.apache.ibatis.reflection.MetaObject;
|
||||
import org.apache.ibatis.reflection.SystemMetaObject;
|
||||
import org.apache.ibatis.session.RowBounds;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Properties;
|
||||
|
|
|
@ -3,8 +3,6 @@ package com.github.pig.gateway.componet.filter;
|
|||
import com.github.pig.gateway.service.LogSendService;
|
||||
import com.netflix.zuul.ZuulFilter;
|
||||
import com.netflix.zuul.context.RequestContext;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@ package com.github.pig.mc.config;
|
|||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
|
|
|
@ -2,15 +2,11 @@ package com.github.pig.mc.listener;
|
|||
|
||||
import com.github.pig.common.constant.MqQueueConstant;
|
||||
import com.github.pig.common.util.template.MobileMsgTemplate;
|
||||
import com.github.pig.mc.handler.SmsMessageHandler;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.amqp.rabbit.annotation.RabbitHandler;
|
||||
import org.springframework.amqp.rabbit.annotation.RabbitListener;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @author lengleng
|
||||
* @date 2018年01月25日15:59:00
|
||||
|
|
|
@ -3,7 +3,6 @@ package com.github.pig.sso;
|
|||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso;
|
||||
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
|
||||
|
||||
/**
|
||||
* @author lengleng
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package com.github.pig.admin.common.config;
|
||||
|
||||
import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
|
||||
import com.github.pig.common.bean.interceptor.DataScopeInterceptor;
|
||||
import org.mybatis.spring.annotation.MapperScan;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
@ -28,8 +27,8 @@ public class MybatisPlusConfig {
|
|||
*
|
||||
* @return DataScopeInterceptor
|
||||
*/
|
||||
@Bean
|
||||
public DataScopeInterceptor dataScopeInterceptor() {
|
||||
return new DataScopeInterceptor();
|
||||
}
|
||||
// @Bean
|
||||
// public DataScopeInterceptor dataScopeInterceptor() {
|
||||
// return new DataScopeInterceptor();
|
||||
// }
|
||||
}
|
|
@ -5,7 +5,6 @@ import com.github.pig.common.constant.MqQueueConstant;
|
|||
import com.github.pig.common.entity.SysLog;
|
||||
import com.github.pig.common.util.UserUtils;
|
||||
import com.github.pig.common.vo.LogVo;
|
||||
import com.xiaoleilu.hutool.util.RandomUtil;
|
||||
import org.slf4j.MDC;
|
||||
import org.springframework.amqp.rabbit.annotation.RabbitHandler;
|
||||
import org.springframework.amqp.rabbit.annotation.RabbitListener;
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
package com.github.pig.admin.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.mapper.EntityWrapper;
|
||||
import com.github.pig.admin.common.util.TreeUtil;
|
||||
import com.github.pig.admin.model.dto.MenuTree;
|
||||
import com.github.pig.admin.model.entity.SysMenu;
|
||||
import com.github.pig.admin.service.SysMenuService;
|
||||
import com.github.pig.admin.common.util.TreeUtil;
|
||||
import com.github.pig.common.constant.CommonConstant;
|
||||
import com.github.pig.common.util.R;
|
||||
import com.github.pig.common.vo.MenuVo;
|
||||
|
|
|
@ -5,7 +5,6 @@ import com.github.pig.admin.model.dto.UserDto;
|
|||
import com.github.pig.admin.model.dto.UserInfo;
|
||||
import com.github.pig.admin.model.entity.SysUser;
|
||||
import com.github.pig.admin.model.entity.SysUserRole;
|
||||
import com.github.pig.admin.service.SysDeptService;
|
||||
import com.github.pig.admin.service.SysUserService;
|
||||
import com.github.pig.common.bean.config.FdfsPropertiesConfig;
|
||||
import com.github.pig.common.constant.CommonConstant;
|
||||
|
@ -20,7 +19,6 @@ import io.swagger.annotations.ApiImplicitParam;
|
|||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.scheduling.annotation.Async;
|
||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
|
|
@ -2,7 +2,6 @@ package com.github.pig.admin.mapper;
|
|||
|
||||
import com.baomidou.mybatisplus.mapper.BaseMapper;
|
||||
import com.github.pig.admin.model.entity.SysDept;
|
||||
import com.github.pig.admin.model.entity.SysDeptRelation;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package com.github.pig.admin.mapper;
|
||||
|
||||
import com.github.pig.admin.model.entity.SysDict;
|
||||
import com.baomidou.mybatisplus.mapper.BaseMapper;
|
||||
import com.github.pig.admin.model.entity.SysDict;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package com.github.pig.admin.mapper;
|
||||
|
||||
import com.github.pig.admin.model.entity.SysRoleDept;
|
||||
import com.baomidou.mybatisplus.mapper.BaseMapper;
|
||||
import com.github.pig.admin.model.entity.SysRoleDept;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
|
@ -5,10 +5,8 @@ import com.github.pig.admin.model.entity.SysUser;
|
|||
import com.github.pig.common.bean.interceptor.DataScope;
|
||||
import com.github.pig.common.util.Query;
|
||||
import com.github.pig.common.vo.UserVo;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
|
@ -1,17 +1,13 @@
|
|||
package com.github.pig.admin.model.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import com.baomidou.mybatisplus.activerecord.Model;
|
||||
import com.baomidou.mybatisplus.annotations.TableField;
|
||||
import com.baomidou.mybatisplus.annotations.TableId;
|
||||
import com.baomidou.mybatisplus.annotations.TableName;
|
||||
import com.baomidou.mybatisplus.enums.IdType;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import com.baomidou.mybatisplus.annotations.TableId;
|
||||
import com.baomidou.mybatisplus.annotations.TableField;
|
||||
import com.baomidou.mybatisplus.activerecord.Model;
|
||||
import com.baomidou.mybatisplus.annotations.TableName;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
package com.github.pig.admin.model.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import com.baomidou.mybatisplus.activerecord.Model;
|
||||
import com.baomidou.mybatisplus.annotations.TableName;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
package com.github.pig.admin.model.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import com.baomidou.mybatisplus.activerecord.Model;
|
||||
import com.baomidou.mybatisplus.annotations.TableField;
|
||||
import com.baomidou.mybatisplus.annotations.TableId;
|
||||
import com.baomidou.mybatisplus.annotations.TableName;
|
||||
import com.baomidou.mybatisplus.enums.IdType;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.annotations.TableId;
|
||||
import com.baomidou.mybatisplus.annotations.TableField;
|
||||
import com.baomidou.mybatisplus.activerecord.Model;
|
||||
import com.baomidou.mybatisplus.annotations.TableName;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
package com.github.pig.admin.model.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.annotations.TableId;
|
||||
import com.baomidou.mybatisplus.annotations.TableField;
|
||||
import com.baomidou.mybatisplus.activerecord.Model;
|
||||
import com.baomidou.mybatisplus.annotations.TableField;
|
||||
import com.baomidou.mybatisplus.annotations.TableId;
|
||||
import com.baomidou.mybatisplus.annotations.TableName;
|
||||
import com.baomidou.mybatisplus.enums.IdType;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 菜单权限表
|
||||
|
|
|
@ -1,15 +1,14 @@
|
|||
package com.github.pig.admin.model.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import com.baomidou.mybatisplus.annotations.TableId;
|
||||
import com.baomidou.mybatisplus.annotations.TableField;
|
||||
import com.baomidou.mybatisplus.activerecord.Model;
|
||||
import com.baomidou.mybatisplus.annotations.TableField;
|
||||
import com.baomidou.mybatisplus.annotations.TableId;
|
||||
import com.baomidou.mybatisplus.annotations.TableName;
|
||||
import com.baomidou.mybatisplus.enums.IdType;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* <p>
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
package com.github.pig.admin.model.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import com.baomidou.mybatisplus.enums.IdType;
|
||||
import com.baomidou.mybatisplus.annotations.TableId;
|
||||
import com.baomidou.mybatisplus.annotations.TableField;
|
||||
import com.baomidou.mybatisplus.activerecord.Model;
|
||||
import com.baomidou.mybatisplus.annotations.TableField;
|
||||
import com.baomidou.mybatisplus.annotations.TableId;
|
||||
import com.baomidou.mybatisplus.annotations.TableName;
|
||||
import com.baomidou.mybatisplus.enums.IdType;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
package com.github.pig.admin.model.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import com.baomidou.mybatisplus.annotations.TableId;
|
||||
import com.baomidou.mybatisplus.activerecord.Model;
|
||||
import com.baomidou.mybatisplus.annotations.TableId;
|
||||
import com.baomidou.mybatisplus.annotations.TableName;
|
||||
import com.baomidou.mybatisplus.enums.IdType;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 角色菜单表
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
package com.github.pig.admin.model.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import com.baomidou.mybatisplus.annotations.TableId;
|
||||
import com.baomidou.mybatisplus.activerecord.Model;
|
||||
import com.baomidou.mybatisplus.annotations.TableId;
|
||||
import com.baomidou.mybatisplus.annotations.TableName;
|
||||
import com.baomidou.mybatisplus.enums.IdType;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 用户角色表
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package com.github.pig.admin.service;
|
||||
|
||||
import com.github.pig.admin.model.entity.SysDict;
|
||||
import com.baomidou.mybatisplus.service.IService;
|
||||
import com.github.pig.admin.model.entity.SysDict;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
|
@ -2,7 +2,6 @@ package com.github.pig.admin.service;
|
|||
|
||||
import com.baomidou.mybatisplus.service.IService;
|
||||
import com.github.pig.common.entity.SysLog;
|
||||
import com.github.pig.common.util.R;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package com.github.pig.admin.service;
|
||||
|
||||
import com.github.pig.admin.model.entity.SysRoleDept;
|
||||
import com.baomidou.mybatisplus.service.IService;
|
||||
import com.github.pig.admin.model.entity.SysRoleDept;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
package com.github.pig.admin.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
|
||||
import com.github.pig.admin.model.entity.SysDict;
|
||||
import com.github.pig.admin.mapper.SysDictMapper;
|
||||
import com.github.pig.admin.model.entity.SysDict;
|
||||
import com.github.pig.admin.service.SysDictService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
|
|
|
@ -6,7 +6,6 @@ import com.github.pig.admin.service.SysLogService;
|
|||
import com.github.pig.common.constant.CommonConstant;
|
||||
import com.github.pig.common.entity.SysLog;
|
||||
import com.github.pig.common.util.Assert;
|
||||
import com.github.pig.common.util.R;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Date;
|
||||
|
|
|
@ -2,8 +2,8 @@ package com.github.pig.admin.service.impl;
|
|||
|
||||
import com.baomidou.mybatisplus.mapper.EntityWrapper;
|
||||
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
|
||||
import com.github.pig.admin.model.entity.SysMenu;
|
||||
import com.github.pig.admin.mapper.SysMenuMapper;
|
||||
import com.github.pig.admin.model.entity.SysMenu;
|
||||
import com.github.pig.admin.service.SysMenuService;
|
||||
import com.github.pig.common.constant.CommonConstant;
|
||||
import com.github.pig.common.util.Assert;
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
package com.github.pig.admin.service.impl;
|
||||
|
||||
import com.github.pig.admin.model.entity.SysRoleDept;
|
||||
import com.github.pig.admin.mapper.SysRoleDeptMapper;
|
||||
import com.github.pig.admin.service.SysRoleDeptService;
|
||||
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
|
||||
import com.github.pig.admin.mapper.SysRoleDeptMapper;
|
||||
import com.github.pig.admin.model.entity.SysRoleDept;
|
||||
import com.github.pig.admin.service.SysRoleDeptService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
|
|
|
@ -2,8 +2,8 @@ package com.github.pig.admin.service.impl;
|
|||
|
||||
import com.baomidou.mybatisplus.mapper.EntityWrapper;
|
||||
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
|
||||
import com.github.pig.admin.model.entity.SysRoleMenu;
|
||||
import com.github.pig.admin.mapper.SysRoleMenuMapper;
|
||||
import com.github.pig.admin.model.entity.SysRoleMenu;
|
||||
import com.github.pig.admin.service.SysRoleMenuService;
|
||||
import org.springframework.cache.annotation.CacheEvict;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
|
|
@ -3,11 +3,11 @@ package com.github.pig.admin.service.impl;
|
|||
import com.baomidou.mybatisplus.mapper.EntityWrapper;
|
||||
import com.baomidou.mybatisplus.plugins.Page;
|
||||
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
|
||||
import com.github.pig.admin.mapper.SysRoleDeptMapper;
|
||||
import com.github.pig.admin.mapper.SysRoleMapper;
|
||||
import com.github.pig.admin.model.dto.RoleDto;
|
||||
import com.github.pig.admin.model.entity.SysRole;
|
||||
import com.github.pig.admin.model.entity.SysRoleDept;
|
||||
import com.github.pig.admin.mapper.SysRoleDeptMapper;
|
||||
import com.github.pig.admin.mapper.SysRoleMapper;
|
||||
import com.github.pig.admin.service.SysRoleService;
|
||||
import com.github.pig.common.util.Query;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
package com.github.pig.admin.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
|
||||
import com.github.pig.admin.model.entity.SysUserRole;
|
||||
import com.github.pig.admin.mapper.SysUserRoleMapper;
|
||||
import com.github.pig.admin.model.entity.SysUserRole;
|
||||
import com.github.pig.admin.service.SysUserRoleService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
|
|
|
@ -3,12 +3,12 @@ package com.github.pig.admin.service.impl;
|
|||
import com.baomidou.mybatisplus.mapper.EntityWrapper;
|
||||
import com.baomidou.mybatisplus.plugins.Page;
|
||||
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
|
||||
import com.github.pig.admin.mapper.SysUserMapper;
|
||||
import com.github.pig.admin.model.dto.UserDto;
|
||||
import com.github.pig.admin.model.dto.UserInfo;
|
||||
import com.github.pig.admin.model.entity.SysDeptRelation;
|
||||
import com.github.pig.admin.model.entity.SysUser;
|
||||
import com.github.pig.admin.model.entity.SysUserRole;
|
||||
import com.github.pig.admin.mapper.SysUserMapper;
|
||||
import com.github.pig.admin.service.SysDeptRelationService;
|
||||
import com.github.pig.admin.service.SysMenuService;
|
||||
import com.github.pig.admin.service.SysUserRoleService;
|
||||
|
@ -25,7 +25,6 @@ import com.github.pig.common.vo.UserVo;
|
|||
import com.xiaoleilu.hutool.util.CollectionUtil;
|
||||
import com.xiaoleilu.hutool.util.RandomUtil;
|
||||
import com.xiaoleilu.hutool.util.StrUtil;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.amqp.rabbit.core.RabbitTemplate;
|
||||
|
|
|
@ -1,16 +1,13 @@
|
|||
package ${package.Controller};
|
||||
import java.util.Map;
|
||||
import java.util.Date;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
package import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import com.github.pig.common.constant.CommonConstant;
|
||||
import com.baomidou.mybatisplus.mapper.EntityWrapper;
|
||||
import com.baomidou.mybatisplus.plugins.Page;
|
||||
import com.github.pig.common.util.Query;
|
||||
import ${package.Entity}.${entity};
|
||||
import ${package.Service}.${entity}Service;
|
||||
|
||||
${package.Controller}
|
||||
;
|
||||
${package.Entity}.${entity};
|
||||
${package.Service}.${entity}Service;
|
||||
#if(${superControllerClassPackage})
|
||||
import ${superControllerClassPackage};
|
||||
${superControllerClassPackage}
|
||||
;
|
||||
#end
|
||||
|
||||
/**
|
||||
|
|
|
@ -1,25 +1,5 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import static redis.clients.jedis.Protocol.sendCommand;
|
||||
import static redis.clients.jedis.Protocol.toByteArray;
|
||||
import static redis.clients.jedis.Protocol.Command.*;
|
||||
import static redis.clients.jedis.Protocol.Keyword.ENCODING;
|
||||
import static redis.clients.jedis.Protocol.Keyword.IDLETIME;
|
||||
import static redis.clients.jedis.Protocol.Keyword.LEN;
|
||||
import static redis.clients.jedis.Protocol.Keyword.LIMIT;
|
||||
import static redis.clients.jedis.Protocol.Keyword.NO;
|
||||
import static redis.clients.jedis.Protocol.Keyword.ONE;
|
||||
import static redis.clients.jedis.Protocol.Keyword.REFCOUNT;
|
||||
import static redis.clients.jedis.Protocol.Keyword.RESET;
|
||||
import static redis.clients.jedis.Protocol.Keyword.STORE;
|
||||
import static redis.clients.jedis.Protocol.Keyword.WITHSCORES;
|
||||
|
||||
import java.lang.reflect.Array;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import redis.clients.jedis.Protocol.Command;
|
||||
import redis.clients.jedis.Protocol.Keyword;
|
||||
import redis.clients.jedis.params.geo.GeoRadiusParam;
|
||||
|
@ -28,6 +8,16 @@ import redis.clients.jedis.params.sortedset.ZAddParams;
|
|||
import redis.clients.jedis.params.sortedset.ZIncrByParams;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import static redis.clients.jedis.Protocol.Command.*;
|
||||
import static redis.clients.jedis.Protocol.Keyword.*;
|
||||
import static redis.clients.jedis.Protocol.sendCommand;
|
||||
import static redis.clients.jedis.Protocol.toByteArray;
|
||||
|
||||
public class BinaryClient extends Connection {
|
||||
public enum LIST_POSITION {
|
||||
BEFORE, AFTER;
|
||||
|
|
|
@ -1,20 +1,5 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import static redis.clients.jedis.Protocol.toByteArray;
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.net.URI;
|
||||
import java.util.AbstractMap;
|
||||
import java.util.AbstractSet;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import redis.clients.jedis.BinaryClient.LIST_POSITION;
|
||||
import redis.clients.jedis.commands.*;
|
||||
import redis.clients.jedis.exceptions.InvalidURIException;
|
||||
|
@ -28,6 +13,12 @@ import redis.clients.util.JedisByteHashMap;
|
|||
import redis.clients.util.JedisURIHelper;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.net.URI;
|
||||
import java.util.*;
|
||||
|
||||
import static redis.clients.jedis.Protocol.toByteArray;
|
||||
|
||||
public class BinaryJedis implements BasicCommands, BinaryJedisCommands, MultiKeyBinaryCommands,
|
||||
AdvancedBinaryJedisCommands, BinaryScriptingCommands, Closeable {
|
||||
protected Client client = null;
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
import redis.clients.jedis.commands.BinaryJedisClusterCommands;
|
||||
import redis.clients.jedis.commands.JedisClusterBinaryScriptingCommands;
|
||||
import redis.clients.jedis.commands.MultiKeyBinaryJedisClusterCommands;
|
||||
|
@ -16,8 +17,6 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
|
||||
public class BinaryJedisCluster implements BinaryJedisClusterCommands,
|
||||
MultiKeyBinaryJedisClusterCommands, JedisClusterBinaryScriptingCommands, Closeable {
|
||||
|
||||
|
|
|
@ -1,16 +1,11 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import static redis.clients.jedis.Protocol.Keyword.MESSAGE;
|
||||
import static redis.clients.jedis.Protocol.Keyword.PMESSAGE;
|
||||
import static redis.clients.jedis.Protocol.Keyword.PSUBSCRIBE;
|
||||
import static redis.clients.jedis.Protocol.Keyword.PUNSUBSCRIBE;
|
||||
import static redis.clients.jedis.Protocol.Keyword.SUBSCRIBE;
|
||||
import static redis.clients.jedis.Protocol.Keyword.UNSUBSCRIBE;
|
||||
import redis.clients.jedis.exceptions.JedisException;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import redis.clients.jedis.exceptions.JedisException;
|
||||
import static redis.clients.jedis.Protocol.Keyword.*;
|
||||
|
||||
public abstract class BinaryJedisPubSub {
|
||||
private int subscribedChannels = 0;
|
||||
|
|
|
@ -1,11 +1,5 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import redis.clients.jedis.BinaryClient.LIST_POSITION;
|
||||
import redis.clients.jedis.commands.BinaryJedisCommands;
|
||||
import redis.clients.jedis.exceptions.JedisConnectionException;
|
||||
|
@ -16,6 +10,12 @@ import redis.clients.jedis.params.sortedset.ZIncrByParams;
|
|||
import redis.clients.util.Hashing;
|
||||
import redis.clients.util.Sharded;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class BinaryShardedJedis extends Sharded<Jedis, JedisShardInfo> implements
|
||||
BinaryJedisCommands {
|
||||
public BinaryShardedJedis(List<JedisShardInfo> shards) {
|
||||
|
|
|
@ -1,17 +1,10 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import redis.clients.util.JedisByteHashMap;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
public class BuilderFactory {
|
||||
public static final Builder<Double> DOUBLE = new Builder<Double>() {
|
||||
@Override
|
||||
|
|
|
@ -1,15 +1,5 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import static redis.clients.jedis.Protocol.Command.GEORADIUS;
|
||||
import static redis.clients.jedis.Protocol.Command.CONFIG;
|
||||
import static redis.clients.jedis.Protocol.toByteArray;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import redis.clients.jedis.JedisCluster.Reset;
|
||||
import redis.clients.jedis.commands.Commands;
|
||||
import redis.clients.jedis.params.geo.GeoRadiusParam;
|
||||
|
@ -18,6 +8,15 @@ import redis.clients.jedis.params.sortedset.ZAddParams;
|
|||
import redis.clients.jedis.params.sortedset.ZIncrByParams;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import static redis.clients.jedis.Protocol.Command.CONFIG;
|
||||
import static redis.clients.jedis.Protocol.toByteArray;
|
||||
|
||||
public class Client extends BinaryClient implements Commands {
|
||||
|
||||
public Client() {
|
||||
|
|
|
@ -1,5 +1,15 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import com.sohu.tv.jedis.stat.data.UsefulDataCollector;
|
||||
import com.sohu.tv.jedis.stat.model.UsefulDataModel;
|
||||
import redis.clients.jedis.commands.ProtocolCommand;
|
||||
import redis.clients.jedis.exceptions.JedisConnectionException;
|
||||
import redis.clients.jedis.exceptions.JedisDataException;
|
||||
import redis.clients.util.IOUtils;
|
||||
import redis.clients.util.RedisInputStream;
|
||||
import redis.clients.util.RedisOutputStream;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.io.IOException;
|
||||
import java.net.InetSocketAddress;
|
||||
|
@ -8,17 +18,6 @@ import java.net.SocketException;
|
|||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.sohu.tv.jedis.stat.data.UsefulDataCollector;
|
||||
import com.sohu.tv.jedis.stat.model.UsefulDataModel;
|
||||
|
||||
import redis.clients.jedis.commands.ProtocolCommand;
|
||||
import redis.clients.jedis.exceptions.JedisConnectionException;
|
||||
import redis.clients.jedis.exceptions.JedisDataException;
|
||||
import redis.clients.util.IOUtils;
|
||||
import redis.clients.util.RedisInputStream;
|
||||
import redis.clients.util.RedisOutputStream;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
public class Connection implements Closeable {
|
||||
|
||||
private static final byte[][] EMPTY_ARGS = new byte[0][];
|
||||
|
|
|
@ -1,16 +1,5 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import java.net.URI;
|
||||
import java.util.AbstractMap;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
|
||||
import redis.clients.jedis.BinaryClient.LIST_POSITION;
|
||||
import redis.clients.jedis.JedisCluster.Reset;
|
||||
import redis.clients.jedis.commands.*;
|
||||
|
@ -21,6 +10,10 @@ import redis.clients.jedis.params.sortedset.ZIncrByParams;
|
|||
import redis.clients.util.SafeEncoder;
|
||||
import redis.clients.util.Slowlog;
|
||||
|
||||
import java.net.URI;
|
||||
import java.util.*;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
public class Jedis extends BinaryJedis implements JedisCommands, MultiKeyCommands,
|
||||
AdvancedJedisCommands, ScriptingCommands, BasicCommands, ClusterCommands, SentinelCommands {
|
||||
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
import redis.clients.jedis.BinaryClient.LIST_POSITION;
|
||||
import redis.clients.jedis.params.geo.GeoRadiusParam;
|
||||
import redis.clients.jedis.params.sortedset.ZAddParams;
|
||||
import redis.clients.jedis.params.sortedset.ZIncrByParams;
|
||||
import redis.clients.jedis.commands.JedisClusterCommands;
|
||||
import redis.clients.jedis.commands.JedisClusterScriptingCommands;
|
||||
import redis.clients.jedis.commands.MultiKeyJedisClusterCommands;
|
||||
import redis.clients.jedis.params.geo.GeoRadiusParam;
|
||||
import redis.clients.jedis.params.set.SetParams;
|
||||
import redis.clients.jedis.params.sortedset.ZAddParams;
|
||||
import redis.clients.jedis.params.sortedset.ZIncrByParams;
|
||||
import redis.clients.util.KeyMergeUtil;
|
||||
|
||||
import java.util.Collections;
|
||||
|
@ -15,10 +17,6 @@ import java.util.Map;
|
|||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
|
||||
import redis.clients.jedis.params.set.SetParams;
|
||||
|
||||
public class JedisCluster extends BinaryJedisCluster implements JedisClusterCommands,
|
||||
MultiKeyJedisClusterCommands, JedisClusterScriptingCommands {
|
||||
public static enum Reset {
|
||||
|
|
|
@ -2,13 +2,7 @@ package redis.clients.jedis;
|
|||
|
||||
import com.sohu.tv.jedis.stat.data.UsefulDataCollector;
|
||||
import com.sohu.tv.jedis.stat.enums.ClientExceptionType;
|
||||
|
||||
import redis.clients.jedis.exceptions.JedisAskDataException;
|
||||
import redis.clients.jedis.exceptions.JedisClusterException;
|
||||
import redis.clients.jedis.exceptions.JedisClusterMaxRedirectionsException;
|
||||
import redis.clients.jedis.exceptions.JedisConnectionException;
|
||||
import redis.clients.jedis.exceptions.JedisMovedDataException;
|
||||
import redis.clients.jedis.exceptions.JedisRedirectionException;
|
||||
import redis.clients.jedis.exceptions.*;
|
||||
import redis.clients.util.JedisClusterCRC16;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
|
|
|
@ -1,15 +1,10 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
|
||||
import redis.clients.jedis.exceptions.JedisConnectionException;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
public abstract class JedisClusterConnectionHandler {
|
||||
protected final JedisClusterInfoCache cache;
|
||||
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
import redis.clients.util.ClusterNodeInformation;
|
||||
import redis.clients.util.ClusterNodeInformationParser;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
@ -7,12 +12,6 @@ import java.util.Map;
|
|||
import java.util.concurrent.locks.Lock;
|
||||
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||||
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
|
||||
import redis.clients.util.ClusterNodeInformation;
|
||||
import redis.clients.util.ClusterNodeInformationParser;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
public class JedisClusterInfoCache {
|
||||
public static final ClusterNodeInformationParser nodeInfoParser = new ClusterNodeInformationParser();
|
||||
|
||||
|
|
|
@ -1,16 +1,15 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import java.net.URI;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
|
||||
import org.apache.commons.pool2.PooledObject;
|
||||
import org.apache.commons.pool2.PooledObjectFactory;
|
||||
import org.apache.commons.pool2.impl.DefaultPooledObject;
|
||||
|
||||
import redis.clients.jedis.exceptions.InvalidURIException;
|
||||
import redis.clients.jedis.exceptions.JedisException;
|
||||
import redis.clients.util.JedisURIHelper;
|
||||
|
||||
import java.net.URI;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
|
||||
/**
|
||||
* PoolableObjectFactory custom impl.
|
||||
*/
|
||||
|
|
|
@ -1,13 +1,12 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import java.net.URI;
|
||||
|
||||
import org.apache.commons.pool2.impl.GenericObjectPool;
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
|
||||
import redis.clients.jedis.exceptions.JedisException;
|
||||
import redis.clients.util.JedisURIHelper;
|
||||
|
||||
import java.net.URI;
|
||||
|
||||
public class JedisPool extends JedisPoolAbstract {
|
||||
|
||||
public JedisPool() {
|
||||
|
|
|
@ -2,7 +2,6 @@ package redis.clients.jedis;
|
|||
|
||||
import org.apache.commons.pool2.PooledObjectFactory;
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
|
||||
import redis.clients.util.Pool;
|
||||
|
||||
public class JedisPoolAbstract extends Pool<Jedis> {
|
||||
|
|
|
@ -1,19 +1,14 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import static redis.clients.jedis.Protocol.Keyword.MESSAGE;
|
||||
import static redis.clients.jedis.Protocol.Keyword.PMESSAGE;
|
||||
import static redis.clients.jedis.Protocol.Keyword.PSUBSCRIBE;
|
||||
import static redis.clients.jedis.Protocol.Keyword.PUNSUBSCRIBE;
|
||||
import static redis.clients.jedis.Protocol.Keyword.SUBSCRIBE;
|
||||
import static redis.clients.jedis.Protocol.Keyword.UNSUBSCRIBE;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import redis.clients.jedis.exceptions.JedisConnectionException;
|
||||
import redis.clients.jedis.exceptions.JedisException;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import static redis.clients.jedis.Protocol.Keyword.*;
|
||||
|
||||
public abstract class JedisPubSub {
|
||||
private int subscribedChannels = 0;
|
||||
private volatile Client client;
|
||||
|
|
|
@ -1,5 +1,9 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
import redis.clients.jedis.exceptions.JedisConnectionException;
|
||||
import redis.clients.jedis.exceptions.JedisException;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
|
@ -8,11 +12,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
|
|||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
|
||||
import redis.clients.jedis.exceptions.JedisConnectionException;
|
||||
import redis.clients.jedis.exceptions.JedisException;
|
||||
|
||||
public class JedisSentinelPool extends JedisPoolAbstract {
|
||||
|
||||
protected GenericObjectPoolConfig poolConfig;
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import java.net.URI;
|
||||
|
||||
import redis.clients.jedis.exceptions.InvalidURIException;
|
||||
import redis.clients.util.JedisURIHelper;
|
||||
import redis.clients.util.ShardInfo;
|
||||
import redis.clients.util.Sharded;
|
||||
|
||||
import java.net.URI;
|
||||
|
||||
public class JedisShardInfo extends ShardInfo<Jedis> {
|
||||
|
||||
public String toString() {
|
||||
|
|
|
@ -1,14 +1,11 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
import redis.clients.jedis.exceptions.JedisConnectionException;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
|
||||
import redis.clients.jedis.exceptions.JedisConnectionException;
|
||||
|
||||
public class JedisSlotBasedConnectionHandler extends JedisClusterConnectionHandler {
|
||||
|
||||
public JedisSlotBasedConnectionHandler(Set<HostAndPort> nodes,
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import redis.clients.jedis.exceptions.JedisDataException;
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import redis.clients.jedis.exceptions.JedisDataException;
|
||||
|
||||
public class Pipeline extends MultiKeyPipelineBase implements Closeable {
|
||||
|
||||
private MultiResponseBuilder currentMulti;
|
||||
|
|
|
@ -1,11 +1,5 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import static redis.clients.jedis.Protocol.toByteArray;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import redis.clients.jedis.BinaryClient.LIST_POSITION;
|
||||
import redis.clients.jedis.commands.BinaryRedisPipeline;
|
||||
import redis.clients.jedis.commands.RedisPipeline;
|
||||
|
@ -14,6 +8,12 @@ import redis.clients.jedis.params.set.SetParams;
|
|||
import redis.clients.jedis.params.sortedset.ZAddParams;
|
||||
import redis.clients.jedis.params.sortedset.ZIncrByParams;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import static redis.clients.jedis.Protocol.toByteArray;
|
||||
|
||||
public abstract class PipelineBase extends Queable implements BinaryRedisPipeline, RedisPipeline {
|
||||
|
||||
protected abstract Client getClient(String key);
|
||||
|
|
|
@ -8,9 +8,6 @@ import redis.clients.jedis.valueobject.RangeScoreVO;
|
|||
import redis.clients.jedis.valueobject.SortedSetVO;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
import java.nio.charset.Charset;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* Created by yijunzhang on 14-6-23.
|
||||
*/
|
||||
|
|
|
@ -7,8 +7,6 @@ import redis.clients.jedis.exceptions.JedisMovedDataException;
|
|||
import redis.clients.jedis.exceptions.JedisRedirectionException;
|
||||
import redis.clients.util.JedisClusterCRC16;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* Created by yijunzhang on 14-5-26.
|
||||
*/
|
||||
|
|
|
@ -1,19 +1,15 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import redis.clients.jedis.commands.ProtocolCommand;
|
||||
import redis.clients.jedis.exceptions.*;
|
||||
import redis.clients.util.RedisInputStream;
|
||||
import redis.clients.util.RedisOutputStream;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import redis.clients.jedis.commands.ProtocolCommand;
|
||||
import redis.clients.jedis.exceptions.JedisAskDataException;
|
||||
import redis.clients.jedis.exceptions.JedisClusterException;
|
||||
import redis.clients.jedis.exceptions.JedisConnectionException;
|
||||
import redis.clients.jedis.exceptions.JedisDataException;
|
||||
import redis.clients.jedis.exceptions.JedisMovedDataException;
|
||||
import redis.clients.util.RedisInputStream;
|
||||
import redis.clients.util.RedisOutputStream;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
public final class Protocol {
|
||||
|
||||
private static final String ASK_RESPONSE = "ASK";
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import static redis.clients.jedis.Protocol.Keyword.COUNT;
|
||||
import static redis.clients.jedis.Protocol.Keyword.MATCH;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import redis.clients.util.SafeEncoder;
|
||||
import static redis.clients.jedis.Protocol.Keyword.COUNT;
|
||||
import static redis.clients.jedis.Protocol.Keyword.MATCH;
|
||||
|
||||
public class ScanParams {
|
||||
private List<byte[]> params = new ArrayList<byte[]>();
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ScanResult<T> {
|
||||
private byte[] cursor;
|
||||
private List<T> results;
|
||||
|
|
|
@ -1,12 +1,5 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import redis.clients.jedis.BinaryClient.LIST_POSITION;
|
||||
import redis.clients.jedis.commands.JedisCommands;
|
||||
import redis.clients.jedis.params.geo.GeoRadiusParam;
|
||||
|
@ -15,6 +8,13 @@ import redis.clients.jedis.params.sortedset.ZAddParams;
|
|||
import redis.clients.jedis.params.sortedset.ZIncrByParams;
|
||||
import redis.clients.util.Hashing;
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class ShardedJedis extends BinaryShardedJedis implements JedisCommands, Closeable {
|
||||
|
||||
protected ShardedJedisPool dataSource = null;
|
||||
|
|
|
@ -1,16 +1,15 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.apache.commons.pool2.PooledObject;
|
||||
import org.apache.commons.pool2.PooledObjectFactory;
|
||||
import org.apache.commons.pool2.impl.DefaultPooledObject;
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
|
||||
import redis.clients.util.Hashing;
|
||||
import redis.clients.util.Pool;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class ShardedJedisPool extends Pool<ShardedJedis> {
|
||||
public ShardedJedisPool(final GenericObjectPoolConfig poolConfig, List<JedisShardInfo> shards) {
|
||||
this(poolConfig, shards, Hashing.MURMUR_HASH);
|
||||
|
|
|
@ -1,19 +1,13 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import static redis.clients.jedis.Protocol.Keyword.ALPHA;
|
||||
import static redis.clients.jedis.Protocol.Keyword.ASC;
|
||||
import static redis.clients.jedis.Protocol.Keyword.BY;
|
||||
import static redis.clients.jedis.Protocol.Keyword.DESC;
|
||||
import static redis.clients.jedis.Protocol.Keyword.GET;
|
||||
import static redis.clients.jedis.Protocol.Keyword.LIMIT;
|
||||
import static redis.clients.jedis.Protocol.Keyword.NOSORT;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import redis.clients.util.SafeEncoder;
|
||||
import static redis.clients.jedis.Protocol.Keyword.*;
|
||||
|
||||
/**
|
||||
* Builder Class for {@link Jedis#sort(String, SortingParams) SORT} Parameters.
|
||||
|
|
|
@ -2,7 +2,6 @@ package redis.clients.jedis;
|
|||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import redis.clients.jedis.exceptions.*;
|
||||
import redis.clients.util.JedisClusterCRC16;
|
||||
|
||||
/**
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import redis.clients.jedis.exceptions.JedisDataException;
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import redis.clients.jedis.exceptions.JedisDataException;
|
||||
|
||||
/**
|
||||
* Transaction is nearly identical to Pipeline, only differences are the multi/discard behaviors
|
||||
*/
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
public class Tuple implements Comparable<Tuple> {
|
||||
private byte[] element;
|
||||
private Double score;
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import static redis.clients.jedis.Protocol.Keyword.AGGREGATE;
|
||||
import static redis.clients.jedis.Protocol.Keyword.WEIGHTS;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import redis.clients.util.SafeEncoder;
|
||||
import static redis.clients.jedis.Protocol.Keyword.AGGREGATE;
|
||||
import static redis.clients.jedis.Protocol.Keyword.WEIGHTS;
|
||||
|
||||
public class ZParams {
|
||||
public enum Aggregate {
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
package redis.clients.jedis.commands;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import redis.clients.util.Slowlog;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface AdvancedJedisCommands {
|
||||
List<String> configGet(String pattern);
|
||||
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package redis.clients.jedis.commands;
|
||||
|
||||
import redis.clients.jedis.*;
|
||||
import redis.clients.jedis.params.geo.GeoRadiusParam;
|
||||
import redis.clients.jedis.params.set.SetParams;
|
||||
import redis.clients.jedis.params.sortedset.ZAddParams;
|
||||
|
|
|
@ -1,16 +1,15 @@
|
|||
package redis.clients.jedis.commands;
|
||||
|
||||
import redis.clients.jedis.params.geo.GeoRadiusParam;
|
||||
import redis.clients.jedis.params.set.SetParams;
|
||||
import redis.clients.jedis.params.sortedset.ZAddParams;
|
||||
import redis.clients.jedis.params.sortedset.ZIncrByParams;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import redis.clients.jedis.*;
|
||||
import redis.clients.jedis.params.geo.GeoRadiusParam;
|
||||
import redis.clients.jedis.params.set.SetParams;
|
||||
import redis.clients.jedis.params.sortedset.ZAddParams;
|
||||
import redis.clients.jedis.params.sortedset.ZIncrByParams;
|
||||
|
||||
/**
|
||||
* Common interface for sharded and non-sharded BinaryJedis
|
||||
*/
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
package redis.clients.jedis.commands;
|
||||
|
||||
import redis.clients.jedis.*;
|
||||
|
||||
import redis.clients.jedis.params.geo.GeoRadiusParam;
|
||||
import redis.clients.jedis.params.sortedset.ZAddParams;
|
||||
import redis.clients.jedis.params.sortedset.ZIncrByParams;
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
package redis.clients.jedis.commands;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import redis.clients.jedis.JedisCluster.Reset;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface ClusterCommands {
|
||||
String clusterNodes();
|
||||
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
package redis.clients.jedis.commands;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import redis.clients.jedis.BinaryClient.LIST_POSITION;
|
||||
import redis.clients.jedis.BitOP;
|
||||
import redis.clients.jedis.ScanParams;
|
||||
|
@ -11,6 +9,8 @@ import redis.clients.jedis.params.set.SetParams;
|
|||
import redis.clients.jedis.params.sortedset.ZAddParams;
|
||||
import redis.clients.jedis.params.sortedset.ZIncrByParams;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public interface Commands {
|
||||
|
||||
void set(final String key, final String value);
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package redis.clients.jedis.commands;
|
||||
|
||||
import redis.clients.jedis.*;
|
||||
import redis.clients.jedis.params.geo.GeoRadiusParam;
|
||||
import redis.clients.jedis.params.set.SetParams;
|
||||
import redis.clients.jedis.params.sortedset.ZAddParams;
|
||||
|
|
|
@ -1,15 +1,14 @@
|
|||
package redis.clients.jedis.commands;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import redis.clients.jedis.*;
|
||||
import redis.clients.jedis.params.geo.GeoRadiusParam;
|
||||
import redis.clients.jedis.params.set.SetParams;
|
||||
import redis.clients.jedis.params.sortedset.ZAddParams;
|
||||
import redis.clients.jedis.params.sortedset.ZIncrByParams;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* Common interface for sharded and non-sharded Jedis
|
||||
*/
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
package redis.clients.jedis.commands;
|
||||
|
||||
import redis.clients.jedis.*;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package redis.clients.jedis.commands;
|
||||
|
||||
import redis.clients.jedis.*;
|
||||
import redis.clients.jedis.params.geo.GeoRadiusParam;
|
||||
import redis.clients.jedis.params.sortedset.ZAddParams;
|
||||
import redis.clients.jedis.params.sortedset.ZIncrByParams;
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
package redis.clients.jedis.params;
|
||||
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
public abstract class Params {
|
||||
|
||||
private Map<String, Object> params;
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
package redis.clients.jedis.params.set;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import redis.clients.jedis.params.Params;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class SetParams extends Params {
|
||||
|
||||
private static final String XX = "xx";
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
package redis.clients.util;
|
||||
|
||||
import redis.clients.jedis.HostAndPort;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import redis.clients.jedis.HostAndPort;
|
||||
|
||||
public class ClusterNodeInformation {
|
||||
private HostAndPort node;
|
||||
private List<Integer> availableSlots;
|
||||
|
|
|
@ -1,13 +1,7 @@
|
|||
package redis.clients.util;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.*;
|
||||
|
||||
public class JedisByteHashMap implements Map<byte[], byte[]>, Cloneable, Serializable {
|
||||
private static final long serialVersionUID = -6971431362627219416L;
|
||||
|
|
|
@ -1,14 +1,13 @@
|
|||
package redis.clients.util;
|
||||
|
||||
import java.io.Closeable;
|
||||
|
||||
import org.apache.commons.pool2.PooledObjectFactory;
|
||||
import org.apache.commons.pool2.impl.GenericObjectPool;
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
|
||||
import redis.clients.jedis.exceptions.JedisConnectionException;
|
||||
import redis.clients.jedis.exceptions.JedisException;
|
||||
|
||||
import java.io.Closeable;
|
||||
|
||||
public abstract class Pool<T> implements Closeable {
|
||||
protected GenericObjectPool<T> internalPool;
|
||||
|
||||
|
|
|
@ -9,8 +9,6 @@
|
|||
|
||||
package redis.clients.util;
|
||||
|
||||
import java.io.*;
|
||||
|
||||
import redis.clients.jedis.exceptions.JedisConnectionException;
|
||||
|
||||
/**
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
package redis.clients.util;
|
||||
|
||||
import java.io.UnsupportedEncodingException;
|
||||
|
||||
import redis.clients.jedis.Protocol;
|
||||
import redis.clients.jedis.exceptions.JedisDataException;
|
||||
import redis.clients.jedis.exceptions.JedisException;
|
||||
|
||||
import java.io.UnsupportedEncodingException;
|
||||
|
||||
/**
|
||||
* The only reason to have this is to be able to compatible with java 1.5 :(
|
||||
*/
|
||||
|
|
|
@ -1,12 +1,6 @@
|
|||
package redis.clients.util;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.SortedMap;
|
||||
import java.util.TreeMap;
|
||||
import java.util.*;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
|
|
|
@ -3,10 +3,8 @@ package redis.clients.jedis;
|
|||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
public class PipelineClusterTest {
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package redis.clients.jedis;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
/**
|
||||
|
|
|
@ -2,7 +2,6 @@ package redis.clients.jedis.tests;
|
|||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
import redis.clients.jedis.BuilderFactory;
|
||||
|
||||
public class BuilderFactoryTest extends Assert {
|
||||
|
|
|
@ -4,7 +4,6 @@ import org.junit.After;
|
|||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import redis.clients.jedis.Connection;
|
||||
import redis.clients.jedis.exceptions.JedisConnectionException;
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@ import org.junit.After;
|
|||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import redis.clients.jedis.Connection;
|
||||
import redis.clients.jedis.Protocol.Command;
|
||||
import redis.clients.jedis.commands.ProtocolCommand;
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
package redis.clients.jedis.tests;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import redis.clients.jedis.HostAndPort;
|
||||
import redis.clients.jedis.Protocol;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class HostAndPortUtil {
|
||||
private static List<HostAndPort> redisHostAndPortList = new ArrayList<HostAndPort>();
|
||||
private static List<HostAndPort> sentinelHostAndPortList = new ArrayList<HostAndPort>();
|
||||
|
|
|
@ -3,7 +3,6 @@ package redis.clients.jedis.tests;
|
|||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import redis.clients.jedis.HostAndPort;
|
||||
import redis.clients.util.ClusterNodeInformation;
|
||||
import redis.clients.util.ClusterNodeInformationParser;
|
||||
|
|
|
@ -1,18 +1,13 @@
|
|||
package redis.clients.jedis.tests;
|
||||
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
import org.junit.*;
|
||||
import redis.clients.jedis.*;
|
||||
import redis.clients.jedis.JedisCluster.Reset;
|
||||
import redis.clients.jedis.exceptions.*;
|
||||
import redis.clients.jedis.tests.utils.ClientKillerUtil;
|
||||
import redis.clients.jedis.tests.utils.JedisClusterTestUtil;
|
||||
import redis.clients.util.ClusterNodeInformationParser;
|
||||
import redis.clients.util.JedisClusterCRC16;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.*;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
public class JedisClusterTest extends Assert {
|
||||
|
|
|
@ -1,24 +1,18 @@
|
|||
package redis.clients.jedis.tests;
|
||||
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
import org.apache.commons.pool2.PooledObject;
|
||||
import org.apache.commons.pool2.PooledObjectFactory;
|
||||
import org.apache.commons.pool2.impl.DefaultPooledObject;
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
import redis.clients.jedis.HostAndPort;
|
||||
import redis.clients.jedis.Jedis;
|
||||
import redis.clients.jedis.JedisPool;
|
||||
import redis.clients.jedis.JedisPoolConfig;
|
||||
import redis.clients.jedis.Transaction;
|
||||
import redis.clients.jedis.*;
|
||||
import redis.clients.jedis.exceptions.InvalidURIException;
|
||||
import redis.clients.jedis.exceptions.JedisConnectionException;
|
||||
import redis.clients.jedis.exceptions.JedisException;
|
||||
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
public class JedisPoolTest extends Assert {
|
||||
private static HostAndPort hnp = HostAndPortUtil.getRedisServers().get(0);
|
||||
|
|
|
@ -1,12 +1,8 @@
|
|||
package redis.clients.jedis.tests;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import redis.clients.jedis.HostAndPort;
|
||||
import redis.clients.jedis.Jedis;
|
||||
import redis.clients.jedis.JedisSentinelPool;
|
||||
|
@ -15,6 +11,9 @@ import redis.clients.jedis.exceptions.JedisConnectionException;
|
|||
import redis.clients.jedis.exceptions.JedisException;
|
||||
import redis.clients.jedis.tests.utils.JedisSentinelTestUtil;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public class JedisSentinelPoolTest extends JedisTestBase {
|
||||
private static final String MASTER_NAME = "mymaster";
|
||||
|
||||
|
|
|
@ -1,18 +1,17 @@
|
|||
package redis.clients.jedis.tests;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import redis.clients.jedis.HostAndPort;
|
||||
import redis.clients.jedis.Jedis;
|
||||
import redis.clients.jedis.exceptions.JedisDataException;
|
||||
import redis.clients.jedis.tests.utils.JedisSentinelTestUtil;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class JedisSentinelTest extends JedisTestBase {
|
||||
private static final String MASTER_NAME = "mymaster";
|
||||
private static final String MONITOR_MASTER_NAME = "mymastermonitor";
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue