You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2025/04/14 10:10:20 UTC
(ignite) branch master updated: IGNITE-24848 Move GridTuple* to ignite-commons (#11985)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 23b3cb3dfee IGNITE-24848 Move GridTuple* to ignite-commons (#11985)
23b3cb3dfee is described below
commit 23b3cb3dfee2b793ce2ce55f65e07aae6c2e9096
Author: Maksim Davydov <70...@users.noreply.github.com>
AuthorDate: Mon Apr 14 13:10:11 2025 +0300
IGNITE-24848 Move GridTuple* to ignite-commons (#11985)
---
.../ignite/internal/util/GridCommonFunc.java | 104 +++++++++++++++++++++
.../ignite/internal/util/lang/GridTuple.java | 0
.../ignite/internal/util/lang/GridTuple3.java | 0
.../ignite/internal/util/lang/GridTuple4.java | 0
.../ignite/internal/util/lang/GridTuple5.java | 0
.../ignite/internal/util/lang/GridTuple6.java | 0
.../java/org/apache/ignite/lang/IgniteBiTuple.java | 4 +-
.../apache/ignite/internal/util/lang/GridFunc.java | 100 --------------------
8 files changed, 106 insertions(+), 102 deletions(-)
diff --git a/modules/commons/src/main/java/org/apache/ignite/internal/util/GridCommonFunc.java b/modules/commons/src/main/java/org/apache/ignite/internal/util/GridCommonFunc.java
index ae5530ee3de..ba3b39321eb 100644
--- a/modules/commons/src/main/java/org/apache/ignite/internal/util/GridCommonFunc.java
+++ b/modules/commons/src/main/java/org/apache/ignite/internal/util/GridCommonFunc.java
@@ -19,8 +19,14 @@ package org.apache.ignite.internal.util;
import java.util.Collection;
import java.util.Map;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.lang.GridTuple3;
+import org.apache.ignite.internal.util.lang.GridTuple4;
+import org.apache.ignite.internal.util.lang.GridTuple5;
+import org.apache.ignite.internal.util.lang.GridTuple6;
import org.apache.ignite.internal.util.lang.gridfunc.StringConcatReducer;
import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgniteReducer;
import org.jetbrains.annotations.Nullable;
@@ -171,4 +177,102 @@ public class GridCommonFunc {
return m == null || m.isEmpty();
}
+ /**
+ * Factory method returning new tuple with given parameter.
+ *
+ * @param v Parameter for tuple.
+ * @param <V> Type of the tuple.
+ * @return Newly created tuple.
+ */
+ public static <V> GridTuple<V> t(@Nullable V v) {
+ return new GridTuple<>(v);
+ }
+
+ /**
+ * Factory method returning new tuple with given parameters.
+ *
+ * @param v1 1st parameter for tuple.
+ * @param v2 2nd parameter for tuple.
+ * @param <V1> Type of the 1st tuple parameter.
+ * @param <V2> Type of the 2nd tuple parameter.
+ * @return Newly created tuple.
+ */
+ public static <V1, V2> IgniteBiTuple<V1, V2> t(@Nullable V1 v1, @Nullable V2 v2) {
+ return new IgniteBiTuple<>(v1, v2);
+ }
+
+ /**
+ * Factory method returning new tuple with given parameters.
+ *
+ * @param v1 1st parameter for tuple.
+ * @param v2 2nd parameter for tuple.
+ * @param v3 3rd parameter for tuple.
+ * @param <V1> Type of the 1st tuple parameter.
+ * @param <V2> Type of the 2nd tuple parameter.
+ * @param <V3> Type of the 3rd tuple parameter.
+ * @return Newly created tuple.
+ */
+ public static <V1, V2, V3> GridTuple3<V1, V2, V3> t(@Nullable V1 v1, @Nullable V2 v2, @Nullable V3 v3) {
+ return new GridTuple3<>(v1, v2, v3);
+ }
+
+ /**
+ * Factory method returning new tuple with given parameters.
+ *
+ * @param v1 1st parameter for tuple.
+ * @param v2 2nd parameter for tuple.
+ * @param v3 3rd parameter for tuple.
+ * @param v4 4th parameter for tuple.
+ * @param <V1> Type of the 1st tuple parameter.
+ * @param <V2> Type of the 2nd tuple parameter.
+ * @param <V3> Type of the 3rd tuple parameter.
+ * @param <V4> Type of the 4th tuple parameter.
+ * @return Newly created tuple.
+ */
+ public static <V1, V2, V3, V4> GridTuple4<V1, V2, V3, V4> t(@Nullable V1 v1, @Nullable V2 v2, @Nullable V3 v3,
+ @Nullable V4 v4) {
+ return new GridTuple4<>(v1, v2, v3, v4);
+ }
+
+ /**
+ * Factory method returning new tuple with given parameters.
+ *
+ * @param v1 1st parameter for tuple.
+ * @param v2 2nd parameter for tuple.
+ * @param v3 3rd parameter for tuple.
+ * @param v4 4th parameter for tuple.
+ * @param v5 5th parameter for tuple.
+ * @param <V1> Type of the 1st tuple parameter.
+ * @param <V2> Type of the 2nd tuple parameter.
+ * @param <V3> Type of the 3rd tuple parameter.
+ * @param <V4> Type of the 4th tuple parameter.
+ * @param <V5> Type of the 5th tuple parameter.
+ * @return Newly created tuple.
+ */
+ public static <V1, V2, V3, V4, V5> GridTuple5<V1, V2, V3, V4, V5> t(@Nullable V1 v1, @Nullable V2 v2,
+ @Nullable V3 v3, @Nullable V4 v4, @Nullable V5 v5) {
+ return new GridTuple5<>(v1, v2, v3, v4, v5);
+ }
+
+ /**
+ * Factory method returning new tuple with given parameters.
+ *
+ * @param v1 1st parameter for tuple.
+ * @param v2 2nd parameter for tuple.
+ * @param v3 3rd parameter for tuple.
+ * @param v4 4th parameter for tuple.
+ * @param v5 5th parameter for tuple.
+ * @param v6 5th parameter for tuple.
+ * @param <V1> Type of the 1st tuple parameter.
+ * @param <V2> Type of the 2nd tuple parameter.
+ * @param <V3> Type of the 3rd tuple parameter.
+ * @param <V4> Type of the 4th tuple parameter.
+ * @param <V5> Type of the 5th tuple parameter.
+ * @param <V6> Type of the 6th tuple parameter.
+ * @return Newly created tuple.
+ */
+ public static <V1, V2, V3, V4, V5, V6> GridTuple6<V1, V2, V3, V4, V5, V6> t(@Nullable V1 v1, @Nullable V2 v2,
+ @Nullable V3 v3, @Nullable V4 v4, @Nullable V5 v5, @Nullable V6 v6) {
+ return new GridTuple6<>(v1, v2, v3, v4, v5, v6);
+ }
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple.java b/modules/commons/src/main/java/org/apache/ignite/internal/util/lang/GridTuple.java
similarity index 100%
rename from modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple.java
rename to modules/commons/src/main/java/org/apache/ignite/internal/util/lang/GridTuple.java
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java b/modules/commons/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java
similarity index 100%
rename from modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java
rename to modules/commons/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java b/modules/commons/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java
similarity index 100%
rename from modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java
rename to modules/commons/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java b/modules/commons/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java
similarity index 100%
rename from modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java
rename to modules/commons/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java b/modules/commons/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java
similarity index 100%
rename from modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java
rename to modules/commons/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java b/modules/commons/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java
similarity index 98%
rename from modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java
rename to modules/commons/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java
index 63a1acc0e39..22d8fb28cfc 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java
+++ b/modules/commons/src/main/java/org/apache/ignite/lang/IgniteBiTuple.java
@@ -29,7 +29,7 @@ import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.Set;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
-import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.CF;
import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.jetbrains.annotations.Nullable;
@@ -74,7 +74,7 @@ public class IgniteBiTuple<V1, V2> implements Map<V1, V2>, Map.Entry<V1, V2>,
* @return New tuple with swapped values.
*/
public IgniteBiTuple<V2, V1> swap() {
- return F.t(val2, val1);
+ return CF.t(val2, val1);
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index 3508ff28a57..5299d53b0fe 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -80,7 +80,6 @@ import org.apache.ignite.internal.util.lang.gridfunc.TransformFilteringIterator;
import org.apache.ignite.internal.util.lang.gridfunc.TransformMapView;
import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.lang.IgniteBiClosure;
-import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgniteCallable;
import org.apache.ignite.lang.IgniteClosure;
import org.apache.ignite.lang.IgnitePredicate;
@@ -1479,105 +1478,6 @@ public class GridFunc extends GridCommonFunc {
return b;
}
- /**
- * Factory method returning new tuple with given parameter.
- *
- * @param v Parameter for tuple.
- * @param <V> Type of the tuple.
- * @return Newly created tuple.
- */
- public static <V> GridTuple<V> t(@Nullable V v) {
- return new GridTuple<>(v);
- }
-
- /**
- * Factory method returning new tuple with given parameters.
- *
- * @param v1 1st parameter for tuple.
- * @param v2 2nd parameter for tuple.
- * @param <V1> Type of the 1st tuple parameter.
- * @param <V2> Type of the 2nd tuple parameter.
- * @return Newly created tuple.
- */
- public static <V1, V2> IgniteBiTuple<V1, V2> t(@Nullable V1 v1, @Nullable V2 v2) {
- return new IgniteBiTuple<>(v1, v2);
- }
-
- /**
- * Factory method returning new tuple with given parameters.
- *
- * @param v1 1st parameter for tuple.
- * @param v2 2nd parameter for tuple.
- * @param v3 3rd parameter for tuple.
- * @param <V1> Type of the 1st tuple parameter.
- * @param <V2> Type of the 2nd tuple parameter.
- * @param <V3> Type of the 3rd tuple parameter.
- * @return Newly created tuple.
- */
- public static <V1, V2, V3> GridTuple3<V1, V2, V3> t(@Nullable V1 v1, @Nullable V2 v2, @Nullable V3 v3) {
- return new GridTuple3<>(v1, v2, v3);
- }
-
- /**
- * Factory method returning new tuple with given parameters.
- *
- * @param v1 1st parameter for tuple.
- * @param v2 2nd parameter for tuple.
- * @param v3 3rd parameter for tuple.
- * @param v4 4th parameter for tuple.
- * @param <V1> Type of the 1st tuple parameter.
- * @param <V2> Type of the 2nd tuple parameter.
- * @param <V3> Type of the 3rd tuple parameter.
- * @param <V4> Type of the 4th tuple parameter.
- * @return Newly created tuple.
- */
- public static <V1, V2, V3, V4> GridTuple4<V1, V2, V3, V4> t(@Nullable V1 v1, @Nullable V2 v2, @Nullable V3 v3,
- @Nullable V4 v4) {
- return new GridTuple4<>(v1, v2, v3, v4);
- }
-
- /**
- * Factory method returning new tuple with given parameters.
- *
- * @param v1 1st parameter for tuple.
- * @param v2 2nd parameter for tuple.
- * @param v3 3rd parameter for tuple.
- * @param v4 4th parameter for tuple.
- * @param v5 5th parameter for tuple.
- * @param <V1> Type of the 1st tuple parameter.
- * @param <V2> Type of the 2nd tuple parameter.
- * @param <V3> Type of the 3rd tuple parameter.
- * @param <V4> Type of the 4th tuple parameter.
- * @param <V5> Type of the 5th tuple parameter.
- * @return Newly created tuple.
- */
- public static <V1, V2, V3, V4, V5> GridTuple5<V1, V2, V3, V4, V5> t(@Nullable V1 v1, @Nullable V2 v2,
- @Nullable V3 v3, @Nullable V4 v4, @Nullable V5 v5) {
- return new GridTuple5<>(v1, v2, v3, v4, v5);
- }
-
- /**
- * Factory method returning new tuple with given parameters.
- *
- * @param v1 1st parameter for tuple.
- * @param v2 2nd parameter for tuple.
- * @param v3 3rd parameter for tuple.
- * @param v4 4th parameter for tuple.
- * @param v5 5th parameter for tuple.
- * @param v6 5th parameter for tuple.
- * @param <V1> Type of the 1st tuple parameter.
- * @param <V2> Type of the 2nd tuple parameter.
- * @param <V3> Type of the 3rd tuple parameter.
- * @param <V4> Type of the 4th tuple parameter.
- * @param <V5> Type of the 5th tuple parameter.
- * @param <V6> Type of the 6th tuple parameter.
- * @return Newly created tuple.
- */
- public static <V1, V2, V3, V4, V5, V6> GridTuple6<V1, V2, V3, V4, V5, V6> t(@Nullable V1 v1, @Nullable V2 v2,
- @Nullable V3 v3, @Nullable V4 v4, @Nullable V5 v5, @Nullable V6 v6) {
- return new GridTuple6<>(v1, v2, v3, v4, v5, v6);
- }
-
/**
* Converts collection to map using collection values as keys and
* passed in default value as values.