From f39cda670d46ad8b027195eb34aa3043f02c635b Mon Sep 17 00:00:00 2001
From: Martin Macko <macko.mar@gmail.com>
Date: Sun, 30 Oct 2016 18:09:58 +0100
Subject: [PATCH] SPR-14304 Removes makeAccessible from convert

	Removes ReflectionUtils.makeAccessible from convert in
	ObjectToObjectConverter, as method returned from
	getValidatedMember will nevere be private.
---
 .../support/ObjectToObjectConverter.java      |  1 -
 .../support/ObjectToObjectConverterTests.java | 52 +++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 spring-core/src/test/java/org/springframework/core/convert/support/ObjectToObjectConverterTests.java

diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java
index dcbc0aae0939..0854082c27ad 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java
@@ -92,7 +92,6 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 		try {
 			if (member instanceof Method) {
 				Method method = (Method) member;
-				ReflectionUtils.makeAccessible(method);
 				if (!Modifier.isStatic(method.getModifiers())) {
 					return method.invoke(source);
 				}
diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/ObjectToObjectConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/ObjectToObjectConverterTests.java
new file mode 100644
index 000000000000..892fdbf3c507
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/core/convert/support/ObjectToObjectConverterTests.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2002-2016 the original author or authors.
+ *
+ * Licensed 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
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.springframework.core.convert.support;
+
+import org.junit.Test;
+import org.springframework.core.convert.TypeDescriptor;
+
+/**
+ * @author Martin Macko
+ */
+public class ObjectToObjectConverterTests {
+
+    @Test(expected = IllegalStateException.class)
+    public void testPrivateMethodOrConstructor() {
+        ObjectToObjectConverter converter = new ObjectToObjectConverter();
+        converter.convert(new Bar(), TypeDescriptor.valueOf(Bar.class), TypeDescriptor.valueOf(Foo.class));
+    }
+
+    static class Foo {
+        public Foo(){}
+        private Foo(Bar bar) {}
+        private static Foo valueOf(Bar bar) {
+            return new Foo();
+        }
+        private static Foo of(Bar bar) {
+            return new Foo();
+        }
+        private static Foo from(Bar bar) {
+            return new Foo();
+        }
+    }
+
+    static class Bar {
+        private Foo toFoo() {
+            return new Foo();
+        }
+    }
+}