GH-37 Reorganize StoredProcedure private members

Author: AlexanderYastrebov

src/main/java/de/zalando/sprocwrapper/proxy/StoredProcedure.java

@@ -72,20 +72,20 @@ class StoredProcedure {
 
     private final Class<?> returnType;
 
+    private final VirtualShardKeyStrategy shardStrategy;
+    private final List<ShardKeyParameter> shardKeyParameters;
+    private final boolean autoPartition;
+
     // whether the result type is a collection (List)
     private final boolean collectionResult;
     private final boolean runOnAllShards;
     private final boolean searchShards;
-    private final boolean autoPartition;
     private final boolean parallel;
     private final boolean readOnly;
     private final WriteTransaction writeTransaction;
 
     private final Executor executor;
 
-    private final VirtualShardKeyStrategy shardStrategy;
-    private final List<ShardKeyParameter> shardKeyParameters;
-
     private static final Executor MULTI_ROW_SIMPLE_TYPE_EXECUTOR = new MultiRowSimpleTypeExecutor();
     private static final Executor MULTI_ROW_TYPE_MAPPER_EXECUTOR = new MultiRowTypeMapperExecutor();
     private static final Executor SINGLE_ROW_SIMPLE_TYPE_EXECUTOR = new SingleRowSimpleTypeExecutor();
@@ -106,6 +106,10 @@ public StoredProcedure(final String name, final String query, final List<StoredP
         this.sqlParameterList = createSqlParameterList(params);
         this.query = (query != null ? query : defaultQuery(name, sqlParameterList));
 
+        this.shardStrategy = sStrategy;
+        this.shardKeyParameters = new ArrayList<>(shardKeyParameters);
+        this.autoPartition = isAutoPartition(shardKeyParameters);
+
         this.runOnAllShards = runOnAllShards;
         this.searchShards = searchShards;
         this.parallel = parallel;
@@ -115,11 +119,6 @@ public StoredProcedure(final String name, final String query, final List<StoredP
         this.adivsoryLock = advisoryLock;
         this.timeout = timeout;
 
-        this.shardStrategy = sStrategy;
-        this.shardKeyParameters = new ArrayList<>(shardKeyParameters);
-
-        this.autoPartition = isAutoPartition(shardKeyParameters);
-
         ValueTransformer<?, ?> valueTransformerForClass = null;
         Executor exec;
         if (genericType instanceof ParameterizedType) {
@@ -246,6 +245,10 @@ public String getSqlParameterList() {
         return sqlParameterList;
     }
 
+    public String getQuery() {
+        return query;
+    }
+
     private static String createSqlParameterList(final List<StoredProcedureParameter> params) {
         String s = "";
         boolean first = true;
@@ -262,14 +265,19 @@ private static String createSqlParameterList(final List<StoredProcedureParameter
         return s;
     }
 
-    public String getQuery() {
-        return query;
-    }
-
     private static String defaultQuery(final String name, final String sqlParameterList) {
         return "SELECT * FROM " + name + " ( " + sqlParameterList + " )";
     }
 
+    private static boolean isAutoPartition(final List<ShardKeyParameter> shardKeyParameters) {
+        for (ShardKeyParameter p : shardKeyParameters) {
+            if (List.class.isAssignableFrom(p.getType())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * build execution string like create_or_update_multiple_objects({"(a,b)","(c,d)" }).
      *
@@ -376,15 +384,6 @@ private Map<Integer, Object[]> partitionArguments(final DataSourceProvider dataS
         return argumentsByShardId;
     }
 
-    private boolean isAutoPartition(final List<ShardKeyParameter> shardKeyParameters) {
-        for (ShardKeyParameter p : shardKeyParameters) {
-            if (List.class.isAssignableFrom(p.getType())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     @Immutable
     private static final class Call implements Callable<Object> {