package com.losd.reqbot.config;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import redis.clients.jedis.JedisPool;
import redis.clients.jedis.JedisPoolConfig;
import redis.clients.jedis.Protocol;

/**
 * The MIT License (MIT)
 * <p>
 * Copyright (c) 2015 Andrew Braithwaite
 * <p>
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 * <p>
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 * <p>
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */
@Configuration
public class JedisConfiguration {
    @Autowired
    RedisSettings settings;

    Logger logger = LoggerFactory.getLogger(JedisConfiguration.class);

    @Bean
    JedisPool jedisPool() throws Exception {
        logger.info("Connecting to database {} on {} port {}",
                settings.getIndex(),
                settings.getHost(),
                settings.getPort());

        JedisPool pool = new JedisPool(new JedisPoolConfig(),
                settings.getHost(),
                settings.getPort(),
                Protocol.DEFAULT_TIMEOUT,
                settings.getPassword(),
                settings.getIndex(),
                settings.getClient());

        return pool;
    }
}

@@ -1953,24 +1953,14 @@
     
-JedisPool pool =
+return
  new
@@ -2226,30 +2226,8 @@
 ());
-%0A%0A        return pool;
 %0A   

remove unneeded variable