Merge pull request #571 from elandau/bugfix/bridge_interpolation

Interpolation not properly bridged when bridging archaius1 to archaius2.

archaius2-archaius1-bridge/src/main/java/com/netflix/archaius/bridge/AbstractConfigurationBridge.java

@@ -192,4 +192,8 @@ public void onConfigUpdated(Config config) {
             }
         });
     }
+
+    public Object resolve(String value) {
+        return config.resolve(value);
+    }
 }

archaius2-archaius1-bridge/src/main/java/com/netflix/archaius/bridge/StaticAbstractConfiguration.java

@@ -211,6 +211,16 @@ protected void addPropertyDirect(String key, Object value) {
         delegate.addPropertyDirect(key, value);
     }
 
+    @Override
+    protected String interpolate(String base) {
+        return delegate.resolve(base).toString();
+    }
+
+    @Override
+    protected Object interpolate(Object value) {
+        return delegate.resolve(value.toString());
+    }
+
     @Override
     protected void clearPropertyDirect(String key) {
         delegate.clearProperty(key);

archaius2-archaius1-bridge/src/test/java/com/netflix/archaius/bridge/AbstractConfigurationBridgeTest.java

@@ -244,4 +244,19 @@ public void testCommonConfigurationListener() {
     	Mockito.verify(listener, Mockito.times(2)).configurationChanged(Mockito.any());
 
     }
+
+    @Test
+    public void verifyValueInterpollation() {
+        AbstractConfiguration config = ConfigurationManager.getConfigInstance();
+        config.setProperty("foo", "${ABC:true}");
+        boolean value = config.getBoolean("foo");
+        Assert.assertTrue(value);
+    }
+
+    @Test
+    public void verifyMissingProperty() {
+        AbstractConfiguration config = ConfigurationManager.getConfigInstance();
+        Boolean value = config.getBoolean("foo", null);
+        Assert.assertNull(value);
+    }
 }