gh-2457 double caching issue

core/cache/src/main/java/uk/gov/gchq/gaffer/cache/Cache.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2020 Crown Copyright
+ * Copyright 2018-2022 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package uk.gov.gchq.gaffer.cache;
 
 import uk.gov.gchq.gaffer.cache.exception.CacheOperationException;
+import uk.gov.gchq.gaffer.core.exception.GafferRuntimeException;
 
 import java.util.Collections;
 import java.util.Set;
@@ -55,8 +56,17 @@ protected void addToCache(final String key, final V value, final boolean overwri
     }
 
     public Set<String> getAllKeys() {
-        final Set<String> allKeysFromCache = CacheServiceLoader.getService().getAllKeysFromCache(cacheName);
-        return (null == allKeysFromCache) ? null : Collections.unmodifiableSet(allKeysFromCache);
+        try {
+            final Set<String> allKeysFromCache;
+            if (CacheServiceLoader.isEnabled()) {
+                allKeysFromCache = CacheServiceLoader.getService().getAllKeysFromCache(cacheName);
+            } else {
+                throw new GafferRuntimeException("Cache is not enabled, check it was Initialised");
+            }
+            return (null == allKeysFromCache) ? null : Collections.unmodifiableSet(allKeysFromCache);
+        } catch (final Exception e) {
+            throw new GafferRuntimeException("Error getting all keys", e);
+        }
     }
 
     /**

core/graph/src/main/java/uk/gov/gchq/gaffer/graph/Graph.java

@@ -18,6 +18,8 @@
 
 import com.google.common.collect.Lists;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -447,8 +449,7 @@ public String getDescription() {
      * Returns all the {@link StoreTrait}s for the contained {@link Store}
      * implementation
      *
-     * @return a {@link Set} of all of the {@link StoreTrait}s that the store
-     *         has.
+     * @return a {@link Set} of all of the {@link StoreTrait}s that the store has.
      */
     @Deprecated
     public Set<StoreTrait> getStoreTraits() {
@@ -975,4 +976,29 @@ private Schema cloneSchema(final Schema schema) {
             return null != schema ? schema.clone() : null;
         }
     }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        final Graph graph = (Graph) o;
+
+        return new EqualsBuilder()
+                .append(new GraphSerialisable.Builder(this).build(), new GraphSerialisable.Builder(graph).build())
+                .isEquals();
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder(17, 37)
+                .append(store)
+                .append(config)
+                .toHashCode();
+    }
 }