Adapt to AOT Infrastructure changes in Commons.

Add Neo4jTypeFilters for general exclusion of Neo4j simple types.

See spring-projects/spring-data-commons#3267

Author: mp911de

src/main/java/org/springframework/data/neo4j/aot/Neo4jManagedTypesBeanRegistrationAotProcessor.java

@@ -13,13 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.neo4j.aot;
 
 import org.jspecify.annotations.Nullable;
 
-import org.springframework.aot.generate.GenerationContext;
-import org.springframework.core.ResolvableType;
-import org.springframework.data.aot.AotContext;
 import org.springframework.data.aot.ManagedTypesBeanRegistrationAotProcessor;
 import org.springframework.util.ClassUtils;
 
@@ -45,14 +43,4 @@ boolean isNeo4jManagedTypes(@Nullable Class<?> beanType) {
 		return beanType != null && ClassUtils.isAssignable(Neo4jManagedTypes.class, beanType);
 	}
 
-	@Override
-	protected void contributeType(ResolvableType type, GenerationContext generationContext, AotContext aotContext) {
-
-		if (Neo4jAotPredicates.IS_SIMPLE_TYPE.test(type.toClass())) {
-			return;
-		}
-
-		super.contributeType(type, generationContext, aotContext);
-	}
-
 }

src/main/java/org/springframework/data/neo4j/aot/Neo4jTypeFilters.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2011-2025 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.neo4j.aot;
+
+import java.util.function.Predicate;
+
+import org.springframework.data.util.TypeCollector;
+import org.springframework.data.util.TypeUtils;
+
+/**
+ * {@link TypeCollector} predicates to exclude Neo4j simple types.
+ *
+ * @author Mark Paluch
+ * @since 8.0
+ */
+class Neo4jTypeFilters implements TypeCollector.TypeCollectorFilters {
+
+	private static final Predicate<Class<?>> CLASS_FILTER = it -> TypeUtils.type(it)
+		.isPartOf("org.springframework.data.neo4j.types", "org.neo4j.driver.types");
+
+	@Override
+	public Predicate<Class<?>> classPredicate() {
+		return Neo4jAotPredicates.IS_SIMPLE_TYPE.or(CLASS_FILTER).negate();
+	}
+
+}

src/main/resources/META-INF/spring/aot.factories

@@ -1,4 +1,6 @@
 org.springframework.aot.hint.RuntimeHintsRegistrar=\
  	org.springframework.data.neo4j.aot.Neo4jRuntimeHints
  org.springframework.beans.factory.aot.BeanRegistrationAotProcessor=\
- 	org.springframework.data.neo4j.aot.Neo4jManagedTypesBeanRegistrationAotProcessor
+ 	org.springframework.data.neo4j.aot.Neo4jManagedTypesBeanRegistrationAotProcessor
+org.springframework.data.util.TypeCollector$TypeCollectorFilters=\
+	org.springframework.data.neo4j.aot.Neo4jTypeFilters

src/test/java/org/springframework/data/neo4j/aot/Neo4jTypeFiltersUnitTests.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2011-2025 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.neo4j.aot;
+
+import java.math.BigDecimal;
+
+import org.junit.jupiter.api.Test;
+import org.neo4j.driver.Value;
+
+import org.springframework.data.neo4j.types.GeographicPoint2d;
+import org.springframework.data.util.TypeCollector;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Unit tests for {@link Neo4jTypeFilters}.
+ *
+ * @author Mark Paluch
+ */
+class Neo4jTypeFiltersUnitTests {
+
+	@Test
+	void shouldExcludeNeo4jSimpleTypes() {
+		assertThat(TypeCollector.inspect(MyEntity.class).list()).containsOnly(MyEntity.class, OtherEntity.class);
+	}
+
+	public static class MyEntity {
+
+		private BigDecimal aNumber;
+
+		private GeographicPoint2d point;
+
+		private Value value;
+
+		private OtherEntity other;
+
+		public BigDecimal getaNumber() {
+			return this.aNumber;
+		}
+
+		public void setaNumber(BigDecimal aNumber) {
+			this.aNumber = aNumber;
+		}
+
+		public GeographicPoint2d getPoint() {
+			return this.point;
+		}
+
+		public void setPoint(GeographicPoint2d point) {
+			this.point = point;
+		}
+
+		public Value getValue() {
+			return this.value;
+		}
+
+		public void setValue(Value value) {
+			this.value = value;
+		}
+
+		public OtherEntity getOther() {
+			return this.other;
+		}
+
+		public void setOther(OtherEntity other) {
+			this.other = other;
+		}
+
+	}
+
+	public static class OtherEntity {
+
+	}
+
+}