pre-release clean up (#103)

* refactor: remove unused method

* refactor: use java.util.Optional over Google's Guava

* refactor: consecutive AssertJ 'assertThat' statements should be chained (Sonarlint java:S5853)

* refactor: null check

Author: bsbodden

redis-om-spring/src/main/java/com/redis/om/spring/RedisJSONKeyValueAdapter.java

@@ -9,6 +9,7 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
@@ -29,7 +30,6 @@
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
-import com.google.common.base.Optional;
 import com.redis.om.spring.convert.RedisOMCustomConversions;
 import com.redis.om.spring.ops.json.JSONOperations;
 import com.redis.om.spring.util.ObjectUtils;
@@ -57,7 +57,7 @@ public RedisJSONKeyValueAdapter(RedisOperations<?, ?> redisOps, JSONOperations<?
   }
 
   /* (non-Javadoc)
-   * 
+   *
    * @see
    * org.springframework.data.keyvalue.core.KeyValueAdapter#put(java.lang.Object,
    * java.lang.Object, java.lang.String) */
@@ -87,7 +87,7 @@ public Object put(Object id, Object item, String keyspace) {
   }
 
   /* (non-Javadoc)
-   * 
+   *
    * @see
    * org.springframework.data.keyvalue.core.KeyValueAdapter#get(java.lang.Object,
    * java.lang.String, java.lang.Class) */
@@ -121,6 +121,10 @@ public <T> List<T> getAllOf(String keyspace, Class<T> type, long offset, int row
     byte[] binKeyspace = toBytes(keyspace);
     Set<byte[]> ids = redisOperations
         .execute((RedisCallback<Set<byte[]>>) connection -> connection.sMembers(binKeyspace));
+    
+    if (ids == null || ids.isEmpty()) {
+      return Collections.emptyList();
+    }
 
     String[] keys = ids.stream().map(b -> getKey(keyspace, new String(b, StandardCharsets.UTF_8)))
         .toArray(String[]::new);
@@ -185,12 +189,12 @@ private Optional<Long> getTTLForEntity(Object entity) {
             }
           }
         } catch (SecurityException | IllegalArgumentException e) {
-          return Optional.absent();
+          return Optional.empty();
         }
       } else if (settings != null && settings.getTimeToLive() != null && settings.getTimeToLive() > 0) {
         return Optional.of(settings.getTimeToLive());
       }
     }
-    return Optional.absent();
+    return Optional.empty();
   }
 }

redis-om-spring/src/main/java/com/redis/om/spring/repository/support/SimpleRedisDocumentRepository.java

@@ -7,11 +7,11 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import com.google.common.base.Optional;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.redis.om.spring.convert.MappingRedisOMConverter;
@@ -191,10 +191,6 @@ public byte[] createKey(String keyspace, String id) {
     return this.mappingConverter.toBytes(keyspace + ":" + id);
   }
 
-  private boolean expires(RedisData data) {
-    return data.getTimeToLive() != null && data.getTimeToLive() > 0L;
-  }
-
   private void processAuditAnnotations(byte[] redisKey, Object item, boolean isNew) {
     var auditClass = isNew ? CreatedDate.class : LastModifiedDate.class;
 
@@ -236,13 +232,13 @@ private Optional<Long> getTTLForEntity(Object entity) {
             }
           }
         } catch (SecurityException | IllegalArgumentException e) {
-          return Optional.absent();
+          return Optional.empty();
         }
       } else if (settings != null && settings.getTimeToLive() != null && settings.getTimeToLive() > 0) {
         return Optional.of(settings.getTimeToLive());
       }
     }
-    return Optional.absent();
+    return Optional.empty();
   }
 
   private enum Command implements ProtocolCommand {

redis-om-spring/src/test/java/com/redis/om/spring/metamodel/MetamodelGeneratorTest.java

@@ -218,8 +218,7 @@ void testValidDocumentUnindexed(Results results) throws IOException {
   @Classpath("data.metamodel.Address")
   void testValidDocumentIndexedNested(Results results) throws IOException {
     List<String> warnings = getWarningStrings(results);
-    assertThat(warnings).hasSize(1);
-    assertThat(warnings).containsOnly(
+    assertThat(warnings).hasSize(1).containsOnly(
         "Processing class ValidDocumentIndexedNested could not resolve valid.Address while checking for nested indexables");
 
     List<String> errors = getErrorStrings(results);