Replace dashes in method name. Support parameters on path level.

Author: Javatar81

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

@@ -70,6 +70,7 @@ private MethodCallExpr toMethodCallExpression(Expression prev, String pathKey, N
 		MethodCallExpr methodCallExpr;
 		if (methodName.startsWith("{")) {
 			methodName = "by" + Character.toUpperCase(methodName.charAt(1)) + methodName.substring(2, methodName.length() - 1);
+			methodName = replaceDashes(methodName);
 			methodCallExpr = new MethodCallExpr(prev, methodName, args.size() > 1 ? new NodeList<>(args.remove(0)) : args);
 		} else {
 			methodCallExpr = new MethodCallExpr(prev, methodName);
@@ -80,5 +81,20 @@ private MethodCallExpr toMethodCallExpression(Expression prev, String pathKey, N
 			return methodCallExpr;
 		}
 	}
+	
+	private static String replaceDashes(String methodName) {
+		int dashIndex = methodName.indexOf("-"); 
+		while(dashIndex > -1) {
+			methodName = methodName.substring(0, dashIndex) 
+					+ String.valueOf(methodName.charAt(dashIndex + 1)).toUpperCase() 
+					+ methodName.substring(dashIndex + 2, methodName.length());
+			dashIndex = methodName.indexOf("-");
+		}
+		return methodName;
+	}
+	
+	public static void main(String[] args) {
+		System.out.println(replaceDashes("abcd-efg"));
+	}
 
 }

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

@@ -34,7 +34,8 @@ public Optional<Parameter> getParameterType(String path, int paramIndex) {
 		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));
+		return oneOfIdOps.map(o -> o.getParameters()).or(() -> Optional.ofNullable(pathItem.getParameters()))
+				.map(p -> p.get(paramIndex));
 	}
 
 	public NodeList<Expression> resolveArgs(String path, NameExpr primary, NodeList<Expression> defaultArgs) {

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

@@ -10,6 +10,7 @@
 import org.acme.client.ApiClientMethodCallFactory;
 import org.acme.read.crud.CrudMapper;
 import org.eclipse.microprofile.openapi.models.Operation;
+import org.eclipse.microprofile.openapi.models.media.Schema;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Modifier.Keyword;
@@ -41,7 +42,6 @@
 import com.github.javaparser.ast.stmt.ThrowStmt;
 import com.github.javaparser.ast.stmt.TryStmt;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
-import com.github.javaparser.ast.type.Type;
 import com.github.javaparser.ast.type.TypeParameter;
 import com.github.javaparser.utils.SourceRoot;
 import com.microsoft.kiota.ApiException;
@@ -58,8 +58,6 @@
 import io.kiota.http.vertx.VertXRequestAdapter;
 import io.kiota.serialization.json.JsonParseNodeFactory;
 import io.vertx.core.Vertx;
-import io.vertx.ext.web.client.WebClient;
-import io.vertx.ext.web.client.WebClientSession;
 import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 
@@ -101,8 +99,6 @@ public void create() {
 		cu.addImport(resource.toString());
 		cu.addImport(Vertx.class);
 		cu.addImport(PostConstruct.class);
-		cu.addImport(WebClientSession.class);
-		cu.addImport(WebClient.class);
 		cu.addImport(VertXRequestAdapter.class);
 		cu.addImport(Inject.class);
 		cu.addImport(Context.class);
@@ -130,11 +126,9 @@ public void create() {
 		desiredMethod(clazz);
 		fetchMethod(clazz);
 		mapper.createPath()
-				.map(e -> e.getValue().getPOST().getRequestBody().getContent().getMediaType("application/json"))
-				.map(m -> m.getSchema().getRef())
-				.map(r -> r.substring(r.lastIndexOf("/") + 1, r.length()))
-				.ifPresent(t -> 
-					createMethod(cu, clazz, new ClassOrInterfaceType(null, t))
+				.map(e -> e.getValue().getPOST())
+				.ifPresent(op -> 
+					createMethod(cu, clazz, op)
 				);
 		mapper.patchPath()
 				.map(e -> e.getValue().getPATCH())
@@ -219,26 +213,42 @@ private void constructor(ClassOrInterfaceDeclaration clazz) {
 				new MethodCallExpr("super", new FieldAccessExpr(new TypeExpr(resourceType), "class"))))));
 	}
 
-	private void createMethod(CompilationUnit cu, ClassOrInterfaceDeclaration clazz, Type createOptionType) {
-		cu.addImport(resource.getQualifier().map(Name::toString).orElse("") + "." + createOptionType);
-		cu.addImport(Creator.class);
-		ClassOrInterfaceType creatorType = new ClassOrInterfaceType(null,
-				new SimpleName(Creator.class.getSimpleName()),
-				new NodeList<>(resourceType, crdType));
-		clazz.addImplementedType(creatorType);
-		MethodDeclaration createMethod = clazz.addMethod("create", Keyword.PUBLIC)
-				.addAnnotation(Override.class)
-				.addParameter(resourceType, "desired")
-				.addParameter(crdType, "primary")
-				.addParameter(contextType, "context")
-				.setType(resourceType);
-		Optional<MethodCallExpr> createCall = methodCalls.create(new NameExpr(FIELD_API_CLIENT), new NameExpr("primary"), new NodeList<>(new MethodCallExpr(new MethodCallExpr(new NameExpr("primary"), "getMetadata"),
-				"getName")),
-				new NodeList<>(new NameExpr("createOption")));
-		AssignExpr assignCreateOpt = new AssignExpr(new VariableDeclarationExpr(createOptionType, "createOption"), new MethodCallExpr(null, "fromResource", new NodeList<>(new NameExpr("primary"), new MethodReferenceExpr(new TypeExpr(createOptionType), new NodeList<>(),"createFromDiscriminatorValue"))),Operator.ASSIGN);
-		ReturnStmt createReturn = createCall
-			.map(m -> new ReturnStmt(m)).orElse(new ReturnStmt(new NullLiteralExpr()));
-		createMethod.setBody(new BlockStmt(new NodeList<>(new ExpressionStmt(assignCreateOpt), createReturn)));
+	private void createMethod(CompilationUnit cu, ClassOrInterfaceDeclaration clazz, Operation op) {
+		Schema schema = op.getRequestBody().getContent().getMediaType("application/json").getSchema();
+		String typeName;
+		if (schema.getRef() != null) {
+			typeName = schema.getRef().substring(schema.getRef().lastIndexOf("/") + 1, schema.getRef().length());
+			ClassOrInterfaceType createOptionType = new ClassOrInterfaceType(null, typeName);
+			
+			cu.addImport(resource.getQualifier().map(Name::toString).orElse("") + "." + createOptionType);
+			cu.addImport(Creator.class);
+			ClassOrInterfaceType creatorType = new ClassOrInterfaceType(null,
+					new SimpleName(Creator.class.getSimpleName()),
+					new NodeList<>(resourceType, crdType));
+			clazz.addImplementedType(creatorType);
+			MethodDeclaration createMethod = clazz.addMethod("create", Keyword.PUBLIC)
+					.addAnnotation(Override.class)
+					.addParameter(resourceType, "desired")
+					.addParameter(crdType, "primary")
+					.addParameter(contextType, "context")
+					.setType(resourceType);
+			Optional<MethodCallExpr> createCall = methodCalls.create(new NameExpr(FIELD_API_CLIENT), new NameExpr("primary"), new NodeList<>(new MethodCallExpr(new MethodCallExpr(new NameExpr("primary"), "getMetadata"),
+					"getName")),
+					new NodeList<>(new NameExpr("createOption")));
+			AssignExpr assignCreateOpt = new AssignExpr(new VariableDeclarationExpr(createOptionType, "createOption"), new MethodCallExpr(null, "fromResource", new NodeList<>(new NameExpr("primary"), new MethodReferenceExpr(new TypeExpr(createOptionType), new NodeList<>(),"createFromDiscriminatorValue"))),Operator.ASSIGN);
+			BlockStmt body = new BlockStmt(new NodeList<>(new ExpressionStmt(assignCreateOpt)));
+			ReturnStmt createReturn;
+			if (op.getResponses().getAPIResponse("201") != null && op.getResponses().getAPIResponse("201").getContent() != null) {
+				createReturn = createCall
+					.map(m -> new ReturnStmt(m)).orElse(new ReturnStmt(new NullLiteralExpr()));
+			} else {
+				createCall
+					.ifPresent(m -> body.addStatement(m));
+				createReturn = new ReturnStmt(new NameExpr("desired"));
+			}
+			body.addStatement(createReturn);
+			createMethod.setBody(body);
+		}
 	}
 
 	private void updateMethod(CompilationUnit cu, ClassOrInterfaceDeclaration clazz, Operation op) {