Skip to content

Commit a464837

Browse files
authoredNov 26, 2023
update dependencies versions (#378)
update dependencies to spring-boot 3.2.0 release train
1 parent 2fa6dd7 commit a464837

File tree

3 files changed

+46
-5
lines changed

3 files changed

+46
-5
lines changed
 

‎build/pom.xml

+42
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,46 @@
9191
</pluginManagement>
9292
</build>
9393

94+
<repositories>
95+
<repository>
96+
<id>spring-milestones</id>
97+
<name>Spring Milestones</name>
98+
<url>https://repo.spring.io/milestone</url>
99+
<snapshots>
100+
<enabled>false</enabled>
101+
</snapshots>
102+
</repository>
103+
<repository>
104+
<id>central</id>
105+
<name>Central Repository</name>
106+
<url>https://repo.maven.apache.org/maven2</url>
107+
<layout>default</layout>
108+
<snapshots>
109+
<enabled>false</enabled>
110+
</snapshots>
111+
</repository>
112+
</repositories>
113+
<pluginRepositories>
114+
<pluginRepository>
115+
<id>central</id>
116+
<name>Central Repository</name>
117+
<url>https://repo.maven.apache.org/maven2</url>
118+
<layout>default</layout>
119+
<snapshots>
120+
<enabled>false</enabled>
121+
</snapshots>
122+
<releases>
123+
<updatePolicy>never</updatePolicy>
124+
</releases>
125+
</pluginRepository>
126+
<pluginRepository>
127+
<id>spring-milestones</id>
128+
<name>Spring Milestones</name>
129+
<url>https://repo.spring.io/milestone</url>
130+
<snapshots>
131+
<enabled>false</enabled>
132+
</snapshots>
133+
</pluginRepository>
134+
</pluginRepositories>
135+
94136
</project>

‎dependencies/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</description>
1515

1616
<properties>
17-
<spring-boot.version>3.1.6</spring-boot.version>
17+
<spring-boot.version>3.2.0</spring-boot.version>
1818
<graphql-java.version>21.3</graphql-java.version>
1919
<evo-inflector.version>1.3</evo-inflector.version>
2020
<joda-time.version>2.12.5</joda-time.version>

‎schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaQueryFactory.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -296,12 +296,11 @@ protected <T> Stream<T> getResultStream(
296296
Thread.currentThread()
297297
);
298298
}
299+
299300
// Let's execute query and wrap result into stream
300-
if (resultStream) {
301-
return query.getResultStream().map(this::unproxy).peek(this::detach);
302-
}
301+
final Stream<T> resultStream = this.resultStream ? query.getResultStream() : query.getResultList().stream();
303302

304-
return query.getResultList().stream().map(this::unproxy).peek(this::detach);
303+
return resultStream.map(this::unproxy).peek(this::detach);
305304
}
306305

307306
protected Object querySingleResult(final DataFetchingEnvironment environment) {

0 commit comments

Comments
 (0)
Please sign in to comment.