Skip to content

Fix FpKit.concat parameters #4154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbakerman merged 1 commit into from
Oct 26, 2025
Merged

Fix FpKit.concat parameters #4154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/main/java/graphql/language/InputObjectTypeDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package graphql.language;


import com.google.common.collect.ImmutableList;
import graphql.Internal;
import graphql.PublicApi;
import graphql.collect.ImmutableKit;
import graphql.util.FpKit;
import graphql.util.TraversalControl;
import graphql.util.TraverserContext;

import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -75,10 +74,7 @@ public String getName() {

@Override
public List<Node> getChildren() {
List<Node> result = new ArrayList<>();
result.addAll(directives.getDirectives());
result.addAll(inputValueDefinitions);
return result;
return FpKit.concat(directives.getDirectives(), inputValueDefinitions);
}

@Override
Expand Down
7 changes: 2 additions & 5 deletions src/main/java/graphql/language/SchemaDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import graphql.Internal;
import graphql.PublicApi;
import graphql.collect.ImmutableKit;
import graphql.util.FpKit;
import graphql.util.TraversalControl;
import graphql.util.TraverserContext;

import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -71,10 +71,7 @@ public Description getDescription() {

@Override
public List<Node> getChildren() {
List<Node> result = new ArrayList<>();
result.addAll(directives.getDirectives());
result.addAll(operationTypeDefinitions);
return result;
return FpKit.concat(directives.getDirectives(), operationTypeDefinitions);
}

@Override
Expand Down
7 changes: 2 additions & 5 deletions src/main/java/graphql/language/UnionTypeDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import graphql.Internal;
import graphql.PublicApi;
import graphql.collect.ImmutableKit;
import graphql.util.FpKit;
import graphql.util.TraversalControl;
import graphql.util.TraverserContext;

import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -95,10 +95,7 @@ public String getName() {

@Override
public List<Node> getChildren() {
List<Node> result = new ArrayList<>();
result.addAll(directives.getDirectives());
result.addAll(memberTypes);
return result;
return FpKit.concat(directives.getDirectives(), memberTypes);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/graphql/util/FpKit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ public static <T> List<T> concat(List<T> l, T t) {
*
* @return a <strong>new</strong> list composed of the two concatenated lists elements
*/
public static <T> List<T> concat(List<T> l1, List<T> l2) {
public static <T> List<T> concat(List<? extends T> l1, List<? extends T> l2) {
List<T> l = new ArrayList<>(l1.size() + l2.size());
l.addAll(l1);
l.addAll(l2);
Expand Down
Loading