groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sun...@apache.org
Subject [6/7] groovy git commit: Rename element getters of tuples to support groovy style better
Date Sat, 17 Nov 2018 17:28:18 GMT
http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/lang/Tuple0.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Tuple0.java b/src/main/groovy/groovy/lang/Tuple0.java
index eaffc25..3713201 100644
--- a/src/main/groovy/groovy/lang/Tuple0.java
+++ b/src/main/groovy/groovy/lang/Tuple0.java
@@ -45,112 +45,112 @@ public class Tuple0 extends Tuple {
      * Concatenate a tuple to this tuple.
      */
     public final <T1> Tuple1<T1> concat(Tuple1<T1> tuple) {
-        return new Tuple1<>(tuple.v1());
+        return new Tuple1<>(tuple.getV1());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T1, T2> Tuple2<T1, T2> concat(Tuple2<T1, T2> tuple) {
-        return new Tuple2<>(tuple.v1(), tuple.v2());
+        return new Tuple2<>(tuple.getV1(), tuple.getV2());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T1, T2, T3> Tuple3<T1, T2, T3> concat(Tuple3<T1, T2, T3> tuple) {
-        return new Tuple3<>(tuple.v1(), tuple.v2(), tuple.v3());
+        return new Tuple3<>(tuple.getV1(), tuple.getV2(), tuple.getV3());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T1, T2, T3, T4> Tuple4<T1, T2, T3, T4> concat(Tuple4<T1, T2, T3, T4> tuple) {
-        return new Tuple4<>(tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4());
+        return new Tuple4<>(tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T1, T2, T3, T4, T5> Tuple5<T1, T2, T3, T4, T5> concat(Tuple5<T1, T2, T3, T4, T5> tuple) {
-        return new Tuple5<>(tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5());
+        return new Tuple5<>(tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T1, T2, T3, T4, T5, T6> Tuple6<T1, T2, T3, T4, T5, T6> concat(Tuple6<T1, T2, T3, T4, T5, T6> tuple) {
-        return new Tuple6<>(tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6());
+        return new Tuple6<>(tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T1, T2, T3, T4, T5, T6, T7> Tuple7<T1, T2, T3, T4, T5, T6, T7> concat(Tuple7<T1, T2, T3, T4, T5, T6, T7> tuple) {
-        return new Tuple7<>(tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7());
+        return new Tuple7<>(tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T1, T2, T3, T4, T5, T6, T7, T8> Tuple8<T1, T2, T3, T4, T5, T6, T7, T8> concat(Tuple8<T1, T2, T3, T4, T5, T6, T7, T8> tuple) {
-        return new Tuple8<>(tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8());
+        return new Tuple8<>(tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T1, T2, T3, T4, T5, T6, T7, T8, T9> Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9> concat(Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9> tuple) {
-        return new Tuple9<>(tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9());
+        return new Tuple9<>(tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> concat(Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> tuple) {
-        return new Tuple10<>(tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10());
+        return new Tuple10<>(tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> concat(Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> tuple) {
-        return new Tuple11<>(tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11());
+        return new Tuple11<>(tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> concat(Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> tuple) {
-        return new Tuple12<>(tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11(), tuple.v12());
+        return new Tuple12<>(tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11(), tuple.getV12());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> concat(Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> tuple) {
-        return new Tuple13<>(tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11(), tuple.v12(), tuple.v13());
+        return new Tuple13<>(tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11(), tuple.getV12(), tuple.getV13());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> concat(Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> tuple) {
-        return new Tuple14<>(tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11(), tuple.v12(), tuple.v13(), tuple.v14());
+        return new Tuple14<>(tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11(), tuple.getV12(), tuple.getV13(), tuple.getV14());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> concat(Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> tuple) {
-        return new Tuple15<>(tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11(), tuple.v12(), tuple.v13(), tuple.v14(), tuple.v15());
+        return new Tuple15<>(tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11(), tuple.getV12(), tuple.getV13(), tuple.getV14(), tuple.getV15());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> concat(Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> tuple) {
-        return new Tuple16<>(tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11(), tuple.v12(), tuple.v13(), tuple.v14(), tuple.v15(), tuple.v16());
+        return new Tuple16<>(tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11(), tuple.getV12(), tuple.getV13(), tuple.getV14(), tuple.getV15(), tuple.getV16());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/lang/Tuple1.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Tuple1.java b/src/main/groovy/groovy/lang/Tuple1.java
index 1e84013..f9b39a8 100644
--- a/src/main/groovy/groovy/lang/Tuple1.java
+++ b/src/main/groovy/groovy/lang/Tuple1.java
@@ -44,7 +44,7 @@ public class Tuple1<T1> extends Tuple {
         return v1;
     }
 
-    public T1 v1() {
+    public T1 getV1() {
         return v1;
     }
 
@@ -59,105 +59,105 @@ public class Tuple1<T1> extends Tuple {
      * Concatenate a tuple to this tuple.
      */
     public final <T2> Tuple2<T1, T2> concat(Tuple1<T2> tuple) {
-        return new Tuple2<>(v1, tuple.v1());
+        return new Tuple2<>(v1, tuple.getV1());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T2, T3> Tuple3<T1, T2, T3> concat(Tuple2<T2, T3> tuple) {
-        return new Tuple3<>(v1, tuple.v1(), tuple.v2());
+        return new Tuple3<>(v1, tuple.getV1(), tuple.getV2());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T2, T3, T4> Tuple4<T1, T2, T3, T4> concat(Tuple3<T2, T3, T4> tuple) {
-        return new Tuple4<>(v1, tuple.v1(), tuple.v2(), tuple.v3());
+        return new Tuple4<>(v1, tuple.getV1(), tuple.getV2(), tuple.getV3());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T2, T3, T4, T5> Tuple5<T1, T2, T3, T4, T5> concat(Tuple4<T2, T3, T4, T5> tuple) {
-        return new Tuple5<>(v1, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4());
+        return new Tuple5<>(v1, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T2, T3, T4, T5, T6> Tuple6<T1, T2, T3, T4, T5, T6> concat(Tuple5<T2, T3, T4, T5, T6> tuple) {
-        return new Tuple6<>(v1, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5());
+        return new Tuple6<>(v1, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T2, T3, T4, T5, T6, T7> Tuple7<T1, T2, T3, T4, T5, T6, T7> concat(Tuple6<T2, T3, T4, T5, T6, T7> tuple) {
-        return new Tuple7<>(v1, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6());
+        return new Tuple7<>(v1, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T2, T3, T4, T5, T6, T7, T8> Tuple8<T1, T2, T3, T4, T5, T6, T7, T8> concat(Tuple7<T2, T3, T4, T5, T6, T7, T8> tuple) {
-        return new Tuple8<>(v1, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7());
+        return new Tuple8<>(v1, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T2, T3, T4, T5, T6, T7, T8, T9> Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9> concat(Tuple8<T2, T3, T4, T5, T6, T7, T8, T9> tuple) {
-        return new Tuple9<>(v1, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8());
+        return new Tuple9<>(v1, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T2, T3, T4, T5, T6, T7, T8, T9, T10> Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> concat(Tuple9<T2, T3, T4, T5, T6, T7, T8, T9, T10> tuple) {
-        return new Tuple10<>(v1, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9());
+        return new Tuple10<>(v1, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> concat(Tuple10<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> tuple) {
-        return new Tuple11<>(v1, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10());
+        return new Tuple11<>(v1, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> concat(Tuple11<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> tuple) {
-        return new Tuple12<>(v1, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11());
+        return new Tuple12<>(v1, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> concat(Tuple12<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> tuple) {
-        return new Tuple13<>(v1, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11(), tuple.v12());
+        return new Tuple13<>(v1, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11(), tuple.getV12());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> concat(Tuple13<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> tuple) {
-        return new Tuple14<>(v1, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11(), tuple.v12(), tuple.v13());
+        return new Tuple14<>(v1, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11(), tuple.getV12(), tuple.getV13());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> concat(Tuple14<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> tuple) {
-        return new Tuple15<>(v1, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11(), tuple.v12(), tuple.v13(), tuple.v14());
+        return new Tuple15<>(v1, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11(), tuple.getV12(), tuple.getV13(), tuple.getV14());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> concat(Tuple15<T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> tuple) {
-        return new Tuple16<>(v1, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11(), tuple.v12(), tuple.v13(), tuple.v14(), tuple.v15());
+        return new Tuple16<>(v1, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11(), tuple.getV12(), tuple.getV13(), tuple.getV14(), tuple.getV15());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/lang/Tuple10.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Tuple10.java b/src/main/groovy/groovy/lang/Tuple10.java
index 7db0a7c..8cb7036 100644
--- a/src/main/groovy/groovy/lang/Tuple10.java
+++ b/src/main/groovy/groovy/lang/Tuple10.java
@@ -60,43 +60,43 @@ public class Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends Tuple {
         this(tuple.v1, tuple.v2, tuple.v3, tuple.v4, tuple.v5, tuple.v6, tuple.v7, tuple.v8, tuple.v9, tuple.v10);
     }
 
-    public T1 v1() {
+    public T1 getV1() {
         return v1;
     }
 
-    public T2 v2() {
+    public T2 getV2() {
         return v2;
     }
 
-    public T3 v3() {
+    public T3 getV3() {
         return v3;
     }
 
-    public T4 v4() {
+    public T4 getV4() {
         return v4;
     }
 
-    public T5 v5() {
+    public T5 getV5() {
         return v5;
     }
 
-    public T6 v6() {
+    public T6 getV6() {
         return v6;
     }
 
-    public T7 v7() {
+    public T7 getV7() {
         return v7;
     }
 
-    public T8 v8() {
+    public T8 getV8() {
         return v8;
     }
 
-    public T9 v9() {
+    public T9 getV9() {
         return v9;
     }
 
-    public T10 v10() {
+    public T10 getV10() {
         return v10;
     }
 
@@ -112,42 +112,42 @@ public class Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends Tuple {
      * Concatenate a tuple to this tuple.
      */
     public final <T11> Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> concat(Tuple1<T11> tuple) {
-        return new Tuple11<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, tuple.v1());
+        return new Tuple11<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, tuple.getV1());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T11, T12> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> concat(Tuple2<T11, T12> tuple) {
-        return new Tuple12<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, tuple.v1(), tuple.v2());
+        return new Tuple12<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, tuple.getV1(), tuple.getV2());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T11, T12, T13> Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> concat(Tuple3<T11, T12, T13> tuple) {
-        return new Tuple13<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, tuple.v1(), tuple.v2(), tuple.v3());
+        return new Tuple13<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, tuple.getV1(), tuple.getV2(), tuple.getV3());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T11, T12, T13, T14> Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> concat(Tuple4<T11, T12, T13, T14> tuple) {
-        return new Tuple14<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4());
+        return new Tuple14<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T11, T12, T13, T14, T15> Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> concat(Tuple5<T11, T12, T13, T14, T15> tuple) {
-        return new Tuple15<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5());
+        return new Tuple15<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T11, T12, T13, T14, T15, T16> Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> concat(Tuple6<T11, T12, T13, T14, T15, T16> tuple) {
-        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6());
+        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/lang/Tuple11.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Tuple11.java b/src/main/groovy/groovy/lang/Tuple11.java
index 3bdbcae..511f01f 100644
--- a/src/main/groovy/groovy/lang/Tuple11.java
+++ b/src/main/groovy/groovy/lang/Tuple11.java
@@ -62,47 +62,47 @@ public class Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> extends Tuple
         this(tuple.v1, tuple.v2, tuple.v3, tuple.v4, tuple.v5, tuple.v6, tuple.v7, tuple.v8, tuple.v9, tuple.v10, tuple.v11);
     }
 
-    public T1 v1() {
+    public T1 getV1() {
         return v1;
     }
 
-    public T2 v2() {
+    public T2 getV2() {
         return v2;
     }
 
-    public T3 v3() {
+    public T3 getV3() {
         return v3;
     }
 
-    public T4 v4() {
+    public T4 getV4() {
         return v4;
     }
 
-    public T5 v5() {
+    public T5 getV5() {
         return v5;
     }
 
-    public T6 v6() {
+    public T6 getV6() {
         return v6;
     }
 
-    public T7 v7() {
+    public T7 getV7() {
         return v7;
     }
 
-    public T8 v8() {
+    public T8 getV8() {
         return v8;
     }
 
-    public T9 v9() {
+    public T9 getV9() {
         return v9;
     }
 
-    public T10 v10() {
+    public T10 getV10() {
         return v10;
     }
 
-    public T11 v11() {
+    public T11 getV11() {
         return v11;
     }
 
@@ -118,35 +118,35 @@ public class Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> extends Tuple
      * Concatenate a tuple to this tuple.
      */
     public final <T12> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> concat(Tuple1<T12> tuple) {
-        return new Tuple12<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, tuple.v1());
+        return new Tuple12<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, tuple.getV1());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T12, T13> Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> concat(Tuple2<T12, T13> tuple) {
-        return new Tuple13<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, tuple.v1(), tuple.v2());
+        return new Tuple13<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, tuple.getV1(), tuple.getV2());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T12, T13, T14> Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> concat(Tuple3<T12, T13, T14> tuple) {
-        return new Tuple14<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, tuple.v1(), tuple.v2(), tuple.v3());
+        return new Tuple14<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, tuple.getV1(), tuple.getV2(), tuple.getV3());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T12, T13, T14, T15> Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> concat(Tuple4<T12, T13, T14, T15> tuple) {
-        return new Tuple15<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4());
+        return new Tuple15<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T12, T13, T14, T15, T16> Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> concat(Tuple5<T12, T13, T14, T15, T16> tuple) {
-        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5());
+        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/lang/Tuple12.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Tuple12.java b/src/main/groovy/groovy/lang/Tuple12.java
index 556f11e..b14ab76 100644
--- a/src/main/groovy/groovy/lang/Tuple12.java
+++ b/src/main/groovy/groovy/lang/Tuple12.java
@@ -65,51 +65,51 @@ public class Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> extends
         this(tuple.v1, tuple.v2, tuple.v3, tuple.v4, tuple.v5, tuple.v6, tuple.v7, tuple.v8, tuple.v9, tuple.v10, tuple.v11, tuple.v12);
     }
 
-    public T1 v1() {
+    public T1 getV1() {
         return v1;
     }
 
-    public T2 v2() {
+    public T2 getV2() {
         return v2;
     }
 
-    public T3 v3() {
+    public T3 getV3() {
         return v3;
     }
 
-    public T4 v4() {
+    public T4 getV4() {
         return v4;
     }
 
-    public T5 v5() {
+    public T5 getV5() {
         return v5;
     }
 
-    public T6 v6() {
+    public T6 getV6() {
         return v6;
     }
 
-    public T7 v7() {
+    public T7 getV7() {
         return v7;
     }
 
-    public T8 v8() {
+    public T8 getV8() {
         return v8;
     }
 
-    public T9 v9() {
+    public T9 getV9() {
         return v9;
     }
 
-    public T10 v10() {
+    public T10 getV10() {
         return v10;
     }
 
-    public T11 v11() {
+    public T11 getV11() {
         return v11;
     }
 
-    public T12 v12() {
+    public T12 getV12() {
         return v12;
     }
 
@@ -125,28 +125,28 @@ public class Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> extends
      * Concatenate a tuple to this tuple.
      */
     public final <T13> Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> concat(Tuple1<T13> tuple) {
-        return new Tuple13<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, tuple.v1());
+        return new Tuple13<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, tuple.getV1());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T13, T14> Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> concat(Tuple2<T13, T14> tuple) {
-        return new Tuple14<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, tuple.v1(), tuple.v2());
+        return new Tuple14<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, tuple.getV1(), tuple.getV2());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T13, T14, T15> Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> concat(Tuple3<T13, T14, T15> tuple) {
-        return new Tuple15<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, tuple.v1(), tuple.v2(), tuple.v3());
+        return new Tuple15<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, tuple.getV1(), tuple.getV2(), tuple.getV3());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T13, T14, T15, T16> Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> concat(Tuple4<T13, T14, T15, T16> tuple) {
-        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4());
+        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/lang/Tuple13.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Tuple13.java b/src/main/groovy/groovy/lang/Tuple13.java
index c2c0281..406147a 100644
--- a/src/main/groovy/groovy/lang/Tuple13.java
+++ b/src/main/groovy/groovy/lang/Tuple13.java
@@ -67,55 +67,55 @@ public class Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ext
         this(tuple.v1, tuple.v2, tuple.v3, tuple.v4, tuple.v5, tuple.v6, tuple.v7, tuple.v8, tuple.v9, tuple.v10, tuple.v11, tuple.v12, tuple.v13);
     }
 
-    public T1 v1() {
+    public T1 getV1() {
         return v1;
     }
 
-    public T2 v2() {
+    public T2 getV2() {
         return v2;
     }
 
-    public T3 v3() {
+    public T3 getV3() {
         return v3;
     }
 
-    public T4 v4() {
+    public T4 getV4() {
         return v4;
     }
 
-    public T5 v5() {
+    public T5 getV5() {
         return v5;
     }
 
-    public T6 v6() {
+    public T6 getV6() {
         return v6;
     }
 
-    public T7 v7() {
+    public T7 getV7() {
         return v7;
     }
 
-    public T8 v8() {
+    public T8 getV8() {
         return v8;
     }
 
-    public T9 v9() {
+    public T9 getV9() {
         return v9;
     }
 
-    public T10 v10() {
+    public T10 getV10() {
         return v10;
     }
 
-    public T11 v11() {
+    public T11 getV11() {
         return v11;
     }
 
-    public T12 v12() {
+    public T12 getV12() {
         return v12;
     }
 
-    public T13 v13() {
+    public T13 getV13() {
         return v13;
     }
 
@@ -130,21 +130,21 @@ public class Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> ext
      * Concatenate a tuple to this tuple.
      */
     public final <T14> Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> concat(Tuple1<T14> tuple) {
-        return new Tuple14<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, tuple.v1());
+        return new Tuple14<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, tuple.getV1());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T14, T15> Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> concat(Tuple2<T14, T15> tuple) {
-        return new Tuple15<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, tuple.v1(), tuple.v2());
+        return new Tuple15<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, tuple.getV1(), tuple.getV2());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T14, T15, T16> Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> concat(Tuple3<T14, T15, T16> tuple) {
-        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, tuple.v1(), tuple.v2(), tuple.v3());
+        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, tuple.getV1(), tuple.getV2(), tuple.getV3());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/lang/Tuple14.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Tuple14.java b/src/main/groovy/groovy/lang/Tuple14.java
index bf473c8..f08138a 100644
--- a/src/main/groovy/groovy/lang/Tuple14.java
+++ b/src/main/groovy/groovy/lang/Tuple14.java
@@ -68,59 +68,59 @@ public class Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14
         this(tuple.v1, tuple.v2, tuple.v3, tuple.v4, tuple.v5, tuple.v6, tuple.v7, tuple.v8, tuple.v9, tuple.v10, tuple.v11, tuple.v12, tuple.v13, tuple.v14);
     }
 
-    public T1 v1() {
+    public T1 getV1() {
         return v1;
     }
 
-    public T2 v2() {
+    public T2 getV2() {
         return v2;
     }
 
-    public T3 v3() {
+    public T3 getV3() {
         return v3;
     }
 
-    public T4 v4() {
+    public T4 getV4() {
         return v4;
     }
 
-    public T5 v5() {
+    public T5 getV5() {
         return v5;
     }
 
-    public T6 v6() {
+    public T6 getV6() {
         return v6;
     }
 
-    public T7 v7() {
+    public T7 getV7() {
         return v7;
     }
 
-    public T8 v8() {
+    public T8 getV8() {
         return v8;
     }
 
-    public T9 v9() {
+    public T9 getV9() {
         return v9;
     }
 
-    public T10 v10() {
+    public T10 getV10() {
         return v10;
     }
 
-    public T11 v11() {
+    public T11 getV11() {
         return v11;
     }
 
-    public T12 v12() {
+    public T12 getV12() {
         return v12;
     }
 
-    public T13 v13() {
+    public T13 getV13() {
         return v13;
     }
 
-    public T14 v14() {
+    public T14 getV14() {
         return v14;
     }
 
@@ -135,14 +135,14 @@ public class Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14
      * Concatenate a tuple to this tuple.
      */
     public final <T15> Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> concat(Tuple1<T15> tuple) {
-        return new Tuple15<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, tuple.v1());
+        return new Tuple15<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, tuple.getV1());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T15, T16> Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> concat(Tuple2<T15, T16> tuple) {
-        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, tuple.v1(), tuple.v2());
+        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, tuple.getV1(), tuple.getV2());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/lang/Tuple15.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Tuple15.java b/src/main/groovy/groovy/lang/Tuple15.java
index 2075ef3..2981472 100644
--- a/src/main/groovy/groovy/lang/Tuple15.java
+++ b/src/main/groovy/groovy/lang/Tuple15.java
@@ -70,63 +70,63 @@ public class Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14
         this(tuple.v1, tuple.v2, tuple.v3, tuple.v4, tuple.v5, tuple.v6, tuple.v7, tuple.v8, tuple.v9, tuple.v10, tuple.v11, tuple.v12, tuple.v13, tuple.v14, tuple.v15);
     }
 
-    public T1 v1() {
+    public T1 getV1() {
         return v1;
     }
 
-    public T2 v2() {
+    public T2 getV2() {
         return v2;
     }
 
-    public T3 v3() {
+    public T3 getV3() {
         return v3;
     }
 
-    public T4 v4() {
+    public T4 getV4() {
         return v4;
     }
 
-    public T5 v5() {
+    public T5 getV5() {
         return v5;
     }
 
-    public T6 v6() {
+    public T6 getV6() {
         return v6;
     }
 
-    public T7 v7() {
+    public T7 getV7() {
         return v7;
     }
 
-    public T8 v8() {
+    public T8 getV8() {
         return v8;
     }
 
-    public T9 v9() {
+    public T9 getV9() {
         return v9;
     }
 
-    public T10 v10() {
+    public T10 getV10() {
         return v10;
     }
 
-    public T11 v11() {
+    public T11 getV11() {
         return v11;
     }
 
-    public T12 v12() {
+    public T12 getV12() {
         return v12;
     }
 
-    public T13 v13() {
+    public T13 getV13() {
         return v13;
     }
 
-    public T14 v14() {
+    public T14 getV14() {
         return v14;
     }
 
-    public T15 v15() {
+    public T15 getV15() {
         return v15;
     }
 
@@ -141,7 +141,7 @@ public class Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14
      * Concatenate a tuple to this tuple.
      */
     public final <T16> Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> concat(Tuple1<T16> tuple) {
-        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, tuple.v1());
+        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, tuple.getV1());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/lang/Tuple16.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Tuple16.java b/src/main/groovy/groovy/lang/Tuple16.java
index 4b0b2f0..66ef023 100644
--- a/src/main/groovy/groovy/lang/Tuple16.java
+++ b/src/main/groovy/groovy/lang/Tuple16.java
@@ -72,67 +72,67 @@ public class Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14
         this(tuple.v1, tuple.v2, tuple.v3, tuple.v4, tuple.v5, tuple.v6, tuple.v7, tuple.v8, tuple.v9, tuple.v10, tuple.v11, tuple.v12, tuple.v13, tuple.v14, tuple.v15, tuple.v16);
     }
 
-    public T1 v1() {
+    public T1 getV1() {
         return v1;
     }
 
-    public T2 v2() {
+    public T2 getV2() {
         return v2;
     }
 
-    public T3 v3() {
+    public T3 getV3() {
         return v3;
     }
 
-    public T4 v4() {
+    public T4 getV4() {
         return v4;
     }
 
-    public T5 v5() {
+    public T5 getV5() {
         return v5;
     }
 
-    public T6 v6() {
+    public T6 getV6() {
         return v6;
     }
 
-    public T7 v7() {
+    public T7 getV7() {
         return v7;
     }
 
-    public T8 v8() {
+    public T8 getV8() {
         return v8;
     }
 
-    public T9 v9() {
+    public T9 getV9() {
         return v9;
     }
 
-    public T10 v10() {
+    public T10 getV10() {
         return v10;
     }
 
-    public T11 v11() {
+    public T11 getV11() {
         return v11;
     }
 
-    public T12 v12() {
+    public T12 getV12() {
         return v12;
     }
 
-    public T13 v13() {
+    public T13 getV13() {
         return v13;
     }
 
-    public T14 v14() {
+    public T14 getV14() {
         return v14;
     }
 
-    public T15 v15() {
+    public T15 getV15() {
         return v15;
     }
 
-    public T16 v16() {
+    public T16 getV16() {
         return v16;
     }
 

http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/lang/Tuple2.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Tuple2.java b/src/main/groovy/groovy/lang/Tuple2.java
index 3214c6b..83645c7 100644
--- a/src/main/groovy/groovy/lang/Tuple2.java
+++ b/src/main/groovy/groovy/lang/Tuple2.java
@@ -52,11 +52,11 @@ public class Tuple2<T1, T2> extends Tuple {
         return v2;
     }
 
-    public T1 v1() {
+    public T1 getV1() {
         return v1;
     }
 
-    public T2 v2() {
+    public T2 getV2() {
         return v2;
     }
 
@@ -72,98 +72,98 @@ public class Tuple2<T1, T2> extends Tuple {
      * Concatenate a tuple to this tuple.
      */
     public final <T3> Tuple3<T1, T2, T3> concat(Tuple1<T3> tuple) {
-        return new Tuple3<>(v1, v2, tuple.v1());
+        return new Tuple3<>(v1, v2, tuple.getV1());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T3, T4> Tuple4<T1, T2, T3, T4> concat(Tuple2<T3, T4> tuple) {
-        return new Tuple4<>(v1, v2, tuple.v1(), tuple.v2());
+        return new Tuple4<>(v1, v2, tuple.getV1(), tuple.getV2());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T3, T4, T5> Tuple5<T1, T2, T3, T4, T5> concat(Tuple3<T3, T4, T5> tuple) {
-        return new Tuple5<>(v1, v2, tuple.v1(), tuple.v2(), tuple.v3());
+        return new Tuple5<>(v1, v2, tuple.getV1(), tuple.getV2(), tuple.getV3());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T3, T4, T5, T6> Tuple6<T1, T2, T3, T4, T5, T6> concat(Tuple4<T3, T4, T5, T6> tuple) {
-        return new Tuple6<>(v1, v2, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4());
+        return new Tuple6<>(v1, v2, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T3, T4, T5, T6, T7> Tuple7<T1, T2, T3, T4, T5, T6, T7> concat(Tuple5<T3, T4, T5, T6, T7> tuple) {
-        return new Tuple7<>(v1, v2, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5());
+        return new Tuple7<>(v1, v2, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T3, T4, T5, T6, T7, T8> Tuple8<T1, T2, T3, T4, T5, T6, T7, T8> concat(Tuple6<T3, T4, T5, T6, T7, T8> tuple) {
-        return new Tuple8<>(v1, v2, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6());
+        return new Tuple8<>(v1, v2, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T3, T4, T5, T6, T7, T8, T9> Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9> concat(Tuple7<T3, T4, T5, T6, T7, T8, T9> tuple) {
-        return new Tuple9<>(v1, v2, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7());
+        return new Tuple9<>(v1, v2, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T3, T4, T5, T6, T7, T8, T9, T10> Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> concat(Tuple8<T3, T4, T5, T6, T7, T8, T9, T10> tuple) {
-        return new Tuple10<>(v1, v2, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8());
+        return new Tuple10<>(v1, v2, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T3, T4, T5, T6, T7, T8, T9, T10, T11> Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> concat(Tuple9<T3, T4, T5, T6, T7, T8, T9, T10, T11> tuple) {
-        return new Tuple11<>(v1, v2, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9());
+        return new Tuple11<>(v1, v2, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> concat(Tuple10<T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> tuple) {
-        return new Tuple12<>(v1, v2, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10());
+        return new Tuple12<>(v1, v2, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> concat(Tuple11<T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> tuple) {
-        return new Tuple13<>(v1, v2, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11());
+        return new Tuple13<>(v1, v2, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> concat(Tuple12<T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> tuple) {
-        return new Tuple14<>(v1, v2, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11(), tuple.v12());
+        return new Tuple14<>(v1, v2, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11(), tuple.getV12());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> concat(Tuple13<T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> tuple) {
-        return new Tuple15<>(v1, v2, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11(), tuple.v12(), tuple.v13());
+        return new Tuple15<>(v1, v2, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11(), tuple.getV12(), tuple.getV13());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> concat(Tuple14<T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> tuple) {
-        return new Tuple16<>(v1, v2, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11(), tuple.v12(), tuple.v13(), tuple.v14());
+        return new Tuple16<>(v1, v2, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11(), tuple.getV12(), tuple.getV13(), tuple.getV14());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/lang/Tuple3.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Tuple3.java b/src/main/groovy/groovy/lang/Tuple3.java
index ff5dbc9..ff567f0 100644
--- a/src/main/groovy/groovy/lang/Tuple3.java
+++ b/src/main/groovy/groovy/lang/Tuple3.java
@@ -60,15 +60,15 @@ public class Tuple3<T1, T2, T3> extends Tuple {
         return v3;
     }
 
-    public T1 v1() {
+    public T1 getV1() {
         return v1;
     }
 
-    public T2 v2() {
+    public T2 getV2() {
         return v2;
     }
 
-    public T3 v3() {
+    public T3 getV3() {
         return v3;
     }
 
@@ -83,91 +83,91 @@ public class Tuple3<T1, T2, T3> extends Tuple {
      * Concatenate a tuple to this tuple.
      */
     public final <T4> Tuple4<T1, T2, T3, T4> concat(Tuple1<T4> tuple) {
-        return new Tuple4<>(v1, v2, v3, tuple.v1());
+        return new Tuple4<>(v1, v2, v3, tuple.getV1());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T4, T5> Tuple5<T1, T2, T3, T4, T5> concat(Tuple2<T4, T5> tuple) {
-        return new Tuple5<>(v1, v2, v3, tuple.v1(), tuple.v2());
+        return new Tuple5<>(v1, v2, v3, tuple.getV1(), tuple.getV2());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T4, T5, T6> Tuple6<T1, T2, T3, T4, T5, T6> concat(Tuple3<T4, T5, T6> tuple) {
-        return new Tuple6<>(v1, v2, v3, tuple.v1(), tuple.v2(), tuple.v3());
+        return new Tuple6<>(v1, v2, v3, tuple.getV1(), tuple.getV2(), tuple.getV3());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T4, T5, T6, T7> Tuple7<T1, T2, T3, T4, T5, T6, T7> concat(Tuple4<T4, T5, T6, T7> tuple) {
-        return new Tuple7<>(v1, v2, v3, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4());
+        return new Tuple7<>(v1, v2, v3, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T4, T5, T6, T7, T8> Tuple8<T1, T2, T3, T4, T5, T6, T7, T8> concat(Tuple5<T4, T5, T6, T7, T8> tuple) {
-        return new Tuple8<>(v1, v2, v3, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5());
+        return new Tuple8<>(v1, v2, v3, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T4, T5, T6, T7, T8, T9> Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9> concat(Tuple6<T4, T5, T6, T7, T8, T9> tuple) {
-        return new Tuple9<>(v1, v2, v3, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6());
+        return new Tuple9<>(v1, v2, v3, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T4, T5, T6, T7, T8, T9, T10> Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> concat(Tuple7<T4, T5, T6, T7, T8, T9, T10> tuple) {
-        return new Tuple10<>(v1, v2, v3, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7());
+        return new Tuple10<>(v1, v2, v3, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T4, T5, T6, T7, T8, T9, T10, T11> Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> concat(Tuple8<T4, T5, T6, T7, T8, T9, T10, T11> tuple) {
-        return new Tuple11<>(v1, v2, v3, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8());
+        return new Tuple11<>(v1, v2, v3, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T4, T5, T6, T7, T8, T9, T10, T11, T12> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> concat(Tuple9<T4, T5, T6, T7, T8, T9, T10, T11, T12> tuple) {
-        return new Tuple12<>(v1, v2, v3, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9());
+        return new Tuple12<>(v1, v2, v3, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> concat(Tuple10<T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> tuple) {
-        return new Tuple13<>(v1, v2, v3, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10());
+        return new Tuple13<>(v1, v2, v3, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> concat(Tuple11<T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> tuple) {
-        return new Tuple14<>(v1, v2, v3, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11());
+        return new Tuple14<>(v1, v2, v3, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> concat(Tuple12<T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> tuple) {
-        return new Tuple15<>(v1, v2, v3, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11(), tuple.v12());
+        return new Tuple15<>(v1, v2, v3, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11(), tuple.getV12());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> concat(Tuple13<T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> tuple) {
-        return new Tuple16<>(v1, v2, v3, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11(), tuple.v12(), tuple.v13());
+        return new Tuple16<>(v1, v2, v3, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11(), tuple.getV12(), tuple.getV13());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/lang/Tuple4.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Tuple4.java b/src/main/groovy/groovy/lang/Tuple4.java
index 30793a2..39b2e0e 100644
--- a/src/main/groovy/groovy/lang/Tuple4.java
+++ b/src/main/groovy/groovy/lang/Tuple4.java
@@ -67,19 +67,19 @@ public class Tuple4<T1, T2, T3, T4> extends Tuple {
         return v4;
     }
 
-    public T1 v1() {
+    public T1 getV1() {
         return v1;
     }
 
-    public T2 v2() {
+    public T2 getV2() {
         return v2;
     }
 
-    public T3 v3() {
+    public T3 getV3() {
         return v3;
     }
 
-    public T4 v4() {
+    public T4 getV4() {
         return v4;
     }
 
@@ -95,84 +95,84 @@ public class Tuple4<T1, T2, T3, T4> extends Tuple {
      * Concatenate a tuple to this tuple.
      */
     public final <T5> Tuple5<T1, T2, T3, T4, T5> concat(Tuple1<T5> tuple) {
-        return new Tuple5<>(v1, v2, v3, v4, tuple.v1());
+        return new Tuple5<>(v1, v2, v3, v4, tuple.getV1());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T5, T6> Tuple6<T1, T2, T3, T4, T5, T6> concat(Tuple2<T5, T6> tuple) {
-        return new Tuple6<>(v1, v2, v3, v4, tuple.v1(), tuple.v2());
+        return new Tuple6<>(v1, v2, v3, v4, tuple.getV1(), tuple.getV2());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T5, T6, T7> Tuple7<T1, T2, T3, T4, T5, T6, T7> concat(Tuple3<T5, T6, T7> tuple) {
-        return new Tuple7<>(v1, v2, v3, v4, tuple.v1(), tuple.v2(), tuple.v3());
+        return new Tuple7<>(v1, v2, v3, v4, tuple.getV1(), tuple.getV2(), tuple.getV3());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T5, T6, T7, T8> Tuple8<T1, T2, T3, T4, T5, T6, T7, T8> concat(Tuple4<T5, T6, T7, T8> tuple) {
-        return new Tuple8<>(v1, v2, v3, v4, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4());
+        return new Tuple8<>(v1, v2, v3, v4, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T5, T6, T7, T8, T9> Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9> concat(Tuple5<T5, T6, T7, T8, T9> tuple) {
-        return new Tuple9<>(v1, v2, v3, v4, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5());
+        return new Tuple9<>(v1, v2, v3, v4, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T5, T6, T7, T8, T9, T10> Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> concat(Tuple6<T5, T6, T7, T8, T9, T10> tuple) {
-        return new Tuple10<>(v1, v2, v3, v4, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6());
+        return new Tuple10<>(v1, v2, v3, v4, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T5, T6, T7, T8, T9, T10, T11> Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> concat(Tuple7<T5, T6, T7, T8, T9, T10, T11> tuple) {
-        return new Tuple11<>(v1, v2, v3, v4, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7());
+        return new Tuple11<>(v1, v2, v3, v4, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T5, T6, T7, T8, T9, T10, T11, T12> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> concat(Tuple8<T5, T6, T7, T8, T9, T10, T11, T12> tuple) {
-        return new Tuple12<>(v1, v2, v3, v4, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8());
+        return new Tuple12<>(v1, v2, v3, v4, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T5, T6, T7, T8, T9, T10, T11, T12, T13> Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> concat(Tuple9<T5, T6, T7, T8, T9, T10, T11, T12, T13> tuple) {
-        return new Tuple13<>(v1, v2, v3, v4, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9());
+        return new Tuple13<>(v1, v2, v3, v4, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> concat(Tuple10<T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> tuple) {
-        return new Tuple14<>(v1, v2, v3, v4, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10());
+        return new Tuple14<>(v1, v2, v3, v4, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> concat(Tuple11<T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> tuple) {
-        return new Tuple15<>(v1, v2, v3, v4, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11());
+        return new Tuple15<>(v1, v2, v3, v4, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> concat(Tuple12<T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> tuple) {
-        return new Tuple16<>(v1, v2, v3, v4, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11(), tuple.v12());
+        return new Tuple16<>(v1, v2, v3, v4, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11(), tuple.getV12());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/lang/Tuple5.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Tuple5.java b/src/main/groovy/groovy/lang/Tuple5.java
index a1dc209..663a8fa 100644
--- a/src/main/groovy/groovy/lang/Tuple5.java
+++ b/src/main/groovy/groovy/lang/Tuple5.java
@@ -74,23 +74,23 @@ public class Tuple5<T1, T2, T3, T4, T5> extends Tuple {
         return v5;
     }
 
-    public T1 v1() {
+    public T1 getV1() {
         return v1;
     }
 
-    public T2 v2() {
+    public T2 getV2() {
         return v2;
     }
 
-    public T3 v3() {
+    public T3 getV3() {
         return v3;
     }
 
-    public T4 v4() {
+    public T4 getV4() {
         return v4;
     }
 
-    public T5 v5() {
+    public T5 getV5() {
         return v5;
     }
 
@@ -106,77 +106,77 @@ public class Tuple5<T1, T2, T3, T4, T5> extends Tuple {
      * Concatenate a tuple to this tuple.
      */
     public final <T6> Tuple6<T1, T2, T3, T4, T5, T6> concat(Tuple1<T6> tuple) {
-        return new Tuple6<>(v1, v2, v3, v4, v5, tuple.v1());
+        return new Tuple6<>(v1, v2, v3, v4, v5, tuple.getV1());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T6, T7> Tuple7<T1, T2, T3, T4, T5, T6, T7> concat(Tuple2<T6, T7> tuple) {
-        return new Tuple7<>(v1, v2, v3, v4, v5, tuple.v1(), tuple.v2());
+        return new Tuple7<>(v1, v2, v3, v4, v5, tuple.getV1(), tuple.getV2());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T6, T7, T8> Tuple8<T1, T2, T3, T4, T5, T6, T7, T8> concat(Tuple3<T6, T7, T8> tuple) {
-        return new Tuple8<>(v1, v2, v3, v4, v5, tuple.v1(), tuple.v2(), tuple.v3());
+        return new Tuple8<>(v1, v2, v3, v4, v5, tuple.getV1(), tuple.getV2(), tuple.getV3());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T6, T7, T8, T9> Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9> concat(Tuple4<T6, T7, T8, T9> tuple) {
-        return new Tuple9<>(v1, v2, v3, v4, v5, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4());
+        return new Tuple9<>(v1, v2, v3, v4, v5, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T6, T7, T8, T9, T10> Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> concat(Tuple5<T6, T7, T8, T9, T10> tuple) {
-        return new Tuple10<>(v1, v2, v3, v4, v5, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5());
+        return new Tuple10<>(v1, v2, v3, v4, v5, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T6, T7, T8, T9, T10, T11> Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> concat(Tuple6<T6, T7, T8, T9, T10, T11> tuple) {
-        return new Tuple11<>(v1, v2, v3, v4, v5, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6());
+        return new Tuple11<>(v1, v2, v3, v4, v5, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T6, T7, T8, T9, T10, T11, T12> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> concat(Tuple7<T6, T7, T8, T9, T10, T11, T12> tuple) {
-        return new Tuple12<>(v1, v2, v3, v4, v5, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7());
+        return new Tuple12<>(v1, v2, v3, v4, v5, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T6, T7, T8, T9, T10, T11, T12, T13> Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> concat(Tuple8<T6, T7, T8, T9, T10, T11, T12, T13> tuple) {
-        return new Tuple13<>(v1, v2, v3, v4, v5, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8());
+        return new Tuple13<>(v1, v2, v3, v4, v5, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T6, T7, T8, T9, T10, T11, T12, T13, T14> Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> concat(Tuple9<T6, T7, T8, T9, T10, T11, T12, T13, T14> tuple) {
-        return new Tuple14<>(v1, v2, v3, v4, v5, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9());
+        return new Tuple14<>(v1, v2, v3, v4, v5, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> concat(Tuple10<T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> tuple) {
-        return new Tuple15<>(v1, v2, v3, v4, v5, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10());
+        return new Tuple15<>(v1, v2, v3, v4, v5, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> concat(Tuple11<T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> tuple) {
-        return new Tuple16<>(v1, v2, v3, v4, v5, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10(), tuple.v11());
+        return new Tuple16<>(v1, v2, v3, v4, v5, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10(), tuple.getV11());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/lang/Tuple6.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Tuple6.java b/src/main/groovy/groovy/lang/Tuple6.java
index 1f65777..4dfdb7b 100644
--- a/src/main/groovy/groovy/lang/Tuple6.java
+++ b/src/main/groovy/groovy/lang/Tuple6.java
@@ -81,27 +81,27 @@ public class Tuple6<T1, T2, T3, T4, T5, T6> extends Tuple {
         return v6;
     }
 
-    public T1 v1() {
+    public T1 getV1() {
         return v1;
     }
 
-    public T2 v2() {
+    public T2 getV2() {
         return v2;
     }
 
-    public T3 v3() {
+    public T3 getV3() {
         return v3;
     }
 
-    public T4 v4() {
+    public T4 getV4() {
         return v4;
     }
 
-    public T5 v5() {
+    public T5 getV5() {
         return v5;
     }
 
-    public T6 v6() {
+    public T6 getV6() {
         return v6;
     }
 
@@ -117,70 +117,70 @@ public class Tuple6<T1, T2, T3, T4, T5, T6> extends Tuple {
      * Concatenate a tuple to this tuple.
      */
     public final <T7> Tuple7<T1, T2, T3, T4, T5, T6, T7> concat(Tuple1<T7> tuple) {
-        return new Tuple7<>(v1, v2, v3, v4, v5, v6, tuple.v1());
+        return new Tuple7<>(v1, v2, v3, v4, v5, v6, tuple.getV1());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T7, T8> Tuple8<T1, T2, T3, T4, T5, T6, T7, T8> concat(Tuple2<T7, T8> tuple) {
-        return new Tuple8<>(v1, v2, v3, v4, v5, v6, tuple.v1(), tuple.v2());
+        return new Tuple8<>(v1, v2, v3, v4, v5, v6, tuple.getV1(), tuple.getV2());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T7, T8, T9> Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9> concat(Tuple3<T7, T8, T9> tuple) {
-        return new Tuple9<>(v1, v2, v3, v4, v5, v6, tuple.v1(), tuple.v2(), tuple.v3());
+        return new Tuple9<>(v1, v2, v3, v4, v5, v6, tuple.getV1(), tuple.getV2(), tuple.getV3());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T7, T8, T9, T10> Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> concat(Tuple4<T7, T8, T9, T10> tuple) {
-        return new Tuple10<>(v1, v2, v3, v4, v5, v6, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4());
+        return new Tuple10<>(v1, v2, v3, v4, v5, v6, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T7, T8, T9, T10, T11> Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> concat(Tuple5<T7, T8, T9, T10, T11> tuple) {
-        return new Tuple11<>(v1, v2, v3, v4, v5, v6, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5());
+        return new Tuple11<>(v1, v2, v3, v4, v5, v6, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T7, T8, T9, T10, T11, T12> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> concat(Tuple6<T7, T8, T9, T10, T11, T12> tuple) {
-        return new Tuple12<>(v1, v2, v3, v4, v5, v6, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6());
+        return new Tuple12<>(v1, v2, v3, v4, v5, v6, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T7, T8, T9, T10, T11, T12, T13> Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> concat(Tuple7<T7, T8, T9, T10, T11, T12, T13> tuple) {
-        return new Tuple13<>(v1, v2, v3, v4, v5, v6, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7());
+        return new Tuple13<>(v1, v2, v3, v4, v5, v6, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T7, T8, T9, T10, T11, T12, T13, T14> Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> concat(Tuple8<T7, T8, T9, T10, T11, T12, T13, T14> tuple) {
-        return new Tuple14<>(v1, v2, v3, v4, v5, v6, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8());
+        return new Tuple14<>(v1, v2, v3, v4, v5, v6, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T7, T8, T9, T10, T11, T12, T13, T14, T15> Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> concat(Tuple9<T7, T8, T9, T10, T11, T12, T13, T14, T15> tuple) {
-        return new Tuple15<>(v1, v2, v3, v4, v5, v6, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9());
+        return new Tuple15<>(v1, v2, v3, v4, v5, v6, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> concat(Tuple10<T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> tuple) {
-        return new Tuple16<>(v1, v2, v3, v4, v5, v6, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9(), tuple.v10());
+        return new Tuple16<>(v1, v2, v3, v4, v5, v6, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9(), tuple.getV10());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/lang/Tuple7.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Tuple7.java b/src/main/groovy/groovy/lang/Tuple7.java
index c92f45f..3ee897e 100644
--- a/src/main/groovy/groovy/lang/Tuple7.java
+++ b/src/main/groovy/groovy/lang/Tuple7.java
@@ -88,31 +88,31 @@ public class Tuple7<T1, T2, T3, T4, T5, T6, T7> extends Tuple {
         return v7;
     }
 
-    public T1 v1() {
+    public T1 getV1() {
         return v1;
     }
 
-    public T2 v2() {
+    public T2 getV2() {
         return v2;
     }
 
-    public T3 v3() {
+    public T3 getV3() {
         return v3;
     }
 
-    public T4 v4() {
+    public T4 getV4() {
         return v4;
     }
 
-    public T5 v5() {
+    public T5 getV5() {
         return v5;
     }
 
-    public T6 v6() {
+    public T6 getV6() {
         return v6;
     }
 
-    public T7 v7() {
+    public T7 getV7() {
         return v7;
     }
 
@@ -128,63 +128,63 @@ public class Tuple7<T1, T2, T3, T4, T5, T6, T7> extends Tuple {
      * Concatenate a tuple to this tuple.
      */
     public final <T8> Tuple8<T1, T2, T3, T4, T5, T6, T7, T8> concat(Tuple1<T8> tuple) {
-        return new Tuple8<>(v1, v2, v3, v4, v5, v6, v7, tuple.v1());
+        return new Tuple8<>(v1, v2, v3, v4, v5, v6, v7, tuple.getV1());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T8, T9> Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9> concat(Tuple2<T8, T9> tuple) {
-        return new Tuple9<>(v1, v2, v3, v4, v5, v6, v7, tuple.v1(), tuple.v2());
+        return new Tuple9<>(v1, v2, v3, v4, v5, v6, v7, tuple.getV1(), tuple.getV2());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T8, T9, T10> Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> concat(Tuple3<T8, T9, T10> tuple) {
-        return new Tuple10<>(v1, v2, v3, v4, v5, v6, v7, tuple.v1(), tuple.v2(), tuple.v3());
+        return new Tuple10<>(v1, v2, v3, v4, v5, v6, v7, tuple.getV1(), tuple.getV2(), tuple.getV3());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T8, T9, T10, T11> Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> concat(Tuple4<T8, T9, T10, T11> tuple) {
-        return new Tuple11<>(v1, v2, v3, v4, v5, v6, v7, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4());
+        return new Tuple11<>(v1, v2, v3, v4, v5, v6, v7, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T8, T9, T10, T11, T12> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> concat(Tuple5<T8, T9, T10, T11, T12> tuple) {
-        return new Tuple12<>(v1, v2, v3, v4, v5, v6, v7, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5());
+        return new Tuple12<>(v1, v2, v3, v4, v5, v6, v7, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T8, T9, T10, T11, T12, T13> Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> concat(Tuple6<T8, T9, T10, T11, T12, T13> tuple) {
-        return new Tuple13<>(v1, v2, v3, v4, v5, v6, v7, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6());
+        return new Tuple13<>(v1, v2, v3, v4, v5, v6, v7, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T8, T9, T10, T11, T12, T13, T14> Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> concat(Tuple7<T8, T9, T10, T11, T12, T13, T14> tuple) {
-        return new Tuple14<>(v1, v2, v3, v4, v5, v6, v7, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7());
+        return new Tuple14<>(v1, v2, v3, v4, v5, v6, v7, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T8, T9, T10, T11, T12, T13, T14, T15> Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> concat(Tuple8<T8, T9, T10, T11, T12, T13, T14, T15> tuple) {
-        return new Tuple15<>(v1, v2, v3, v4, v5, v6, v7, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8());
+        return new Tuple15<>(v1, v2, v3, v4, v5, v6, v7, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T8, T9, T10, T11, T12, T13, T14, T15, T16> Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> concat(Tuple9<T8, T9, T10, T11, T12, T13, T14, T15, T16> tuple) {
-        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8(), tuple.v9());
+        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8(), tuple.getV9());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/lang/Tuple8.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Tuple8.java b/src/main/groovy/groovy/lang/Tuple8.java
index 09d7cc8..c20bd76 100644
--- a/src/main/groovy/groovy/lang/Tuple8.java
+++ b/src/main/groovy/groovy/lang/Tuple8.java
@@ -95,35 +95,35 @@ public class Tuple8<T1, T2, T3, T4, T5, T6, T7, T8> extends Tuple {
         return v8;
     }
 
-    public T1 v1() {
+    public T1 getV1() {
         return v1;
     }
 
-    public T2 v2() {
+    public T2 getV2() {
         return v2;
     }
 
-    public T3 v3() {
+    public T3 getV3() {
         return v3;
     }
 
-    public T4 v4() {
+    public T4 getV4() {
         return v4;
     }
 
-    public T5 v5() {
+    public T5 getV5() {
         return v5;
     }
 
-    public T6 v6() {
+    public T6 getV6() {
         return v6;
     }
 
-    public T7 v7() {
+    public T7 getV7() {
         return v7;
     }
 
-    public T8 v8() {
+    public T8 getV8() {
         return v8;
     }
 
@@ -139,56 +139,56 @@ public class Tuple8<T1, T2, T3, T4, T5, T6, T7, T8> extends Tuple {
      * Concatenate a tuple to this tuple.
      */
     public final <T9> Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9> concat(Tuple1<T9> tuple) {
-        return new Tuple9<>(v1, v2, v3, v4, v5, v6, v7, v8, tuple.v1());
+        return new Tuple9<>(v1, v2, v3, v4, v5, v6, v7, v8, tuple.getV1());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T9, T10> Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> concat(Tuple2<T9, T10> tuple) {
-        return new Tuple10<>(v1, v2, v3, v4, v5, v6, v7, v8, tuple.v1(), tuple.v2());
+        return new Tuple10<>(v1, v2, v3, v4, v5, v6, v7, v8, tuple.getV1(), tuple.getV2());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T9, T10, T11> Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> concat(Tuple3<T9, T10, T11> tuple) {
-        return new Tuple11<>(v1, v2, v3, v4, v5, v6, v7, v8, tuple.v1(), tuple.v2(), tuple.v3());
+        return new Tuple11<>(v1, v2, v3, v4, v5, v6, v7, v8, tuple.getV1(), tuple.getV2(), tuple.getV3());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T9, T10, T11, T12> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> concat(Tuple4<T9, T10, T11, T12> tuple) {
-        return new Tuple12<>(v1, v2, v3, v4, v5, v6, v7, v8, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4());
+        return new Tuple12<>(v1, v2, v3, v4, v5, v6, v7, v8, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T9, T10, T11, T12, T13> Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> concat(Tuple5<T9, T10, T11, T12, T13> tuple) {
-        return new Tuple13<>(v1, v2, v3, v4, v5, v6, v7, v8, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5());
+        return new Tuple13<>(v1, v2, v3, v4, v5, v6, v7, v8, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T9, T10, T11, T12, T13, T14> Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> concat(Tuple6<T9, T10, T11, T12, T13, T14> tuple) {
-        return new Tuple14<>(v1, v2, v3, v4, v5, v6, v7, v8, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6());
+        return new Tuple14<>(v1, v2, v3, v4, v5, v6, v7, v8, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T9, T10, T11, T12, T13, T14, T15> Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> concat(Tuple7<T9, T10, T11, T12, T13, T14, T15> tuple) {
-        return new Tuple15<>(v1, v2, v3, v4, v5, v6, v7, v8, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7());
+        return new Tuple15<>(v1, v2, v3, v4, v5, v6, v7, v8, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T9, T10, T11, T12, T13, T14, T15, T16> Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> concat(Tuple8<T9, T10, T11, T12, T13, T14, T15, T16> tuple) {
-        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, v8, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7(), tuple.v8());
+        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, v8, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7(), tuple.getV8());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/lang/Tuple9.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Tuple9.java b/src/main/groovy/groovy/lang/Tuple9.java
index 9879b8f..0b91b64 100644
--- a/src/main/groovy/groovy/lang/Tuple9.java
+++ b/src/main/groovy/groovy/lang/Tuple9.java
@@ -103,39 +103,39 @@ public class Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9> extends Tuple {
         return v9;
     }
 
-    public T1 v1() {
+    public T1 getV1() {
         return v1;
     }
 
-    public T2 v2() {
+    public T2 getV2() {
         return v2;
     }
 
-    public T3 v3() {
+    public T3 getV3() {
         return v3;
     }
 
-    public T4 v4() {
+    public T4 getV4() {
         return v4;
     }
 
-    public T5 v5() {
+    public T5 getV5() {
         return v5;
     }
 
-    public T6 v6() {
+    public T6 getV6() {
         return v6;
     }
 
-    public T7 v7() {
+    public T7 getV7() {
         return v7;
     }
 
-    public T8 v8() {
+    public T8 getV8() {
         return v8;
     }
 
-    public T9 v9() {
+    public T9 getV9() {
         return v9;
     }
 
@@ -151,49 +151,49 @@ public class Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9> extends Tuple {
      * Concatenate a tuple to this tuple.
      */
     public final <T10> Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> concat(Tuple1<T10> tuple) {
-        return new Tuple10<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, tuple.v1());
+        return new Tuple10<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, tuple.getV1());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T10, T11> Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> concat(Tuple2<T10, T11> tuple) {
-        return new Tuple11<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, tuple.v1(), tuple.v2());
+        return new Tuple11<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, tuple.getV1(), tuple.getV2());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T10, T11, T12> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> concat(Tuple3<T10, T11, T12> tuple) {
-        return new Tuple12<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, tuple.v1(), tuple.v2(), tuple.v3());
+        return new Tuple12<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, tuple.getV1(), tuple.getV2(), tuple.getV3());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T10, T11, T12, T13> Tuple13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> concat(Tuple4<T10, T11, T12, T13> tuple) {
-        return new Tuple13<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4());
+        return new Tuple13<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T10, T11, T12, T13, T14> Tuple14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> concat(Tuple5<T10, T11, T12, T13, T14> tuple) {
-        return new Tuple14<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5());
+        return new Tuple14<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T10, T11, T12, T13, T14, T15> Tuple15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> concat(Tuple6<T10, T11, T12, T13, T14, T15> tuple) {
-        return new Tuple15<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6());
+        return new Tuple15<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6());
     }
 
     /**
      * Concatenate a tuple to this tuple.
      */
     public final <T10, T11, T12, T13, T14, T15, T16> Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> concat(Tuple7<T10, T11, T12, T13, T14, T15, T16> tuple) {
-        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, tuple.v1(), tuple.v2(), tuple.v3(), tuple.v4(), tuple.v5(), tuple.v6(), tuple.v7());
+        return new Tuple16<>(v1, v2, v3, v4, v5, v6, v7, v8, v9, tuple.getV1(), tuple.getV2(), tuple.getV3(), tuple.getV4(), tuple.getV5(), tuple.getV6(), tuple.getV7());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/groovy/blob/c5e83397/src/main/groovy/groovy/util/function/Consumer1.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/util/function/Consumer1.java b/src/main/groovy/groovy/util/function/Consumer1.java
index c19441f..092efa3 100644
--- a/src/main/groovy/groovy/util/function/Consumer1.java
+++ b/src/main/groovy/groovy/util/function/Consumer1.java
@@ -36,7 +36,7 @@ public interface Consumer1<T1> extends Consumer<T1> {
      * @param args The arguments as a tuple.
      */
     default void accept(Tuple1<? extends T1> args) {
-        accept(args.v1());
+        accept(args.getV1());
     }
 
     /**
@@ -70,6 +70,6 @@ public interface Consumer1<T1> extends Consumer<T1> {
      * Let this consumer partially accept the arguments.
      */
     default Consumer0 acceptPartially(Tuple1<? extends T1> args) {
-        return () -> accept(args.v1());
+        return () -> accept(args.getV1());
     }
 }


Mime
View raw message