Merge pull request #417 from elandau/feature/scoped_property

config: Dynamic properties that are only scoped to the client (no default)

ribbon-core/src/main/java/com/netflix/client/config/IClientConfig.java

@@ -155,6 +155,13 @@ public interface IClientConfig {
      */
     <T> Property<T> getDynamicProperty(IClientConfigKey<T> key);
 
+    /**
+     * @return Get a property that is only scoped to this client.
+     */
+    default <T> Property<T> getScopedProperty(IClientConfigKey<T> key) {
+        throw new UnsupportedOperationException();
+    }
+
     /**
      * @return Return a dynamically updated property that is a mapping of all properties prefixed by the key name to an
      * object with static method valueOf(Map{@literal <}String, String{@literal >})

ribbon-core/src/main/java/com/netflix/client/config/ReloadableClientConfig.java

@@ -198,10 +198,10 @@ public abstract class ReloadableClientConfig implements IClientConfig {
     public final <T> Property<T> getGlobalProperty(IClientConfigKey<T> key) {
         LOG.debug("Get global property {} default {}", key.key(), key.defaultValue());
 
-        return createProperty(
+        return (Property<T>) dynamicProperties.computeIfAbsent(key, ignore -> createProperty(
                 () -> resolver.get(key.key(), key.type()),
                 key::defaultValue,
-                true);
+                true));
     }
 
     interface ReloadableProperty<T> extends Property<T> {
@@ -241,12 +241,16 @@ public abstract class ReloadableClientConfig implements IClientConfig {
             return value;
         }
 
-        value = getIfSet(key);
+        return getIfSet(key);
+    }
+
+    private <T> Optional<T> resolverScopedProperty(IClientConfigKey<T> key) {
+        Optional<T> value = resolver.get(clientName + "." + getNameSpace() + "." + key.key(), key.type());
         if (value.isPresent()) {
             return value;
         }
 
-        return Optional.empty();
+        return getIfSet(key);
     }
 
     @Override
@@ -296,12 +300,20 @@ public abstract class ReloadableClientConfig implements IClientConfig {
         return getClientDynamicProperty(key, true);
     }
 
+    @Override
+    public <T> Property<T> getScopedProperty(IClientConfigKey<T> key) {
+        return (Property<T>) dynamicProperties.computeIfAbsent(key, ignore -> createProperty(
+                () -> resolverScopedProperty(key),
+                key::defaultValue,
+                isDynamic));
+    }
+
     @Override
     public <T> Property<T> getPrefixMappedProperty(IClientConfigKey<T> key) {
-        return createProperty(
+        return (Property<T>) dynamicProperties.computeIfAbsent(key, ignore -> createProperty(
                 getPrefixedMapPropertySupplier(key),
                 key::defaultValue,
-                isDynamic);
+                isDynamic));
     }
 
     private <T> Supplier<Optional<T>> getPrefixedMapPropertySupplier(IClientConfigKey<T> key) {

ribbon-core/src/test/java/com/netflix/client/config/ClientConfigTest.java

@@ -191,5 +191,17 @@ public class ClientConfigTest {
         Property<CustomValueOf> prop = clientConfig.getDynamicProperty(CUSTOM_KEY);
         Assert.assertEquals("value", prop.getOrDefault().getValue());
     }
+
+    @Test
+    public void testScopedProperty() {
+        ConfigurationManager.getConfigInstance().setProperty("ribbon.foo.ScopePropertyTimeout", "2000");
+        ConfigurationManager.getConfigInstance().setProperty("testScopedProperty.ribbon.foo.ScopePropertyTimeout", "1000");
+
+        DefaultClientConfigImpl clientConfig = new DefaultClientConfigImpl();
+        clientConfig.setClientName("testScopedProperty");
+
+        Property<Integer> prop = clientConfig.getScopedProperty(new CommonClientConfigKey<Integer>("foo.ScopePropertyTimeout", 0) {});
+        Assert.assertEquals(1000, prop.get().get().intValue());
+    }
 }