Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Annotations to generate code #773

Merged
merged 1 commit into from
Jan 26, 2024
Merged

Update Annotations to generate code #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions common/py/src/main/java/zingg/common/py/processors/PythonClassProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
// __init__ method
System.out.println(" def __init__(self" +
generateConstructorParameters(classElement) + "):");
if (element.getSimpleName().contentEquals("Pipe")) {
generateClassInitializationCode(classElement, element);
}
for (VariableElement field : ElementFilter.fieldsIn(classElement.getEnclosedElements())) {
if (!field.getSimpleName().contentEquals("serialVersionUID")) {
generateFieldInitializationCode(field, element);
}
}
generateClassInitializationCode(classElement, element);

// for (VariableElement field : ElementFilter.fieldsIn(classElement.getEnclosedElements())) {
// if (!field.getSimpleName().contentEquals("serialVersionUID")) {
// generateFieldInitializationCode(field, element);
// }
// }

for (ExecutableElement methodElement : ElementFilter.methodsIn(classElement.getEnclosedElements())) {
if (methodElement.getAnnotation(PythonMethod.class) != null) {
methodNames.add(methodElement.getSimpleName().toString());
Expand Down Expand Up @@ -87,17 +87,19 @@ private void generateImportsAndDeclarations() {
}

private void generateClassInitializationCode(TypeElement classElement, Element element) {
System.out.println(" self." + element.getSimpleName().toString().toLowerCase() + " = getJVM().zingg.spark.client.pipe.SparkPipe()");
if (element.getSimpleName().contentEquals("Pipe")) {
System.out.println(" self." + element.getSimpleName().toString().toLowerCase() + " = getJVM().zingg.spark.client.pipe.SparkPipe()");
}
}

private void generateFieldInitializationCode(VariableElement field, Element element) {
String fieldName = field.getSimpleName().toString();
String fieldAssignment = "self." + element.getSimpleName().toString().toLowerCase() + "." + fieldName + " = " + fieldName;
// private void generateFieldInitializationCode(VariableElement field, Element element) {
// String fieldName = field.getSimpleName().toString();
// String fieldAssignment = "self." + element.getSimpleName().toString().toLowerCase() + "." + fieldName + " = " + fieldName;

if (!fieldName.startsWith("FORMAT_")) {
System.out.println(" " + fieldAssignment);
}
}
// if (!fieldName.startsWith("FORMAT_")) {
// System.out.println(" " + fieldAssignment);
// }
// }

private String generateConstructorParameters(TypeElement classElement) {
StringBuilder parameters = new StringBuilder();
Expand Down
14 changes: 8 additions & 6 deletions common/py/src/main/java/zingg/common/py/processors/PythonMethodProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import javax.lang.model.type.TypeMirror;
import javax.lang.model.type.TypeKind;
import java.util.Set;
import java.util.logging.Logger;
// import java.util.logging.Logger;

import javax.lang.model.element.*;
import zingg.common.py.annotations.*;
Expand Down Expand Up @@ -38,7 +38,8 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
if (methodNames.contains(methodElement.getSimpleName().toString())) {
// LOG.info("Generating Python method for: " + methodElement.getSimpleName());
System.out.println(" def " + methodElement.getSimpleName() + "(self" +
generateMethodSignature(methodElement) + "):\n " + generateMethodReturn(methodElement));
generateMethodSignature(methodElement) + "):");
generateMethodReturn(methodElement);
generateFieldAssignment(methodElement);
}
}
Expand All @@ -64,14 +65,15 @@ private String generateMethodParameters(ExecutableElement methodElement) {
return parameters.toString();
}

private String generateMethodReturn(ExecutableElement methodElement) {
private void generateMethodReturn(ExecutableElement methodElement) {
TypeMirror returnType = methodElement.getReturnType();
if (returnType.getKind() == TypeKind.VOID) {
return "";
return;
} else {
String returnTypeString = resolveType(returnType);
String variableName = methodElement.getSimpleName().toString();
return "return " + variableName;
String methodName = methodElement.getSimpleName().toString();
String className = methodElement.getEnclosingElement().getSimpleName().toString();
System.out.println(" return self." + className.toLowerCase() + "." + methodName + "()");
}
}

Expand Down
Loading