Fix nullable issues.

Author: christophstrobl

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/AggregationBlocks.java

@@ -156,7 +156,7 @@ private static Class<?> getOutputType(MongoQueryMethod queryMethod) {
 		Class<?> outputType = queryMethod.getReturnedObjectType();
 		if (MongoSimpleTypes.HOLDER.isSimpleType(outputType)) {
 			outputType = Document.class;
-		} else if (ClassUtils.isAssignable(AggregationResults.class, outputType)) {
+		} else if (ClassUtils.isAssignable(AggregationResults.class, outputType) && queryMethod.getReturnType().getComponentType() != null) {
 			outputType = queryMethod.getReturnType().getComponentType().getType();
 		}
 		return outputType;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/AotPlaceholders.java

@@ -53,7 +53,7 @@ static Placeholder indexed(int position) {
 	 * @param type
 	 * @return
 	 */
-	public static Shape geoJson(int index, String type) {
+	static Shape geoJson(int index, String type) {
 		return new GeoJsonPlaceholder(index, type);
 	}
 
@@ -63,7 +63,7 @@ public static Shape geoJson(int index, String type) {
 	 * @param index zero-based index referring to the bindable method parameter.
 	 * @return
 	 */
-	public static Point point(int index) {
+	static Point point(int index) {
 		return new PointPlaceholder(index);
 	}
 
@@ -73,7 +73,7 @@ public static Point point(int index) {
 	 * @param index zero-based index referring to the bindable method parameter.
 	 * @return
 	 */
-	public static Shape circle(int index) {
+	static Shape circle(int index) {
 		return new CirclePlaceholder(index);
 	}
 
@@ -83,7 +83,7 @@ public static Shape circle(int index) {
 	 * @param index zero-based index referring to the bindable method parameter.
 	 * @return
 	 */
-	public static Shape box(int index) {
+	static Shape box(int index) {
 		return new BoxPlaceholder(index);
 	}
 
@@ -93,7 +93,7 @@ public static Shape box(int index) {
 	 * @param index zero-based index referring to the bindable method parameter.
 	 * @return
 	 */
-	public static Shape sphere(int index) {
+	static Shape sphere(int index) {
 		return new SpherePlaceholder(index);
 	}
 
@@ -103,11 +103,11 @@ public static Shape sphere(int index) {
 	 * @param index zero-based index referring to the bindable method parameter.
 	 * @return
 	 */
-	public static Shape polygon(int index) {
+	static Shape polygon(int index) {
 		return new PolygonPlaceholder(index);
 	}
 
-	public static RegexPlaceholder regex(int index, @Nullable String options) {
+	static RegexPlaceholder regex(int index, @Nullable String options) {
 		return new RegexPlaceholder(index, options);
 	}
 
@@ -117,7 +117,7 @@ public static RegexPlaceholder regex(int index, @Nullable String options) {
 	 * @since 5.0
 	 * @author Christoph Strobl
 	 */
-	public interface Placeholder {
+	interface Placeholder {
 
 		String getValue();
 	}
@@ -143,7 +143,7 @@ private static class PointPlaceholder extends Point implements Placeholder {
 
 		private final int index;
 
-		public PointPlaceholder(int index) {
+		PointPlaceholder(int index) {
 			super(Double.NaN, Double.NaN);
 			this.index = index;
 		}
@@ -188,7 +188,7 @@ private static class CirclePlaceholder extends Circle implements Placeholder {
 
 		private final int index;
 
-		public CirclePlaceholder(int index) {
+		CirclePlaceholder(int index) {
 			super(new PointPlaceholder(index), Distance.of(1, Metrics.NEUTRAL)); //
 			this.index = index;
 		}
@@ -209,7 +209,7 @@ private static class BoxPlaceholder extends Box implements Placeholder {
 
 		private final int index;
 
-		public BoxPlaceholder(int index) {
+		BoxPlaceholder(int index) {
 			super(new PointPlaceholder(index), new PointPlaceholder(index));
 			this.index = index;
 		}
@@ -230,7 +230,7 @@ private static class SpherePlaceholder extends Sphere implements Placeholder {
 
 		private final int index;
 
-		public SpherePlaceholder(int index) {
+		SpherePlaceholder(int index) {
 			super(new PointPlaceholder(index), Distance.of(1, Metrics.NEUTRAL)); //
 			this.index = index;
 		}
@@ -251,7 +251,7 @@ private static class PolygonPlaceholder extends Polygon implements Placeholder {
 
 		private final int index;
 
-		public PolygonPlaceholder(int index) {
+		PolygonPlaceholder(int index) {
 			super(new PointPlaceholder(index), new PointPlaceholder(index), new PointPlaceholder(index),
 					new PointPlaceholder(index));
 			this.index = index;
@@ -272,14 +272,14 @@ public String toString() {
 	static class RegexPlaceholder implements Placeholder {
 
 		private final int index;
-		private final String options;
+		private final @Nullable String options;
 
-		public RegexPlaceholder(int index, String options) {
+		RegexPlaceholder(int index, @Nullable String options) {
 			this.index = index;
 			this.options = options;
 		}
 
-		public @Nullable String regexOptions() {
+		@Nullable String regexOptions() {
 			return options;
 		}
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/AotStringQuery.java

@@ -87,7 +87,7 @@ boolean isRegexPlaceholderAt(int index) {
 		return this.placeholders.get(index) instanceof RegexPlaceholder;
 	}
 
-	String getRegexOptions(int index) {
+	@Nullable String getRegexOptions(int index) {
 		if(this.placeholders.isEmpty()) {
 			return null;
 		}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoAotRepositoryFragmentSupport.java

@@ -233,7 +233,7 @@ protected Object toRegex(Object source) {
 		return toRegex(source, null);
 	}
 
-	protected Object toRegex(Object source, String options) {
+	protected Object toRegex(Object source, @Nullable String options) {
 
 		if (source instanceof String sv) {
 			return new BsonRegularExpression(MongoRegexCreator.INSTANCE.toRegularExpression(sv, MatchMode.LIKE), options);
@@ -256,6 +256,7 @@ protected BasicQuery createQuery(Method method, String queryString, Object... pa
 		return new BasicQuery(queryDocument);
 	}
 
+	@SuppressWarnings("NullAway")
 	protected AggregationPipeline createPipeline(List<Object> rawStages) {
 
 		if (rawStages.isEmpty()) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributor.java

@@ -93,6 +93,7 @@ public MongoRepositoryContributor(AotRepositoryContext repositoryContext) {
 		this.queryCreator = new AotQueryCreator(this.mappingContext);
 	}
 
+	@SuppressWarnings("NullAway")
 	private NamedQueries getNamedQueries(@Nullable RepositoryConfigurationSource configSource, ClassLoader classLoader) {
 
 		String location = configSource != null ? configSource.getNamedQueryLocation().orElse(null) : null;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/Snippet.java

@@ -23,6 +23,7 @@
 import org.springframework.data.mongodb.repository.aot.Snippet.BuilderStyleVariableBuilder.BuilderStyleVariableBuilderImpl;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.CodeBlock.Builder;
+import org.springframework.util.Assert;
 
 /**
  * @author Christoph Strobl
@@ -192,12 +193,17 @@ public BuilderStyleMethodArgumentBuilder call(String methodName) {
 
 			@Override
 			public BuilderStyleBuilder with(Snippet snippet) {
+
+				Assert.notNull(targetMethodName, "TargetMethodName must be set before calling this method");
+
 				new BuilderStyleSnippet(targetVariableName, targetMethodName, snippet).appendTo(targetBuilder);
 				return this;
 			}
 
 			@Override
 			public VariableSnippet variable() {
+
+				Assert.notNull(variableSnippet, "VariableSnippet must not be null");
 				return this.variableSnippet;
 			}
 		}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java

@@ -258,8 +258,9 @@ private Criteria createNearCriteria(MongoPersistentProperty property, Criteria c
 			Iterator<Object> parameters) {
 
 		Range<Distance> range = accessor.getDistanceRange();
-		Optional<Distance> distance = range.getUpperBound().getValue();
-		Optional<Distance> minDistance = range.getLowerBound().getValue();
+
+		Optional<Distance> distance = range != null ? range.getUpperBound().getValue() : Optional.empty();
+		Optional<Distance> minDistance = range != null ? range.getLowerBound().getValue() : Optional.empty();
 
 		Point point = accessor.getGeoNearLocation();
 		Point pointToUse = point == null ? nextAs(parameters, Point.class) : point;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryExecution.java

@@ -202,7 +202,7 @@ NearQuery nearQuery(Query query) {
 			}
 
 			Range<Distance> distances = accessor.getDistanceRange();
-			Assert.notNull(nearLocation, "[query.distance] must not be null");
+			Assert.notNull(distances, "[query.distances] must not be null");
 
 			distances.getLowerBound().getValue().ifPresent(it -> nearQuery.minDistance(it).in(it.getMetric()));
 			distances.getUpperBound().getValue().ifPresent(it -> nearQuery.maxDistance(it).in(it.getMetric()));