refactor: Move cache code to own project: cactoos-cache

Author: fabriciofx

pom.xml

@@ -86,6 +86,11 @@
       <artifactId>cactoos</artifactId>
       <version>0.57.0</version>
     </dependency>
+    <dependency>
+      <groupId>com.github.fabriciofx</groupId>
+      <artifactId>cactoos-cache</artifactId>
+      <version>0.0.1</version>
+    </dependency>
     <dependency>
       <groupId>com.zaxxer</groupId>
       <artifactId>HikariCP</artifactId>

src/main/java/com/github/fabriciofx/cactoos/jdbc/Cache.java

@@ -4,12 +4,15 @@
  */
 package com.github.fabriciofx.cactoos.jdbc.cache;
 
+import com.github.fabriciofx.cactoos.cache.Key;
+import com.github.fabriciofx.cactoos.cache.entry.EntryEnvelope;
 import com.github.fabriciofx.cactoos.jdbc.Query;
 import com.github.fabriciofx.cactoos.jdbc.Table;
-import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import org.cactoos.Scalar;
+import org.cactoos.list.ListOf;
 import org.cactoos.map.MapEntry;
 import org.cactoos.map.MapOf;
 import org.cactoos.scalar.Unchecked;
@@ -18,22 +21,7 @@
  * CacheEntry.
  * @since 0.9.0
  */
-public final class CacheEntry implements Entry<Query, Table> {
-    /**
-     * Key.
-     */
-    private final Key<Query> id;
-
-    /**
-     * Table to be stored in the cache.
-     */
-    private final Table table;
-
-    /**
-     * Metadata (tables names).
-     */
-    private final Map<String, Set<String>> meta;
-
+public final class CacheEntry extends EntryEnvelope<Query, Table> {
     /**
      * Ctor.
      * @param key The key
@@ -51,7 +39,7 @@ public CacheEntry(
             new MapOf<>(
                 new MapEntry<>(
                     "tables",
-                    new Unchecked<>(tables).value()
+                    new ListOf<>(new Unchecked<>(tables).value())
                 )
             )
         );
@@ -60,31 +48,14 @@ public CacheEntry(
     /**
      * Ctor.
      * @param key The key
-     * @param table The table to be stored
-     * @param meta Metadata associated with this entry.
+     * @param table The Table
+     * @param metadata Metadata (table names)
      */
     public CacheEntry(
         final Key<Query> key,
         final Table table,
-        final Map<String, Set<String>> meta
+        final Map<String, List<String>> metadata
     ) {
-        this.id = key;
-        this.table = table;
-        this.meta = meta;
-    }
-
-    @Override
-    public Key<Query> key() {
-        return this.id;
-    }
-
-    @Override
-    public Table value() {
-        return this.table;
-    }
-
-    @Override
-    public Iterable<String> metadata(final String entity) {
-        return this.meta.getOrDefault(entity, new HashSet<>());
+        super(key, table, metadata);
     }
 }

src/main/java/com/github/fabriciofx/cactoos/jdbc/cache/CacheEntry.java

@@ -4,77 +4,20 @@
  */
 package com.github.fabriciofx.cactoos.jdbc.cache;
 
+import com.github.fabriciofx.cactoos.cache.key.KeyEnvelope;
 import com.github.fabriciofx.cactoos.jdbc.Query;
-import com.github.fabriciofx.cactoos.jdbc.cache.hash.Murmur3Hash;
 import com.github.fabriciofx.cactoos.jdbc.sql.BytesQuery;
-import org.cactoos.Text;
-import org.cactoos.text.HexOf;
-import org.cactoos.text.Sticky;
-import org.cactoos.text.UncheckedText;
 
 /**
  * CacheKey.
  * @since 0.9.0
  */
-public final class CacheKey implements Key<Query> {
-    /**
-     * Query.
-     */
-    private final Query qry;
-
-    /**
-     * Hash.
-     */
-    private final UncheckedText hsh;
-
+public final class CacheKey extends KeyEnvelope<Query> {
     /**
      * Ctor.
-     * @param query The query
+     * @param query A query
      */
     public CacheKey(final Query query) {
-        this(
-            query,
-            new Sticky(new HexOf(new Murmur3Hash(new BytesQuery(query))))
-        );
-    }
-
-    /**
-     * Ctor.
-     * @param query The query
-     * @param hash The query's hash
-     */
-    public CacheKey(final Query query, final Text hash) {
-        this(query, new UncheckedText(hash));
-    }
-
-    /**
-     * Ctor.
-     * @param query The query
-     * @param hash The query's hash
-     */
-    public CacheKey(final Query query, final UncheckedText hash) {
-        this.qry = query;
-        this.hsh = hash;
-    }
-
-    @Override
-    public Query domain() {
-        return this.qry;
-    }
-
-    @Override
-    public String hash() {
-        return this.hsh.asString();
-    }
-
-    @Override
-    public boolean equals(final Object other) {
-        return other instanceof CacheKey
-            && this.hash().equals(CacheKey.class.cast(other).hash());
-    }
-
-    @Override
-    public int hashCode() {
-        return this.hash().hashCode();
+        super(query, new BytesQuery(query));
     }
 }