Address reviewer comments

Author: vjovanov

compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/LambdaUtils.java

@@ -120,7 +120,11 @@ public static String findStableLambdaName(ClassInitializationPlugin cip, Provide
 
     public static boolean isLambdaType(ResolvedJavaType type) {
         String typeName = type.getName();
-        return type.isFinalFlagSet() && typeName.contains(LAMBDA_CLASS_NAME_SUBSTRING) && lambdaMatcher(type.getName()).find();
+        return type.isFinalFlagSet() && isLambdaName(typeName);
+    }
+
+    public static boolean isLambdaName(String name) {
+        return name.contains(LAMBDA_CLASS_NAME_SUBSTRING) && lambdaMatcher(name).find();
     }
 
     private static String createStableLambdaName(ResolvedJavaType lambdaType, List<ResolvedJavaMethod> targetMethods) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ConfigurationParserUtils.java

@@ -60,15 +60,6 @@ public static ReflectionConfigurationParser<ConditionalElement<Class<?>>> create
                         ConfigurationFiles.Options.StrictConfiguration.getValue());
     }
 
-    public static int parseAndRegisterConfigurations(ConfigurationParser parser, ImageClassLoader classLoader, String featureName,
-                    HostedOptionKey<LocatableMultiOptionValue.Paths> configFilesOption, HostedOptionKey<LocatableMultiOptionValue.Strings> configResourcesOption, String directoryFileName) {
-
-        List<Path> paths = configFilesOption.getValue().values();
-        List<String> resourceValues = configResourcesOption.getValue().values();
-        var configFilesOptionName = configFilesOption.getName();
-        return parseAndRegisterConfigurations(parser, classLoader, featureName, configFilesOptionName, configResourcesOption.getName(), directoryFileName, paths, resourceValues);
-    }
-
     /**
      * Parses configurations in files specified by {@code configFilesOption} and resources specified
      * by {@code configResourcesOption} and registers the parsed elements using
@@ -78,6 +69,15 @@ public static int parseAndRegisterConfigurations(ConfigurationParser parser, Ima
      * @param directoryFileName file name for searches via {@link ConfigurationFiles}.
      * @return the total number of successfully parsed configuration files and resources.
      */
+    public static int parseAndRegisterConfigurations(ConfigurationParser parser, ImageClassLoader classLoader, String featureName,
+                    HostedOptionKey<LocatableMultiOptionValue.Paths> configFilesOption, HostedOptionKey<LocatableMultiOptionValue.Strings> configResourcesOption, String directoryFileName) {
+
+        List<Path> paths = configFilesOption.getValue().values();
+        List<String> resourceValues = configResourcesOption.getValue().values();
+        var configFilesOptionName = configFilesOption.getName();
+        return parseAndRegisterConfigurations(parser, classLoader, featureName, configFilesOptionName, configResourcesOption.getName(), directoryFileName, paths, resourceValues);
+    }
+
     public static int parseAndRegisterConfigurations(ConfigurationParser parser, ImageClassLoader classLoader,
                     String featureName, String configFilesOptionName, String configResourcesOptionName,
                     String directoryFileName, List<Path> paths,

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/serialize/SerializationFeature.java

@@ -528,7 +528,8 @@ public void registerWithTargetConstructorClass(ConfigurationCondition condition,
 
     private static void registerForSerialization(Class<?> serializationTargetClass) {
 
-        if (Serializable.class.isAssignableFrom(serializationTargetClass) || !Proxy.isProxyClass(serializationTargetClass)) {
+        /* Proxy classes have special treatment so no registration needed */
+        if (Serializable.class.isAssignableFrom(serializationTargetClass) && !Proxy.isProxyClass(serializationTargetClass)) {
             /*
              * ObjectStreamClass.computeDefaultSUID is always called at runtime to verify
              * serialization class consistency, so need to register all constructors, methods and

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java

@@ -252,29 +252,40 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
         }
     }
 
-    private static boolean nonNullJavaConstants(ValueNode... clazz) {
-        for (ValueNode valueNode : clazz) {
+    private static boolean nonNullJavaConstants(ValueNode... valueNodes) {
+        for (ValueNode valueNode : valueNodes) {
             if (!valueNode.isJavaConstant() || valueNode.isNullConstant()) {
                 return false;
             }
         }
         return true;
     }
 
-    private static boolean isParseLimit(String pattern) {
+    private static boolean isLimitPattern(String pattern) {
         int eqNdx = pattern.indexOf('=');
         // not a limit pattern
         return eqNdx >= 0;
     }
 
+    /**
+     * Extract the target class name from the <code>pattern</code>. We support two formats:
+     * <ul>
+     * <li>A concrete class name (pattern doesn't end with .* or .**), e.g.:
+     * <code>com.foo.Bar</code>. In this case we register the concrete class for
+     * serialization/deserialization.</li>
+     * <li>A concrete class name that ends with a <code>$$Lambda$*</code>. In this case, we register
+     * all lambdas that originate in the methods of the target class for
+     * serialization/deserialization.</li>
+     * </ul>
+     */
     private static void parsePatternAndRegister(String pattern) {
         String[] patterns = pattern.split(";");
         for (String p : patterns) {
             int nameLen = p.length();
             if (nameLen == 0) {
                 continue;
             }
-            if (isParseLimit(p)) {
+            if (isLimitPattern(p)) {
                 continue;
             }
             boolean negate = p.charAt(0) == '!';
@@ -293,7 +304,7 @@ private static void parsePatternAndRegister(String pattern) {
                     // Pattern is a classname (possibly empty) with a trailing wildcard
                     final String className = p.substring(poffset, nameLen - 1);
                     if (!negate) {
-                        if (className.contains(LambdaUtils.LAMBDA_CLASS_NAME_SUBSTRING)) {
+                        if (className.endsWith(LambdaUtils.LAMBDA_CLASS_NAME_SUBSTRING)) {
                             try {
                                 String lambdaHolderName = className.split(LambdaUtils.LAMBDA_SPLIT_PATTERN)[0];
                                 RuntimeSerialization.registerLambdaCapturingClass(Class.forName(lambdaHolderName, false, Thread.currentThread().getContextClassLoader()));