refactor: Common static analysis issues

Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.staticanalysis.CommonStaticAnalysis?organizationId=TmV0ZmxpeCArIFNwcmluZw%3D%3D

Co-authored-by: Moderne <team@moderne.io>

Author: natedanner

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoResourceHolder.java

@@ -36,7 +36,7 @@
 class MongoResourceHolder extends ResourceHolderSupport {
 
 	private @Nullable ClientSession session;
-	private MongoDatabaseFactory dbFactory;
+	private final MongoDatabaseFactory dbFactory;
 
 	/**
 	 * Create a new {@link MongoResourceHolder} for a given {@link ClientSession session}.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoDatabaseUtils.java

@@ -144,11 +144,8 @@ private static Mono<MongoDatabase> doGetMongoDatabase(@Nullable String dbName, R
 
 		return TransactionSynchronizationManager.forCurrentTransaction()
 				.filter(TransactionSynchronizationManager::isSynchronizationActive) //
-				.flatMap(synchronizationManager -> {
-
-					return doGetSession(synchronizationManager, factory, sessionSynchronization) //
-							.flatMap(it -> getMongoDatabaseOrDefault(dbName, factory.withSession(it)));
-				}) //
+				.flatMap(synchronizationManager -> doGetSession(synchronizationManager, factory, sessionSynchronization) //
+							.flatMap(it -> getMongoDatabaseOrDefault(dbName, factory.withSession(it)))) //
 				.onErrorResume(NoTransactionException.class, e -> getMongoDatabaseOrDefault(dbName, factory))
 				.switchIfEmpty(getMongoDatabaseOrDefault(dbName, factory));
 	}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoResourceHolder.java

@@ -36,7 +36,7 @@
 class ReactiveMongoResourceHolder extends ResourceHolderSupport {
 
 	private @Nullable ClientSession session;
-	private ReactiveMongoDatabaseFactory databaseFactory;
+	private final ReactiveMongoDatabaseFactory databaseFactory;
 
 	/**
 	 * Create a new {@link ReactiveMongoResourceHolder} for a given {@link ClientSession session}.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoTransactionManager.java

@@ -175,10 +175,9 @@ protected Mono<Void> doBegin(TransactionSynchronizationManager synchronizationMa
 					.onErrorMap(
 							ex -> new TransactionSystemException(String.format("Could not start Mongo transaction for session %s.",
 									debugString(mongoTransactionObject.getSession())), ex))
-					.doOnSuccess(resourceHolder -> {
+					.doOnSuccess(resourceHolder ->
 
-						synchronizationManager.bindResource(getRequiredDatabaseFactory(), resourceHolder);
-					}).then();
+						synchronizationManager.bindResource(getRequiredDatabaseFactory(), resourceHolder)).then();
 		});
 	}
 
@@ -215,10 +214,8 @@ protected final Mono<Void> doCommit(TransactionSynchronizationManager synchroniz
 						debugString(mongoTransactionObject.getSession())));
 			}
 
-			return doCommit(synchronizationManager, mongoTransactionObject).onErrorMap(ex -> {
-				return new TransactionSystemException(String.format("Could not commit Mongo transaction for session %s.",
-						debugString(mongoTransactionObject.getSession())), ex);
-			});
+			return doCommit(synchronizationManager, mongoTransactionObject).onErrorMap(ex -> new TransactionSystemException(String.format("Could not commit Mongo transaction for session %s.",
+						debugString(mongoTransactionObject.getSession())), ex));
 		});
 	}
 
@@ -251,11 +248,9 @@ protected Mono<Void> doRollback(TransactionSynchronizationManager synchronizatio
 						debugString(mongoTransactionObject.getSession())));
 			}
 
-			return mongoTransactionObject.abortTransaction().onErrorResume(MongoException.class, ex -> {
-				return Mono
+			return mongoTransactionObject.abortTransaction().onErrorResume(MongoException.class, ex -> Mono
 						.error(new TransactionSystemException(String.format("Could not abort Mongo transaction for session %s.",
-								debugString(mongoTransactionObject.getSession())), ex));
-			});
+								debugString(mongoTransactionObject.getSession())), ex)));
 		});
 	}
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SessionAwareMethodInterceptor.java

@@ -115,9 +115,9 @@ public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 
 		Optional<Method> targetMethod = METHOD_CACHE.lookup(methodInvocation.getMethod(), targetType, sessionType);
 
-		return !targetMethod.isPresent() ? methodInvocation.proceed()
-				: ReflectionUtils.invokeMethod(targetMethod.get(), target,
-						prependSessionToArguments(session, methodInvocation));
+		return targetMethod.isPresent() ? ReflectionUtils.invokeMethod(targetMethod.get(), target,
+						prependSessionToArguments(session, methodInvocation))
+				: methodInvocation.proceed();
 	}
 
 	private boolean requiresDecoration(Method method) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SimpleMongoTransactionOptions.java

@@ -36,7 +36,7 @@
  * @author Christoph Strobl
  * @since 4.3
  */
-class SimpleMongoTransactionOptions implements MongoTransactionOptions {
+final class SimpleMongoTransactionOptions implements MongoTransactionOptions {
 
 	static final Set<String> KNOWN_KEYS = Arrays.stream(OptionKey.values()).map(OptionKey::getKey)
 			.collect(Collectors.toSet());

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SpringDataMongoDB.java

@@ -57,7 +57,7 @@ public static MongoDriverInformation driverInformation() {
 	public static Version version() {
 
 		Package pkg = SpringDataMongoDB.class.getPackage();
-		String versionString = (pkg != null ? pkg.getImplementationVersion() : null);
+		String versionString = pkg != null ? pkg.getImplementationVersion() : null;
 
 		if (!StringUtils.hasText(versionString)) {
 

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

@@ -40,7 +40,7 @@
  */
 public class LazyLoadingProxyAotProcessor {
 
-	private boolean generalLazyLoadingProxyContributed = false;
+	private boolean generalLazyLoadingProxyContributed;
 
 	public void registerLazyLoadingProxyIfNeeded(Class<?> type, GenerationContext generationContext) {
 

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

@@ -33,12 +33,12 @@
  */
 public class MongoAotPredicates {
 
-	public static final Predicate<Class<?>> IS_SIMPLE_TYPE = (type) -> MongoSimpleTypes.HOLDER.isSimpleType(type)
+	public static final Predicate<Class<?>> IS_SIMPLE_TYPE = type -> MongoSimpleTypes.HOLDER.isSimpleType(type)
 			|| TypeUtils.type(type).isPartOf("org.bson");
 	public static final Predicate<ReactiveLibrary> IS_REACTIVE_LIBARARY_AVAILABLE = ReactiveWrappers::isAvailable;
-	public static final Predicate<ClassLoader> IS_SYNC_CLIENT_PRESENT = (classLoader) -> ClassUtils
+	public static final Predicate<ClassLoader> IS_SYNC_CLIENT_PRESENT = classLoader -> ClassUtils
 			.isPresent("com.mongodb.client.MongoClient", classLoader);
-	public static final Predicate<ClassLoader> IS_REACTIVE_CLIENT_PRESENT = (classLoader) -> ClassUtils
+	public static final Predicate<ClassLoader> IS_REACTIVE_CLIENT_PRESENT = classLoader -> ClassUtils
 			.isPresent("com.mongodb.reactivestreams.client.MongoClient", classLoader);
 
 	/**

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingBeanDefinitionParser.java

@@ -44,7 +44,7 @@
  */
 public class MongoAuditingBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
 
-	private static boolean PROJECT_REACTOR_AVAILABLE = ClassUtils.isPresent("reactor.core.publisher.Mono",
+	private static final boolean PROJECT_REACTOR_AVAILABLE = ClassUtils.isPresent("reactor.core.publisher.Mono",
 			MongoAuditingRegistrar.class.getClassLoader());
 
 	@Override

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoConfigurationSupport.java

@@ -139,7 +139,7 @@ protected void configureConverters(MongoConverterConfigurationAdapter converterC
 	 */
 	protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
 
-		Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
+		Set<Class<?>> initialEntitySet = new HashSet<>();
 
 		for (String basePackage : getMappingBasePackages()) {
 			initialEntitySet.addAll(scanForEntities(basePackage));
@@ -162,7 +162,7 @@ protected Set<Class<?>> scanForEntities(String basePackage) throws ClassNotFound
 			return Collections.emptySet();
 		}
 
-		Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
+		Set<Class<?>> initialEntitySet = new HashSet<>();
 
 		if (StringUtils.hasText(basePackage)) {
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoParsingUtils.java

@@ -143,7 +143,7 @@ public static boolean parseMongoClientSettings(Element element, BeanDefinitionBu
 	 */
 	static BeanDefinitionBuilder getWriteConcernPropertyEditorBuilder() {
 
-		Map<String, Class<?>> customEditors = new ManagedMap<String, Class<?>>();
+		Map<String, Class<?>> customEditors = new ManagedMap<>();
 		customEditors.put("com.mongodb.WriteConcern", WriteConcernPropertyEditor.class);
 
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);
@@ -213,7 +213,7 @@ static BeanDefinitionBuilder getReadPreferencePropertyEditorBuilder() {
 	 */
 	static BeanDefinitionBuilder getMongoCredentialPropertyEditor() {
 
-		Map<String, Class<?>> customEditors = new ManagedMap<String, Class<?>>();
+		Map<String, Class<?>> customEditors = new ManagedMap<>();
 		customEditors.put("com.mongodb.MongoCredential[]", MongoCredentialPropertyEditor.class);
 
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CustomEditorConfigurer.class);

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java

@@ -55,7 +55,7 @@ public void setAsText(@Nullable String replicaSetString) {
 		}
 
 		String[] replicaSetStringArray = StringUtils.commaDelimitedListToStringArray(replicaSetString);
-		Set<ServerAddress> serverAddresses = new HashSet<ServerAddress>(replicaSetStringArray.length);
+		Set<ServerAddress> serverAddresses = new HashSet<>(replicaSetStringArray.length);
 
 		for (String element : replicaSetStringArray) {
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ChangeStreamEvent.java

@@ -221,10 +221,12 @@ public String toString() {
 	@Override
 	public boolean equals(@Nullable Object o) {
 
-		if (this == o)
+		if (this == o) {
 			return true;
-		if (o == null || getClass() != o.getClass())
+		}
+		if (o == null || getClass() != o.getClass()) {
 			return false;
+		}
 
 		ChangeStreamEvent<?> that = (ChangeStreamEvent<?>) o;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ChangeStreamOptions.java

@@ -165,10 +165,12 @@ private static <T> Object doGetTimestamp(Object timestamp, Class<T> targetType)
 
 	@Override
 	public boolean equals(@Nullable Object o) {
-		if (this == o)
+		if (this == o) {
 			return true;
-		if (o == null || getClass() != o.getClass())
+		}
+		if (o == null || getClass() != o.getClass()) {
 			return false;
+		}
 
 		ChangeStreamOptions that = (ChangeStreamOptions) o;
 
@@ -230,7 +232,7 @@ enum Resume {
 	 * @author Christoph Strobl
 	 * @since 2.1
 	 */
-	public static class ChangeStreamOptionsBuilder {
+	public static final class ChangeStreamOptionsBuilder {
 
 		private @Nullable Object filter;
 		private @Nullable BsonValue resumeToken;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CollectionOptions.java

@@ -39,13 +39,13 @@
  * @author Mark Paluch
  * @author Andreas Zink
  */
-public class CollectionOptions {
+public final class CollectionOptions {
 
 	private @Nullable Long maxDocuments;
 	private @Nullable Long size;
 	private @Nullable Boolean capped;
 	private @Nullable Collation collation;
-	private ValidationOptions validationOptions;
+	private final ValidationOptions validationOptions;
 	private @Nullable TimeSeriesOptions timeSeriesOptions;
 	private @Nullable CollectionChangeStreamOptions changeStreamOptions;
 
@@ -547,8 +547,9 @@ public boolean equals(@Nullable Object o) {
 			if (!ObjectUtils.nullSafeEquals(validator, that.validator)) {
 				return false;
 			}
-			if (validationLevel != that.validationLevel)
+			if (validationLevel != that.validationLevel) {
 				return false;
+			}
 			return validationAction == that.validationAction;
 		}
 
@@ -567,7 +568,7 @@ public int hashCode() {
 	 * @author Christoph Strobl
 	 * @since 4.0
 	 */
-	public static class CollectionChangeStreamOptions {
+	public static final class CollectionChangeStreamOptions {
 
 		private final boolean preAndPostImages;
 
@@ -609,7 +610,7 @@ public boolean equals(@Nullable Object o) {
 
 		@Override
 		public int hashCode() {
-			return (preAndPostImages ? 1 : 0);
+			return preAndPostImages ? 1 : 0;
 		}
 	}
 
@@ -621,7 +622,7 @@ public int hashCode() {
 	 * @see <a href=
 	 *      "https://docs.mongodb.com/manual/core/timeseries-collections">https://docs.mongodb.com/manual/core/timeseries-collections</a>
 	 */
-	public static class TimeSeriesOptions {
+	public static final class TimeSeriesOptions {
 
 		private final String timeField;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CollectionPreparerSupport.java

@@ -119,7 +119,7 @@ public ReadPreference getReadPreference() {
 		return null;
 	}
 
-	static class CollectionPreparerDelegate extends CollectionPreparerSupport
+	static final class CollectionPreparerDelegate extends CollectionPreparerSupport
 			implements CollectionPreparer<MongoCollection<Document>> {
 
 		private CollectionPreparerDelegate(List<Object> sources) {
@@ -147,7 +147,7 @@ public MongoCollection<Document> prepare(MongoCollection<Document> collection) {
 
 	}
 
-	static class ReactiveCollectionPreparerDelegate extends CollectionPreparerSupport
+	static final class ReactiveCollectionPreparerDelegate extends CollectionPreparerSupport
 			implements CollectionPreparer<com.mongodb.reactivestreams.client.MongoCollection<Document>> {
 
 		private ReactiveCollectionPreparerDelegate(List<Object> sources) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CountQuery.java

@@ -36,7 +36,7 @@
  * @author Mark Paluch
  * @since 3.0
  */
-class CountQuery {
+final class CountQuery {
 
 	private final Document source;
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CursorPreparer.java

@@ -38,7 +38,7 @@ public interface CursorPreparer extends ReadPreferenceAware {
 	 *
 	 * @since 2.2
 	 */
-	CursorPreparer NO_OP_PREPARER = (iterable -> iterable);
+	CursorPreparer NO_OP_PREPARER = iterable -> iterable;
 
 	/**
 	 * Prepare the given cursor (apply limits, skips and so on). Returns the prepared cursor.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultReactiveBulkOperations.java

@@ -236,9 +236,7 @@ private Mono<BulkWriteResult> bulkWriteTo(MongoCollection<Document> collection)
 		});
 
 		MongoCollection<Document> theCollection = collection;
-		return concat.collectList().flatMap(it -> {
-
-			return Mono
+		return concat.collectList().flatMap(it -> Mono
 					.from(theCollection
 							.bulkWrite(it.stream().map(SourceAwareWriteModelHolder::model).collect(Collectors.toList()), bulkOptions))
 					.doOnSuccess(state -> {
@@ -247,8 +245,7 @@ private Mono<BulkWriteResult> bulkWriteTo(MongoCollection<Document> collection)
 						List<Mono<Object>> monos = it.stream().map(this::maybeInvokeAfterSaveCallback).collect(Collectors.toList());
 
 						return Flux.concat(monos).then(Mono.just(state));
-					});
-		});
+					}));
 	}
 
 	/**

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultScriptOperations.java

@@ -137,7 +137,7 @@ public Set<String> getScriptNames() {
 			return Collections.emptySet();
 		}
 
-		Set<String> scriptNames = new HashSet<String>();
+		Set<String> scriptNames = new HashSet<>();
 
 		for (NamedMongoScript script : scripts) {
 			scriptNames.add(script.getName());

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityOperations.java

@@ -842,7 +842,7 @@ private Object getNestedPropertyValue(String key) {
 		}
 	}
 
-	private static class AdaptibleMappedEntity<T> extends MappedEntity<T> implements AdaptibleEntity<T> {
+	private static final class AdaptibleMappedEntity<T> extends MappedEntity<T> implements AdaptibleEntity<T> {
 
 		private final MongoPersistentEntity<?> entity;
 		private final ConvertingPropertyAccessor<T> propertyAccessor;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/FindPublisherPreparer.java

@@ -39,7 +39,7 @@ public interface FindPublisherPreparer extends ReadPreferenceAware {
 	 *
 	 * @since 2.2
 	 */
-	FindPublisherPreparer NO_OP_PREPARER = (findPublisher -> findPublisher);
+	FindPublisherPreparer NO_OP_PREPARER = findPublisher -> findPublisher;
 
 	/**
 	 * Prepare the given cursor (apply limits, skips and so on). Returns the prepared cursor.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/GeoCommandStatistics.java

@@ -26,7 +26,7 @@
  * @soundtrack Fruitcake - Jeff Coffin (The Inside of the Outside)
  * @since 1.9
  */
-class GeoCommandStatistics {
+final class GeoCommandStatistics {
 
 	private static final GeoCommandStatistics NONE = new GeoCommandStatistics(new Document());
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/HintFunction.java

@@ -30,7 +30,7 @@
  * @author Christoph Strobl
  * @since 4.1
  */
-class HintFunction {
+final class HintFunction {
 
 	private static final HintFunction EMPTY = new HintFunction(null);
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappedDocument.java

@@ -32,7 +32,7 @@
  * @author Oliver Gierke
  * @since 2.1
  */
-public class MappedDocument {
+public final class MappedDocument {
 
 	private static final String ID_FIELD = FieldName.ID.name();
 	private static final Document ID_ONLY_PROJECTION = new Document(ID_FIELD, 1);

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreator.java

@@ -73,7 +73,7 @@ class MappingMongoJsonSchemaCreator implements MongoJsonSchemaCreator {
 	MappingMongoJsonSchemaCreator(MongoConverter converter) {
 
 		this(converter, (MappingContext<MongoPersistentEntity<?>, MongoPersistentProperty>) converter.getMappingContext(),
-				(property) -> true, new LinkedMultiValueMap<>());
+				property -> true, new LinkedMultiValueMap<>());
 	}
 
 	@SuppressWarnings("unchecked")