Merge pull request #728 from Netflix/ignore-static-methods

Skip static methods on config interfaces
Netflix · Aug 19, 2024 · 3424aa3 · 3424aa3
2 parents ffed4cb + f12296c
commit 3424aa3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/archaius2-core/src/main/java/com/netflix/archaius/ConfigProxyFactory.java b/archaius2-core/src/main/java/com/netflix/archaius/ConfigProxyFactory.java
@@ -23,6 +23,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.lang.reflect.Proxy;
 import java.lang.reflect.Type;
 import java.util.Collections;
@@ -232,6 +233,9 @@ <T> T newProxy(final Class<T> type, final String initialPrefix, boolean immutabl
         // Each setter will be mapped to a Property<T> for the property name:
         //      prefix + lowerCamelCaseDerivedPropertyName
         for (Method method : type.getMethods()) {
+            if (Modifier.isStatic(method.getModifiers())) {
+                continue;
+            }
             MethodInvokerHolder methodInvokerHolder = buildInvokerForMethod(type, prefix, method, proxyObject, immutable);
 
             propertyNames.put(method, methodInvokerHolder.propertyName);

diff --git a/archaius2-core/src/test/java/com/netflix/archaius/ProxyFactoryTest.java b/archaius2-core/src/test/java/com/netflix/archaius/ProxyFactoryTest.java
@@ -650,4 +650,28 @@ public void testNestedInterfaceWithCustomDecoder() {
         assertEquals(5, proxy.intValue());
         assertEquals("BLAH", proxy.customValue().value());
     }
+
+    @Configuration(prefix = "config")
+    public interface ConfigWithStaticMethods {
+        @PropertyName(name = "foo")
+        @DefaultValue("foo-value")
+        String foo();
+
+        static String bar() {
+            return "bar-value";
+        }
+
+        static int baz(int x) {
+            return x + 1;
+        }
+    }
+
+    @Test
+    public void testInterfaceWithStaticMethods() {
+        SettableConfig config = new DefaultSettableConfig();
+        config.setProperty("config.foo", "foo-value-updated");
+        ConfigProxyFactory proxyFactory = new ConfigProxyFactory(config, config.getDecoder(), DefaultPropertyFactory.from(config));
+        ConfigWithStaticMethods configWithStaticMethods = proxyFactory.newProxy(ConfigWithStaticMethods.class);
+        assertEquals("foo-value-updated", configWithStaticMethods.foo());
+    }
 }