diff options
Diffstat (limited to 'container-compiler-plugin/src/main/java/io/trygvis/container')
9 files changed, 228 insertions, 108 deletions
diff --git a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/EntityHandler.java b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/EntityHandler.java index 74f303f..9bce51e 100644 --- a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/EntityHandler.java +++ b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/EntityHandler.java @@ -1,15 +1,20 @@ package io.trygvis.container.compiler; import io.trygvis.container.compiler.model.ClassG; +import io.trygvis.container.compiler.model.Constructor; import io.trygvis.container.compiler.model.FieldRef; +import io.trygvis.container.compiler.model.MethodRef; +import io.trygvis.container.compiler.model.Parameters; import io.trygvis.container.compiler.model.TypeRef; import io.trygvis.persistence.EntityMirror; import io.trygvis.persistence.FieldMirror; import io.trygvis.persistence.GeneratorConfiguration; import io.trygvis.persistence.SequenceMirror; import io.trygvis.persistence.SqlEntity; +import io.trygvis.persistence.SqlEntitySet; import io.trygvis.persistence.TypeHandler; -import io.trygvis.persistence.sql.SqlEntityDesc; +import io.trygvis.persistence.sql.SqlDao; +import io.trygvis.persistence.sql.SqlEntityMeta; import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.AnnotationMirror; @@ -25,9 +30,10 @@ import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; import javax.persistence.Id; import javax.persistence.SequenceGenerator; -import javax.tools.JavaFileObject; import java.io.IOException; -import java.io.PrintWriter; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -35,8 +41,9 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import static io.trygvis.container.compiler.Utils.toFieldName; -import static io.trygvis.container.compiler.Utils.toJavaString; +import static io.trygvis.container.compiler.Utils.*; +import static io.trygvis.container.compiler.model.Parameters.ParameterRef; +import static io.trygvis.container.compiler.model.TypeRef.VOID; import static io.trygvis.persistence.FieldMirror.AccessorType.FIELD; import static io.trygvis.persistence.FieldMirror.AccessorType.METHOD; import static io.trygvis.persistence.FieldMirror.FieldType.PRIMITIVE; @@ -47,15 +54,15 @@ import static java.lang.String.format; import static java.lang.reflect.Modifier.PUBLIC; import static javax.lang.model.util.ElementFilter.fieldsIn; import static javax.lang.model.util.ElementFilter.methodsIn; -import static org.apache.commons.lang.StringUtils.*; +import static org.apache.commons.lang.StringUtils.join; public class EntityHandler extends AbstractHandler { private GeneratorConfiguration generatorConfiguration = new GeneratorConfiguration(); - private SqlUnitModel sqlUnit = new SqlUnitModel(); - private PackageElement packageElement; + private SqlUnitModel sqlUnit; - public EntityHandler(ProcessingEnvironment processingEnv) { + public EntityHandler(ProcessingEnvironment processingEnv, SqlUnitModel sqlUnit) { super(processingEnv); + this.sqlUnit = sqlUnit; } public void phase1(Set<TypeElement> sqlEntities, Set<PackageElement> packages) throws Exception { @@ -81,11 +88,22 @@ public class EntityHandler extends AbstractHandler { if (packages.size() == 0) { throw new CompilerException("There has to be exactly one @SqlEntitySet annotated package."); } - packageElement = packages.iterator().next(); + PackageElement packageElement = packages.iterator().next(); if (packages.size() != 1) { throw new CompilerException(packageElement, "There can only be one @SqlEntitySet annotated package."); } + AnnotationMirror sqlEntitySet = getAnnotation(SqlEntitySet.class, packageElement); + String name = null; + for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> v : sqlEntitySet.getElementValues().entrySet()) { + String field = v.getKey().getSimpleName().toString(); + String value = v.getValue().getValue().toString(); + switch (field) { + case "name": + name = value; + } + } + sqlUnit.setName(name); sqlUnit.setPackageName(packageElement.getQualifiedName().toString()); } @@ -178,6 +196,7 @@ public class EntityHandler extends AbstractHandler { if (idFields.size() != 1) { throw new CompilerException(element, "This implementation only support a single @Id annotated field."); } + entity.setIdType(idFields.get(0).type); sqlUnit.add(entity, element); } @@ -193,18 +212,19 @@ public class EntityHandler extends AbstractHandler { for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> v : sequenceGenerator.getElementValues().entrySet()) { String field = v.getKey().getSimpleName().toString(); + String value = v.getValue().getValue().toString(); switch (field) { case "name": - name = v.getValue().getValue().toString(); + name = value; break; case "sequenceName": - sequenceName = v.getValue().getValue().toString(); + sequenceName = value; break; case "initialValue": - initialValue = Integer.valueOf(v.getValue().getValue().toString()); + initialValue = Integer.valueOf(value); break; case "allocationSize": - allocationSize = Integer.valueOf(v.getValue().getValue().toString()); + allocationSize = Integer.valueOf(value); break; default: throw new InternalErrorException("Unsupported field on @SequenceGenerator: " + field); @@ -218,30 +238,83 @@ public class EntityHandler extends AbstractHandler { } public ClassG phase3(EntityMirror entityMirror) throws IOException { - ClassG g = new ClassG(PUBLIC, entityMirror.daoType); + ClassG g = new ClassG(PUBLIC, entityMirror.daoType). + extendsType(new TypeRef(SqlDao.class).args(entityMirror.idType, entityMirror.type)); + Parameters p = new Parameters(); + ParameterRef c = p.addParameter(new TypeRef(Connection.class), "c"); + g.add(new Constructor(p, "super(" + c.name + ");")); TypeRef stringType = g.imports.add(String.class); - TypeRef sqlEntityDescType = g.imports.add(SqlEntityDesc.class); + TypeRef sqlEntityDescType = g.imports.add(SqlEntityMeta.class); + TypeRef sqlException = g.imports.add(SQLException.class); - g.addPublicStaticFinalField(stringType, "createTableSql"). + FieldRef createTableSql = g.addPublicStaticFinalField(stringType, "createTableSql"). value(toJavaString(entityMirror.createTableSql(sqlUnit))); - g.addPublicStaticFinalField(stringType, "dropTableSql"). + g.add(new MethodRef(PUBLIC, stringType, "createTableSql", "return createTableSql;")); + FieldRef dropTableSql = g.addPublicStaticFinalField(stringType, "dropTableSql"). value(toJavaString(entityMirror.dropTableSql())); + g.add(new MethodRef(PUBLIC, stringType, "dropTableSql", "return dropTableSql;")); g.addPublicStaticFinalField(stringType, "insertIntoSql"). value(toJavaString(entityMirror.insertIntoSql(sqlUnit))); g.addPublicStaticFinalField(stringType, "deleteFromSql"). value(toJavaString(entityMirror.deleteFromSql())); String desc = "new " + sqlEntityDescType + "(" + toJavaString(entityMirror.tableName) + ", " + - toJavaString(entityMirror.defaultFields()) + + toJavaString(entityMirror.defaultFields()) + ", " + + toJavaString(createTableSql.name) + ", " + + toJavaString(dropTableSql.name) + ")"; g.addPublicStaticFinalField(sqlEntityDescType, "desc").value(desc); ClassG.InnerClassG typedQuery = g.addInnerClass(entityMirror.queryType(g.imports)); - typedQuery.inner.addMethod(entityMirror.fromResultSet(g.imports)); - g.addMethod(entityMirror.insertInto(sqlUnit, g.imports)); - g.addMethod(entityMirror.delete(g.imports)); - g.addMethod(entityMirror.deleteById(g.imports)); - g.addMethod(entityMirror.query(g.imports)); + g.addInnerClass(entityMirror.utils(sqlUnit)); + + { + p = new Parameters(); + ParameterRef rs = p.addParameter(new TypeRef(ResultSet.class), "rs"); + g.add(new MethodRef(PUBLIC, entityMirror.type, "fromResultSet", p, + "return Utils.fromResultSet" + entityMirror.type.className + "(" + rs.name + ");"). + exception(sqlException)); + } + + { + p = new Parameters(); + ParameterRef entity = p.addParameter(entityMirror.type, "entity"); + g.add(new MethodRef(PUBLIC, VOID, "insert", p, + "Utils.insert" + entityMirror.type.className + "(super.c, " + entity.name + ");"). + exception(sqlException)); + } + + { + p = new Parameters(); + ParameterRef id = p.addParameter(entityMirror.idType, "id"); + g.add(new MethodRef(PUBLIC, entityMirror.type, "selectById", p, + "return Utils.select" + entityMirror.type.className + "ById(super.c, " + id.name + ");"). + exception(sqlException)); + } + + { + p = new Parameters(); + ParameterRef entity = p.addParameter(entityMirror.type, "entity"); + g.add(new MethodRef(PUBLIC, VOID, "delete", p, + "Utils.delete" + entityMirror.type.className + "(super.c, " + entity.name + ");"). + exception(sqlException)); + } + + { + p = new Parameters(); + ParameterRef id = p.addParameter(entityMirror.idType, "id"); + g.add(new MethodRef(PUBLIC, VOID, "deleteById", p, + "Utils.delete" + entityMirror.type.className + "ById(super.c, " + id.name + ");"). + exception(sqlException)); + } + + { + p = new Parameters(); + ParameterRef entity = p.addParameter(entityMirror.type, "entity"); + g.add(new MethodRef(PUBLIC, VOID, "update", p, + "Utils.update" + entityMirror.type.className + "(super.c, " + entity.name + ");"). + exception(sqlException)); + } return g; } @@ -328,10 +401,8 @@ public class EntityHandler extends AbstractHandler { public void phase3(boolean errorRaised) throws Exception { try { for (EntityMirror entity : sqlUnit.getEntities().values()) { - writeFile(phase3(entity), sqlUnit.element(entity)); + writeFile(processingEnv, phase3(entity), sqlUnit.element(entity)); } - writeFile(generateSequences(sqlUnit), null); - writeFile(generateSession(), null); } catch (CompilerException | InternalErrorException e) { // Ignore any exceptions if we had an error from before if (errorRaised) { @@ -341,62 +412,6 @@ public class EntityHandler extends AbstractHandler { } } - private ClassG generateSequences(SqlUnitModel unit) { - TypeRef sequences = new TypeRef(unit.getPackageName() + ".Sequences"); - ClassG g = new ClassG(PUBLIC, sequences); - List<String> creates = new ArrayList<>(); - List<String> drops = new ArrayList<>(); - for (SequenceMirror sequence : unit.getSequences().values()) { - TypeRef stringType = g.imports.add(String.class); - String value = "CREATE SEQUENCE " + sequence.sequenceName + ";"; - FieldRef f = g.addPublicStaticFinalField(stringType, "create" + capitalize(sequence.name)). - value(toJavaString(value)); - creates.add(f.name); - - f = g.addPublicStaticFinalField(stringType, "drop" + capitalize(sequence.name)). - value(toJavaString("DROP SEQUENCE " + sequence.sequenceName) + ";"); - drops.add(f.name); - - } - g.addPublicStaticFinalField(new TypeRef(String[].class), "createSequences"). - value("new String[]{" + join(creates, ", ") + "}"); - g.addPublicStaticFinalField(new TypeRef(String[].class), "dropSequences"). - value("new String[]{" + join(drops, ", ") + "}"); - return g; - } - - private void writeFile(ClassG g, Element element) throws IOException { - JavaFileObject sourceFile = processingEnv.getFiler().createSourceFile(g.type.fqName, element); - try (PrintWriter w = new PrintWriter(sourceFile.openWriter())) { - for (String s : g.generate()) { - w.println(stripEnd(s, " ")); - } - } - } - - private ClassG generateSession() throws IOException { - String p = packageElement.getQualifiedName().toString(); - - // TODO: Support a name prefix from @SqlEntitySet - TypeRef type = new TypeRef(p + ".Session"); - -/* - TypeRef conType = g.add(Connection.class); - Parameters parameters = new Parameters(); - ParameterRef c = parameters.addParameter(conType, "c"); - - List<String> body = new ArrayList<>(); - for (EntityMirror entity : entities) { - FieldRef fieldRef = g.addField(entity.javaName.asElement().asType(), toFieldName(entity.daoName)); - body.add("this." + fieldRef.name + " = new " + entity.daoName + "(" + c.name + ");"); - } - - g.addConstructor(parameters, body); -*/ - - return new ClassG(PUBLIC, type); - } - public static String sqlName(String javaName) { StringBuilder builder = new StringBuilder(); for (char c : javaName.toCharArray()) { @@ -420,7 +435,7 @@ public class EntityHandler extends AbstractHandler { return null; } - public AnnotationMirror getAnnotation(Class<?> c, TypeElement type) { + public AnnotationMirror getAnnotation(Class<?> c, Element type) { AnnotationMirror annotation = findAnnotation(c, type); if (annotation != null) { diff --git a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/MyProcessor.java b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/MyProcessor.java index fbbc56d..64ac678 100644 --- a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/MyProcessor.java +++ b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/MyProcessor.java @@ -25,6 +25,10 @@ import javax.tools.Diagnostic; import java.util.HashSet; import java.util.Set; +import static io.trygvis.container.compiler.Utils.writeFile; +import static io.trygvis.persistence.generators.EntityManagerGenerator.generateEntityManager; +import static io.trygvis.persistence.generators.EntityManagerFactoryGenerator.generateEntityManagerFactory; +import static io.trygvis.persistence.generators.SequencesGenerator.generateSequences; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.Collections.emptySet; @@ -104,7 +108,8 @@ public class MyProcessor implements Processor { TypeElement log = elements.getTypeElement(Log.class.getCanonicalName()); TypeElement entity = elements.getTypeElement(Entity.class.getCanonicalName()); - EntityHandler entityHandler = new EntityHandler(processingEnv); + SqlUnitModel unit = new SqlUnitModel(); + EntityHandler entityHandler = new EntityHandler(processingEnv, unit); Set<TypeElement> sqlEntities = typesIn(roundEnv.getElementsAnnotatedWith(SqlEntity.class)); Set<PackageElement> packages = ElementFilter.packagesIn(roundEnv.getElementsAnnotatedWith(SqlEntitySet.class)); @@ -136,6 +141,9 @@ public class MyProcessor implements Processor { } entityHandler.phase3(hadErrors); + writeFile(processingEnv, generateSequences(unit), null); + writeFile(processingEnv, generateEntityManagerFactory(unit), null); + writeFile(processingEnv, generateEntityManager(unit), null); return true; } diff --git a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/SqlUnitModel.java b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/SqlUnitModel.java index 1bd2535..e41fbb8 100644 --- a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/SqlUnitModel.java +++ b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/SqlUnitModel.java @@ -14,6 +14,7 @@ public class SqlUnitModel { private Map<String, SequenceMirror> sequences = new TreeMap<>(); private Map<SequenceMirror, Element> sequenceElements = new TreeMap<>(); private String packageName; + private String name; public String getPackageName() { if (packageName == null) { @@ -27,6 +28,14 @@ public class SqlUnitModel { this.packageName = packageName; } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + // ----------------------------------------------------------------------- // Entity Mirrors // ----------------------------------------------------------------------- diff --git a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/TransactionalHandler.java b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/TransactionalHandler.java index b5db075..bfa1ec8 100644 --- a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/TransactionalHandler.java +++ b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/TransactionalHandler.java @@ -1,6 +1,7 @@ package io.trygvis.container.compiler; import io.trygvis.container.compiler.model.ClassG; +import io.trygvis.container.compiler.model.Constructor; import io.trygvis.container.compiler.model.FieldRef; import io.trygvis.container.compiler.model.MethodRef; import io.trygvis.container.compiler.model.Parameters; @@ -109,7 +110,7 @@ public class TransactionalHandler extends AbstractHandler { body.add(" });"); MethodRef m = new MethodRef(PUBLIC, returnType, ee.getSimpleName().toString(), parameters, body); - g.addMethod(m); + g.add(m); } JavaFileObject sourceFile = processingEnv.getFiler().createSourceFile((p.length() == 0 ? "" : p + ".") + className, element); @@ -137,6 +138,6 @@ public class TransactionalHandler extends AbstractHandler { List<String> body = new ArrayList<>(); body.add("super(" + collectionToDelimitedString(goesToSuper, ", ") + ");"); body.add("this." + platformTransactionManager.name + " = " + transactionManager.name + ";"); - g.addConstructor(parameters, body); + g.add(new Constructor(parameters, body)); } } diff --git a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/Utils.java b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/Utils.java index 8bb1b33..5d69fc0 100644 --- a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/Utils.java +++ b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/Utils.java @@ -1,13 +1,29 @@ package io.trygvis.container.compiler; +import io.trygvis.container.compiler.model.ClassG; +import io.trygvis.container.compiler.model.Imports; +import io.trygvis.container.compiler.model.TypeRef; + +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.Element; +import javax.persistence.PersistenceException; +import javax.tools.JavaFileObject; import java.io.BufferedReader; import java.io.IOException; +import java.io.PrintWriter; import java.io.StringReader; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; +import static io.trygvis.container.compiler.model.ClassG.addAll; import static java.lang.Character.toLowerCase; import static java.lang.Character.toUpperCase; +import static org.apache.commons.lang.StringUtils.stripEnd; public class Utils { + public static final String EOL = System.getProperty("line.separator"); + public static String toFieldName(String s) { if (s.length() < 1) { return s.toLowerCase(); @@ -40,6 +56,11 @@ public class Utils { return new String(chars, 0, j); } + public static String toClassName(String s) { + s = toFieldName(s); + return toUpperCase(s.charAt(0)) + s.substring(1, s.length()); + } + public static String toSetterName(String s) { s = toFieldName(s); return "set" + toUpperCase(s.charAt(0)) + s.substring(1, s.length()); @@ -60,8 +81,8 @@ public class Utils { buffer.append(line.replace("\"", "\\\"")); buffer.append('"'); line = reader.readLine(); - if(line != null) { - buffer.append(" +\n"); + if (line != null) { + buffer.append(" +").append(EOL); } } @@ -70,4 +91,25 @@ public class Utils { throw new RuntimeException(e); } } + + public static void writeFile(ProcessingEnvironment processingEnv, ClassG g, Element element) throws IOException { + JavaFileObject sourceFile = processingEnv.getFiler().createSourceFile(g.type.fqName, element); + try (PrintWriter w = new PrintWriter(sourceFile.openWriter())) { + for (String s : g.generate()) { + w.println(stripEnd(s, " ")); + } + } + } + + public static List<String> tryCatchSqlException(Imports imports, List<String> body) { + TypeRef sqlException = imports.add(SQLException.class); + TypeRef persistenceException = imports.add(PersistenceException.class); + List<String> newBody = new ArrayList<>(); + newBody.add("try {"); + addAll(1, newBody, body); + newBody.add("} catch (" + sqlException.plainName + " e) {"); + newBody.add(" throw new " + persistenceException.plainName + "(e);"); // TODO: Add context info. + newBody.add("}"); + return newBody; + } } diff --git a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/ClassG.java b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/ClassG.java index c99feae..402498c 100644 --- a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/ClassG.java +++ b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/ClassG.java @@ -45,7 +45,12 @@ public class ClassG { } public ClassG extendsType(TypeRef extendsType) { - this.extendsType = extendsType; + this.extendsType = imports.add(extendsType); + return this; + } + + public ClassG extendsType(Class<?> extendsType) { + this.extendsType = imports.add(extendsType); return this; } @@ -54,6 +59,13 @@ public class ClassG { return this; } + public ClassG implementsType(Class... implementsTypes) { + for (Class type : implementsTypes) { + this.implementsTypes.add(imports.add(type)); + } + return this; + } + public FieldRef addField(TypeMirror klass, String name) { TypeRef type = imports.add(klass); FieldRef ref = new FieldRef(PRIVATE | FINAL, type, name); @@ -80,18 +92,17 @@ public class ClassG { return addField(PUBLIC | STATIC | FINAL, type, name); } - public Constructor addConstructor(Parameters parameters, List<String> body) { - Constructor constructor = new Constructor(this, parameters, body); + public ClassG add(Constructor constructor) { constructors.add(constructor); - return constructor; + return this; } - public ClassG addMethod(MethodRef methodRef) { + public ClassG add(MethodRef methodRef) { this.methods.add(methodRef); return this; } -// public MethodRef addMethod(List<String> body, TypeRef returnType, String name, Parameters parameters) { +// public MethodRef add(List<String> body, TypeRef returnType, String name, Parameters parameters) { // MethodRef ref = new MethodRef(PUBLIC, returnType, name, parameters, body); // methods.add(ref); // return ref; @@ -145,7 +156,7 @@ public class ClassG { for (Constructor constructor : constructors) { body.add(""); - addAll(1, body, constructor.write()); + addAll(1, body, constructor.write(this)); } for (MethodRef method : methods) { @@ -165,7 +176,11 @@ public class ClassG { } private List<String> write(MethodRef method) { - List<String> body = new ArrayList<>(); + String typeArgs = ""; + if (!method.typeArgs.isEmpty()) { + typeArgs = "<" + join(method.typeArgs, ", ") + "> "; + } + String returnString; if (method.returnType == TypeRef.VOID) { returnString = "void"; @@ -178,9 +193,10 @@ public class ClassG { parameters.add("final " + p.klass + " " + p.name); } - String m = Modifier.toString(method.modifiers) + " " + + String m = Modifier.toString(method.modifiers) + " " + typeArgs + returnString + " " + method.name + "(" + collectionToDelimitedString(parameters, ", ") + ")"; + List<String> body = new ArrayList<>(); if (method.exceptions.isEmpty()) { body.add(m + " {"); } else { diff --git a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/Constructor.java b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/Constructor.java index 0f3ceeb..f701476 100644 --- a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/Constructor.java +++ b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/Constructor.java @@ -4,21 +4,24 @@ import java.util.ArrayList; import java.util.List; import static io.trygvis.container.compiler.model.ClassG.addAll; +import static java.util.Arrays.asList; import static org.apache.commons.lang.StringUtils.join; public class Constructor { - private final ClassG g; private final Parameters parameters; private final List<String> body; - public Constructor(ClassG g, Parameters parameters, List<String> body) { - this.g = g; + public Constructor(Parameters parameters, String... body) { + this(parameters, asList(body)); + } + + public Constructor(Parameters parameters, List<String> body) { this.parameters = parameters; this.body = body; } - public List<String> write() { + public List<String> write(ClassG g) { List<String> ps = new ArrayList<>(); for (Parameters.ParameterRef p : parameters) { ps.add(p.klass + " " + p.name); diff --git a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/MethodRef.java b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/MethodRef.java index 902d25a..952a1e5 100644 --- a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/MethodRef.java +++ b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/MethodRef.java @@ -1,11 +1,14 @@ package io.trygvis.container.compiler.model; import java.lang.reflect.Modifier; +import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.TreeSet; +import static java.util.Arrays.asList; import static java.util.Collections.addAll; +import static java.util.Collections.singletonList; public class MethodRef { public final TypeRef returnType; @@ -13,8 +16,17 @@ public class MethodRef { public final int modifiers; public final Parameters parameters; public final Set<TypeRef> exceptions = new TreeSet<>(); + public final List<String> typeArgs = new ArrayList<>(); public final List<String> body; + public MethodRef(int modifiers, TypeRef returnType, String name, String body) { + this(modifiers, returnType, name, new Parameters(), singletonList(body)); + } + + public MethodRef(int modifiers, TypeRef returnType, String name, Parameters p, String... body) { + this(modifiers, returnType, name, p, asList(body)); + } + public MethodRef(int modifiers, TypeRef returnType, String name, Parameters parameters, List<String> body) { this.modifiers = modifiers; this.returnType = returnType; @@ -31,4 +43,9 @@ public class MethodRef { addAll(this.exceptions, exceptions); return this; } + + public MethodRef typeArgs(String... args) { + addAll(typeArgs, args); + return this; + } } diff --git a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/TypeRef.java b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/TypeRef.java index 2e679a5..c329ab3 100644 --- a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/TypeRef.java +++ b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/TypeRef.java @@ -2,6 +2,7 @@ package io.trygvis.container.compiler.model; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -39,9 +40,9 @@ public class TypeRef implements Comparable<TypeRef> { public final boolean array; - public final List<TypeRef> args; + public final List<String> args; - private TypeRef(String fqName, String name, boolean primitive, boolean array, List<TypeRef> args) { + private TypeRef(String fqName, String name, boolean primitive, boolean array, List<String> args) { this.fqName = fqName; this.plainName = name; this.primitive = primitive; @@ -61,7 +62,7 @@ public class TypeRef implements Comparable<TypeRef> { } public TypeRef(Class<?> klass) { - this(fqName(klass), fqName(klass), false, klass.isArray(), Collections.<TypeRef>emptyList()); + this(fqName(klass), fqName(klass), false, klass.isArray(), Collections.<String>emptyList()); } private static String fqName(Class<?> klass) { @@ -74,14 +75,14 @@ public class TypeRef implements Comparable<TypeRef> { } public TypeRef(String fqName) { - this(fqName, fqName, false, false, Collections.<TypeRef>emptyList()); + this(fqName, fqName, false, false, Collections.<String>emptyList()); } - public TypeRef(String fqName, String name, boolean array, List<TypeRef> args) { + public TypeRef(String fqName, String name, boolean array, List<String> args) { this(fqName, name, false, array, args); } - public TypeRef args(List<TypeRef> args) { + public TypeRef args(List<String> args) { return new TypeRef(fqName, plainName, primitive, array, args); } @@ -108,6 +109,14 @@ public class TypeRef implements Comparable<TypeRef> { } public TypeRef args(TypeRef... args) { + List<String> list = new ArrayList<>(); + for (TypeRef arg : args) { + list.add(arg.plainName); + } + return args(list); + } + + public TypeRef args(String... args) { return args(asList(args)); } |