Use Optional for getConfig/resolveConfig calls

Some minor changes to log output as well

4 files changed, 24 insertions, 34 deletions

diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java
index f84d447e3a1..d243d9c6dff 100644
--- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java
+++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java
@@ -6,7 +6,7 @@ import org.junit.Test;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author hmusum
@@ -17,8 +17,8 @@ public class MemoryCacheConfigClientTest {
     public void basic() {
         MemoryCacheConfigClient client = new MemoryCacheConfigClient(new MemoryCache());
         client.memoryCache().update(ConfigTester.fooConfig);
-        assertEquals(ConfigTester.fooConfig, client.getConfig(ConfigTester.fooConfig, null));
-        assertNull(client.getConfig(ConfigTester.barConfig, null));
+        assertEquals(ConfigTester.fooConfig, client.getConfig(ConfigTester.fooConfig, null).orElseThrow());
+        assertTrue(client.getConfig(ConfigTester.barConfig, null).isEmpty());
 
         assertEquals("N/A", client.getActiveSourceConnection());
         assertEquals(List.of("N/A"), client.getSourceConnections());
diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheTest.java
index 1a919ad3988..b0cba728a0c 100644
--- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheTest.java
+++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheTest.java
@@ -15,7 +15,6 @@ import java.util.ArrayList;
 import java.util.Optional;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -84,14 +83,12 @@ public class MemoryCacheTest {
         assertTrue(cache.containsKey(cacheKey));
         assertTrue(cache.containsKey(cacheKey2));
 
-        RawConfig response = cache.get(cacheKey);
-        assertNotNull(response);
+        RawConfig response = cache.get(cacheKey).orElseThrow();
         assertEquals(defName, response.getName());
         assertEquals(payload.toString(), response.getPayload().toString());
         assertEquals(generation, response.getGeneration());
 
-        response = cache.get(cacheKey2);
-        assertNotNull(response);
+        response = cache.get(cacheKey2).orElseThrow();
         assertEquals(defName2, response.getName());
         assertEquals(payload2.toString(), response.getPayload().toString());
         assertEquals(generation, response.getGeneration());
@@ -108,14 +105,12 @@ public class MemoryCacheTest {
         assertEquals(2, cache.size());
         assertTrue(cache.containsKey(cacheKey));
 
-        RawConfig response = cache.get(cacheKey);
-        assertNotNull(response);
+        RawConfig response = cache.get(cacheKey).orElseThrow();
         assertEquals(defName, response.getName());
         assertEquals(payload.getData(), response.getPayload().getData());
         assertEquals(generation, response.getGeneration());
 
-        response = cache.get(cacheKeyDifferentMd5);
-        assertNotNull(response);
+        response = cache.get(cacheKeyDifferentMd5).orElseThrow();
         assertEquals(defName, response.getName());
         assertEquals(payloadDifferentMd5.getData(), response.getPayload().getData());
         assertEquals(generation, response.getGeneration());
diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockConfigSourceClient.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockConfigSourceClient.java
index d0724b9dbd0..e02ca22d0a0 100644
--- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockConfigSourceClient.java
+++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockConfigSourceClient.java
@@ -7,6 +7,7 @@ import com.yahoo.vespa.config.protocol.JRTServerConfigRequest;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * Mock client that always returns with config immediately
@@ -24,10 +25,10 @@ public class MockConfigSourceClient implements ConfigSourceClient{
     }
 
     @Override
-    public RawConfig getConfig(RawConfig input, JRTServerConfigRequest request) {
-        final RawConfig config = getConfig(input.getKey());
+    public Optional<RawConfig> getConfig(RawConfig input, JRTServerConfigRequest request) {
+        RawConfig config = getConfig(input.getKey());
         memoryCache.update(config);
-        return config;
+        return Optional.of(config);
     }
 
     private RawConfig getConfig(ConfigKey<?> configKey) {
diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java
index 09eae6a297d..1bcd1562a85 100644
--- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java
+++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java
@@ -62,11 +62,10 @@ public class ProxyServerTest {
         ConfigTester tester = new ConfigTester();
         MemoryCache memoryCache = proxy.memoryCache();
         assertEquals(0, memoryCache.size());
-        RawConfig res = proxy.resolveConfig(tester.createRequest(fooConfig));
-        assertNotNull(res);
+        RawConfig res = proxy.resolveConfig(tester.createRequest(fooConfig)).orElseThrow();
         assertEquals(ConfigTester.fooPayload.toString(), res.getPayload().toString());
         assertEquals(1, memoryCache.size());
-        assertEquals(res, memoryCache.get(new ConfigCacheKey(fooConfig.getKey(), fooConfig.getDefMd5())));
+        assertEquals(res, memoryCache.get(new ConfigCacheKey(fooConfig.getKey(), fooConfig.getDefMd5())).orElseThrow());
     }
 
     /**
@@ -111,15 +110,14 @@ public class ProxyServerTest {
         ConfigTester tester = new ConfigTester();
         MemoryCache memoryCache = proxy.memoryCache();
         assertEquals(0, memoryCache.size());
-        RawConfig res = proxy.resolveConfig(tester.createRequest(fooConfig));
-        assertNotNull(res);
+        RawConfig res = proxy.resolveConfig(tester.createRequest(fooConfig)).orElseThrow();
         assertEquals(ConfigTester.fooPayload.toString(), res.getPayload().toString());
         assertEquals(1, memoryCache.size());
-        assertEquals(res, memoryCache.get(new ConfigCacheKey(fooConfig.getKey(), fooConfig.getDefMd5())));
+        assertEquals(res, memoryCache.get(new ConfigCacheKey(fooConfig.getKey(), fooConfig.getDefMd5())).orElseThrow());
 
         // Trying same config again
         JRTServerConfigRequest newRequestBasedOnResponse = tester.createRequest(res);
-        RawConfig res2 = proxy.resolveConfig(newRequestBasedOnResponse);
+        RawConfig res2 = proxy.resolveConfig(newRequestBasedOnResponse).orElseThrow();
         assertFalse(ProxyServer.configOrGenerationHasChanged(res2, newRequestBasedOnResponse));
         assertEquals(1, memoryCache.size());
     }
@@ -137,8 +135,7 @@ public class ProxyServerTest {
         MemoryCache memoryCache = proxy.memoryCache();
         assertEquals(0, memoryCache.size());
 
-        RawConfig res = proxy.resolveConfig(tester.createRequest(fooConfig));
-        assertNotNull(res);
+        RawConfig res = proxy.resolveConfig(tester.createRequest(fooConfig)).orElseThrow();
         assertNotNull(res.getPayload());
         assertTrue(res.isError());
         assertEquals(0, memoryCache.size());
@@ -148,14 +145,13 @@ public class ProxyServerTest {
         source.put(fooConfig.getKey(), createConfigWithNextConfigGeneration(fooConfig, 0));
 
         // Verify that we get the config now and that it is cached
-        res = proxy.resolveConfig(tester.createRequest(fooConfig));
-        assertNotNull(res);
+        res = proxy.resolveConfig(tester.createRequest(fooConfig)).orElseThrow();
         assertNotNull(res.getPayload().getData());
         assertEquals(ConfigTester.fooPayload.toString(), res.getPayload().toString());
         assertEquals(1, memoryCache.size());
 
         JRTServerConfigRequest newRequestBasedOnResponse = tester.createRequest(res);
-        RawConfig res2 = proxy.resolveConfig(newRequestBasedOnResponse);
+        RawConfig res2 = proxy.resolveConfig(newRequestBasedOnResponse).orElseThrow();
         assertFalse(ProxyServer.configOrGenerationHasChanged(res2, newRequestBasedOnResponse));
         assertEquals(1, memoryCache.size());
     }
@@ -172,7 +168,7 @@ public class ProxyServerTest {
         MemoryCache cache = proxy.memoryCache();
 
         assertEquals(0, cache.size());
-        RawConfig res = proxy.resolveConfig(tester.createRequest(fooConfig));
+        RawConfig res = proxy.resolveConfig(tester.createRequest(fooConfig)).orElseThrow();
         assertNotNull(res);
         assertEquals(ConfigTester.fooPayload.toString(), res.getPayload().toString());
         assertEquals(1, cache.size());
@@ -183,8 +179,7 @@ public class ProxyServerTest {
                                               0, fooConfig.getDefContent(), Optional.empty());
         source.put(fooConfig.getKey(), emptyConfig);
 
-        res = proxy.resolveConfig(tester.createRequest(fooConfig));
-        assertNotNull(res.getPayload());
+        res = proxy.resolveConfig(tester.createRequest(fooConfig)).orElseThrow();
         assertEquals(emptyConfig.getPayload().toString(), res.getPayload().toString());
         assertEquals(0, cache.size());
 
@@ -193,7 +188,7 @@ public class ProxyServerTest {
         source.put(fooConfig.getKey(), createConfigWithNextConfigGeneration(fooConfig, 0));
 
         // Verify that we get the config now and that it is cached
-        res = proxy.resolveConfig(tester.createRequest(fooConfig));
+        res = proxy.resolveConfig(tester.createRequest(fooConfig)).orElseThrow();
         assertNotNull(res.getPayload().getData());
         assertEquals(ConfigTester.fooPayload.toString(), res.getPayload().toString());
         assertEquals(1, cache.size());
@@ -202,15 +197,14 @@ public class ProxyServerTest {
     @Test
     public void testReconfiguration() {
         ConfigTester tester = new ConfigTester();
-        RawConfig res = proxy.resolveConfig(tester.createRequest(fooConfig));
-        assertNotNull(res);
+        RawConfig res = proxy.resolveConfig(tester.createRequest(fooConfig)).orElseThrow();
         assertEquals(ConfigTester.fooPayload.toString(), res.getPayload().toString());
 
         // Simulate deployment, add config with new config generation
         long previousGeneration = res.getGeneration();
         source.put(fooConfig.getKey(), createConfigWithNextConfigGeneration(res, 0));
         JRTServerConfigRequest newRequestBasedOnResponse = tester.createRequest(res);
-        RawConfig res2 = proxy.resolveConfig(newRequestBasedOnResponse);
+        RawConfig res2 = proxy.resolveConfig(newRequestBasedOnResponse).orElseThrow();
         assertEquals(previousGeneration + 1, res2.getGeneration());
         assertTrue(ProxyServer.configOrGenerationHasChanged(res2, newRequestBasedOnResponse));
     }