API Versioning reconcile problem Quick Fixes

Signed-off-by: BoykoAlex <alex.boyko@broadcom.com>

Author: BoykoAlex

headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/SpringProjectUtil.java

@@ -11,10 +11,16 @@
 package org.springframework.ide.vscode.commons.java;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -142,5 +148,60 @@ public static Predicate<IJavaProject> libraryVersionGreaterOrEqual(String librar
 			return true;
 		};
 	}
+	
+	/**
+	 * Finds Spring Boot application.properties and application.yml files in the project's resource folders.
+	 * Prioritizes main application.properties/yml files over profile-specific files (application-*.properties/yml).
+	 * Excludes test resources.
+	 * 
+	 * @param project the Java project
+	 * @return list of Boot properties/YAML file paths, with main files prioritized over profile-specific files
+	 */
+	public static List<Path> findBootPropertiesFiles(IJavaProject project) {
+		List<Path> mainFiles = new ArrayList<>();
+		List<Path> profileFiles = new ArrayList<>();
+		
+		try {
+			project.getClasspath().getClasspathEntries().stream()
+				.filter(Classpath::isSource)
+				.filter(cpe -> !cpe.isTest())  // Exclude test resources
+				.filter(cpe -> !cpe.isJavaContent())  // Only resource folders
+				.map(cpe -> new File(cpe.getPath()).toPath())
+				.flatMap(folder -> {
+					try {
+						return Files.list(folder);
+					} catch (IOException e) {
+						return Stream.empty();
+					}
+				})
+				.forEach(path -> {
+					String fileName = path.getFileName().toString();
+					
+					// Main application files - highest priority
+					if ("application.properties".equals(fileName)) {
+						mainFiles.add(path);
+					} else if ("application.yml".equals(fileName) || "application.yaml".equals(fileName)) {
+						mainFiles.add(path);
+					}
+					// Profile-specific files - lower priority
+					else if (fileName.matches("application-.*\\.properties")) {
+						profileFiles.add(path);
+					} else if (fileName.matches("application-.*\\.ya?ml")) {
+						profileFiles.add(path);
+					}
+				});
+		} catch (Exception e) {
+			// ignore
+		}
+		
+		// Return main files first, then profile files if no main files exist
+		List<Path> result = new ArrayList<>();
+		result.addAll(mainFiles);
+		if (mainFiles.isEmpty()) {
+			result.addAll(profileFiles);
+		}
+		return result;
+	}
+	
 
 }

headless-services/commons/commons-rewrite/src/main/java/org/openrewrite/java/spring/AddSpringProperty.java

@@ -23,6 +23,8 @@
 import org.openrewrite.yaml.MergeYaml;
 import org.openrewrite.yaml.tree.Yaml;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Objects;
@@ -65,7 +67,7 @@ public class AddSpringProperty extends Recipe {
     @Nullable
     List<String> pathExpressions;
 
-    
+    @JsonCreator
     public AddSpringProperty(String property, String value, @Nullable String comment,
 			@Nullable List<String> pathExpressions) {
 		this.property = property;

headless-services/commons/commons-rewrite/src/main/java/org/openrewrite/java/spring/AutowiredFieldIntoConstructorParameterVisitor.java

@@ -15,25 +15,37 @@
  */
 package org.openrewrite.java.spring;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import org.openrewrite.Cursor;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Tree;
 import org.openrewrite.internal.ListUtils;
-import org.openrewrite.java.*;
-import org.openrewrite.java.tree.*;
+import org.openrewrite.java.AnnotationMatcher;
+import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.JavaTemplate;
+import org.openrewrite.java.JavaVisitor;
+import org.openrewrite.java.RemoveAnnotationVisitor;
+import org.openrewrite.java.tree.Expression;
+import org.openrewrite.java.tree.J;
 import org.openrewrite.java.tree.J.Block;
 import org.openrewrite.java.tree.J.ClassDeclaration;
 import org.openrewrite.java.tree.J.MethodDeclaration;
 import org.openrewrite.java.tree.J.VariableDeclarations;
+import org.openrewrite.java.tree.JavaType;
 import org.openrewrite.java.tree.JavaType.FullyQualified;
+import org.openrewrite.java.tree.Space;
+import org.openrewrite.java.tree.Statement;
+import org.openrewrite.java.tree.TypeTree;
+import org.openrewrite.java.tree.TypeUtils;
 import org.openrewrite.marker.Markers;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import com.fasterxml.jackson.annotation.JsonCreator;
 
 
 public class AutowiredFieldIntoConstructorParameterVisitor extends JavaVisitor<ExecutionContext> {
@@ -43,7 +55,7 @@ public class AutowiredFieldIntoConstructorParameterVisitor extends JavaVisitor<E
     private final String fieldName;
 
 
-
+    @JsonCreator
     public AutowiredFieldIntoConstructorParameterVisitor(String classFqName, String fieldName) {
 		this.classFqName = classFqName;
 		this.fieldName = fieldName;

headless-services/commons/commons-rewrite/src/main/java/org/openrewrite/java/spring/ChangeSpringPropertyValue.java

@@ -18,11 +18,18 @@
 import java.util.Objects;
 
 import org.jspecify.annotations.Nullable;
-import org.openrewrite.*;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Option;
+import org.openrewrite.Recipe;
+import org.openrewrite.Tree;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.Validated;
 import org.openrewrite.internal.StringUtils;
 import org.openrewrite.properties.tree.Properties;
 import org.openrewrite.yaml.tree.Yaml;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+
 public class ChangeSpringPropertyValue extends Recipe {
 
     @Override
@@ -65,6 +72,7 @@ public String getDescription() {
     @Nullable
     Boolean relaxedBinding;
 
+    @JsonCreator
 	public ChangeSpringPropertyValue(String propertyKey, String newValue, @Nullable String oldValue,
 			@Nullable Boolean regex, @Nullable Boolean relaxedBinding) {
 		this.propertyKey = propertyKey;

headless-services/commons/commons-rewrite/src/main/java/org/openrewrite/java/spring/CommentOutSpringPropertyKey.java

@@ -19,10 +19,16 @@
 
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
-import org.openrewrite.*;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Option;
+import org.openrewrite.Recipe;
+import org.openrewrite.Tree;
+import org.openrewrite.TreeVisitor;
 import org.openrewrite.properties.tree.Properties;
 import org.openrewrite.yaml.tree.Yaml;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+
 public class CommentOutSpringPropertyKey extends Recipe {
 
     @Override
@@ -45,9 +51,8 @@ public String getDescription() {
             example = "This property is deprecated and no longer applicable starting from Spring Boot 3.0.x")
     String comment;
 
-    
+    @JsonCreator
     public CommentOutSpringPropertyKey(String propertyKey, String comment) {
-		super();
 		this.propertyKey = propertyKey;
 		this.comment = comment;
 	}

headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/AddApiVersionConfig.java

@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2026 Broadcom, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Broadcom, Inc. - initial API and implementation
+ *******************************************************************************/
+package org.springframework.ide.vscode.commons.rewrite.java;
+
+import java.util.List;
+
+import org.openrewrite.NlsRewrite.Description;
+import org.openrewrite.NlsRewrite.DisplayName;
+import org.openrewrite.config.CompositeRecipe;
+import org.springframework.ide.vscode.commons.rewrite.java.AddApiVersioningConfigurationCall.ConfigType;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class AddApiVersionConfig extends CompositeRecipe {
+
+	@JsonCreator
+	public AddApiVersionConfig(
+			@JsonProperty("filePath") String filePath,
+			@JsonProperty("pkgName") String pkgName,
+			@JsonProperty("isFlux") boolean isFlux,
+			@JsonProperty("configType") ConfigType configType,
+			@JsonProperty("value") String value) {
+		super(List.of(
+				new AddWebConfigurerBean(filePath, pkgName, isFlux),
+				new AddApiVersioningConfigMethod(filePath),
+				new AddApiVersioningConfigurationCall(filePath, configType, value)
+		));
+	}
+
+	@Override
+	public @DisplayName String getDisplayName() {
+		return "Add API versioning configuration to Web Configurer";
+	}
+
+	@Override
+	public @Description String getDescription() {
+		return "Creates or updates a Web Configurer class with API versioning configuration. "
+				+ "This composite recipe performs three steps: "
+				+ "1) Creates a WebMvcConfigurer or WebFluxConfigurer @Configuration class if it doesn't exist, "
+				+ "2) Adds the configureApiVersioning method if not present, and "
+				+ "3) Adds the appropriate versioning configuration call (useRequestHeader, useQueryParam, usePathSegment, or useMediaTypeParameter).";
+	}
+
+}

headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/AddApiVersioningConfigMethod.java

@@ -0,0 +1,131 @@
+/*******************************************************************************
+ * Copyright (c) 2026 Broadcom, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Broadcom, Inc. - initial API and implementation
+ *******************************************************************************/
+package org.springframework.ide.vscode.commons.rewrite.java;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.NlsRewrite.Description;
+import org.openrewrite.NlsRewrite.DisplayName;
+import org.openrewrite.Option;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.JavaParser;
+import org.openrewrite.java.JavaTemplate;
+import org.openrewrite.java.MethodMatcher;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.J.CompilationUnit;
+import org.openrewrite.java.tree.TypeUtils;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class AddApiVersioningConfigMethod extends Recipe {
+
+	private static final String WEB_MVC_CONFIGURER = "org.springframework.web.servlet.config.annotation.WebMvcConfigurer";
+	private static final String WEB_FLUX_CONFIGURER = "org.springframework.web.reactive.config.WebFluxConfigurer";
+	private static final String API_VERSION_CONFIGURER = "org.springframework.web.servlet.config.annotation.ApiVersionConfigurer";
+	
+	private static final MethodMatcher CONFIG_METHOD_MATCHER = new MethodMatcher(
+			"* configureApiVersioning(org.springframework.web.servlet.config.annotation.ApiVersionConfigurer)");
+
+	@Option(description = "Path to the Java file", example = "com/example/config/WebConfig.java")
+	private String filePath;
+
+	@JsonCreator
+	public AddApiVersioningConfigMethod(@JsonProperty("filePath") String filePath) {
+		this.filePath = filePath;
+	}
+
+	@Override
+	public @DisplayName String getDisplayName() {
+		return "Add configureApiVersioning method";
+	}
+
+	@Override
+	public @Description String getDescription() {
+		return "Adds configureApiVersioning method to WebMvcConfigurer or WebFluxConfigurer class if it doesn't exist.";
+	}
+
+	@Override
+	public TreeVisitor<?, ExecutionContext> getVisitor() {
+		final Path file = Paths.get(filePath);
+		return new JavaIsoVisitor<ExecutionContext>() {
+			
+			@Override
+			public CompilationUnit visitCompilationUnit(CompilationUnit cu, ExecutionContext p) {
+				Path cuPath = cu.getSourcePath();
+				// Only process if this is the target file
+				if (cuPath == null || !cuPath.equals(file)) {
+					return cu;
+				} else {
+					return super.visitCompilationUnit(cu, p);
+				}
+			}
+
+			@Override
+			public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) {
+				J.ClassDeclaration c = super.visitClassDeclaration(classDecl, ctx);
+				
+				// Check if class implements WebMvcConfigurer or WebFluxConfigurer
+				if (!isWebConfigurer(c)) {
+					return c;
+				}
+				
+				// Check if configureApiVersioning method already exists
+				if (hasConfigureApiVersioningMethod(c)) {
+					return c;
+				}
+				
+				// Add the configureApiVersioning method
+				return addConfigureApiVersioningMethod(c, ctx);
+			}
+			
+			private boolean isWebConfigurer(J.ClassDeclaration classDecl) {
+				return TypeUtils.isAssignableTo(WEB_MVC_CONFIGURER, classDecl.getType())
+						|| TypeUtils.isAssignableTo(WEB_FLUX_CONFIGURER, classDecl.getType());
+			}
+			
+			private boolean hasConfigureApiVersioningMethod(J.ClassDeclaration classDecl) {
+				return classDecl.getBody().getStatements().stream()
+						.filter(J.MethodDeclaration.class::isInstance)
+						.map(J.MethodDeclaration.class::cast)
+						.anyMatch(method -> CONFIG_METHOD_MATCHER.matches(method.getMethodType()));
+			}
+			
+			private J.ClassDeclaration addConfigureApiVersioningMethod(J.ClassDeclaration classDecl, ExecutionContext ctx) {
+				JavaTemplate template = JavaTemplate.builder("""
+					@Override
+					public void configureApiVersioning(ApiVersionConfigurer configurer) {
+					}
+					""")
+						.contextSensitive()
+						.javaParser(JavaParser.fromJavaVersion()
+								.dependsOn("""
+									package org.springframework.web.servlet.config.annotation;
+									public interface ApiVersionConfigurer {}
+									""")
+						)
+						.imports(API_VERSION_CONFIGURER)
+						.build();
+				
+				maybeAddImport(API_VERSION_CONFIGURER);
+				
+				return template.apply(
+						getCursor(),
+						classDecl.getBody().getCoordinates().lastStatement()
+				);
+			}
+		};
+	}
+}