minor tweaks for readability, test coverage

Author: PeteGillinElastic

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/IngestGeoIpPlugin.java

@@ -88,12 +88,14 @@ public class IngestGeoIpPlugin extends Plugin
         PersistentTaskPlugin,
         ActionPlugin,
         ReloadablePlugin {
+
     private static final Setting<Long> CACHE_SIZE_COUNT = Setting.longSetting(
         "ingest.geoip.cache_size",
         1000,
         0,
         Setting.Property.NodeScope
     );
+
     private static final Setting<ByteSizeValue> CACHE_SIZE_BYTES = Setting.byteSizeSetting(
         "ingest.geoip.cache_memory_size",
         ByteSizeValue.MINUS_ONE,

modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpCacheTests.java

@@ -54,10 +54,8 @@ public void testCachesAndEvictsResults_maxBytes() {
         String ip2 = "127.0.0.2";
         String databasePath2 = "path/to/db";
         FakeResponse response2 = new FakeResponse(222);
-        long totalSize = GeoIpCache.keySizeInBytes(ip1, databasePath1) + response1.sizeInBytes() + GeoIpCache.keySizeInBytes(
-            ip2,
-            databasePath2
-        ) + response2.sizeInBytes();
+        long totalSize = GeoIpCache.keySizeInBytes(ip1, databasePath1) + GeoIpCache.keySizeInBytes(ip2, databasePath2) + response1
+            .sizeInBytes() + response2.sizeInBytes();
 
         GeoIpCache justBigEnoughCache = GeoIpCache.createGeoIpCacheWithMaxBytes(ByteSizeValue.ofBytes(totalSize));
         justBigEnoughCache.putIfAbsent(projectId, ip1, databasePath1, ip -> response1);
@@ -129,11 +127,19 @@ public void testThrowsFunctionsException() {
         assertEquals("bad", ex.getMessage());
     }
 
-    public void testInvalidInit() {
+    public void testInvalidInit_maxCount() {
         IllegalArgumentException ex = expectThrows(IllegalArgumentException.class, () -> GeoIpCache.createGeoIpCacheWithMaxCount(-1));
         assertEquals("geoip max cache size must be 0 or greater", ex.getMessage());
     }
 
+    public void testInvalidInit_maxBytes() {
+        IllegalArgumentException ex = expectThrows(
+            IllegalArgumentException.class,
+            () -> GeoIpCache.createGeoIpCacheWithMaxBytes(ByteSizeValue.MINUS_ONE)
+        );
+        assertEquals("geoip max cache size in bytes must be 0 or greater", ex.getMessage());
+    }
+
     public void testGetCacheStats() {
         final long maxCacheSize = 2;
         final AtomicLong testNanoTime = new AtomicLong(0);