Support different path param types for #7 What field from crd should be

used as an identifier for the resource

Author: Javatar81

operator-gen-maven-plugin/src/main/java/org/acme/OperatorGenMojo.java

@@ -74,10 +74,6 @@ public class OperatorGenMojo
     private Configuration config;
 
 
-    public OperatorGenMojo() {
-    	
-    }
-    
     public void execute()
         throws MojoExecutionException
     {
@@ -112,7 +108,7 @@ private void processResponseType(OpenAPI openApiDoc, File jsonsFile, String resp
 		String crdVersion = config.getCrdVersion();
 		String basePackage = config.getCrdPackage();
 		ResponseTypeMapper mapper = new ResponseTypeMapper(openApiDoc, responseType);
-		ParameterResolver resolver = new ParameterResolver(config);
+		ParameterResolver resolver = new ParameterResolver(config, openApiDoc);
 		ApiClientMethodCallFactory methodCalls = new KiotaMethodCallFactory(mapper, resolver);
 		String className = responseType.substring(0, 1).toUpperCase() + responseType.substring(1);
 		Name crdName = new Name(new Name(basePackage), className);

operator-gen-maven-plugin/src/main/java/org/acme/client/ParameterResolver.java

@@ -3,11 +3,16 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 import org.acme.Configuration;
+import org.eclipse.microprofile.openapi.models.OpenAPI;
+import org.eclipse.microprofile.openapi.models.Operation;
+import org.eclipse.microprofile.openapi.models.PathItem;
+import org.eclipse.microprofile.openapi.models.parameters.Parameter;
 
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.expr.Expression;
@@ -17,9 +22,19 @@
 public class ParameterResolver {
 
 	private final Configuration config;
+	private final OpenAPI openApiDoc;
 
-	public ParameterResolver(Configuration config) {
+	public ParameterResolver(Configuration config, OpenAPI openApiDoc) {
 		this.config = config;
+		this.openApiDoc = openApiDoc;
+	}
+	
+	public Optional<Parameter> getParameterType(String path, int paramIndex) {
+		PathItem pathItem = openApiDoc.getPaths().getPathItem(path);
+		Optional<Operation> oneOfIdOps = Optional.ofNullable(pathItem.getGET())
+			.or(() -> Optional.ofNullable(pathItem.getPATCH()))
+			.or(() -> Optional.ofNullable(pathItem.getDELETE()));
+		return oneOfIdOps.map(o -> o.getParameters().get(paramIndex));
 	}
 
 	public NodeList<Expression> resolveArgs(String path, NameExpr primary, NodeList<Expression> defaultArgs) {

operator-gen-maven-plugin/src/main/java/org/acme/gen/CrdResourceGen.java

@@ -5,6 +5,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -46,6 +47,17 @@
  * patch request schema will be moved to the CRD status.
  */
 public class CrdResourceGen {
+	
+	private static class FieldNameType {
+		String name;
+		String type;
+		FieldNameType(String name, String type) {
+			this.name = name;
+			this.type = type;
+		}
+	}
+	
+	
 	private static final Logger LOG = LoggerFactory.getLogger(CrdResourceGen.class);
 	private static final String NODE_TEMPLATE = "{\"type\": \"%s\"}";
 	private final Path path;
@@ -55,6 +67,8 @@ public class CrdResourceGen {
 	private final ParameterResolver resolver;
 	private final ObjectMapper objMapper = new ObjectMapper();
 
+	
+	
 
 	public CrdResourceGen(Path path, Path openApiJson, Name name, CrudMapper mapper, ParameterResolver resolver) {
 		super();
@@ -112,24 +126,31 @@ private void mapProperties(JsonNode jsonNodeTree, JSONSchemaPropsBuilder specBui
 	private void addMissingFieldsFromPathParamMappings(Set<Entry<String, JsonNode>> fields, String prefix) {
 		resolver.getPathParamMappingKeys().stream()
 			.filter(this::oneOfCrudPathsMatches)
-			//TODO Determine the type of the param
-			// Use the path to determine the params and add info to param 1,2,3
-			.flatMap(s -> resolver.paramMappingValueList(resolver.getPathParamMappings().get(s)).stream())
-			.filter(v -> v.startsWith(prefix + "."))
+			.flatMap(s -> {
+				List<String> paramMappingValueList = resolver.paramMappingValueList(resolver.getPathParamMappings().get(s));
+				List<FieldNameType> fieldEntries = new ArrayList<>(); 
+				for (int i = 0; i < paramMappingValueList.size(); i++) {
+					fieldEntries.add(new FieldNameType(paramMappingValueList.get(i), resolver.getParameterType(s, i)
+							.map(p -> p.getSchema().getType().toString()).orElse("string")));
+				}
+				return fieldEntries.stream();
+			})
+			.filter(v -> v.name.startsWith(prefix + "."))
 			.map(v -> removePrefix(prefix, v))
-			.filter(v -> fields.stream().noneMatch(e -> e.getKey().equals(v)))
+			.filter(v -> fields.stream().noneMatch(e -> e.getKey().equals(v.name)))
 			.forEach(v -> {
 				try {
-					
-					fields.add(Map.entry(v, objMapper.readTree(String.format(NODE_TEMPLATE, "string"))));
+					System.out.println(v.name);
+					fields.add(Map.entry(v.name, objMapper.readTree(String.format(NODE_TEMPLATE, v.type))));
 				} catch (JsonProcessingException e) {
 					LOG.error("Error adding JSON node", e);
 				} 
-			});
+			});		
 	}
 
-	private String removePrefix(String prefix, String v) {
-		return v.substring(prefix.length() + 1);
+	private FieldNameType removePrefix(String prefix, FieldNameType fieldNameType) {
+		fieldNameType.name = fieldNameType.name.substring(prefix.length() + 1);
+		return fieldNameType;
 	}
 
 	private boolean oneOfCrudPathsMatches(String s) {

operator-gen-maven-plugin/src/test/java/org/acme/client/KiotaClientNamingTest.java

@@ -56,7 +56,7 @@ public V setValue(V value) {
 	@BeforeEach
 	void setUp() {
 		mapper = Mockito.mock(CrudMapper.class);
-		client = new KiotaMethodCallFactory(mapper, new ParameterResolver(new Configuration(ConfigProvider.getConfig(), new ArrayList<>())));
+		client = new KiotaMethodCallFactory(mapper, new ParameterResolver(new Configuration(ConfigProvider.getConfig(), new ArrayList<>()), null));
 	}
 
 	@Test