From f583eb302c6c80939b48ea65a68db71f1dd8d730 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 9 Aug 2022 16:26:23 +0300
Subject: [PATCH] Fix deprecation warnings for Spring Data ClassTypeInformation

---
 .../graphql/data/query/QueryByExampleDataFetcher.java    | 9 ++++-----
 .../graphql/data/query/QuerydslDataFetcher.java          | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/query/QueryByExampleDataFetcher.java b/spring-graphql/src/main/java/org/springframework/graphql/data/query/QueryByExampleDataFetcher.java
index 1c2195da..621c27d6 100644
--- a/spring-graphql/src/main/java/org/springframework/graphql/data/query/QueryByExampleDataFetcher.java
+++ b/spring-graphql/src/main/java/org/springframework/graphql/data/query/QueryByExampleDataFetcher.java
@@ -38,7 +38,6 @@ import org.springframework.data.domain.Sort;
 import org.springframework.data.repository.query.FluentQuery;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 import org.springframework.data.repository.query.ReactiveQueryByExampleExecutor;
-import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.graphql.data.GraphQlArgumentBinder;
 import org.springframework.graphql.data.GraphQlRepository;
@@ -246,7 +245,7 @@ public abstract class QueryByExampleDataFetcher<T> {
 
 		private final QueryByExampleExecutor<T> executor;
 
-		private final ClassTypeInformation<T> domainType;
+		private final TypeInformation<T> domainType;
 
 		private final Class<R> resultType;
 
@@ -254,10 +253,10 @@ public abstract class QueryByExampleDataFetcher<T> {
 
 		@SuppressWarnings("unchecked")
 		Builder(QueryByExampleExecutor<T> executor, Class<R> domainType) {
-			this(executor, ClassTypeInformation.from((Class<T>) domainType), domainType, Sort.unsorted());
+			this(executor, TypeInformation.of((Class<T>) domainType), domainType, Sort.unsorted());
 		}
 
-		Builder(QueryByExampleExecutor<T> executor, ClassTypeInformation<T> domainType, Class<R> resultType, Sort sort) {
+		Builder(QueryByExampleExecutor<T> executor, TypeInformation<T> domainType, Class<R> resultType, Sort sort) {
 			this.executor = executor;
 			this.domainType = domainType;
 			this.resultType = resultType;
@@ -326,7 +325,7 @@ public abstract class QueryByExampleDataFetcher<T> {
 
 		@SuppressWarnings("unchecked")
 		ReactiveBuilder(ReactiveQueryByExampleExecutor<T> executor, Class<R> domainType) {
-			this(executor, ClassTypeInformation.from((Class<T>) domainType), domainType, Sort.unsorted());
+			this(executor, TypeInformation.of((Class<T>) domainType), domainType, Sort.unsorted());
 		}
 
 		ReactiveBuilder(
diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/query/QuerydslDataFetcher.java b/spring-graphql/src/main/java/org/springframework/graphql/data/query/QuerydslDataFetcher.java
index 616fd328..0dc4da32 100644
--- a/spring-graphql/src/main/java/org/springframework/graphql/data/query/QuerydslDataFetcher.java
+++ b/spring-graphql/src/main/java/org/springframework/graphql/data/query/QuerydslDataFetcher.java
@@ -44,7 +44,6 @@ import org.springframework.data.querydsl.binding.QuerydslBindings;
 import org.springframework.data.querydsl.binding.QuerydslPredicateBuilder;
 import org.springframework.data.repository.query.FluentQuery;
 import org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery;
-import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.graphql.data.GraphQlRepository;
 import org.springframework.graphql.execution.RuntimeWiringConfigurer;
@@ -289,7 +288,7 @@ public abstract class QuerydslDataFetcher<T> {
 
 		private final QuerydslPredicateExecutor<T> executor;
 
-		private final ClassTypeInformation<T> domainType;
+		private final TypeInformation<T> domainType;
 
 		private final Class<R> resultType;
 
@@ -300,13 +299,13 @@ public abstract class QuerydslDataFetcher<T> {
 		@SuppressWarnings("unchecked")
 		Builder(QuerydslPredicateExecutor<T> executor, Class<R> domainType) {
 			this(executor,
-					ClassTypeInformation.from((Class<T>) domainType),
+					TypeInformation.of((Class<T>) domainType),
 					domainType,
 					Sort.unsorted(),
 					NO_OP_BINDER_CUSTOMIZER);
 		}
 
-		Builder(QuerydslPredicateExecutor<T> executor, ClassTypeInformation<T> domainType,
+		Builder(QuerydslPredicateExecutor<T> executor, TypeInformation<T> domainType,
 				Class<R> resultType, Sort sort, QuerydslBinderCustomizer<? extends EntityPath<T>> customizer) {
 
 			this.executor = executor;
@@ -400,7 +399,7 @@ public abstract class QuerydslDataFetcher<T> {
 		@SuppressWarnings("unchecked")
 		ReactiveBuilder(ReactiveQuerydslPredicateExecutor<T> executor, Class<R> domainType) {
 			this(executor,
-					ClassTypeInformation.from((Class<T>) domainType),
+					TypeInformation.of((Class<T>) domainType),
 					domainType,
 					Sort.unsorted(),
 					NO_OP_BINDER_CUSTOMIZER);