gh-2457 PR requests.

gchq · Oct 31, 2022 · 543378e · 543378e
1 parent 6bb3655
commit 543378e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 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
@@ -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/...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
@@ -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/.../federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreCache.java b/.../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()
+                        : ""));
     }
 
     /**