From e2a7057af91272418e8c0e6d52d9488e4e13cd8e Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Thu, 5 Mar 2015 17:13:56 +0100
Subject: [PATCH] DATACMNS-652 - Removed JDK 8 reference from TypeDiscoverer.

Removed accidentally introduced reference to JDK 8's Executable as common super type of Constructor and Method.
---
 .../data/util/TypeDiscoverer.java             | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/springframework/data/util/TypeDiscoverer.java b/src/main/java/org/springframework/data/util/TypeDiscoverer.java
index 060535ee0..ed76d1f9a 100644
--- a/src/main/java/org/springframework/data/util/TypeDiscoverer.java
+++ b/src/main/java/org/springframework/data/util/TypeDiscoverer.java
@@ -17,7 +17,6 @@ package org.springframework.data.util;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Constructor;
-import java.lang.reflect.Executable;
 import java.lang.reflect.Field;
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.Method;
@@ -158,7 +157,15 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
 	public List<TypeInformation<?>> getParameterTypes(Constructor<?> constructor) {
 
 		Assert.notNull(constructor, "Constructor must not be null!");
-		return getParameterTypes((Executable) constructor);
+
+		Type[] types = constructor.getGenericParameterTypes();
+		List<TypeInformation<?>> result = new ArrayList<TypeInformation<?>>(types.length);
+
+		for (Type parameterType : types) {
+			result.add(createInfo(parameterType));
+		}
+
+		return result;
 	}
 
 	/*
@@ -408,7 +415,15 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
 	public List<TypeInformation<?>> getParameterTypes(Method method) {
 
 		Assert.notNull(method, "Method most not be null!");
-		return getParameterTypes((Executable) method);
+
+		Type[] types = method.getGenericParameterTypes();
+		List<TypeInformation<?>> result = new ArrayList<TypeInformation<?>>(types.length);
+
+		for (Type parameterType : types) {
+			result.add(createInfo(parameterType));
+		}
+
+		return result;
 	}
 
 	/* 
@@ -479,18 +494,6 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
 		return createInfo(arguments[index]);
 	}
 
-	private List<TypeInformation<?>> getParameterTypes(Executable executable) {
-
-		Type[] types = executable.getGenericParameterTypes();
-		List<TypeInformation<?>> result = new ArrayList<TypeInformation<?>>(types.length);
-
-		for (Type parameterType : types) {
-			result.add(createInfo(parameterType));
-		}
-
-		return result;
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see java.lang.Object#equals(java.lang.Object)