From 9214acb6946c8c7c4d5f138b9332e4464677b8a6 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Tue, 29 Aug 2017 15:26:15 +0200
Subject: [PATCH] DATACASS-146 - Polishing.

Reorder methods to match interface ordering.
---
 .../CassandraParametersParameterAccessor.java | 24 +++++++++----------
 .../query/ConvertingParameterAccessor.java    | 14 +++++++----
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessor.java
index 4d8da9344..f7124fee5 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessor.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessor.java
@@ -50,14 +50,6 @@ public class CassandraParametersParameterAccessor extends ParametersParameterAcc
 		this.values = Arrays.asList(values);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#findCassandraType(int)
-	 */
-	public CassandraType findCassandraType(int index) {
-		return getParameters().getParameter(index).getCassandraType();
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#getDataType(int)
@@ -73,11 +65,10 @@ public class CassandraParametersParameterAccessor extends ParametersParameterAcc
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ParametersParameterAccessor#getParameters()
+	 * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#findCassandraType(int)
 	 */
-	@Override
-	public CassandraParameters getParameters() {
-		return (CassandraParameters) super.getParameters();
+	public CassandraType findCassandraType(int index) {
+		return getParameters().getParameter(index).getCassandraType();
 	}
 
 	/*
@@ -89,6 +80,15 @@ public class CassandraParametersParameterAccessor extends ParametersParameterAcc
 		return getParameters().getParameter(index).getType();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.ParametersParameterAccessor#getParameters()
+	 */
+	@Override
+	public CassandraParameters getParameters() {
+		return (CassandraParameters) super.getParameters();
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.repository.query.CassandraParameterAccessor#getValues()
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java
index 745df92a3..7bf716a7f 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java
@@ -84,11 +84,6 @@ class ConvertingParameterAccessor implements CassandraParameterAccessor {
 		return potentiallyConvert(index, delegate.getBindableValue(index), null);
 	}
 
-	@Override
-	public CassandraType findCassandraType(int index) {
-		return delegate.findCassandraType(index);
-	}
-
 	/* (non-Javadoc)
 	 * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#getDataType(int)
 	 */
@@ -100,6 +95,15 @@ class ConvertingParameterAccessor implements CassandraParameterAccessor {
 		return (dataType != null ? dataType : converter.getMappingContext().getDataType(getParameterType(index)));
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#findCassandraType(int)
+	 */
+	@Override
+	public CassandraType findCassandraType(int index) {
+		return delegate.findCassandraType(index);
+	}
+
+
 	/* (non-Javadoc)
 	 * @see org.springframework.data.cassandra.repository.query.CassandraParameterAccessor#getParameterType(int)
 	 */