Fix test failures

Author: somiljain2006

plugin/src/main/java/io/jenkins/plugins/casc/impl/configurators/DescriptorConfigurator.java

@@ -66,17 +66,22 @@ private List<String> resolvePossibleNames(Descriptor descriptor) {
         return Optional.ofNullable(descriptor.getClass().getAnnotation(Symbol.class))
                 .map(s -> Arrays.asList(s.value()))
                 .orElseGet(() -> {
+                    String fallbackName = fromPascalCaseToCamelCase(
+                            unwrapAnonymous(descriptor.getKlass().toJavaClass()).getSimpleName());
+
                     Class<?> typeParam = extractDescriptorTypeParameter(descriptor.getClass());
+                    String derivedName = null;
 
-                    Class<?> targetClass = typeParam != null
-                            ? typeParam
-                            : descriptor.getKlass().toJavaClass();
+                    if (typeParam != null) {
+                        Class<?> targetClass = unwrapAnonymous(typeParam);
+                        derivedName = fromPascalCaseToCamelCase(targetClass.getSimpleName());
+                    }
 
-                    while (targetClass.isAnonymousClass()) {
-                        targetClass = targetClass.getSuperclass();
+                    if (derivedName != null && !derivedName.equals(fallbackName)) {
+                        return Arrays.asList(fallbackName, derivedName);
                     }
 
-                    return singletonList(fromPascalCaseToCamelCase(targetClass.getSimpleName()));
+                    return singletonList(fallbackName);
                 });
     }
 
@@ -111,10 +116,17 @@ private Class<?> extractDescriptorTypeParameter(Class<?> clazz) {
 
     private static String fromPascalCaseToCamelCase(String s) {
         if (s == null || s.isEmpty()) {
-            return s != null ? s : "";
+            throw new IllegalStateException("Cannot derive configurator name from an empty class name");
         }
         StringBuilder sb = new StringBuilder(s);
         sb.setCharAt(0, Character.toLowerCase(s.charAt(0)));
         return sb.toString();
     }
+
+    private Class<?> unwrapAnonymous(Class<?> clazz) {
+        while (clazz.isAnonymousClass()) {
+            clazz = clazz.getSuperclass();
+        }
+        return clazz;
+    }
 }