gh-2447 Fixed GraphSerialisable equals.

gchq · Oct 27, 2022 · ecfeffe · ecfeffe
1 parent d5326d8
commit ecfeffe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/core/graph/src/main/java/uk/gov/gchq/gaffer/graph/GraphSerialisable.java b/core/graph/src/main/java/uk/gov/gchq/gaffer/graph/GraphSerialisable.java
@@ -33,6 +33,7 @@
 
 import java.io.InputStream;
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Properties;
 
 import static java.util.Objects.isNull;
@@ -124,9 +125,9 @@ public boolean equals(final Object obj) {
         } else {
             final GraphSerialisable that = (GraphSerialisable) obj;
             rtn = new EqualsBuilder()
-                    .append(this.getConfig(), that.getConfig())
-                    .append(this.getSchema(), that.getSchema())
-                    .append(this.getStoreProperties(), that.getStoreProperties())
+                    .appendSuper(Arrays.equals(this.getSerialisedConfig(), that.getSerialisedConfig()))
+                    .appendSuper(Arrays.equals(this.getSerialisedSchema(), that.getSerialisedSchema()))
+                    .appendSuper(Arrays.equals(this.getSerialisedProperties(), that.getSerialisedProperties()))
                     .build();
         }
         return rtn;
@@ -144,9 +145,9 @@ public String toString() {
     @Override
     public int hashCode() {
         return new HashCodeBuilder(13, 31)
-                .append(this.getConfig())
-                .append(this.getSchema())
-                .append(this.getStoreProperties().getProperties())
+                .append(this.getSerialisedConfig())
+                .append(this.getSerialisedSchema())
+                .append(this.getSerialisedProperties())
                 .build();
     }
 

diff --git a/...ederated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedGraphStorage.java b/...ederated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedGraphStorage.java
@@ -66,7 +66,6 @@ public class FederatedGraphStorage {
     public static final String ACCESS_IS_NULL = "Can not put graph into storage without a FederatedAccess key.";
     public static final String GRAPH_IDS_NOT_VISIBLE = "The following graphIds are not visible or do not exist: %s";
     private static final Logger LOGGER = LoggerFactory.getLogger(FederatedGraphStorage.class);
-    private final Map<FederatedAccess, Set<Graph>> storage = new HashMap<>();
     private final FederatedStoreCache federatedStoreCache;
     private Boolean isCacheEnabled = false;
     private GraphLibrary graphLibrary;