diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/DefaultConfiguration.java b/querydsl-apt/src/main/java/com/querydsl/apt/DefaultConfiguration.java index 17d391457..5b010036e 100644 --- a/querydsl-apt/src/main/java/com/querydsl/apt/DefaultConfiguration.java +++ b/querydsl-apt/src/main/java/com/querydsl/apt/DefaultConfiguration.java @@ -20,6 +20,7 @@ import java.util.*; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import javax.annotation.processing.ProcessingEnvironment; import javax.annotation.processing.RoundEnvironment; import javax.lang.model.element.*; import javax.lang.model.type.TypeMirror; @@ -78,8 +79,8 @@ public class DefaultConfiguration implements Configuration { private Function variableNameFunction; public DefaultConfiguration( + ProcessingEnvironment processingEnvironment, RoundEnvironment roundEnv, - Map options, Collection keywords, @Nullable Class entitiesAnn, Class entityAnn, @@ -91,6 +92,7 @@ public class DefaultConfiguration implements Configuration { this.excludedPackages = new HashSet(); this.includedClasses = new HashSet(); this.includedPackages = new HashSet(); + module.bind(ProcessingEnvironment.class, processingEnvironment); module.bind(RoundEnvironment.class, roundEnv); module.bind(CodegenModule.KEYWORDS, keywords); this.entitiesAnn = entitiesAnn; @@ -122,6 +124,7 @@ public class DefaultConfiguration implements Configuration { boolean listAccessors = false; boolean mapAccessors = false; boolean createDefaultVariable = true; + Map options = processingEnvironment.getOptions(); if (options.containsKey(QUERYDSL_ENTITY_ACCESSORS)) { entityAccessors = Boolean.valueOf(options.get(QUERYDSL_ENTITY_ACCESSORS)); diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/QuerydslAnnotationProcessor.java b/querydsl-apt/src/main/java/com/querydsl/apt/QuerydslAnnotationProcessor.java index df8a17689..ea9384ba1 100644 --- a/querydsl-apt/src/main/java/com/querydsl/apt/QuerydslAnnotationProcessor.java +++ b/querydsl-apt/src/main/java/com/querydsl/apt/QuerydslAnnotationProcessor.java @@ -41,7 +41,7 @@ public class QuerydslAnnotationProcessor extends AbstractQuerydslProcessor { Class skip = QueryTransient.class; return new DefaultConfiguration( - roundEnv, processingEnv.getOptions(), Collections.emptySet(), entities, + processingEnv, roundEnv, Collections.emptySet(), entities, entity, superType, embeddable, embedded, skip); } diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/hibernate/HibernateAnnotationProcessor.java b/querydsl-apt/src/main/java/com/querydsl/apt/hibernate/HibernateAnnotationProcessor.java index 816d101d7..ae86181f5 100644 --- a/querydsl-apt/src/main/java/com/querydsl/apt/hibernate/HibernateAnnotationProcessor.java +++ b/querydsl-apt/src/main/java/com/querydsl/apt/hibernate/HibernateAnnotationProcessor.java @@ -40,7 +40,7 @@ public class HibernateAnnotationProcessor extends JPAAnnotationProcessor { Class embeddable = Embeddable.class; Class embedded = Embedded.class; Class skip = Transient.class; - return new HibernateConfiguration(roundEnv, processingEnv, processingEnv.getOptions(), entity, superType, + return new HibernateConfiguration(roundEnv, processingEnv, entity, superType, embeddable, embedded, skip); } catch (ClassNotFoundException e) { throw new RuntimeException(e); diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/hibernate/HibernateConfiguration.java b/querydsl-apt/src/main/java/com/querydsl/apt/hibernate/HibernateConfiguration.java index f390af31d..82af115d4 100644 --- a/querydsl-apt/src/main/java/com/querydsl/apt/hibernate/HibernateConfiguration.java +++ b/querydsl-apt/src/main/java/com/querydsl/apt/hibernate/HibernateConfiguration.java @@ -17,7 +17,6 @@ import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Map; import javax.annotation.processing.ProcessingEnvironment; import javax.annotation.processing.RoundEnvironment; @@ -36,13 +35,12 @@ public class HibernateConfiguration extends JPAConfiguration { public HibernateConfiguration( RoundEnvironment roundEnv, ProcessingEnvironment processingEnv, - Map options, Class entityAnn, Class superTypeAnn, Class embeddableAnn, Class embeddedAnn, Class skipAnn) throws ClassNotFoundException { - super(roundEnv, processingEnv, options, entityAnn, superTypeAnn, embeddableAnn, embeddedAnn, skipAnn); + super(roundEnv, processingEnv, entityAnn, superTypeAnn, embeddableAnn, embeddedAnn, skipAnn); } @SuppressWarnings("unchecked") diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/jdo/JDOAnnotationProcessor.java b/querydsl-apt/src/main/java/com/querydsl/apt/jdo/JDOAnnotationProcessor.java index 18e7ac35a..190d7a5c1 100644 --- a/querydsl-apt/src/main/java/com/querydsl/apt/jdo/JDOAnnotationProcessor.java +++ b/querydsl-apt/src/main/java/com/querydsl/apt/jdo/JDOAnnotationProcessor.java @@ -45,7 +45,7 @@ public class JDOAnnotationProcessor extends AbstractQuerydslProcessor { Class embeddable = EmbeddedOnly.class; Class embedded = QueryEmbedded.class; Class skip = NotPersistent.class; - return new JDOConfiguration(roundEnv, processingEnv.getOptions(), + return new JDOConfiguration(processingEnv, roundEnv, entities, entity, superType, embeddable, embedded, skip); } } diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/jdo/JDOConfiguration.java b/querydsl-apt/src/main/java/com/querydsl/apt/jdo/JDOConfiguration.java index 758dc63a8..85311ed79 100644 --- a/querydsl-apt/src/main/java/com/querydsl/apt/jdo/JDOConfiguration.java +++ b/querydsl-apt/src/main/java/com/querydsl/apt/jdo/JDOConfiguration.java @@ -17,8 +17,8 @@ package com.querydsl.apt.jdo; import java.lang.annotation.Annotation; import java.util.List; -import java.util.Map; +import javax.annotation.processing.ProcessingEnvironment; import javax.annotation.processing.RoundEnvironment; import javax.jdo.annotations.*; import javax.lang.model.element.Element; @@ -51,14 +51,14 @@ public class JDOConfiguration extends DefaultConfiguration { Order.class, Persistent.class, PrimaryKey.class, QueryType.class, QueryInit.class, QueryTransient.class, Serialized.class, Transactional.class, Unique.class, Value.class); - public JDOConfiguration(RoundEnvironment roundEnv, - Map options, + public JDOConfiguration(ProcessingEnvironment processingEnvironment, + RoundEnvironment roundEnv, Class entitiesAnn, Class entityAnn, Class superTypeAnn, Class embeddableAnn, Class embeddedAnn, Class skipAnn) { - super(roundEnv, options, Keywords.JDO, entitiesAnn, entityAnn, superTypeAnn, + super(processingEnvironment, roundEnv, Keywords.JDO, entitiesAnn, entityAnn, superTypeAnn, embeddableAnn, embeddedAnn, skipAnn); } diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/jpa/JPAAnnotationProcessor.java b/querydsl-apt/src/main/java/com/querydsl/apt/jpa/JPAAnnotationProcessor.java index 9ecd2b454..a7173e425 100644 --- a/querydsl-apt/src/main/java/com/querydsl/apt/jpa/JPAAnnotationProcessor.java +++ b/querydsl-apt/src/main/java/com/querydsl/apt/jpa/JPAAnnotationProcessor.java @@ -39,7 +39,7 @@ public class JPAAnnotationProcessor extends AbstractQuerydslProcessor { Class embeddable = Embeddable.class; Class embedded = Embedded.class; Class skip = Transient.class; - return new JPAConfiguration(roundEnv, processingEnv, processingEnv.getOptions(), + return new JPAConfiguration(roundEnv, processingEnv, entity, superType, embeddable, embedded, skip); } diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/jpa/JPAConfiguration.java b/querydsl-apt/src/main/java/com/querydsl/apt/jpa/JPAConfiguration.java index bbc764987..61012ee96 100644 --- a/querydsl-apt/src/main/java/com/querydsl/apt/jpa/JPAConfiguration.java +++ b/querydsl-apt/src/main/java/com/querydsl/apt/jpa/JPAConfiguration.java @@ -15,7 +15,6 @@ package com.querydsl.apt.jpa; import java.lang.annotation.Annotation; import java.util.List; -import java.util.Map; import javax.annotation.processing.ProcessingEnvironment; import javax.annotation.processing.RoundEnvironment; @@ -45,13 +44,12 @@ public class JPAConfiguration extends DefaultConfiguration { public JPAConfiguration(RoundEnvironment roundEnv, ProcessingEnvironment processingEnv, - Map options, Class entityAnn, Class superTypeAnn, Class embeddableAnn, Class embeddedAnn, Class skipAnn) { - super(roundEnv, options, Keywords.JPA, QueryEntities.class, entityAnn, superTypeAnn, + super(processingEnv, roundEnv, Keywords.JPA, QueryEntities.class, entityAnn, superTypeAnn, embeddableAnn, embeddedAnn, skipAnn); this.annotations = getAnnotations(); this.types = processingEnv.getTypeUtils(); diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/morphia/MorphiaAnnotationProcessor.java b/querydsl-apt/src/main/java/com/querydsl/apt/morphia/MorphiaAnnotationProcessor.java index cf14ed7d1..1d7d41bbd 100644 --- a/querydsl-apt/src/main/java/com/querydsl/apt/morphia/MorphiaAnnotationProcessor.java +++ b/querydsl-apt/src/main/java/com/querydsl/apt/morphia/MorphiaAnnotationProcessor.java @@ -46,8 +46,8 @@ public class MorphiaAnnotationProcessor extends AbstractQuerydslProcessor { Class superType = QuerySupertype.class; Class embedded = Embedded.class; Class skip = Transient.class; - DefaultConfiguration conf = new DefaultConfiguration(roundEnv, - processingEnv.getOptions(), Collections.emptySet(), + DefaultConfiguration conf = new DefaultConfiguration(processingEnv, roundEnv, + Collections.emptySet(), entities, entity, superType, null, embedded, skip); try { @SuppressWarnings("unchecked") // Point is an Expression diff --git a/querydsl-apt/src/main/java/com/querydsl/apt/roo/RooAnnotationProcessor.java b/querydsl-apt/src/main/java/com/querydsl/apt/roo/RooAnnotationProcessor.java index fd956a266..bdfba58cf 100644 --- a/querydsl-apt/src/main/java/com/querydsl/apt/roo/RooAnnotationProcessor.java +++ b/querydsl-apt/src/main/java/com/querydsl/apt/roo/RooAnnotationProcessor.java @@ -47,7 +47,7 @@ public class RooAnnotationProcessor extends AbstractQuerydslProcessor { Class embeddable = Embeddable.class; Class embedded = Embedded.class; Class skip = Transient.class; - DefaultConfiguration conf = new JPAConfiguration(roundEnv, processingEnv, processingEnv.getOptions(), + DefaultConfiguration conf = new JPAConfiguration(roundEnv, processingEnv, entity, superType, embeddable, embedded, skip); conf.setAlternativeEntityAnnotation(RooJpaActiveRecord.class); return conf;