Refactor Tuple

common-parent/common-all/pom.xml

@@ -42,7 +42,7 @@
         <invariant.version>1.0.1</invariant.version>
         <function.version>1.0.1</function.version>
         <json.version>1.0.3</json.version>
-        <tuple.version>1.0.3</tuple.version>
+        <tuple.version>1.0.4-SNAPSHOT</tuple.version>
         <logger.version>1.0.4</logger.version>
         <codegen.version>2.4.6-SNAPSHOT</codegen.version>
         <codegenxml.version>1.0.2</codegenxml.version>

common-parent/tuple/pom.xml

@@ -26,16 +26,16 @@
     <parent>
         <groupId>com.speedment.common</groupId>
         <artifactId>common-parent</artifactId>
-        <version>1.0.4</version>
+        <version>3.0.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>tuple</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.4-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Speedment - Common - Tuple</name>
     <description>
-        A collection of Tuple classes that represent sets of a fixed length 
+        A collection of Immutable Tuple classes that represent sets of a fixed length 
         where every element has a specific type.
     </description>
     <url>https://github.com/speedment/speedment/wiki/Tuple</url>

common-parent/tuple/src/main/java/com/speedment/common/tuple/BasicTuple.java

@@ -25,14 +25,13 @@
  */
 public interface BasicTuple<R> {
 
-
     /**
-     * Returns the length of the Tuple. For example, a Tuple2 has a length of 2
-     * whereas a Tuple3 has a length of 3.
+     * Returns the degree of the Tuple. For example, a Tuple2 has a degree of 2
+     * whereas a Tuple3 has a degree of 3.
      *
-     * @return the length of the Tuple
+     * @return the degree of the Tuple
      */
-    int length();
+    int degree();
 
     /**
      * Gets the tuple element at the given index. For example, get(0) will
@@ -46,10 +45,10 @@ public interface BasicTuple<R> {
     R get(int index);
 
     /**
-     * Returns a {@link Stream} of all non-null values for this Tuple of the
-     * given class. I.e. all non-null members of a Tuple that can be cast to the
-     * given class are included in the Stream. If sequential, the Stream will
-     * start with the 0:th tuple and progress upwards.
+     * Returns a {@link Stream} of all values for this Tuple of the given class.
+     * I.e. all non-null members of a Tuple that can be cast to the given class
+     * are included in the Stream. If sequential, the Stream will start with the
+     * 0:th tuple and progress upwards.
      *
      * @param <T> The type of stream
      * @param clazz The class of the type of the stream

common-parent/tuple/src/main/java/com/speedment/common/tuple/Tuple.java

@@ -35,13 +35,14 @@ public interface Tuple extends BasicTuple<Object> {
      * @return a {@link Stream} of all values for this Tuple
      */
     Stream<Object> stream();
-    
+
     @Override
     default <T> Stream<T> streamOf(Class<T> clazz) {
         return stream()
-            .filter(s -> s != null)
             .filter(clazz::isInstance)
             .map(clazz::cast);
     }
 
+    //<T> T map(Function<? extends Tuple, T> mapper);
+
 }