You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/06/09 14:23:21 UTC
[camel] 02/02: (chores) core: removed unused code
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ee5992f2f33116134ead28a6d3d0396ac814491f
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jun 9 14:30:22 2023 +0200
(chores) core: removed unused code
---
.../camel/language/csimple/CSimpleHelper.java | 2 +-
.../org/apache/camel/support/GroupIterator.java | 22 +---------------------
.../camel/support/builder/ExpressionBuilder.java | 2 +-
3 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
index 73b96c166a8..de7fc87740f 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
@@ -470,7 +470,7 @@ public final class CSimpleHelper {
public static GroupIterator collate(Exchange exchange, Object group) {
int num = exchange.getContext().getTypeConverter().tryConvertTo(int.class, exchange, group);
Iterator<?> it = org.apache.camel.support.ObjectHelper.createIterator(exchange.getMessage().getBody());
- return new GroupIterator(exchange, it, num);
+ return new GroupIterator(it, num);
}
public static String messageHistory(Exchange exchange, boolean detailed) {
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/GroupIterator.java b/core/camel-support/src/main/java/org/apache/camel/support/GroupIterator.java
index d905e3a5466..e408008b80e 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/GroupIterator.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/GroupIterator.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.util.IOHelper;
@@ -37,42 +36,23 @@ import org.apache.camel.util.IOHelper;
*/
public final class GroupIterator implements Iterator<Object>, Closeable {
- private final CamelContext camelContext;
- private final Exchange exchange;
private final Iterator<?> it;
private final int group;
- private final boolean skipFirst;
private boolean closed;
/**
* Creates a new group iterator
*
- * @param exchange the exchange used to create this group iterator
* @param it the iterator to group
* @param group number of parts to group together
* @throws IllegalArgumentException is thrown if group is not a positive number
*/
- public GroupIterator(Exchange exchange, Iterator<?> it, int group) {
- this(exchange, it, group, false);
- }
-
- /**
- * Creates a new group iterator
- *
- * @param exchange the exchange used to create this group iterator
- * @param it the iterator to group
- * @param group number of parts to group together
- * @throws IllegalArgumentException is thrown if group is not a positive number
- */
- public GroupIterator(Exchange exchange, Iterator<?> it, int group, boolean skipFirst) {
- this.exchange = exchange;
- this.camelContext = exchange.getContext();
+ public GroupIterator(Iterator<?> it, int group) {
this.it = it;
this.group = group;
if (group <= 0) {
throw new IllegalArgumentException("Group must be a positive number, was: " + group);
}
- this.skipFirst = skipFirst;
}
@Override
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
index 05b4ddbe065..73455f148f1 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
@@ -1418,7 +1418,7 @@ public class ExpressionBuilder {
if (token != null) {
return new GroupTokenIterator(exchange, it, token, parts, skipFirst);
} else {
- return new GroupIterator(exchange, it, parts, skipFirst);
+ return new GroupIterator(it, parts);
}
}