XBEAN-453 - honor Option.CASE_INSENSITIVE_PROPERTIES for ctors

xbean-reflect/src/main/java/org/apache/xbean/recipe/ObjectRecipe.java

@@ -24,11 +24,14 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
 
 import org.apache.xbean.propertyeditor.PropertyEditorRegistry;
 import org.apache.xbean.recipe.ReflectionUtil.*;
@@ -270,7 +273,11 @@ protected Object internalCreate(Type expectedType, boolean lazyRefAllowed) throw
 
         //
         // clone the properties so they can be used again
-        Map<Property,Object> propertyValues = new LinkedHashMap<Property,Object>(properties);
+        Map<Property,Object> propertyValues = options.contains(Option.CASE_INSENSITIVE_PROPERTIES)
+                ? new TreeMap<>(Comparator.comparing(property -> property.name, String.CASE_INSENSITIVE_ORDER))
+                : new LinkedHashMap<>();
+
+        propertyValues.putAll(properties);
 
         //
         // create the instance
@@ -567,11 +574,18 @@ private Factory findFactory(Type expectedType) {
             consturctorClass = type;
         }
 
+        Set<String> availableProperties = getProperties().keySet();
+        if (options.contains(Option.CASE_INSENSITIVE_PROPERTIES)) {
+            Set<String> caseInsensitiveProperties = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+            caseInsensitiveProperties.addAll(availableProperties);
+            availableProperties = caseInsensitiveProperties;
+        }
+
         ConstructorFactory constructor = ReflectionUtil.findConstructor(
                 consturctorClass,
                 constructorArgNames,
                 constructorArgTypes,
-                getProperties().keySet(),
+                availableProperties,
                 options);
 
         return constructor;

xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java

@@ -1039,7 +1039,7 @@ private static String toParameterList(List<? extends Class<?>> parameterTypes) {
             for (int i = 0; i < parameterTypes.size(); i++) {
                 Class type = parameterTypes.get(i);
                 if (i > 0) buffer.append(", ");
-                buffer.append(type.getName());
+                buffer.append(type != null ? type.getName() : "...");
             }
         } else {
             buffer.append("...");

xbean-reflect/src/test/java/org/apache/xbean/recipe/XBean353Test.java

@@ -0,0 +1,55 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.xbean.recipe;
+
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class XBean353Test {
+
+    @Test
+    public void testCreateObjectCaseInsensitive() {
+        final Map<String, Object> availableProperties = new HashMap<>();
+        availableProperties.put("PoolSize", 10);
+
+        final String[] paramNames = new String[]{"poolSize"};
+        ObjectRecipe recipe = new ObjectRecipe(Constructor.class, paramNames);
+        recipe.setAllProperties(availableProperties);
+        recipe.allow(Option.CASE_INSENSITIVE_PROPERTIES);
+
+        final Object o = recipe.create();
+        assertNotNull(o);
+        assertTrue(o instanceof Constructor);
+        assertEquals(10, ((Constructor) o).poolSize);
+    }
+
+    public static class Constructor {
+
+        int poolSize;
+
+        public Constructor(int poolSize) {
+            this.poolSize = poolSize;
+        }
+    }
+}