Resolve package cycle between repository.config and repository.aot.

Closes spring-projects#2708

Author: christophstrobl

src/main/java/org/springframework/data/aot/ManagedTypesBeanRegistrationAotProcessor.java

@@ -31,6 +31,8 @@
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.ResolvableType;
 import org.springframework.data.domain.ManagedTypes;
+import org.springframework.data.util.TypeContributor;
+import org.springframework.data.util.TypeUtils;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;

src/main/java/org/springframework/data/aot/ManagedTypesRegistrationAotContribution.java

@@ -35,6 +35,7 @@
 import org.springframework.core.ResolvableType;
 import org.springframework.data.domain.ManagedTypes;
 import org.springframework.data.util.Lazy;
+import org.springframework.data.util.TypeCollector;
 import org.springframework.javapoet.ClassName;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.MethodSpec.Builder;

src/main/java/org/springframework/data/aot/Predicates.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.querydsl.aot;
+
+import java.util.Arrays;
+
+import org.springframework.aot.hint.MemberCategory;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
+import org.springframework.aot.hint.TypeReference;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
+import org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor;
+import org.springframework.lang.Nullable;
+import org.springframework.util.ClassUtils;
+
+import com.querydsl.core.types.Predicate;
+
+/**
+ * @author Christoph Strobl
+ * @since 4.0
+ */
+public class QuerydslHints implements RuntimeHintsRegistrar {
+
+	@Override
+	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
+
+		if (ClassUtils.isPresent("com.querydsl.core.types.Predicate", classLoader)) {
+
+			// repository infrastructure
+			hints.reflection().registerTypes(Arrays.asList( //
+					TypeReference.of(Predicate.class), //
+					TypeReference.of(QuerydslPredicateExecutor.class)), builder -> {
+						builder.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS);
+					});
+
+			if (ClassUtils.isPresent("reactor.core.publisher.Flux", classLoader)) {
+				// repository infrastructure
+				hints.reflection().registerTypes(Arrays.asList( //
+						TypeReference.of(ReactiveQuerydslPredicateExecutor.class)), builder -> {
+							builder.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS);
+						});
+			}
+		}
+	}
+}

src/main/java/org/springframework/data/querydsl/aot/QuerydslHints.java

@@ -26,9 +26,6 @@
 import org.springframework.core.io.InputStreamSource;
 import org.springframework.data.domain.Example;
 import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.querydsl.QuerydslPredicateExecutor;
-import org.springframework.data.querydsl.QuerydslUtils;
-import org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport;
 import org.springframework.data.repository.core.support.RepositoryFragment;
@@ -42,8 +39,6 @@
 import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 
-import com.querydsl.core.types.Predicate;
-
 /**
  * {@link RuntimeHintsRegistrar} holding required hints to bootstrap data repositories. <br />
  * Already registered via {@literal aot.factories}.
@@ -87,24 +82,6 @@ public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader)
 					});
 		}
 
-		if (QuerydslUtils.QUERY_DSL_PRESENT) {
-
-			// repository infrastructure
-			hints.reflection().registerTypes(Arrays.asList( //
-					TypeReference.of(Predicate.class), //
-					TypeReference.of(QuerydslPredicateExecutor.class)), builder -> {
-						builder.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS);
-					});
-
-			if (PROJECT_REACTOR_PRESENT) {
-				// repository infrastructure
-				hints.reflection().registerTypes(Arrays.asList( //
-						TypeReference.of(ReactiveQuerydslPredicateExecutor.class)), builder -> {
-							builder.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS);
-						});
-			}
-		}
-
 		// named queries
 		hints.reflection().registerTypes(Arrays.asList( //
 				TypeReference.of(Properties.class), //

src/main/java/org/springframework/data/repository/aot/hint/RepositoryRuntimeHints.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.aot;
+package org.springframework.data.repository.config;
 
 import java.lang.annotation.Annotation;
 import java.util.Set;

src/main/java/org/springframework/data/repository/aot/AotRepositoryContext.java renamed to src/main/java/org/springframework/data/repository/config/AotRepositoryContext.java

@@ -1,3 +1,35 @@
+/*
+ * Copyright 2022. the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Copyright 2022. the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 /*
  * Copyright 2022 the original author or authors.
  *
@@ -13,7 +45,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.aot;
+package org.springframework.data.repository.config;
 
 import java.lang.reflect.Method;
 import java.util.Collection;

src/main/java/org/springframework/data/repository/aot/AotRepositoryInformation.java renamed to src/main/java/org/springframework/data/repository/config/AotRepositoryInformation.java

@@ -1,3 +1,35 @@
+/*
+ * Copyright 2022. the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Copyright 2022. the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 /*
  * Copyright 2022 the original author or authors.
  *
@@ -13,7 +45,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.aot;
+package org.springframework.data.repository.config;
 
 import java.lang.annotation.Annotation;
 import java.util.LinkedHashSet;
@@ -23,8 +55,9 @@
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.core.annotation.MergedAnnotation;
 import org.springframework.data.aot.AotContext;
-import org.springframework.data.aot.TypeCollector;
-import org.springframework.data.aot.TypeUtils;
+import org.springframework.data.repository.config.AotRepositoryContext;
+import org.springframework.data.util.TypeCollector;
+import org.springframework.data.util.TypeUtils;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.util.Lazy;
 

src/main/java/org/springframework/data/repository/aot/DefaultAotRepositoryContext.java renamed to src/main/java/org/springframework/data/repository/config/DefaultAotRepositoryContext.java

@@ -1,3 +1,35 @@
+/*
+ * Copyright 2022. the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Copyright 2022. the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 /*
  * Copyright 2022 the original author or authors.
  *
@@ -13,7 +45,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.repository.aot;
+package org.springframework.data.repository.config;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -23,8 +55,6 @@
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.data.repository.config.RepositoryConfiguration;
-import org.springframework.data.repository.config.RepositoryFragmentConfigurationProvider;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
 import org.springframework.data.repository.core.support.RepositoryFragment;

src/main/java/org/springframework/data/repository/aot/RepositoryBeanDefinitionReader.java renamed to src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionReader.java

@@ -23,7 +23,6 @@
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.data.repository.aot.RepositoryRegistrationAotProcessor;
 import org.springframework.lang.NonNull;
 
 /**