DATACMNS-804 - ParametersParameterAccessor now correctly iterates over only the bindable values.

Corrected the way the BindableParametersIterator works by limiting the upper bound of the iteration to the number of actually bindable parameters.

Author: odrotbohm

src/main/java/org/springframework/data/repository/query/ParametersParameterAccessor.java

@@ -145,33 +145,49 @@ public boolean hasBindableNullValue() {
 	 * @see org.springframework.data.repository.query.ParameterAccessor#iterator()
 	 */
 	public BindableParameterIterator iterator() {
-		return new BindableParameterIterator();
+		return new BindableParameterIterator(this);
 	}
 
 	/**
 	 * Iterator class to allow traversing all bindable parameters inside the accessor.
 	 * 
 	 * @author Oliver Gierke
 	 */
-	private class BindableParameterIterator implements Iterator<Object> {
+	private static class BindableParameterIterator implements Iterator<Object> {
+
+		private final int bindableParameterCount;
+		private final ParameterAccessor accessor;
 
 		private int currentIndex = 0;
 
+		/**
+		 * Creates a new {@link BindableParameterIterator}.
+		 * 
+		 * @param accessor must not be {@literal null}.
+		 */
+		public BindableParameterIterator(ParametersParameterAccessor accessor) {
+
+			Assert.notNull(accessor, "ParametersParameterAccessor must not be null!");
+
+			this.accessor = accessor;
+			this.bindableParameterCount = accessor.getParameters().getBindableParameters().getNumberOfParameters();
+		}
+
 		/**
 		 * Returns the next bindable parameter.
 		 * 
 		 * @return
 		 */
 		public Object next() {
-			return getBindableValue(currentIndex++);
+			return accessor.getBindableValue(currentIndex++);
 		}
 
 		/*
 		 * (non-Javadoc)
 		 * @see java.util.Iterator#hasNext()
 		 */
 		public boolean hasNext() {
-			return values.size() > currentIndex;
+			return bindableParameterCount > currentIndex;
 		}
 
 		/*

src/test/java/org/springframework/data/repository/query/ParametersParameterAccessorUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 the original author or authors.
+ * Copyright 2011-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.
@@ -15,14 +15,15 @@
  */
 package org.springframework.data.repository.query;
 
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
 import java.lang.reflect.Method;
 import java.util.Iterator;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 
 /**
@@ -65,6 +66,21 @@ public void detectsNullValue() throws Exception {
 		assertThat(accessor.hasBindableNullValue(), is(false));
 	}
 
+	/**
+	 * @see DATACMNS-804
+	 */
+	@Test
+	public void iteratesonlyOverBindableValues() throws Exception {
+
+		Method method = Sample.class.getMethod("method", Pageable.class, String.class);
+		DefaultParameters parameters = new DefaultParameters(method);
+
+		ParametersParameterAccessor accessor = new ParametersParameterAccessor(parameters,
+				new Object[] { new PageRequest(0, 10), "Foo" });
+
+		assertThat(accessor, is(iterableWithSize(1)));
+	}
+
 	interface Sample {
 
 		void method(String string, int integer);