From 543378ef891f6ac41e90ba1b029f7962b93f1b00 Mon Sep 17 00:00:00 2001 From: GCHQDev404 Date: Mon, 31 Oct 2022 10:45:15 +0000 Subject: [PATCH] gh-2457 PR requests. --- core/store/src/main/java/uk/gov/gchq/gaffer/store/Store.java | 3 +-- .../gchq/gaffer/federatedstore/FederatedGraphStorage.java | 3 ++- .../gov/gchq/gaffer/federatedstore/FederatedStoreCache.java | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/store/src/main/java/uk/gov/gchq/gaffer/store/Store.java b/core/store/src/main/java/uk/gov/gchq/gaffer/store/Store.java index dd28d415d51..af371e81af3 100644 --- a/core/store/src/main/java/uk/gov/gchq/gaffer/store/Store.java +++ b/core/store/src/main/java/uk/gov/gchq/gaffer/store/Store.java @@ -253,8 +253,7 @@ public static Store createStore(final String graphId, final Schema schema, final final String storeClass = storeProperties.getStoreClass(); if (isNull(storeClass)) { - throw new IllegalArgumentException(String - .format("The Store class name was not found in the store properties for key: %s, GraphId: %s", + throw new IllegalArgumentException(String.format("The Store class name was not found in the store properties for key: %s, GraphId: %s", StoreProperties.STORE_CLASS, graphId)); } diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedGraphStorage.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedGraphStorage.java index 9b6d675fc3e..28f897c907a 100644 --- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedGraphStorage.java +++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedGraphStorage.java @@ -125,7 +125,7 @@ public void put(final GraphSerialisable graph, final FederatedAccess access) thr addToCache(graph, access); } catch (final Exception e) { - throw new StorageException("Error adding graph " + graphId + (nonNull(e.getMessage()) ? (" to storage due to: " + e.getMessage()) : "."), e); + throw new StorageException(String.format("Error adding graph %s%s", graphId, nonNull(e.getMessage()) ? (" to storage due to: " + e.getMessage()) : "."), e); } } else { throw new StorageException("Graph cannot be null"); @@ -506,6 +506,7 @@ private GraphSerialisable getGraphToUpdate(final String graphId, final Predicate /** * Enum for the Graph Properties or Schema */ + //TODO FS Why is there an enum? public enum GraphConfigEnum { SCHEMA("schema"), PROPERTIES("properties"); diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreCache.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreCache.java index f79af2345b3..79695777692 100644 --- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreCache.java +++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreCache.java @@ -40,7 +40,10 @@ public FederatedStoreCache() { } public FederatedStoreCache(final String cacheNameSuffix) { - super(String.format("%s%s", CACHE_SERVICE_NAME_PREFIX, nonNull(cacheNameSuffix) ? "_" + cacheNameSuffix.toLowerCase() : "")); + super(String.format("%s%s", CACHE_SERVICE_NAME_PREFIX, + nonNull(cacheNameSuffix) + ? "_" + cacheNameSuffix.toLowerCase() + : "")); } /**