Programming Challenge redislabs-training#1 solution improvement

Author: ThiernoAmirouDiallo

src/main/java/com/redislabs/university/RU102J/dao/SiteDaoRedisImpl.java

@@ -1,53 +1,60 @@
 package com.redislabs.university.RU102J.dao;
 
 import com.redislabs.university.RU102J.api.Site;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 
-import java.util.*;
-
 public class SiteDaoRedisImpl implements SiteDao {
-    private final JedisPool jedisPool;
-
-    public SiteDaoRedisImpl(JedisPool jedisPool) {
-        this.jedisPool = jedisPool;
-    }
-
-    // When we insert a site, we set all of its values into a single hash.
-    // We then store the site's id in a set for easy access.
-    @Override
-    public void insert(Site site) {
-        try (Jedis jedis = jedisPool.getResource()) {
-            String hashKey = RedisSchema.getSiteHashKey(site.getId());
-            String siteIdKey = RedisSchema.getSiteIDsKey();
-            jedis.hmset(hashKey, site.toMap());
-            jedis.sadd(siteIdKey, hashKey);
-        }
-    }
-
-    @Override
-    public Site findById(long id) {
-        try(Jedis jedis = jedisPool.getResource()) {
-            String key = RedisSchema.getSiteHashKey(id);
-            Map<String, String> fields = jedis.hgetAll(key);
-            if (fields == null || fields.isEmpty()) {
-                return null;
-            } else {
-                return new Site(fields);
-            }
-        }
-    }
-
-    // Challenge #1
-    @Override
-    public Set<Site> findAll() {
-        Set<Site> sites = new HashSet<>();
-        try ( Jedis jedis = jedisPool.getResource() ) {
-            for ( String siteHashKey : jedis.smembers( RedisSchema.getSiteIDsKey() ) ) {
-                sites.add( new Site( jedis.hgetAll( siteHashKey ) ) );
-            }
-        }
-
-        return sites;
-    }
+
+	private final JedisPool jedisPool;
+
+	public SiteDaoRedisImpl( JedisPool jedisPool ) {
+		this.jedisPool = jedisPool;
+	}
+
+	// When we insert a site, we set all of its values into a single hash.
+	// We then store the site's id in a set for easy access.
+	@Override
+	public void insert( Site site ) {
+		try ( Jedis jedis = jedisPool.getResource() ) {
+			String hashKey = RedisSchema.getSiteHashKey( site.getId() );
+			String siteIdKey = RedisSchema.getSiteIDsKey();
+			jedis.hmset( hashKey, site.toMap() );
+			jedis.sadd( siteIdKey, hashKey );
+		}
+	}
+
+	@Override
+	public Site findById( long id ) {
+		try ( Jedis jedis = jedisPool.getResource() ) {
+			String key = RedisSchema.getSiteHashKey( id );
+			Map<String, String> fields = jedis.hgetAll( key );
+			if ( fields == null || fields.isEmpty() ) {
+				return null;
+			} else {
+				return new Site( fields );
+			}
+		}
+	}
+
+	// Challenge #1
+	@Override
+	public Set<Site> findAll() {
+		Set<Site> sites = new HashSet<>();
+		try ( Jedis jedis = jedisPool.getResource() ) {
+			for ( String siteHashKey : jedis.smembers( RedisSchema.getSiteIDsKey() ) ) {
+				Map<String, String> fields = jedis.hgetAll( siteHashKey );
+				if ( fields != null && !fields.isEmpty() ) {
+					sites.add( new Site( fields ) );
+				}
+			}
+		}
+
+		return sites;
+	}
 }