X Tutup
Skip to content

Improve FpKit.concat, presize collections / maps #4152

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 25, 2025
Merged

Improve FpKit.concat, presize collections / maps #4152

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
7 changes: 4 additions & 3 deletions src/main/java/graphql/GraphqlErrorHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package graphql;

import com.google.common.collect.Maps;
import graphql.language.SourceLocation;
import graphql.util.FpKit;

Expand All @@ -20,7 +21,7 @@
public class GraphqlErrorHelper {

public static Map<String, Object> toSpecification(GraphQLError error) {
Map<String, Object> errorMap = new LinkedHashMap<>();
Map<String, Object> errorMap = Maps.newLinkedHashMapWithExpectedSize(4);
errorMap.put("message", error.getMessage());
if (error.getLocations() != null) {
errorMap.put("locations", locations(error.getLocations()));
Expand Down Expand Up @@ -73,7 +74,7 @@ public static Object location(SourceLocation location) {
if (line < 1 || column < 1) {
return null;
}
LinkedHashMap<String, Object> map = new LinkedHashMap<>(2);
Map<String, Object> map = Maps.newLinkedHashMapWithExpectedSize(2);
map.put("line", line);
map.put("column", column);
return map;
Expand Down Expand Up @@ -120,7 +121,7 @@ private static void extractExtensions(GraphQLError.Builder<?> errorBuilder, Map<
private static void extractLocations(GraphQLError.Builder<?> errorBuilder, Map<String, Object> rawError) {
List<Object> locations = (List<Object>) rawError.get("locations");
if (locations != null) {
List<SourceLocation> sourceLocations = new ArrayList<>();
List<SourceLocation> sourceLocations = new ArrayList<>(locations.size());
for (Object locationObj : locations) {
Map<String, Object> location = (Map<String, Object>) locationObj;
if (location != null) {
Expand Down
13 changes: 8 additions & 5 deletions src/main/java/graphql/util/FpKit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import graphql.Internal;
import org.jspecify.annotations.NonNull;
Expand All @@ -25,7 +26,6 @@
import java.util.function.Supplier;
import java.util.stream.Stream;

import static java.util.Collections.singletonList;

@Internal
public class FpKit {
Expand All @@ -39,7 +39,7 @@ public static <T> Map<String, T> getByName(List<T> namedObjects, Function<T, Str
//
// From a collection of keyed things, get a map of them by key, merging them according to the merge function
public static <T, NewKey> Map<NewKey, T> toMap(Collection<T> collection, Function<T, NewKey> keyFunction, BinaryOperator<T> mergeFunc) {
Map<NewKey, T> resultMap = new LinkedHashMap<>();
Map<NewKey, T> resultMap = Maps.newLinkedHashMapWithExpectedSize(collection.size());
for (T obj : collection) {
NewKey key = keyFunction.apply(obj);
if (resultMap.containsKey(key)) {
Expand Down Expand Up @@ -250,7 +250,10 @@ public static OptionalInt toSize(Object iterableResult) {
* @return a <strong>new</strong> list composed of the first list elements and the new element
*/
public static <T> List<T> concat(List<T> l, T t) {
return concat(l, singletonList(t));
List<T> list = new ArrayList<>(l.size() + 1);
list.addAll(l);
list.add(t);
return list;
}

/**
Expand All @@ -263,9 +266,9 @@ 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) {
ArrayList<T> l = new ArrayList<>(l1);
List<T> l = new ArrayList<>(l1.size() + l2.size());
l.addAll(l1);
l.addAll(l2);
l.trimToSize();
return l;
}

Expand Down
3 changes: 2 additions & 1 deletion src/test/java/graphql/schema/scalars/ObjectScalar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package graphql.schema.scalars;

import com.google.common.collect.Maps;
import graphql.Assert;
import graphql.Internal;
import graphql.language.ArrayValue;
Expand Down Expand Up @@ -92,7 +93,7 @@ public Object parseLiteral(Object input, Map<String, Object> variables) throws C
}
if (input instanceof ObjectValue) {
List<ObjectField> values = ((ObjectValue) input).getObjectFields();
Map<String, Object> parsedValues = new LinkedHashMap<>();
Map<String, Object> parsedValues = Maps.newLinkedHashMapWithExpectedSize(values.size());
values.forEach(fld -> {
Object parsedValue = parseLiteral(fld.getValue(), variables);
parsedValues.put(fld.getName(), parsedValue);
Expand Down
Loading
X Tutup