Merge pull request quarkusio#52526 from michalvavrik/feature/fix-new-dev-svc-model-reflective-eq

Fix detection of new dev service model changes for situations when service config is a constant

Author: holly-cummins

core/runtime/src/main/java/io/quarkus/devservices/crossclassloader/runtime/ComparableDevServicesConfig.java

@@ -52,12 +52,16 @@ private static boolean reflectiveEquals(Object config, Object otherConfig) {
         }
 
         try {
+            boolean foundConfigInterface = false;
             while (clazz != null) {
                 // Get all interfaces implemented by the class
                 for (Class<?> iface : clazz.getInterfaces()) {
                     // Check if the interface is a config one
 
                     if (isConfigInterface(iface)) {
+                        if (!foundConfigInterface) {
+                            foundConfigInterface = true;
+                        }
                         // For each method in the interface
                         // In the future, if we wanted some methods to be ignored, we could use a marker annotation in the config object
                         for (Method method : iface.getMethods()) {
@@ -83,7 +87,10 @@ private static boolean reflectiveEquals(Object config, Object otherConfig) {
                 otherClazz = otherClazz.getSuperclass();
 
             }
-            return true;
+            if (foundConfigInterface) {
+                return true;
+            }
+            return config.equals(otherConfig);
         } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException ex) {
             throw new RuntimeException(ex);
         }

core/runtime/src/test/java/io/quarkus/devservices/crossclassloader/runtime/ComparableDevServicesConfigTest.java

@@ -96,6 +96,20 @@ public void nullUuidIsHandled() {
                 new ComparableDevServicesConfig(null, null, null, config).hashCode());
     }
 
+    @Test
+    public void sameConstantsAreEqual() {
+        var a1 = new ComparableDevServicesConfig(uuid, null, null, "1");
+        var a2 = new ComparableDevServicesConfig(uuid, null, null, "1");
+        assertEquals(a1, a2);
+    }
+
+    @Test
+    public void differentConstantsAreNotEqual() {
+        var a1 = new ComparableDevServicesConfig(uuid, null, null, "2");
+        var a2 = new ComparableDevServicesConfig(uuid, null, null, "1");
+        assertNotEquals(a1, a2);
+    }
+
     @ConfigGroup
     interface CI {